diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue index 2c50eb6..2043200 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue @@ -316,6 +316,15 @@ delete infoObject.value.dataSourcesWay; infoObject.value.comparisonType = infoObject.value.comparisonType.split(','); infoObject.value.ruleType = infoObject.value.ruleType + ''; + //枚举 需要重新赋值 + if ( + infoObject.value.hxAlarmRuleLogicList && + infoObject.value.hxAlarmRuleLogicList.length > 0 + ) { + infoObject.value.hxAlarmRuleLogicList.forEach((item: any) => { + item.logic = item.logic.value; + }); + } infoObject.value.alarmList = infoObject.value.hxAlarmRuleLogicList || []; delete infoObject.value.hxAlarmRuleLogicList; //获取设备/节点 diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue index bf0395f..39920f9 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue @@ -320,6 +320,15 @@ getDevicePoint({ id: infoObject.value.deviceName }); // 回显 选择设备类型 findParentIds(deviceTypeTreeData.value, infoObject.value.deviceType, selectDevice.value); + //枚举 需要重新赋值 + if ( + infoObject.value.hxAlarmRuleLogicList && + infoObject.value.hxAlarmRuleLogicList.length > 0 + ) { + infoObject.value.hxAlarmRuleLogicList.forEach((item: any) => { + item.logic = item.logic.value; + }); + } infoObject.value.alarmList = infoObject.value.hxAlarmRuleLogicList || []; delete infoObject.value.hxAlarmRuleLogicList; infoObject.value.deviceType = selectDevice; diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue index 4e6498d..dfa6878 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue @@ -7,7 +7,7 @@ @ok="handleOk" @cancel="handleCancel">
-
+
2
+
+
+
+ 人员列表 +
+