Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

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;

hx-ai-intelligent/src/view/equipmentControl/liftSystem/liftInfo.vue

@@ -242,6 +242,7 @@
                   img {
                     width: 100%;
                     height: 100%;
+                    user-select: none;
                   }
                 }
               }

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>
+            <span class="tag-text">{{ blub.regionName + ' > ' + blub.deviceGroupName }}</span></div
-          </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="" />

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('修改完成');

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;