diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 31b5587..a4f9553 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -47,6 +47,7 @@
         jobStatus: '', // 工单状态
         handleMessage: '' // 原因
       },
+      isBatch: false, // 是不是批量删除
       dialogVisible: false,
       closeReasons: [{
         value: '4',
@@ -65,11 +66,13 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      debugger
       this.dialogVisible = dialogFormVisible
+      this.isBatch = isBatch
       if (isBatch) {
         this.formData.keywords = params.keywords
-        this.formData.alarmType = params.alarmTpe
-        this.formData.alarmContent = params.alarmContent
+        this.formData.alarmType = params.alarmType
+        this.formData.alarmContent = params.alarmContentType
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {

diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 31b5587..a4f9553 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -47,6 +47,7 @@
         jobStatus: '', // 工单状态
         handleMessage: '' // 原因
       },
+      isBatch: false, // 是不是批量删除
       dialogVisible: false,
       closeReasons: [{
         value: '4',
@@ -65,11 +66,13 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      debugger
       this.dialogVisible = dialogFormVisible
+      this.isBatch = isBatch
       if (isBatch) {
         this.formData.keywords = params.keywords
-        this.formData.alarmType = params.alarmTpe
-        this.formData.alarmContent = params.alarmContent
+        this.formData.alarmType = params.alarmType
+        this.formData.alarmContent = params.alarmContentType
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7563fbb..49713f4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -7,7 +7,7 @@
           <el-form-item class="selectForm-container-item" prop="keywords">
             <el-input v-model.trim="listQuery.keywords" placeholder="窨井编号" clearable/>
           </el-form-item>
-          <el-form-item v-if="showAlarmType" class="selectForm-container-item" prop="alarmType">
+          <el-form-item v-if="isOperation()" class="selectForm-container-item" prop="alarmType">
             <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
               <el-option
                 v-for="item in alarmTypeList"
@@ -47,7 +47,7 @@
           <el-button v-if="hasPerm('/alarm/batchCancel')" class="edit_btn" size="small" @click="batchCancel">批量消警</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column label="窨井编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -57,6 +57,7 @@
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -81,7 +82,7 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
-    <handle-prompt v-show="cancelShow" ref="handlePrompt" @watchChild="fetchData"/>
+    <handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
   </div>
 </template>
 
@@ -89,6 +90,7 @@
 import infoWell from '@/views/wellManage/infoWell'
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 import HandlePrompt from './components/HandlePrompt'
+import { isOperation } from '@/utils/permission'
 
 export default {
   name: 'ListAlarmNow',
@@ -130,6 +132,12 @@
           align: 'center'
         },
         {
+          text: '告警等级',
+          value: 'alarmLevel',
+          align: 'center',
+          level: true
+        },
+        {
           text: '告警数值',
           value: 'alarmValue',
           width: 90,
@@ -146,18 +154,18 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
-        },
-        {
-          text: '联系人',
-          value: 'staff',
-          align: 'center'
-        },
-        {
-          text: '联系方式',
-          value: 'tel',
-          width: 110,
-          align: 'center'
         }
+        // {
+        //   text: '联系人',
+        //   value: 'staff',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '联系方式',
+        //   value: 'tel',
+        //   width: 110,
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -187,6 +195,7 @@
     }
   },
   watch: {
+    // 当告警各类型变化时，刷新告警内容列表
     alarmType(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
@@ -195,6 +204,7 @@
         this.alarmContentTypeList = []
       }
     },
+    // 当时间范围变化时，填充listQuery时间
     timeRange(val) {
       if (val && val.length > 0) {
         this.listQuery.beginTime = val[0]
@@ -224,20 +234,37 @@
     // 取消报警
     cancelAlarm(jobId) {
       this.cancelShow = true
-      this.$refs.handlePrompt.initDialog(this.cancelShow, jobId, false)
+      // setTimeout(function() {
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      // }, 100)
     },
     // 取消报警,调用结束工单接口
     batchCancel() {
       this.cancelShow = true
-      this.$refs.handlePrompt.initDialog(this.cancelShow, '', true, this.listQuery)
+      // setTimeout(function() {
+        this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      // }, 100)
     },
-    formatValue(row, column, cellValue) {
-      if (cellValue === '') {
-        return '--'
+    formatValue(cellValue) {
+      if (cellValue === 1) {
+        return '一级告警'
+      } else if (cellValue === 2) {
+        return '二级告警'
+      } else if (cellValue === 3) {
+        return '三级告警'
       } else {
-        return cellValue
+        return ''
       }
     },
+    // 计算行样式，不同等级显示不同颜色，暂时不用了
+    tableRowClassName({ row, rowIndex }) {
+      // if (row.alarmLevel === 1) {
+      //   return 'red-row'
+      // } else if (row.alarmLevel === 2) {
+      //   return 'yellow-row'
+      // }
+      return ''
+    },
     // 显示窨井详情
     showWellDetail(row) {
       this.wellShow = true
@@ -292,8 +319,9 @@
     fetchAlarmType() {
       getAlarmType().then(response => {
         this.alarmTypeList = response.data
-        if (this.alarmTypeList.length <= 1) {
+        if (!isOperation()) { // 如果不是管理员和运维人员
           this.showAlarmType = false
+          this.listQuery.alarmType = '1'
         }
       })
     },
@@ -357,3 +385,16 @@
     color:red
   }
 </style>
+<style rel="stylesheet/scss" lang="scss">
+  .el-table {
+    .red-row{
+      background: #F9E9E8;
+    }
+    .orange-row{
+      background: #F9E7D1;
+    }
+    .yellow-row{
+      background: oldlace;
+    }
+  }
+</style>

diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 31b5587..a4f9553 100644
--- a/src/views/alarmManage/components/HandlePrompt.vue
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -47,6 +47,7 @@
         jobStatus: '', // 工单状态
         handleMessage: '' // 原因
       },
+      isBatch: false, // 是不是批量删除
       dialogVisible: false,
       closeReasons: [{
         value: '4',
@@ -65,11 +66,13 @@
   methods: {
     // 初始化对话框
     initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      debugger
       this.dialogVisible = dialogFormVisible
+      this.isBatch = isBatch
       if (isBatch) {
         this.formData.keywords = params.keywords
-        this.formData.alarmType = params.alarmTpe
-        this.formData.alarmContent = params.alarmContent
+        this.formData.alarmType = params.alarmType
+        this.formData.alarmContent = params.alarmContentType
         this.formData.beginTime = params.beginTime
         this.formData.endTime = params.endTime
       } else {
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7563fbb..49713f4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -7,7 +7,7 @@
           <el-form-item class="selectForm-container-item" prop="keywords">
             <el-input v-model.trim="listQuery.keywords" placeholder="窨井编号" clearable/>
           </el-form-item>
-          <el-form-item v-if="showAlarmType" class="selectForm-container-item" prop="alarmType">
+          <el-form-item v-if="isOperation()" class="selectForm-container-item" prop="alarmType">
             <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
               <el-option
                 v-for="item in alarmTypeList"
@@ -47,7 +47,7 @@
           <el-button v-if="hasPerm('/alarm/batchCancel')" class="edit_btn" size="small" @click="batchCancel">批量消警</el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border>
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border>
         <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column label="窨井编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -57,6 +57,7 @@
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" :formatter="column.formatFun" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else-if="column.level">{{ formatValue(scope.row[column.value]) }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
@@ -81,7 +82,7 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
-    <handle-prompt v-show="cancelShow" ref="handlePrompt" @watchChild="fetchData"/>
+    <handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
   </div>
 </template>
 
@@ -89,6 +90,7 @@
 import infoWell from '@/views/wellManage/infoWell'
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 import HandlePrompt from './components/HandlePrompt'
+import { isOperation } from '@/utils/permission'
 
 export default {
   name: 'ListAlarmNow',
@@ -130,6 +132,12 @@
           align: 'center'
         },
         {
+          text: '告警等级',
+          value: 'alarmLevel',
+          align: 'center',
+          level: true
+        },
+        {
           text: '告警数值',
           value: 'alarmValue',
           width: 90,
@@ -146,18 +154,18 @@
           value: 'alarmTime',
           width: 170,
           align: 'center'
-        },
-        {
-          text: '联系人',
-          value: 'staff',
-          align: 'center'
-        },
-        {
-          text: '联系方式',
-          value: 'tel',
-          width: 110,
-          align: 'center'
         }
+        // {
+        //   text: '联系人',
+        //   value: 'staff',
+        //   align: 'center'
+        // },
+        // {
+        //   text: '联系方式',
+        //   value: 'tel',
+        //   width: 110,
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
@@ -187,6 +195,7 @@
     }
   },
   watch: {
+    // 当告警各类型变化时，刷新告警内容列表
     alarmType(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
@@ -195,6 +204,7 @@
         this.alarmContentTypeList = []
       }
     },
+    // 当时间范围变化时，填充listQuery时间
     timeRange(val) {
       if (val && val.length > 0) {
         this.listQuery.beginTime = val[0]
@@ -224,20 +234,37 @@
     // 取消报警
     cancelAlarm(jobId) {
       this.cancelShow = true
-      this.$refs.handlePrompt.initDialog(this.cancelShow, jobId, false)
+      // setTimeout(function() {
+        this.$refs.handlePrompt.initDialog(true, jobId, false)
+      // }, 100)
     },
     // 取消报警,调用结束工单接口
     batchCancel() {
       this.cancelShow = true
-      this.$refs.handlePrompt.initDialog(this.cancelShow, '', true, this.listQuery)
+      // setTimeout(function() {
+        this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      // }, 100)
     },
-    formatValue(row, column, cellValue) {
-      if (cellValue === '') {
-        return '--'
+    formatValue(cellValue) {
+      if (cellValue === 1) {
+        return '一级告警'
+      } else if (cellValue === 2) {
+        return '二级告警'
+      } else if (cellValue === 3) {
+        return '三级告警'
       } else {
-        return cellValue
+        return ''
       }
     },
+    // 计算行样式，不同等级显示不同颜色，暂时不用了
+    tableRowClassName({ row, rowIndex }) {
+      // if (row.alarmLevel === 1) {
+      //   return 'red-row'
+      // } else if (row.alarmLevel === 2) {
+      //   return 'yellow-row'
+      // }
+      return ''
+    },
     // 显示窨井详情
     showWellDetail(row) {
       this.wellShow = true
@@ -292,8 +319,9 @@
     fetchAlarmType() {
       getAlarmType().then(response => {
         this.alarmTypeList = response.data
-        if (this.alarmTypeList.length <= 1) {
+        if (!isOperation()) { // 如果不是管理员和运维人员
           this.showAlarmType = false
+          this.listQuery.alarmType = '1'
         }
       })
     },
@@ -357,3 +385,16 @@
     color:red
   }
 </style>
+<style rel="stylesheet/scss" lang="scss">
+  .el-table {
+    .red-row{
+      background: #F9E9E8;
+    }
+    .orange-row{
+      background: #F9E7D1;
+    }
+    .yellow-row{
+      background: oldlace;
+    }
+  }
+</style>
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index de8c382..9614347 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="job-form">
-    <el-form ref="dataForm" :label-position="labelPosition" :model="jobForm" label-width="120px">
+    <el-form v-loading="loading" ref="dataForm" :label-position="labelPosition" :model="jobForm" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="工单编号">
@@ -39,6 +39,11 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item label="告警详情">
+            <el-input v-model="jobForm.alarmMessage" type="text" placeholder="未知" disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="9" :offset="3">
           <el-form-item label="处理状态">
             <el-input v-model="jobForm.jobStatusName" type="text" placeholder="未知" disabled/>
           </el-form-item>
@@ -148,6 +153,7 @@
         alarmType: '',
         alarmTypeName: '', // 告警类型
         alarmContentName: '', // 报警内容
+        alarmMessage: '', // 告警详情
         jobStatusName: '', // 工单处理状态
         firstState: '', // 现场情况描述
         firstStatePhotos: '', // 现场情况图片
@@ -175,11 +181,16 @@
       dialogImageUrl: '', // 图片预览路径
       dialogVisible: false, // 图片预览框是否显示
       labelPosition: 'right', // labe对齐方式
-      mapShow: false // 是否显示地图
+      mapShow: false, // 是否显示地图
+      loading: true
     }
   },
-  mounted() {
-    const jobId = this.$route.query.jobId
+  // mounted() {
+  //   const jobId = this.$route.params.id
+  //   this.getJobInfo(jobId)
+  // },
+  activated() {
+    const jobId = this.$route.params.id
     this.getJobInfo(jobId)
   },
   methods: {
@@ -189,13 +200,18 @@
     },
     // 获取工单详情
     getJobInfo: function(jobId) {
+      this.loading = true
       const base_url = process.env.BASE_API + '/static/'
       getJobInfo(jobId).then(response => {
+        this.loading = false
         if (response.code === 200) {
+          if (response.data.length <= 0) {
+            return
+          }
           const job = response.data[0]
           this.jobForm = job
           // 处理现场图片
-          if (job.firstStatePhotos.length > 0) {
+          if (job.firstStatePhotos !== '') {
             this.firstImageList = []
             const urls = job.firstStatePhotos.split(';')
             for (const url of urls) {
@@ -207,7 +223,7 @@
             this.firstImageList = []
           }
           // 处理维护图片
-          if (job.handlePhotos.length > 0) {
+          if (job.handlePhotos.length !== '') {
             this.handleImageList = []
             const urls = job.handlePhotos.split(';')
             for (const url of urls) {
@@ -219,14 +235,15 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有getJobTime有值，表示有人接单，状态改为已接单
+          // 若有getJobTime有值，表示有人接单
+          this.activities = []
           if (job.getJobTime) {
             const activity = {
               content: job.getJobPerson + '已接单',
               timestamp: job.getJobTime
             }
             this.activities.push(activity)
-            this.activeStep = 1
+            this.activeStep += 1
           } else { // 否则添加空的状态
             const activity = {
               content: '待处理',
@@ -241,9 +258,9 @@
               timestamp: job.confirmJobTime
             }
             this.activities.push(activity)
-            this.activeStep = 2
+            this.activeStep += 1
           } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            if (job.jobStatus !== '4') { // 状态不为已取消的话，显示待确认
+            if (job.jobStatus !== '4' && job.jobStatus !== '3') { // 状态不为已取消的话，显示待确认
               const activity = {
                 content: '待确认',
                 timestamp: ''
@@ -269,14 +286,14 @@
               }
               this.activities.push(activity1)
               this.activities.push(activity2)
-              this.activeStep = 3
+              this.activeStep += 1
             } else if (job.jobStatus === '4') { // 已取消
               const activity1 = {
                 content: handleJobPerson + '已取消',
                 timestamp: job.handleJobTime
               }
               this.activities.push(activity1)
-              this.activeStep = 2
+              this.activeStep += 1
             }
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替