diff --git a/src/api/alarm.js b/src/api/alarm.js
index 14f61d1..37f7c3e 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -51,3 +51,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 取消报警
+export function cancelAlarm(params) {
+  return request({
+    url: 'alarm/cancelAlarm',
+    method: 'post',
+    params
+  })
+}
+
+// 批量删除告警
+export function batchCancel(params) {
+  return request({
+    url: 'alarm/batchCancel',
+    method: 'post',
+    params
+  })
+}
+

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 14f61d1..37f7c3e 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -51,3 +51,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 取消报警
+export function cancelAlarm(params) {
+  return request({
+    url: 'alarm/cancelAlarm',
+    method: 'post',
+    params
+  })
+}
+
+// 批量删除告警
+export function batchCancel(params) {
+  return request({
+    url: 'alarm/batchCancel',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/job.js b/src/api/job.js
index 3503e5d..a7d0a3f 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -42,3 +42,4 @@
   })
 }
 
+

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 14f61d1..37f7c3e 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -51,3 +51,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 取消报警
+export function cancelAlarm(params) {
+  return request({
+    url: 'alarm/cancelAlarm',
+    method: 'post',
+    params
+  })
+}
+
+// 批量删除告警
+export function batchCancel(params) {
+  return request({
+    url: 'alarm/batchCancel',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/job.js b/src/api/job.js
index 3503e5d..a7d0a3f 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -42,3 +42,4 @@
   })
 }
 
+
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
new file mode 100644
index 0000000..292747e
--- /dev/null
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -0,0 +1,133 @@
+<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="jobStatus">
+        <el-select v-model="formData.jobStatus" placeholder="请选择">
+          <el-option
+            v-for="item in closeReasons"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+      </el-form-item>
+      <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, cancelAlarm } from '@/api/alarm'
+
+export default {
+  name: 'HandlePrompt',
+  data() {
+    return {
+      formData: {
+        keywords: '', // 批量消警查询条件——关键字
+        alarmType: '', // 批量消警查询条件——报警类型
+        alarmContent: '', // 批量消警查询条件——报警内容
+        beginTime: '', // 批量消警查询条件——开始时间
+        endTime: '', // 批量消警查询条件——结束时间
+        id: '', // 工单id
+        jobStatus: '', // 工单状态
+        handleMessage: '' // 原因
+      },
+      dialogVisible: false,
+      closeReasons: [{
+        value: '4',
+        label: '已取消'
+      }, {
+        value: '3',
+        label: '已完成'
+      }],
+      rules: {
+        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
+        handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] }],
+      },
+      value: ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      this.dialogVisible = dialogFormVisible
+      if (isBatch) {
+        this.formData.keywords = params.keywords
+        this.formData.alarmType = params.alarmTpe
+        this.formData.alarmContent = params.alarmContent
+        this.formData.beginTime = params.beginTime
+        this.formData.endTime = params.endTime
+      } else {
+        this.formData.id = jobId
+      }
+
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.closeDialog()
+        })
+        .catch(_ => {})
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm() {
+      this.$confirm(
+        '确定要取消报警吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        // 批量消警接口
+        if (this.isBatch) {
+          batchCancel(this.formData).then(response => {
+            this.$message.success('批量消警成功')
+            this.closeDialog()
+          })
+        } else { // 单个消警接口
+          const formData = {
+            id: this.formData.id,
+            jobStatus: this.formData.jobStatus, // 工单状态
+            handleMessage: this.formData.handleMessage // 原因
+          }
+          cancelAlarm(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 14f61d1..37f7c3e 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -51,3 +51,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+// 取消报警
+export function cancelAlarm(params) {
+  return request({
+    url: 'alarm/cancelAlarm',
+    method: 'post',
+    params
+  })
+}
+
+// 批量删除告警
+export function batchCancel(params) {
+  return request({
+    url: 'alarm/batchCancel',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/api/job.js b/src/api/job.js
index 3503e5d..a7d0a3f 100644
--- a/src/api/job.js
+++ b/src/api/job.js
@@ -42,3 +42,4 @@
   })
 }
 
+
diff --git a/src/views/alarmManage/components/HandlePrompt.vue b/src/views/alarmManage/components/HandlePrompt.vue
new file mode 100644
index 0000000..292747e
--- /dev/null
+++ b/src/views/alarmManage/components/HandlePrompt.vue
@@ -0,0 +1,133 @@
+<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="jobStatus">
+        <el-select v-model="formData.jobStatus" placeholder="请选择">
+          <el-option
+            v-for="item in closeReasons"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+      </el-form-item>
+      <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, cancelAlarm } from '@/api/alarm'
+
+export default {
+  name: 'HandlePrompt',
+  data() {
+    return {
+      formData: {
+        keywords: '', // 批量消警查询条件——关键字
+        alarmType: '', // 批量消警查询条件——报警类型
+        alarmContent: '', // 批量消警查询条件——报警内容
+        beginTime: '', // 批量消警查询条件——开始时间
+        endTime: '', // 批量消警查询条件——结束时间
+        id: '', // 工单id
+        jobStatus: '', // 工单状态
+        handleMessage: '' // 原因
+      },
+      dialogVisible: false,
+      closeReasons: [{
+        value: '4',
+        label: '已取消'
+      }, {
+        value: '3',
+        label: '已完成'
+      }],
+      rules: {
+        jobStatus: [{ required: true, message: '关闭原因必选', trigger: ['blur', 'change'] }],
+        handleMessage: [{ required: true, message: '备注不得为空', trigger: ['blur', 'change'] }],
+      },
+      value: ''
+    }
+  },
+  methods: {
+    // 初始化对话框
+    initDialog: function(dialogFormVisible, jobId, isBatch, params) {
+      this.dialogVisible = dialogFormVisible
+      if (isBatch) {
+        this.formData.keywords = params.keywords
+        this.formData.alarmType = params.alarmTpe
+        this.formData.alarmContent = params.alarmContent
+        this.formData.beginTime = params.beginTime
+        this.formData.endTime = params.endTime
+      } else {
+        this.formData.id = jobId
+      }
+
+    },
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          this.closeDialog()
+        })
+        .catch(_ => {})
+    },
+    // 取消报警,调用结束工单接口
+    cancelAlarm() {
+      this.$confirm(
+        '确定要取消报警吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        // 批量消警接口
+        if (this.isBatch) {
+          batchCancel(this.formData).then(response => {
+            this.$message.success('批量消警成功')
+            this.closeDialog()
+          })
+        } else { // 单个消警接口
+          const formData = {
+            id: this.formData.id,
+            jobStatus: this.formData.jobStatus, // 工单状态
+            handleMessage: this.formData.handleMessage // 原因
+          }
+          cancelAlarm(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 95a6853..24e3ded 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -44,6 +44,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>
@@ -59,6 +60,11 @@
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
+        <el-table-column v-if="hasPerm('/alarm/cancelAlarm')" 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>
     <!--分页-->
@@ -75,16 +81,18 @@
         @current-change="handleCurrentChange"/>
     </div>
     <info-well v-show="wellShow" ref="wellInfo"/>
+    <handle-prompt v-show="cancelShow" ref="handlePrompt"@watchChild="fetchData"/>
   </div>
 </template>
 
 <script>
 import infoWell from '@/views/wellManage/infoWell'
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
+import HandlePrompt from './components/HandlePrompt'
 
 export default {
   name: 'ListAlarmNow',
-  components: { infoWell },
+  components: { HandlePrompt, infoWell },
   data() {
     return {
       listQuery: {
@@ -169,7 +177,8 @@
       listLoading: true, // 加载动画
       fullscreenLoading: false, // 全屏加载动画
       wellShow: false, // 是否显示闸井详情
-      detailShow: false // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      cancelShow: false // 是否显示取消报警原因弹窗
     }
   },
   computed: {
@@ -212,6 +221,16 @@
     this.fetchData(false)
   },
   methods: {
+    // 取消报警
+    cancelAlarm(jobId) {
+      this.cancelShow = true
+      this.$refs.handlePrompt.initDialog(this.cancelShow, jobId, false)
+    },
+    // 取消报警,调用结束工单接口
+    batchCancel() {
+      this.cancelShow = true
+      this.$refs.handlePrompt.initDialog(this.cancelShow, '', true, this.listQuery)
+    },
     formatValue(row, column, cellValue) {
       if (cellValue === '') {
         return '--'