diff --git a/src/api/alarm.js b/src/api/alarm.js
index 5202a0d..9357263 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -50,3 +50,11 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出
+export function batchCancel(params) {
+  return request({
+    url: 'alarm/batchCancel',
+    method: 'post'
+  })
+}

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 5202a0d..9357263 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -50,3 +50,11 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出
+export function batchCancel(params) {
+  return request({
+    url: 'alarm/batchCancel',
+    method: 'post'
+  })
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 30ecec9..952a7aa 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,6 +6,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/alarm/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <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>
@@ -21,6 +22,11 @@
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
+        <el-table-column v-if="hasPerm('/job/overJob')" label="操作" align="center" >
+          <template slot-scope="scope">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">取消报警</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--分页-->
@@ -42,7 +48,8 @@
 
 <script>
 import infoWell from '@/views/wellManage/infoWellBdOffline'
-import { getAlarmList, batchExportAlarm } from '@/api/alarm'
+import { getAlarmList, batchExportAlarm, batchCancel } from '@/api/alarm'
+import { overJob } from '@/api/job'
 
 export default {
   name: 'ListAlarmNow',
@@ -77,13 +84,13 @@
           value: 'alarmContentName',
           align: 'center'
         },
-        {
-          text: '告警数值',
-          value: 'alarmValue',
-          width: 90,
-          align: 'center',
-          checkCell: true
-        },
+        // {
+        //   text: '告警数值',
+        //   value: 'alarmValue',
+        //   // width: 90,
+        //   align: 'center',
+        //   checkCell: true
+        // },
         {
           text: '派出所',
           value: 'deptName',
@@ -94,18 +101,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: [], // 列表数据
@@ -199,6 +206,40 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm(jobId) {
+      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()
+        })
+      })
     }
   }
 }

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 5202a0d..9357263 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -50,3 +50,11 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出
+export function batchCancel(params) {
+  return request({
+    url: 'alarm/batchCancel',
+    method: 'post'
+  })
+}
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 30ecec9..952a7aa 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -6,6 +6,7 @@
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button v-if="hasPerm('/alarm/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <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>
@@ -21,6 +22,11 @@
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
+        <el-table-column v-if="hasPerm('/job/overJob')" label="操作" align="center" >
+          <template slot-scope="scope">
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.jobId)">取消报警</el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <!--分页-->
@@ -42,7 +48,8 @@
 
 <script>
 import infoWell from '@/views/wellManage/infoWellBdOffline'
-import { getAlarmList, batchExportAlarm } from '@/api/alarm'
+import { getAlarmList, batchExportAlarm, batchCancel } from '@/api/alarm'
+import { overJob } from '@/api/job'
 
 export default {
   name: 'ListAlarmNow',
@@ -77,13 +84,13 @@
           value: 'alarmContentName',
           align: 'center'
         },
-        {
-          text: '告警数值',
-          value: 'alarmValue',
-          width: 90,
-          align: 'center',
-          checkCell: true
-        },
+        // {
+        //   text: '告警数值',
+        //   value: 'alarmValue',
+        //   // width: 90,
+        //   align: 'center',
+        //   checkCell: true
+        // },
         {
           text: '派出所',
           value: 'deptName',
@@ -94,18 +101,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: [], // 列表数据
@@ -199,6 +206,40 @@
     handleCurrentChange(val) {
       this.listQuery.offset = val
       this.fetchData()
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm(jobId) {
+      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()
+        })
+      })
     }
   }
 }
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 4a3be6d..aa74bd3 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -127,13 +127,13 @@
           value: 'alarmContentName',
           align: 'center'
         },
-        {
-          text: '告警数值',
-          value: 'alarmValue',
-          width: 90,
-          align: 'center',
-          class: 'warning'
-        },
+        // {
+        //   text: '告警数值',
+        //   value: 'alarmValue',
+        //   width: 90,
+        //   align: 'center',
+        //   class: 'warning'
+        // },
         {
           text: '派出所',
           value: 'deptName',