This commit is contained in:
joylink_zhaoerwei 2023-08-25 08:59:18 +08:00
parent 3fbc2f20f0
commit e388069ff1
3 changed files with 5 additions and 2 deletions

View File

@ -132,9 +132,11 @@ onMounted(() => {
messageUse = lineNetStore.alarmInfo[0] as AlarmInfo; messageUse = lineNetStore.alarmInfo[0] as AlarmInfo;
} else { } else {
messageUse = props.alarmMeaasge as AlarmInfo; messageUse = props.alarmMeaasge as AlarmInfo;
if (messageUse.alarmStatus == 1 || messageUse.alarmStatus == 0) { if (messageUse.alarmStatus == 1) {
showConfirmMmessage.value = false; showConfirmMmessage.value = false;
searchById(); searchById();
} else if (messageUse.alarmStatus == 0) {
showConfirmMmessage.value = false;
} }
} }
updata(); updata();

View File

@ -185,6 +185,7 @@ function openAlarmDialog(row: any) {
row.line_id = row.lineId; row.line_id = row.lineId;
row.alert_object = row.alertObject; row.alert_object = row.alertObject;
row.alert_tip_id = row.alertTipId; row.alert_tip_id = row.alertTipId;
row.alert_location_id = row.alertLocationId;
dialogInstance.value = $q.dialog({ dialogInstance.value = $q.dialog({
component: alarmInfoDialog, component: alarmInfoDialog,
componentProps: { componentProps: {

View File

@ -151,7 +151,7 @@ watch(
if ( if (
g.type == Station.Type && g.type == Station.Type &&
rangeConfig.deviceType == Station.Type && rangeConfig.deviceType == Station.Type &&
(g as Station).datas.hasControl (g as Station).datas.concentrationStations
) { ) {
select = true; select = true;
} }