From 1790db4595ee0b3a3a64f0ff8a8ed7221a3a8a7c Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Thu, 25 Jul 2024 15:42:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue | 4 ++-- .../alarmSettings/energyAlarm/editeEnergyAlarm.vue | 10 +++++----- .../alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue | 6 +++--- .../alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) 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 1d2e2e9..305c88d 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue @@ -267,8 +267,8 @@ }; //父调子 页面显示方法 const toggle = async (value: any, info: any) => { - let menu = await getEnum({ params: { enumType: 'LogicEnum' } }); - logicEnum.value = menu.data; + let enumData = await getEnum({ params: { enumType: 'LogicEnum' } }); + logicEnum.value = enumData.data; // 数据来源 let energyType = await dict({ params: { dicKey: 'ENERGY_TYPE' } }); if (energyType.data.data) { diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue index abedc99..9fc566c 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editeEnergyAlarm.vue @@ -163,7 +163,7 @@ monitorTimeUnit: [{ required: true, message: '请选择监测时长单位', trigger: 'change' }], }; const getMenu = async () => { - let menu = await getAllEnum({ + let enumData = await getAllEnum({ params: [ 'PriorityEnum', 'MonitorFrequencyEnumm', @@ -171,10 +171,10 @@ 'IntervalDurationUnitEnum', ], }); - PriorityEnum.value = menu.data.PriorityEnum; - MonitorFrequencyEnumm.value = menu.data.MonitorFrequencyEnumm; - AlarmFrequencyEnum.value = menu.data.AlarmFrequencyEnum; - intervalDurationUnitData.value = menu.data.IntervalDurationUnitEnum; + PriorityEnum.value = enumData.data.PriorityEnum; + MonitorFrequencyEnumm.value = enumData.data.MonitorFrequencyEnumm; + AlarmFrequencyEnum.value = enumData.data.AlarmFrequencyEnum; + intervalDurationUnitData.value = enumData.data.IntervalDurationUnitEnum; }; const toggle = (value: any) => { //获取枚举 回显 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 cad52e1..dfd3dd6 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue @@ -292,9 +292,9 @@ return null; // 没有找到目标节点,返回 null }; const getMenu = async () => { - let menu = await getAllEnum({ params: ['LogicEnum', 'ValueTypeEnum'] }); - logicEnum.value = menu.data.LogicEnum; - valueTypeEnum.value = menu.data.ValueTypeEnum; + let enumData = await getAllEnum({ params: ['LogicEnum', 'ValueTypeEnum'] }); + logicEnum.value = enumData.data.LogicEnum; + valueTypeEnum.value = enumData.data.ValueTypeEnum; }; //父调子 页面显示方法 const toggle = async (value: any, info: any) => { diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue index 24a2ce1..3f64da7 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue @@ -113,7 +113,7 @@ const IntervalDurationUnitEnum = ref([]); const PriorityEnum = ref([]); const getMenu = async () => { - let menu = await getAllEnum({ + let enumData = await getAllEnum({ params: [ 'PriorityEnum', 'MonitorTimeUnitEnum', @@ -121,10 +121,10 @@ 'IntervalDurationUnitEnum', ], }); - PriorityEnum.value = menu.data.PriorityEnum; - MonitorTimeUnitEnum.value = menu.data.MonitorTimeUnitEnum; - AlarmFrequencyEnum.value = menu.data.AlarmFrequencyEnum; - IntervalDurationUnitEnum.value = menu.data.IntervalDurationUnitEnum; + PriorityEnum.value = enumData.data.PriorityEnum; + MonitorTimeUnitEnum.value = enumData.data.MonitorTimeUnitEnum; + AlarmFrequencyEnum.value = enumData.data.AlarmFrequencyEnum; + IntervalDurationUnitEnum.value = enumData.data.IntervalDurationUnitEnum; }; const toggle = (value: any) => { //获取枚举 回显