Browse Source

fix:换成枚举

temp
zhaohy 4 months ago
parent
commit
0e9743f598
  1. 9
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
  2. 9
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
  3. 24
      hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue

9
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;
///

9
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;

24
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue

@ -7,7 +7,7 @@
@ok="handleOk"
@cancel="handleCancel">
<div style="width: 100%; height: 480px; display: flex">
<div style="width: 300px; height: 100%; overflow-y: auto; padding: 0px, 12px">
<div style="width: 300px; height: 100%; overflow-y: auto; padding: 0, 12px; gap: 5px">
<div style="width: 100%; display: flex; position: relative">
<div
style="
@ -52,7 +52,27 @@
</template>
</a-tree>
</div>
<div style="width: calc(100% - 200px); height: 100%; padding: 12px"> 2</div>
<div style="width: calc(100% - 200px); height: 100%; padding: 0, 24px; overflow-y: auto">
<div style="width: 100%; display: flex; position: relative">
<div
style="
border-width: 0px;
position: absolute;
left: 0px;
top: 5px;
width: 5px;
height: 15px;
background: inherit;
background-color: rgba(251, 156, 67, 1);
border: none;
border-radius: 5px;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
"></div>
<span style="margin-left: 24px; color: #333333">人员列表</span>
</div>
</div>
</div>
</a-modal>
</template>

Loading…
Cancel
Save