diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 0a1cae5..f9c6697 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -59,8 +59,8 @@
           </el-button>
         </el-col>
       </el-row>
-      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small" @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55" />
+      <el-table v-loading="listLoading" :data="list" :row-class-name="tableRowClassName" class="table" border size="small">
+        <!--        <el-table-column align="center" type="selection" width="55" />-->
         <el-table-column :index="indexMethod" align="center" type="index" label="序号" width="55" />
         <el-table-column label="点位编号" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -264,36 +264,15 @@
     handleSelectionChange(val) {
       this.multipleSelection = val
     },
-    // 检查选择情况
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
     // 批量消警,调用结束工单接口
     batchCancel() {
-      if (this.checkSelection()) {
-        const deviceIds = []
-        const deviceIndex = []
-        this.multipleSelection.forEach(function(value, index) {
-          deviceIds.push(value.id)
-          deviceIndex.push(index)
-        })
-        const jobId = deviceIds.toString()
-        this.cancelShow = true
-        this.$refs.handlePrompt.initDialog(true, jobId, false)
-      } else {
-        this.$message.error('至少选中一项')
-      }
+      this.cancelShow = true
+      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
     },
     // 取消报警
     cancelAlarm(id) {
       this.cancelShow = true
-      // setTimeout(function() {
       this.$refs.handlePrompt.initDialog(true, id, false)
-      // }, 100)
     },
     formatValue(cellValue) {
       if (cellValue === 1) {