diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 2990af1..d802514 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: '3',
@@ -66,11 +67,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 2990af1..d802514 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: '3',
@@ -66,11 +67,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 eb6e5bc..49713f4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -82,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>
 
@@ -195,6 +195,7 @@
     }
   },
   watch: {
+    // 当告警各类型变化时，刷新告警内容列表
     alarmType(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
@@ -203,6 +204,7 @@
         this.alarmContentTypeList = []
       }
     },
+    // 当时间范围变化时，填充listQuery时间
     timeRange(val) {
       if (val && val.length > 0) {
         this.listQuery.beginTime = val[0]
@@ -232,12 +234,16 @@
     // 取消报警
     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(cellValue) {
       if (cellValue === 1) {
@@ -250,6 +256,7 @@
         return ''
       }
     },
+    // 计算行样式，不同等级显示不同颜色，暂时不用了
     tableRowClassName({ row, rowIndex }) {
       // if (row.alarmLevel === 1) {
       //   return 'red-row'

diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
index 2990af1..d802514 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: '3',
@@ -66,11 +67,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 eb6e5bc..49713f4 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -82,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>
 
@@ -195,6 +195,7 @@
     }
   },
   watch: {
+    // 当告警各类型变化时，刷新告警内容列表
     alarmType(val) {
       this.listQuery.alarmContentType = ''
       if (val && val !== '') {
@@ -203,6 +204,7 @@
         this.alarmContentTypeList = []
       }
     },
+    // 当时间范围变化时，填充listQuery时间
     timeRange(val) {
       if (val && val.length > 0) {
         this.listQuery.beginTime = val[0]
@@ -232,12 +234,16 @@
     // 取消报警
     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(cellValue) {
       if (cellValue === 1) {
@@ -250,6 +256,7 @@
         return ''
       }
     },
+    // 计算行样式，不同等级显示不同颜色，暂时不用了
     tableRowClassName({ row, rowIndex }) {
       // if (row.alarmLevel === 1) {
       //   return 'red-row'
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index aab6475..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="工单编号">
@@ -181,10 +181,15 @@
       dialogImageUrl: '', // 图片预览路径
       dialogVisible: false, // 图片预览框是否显示
       labelPosition: 'right', // labe对齐方式
-      mapShow: false // 是否显示地图
+      mapShow: false, // 是否显示地图
+      loading: true
     }
   },
-  mounted() {
+  // mounted() {
+  //   const jobId = this.$route.params.id
+  //   this.getJobInfo(jobId)
+  // },
+  activated() {
     const jobId = this.$route.params.id
     this.getJobInfo(jobId)
   },
@@ -195,9 +200,10 @@
     },
     // 获取工单详情
     getJobInfo: function(jobId) {
-      console.log('getJobInfo')
+      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
@@ -229,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: '待处理',
@@ -251,7 +258,7 @@
               timestamp: job.confirmJobTime
             }
             this.activities.push(activity)
-            this.activeStep = 2
+            this.activeStep += 1
           } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
             if (job.jobStatus !== '4' && job.jobStatus !== '3') { // 状态不为已取消的话，显示待确认
               const activity = {
@@ -279,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 === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替