diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 49713f4..1490257 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -235,14 +235,14 @@ cancelAlarm(jobId) { this.cancelShow = true // setTimeout(function() { - this.$refs.handlePrompt.initDialog(true, jobId, false) + this.$refs.handlePrompt.initDialog(true, jobId, false) // }, 100) }, // 取消报警,调用结束工单接口 batchCancel() { this.cancelShow = true // setTimeout(function() { - this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery) + this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery) // }, 100) }, formatValue(cellValue) { diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue index 49713f4..1490257 100644 --- a/src/views/alarmManage/listAlarmNow.vue +++ b/src/views/alarmManage/listAlarmNow.vue @@ -235,14 +235,14 @@ cancelAlarm(jobId) { this.cancelShow = true // setTimeout(function() { - this.$refs.handlePrompt.initDialog(true, jobId, false) + this.$refs.handlePrompt.initDialog(true, jobId, false) // }, 100) }, // 取消报警,调用结束工单接口 batchCancel() { this.cancelShow = true // setTimeout(function() { - this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery) + this.$refs.handlePrompt.initDialog(true, '', true, this.listQuery) // }, 100) }, formatValue(cellValue) { diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue index 886ffc7..e1cc02d 100644 --- a/src/views/alarmManage/listAlarmRecords.vue +++ b/src/views/alarmManage/listAlarmRecords.vue @@ -201,8 +201,8 @@ next() }, mounted() { - 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 = '' @@ -217,8 +217,8 @@ 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 = ''