diff --git a/src/components/alarm/alarmInfoDialog.vue b/src/components/alarm/alarmInfoDialog.vue index 80f0c41..d06a625 100644 --- a/src/components/alarm/alarmInfoDialog.vue +++ b/src/components/alarm/alarmInfoDialog.vue @@ -132,9 +132,11 @@ onMounted(() => { messageUse = lineNetStore.alarmInfo[0] as AlarmInfo; } else { messageUse = props.alarmMeaasge as AlarmInfo; - if (messageUse.alarmStatus == 1 || messageUse.alarmStatus == 0) { + if (messageUse.alarmStatus == 1) { showConfirmMmessage.value = false; searchById(); + } else if (messageUse.alarmStatus == 0) { + showConfirmMmessage.value = false; } } updata(); diff --git a/src/components/alarm/alarmInfoList.vue b/src/components/alarm/alarmInfoList.vue index 8bcc5db..0eae12f 100644 --- a/src/components/alarm/alarmInfoList.vue +++ b/src/components/alarm/alarmInfoList.vue @@ -185,6 +185,7 @@ function openAlarmDialog(row: any) { row.line_id = row.lineId; row.alert_object = row.alertObject; row.alert_tip_id = row.alertTipId; + row.alert_location_id = row.alertLocationId; dialogInstance.value = $q.dialog({ component: alarmInfoDialog, componentProps: { diff --git a/src/components/rangeConfig.vue b/src/components/rangeConfig.vue index 9586259..be0a7b9 100644 --- a/src/components/rangeConfig.vue +++ b/src/components/rangeConfig.vue @@ -151,7 +151,7 @@ watch( if ( g.type == Station.Type && rangeConfig.deviceType == Station.Type && - (g as Station).datas.hasControl + (g as Station).datas.concentrationStations ) { select = true; }