xuziqiang/SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

Browse Source
This commit is contained in:
xuziqiang
2024-07-15 17:15:59 +08:00
parent dac2e095e1 c68dc4deb7
commit ef20fa58de
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
View File

@@ -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
View File

@@ -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
View File

@@ -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>