1.ps修改生活热水-实时监控的动态图，修改添加供水泵1、供水泵2、补水状态、回水状态、热泵等状态

2.生活热水-控制界面添加裙楼回水阀信息，修改供水泵运行状态
3.空调风柜监控系统-系统监控页面回风温度可修改

src/views/aircAndWindc/awSysMonitor/index.vue

@@ -125,7 +125,6 @@
               @keyup.enter.native="handleEnter(backAirObj, $event, '℃')"
               @input="handleInput(backAirObj)"
               @blur="handleBlur()"
-              disabled
               v-model="backAirObj.collectValue"
               size="mini"
             >
@@ -218,7 +217,6 @@
                 @keyup.enter.native="handleEnter(backwaterObj, $event, '℃')"
                 @input="handleInput(backwaterObj)"
                 @blur="handleBlur()"
-                disabled
                 v-model="backwaterObj.collectValue"
                 size="mini"
               >

src/views/centerairC/sysMonitor/hostDetails.vue

@@ -132,7 +132,7 @@
           </div>
           <div class="hostStatus-li">
             <span>故障状态:</span>
-            <span class="goodData" v-if="badObj.showValue === '未故障'">{{
+            <span class="goodData" v-if="badObj.showValue === '正常'">{{
               badObj.showValue
             }}</span>
             <span class="badData" v-else>{{ badObj.showValue }}</span>
@@ -393,8 +393,7 @@ export default {
                   this.automaticObj = item;
                 } else if (item.paramType === "5") {
                   // 故障状态
-                  item.showValue =
+                  item.showValue = item.curValue;
-                    Number(item.curValue) === 0 ? "未故障" : "故障";
                   this.badObj = item;
                 } else if (item.paramType === "22") {
                   // 本地远程

src/views/components/waterTank.vue

@@ -46,9 +46,9 @@ export default {
 }
 .water {
   position: absolute;
-  bottom: 0;
+  bottom: 0.05rem;
-  left: 0;
+  left: 0.03rem;
-  width: 100%;
+  width: 1.13rem;
   /* 修改颜色表示，添加透明度 */
   background-color: rgba(23, 106, 201);
   overflow: hidden;
@@ -82,7 +82,7 @@ export default {
   }
 }
 
-@media (min-width: 720px) and (max-width: 1240px){
+@media (min-width: 720px) and (max-width: 1240px) {
   .monitor-container {
     width: 100px !important;
     height: 100px !important;

src/views/hotWater/waterControl/index.vue

@@ -129,7 +129,9 @@
                 />
                 <div class="monitor-words">
                   <div class="words-li">
-                    <div class="ash" style="letter-spacing: 5px;">频率手自动:</div>
+                    <div class="ash" style="letter-spacing: 5px">
+                      频率手自动:
+                    </div>
                     <div class="white">
                       <el-switch
                         style="display: block"
@@ -143,7 +145,9 @@
                     </div>
                   </div>
                   <div class="words-li">
-                    <div class="ash" style="letter-spacing: 7px;">启停&nbsp;控制:</div>
+                    <div class="ash" style="letter-spacing: 7px">
+                      启停&nbsp;控制:
+                    </div>
                     <div class="white">
                       <el-switch
                         style="display: block"
@@ -268,6 +272,80 @@
                 </div>
               </div>
             </div>
+            <!-- 裙楼供水泵、高区供水泵、中厨回水泵 -->
+            <div class="monitor-flex-left" v-if="activeName.includes('回水')">
+              <div class="control-top">
+                <img
+                  class="monitor-img2"
+                  src="../../../assets/images/startpum.png"
+                />
+                <div class="monitor-words">
+                  <div class="words-li">
+                    <div class="ash">回水温度:</div>
+                    <div class="white">{{ item.temp }}℃</div>
+                  </div>
+                  <div class="words-li">
+                    <div class="ash">回水温度设置:</div>
+                    <el-input
+                      v-model="item.tempSet"
+                      @keyup.enter.native="
+                        handleEnter(
+                          item,
+                          item.tempSet,
+                          item.tempSetId,
+                          '回水温度',
+                          '℃'
+                        )
+                      "
+                      @input="handleInput(item)"
+                      @blur="handleBlur()"
+                      size="mini"
+                    ></el-input>
+                    <div class="white">℃</div>
+                  </div>
+                </div>
+              </div>
+              <div class="monitor-words" style="margin-top: 20px">
+                <div class="words-li">
+                  <div class="ash">回水温度设定差值:</div>
+                  <el-input
+                    v-model="item.diffValueSet"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.diffValueSet,
+                        item.diffValueSetId,
+                        '回水温度设定差值',
+                        '℃'
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                    size="mini"
+                  ></el-input>
+                  <div class="white">℃</div>
+                </div>
+                <div class="words-li">
+                  <div class="ash">回水温度设定延时时间:</div>
+                  <el-input
+                    v-model="item.delayTimeSet"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.delayTimeSet,
+                        item.delayTimeSetId,
+                        '回水温度设定延时时间',
+                        'S'
+                      )
+                    "
+                    @input="handleInput(item)"
+                    @blur="handleBlur()"
+                    size="mini"
+                  ></el-input>
+                  <div class="white">S</div>
+                </div>
+              </div>
+            </div>
             <!-- 水箱 -->
             <div class="monitor-flex-left" v-if="activeName.includes('水箱')">
               <div class="control-top">
@@ -313,7 +391,7 @@
                   ></el-input>
                   <div class="white">%</div>
                 </div>
-                <div class="words-li words-li5">
+                <div class="words-li words-li6">
                   <div class="ash">液位设定延时时间:</div>
                   <el-input
                     size="mini"
@@ -332,7 +410,7 @@
                   ></el-input>
                   <div class="white">min</div>
                 </div>
-                <div class="words-li words-li5">
+                <div class="words-li words-li2">
                   <div class="ash ash2">液位误差值:</div>
                   <el-input
                     size="mini"
@@ -374,7 +452,7 @@
                 />
                 <div class="monitor-words">
                   <div class="words-li">
-                    <div class="ash" style="letter-spacing: 8px;">一键启动:</div>
+                    <div class="ash" style="letter-spacing: 8px">一键启动:</div>
                     <div class="white">
                       <el-switch
                         style="display: block"
@@ -669,7 +747,7 @@ export default {
             let deviceItem = {
               ...item,
               waterLevel: Number(item.waterLevel),
-              runningStatus: Number(item.switchStatus) == 0 ? "运行" : "停止", //运行状态
+              runningStatus: Number(item.runningStatus) == 0 ? "停止" : "运行", //运行状态
               switchStatus: Number(item.switchStatus) == 0 ? false : true, //启停控制
               alarmStatus: Number(item.alarmStatus) == 0 ? "无故障" : "故障", //故障状态
               handAutomaticSwitch:
@@ -1217,6 +1295,12 @@ export default {
                 width: 100px;
               }
             }
+            .words-li6 {
+              width: 70%;
+              .ash2 {
+                width: 100px;
+              }
+            }
           }
           .sigClass {
             width: 40%;

src/views/hotWater/waterMonitor/index.vue

@@ -55,17 +55,18 @@
             <img v-else src="../../../assets/images/flowimg/nomove.png" class="bigMove" alt="" /> -->
 
             <!-- 文字定位  -->
-            <div class="flow-text text1">冷水泵</div>
+            <div class="flow-text text1">供水泵1</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 text5">房间</div>
-            <div class="flow-text text6">热水供水泵</div>
+            <div class="flow-text text6">供水泵2</div>
             <div class="flow-text text7">循环加热泵</div>
-            <!-- 补水定位 -->
+            <div class="flow-text text8">补水阀</div>
+            <!-- 补水阀定位 -->
             <img
               class="replenish"
-              v-if="this.coolpumstate === '运行'"
+              v-if="this.useWaterState === '1'"
               src="../../../assets/flowimg/replenish-move.gif"
               alt=""
             />
@@ -78,7 +79,7 @@
             <!-- 供水定位 -->
             <img
               class="supply"
-              v-if="this.waterpumstate === '运行'"
+              v-if="this.upWaterState1 === '1' || this.upWaterState2 === '1'"
               src="../../../assets/flowimg/supply-move.gif"
               alt=""
             />
@@ -91,7 +92,7 @@
             <!-- 加热定位 -->
             <img
               class="circulate"
-              v-if="this.hotpumstate === '运行' && this.isBad"
+              v-if="this.hotPumState === '1' && this.isBad !== '1'"
               src="../../../assets/flowimg/circulate-move.gif"
               alt=""
             />
@@ -101,54 +102,49 @@
               src="../../../assets/flowimg/circulate-nomove.png"
               alt=""
             />
-            <!-- 冷水泵定位 -->
+            <!-- 供水泵1定位 -->
             <img
               class="coolpum"
-              v-if="this.coolpumstate === ''"
+              v-if="this.upWaterState1 === '1'"
-              src="../../../assets/flowimg/closepum.png"
+              src="../../../assets/flowimg/startpum.png"
               alt=""
             />
             <img
               class="coolpum"
-              v-else-if="this.coolpumstate === '不运行'"
+              v-else
               src="../../../assets/flowimg/closepum.png"
               alt=""
             />
+            <!-- 供水泵2定位 -->
             <img
-              class="coolpum"
+              class="waterpum"
-              v-else-if="this.coolpumstate === '运行'"
+              v-if="this.upWaterState2 === '1'"
-              src="../../../assets/flowimg/startpum.png"
-              alt=""
-            />
-            <img
-              class="coolpum"
-              v-else-if="this.coolpumstate === '补水'"
               src="../../../assets/flowimg/startpum.png"
               alt=""
             />
             <img
-              class="coolpum"
+              class="waterpum"
               v-else
               src="../../../assets/flowimg/closepum.png"
               alt=""
             />
-            <!-- 热水供水泵定位 -->
+            <!-- 补水定位 -->
             <img
-              class="waterpum"
+              class="buwaterpum2"
-              v-if="this.waterpumstate === '运行'"
+              v-if="backWaterState === '1'"
-              src="../../../assets/flowimg/startpum.png"
+              src="../../../assets/flowimg/bu-move.gif"
               alt=""
             />
             <img
-              class="waterpum"
+              class="buwaterpum"
               v-else
-              src="../../../assets/flowimg/closepum.png"
+              src="../../../assets/flowimg/bu-nomove.png"
               alt=""
             />
             <!-- 循环加热泵定位-->
             <img
               class="cirpum"
-              v-if="this.hotpumstate === '运行' && this.isBad"
+              v-if="this.hotPumState === '1' && this.isBad !== '1'"
               src="../../../assets/flowimg/startpum.png"
               alt=""
             />
@@ -161,13 +157,13 @@
             <!-- 热泵定位 -->
             <img
               class="hotpum"
-              v-if="this.hotpumstate === '运行' && this.isBad"
+              v-if="this.hotPumState === '1' && this.isBad !== '1'"
               src="../../../assets/flowimg/starthotpum.png"
               alt=""
             />
             <img
               class="hotpum"
-              v-else-if="this.isBad === '故障'"
+              v-else-if="this.isBad === '1'"
               src="../../../assets/flowimg/badhotpum.png"
               alt=""
             />
@@ -273,16 +269,34 @@
                 <span>{{ row.waterLevel }} </span>
               </template>
             </el-table-column>
-            <el-table-column prop="runState" label="热泵状态">
+            <el-table-column prop="upWaterState1" label="供水泵1状态">
               <template slot-scope="{ row }">
-                <span v-if="row.runState === '0'">不运行 </span>
+                <span v-if="row.upWaterState1 === '0'">不运行 </span>
-                <span v-if="row.runState === '1'">运行 </span>
+                <span v-if="row.upWaterState1 === '1'">运行 </span>
               </template>
             </el-table-column>
-            <el-table-column prop="upWaterState" label="供水状态">
+            <el-table-column prop="upWaterState2" label="供水泵2状态">
               <template slot-scope="{ row }">
-                <span v-if="row.upWaterState === '0'">不运行 </span>
+                <span v-if="row.upWaterState2 === '0'">不运行 </span>
-                <span v-if="row.upWaterState === '1'">运行 </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>
+                <span v-if="row.useWaterState === '1'">运行 </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="backWaterState" label="回水状态">
+              <template slot-scope="{ row }">
+                <span v-if="row.backWaterState === '0'">不运行 </span>
+                <span v-if="row.backWaterState === '1'">运行 </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="runState" label="热泵状态">
+              <template slot-scope="{ row }">
+                <span v-if="row.runState === '0'">不运行 </span>
+                <span v-if="row.runState === '1'">运行 </span>
               </template>
             </el-table-column>
             <el-table-column prop="isFault" label="是否故障">
@@ -320,15 +334,14 @@ export default {
       baseTable: [], //公共信息列表数据
       tableData: [], //系统状态表格数据
 
-      // 冷水泵状态 0表示关闭 1表示开启
+      // 供水阀状态 0表示关闭 1表示开启
-      coolpumstate: "",
+      useWaterState: "",
-      // 热水供水泵状态 0表示关闭 1表示开启
+      upWaterState1: "", //供水泵1状态
-      waterpumstate: "",
+      upWaterState2: "", //供水泵2状态
+      backWaterState: "", //回水阀状态
       // 热泵状态 两个系数
-      hotpumstate: "关机模式",
+      hotPumState: "",
       isBad: "无故障",
-      // 浴室使用状态 0表示未使用， 1表示使用
-      bathstate: 0,
       // 网关在线状态 0表示离线 1表示在线
       webstate: 1,
       // 水位变化数值
@@ -488,8 +501,13 @@ export default {
       this.temdata = row.waterTemp;
       this.pumname = row.pumpName;
       // 热泵状态 是否故障
-      this.hotpumstate = row.runState;
+      this.hotPumState = row.runState;
       this.isBad = row.isFault;
+      this.useWaterState = row.useWaterState;
+      this.upWaterState1 = row.upWaterState1;
+      this.upWaterState2 = row.upWaterState2;
+      this.backWaterState = row.backWaterState;
+      console.log("补水阀状态11111111111111111111", this.useWaterState);
     },
     /* 加入小手状态 */
     tableRowStyle({ row, column, rowIndex, columnIndex }) {
@@ -725,8 +743,8 @@ export default {
 
           .text1 {
             position: absolute;
-            top: 0.28rem;
+            top: 2.9rem;
-            left: 0.24rem;
+            left: 0.6rem;
             z-index: 1;
           }
 
@@ -748,7 +766,7 @@ export default {
 
           .text4 {
             position: absolute;
-            top: 2.3rem;
+            top: 2.6rem;
             right: 0.5rem;
             z-index: 1;
           }
@@ -763,7 +781,7 @@ export default {
           .text6 {
             position: absolute;
             top: 4.27rem;
-            left: 0.24rem;
+            left: 0.6rem;
             z-index: 1;
           }
 
@@ -773,6 +791,12 @@ export default {
             left: 5.6rem;
             z-index: 1;
           }
+          .text8 {
+            position: absolute;
+            top: 0.5rem;
+            left: 1.4rem;
+            z-index: 1;
+          }
 
           .replenish {
             position: absolute;
@@ -804,7 +828,8 @@ export default {
             width: 1rem;
             height: 0.78rem;
             position: absolute;
-            top: 0.54rem;
+            top: 2rem;
+            left: 0.5rem;
             z-index: 2;
           }
 
@@ -813,7 +838,23 @@ export default {
             height: 0.78rem;
             position: absolute;
             top: 3.37rem;
-            left: 0.4rem;
+            left: 0.5rem;
+          }
+          .buwaterpum {
+            width: 8.5rem;
+            height: 2.9rem;
+            position: absolute;
+            top: -0.1rem;
+            right: -0.02rem;
+            z-index: 2;
+          }
+          .buwaterpum2 {
+            width: 8.5rem;
+            height: 4.4rem;
+            position: absolute;
+            top: -0.9rem;
+            right: -0.02rem;
+            z-index: 2;
           }
 
           .cirpum {
@@ -894,7 +935,7 @@ export default {
             background-color: #dff1fa;
             margin-left: 2%;
             position: absolute;
-            top: 1.78rem;
+            top: 1.47rem;
             left: 2.6rem;
             border: solid 0.01rem #11aaea;
             z-index: 3;