diff --git a/src/api/alarm.js b/src/api/alarm.js
index 37f7c3e..5e3222e 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -54,7 +54,7 @@
 // 取消报警
 export function cancelAlarm(params) {
   return request({
-    url: 'alarm/cancelAlarm',
+    url: 'alarm/cancelAlarmById',
     method: 'post',
     params
   })
@@ -63,7 +63,7 @@
 // 批量删除告警
 export function batchCancel(params) {
   return request({
-    url: 'alarm/batchCancel',
+    url: 'alarm/batchCancelAlarm',
     method: 'post',
     params
   })

diff --git a/src/api/alarm.js b/src/api/alarm.js
index 37f7c3e..5e3222e 100644
--- a/src/api/alarm.js
+++ b/src/api/alarm.js
@@ -54,7 +54,7 @@
 // 取消报警
 export function cancelAlarm(params) {
   return request({
-    url: 'alarm/cancelAlarm',
+    url: 'alarm/cancelAlarmById',
     method: 'post',
     params
   })
@@ -63,7 +63,7 @@
 // 批量删除告警
 export function batchCancel(params) {
   return request({
-    url: 'alarm/batchCancel',
+    url: 'alarm/batchCancelAlarm',
     method: 'post',
     params
   })
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 5736775..96d7e6b 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -75,7 +75,7 @@
         </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>
+            <el-button type="danger" size="small" @click="cancelAlarm(scope.row.id)">取消报警</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -101,6 +101,7 @@
 <script>
 import infoWell from '@/views/wellManage/infoWell'
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
+import { batchCancel, cancelAlarm } from '@/api/alarm'
 import HandlePrompt from './components/HandlePrompt'
 import { isOperation } from '@/utils/permission'
 import { dateToString, getLastWeek } from '@/utils/formatDate'
@@ -249,18 +250,41 @@
   },
   methods: {
     // 取消报警
-    cancelAlarm(jobId) {
+    cancelAlarm(id) {
       this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+      this.$confirm(
+        '确定要取消报警吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+          const formData = {alarmId: id}
+          // console.log(formData)
+          cancelAlarm(formData).then(response => {
+            this.$message.success('取消报警成功')
+          })
+      })
     },
     // 取消报警,调用结束工单接口
     batchCancel() {
       this.cancelShow = true
-      // setTimeout(function() {
-      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
-      // }, 100)
+      this.$confirm(
+        '确定要取消报警吗？',
+        '确认操作',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      ).then(() => {
+        // console.log(this.listQuery)
+        batchCancel(this.listQuery).then(res => {
+          this.$message.success('批量消警成功')
+        })
+      })
     },
     formatValue(cellValue) {
       if (cellValue === 1) {