From a9e69984305b6aa8d3738a4b890cd5d9d1dd2b85 Mon Sep 17 00:00:00 2001 From: chenpingsen Date: Thu, 25 Jul 2024 14:14:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=94=B5=E6=A2=AF=E7=B3=BB=E7=BB=9F/?= =?UTF-8?q?=E7=85=A7=E6=98=8E=E7=B3=BB=E7=BB=9F=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/view/equipmentControl/liftSystem/index.vue | 68 +- .../view/equipmentControl/liftSystem/liftInfo.vue | 171 ++-- .../equipmentControl/lightingManage/indexs.vue | 450 +++++------ .../view/equipmentControl/lightingManage/light.vue | 239 +++--- .../view/equipmentControl/lightingManage/tabs1.vue | 891 +++++++++++---------- .../view/equipmentControl/lightingManage/tabs2.vue | 329 ++++---- .../view/equipmentControl/lightingManage/tabs3.vue | 330 ++++---- 7 files changed, 1242 insertions(+), 1236 deletions(-) diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue index b9b21c4..c6705cc 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue @@ -1,53 +1,47 @@ diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue index 3b63442..d6e50fd 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue @@ -10,7 +10,7 @@
- +
@@ -21,7 +21,7 @@
- +
@@ -32,7 +32,7 @@
- +
@@ -43,109 +43,104 @@ diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue index 1297d9d..e03748d 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/indexs.vue @@ -1,286 +1,276 @@ - - - \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue index c9f361a..1f941b4 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue @@ -1,59 +1,59 @@ - + - \ No newline at end of file diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue index 0ae9d57..a370239 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue @@ -5,15 +5,21 @@
照明区域 -
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue index ec1de0e..347920a 100644 --- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue +++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs3.vue @@ -9,7 +9,10 @@ - {{ row.key }} {{ row.data }} @@ -19,7 +22,7 @@ -
+
@@ -30,7 +33,11 @@
  - {{ item.name }} + {{ item.name }}
@@ -43,9 +50,7 @@
-
- 亮度 -
+
亮度
100lux @@ -53,9 +58,7 @@
-
- 控制场景 -
+
控制场景
手动 @@ -63,9 +66,7 @@
-
- 色温 -
+
色温
4000k @@ -76,7 +77,7 @@
-
+
@@ -87,169 +88,164 @@