From aef40e64deadccfd116d5ba8935bea8b00b57e43 Mon Sep 17 00:00:00 2001
From: chenpingsen <chenpingsen>
Date: Wed, 14 Aug 2024 16:53:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=80=E4=BA=9B=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8E=E4=BA=A4=E4=BA=92=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/view/equipmentControl/liftSystem/index.vue             |  2 +-
 .../src/view/equipmentControl/liftSystem/liftInfo.vue          |  1 +
 .../src/view/equipmentControl/lightingManage/light.vue         | 10 +++++++---
 .../src/view/equipmentControl/lightingManage/tabs1.vue         |  5 +++++
 .../equipmentControl/ventilationSystem/components/boxModel.vue |  2 ++
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
index 22b2dc6..ae1058a 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/index.vue
@@ -152,7 +152,7 @@
     // 未知
     --unknown: #a742ff;
     // 触发图标大小
-    --size: 40px;
+    --size: 36px;
     width: 100%;
     height: 100%;
     position: relative;
diff --git a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
index 15b303f..f1456fc 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue
@@ -242,6 +242,7 @@
                   img {
                     width: 100%;
                     height: 100%;
+                    user-select: none;
                   }
                 }
               }
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
index b56265f..ca25fe1 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/light.vue
@@ -5,15 +5,19 @@
         <div class="light-tag-tit">
           <div>
             <img src="/asset/image//bulbLogo/21962.png" alt="" />
-            <span class="tag-text">{{ blub.regionName + ' > ' + blub.deviceGroupName }}</span>
-          </div>
+            <span class="tag-text">{{ blub.regionName + ' > ' + blub.deviceGroupName }}</span></div
+          >
           <button class="right-button">{{ blub.scene.label }}</button>
         </div>
         <div class="light-tag-box">
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
             <span class="title">控制模式</span>
-            <span class="result">{{ blub.mode.label }}</span>
+            <span class="result">{{
+              blub.mode.label.indexOf('模式') != -1
+                ? blub.mode.label.replace('模式', '')
+                : blub.mode.label
+            }}</span>
           </div>
           <div class="tag-box-item">
             <img src="/asset/image//bulbLogo/22496.png" alt="" />
diff --git a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
index 2f08647..be18826 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/lightingManage/tabs1.vue
@@ -791,6 +791,11 @@
       })
       .then((res) => {
         let data = res.data;
+        // 修改请求发送了，但操作时产生了失败结果
+        if (data.retcode != 0) {
+          // 直接提示并跳出
+          return message.warning(data.msg);
+        }
         // 所有修改均生效
         if (data.allSucceed) {
           message.success('修改完成');
diff --git a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue
index f71790a..a3fbfcf 100644
--- a/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/ventilationSystem/components/boxModel.vue
@@ -78,6 +78,7 @@
 </script>
 <style lang="less" scoped>
   .box-model {
+    position: relative;
     min-width: 162px;
     height: 110px;
     background: inherit;
@@ -87,6 +88,7 @@
     border-style: solid;
     border-color: rgba(13, 255, 255, 1);
     border-radius: 8px;
+    z-index: 99;
     .title {
       position: relative;
       padding-left: 9px;