diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6a8bc10..f9e6fc9 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -56,6 +56,7 @@
 export function batchCancel(params) {
   return request({
     url: 'alarm/batchCancel',
-    method: 'post'
+    method: 'post',
+    params
   })
 }

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6a8bc10..f9e6fc9 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -56,6 +56,7 @@
 export function batchCancel(params) {
   return request({
     url: 'alarm/batchCancel',
-    method: 'post'
+    method: 'post',
+    params
   })
 }
diff --git a/src/api/job.js b/src/api/job.js
index 141e2e6..ebd33d2 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -11,15 +11,16 @@
   })
 }
 
-export function overJob(id) {
+export function overJob(params) {
   return request({
     url: 'job/overJob',
     method: 'post',
-    params: {
-      id: id,
-      handleMessage: '',
-      handlePhotos: ''
-    }
+    params
+    // params: {
+    //   id: id,
+    //   handleMessage: '',
+    //   handlePhotos: ''
+    // }
   })
 }
 

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6a8bc10..f9e6fc9 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -56,6 +56,7 @@
 export function batchCancel(params) {
   return request({
     url: 'alarm/batchCancel',
-    method: 'post'
+    method: 'post',
+    params
   })
 }
diff --git a/src/api/job.js b/src/api/job.js
index 141e2e6..ebd33d2 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -11,15 +11,16 @@
   })
 }
 
-export function overJob(id) {
+export function overJob(params) {
   return request({
     url: 'job/overJob',
     method: 'post',
-    params: {
-      id: id,
-      handleMessage: '',
-      handlePhotos: ''
-    }
+    params
+    // params: {
+    //   id: id,
+    //   handleMessage: '',
+    //   handlePhotos: ''
+    // }
   })
 }
 
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
new file mode 100644
index 0000000..d5bc9a1
--- /dev/null
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    append-to-body
+    title="取消告警"
+    width="30%"
+    @close="closeDialog">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item label="取消原因" prop="handleMessage">
+        <el-input
+          v-model.trim="formData.handleMessage"
+          type="textarea"
+          placeholder="请输入详细的告警取消原因"/>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="cancelAlarm" >确 定</el-button>
+    </span>
+  </el-dialog>
+
+</template>
+
+<script>
+import { batchCancel } from '@/api/alarm'
+import { overJob } from '@/api/job'
+
+export default {
+  name: 'HandlePrompt',
+  data() {
+    return {
+      formData: {
+        keywords: '', // 批量消警查询条件——关键字
+        alarmType: '', // 批量消警查询条件——报警类型
+        alarmContent: '', // 批量消警查询条件——报警内容
+        beginTime: '', // 批量消警查询条件——开始时间
+        endTime: '', // 批量消警查询条件——结束时间
+        id: '', // 工单id
+        jobStatus: '', // 工单状态
+        handleMessage: '' // 原因
+      },
+      isBatch: false, // 是不是批量删除
+      dialogVisible: false,
+      closeReasons: [{
+        value: '3',
+        label: '已处理' // 已完成
+      }, {
+        value: '4',
+        label: '无需处理' // 已取消
+      }],
+      rules: {
+        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
+        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+      },
+      value: ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      this.dialogVisible = dialogFormVisible
+      this.isBatch = isBatch
+      if (isBatch) {
+        // this.formData.keywords = params.keywords
+        // this.formData.alarmType = params.alarmType
+        // this.formData.alarmContent = params.alarmContentType
+        // this.formData.beginTime = params.beginTime
+        // this.formData.endTime = params.endTime
+      } else {
+        this.formData.id = jobId
+      }
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.closeDialog()
+        })
+        .catch(_ => {})
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm() {
+      const confirmText = this.isBatch?'确定要强制取消全部报警吗？':'确定要强制取消报警吗？'
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.$confirm(
+            confirmText,
+            '确认操作',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          ).then(() => {
+            // 批量消警接口
+            if (this.isBatch) {
+              const form = {
+                handleMessage: this.formData.handleMessage
+              }
+              batchCancel(form).then(response => {
+                this.$message.success('批量消警成功')
+                this.closeDialog()
+              })
+            } else { // 单个消警接口
+              const formData = {
+                id: this.formData.id,
+                handleMessage: this.formData.handleMessage,
+                handlePhotos:''
+              }
+              overJob(formData).then(response => {
+                this.$message.success('取消报警成功')
+                this.closeDialog()
+              })
+            }
+          })
+        }
+      })
+    },
+    closeDialog() {
+      this.dialogVisible = false
+      this.$emit('watchChild')
+      this.formData.jobStatus = ''
+      this.formData.handleMessage = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['form'].clearValidate()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6a8bc10..f9e6fc9 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -56,6 +56,7 @@
 export function batchCancel(params) {
   return request({
     url: 'alarm/batchCancel',
-    method: 'post'
+    method: 'post',
+    params
   })
 }
diff --git a/src/api/job.js b/src/api/job.js
index 141e2e6..ebd33d2 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -11,15 +11,16 @@
   })
 }
 
-export function overJob(id) {
+export function overJob(params) {
   return request({
     url: 'job/overJob',
     method: 'post',
-    params: {
-      id: id,
-      handleMessage: '',
-      handlePhotos: ''
-    }
+    params
+    // params: {
+    //   id: id,
+    //   handleMessage: '',
+    //   handlePhotos: ''
+    // }
   })
 }
 
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
new file mode 100644
index 0000000..d5bc9a1
--- /dev/null
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    append-to-body
+    title="取消告警"
+    width="30%"
+    @close="closeDialog">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item label="取消原因" prop="handleMessage">
+        <el-input
+          v-model.trim="formData.handleMessage"
+          type="textarea"
+          placeholder="请输入详细的告警取消原因"/>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="cancelAlarm" >确 定</el-button>
+    </span>
+  </el-dialog>
+
+</template>
+
+<script>
+import { batchCancel } from '@/api/alarm'
+import { overJob } from '@/api/job'
+
+export default {
+  name: 'HandlePrompt',
+  data() {
+    return {
+      formData: {
+        keywords: '', // 批量消警查询条件——关键字
+        alarmType: '', // 批量消警查询条件——报警类型
+        alarmContent: '', // 批量消警查询条件——报警内容
+        beginTime: '', // 批量消警查询条件——开始时间
+        endTime: '', // 批量消警查询条件——结束时间
+        id: '', // 工单id
+        jobStatus: '', // 工单状态
+        handleMessage: '' // 原因
+      },
+      isBatch: false, // 是不是批量删除
+      dialogVisible: false,
+      closeReasons: [{
+        value: '3',
+        label: '已处理' // 已完成
+      }, {
+        value: '4',
+        label: '无需处理' // 已取消
+      }],
+      rules: {
+        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
+        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+      },
+      value: ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      this.dialogVisible = dialogFormVisible
+      this.isBatch = isBatch
+      if (isBatch) {
+        // this.formData.keywords = params.keywords
+        // this.formData.alarmType = params.alarmType
+        // this.formData.alarmContent = params.alarmContentType
+        // this.formData.beginTime = params.beginTime
+        // this.formData.endTime = params.endTime
+      } else {
+        this.formData.id = jobId
+      }
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.closeDialog()
+        })
+        .catch(_ => {})
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm() {
+      const confirmText = this.isBatch?'确定要强制取消全部报警吗？':'确定要强制取消报警吗？'
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.$confirm(
+            confirmText,
+            '确认操作',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          ).then(() => {
+            // 批量消警接口
+            if (this.isBatch) {
+              const form = {
+                handleMessage: this.formData.handleMessage
+              }
+              batchCancel(form).then(response => {
+                this.$message.success('批量消警成功')
+                this.closeDialog()
+              })
+            } else { // 单个消警接口
+              const formData = {
+                id: this.formData.id,
+                handleMessage: this.formData.handleMessage,
+                handlePhotos:''
+              }
+              overJob(formData).then(response => {
+                this.$message.success('取消报警成功')
+                this.closeDialog()
+              })
+            }
+          })
+        }
+      })
+    },
+    closeDialog() {
+      this.dialogVisible = false
+      this.$emit('watchChild')
+      this.formData.jobStatus = ''
+      this.formData.handleMessage = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['form'].clearValidate()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7b0042d..37ee964 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -43,6 +43,7 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
+    <<handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
   </div>
 </template>
 
@@ -50,10 +51,11 @@
 import infoWell from '@/views/wellManage/infoWellBdOffline'
 import { getAlarmList, batchExportAlarm, batchCancel } from '@/api/alarm'
 import { overJob } from '@/api/job'
+import HandlePrompt from './component/HandlePrompt'
 
 export default {
   name: 'ListAlarmNow',
-  components: { infoWell },
+  components: { HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
@@ -130,7 +132,8 @@
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
       wellShow: false, // 是否显示闸井详情
-      detailShow: false // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      cancelShow: true
     }
   },
   created() {
@@ -209,37 +212,42 @@
     },
     // 取消报警,调用结束工单接口
     cancelAlarm(jobId) {
-      this.$confirm(
-        '确定要强制取消报警吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        overJob(jobId).then(response => {
-          this.$message.success('取消报警成功')
-          this.fetchData()
-        })
-      })
+      this.cancelShow = true
+      // setTimeout(function() {
+      this.$refs.handlePrompt.initDialog(true, jobId, false)
+      // this.$confirm(
+      //   '确定要强制取消报警吗？',
+      //   '确认操作',
+      //   {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //   overJob(jobId).then(response => {
+      //     this.$message.success('取消报警成功')
+      //     this.fetchData()
+      //   })
+      // })
     },
     // 批量消警
     batchCancel() {
-      this.$confirm(
-        '确定要强制取消全部报警吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        batchCancel().then(response => {
-          this.$message.success('取消报警成功')
-          this.fetchData()
-        })
-      })
+      this.cancelShow = true
+      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      // this.$confirm(
+      //   '确定要强制取消全部报警吗？',
+      //   '确认操作',
+      //   {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //   batchCancel().then(response => {
+      //     this.$message.success('取消报警成功')
+      //     this.fetchData()
+      //   })
+      // })
     }
   }
 }

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6a8bc10..f9e6fc9 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -56,6 +56,7 @@
 export function batchCancel(params) {
   return request({
     url: 'alarm/batchCancel',
-    method: 'post'
+    method: 'post',
+    params
   })
 }
diff --git a/src/api/job.js b/src/api/job.js
index 141e2e6..ebd33d2 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -11,15 +11,16 @@
   })
 }
 
-export function overJob(id) {
+export function overJob(params) {
   return request({
     url: 'job/overJob',
     method: 'post',
-    params: {
-      id: id,
-      handleMessage: '',
-      handlePhotos: ''
-    }
+    params
+    // params: {
+    //   id: id,
+    //   handleMessage: '',
+    //   handlePhotos: ''
+    // }
   })
 }
 
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
new file mode 100644
index 0000000..d5bc9a1
--- /dev/null
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    append-to-body
+    title="取消告警"
+    width="30%"
+    @close="closeDialog">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item label="取消原因" prop="handleMessage">
+        <el-input
+          v-model.trim="formData.handleMessage"
+          type="textarea"
+          placeholder="请输入详细的告警取消原因"/>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="cancelAlarm" >确 定</el-button>
+    </span>
+  </el-dialog>
+
+</template>
+
+<script>
+import { batchCancel } from '@/api/alarm'
+import { overJob } from '@/api/job'
+
+export default {
+  name: 'HandlePrompt',
+  data() {
+    return {
+      formData: {
+        keywords: '', // 批量消警查询条件——关键字
+        alarmType: '', // 批量消警查询条件——报警类型
+        alarmContent: '', // 批量消警查询条件——报警内容
+        beginTime: '', // 批量消警查询条件——开始时间
+        endTime: '', // 批量消警查询条件——结束时间
+        id: '', // 工单id
+        jobStatus: '', // 工单状态
+        handleMessage: '' // 原因
+      },
+      isBatch: false, // 是不是批量删除
+      dialogVisible: false,
+      closeReasons: [{
+        value: '3',
+        label: '已处理' // 已完成
+      }, {
+        value: '4',
+        label: '无需处理' // 已取消
+      }],
+      rules: {
+        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
+        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+      },
+      value: ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      this.dialogVisible = dialogFormVisible
+      this.isBatch = isBatch
+      if (isBatch) {
+        // this.formData.keywords = params.keywords
+        // this.formData.alarmType = params.alarmType
+        // this.formData.alarmContent = params.alarmContentType
+        // this.formData.beginTime = params.beginTime
+        // this.formData.endTime = params.endTime
+      } else {
+        this.formData.id = jobId
+      }
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.closeDialog()
+        })
+        .catch(_ => {})
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm() {
+      const confirmText = this.isBatch?'确定要强制取消全部报警吗？':'确定要强制取消报警吗？'
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.$confirm(
+            confirmText,
+            '确认操作',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          ).then(() => {
+            // 批量消警接口
+            if (this.isBatch) {
+              const form = {
+                handleMessage: this.formData.handleMessage
+              }
+              batchCancel(form).then(response => {
+                this.$message.success('批量消警成功')
+                this.closeDialog()
+              })
+            } else { // 单个消警接口
+              const formData = {
+                id: this.formData.id,
+                handleMessage: this.formData.handleMessage,
+                handlePhotos:''
+              }
+              overJob(formData).then(response => {
+                this.$message.success('取消报警成功')
+                this.closeDialog()
+              })
+            }
+          })
+        }
+      })
+    },
+    closeDialog() {
+      this.dialogVisible = false
+      this.$emit('watchChild')
+      this.formData.jobStatus = ''
+      this.formData.handleMessage = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['form'].clearValidate()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7b0042d..37ee964 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -43,6 +43,7 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
+    <<handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
   </div>
 </template>
 
@@ -50,10 +51,11 @@
 import infoWell from '@/views/wellManage/infoWellBdOffline'
 import { getAlarmList, batchExportAlarm, batchCancel } from '@/api/alarm'
 import { overJob } from '@/api/job'
+import HandlePrompt from './component/HandlePrompt'
 
 export default {
   name: 'ListAlarmNow',
-  components: { infoWell },
+  components: { HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
@@ -130,7 +132,8 @@
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
       wellShow: false, // 是否显示闸井详情
-      detailShow: false // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      cancelShow: true
     }
   },
   created() {
@@ -209,37 +212,42 @@
     },
     // 取消报警,调用结束工单接口
     cancelAlarm(jobId) {
-      this.$confirm(
-        '确定要强制取消报警吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        overJob(jobId).then(response => {
-          this.$message.success('取消报警成功')
-          this.fetchData()
-        })
-      })
+      this.cancelShow = true
+      // setTimeout(function() {
+      this.$refs.handlePrompt.initDialog(true, jobId, false)
+      // this.$confirm(
+      //   '确定要强制取消报警吗？',
+      //   '确认操作',
+      //   {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //   overJob(jobId).then(response => {
+      //     this.$message.success('取消报警成功')
+      //     this.fetchData()
+      //   })
+      // })
     },
     // 批量消警
     batchCancel() {
-      this.$confirm(
-        '确定要强制取消全部报警吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        batchCancel().then(response => {
-          this.$message.success('取消报警成功')
-          this.fetchData()
-        })
-      })
+      this.cancelShow = true
+      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      // this.$confirm(
+      //   '确定要强制取消全部报警吗？',
+      //   '确认操作',
+      //   {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //   batchCancel().then(response => {
+      //     this.$message.success('取消报警成功')
+      //     this.fetchData()
+      //   })
+      // })
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 5ac4b20..e6846b8 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -54,6 +54,11 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
+        <el-table-column label="告警状态" width="90" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.status=='1'?'正在报警':'已消警' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
             <el-button v-if="scope.row.alarmType=='1'" type="text" @click="showJob(scope.row)">查看工单</el-button>

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 6a8bc10..f9e6fc9 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -56,6 +56,7 @@
 export function batchCancel(params) {
   return request({
     url: 'alarm/batchCancel',
-    method: 'post'
+    method: 'post',
+    params
   })
 }
diff --git a/src/api/job.js b/src/api/job.js
index 141e2e6..ebd33d2 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -11,15 +11,16 @@
   })
 }
 
-export function overJob(id) {
+export function overJob(params) {
   return request({
     url: 'job/overJob',
     method: 'post',
-    params: {
-      id: id,
-      handleMessage: '',
-      handlePhotos: ''
-    }
+    params
+    // params: {
+    //   id: id,
+    //   handleMessage: '',
+    //   handlePhotos: ''
+    // }
   })
 }
 
diff --git a/src/views/alarmManage/component/HandlePrompt.vue b/src/views/alarmManage/component/HandlePrompt.vue
new file mode 100644
index 0000000..d5bc9a1
--- /dev/null
+++ b/src/views/alarmManage/component/HandlePrompt.vue
@@ -0,0 +1,134 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    append-to-body
+    title="取消告警"
+    width="30%"
+    @close="closeDialog">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item label="取消原因" prop="handleMessage">
+        <el-input
+          v-model.trim="formData.handleMessage"
+          type="textarea"
+          placeholder="请输入详细的告警取消原因"/>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="cancelAlarm" >确 定</el-button>
+    </span>
+  </el-dialog>
+
+</template>
+
+<script>
+import { batchCancel } from '@/api/alarm'
+import { overJob } from '@/api/job'
+
+export default {
+  name: 'HandlePrompt',
+  data() {
+    return {
+      formData: {
+        keywords: '', // 批量消警查询条件——关键字
+        alarmType: '', // 批量消警查询条件——报警类型
+        alarmContent: '', // 批量消警查询条件——报警内容
+        beginTime: '', // 批量消警查询条件——开始时间
+        endTime: '', // 批量消警查询条件——结束时间
+        id: '', // 工单id
+        jobStatus: '', // 工单状态
+        handleMessage: '' // 原因
+      },
+      isBatch: false, // 是不是批量删除
+      dialogVisible: false,
+      closeReasons: [{
+        value: '3',
+        label: '已处理' // 已完成
+      }, {
+        value: '4',
+        label: '无需处理' // 已取消
+      }],
+      rules: {
+        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
+        handleMessage: [{ min: 1, max: 30, message: '长度不得超过30字', trigger: 'blur' }]
+      },
+      value: ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      this.dialogVisible = dialogFormVisible
+      this.isBatch = isBatch
+      if (isBatch) {
+        // this.formData.keywords = params.keywords
+        // this.formData.alarmType = params.alarmType
+        // this.formData.alarmContent = params.alarmContentType
+        // this.formData.beginTime = params.beginTime
+        // this.formData.endTime = params.endTime
+      } else {
+        this.formData.id = jobId
+      }
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.closeDialog()
+        })
+        .catch(_ => {})
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm() {
+      const confirmText = this.isBatch?'确定要强制取消全部报警吗？':'确定要强制取消报警吗？'
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.$confirm(
+            confirmText,
+            '确认操作',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }
+          ).then(() => {
+            // 批量消警接口
+            if (this.isBatch) {
+              const form = {
+                handleMessage: this.formData.handleMessage
+              }
+              batchCancel(form).then(response => {
+                this.$message.success('批量消警成功')
+                this.closeDialog()
+              })
+            } else { // 单个消警接口
+              const formData = {
+                id: this.formData.id,
+                handleMessage: this.formData.handleMessage,
+                handlePhotos:''
+              }
+              overJob(formData).then(response => {
+                this.$message.success('取消报警成功')
+                this.closeDialog()
+              })
+            }
+          })
+        }
+      })
+    },
+    closeDialog() {
+      this.dialogVisible = false
+      this.$emit('watchChild')
+      this.formData.jobStatus = ''
+      this.formData.handleMessage = ''
+      // 清除验证
+      this.$nextTick(() => {
+        this.$refs['form'].clearValidate()
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 7b0042d..37ee964 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -43,6 +43,7 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
+    <<handle-prompt ref="handlePrompt" @watchChild="fetchData"/>
   </div>
 </template>
 
@@ -50,10 +51,11 @@
 import infoWell from '@/views/wellManage/infoWellBdOffline'
 import { getAlarmList, batchExportAlarm, batchCancel } from '@/api/alarm'
 import { overJob } from '@/api/job'
+import HandlePrompt from './component/HandlePrompt'
 
 export default {
   name: 'ListAlarmNow',
-  components: { infoWell },
+  components: { HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
@@ -130,7 +132,8 @@
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
       wellShow: false, // 是否显示闸井详情
-      detailShow: false // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      cancelShow: true
     }
   },
   created() {
@@ -209,37 +212,42 @@
     },
     // 取消报警,调用结束工单接口
     cancelAlarm(jobId) {
-      this.$confirm(
-        '确定要强制取消报警吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        overJob(jobId).then(response => {
-          this.$message.success('取消报警成功')
-          this.fetchData()
-        })
-      })
+      this.cancelShow = true
+      // setTimeout(function() {
+      this.$refs.handlePrompt.initDialog(true, jobId, false)
+      // this.$confirm(
+      //   '确定要强制取消报警吗？',
+      //   '确认操作',
+      //   {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //   overJob(jobId).then(response => {
+      //     this.$message.success('取消报警成功')
+      //     this.fetchData()
+      //   })
+      // })
     },
     // 批量消警
     batchCancel() {
-      this.$confirm(
-        '确定要强制取消全部报警吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        batchCancel().then(response => {
-          this.$message.success('取消报警成功')
-          this.fetchData()
-        })
-      })
+      this.cancelShow = true
+      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
+      // this.$confirm(
+      //   '确定要强制取消全部报警吗？',
+      //   '确认操作',
+      //   {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }
+      // ).then(() => {
+      //   batchCancel().then(response => {
+      //     this.$message.success('取消报警成功')
+      //     this.fetchData()
+      //   })
+      // })
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 5ac4b20..e6846b8 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -54,6 +54,11 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
+        <el-table-column label="告警状态" width="90" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>{{ scope.row.status=='1'?'正在报警':'已消警' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
             <el-button v-if="scope.row.alarmType=='1'" type="text" @click="showJob(scope.row)">查看工单</el-button>
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 5713aa4..e9d44bf 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -43,6 +43,11 @@
             <el-input v-model="jobForm.jobStatusName" type="text" placeholder="未知" disabled/>
           </el-form-item>
         </el-col>
+        <!--<el-col v-if="jobForm.jobStatus=='3'" :span="9" :offset="3">-->
+          <!--<el-form-item label="完成原因">-->
+            <!--<el-input v-model="jobForm.handleMesssage" type="text" placeholder="无" disabled/>-->
+          <!--</el-form-item>-->
+        <!--</el-col>-->
       </el-row>
       <el-row v-if="jobForm.firstState" :gutter="20">
         <el-col :span="20">