1.修改生活热水、风机、温度系统的监测页面改动

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

@@ -204,7 +204,7 @@
               </el-option>
             </el-select>
           </div>
-          <!-- <div
+          <div
             class="context-li"
             v-if="isObjectValid(remoteManualObj) && startStopValue === 0"
           >
@@ -237,7 +237,7 @@
               :disabled="automaticObj.collectValue"
             >
             </el-switch>
-          </div> -->
+          </div>
           <div
             class="context-li"
             v-if="isObjectValid(openingBackObj)"
@@ -1851,7 +1851,7 @@ export default {
   }
   .fan-satatus3 {
     position: absolute;
-    top: 1.1rem;
+    top: 0.8rem;
     left: 6.4rem;
     display: flex;
     flex-direction: column;
@@ -2219,7 +2219,7 @@ export default {
   .windC {
     transform: scale(0.8);
     .fan-satatus3 {
-      top: 0.6rem !important;
+      top: 0.2rem !important;
     }
   }
 }

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

@@ -163,7 +163,7 @@
             <div class="noneStautus" v-if="automaticObj.collectValue">手动</div>
             <div class="goodStautus" v-else>自动</div>
           </div>
-          <!-- <div class="context-li" v-if="isObjectValid(startControlObj)">
+          <div class="context-li" v-if="isObjectValid(startControlObj)">
             <div class="wind-text">风机启停控制</div>
             <el-switch
               style="display: block"
@@ -176,7 +176,7 @@
               :disabled="automaticObj.collectValue"
             >
             </el-switch>
-          </div> -->
+          </div>
         </div>
         <div class="fan-satatus2">
           <div class="context-li" v-if="isObjectValid(waterSupplyObj)">

src/views/hotWater/waterControl/index.vue

@@ -277,7 +277,7 @@
                   <div class="white">次</div>
                 </div>
                 <div class="words-li">
-                  <div class="white">一次50分钟</div>
+                  <div class="white">一次{{ item.counterSet * 50 }}分钟</div>
                 </div>
               </div>
             </div>
@@ -682,7 +682,7 @@
                     item.alarmStatus
                   }}</el-tag>
                 </div>
-                <div class="words-li words-li4">
+                <!-- <div class="words-li words-li4">
                   <div class="ash">补水延时时间设定:</div>
                   <el-input
                     v-model="item.delayTimeSet"
@@ -700,7 +700,7 @@
                     size="mini"
                   ></el-input>
                   <div class="white">S</div>
-                </div>
+                </div> -->
               </div>
             </div>
           </div>

src/views/hotWater/waterMonitor/waterMonitorDetails.vue

@@ -104,12 +104,14 @@
             <img v-else src="../../../assets/images/flowimg/nomove.png" class="bigMove" alt="" /> -->
 
               <!-- 文字定位  -->
-              <div class="flow-text text1">供水泵1</div>
+              <div class="flow-text text1">{{ progressName1 }}供水泵1</div>
+              <div class="flow-text text6">{{ progressName1 }}供水泵2</div>
+              <div class="flow-text text9">{{ progressName2 }}供水泵1</div>
+              <div class="flow-text text10">{{ progressName2 }}供水泵2</div>
               <div class="flow-text text2">回水管</div>
               <div class="flow-text text3">无线网关</div>
               <div class="flow-text text4">回水阀</div>
               <div class="flow-text text5">房间</div>
-              <div class="flow-text text6">供水泵2</div>
               <div class="flow-text text7">循环加热泵</div>
               <div class="flow-text text8">补水阀</div>
               <!-- 补水阀定位 -->
@@ -128,7 +130,12 @@
               <!-- 供水定位 -->
               <img
                 class="supply"
-                v-if="this.upWaterState1 === '1' || this.upWaterState2 === '1'"
+                v-if="
+                  this.upWaterState1 === '1' ||
+                  this.upWaterState2 === '1' ||
+                  this.upWaterState3 === '1' ||
+                  this.upWaterState4 === '1'
+                "
                 src="../../../assets/flowimg/supply-move.gif"
                 alt=""
               />
@@ -179,26 +186,26 @@
               />
               <!-- 供水泵3定位 -->
               <img
-                class="waterpum"
-                v-if="this.upWaterState2 === '1'"
+                class="waterpum2"
+                v-if="this.upWaterState3 === '1'"
                 src="../../../assets/flowimg/startpum.png"
                 alt=""
               />
               <img
-                class="waterpum"
+                class="waterpum2"
                 v-else
                 src="../../../assets/flowimg/closepum.png"
                 alt=""
               />
               <!-- 供水泵4定位 -->
               <img
-                class="waterpum"
-                v-if="this.upWaterState2 === '1'"
+                class="waterpum3"
+                v-if="this.upWaterState4 === '1'"
                 src="../../../assets/flowimg/startpum.png"
                 alt=""
               />
               <img
-                class="waterpum"
+                class="waterpum3"
                 v-else
                 src="../../../assets/flowimg/closepum.png"
                 alt=""
@@ -541,18 +548,6 @@
                   <span>{{ row.waterLevel2 }} </span>
                 </template>
               </el-table-column>
-              <el-table-column prop="upWaterState1" label="供水泵1状态">
-                <template slot-scope="{ row }">
-                  <span v-if="row.upWaterState1 === '0'">不运行 </span>
-                  <span v-if="row.upWaterState1 === '1'">运行 </span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="upWaterState2" label="供水泵2状态">
-                <template slot-scope="{ row }">
-                  <span v-if="row.upWaterState2 === '0'">不运行 </span>
-                  <span v-if="row.upWaterState2 === '1'">运行 </span>
-                </template>
-              </el-table-column>
               <el-table-column prop="upWaterState" label="补水状态">
                 <template slot-scope="{ row }">
                   <span v-if="row.useWaterState === '0'">不运行 </span>
@@ -618,6 +613,8 @@ export default {
       useWaterState: "",
       upWaterState1: "", //供水泵1状态
       upWaterState2: "", //供水泵2状态
+      upWaterState3: "", //供水泵3状态
+      upWaterState4: "", //供水泵4状态
       backWaterState: "", //回水阀状态
       // 热泵状态 两个系数
       hotPumState: "",
@@ -942,6 +939,8 @@ export default {
       this.useWaterState = row.useWaterState;
       this.upWaterState1 = row.upWaterState1;
       this.upWaterState2 = row.upWaterState2;
+      this.upWaterState3 = row.upWaterState3;
+      this.upWaterState4 = row.upWaterState4;
       this.backWaterState = row.backWaterState;
       console.log("补水阀状态11111111111111111111", this.useWaterState);
     },
@@ -1286,8 +1285,8 @@ export default {
 
           .text1 {
             position: absolute;
-            top: 2.9rem;
-            left: 0.6rem;
+            top: 3.15rem;
+            left: 0.55rem;
             z-index: 1;
           }
 
@@ -1323,8 +1322,8 @@ export default {
 
           .text6 {
             position: absolute;
-            top: 4.27rem;
-            left: 0.6rem;
+            top: 4.3rem;
+            left: 0.55rem;
             z-index: 1;
           }
 
@@ -1340,6 +1339,18 @@ export default {
             left: 1.4rem;
             z-index: 1;
           }
+          .text9 {
+            position: absolute;
+            top: 5.4rem;
+            left: 0.55rem;
+            z-index: 1;
+          }
+          .text10 {
+            position: absolute;
+            top: 6.4rem;
+            left: 0.55rem;
+            z-index: 1;
+          }
 
           .replenish {
             position: absolute;
@@ -1368,20 +1379,34 @@ export default {
           }
 
           .coolpum {
-            width: 1rem;
-            height: 0.78rem;
+            width: 0.9rem;
+            height: 0.68rem;
             position: absolute;
-            top: 2rem;
-            left: 0.5rem;
+            top: 2.4rem;
+            left: 0.6rem;
             z-index: 2;
           }
 
           .waterpum {
-            width: 1rem;
-            height: 0.78rem;
+            width: 0.9rem;
+            height: 0.68rem;
+            position: absolute;
+            top: 3.55rem;
+            left: 0.6rem;
+          }
+          .waterpum2 {
+            width: 0.9rem;
+            height: 0.68rem;
             position: absolute;
-            top: 3.37rem;
-            left: 0.5rem;
+            top: 4.65rem;
+            left: 0.6rem;
+          }
+          .waterpum3 {
+            width: 0.9rem;
+            height: 0.68rem;
+            position: absolute;
+            top: 5.65rem;
+            left: 0.6rem;
           }
           .buwaterpum {
             width: 8.5rem;

src/views/temSys/temMonitor/temMonitorDeatils.vue

@@ -47,7 +47,7 @@
     <div class="app-container">
       <div class="left-tree">
         <!-- 为 el-tree 设置一个固定的高度和滚动条 -->
-        <div style="height: 5rem; overflow-y: auto">
+        <div style="height: 6rem; overflow-y: auto">
           <el-tree
             ref="tree"
             :data="treeData"