1.修改风柜监测系统样式、loading问题

2.修改生活热水手机端样式

src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="monitor" v-loading="loading">
+  <div class="monitor">
     <div class="monitor-top">
       <img
         class="title-left"
@@ -101,7 +101,6 @@ export default {
   name: "asSysMonitorDetails",
   data() {
     return {
-      loading: false,
       currentDate: new Date(),
       nowTimer: null,
       isShowWarning: false, //是否有报警

src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue

@@ -117,6 +117,7 @@
           <el-form @submit.native.prevent>
             <el-form-item>
               <el-input
+                style="width: 1.2rem"
                 @keyup.enter.native="handleEnter(damperOneObj, $event, '%')"
                 @input="handleInput(damperOneObj)"
                 @blur="handleBlur()"
@@ -139,6 +140,7 @@
           <el-form @submit.native.prevent>
             <el-form-item>
               <el-input
+                style="width: 1.2rem"
                 @keyup.enter.native="handleEnter(damperTwoObj, $event, '%')"
                 @input="handleInput(damperTwoObj)"
                 @blur="handleBlur()"
@@ -161,6 +163,7 @@
           <el-form @submit.native.prevent>
             <el-form-item>
               <el-input
+                style="width: 1.2rem"
                 @keyup.enter.native="handleEnter(damperTwoObj, $event, '%')"
                 @input="handleInput(damperTwoObj)"
                 @blur="handleBlur()"
@@ -214,6 +217,7 @@
               active-text="开启"
               inactive-text="停止"
               @change="handleControlText(remoteManualObj)"
+              :disabled="automaticObj.collectValue"
             >
             </el-switch>
           </div>
@@ -230,6 +234,7 @@
               active-text="开启"
               inactive-text="停止"
               @change="handleControlText(timeScheduleObj)"
+              :disabled="automaticObj.collectValue"
             >
             </el-switch>
           </div>
@@ -276,8 +281,8 @@
         <div class="fan-satatus1">
           <div class="context-li" v-if="isObjectValid(automaticObj)">
             <div class="wind-text">风机手自动状态:</div>
-            <div class="goodStautus" v-if="automaticObj.collectValue">手动</div>
+            <div class="noneStautus" v-if="automaticObj.collectValue">手动</div>
-            <div class="noneStautus" v-else>自动</div>
+            <div class="goodStautus" v-else>自动</div>
           </div>
           <!-- <div class="context-li" v-if="isObjectValid(startControlObj)">
             <div class="wind-text">风机启停控制</div>
@@ -1160,22 +1165,21 @@ export default {
             this.loading = true;
             // 更新所有设备状态;
             setTimeout(() => {
-              this.getWindList().finally(() => {
+              this.getWindList(this.currentId);
               // 关闭 loading 效果
               this.loading = false;
-              });
             }, 5000);
           } else {
             // this.$modal.msgError("操作失败");
             console.log("应该更新状态的");
             // 更新所有设备状态;
-            this.getWindList();
+            this.getWindList(this.currentId);
           }
         })
         .catch((error) => {
           console.log("请求发生错误，更新设备状态", error);
           // 更新所有设备状态;
-          this.getWindList();
+          this.getWindList(this.currentId);
         });
     },
     // 打开定时开关弹框
@@ -1362,10 +1366,9 @@ export default {
             this.loading = true;
             // 更新所有设备状态;
             setTimeout(() => {
-              this.getPolicyList().finally(() => {
+              this.getPolicyList();
               // 关闭 loading 效果
               this.loading = false;
-              });
             }, 500);
           } else {
             // this.$modal.msgError("操作失败");
@@ -1639,10 +1642,10 @@ export default {
   }
   .wind-tem2 {
     z-index: 10;
-    width: 3.7rem;
+    // width: 3.8rem;
     position: absolute;
     top: 2.2rem;
-    right: -1.1rem;
+    left: 10.55rem;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -1658,10 +1661,10 @@ export default {
   }
   .wind-tem3 {
     z-index: 10;
-    width: 3.47rem;
+    // width: 3.57rem;
     position: absolute;
     top: 4.1rem;
-    right: -0.9rem;
+    left: 10.55rem;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -1677,10 +1680,10 @@ export default {
   }
   .wind-tem4 {
     z-index: 10;
-    width: 3.47rem;
+    // width: 3.57rem;
     position: absolute;
     top: 5.9rem;
-    right: -0.9rem;
+    left: 10.55rem;
     display: flex;
     flex-direction: row;
     align-items: center;

src/views/aircAndWindc/awSysMonitor/components/normalMonitor.vue

@@ -166,6 +166,7 @@
               active-text="开启"
               inactive-text="停止"
               @change="handleControlText(startControlObj)"
+              :disabled="automaticObj.collectValue"
             >
             </el-switch>
           </div>
@@ -694,26 +695,25 @@ export default {
         .then((res) => {
           if (res.code == 200) {
             this.$modal.msgSuccess("指令下发成功!");
-            // 开启 loading 效果
+            // // 开启 loading 效果
-            this.loading = true;
+            // this.loading = true;
             // 更新所有设备状态;
             setTimeout(() => {
-              this.getWindList().finally(() => {
+              this.getWindList(this.currentId);
-                // 关闭 loading 效果
-                this.loading = false;
-              });
             }, 5000);
+            // // 关闭 loading 效果
+            // this.loading = false;
           } else {
             // this.$modal.msgError("操作失败");
             console.log("应该更新状态的");
             // 更新所有设备状态;
-            this.getWindList();
+            this.getWindList(this.currentId);
           }
         })
         .catch((error) => {
           console.log("请求发生错误，更新设备状态", error);
           // 更新所有设备状态;
-          this.getWindList();
+          this.getWindList(this.currentId);
         });
     },
     // 打开定时开关弹框
@@ -900,10 +900,9 @@ export default {
             this.loading = true;
             // 更新所有设备状态;
             setTimeout(() => {
-              this.getPolicyList().finally(() => {
+              this.getPolicyList();
               // 关闭 loading 效果
               this.loading = false;
-              });
             }, 500);
           } else {
             // this.$modal.msgError("操作失败");

src/views/hotWater/waterMonitor/waterMonitorDetails.vue

@@ -740,7 +740,7 @@ export default {
       this.$router.push("/alarm/alarmRecord");
     },
     getImageSrc(item) {
-      console.log("item", item);
+      // console.log("item", item);
       if (item.runState === "1" && item.isFault !== "1") {
         // 使用 require 函数导入图片
         return require("@/assets/flowimg/starthotpum.png");
@@ -1959,6 +1959,61 @@ export default {
     }
   }
 }
+// 手机端样式
+@media (min-width: 0px) and (max-width: 990px) {
+  .buildingDiv {
+    padding-left: 0.54rem !important;
+    margin-bottom: 0.2rem !important;
+    .title-bg {
+      width: 2.08rem !important;
+      height: 0.38rem !important;
+    }
+    .title-word {
+      font-size: 15px !important;
+    }
+  }
+  .app-container .left-tree .base-mes {
+    padding: 0.2rem 0.1rem !important;
+    font-size: 14px !important;
+    border-radius: 0.06rem !important;
+  }
+  .app-container .left-tree .base-mes .base-title {
+    font-size: 15px !important;
+  }
+  .app-container .left-tree .base-mes .base-height {
+    height: 5.7rem !important;
+  }
+  .app-container .right-monitor .folw .changecontent .tablemaeta {
+    font-size: 14px !important;
+  }
+  .app-container {
+    padding: 0rem 0.2rem 0 0.35rem !important;
+  }
+  .app-container .left-tree {
+    width: 200px !important;
+    min-height: 340px !important;
+    padding: 0.15rem 0.1rem 0.1rem 0.1rem !important;
+  }
+  .app-container .tree-div {
+    height: 300px !important;
+    width: 100%;
+    overflow-x: hidden !important;
+  }
+  .app-container .right-monitor {
+    width: calc(100% - 210px) !important;
+    .folw {
+      .changecontent {
+        border-radius: 0.06rem !important;
+        height: 300px !important;
+        padding: 0.35rem 0.1rem 0.1rem 0.1rem !important;
+        margin-top: 0.4rem !important;
+      }
+    }
+  }
+  .custom-tree-node {
+    font-size: 12px !important;
+  }
+}
 </style>
 <style scoped>
 /* 自定义高亮颜色 */
@@ -1970,4 +2025,10 @@ export default {
   /* color: #f56c6c;  */
   color: #25f1f8;
 }
+/* 手机端样式 */
+@media (min-width: 0px) and (max-width: 990px) {
+  .left-tree >>> .el-tree-node__content > .el-tree-node__expand-icon {
+    padding: 3px !important;
+  }
+}
 </style>