diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 49713f4..1192b63 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -234,16 +234,12 @@
     // 取消报警
     cancelAlarm(jobId) {
       this.cancelShow = true
-      // setTimeout(function() {
-        this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+      this.$refs.handlePrompt.initDialog(true, jobId, false)
     },
     // 取消报警,调用结束工单接口
     batchCancel() {
       this.cancelShow = true
-      // setTimeout(function() {
-        this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
-      // }, 100)
+      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
     },
     formatValue(cellValue) {
       if (cellValue === 1) {

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 49713f4..1192b63 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -234,16 +234,12 @@
     // 取消报警
     cancelAlarm(jobId) {
       this.cancelShow = true
-      // setTimeout(function() {
-        this.$refs.handlePrompt.initDialog(true, jobId, false)
-      // }, 100)
+      this.$refs.handlePrompt.initDialog(true, jobId, false)
     },
     // 取消报警,调用结束工单接口
     batchCancel() {
       this.cancelShow = true
-      // setTimeout(function() {
-        this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
-      // }, 100)
+      this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery)
     },
     formatValue(cellValue) {
       if (cellValue === 1) {
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 886ffc7..e7cc94e 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -215,10 +215,9 @@
     }
   },
   activated() {
-    console.log('alarmRecored actived')
     if (!isFromDetail) {
-      if (this.$route.窨井 && this.$route.窨井.wellCode) {
-        this.listQuery.keywords = this.$route.窨井.wellCode
+      if (this.$route.query && this.$route.query.wellCode) {
+        this.listQuery.keywords = this.$route.query.wellCode
         this.fetchData(false)
       } else {
         this.listQuery.keywords = ''