From 5d7bd5bb192612cdfd64472fd9bca3e45a81e5c5 Mon Sep 17 00:00:00 2001 From: chenpingsen Date: Wed, 7 Aug 2024 09:27:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E6=96=B0=E9=A3=8E=E7=B3=BB=E7=BB=9F=20?= =?UTF-8?q?&=20=E9=80=9A=E9=A3=8E=E7=B3=BB=E7=BB=9F=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E8=8A=82/=E5=9B=BE=E5=83=8F=E7=B4=A0=E6=9D=90?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../airConditionControlSystem/dialogStyle.less | 7 +- .../airConditioningSystem/index.vue | 102 +- .../image/airConditioningSystem/airConditioner.png | Bin 2590 -> 0 bytes .../image/airConditioningSystem/airConditioner.svg | 44 + .../image/airConditioningSystem/floorHeating.png | Bin 2693 -> 0 bytes .../image/airConditioningSystem/floorHeating.svg | 39 + .../image/airConditioningSystem/freshAir.png | Bin 2710 -> 0 bytes .../image/airConditioningSystem/freshAir.svg | 42 + .../image/airConditioningSystem/people.png | Bin 2797 -> 0 bytes .../image/airConditioningSystem/people.svg | 39 + .../image/airConditioningSystem/temperature.png | Bin 2717 -> 0 bytes .../image/airConditioningSystem/temperature.svg | 39 + .../image/ventilationSystem/CO2.png | Bin 2469 -> 0 bytes .../image/ventilationSystem/CO2.svg | 42 + .../image/ventilationSystem/PM25.png | Bin 2491 -> 0 bytes .../image/ventilationSystem/PM25.svg | 42 + .../image/ventilationSystem/a1.svg | 44 + .../image/ventilationSystem/fanMachine.png | Bin 2351 -> 0 bytes .../image/ventilationSystem/fanMachine.svg | 41 + .../image/ventilationSystem/humidity.svg | 42 + .../image/ventilationSystem/ventilatingFan.png | Bin 2524 -> 0 bytes .../image/ventilationSystem/ventilatingFan.svg | 39 + .../image/ventilationSystem/window.png | Bin 2412 -> 0 bytes .../image/ventilationSystem/window.svg | 42 + .../lightingManage/dialogStyle.less | 7 +- .../equipmentControl/lightingManage/indexs1.vue | 2190 -------------------- .../equipmentControl/ventilationSystem/index.vue | 78 +- 27 files changed, 616 insertions(+), 2263 deletions(-) delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/airConditioner.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/airConditioner.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/floorHeating.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/floorHeating.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/freshAir.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/freshAir.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/people.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/people.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/temperature.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/airConditioningSystem/temperature.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/CO2.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/CO2.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/PM25.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/PM25.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/a1.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/fanMachine.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/fanMachine.svg create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/humidity.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/ventilatingFan.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/ventilatingFan.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/window.png create mode 100644 hx-ai-intelligent/src/view/equipmentControl/image/ventilationSystem/window.svg delete mode 100644 hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs1.vue diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/dialogStyle.less b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/dialogStyle.less index 382533c..3d550c5 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/dialogStyle.less +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditionControlSystem/dialogStyle.less @@ -45,7 +45,12 @@ border: 2px solid transparent; border-image: linear-gradient(to bottom, #0077ff, #00f6ff, #000000) 1; .title-img { - padding-top: 6px; + margin-top: 6px; + } + .title-text { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } } .imgText { diff --git a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue index 299f4cb..f66f48a 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue @@ -2,14 +2,13 @@