From 4955c235ccb39dbac5520b34c21e3d4bfe07ce80 Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Thu, 18 Jul 2024 15:17:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentAlarm/configureDeviceAlarms.vue | 2 +- .../equipmentAlarm/editConfigureDeviceAlarm.vue | 4 +- .../notificationManagement/linkPeople/index.vue | 1 - .../alarmSettings/ts/energyAlarmConfig.ts | 9 ++- .../alarmSettings/ts/equipmentAlarmConfig.ts | 9 ++- .../view/alarmManagement/equipmentAlarm/look.vue | 8 +- .../view/alarmManagement/equipmentAlarm/status.vue | 87 +++++++++++----------- .../alarmManagement/equipmentAlarm/ts/config.ts | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue index 6f92f87..1b57ddd 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue @@ -215,7 +215,7 @@ pageNum: 1, pageSize: 99, }, - placeholder: '请选择设备点位', + placeholder: '请选择设备名称', resultField: 'data.records', labelField: 'deviceName', valueField: 'id', 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 f44bf69..f591179 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue @@ -196,8 +196,8 @@ }); }; //选择设备方法 - const selectDevice = (value: string) => { - console.log(`selected ${value}`); + const selectDevice = () => { + getDevicePoint({ id: infoObject.value.deviceName }); }; //获取设备列表 const getDevicePage = (value: any) => { 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 41ec61d..0f660ba 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 @@ -296,7 +296,6 @@ const expanded = dataList .map((item: TreeProps['treeData'][number]) => { if (item.title.indexOf(value) > -1) { - console.log(item.title.indexOf(value)); return getParentKey(item.key, deptTreeData.value); } return null; diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts index 5edbf31..75531f6 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/energyAlarmConfig.ts @@ -98,10 +98,11 @@ export const energyAlarmConfigs = ( name: 'energyAlarmEdit', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { - data.monitorFrequency = data.monitorFrequency.value; - data.priority = data.priority.value; - data.repetitions = data.repetitions.value; - editeEnergyAlarm.value.toggle(data); + const obj = { ...data }; + obj.monitorFrequency = data.monitorFrequency.value; + obj.priority = data.priority.value; + obj.repetitions = data.repetitions.value; + editeEnergyAlarm.value.toggle(obj); }, }, { diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts index 3848142..18530e1 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/ts/equipmentAlarmConfig.ts @@ -99,10 +99,11 @@ export const equipmentAlarmTableConfig = ( name: 'equipmentAlarmEdit', dynamicParams: ['uuid', 'appealType'], handle: (data: any) => { - data.priority = data.priority.value; - data.repetitions = data.repetitions.value; - data.monitorTimeUnit = data.monitorTimeUnit.value; - editEquipmentAlarm.value.toggle(data); + const obj = { ...data }; + obj.priority = data.priority.value; + obj.repetitions = data.repetitions.value; + obj.monitorTimeUnit = data.monitorTimeUnit.value; + editEquipmentAlarm.value.toggle(obj); }, }, { diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue index baeb5df..8aea66b 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue @@ -17,14 +17,14 @@ display: flex; position: relative; font-size: 16px; - border-bottom: 1px solid rgb(255, 118, 2); /* 设置底部边框为1像素实线，并指定颜色 */ + border-bottom: 1px solid #2778ff; /* 设置底部边框为1像素实线，并指定颜色 */ ">
告警编号：20230310001
- 15点08分 + 2024-03-10 15:08:10
@@ -38,7 +38,7 @@ 新告警 C003
用电量超标
当日用电量超出预设值
用电量超标
当日用电量超出预设值 1栋10层低压柜 0 @@ -233,7 +233,7 @@ top: 0px; width: 5px; height: 35px; - background-color: rgb(254, 118, 2); + background-color: #2778ff; } :deep(.ant-descriptions-item-label) { width: 25%; diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue index 9ec1b01..499db32 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue @@ -1,7 +1,7 @@