From 67a76481cc01adf052385dc0c1152554c33d5701 Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Wed, 31 Jul 2024 15:13:37 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E9=A3=8E=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../energyAlarm/editConfigureEnergyAlarm.vue | 1 - .../equipmentAlarm/editConfigureDeviceAlarm.vue | 1 - .../equipmentAlarm/editeEquipmentAlarm.vue | 1 - .../components/conditioningModel.vue | 149 +++++++++++++++ .../components/newTrendModel.vue | 149 +++++++++++++++ .../airConditioningSystem/index.vue | 210 ++++++++++++++++++--- .../components/doubleSingleModel.vue | 116 ++++++++++++ .../equipmentControl/components/singleModel.vue | 2 +- .../airConditioningSystem/conditioningIcon.png | Bin 0 -> 4363 bytes .../image/airConditioningSystem/electricFan.png | Bin 0 -> 8143 bytes .../airConditioningSystem/newTrendModelBg.png | Bin 0 -> 9314 bytes .../airConditioningSystem/newTrendModelIcon.png | Bin 0 -> 2625 bytes .../image/airConditioningSystem/sunBlue.png | Bin 0 -> 2767 bytes .../image/airConditioningSystem/sunRed.png | Bin 0 -> 8681 bytes .../image/airConditioningSystem/sunYellow.png | Bin 0 -> 8606 bytes .../airConditioningSystem/temperature-box.png | Bin 8681 -> 0 bytes 16 files changed, 604 insertions(+), 25 deletions(-) create mode 100644 hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue create mode 100644 hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/newTrendModel.vue create mode 100644 hx-ai-intelligent/src/view/equipmentControl/components/doubleSingleModel.vue create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/conditioningIcon.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/electricFan.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/newTrendModelBg.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/newTrendModelIcon.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/sunBlue.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/sunRed.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/sunYellow.png delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/temperature-box.png 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 04e5d8a..3d6275b 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue @@ -25,7 +25,6 @@ label: 'orgName', value: 'orgId', }" - :disabled="true" tree-node-filter-prop="orgName" /> 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 addb5bc..59e66ea 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue @@ -25,7 +25,6 @@ value: 'orgId', }" :tree-data="siteDataTree" - :disabled="true" tree-node-filter-prop="orgName" /> 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 3f64da7..773f6ac 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editeEquipmentAlarm.vue @@ -345,4 +345,3 @@ width: 23%; } -../../../../api/alarmManagement/alarmSettings/deviceAlarms diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue new file mode 100644 index 0000000..3fb8bdb --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/conditioningModel.vue @@ -0,0 +1,149 @@ + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/newTrendModel.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/newTrendModel.vue new file mode 100644 index 0000000..690bbe0 --- /dev/null +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/components/newTrendModel.vue @@ -0,0 +1,149 @@ + + + diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue index 8840fc7..a02352c 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue @@ -1,5 +1,5 @@