1.修改生活热水-实时监控的动态图

2.修改中央空调-系统监测各个定位数据匹配逻辑

.env.development

@@ -7,9 +7,9 @@ ENV = 'development'
 # 开发环境
 # VUE_APP_BASE_API = '/dev-api'
 # 后台
-# VUE_APP_BASE_API = 'http://192.168.1.222:8080'
+VUE_APP_BASE_API = 'http://192.168.1.222:8080'
-# 云端
+# 梅州云端
-VUE_APP_BASE_API = 'http://106.55.173.225:8091'
+# VUE_APP_BASE_API = 'http://106.55.173.225:8091'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/components/waterTank.vue

@@ -64,7 +64,7 @@ export default {
     height: 120px !important;
   }
   .water {
-    width: 110px !important;
+    width: 105px !important;
   }
 }
 
@@ -78,7 +78,7 @@ export default {
     height: 100px !important;
   }
   .water {
-    width: 90px !important;
+    width: 85px !important;
   }
 }
 
@@ -92,7 +92,7 @@ export default {
     height: 110px !important;
   }
   .water {
-    width: 100px !important;
+    width: 96px !important;
   }
 }
 
@@ -106,7 +106,7 @@ export default {
     height: 90px !important;
   }
   .water {
-    width: 80px !important;
+    width: 76px !important;
   }
 }
 </style>

src/views/hotWater/waterControl/index.vue

@@ -276,8 +276,8 @@
             <div class="monitor-flex-left" v-if="activeName.includes('回水')">
               <div class="control-top">
                 <img
-                  class="monitor-img2"
+                  class="monitor-img3"
-                  src="../../../assets/images/startpum.png"
+                  src="../../../assets/images/pump.png"
                 />
                 <div class="monitor-words">
                   <div class="words-li">
@@ -303,46 +303,44 @@
                     ></el-input>
                     <div class="white">℃</div>
                   </div>
-                </div>
+                  <div class="words-li">
-              </div>
+                    <div class="ash">回水温度设定差值:</div>
-              <div class="monitor-words" style="margin-top: 20px">
+                    <el-input
-                <div class="words-li">
+                      v-model="item.diffValueSet"
-                  <div class="ash">回水温度设定差值:</div>
+                      @keyup.enter.native="
-                  <el-input
+                        handleEnter(
-                    v-model="item.diffValueSet"
+                          item,
-                    @keyup.enter.native="
+                          item.diffValueSet,
-                      handleEnter(
+                          item.diffValueSetId,
-                        item,
+                          '回水温度设定差值',
-                        item.diffValueSet,
+                          '℃'
-                        item.diffValueSetId,
+                        )
-                        '回水温度设定差值',
+                      "
-                        '℃'
+                      @input="handleInput(item)"
-                      )
+                      @blur="handleBlur()"
-                    "
+                      size="mini"
-                    @input="handleInput(item)"
+                    ></el-input>
-                    @blur="handleBlur()"
+                    <div class="white">℃</div>
-                    size="mini"
+                  </div>
-                  ></el-input>
+                  <div class="words-li">
-                  <div class="white">℃</div>
+                    <div class="ash">回水温度设定延时时间:</div>
-                </div>
+                    <el-input
-                <div class="words-li">
+                      v-model="item.delayTimeSet"
-                  <div class="ash">回水温度设定延时时间:</div>
+                      @keyup.enter.native="
-                  <el-input
+                        handleEnter(
-                    v-model="item.delayTimeSet"
+                          item,
-                    @keyup.enter.native="
+                          item.delayTimeSet,
-                      handleEnter(
+                          item.delayTimeSetId,
-                        item,
+                          '回水温度设定延时时间',
-                        item.delayTimeSet,
+                          'S'
-                        item.delayTimeSetId,
+                        )
-                        '回水温度设定延时时间',
+                      "
-                        'S'
+                      @input="handleInput(item)"
-                      )
+                      @blur="handleBlur()"
-                    "
+                      size="mini"
-                    @input="handleInput(item)"
+                    ></el-input>
-                    @blur="handleBlur()"
+                    <div class="white">min</div>
-                    size="mini"
+                  </div>
-                  ></el-input>
-                  <div class="white">S</div>
                 </div>
               </div>
             </div>
@@ -1236,6 +1234,10 @@ export default {
               width: 1.2rem;
               height: 0.8rem;
             }
+            .monitor-img3 {
+              width: 1.2rem;
+              height: 0.8rem;
+            }
           }
           .control-bottom {
             width: 100%;
@@ -1359,24 +1361,11 @@ export default {
     }
   }
 }
-@media (min-width: 1400px) and (max-width: 1620px) {
+@media (min-width: 1350px) and (max-width: 1460px) {
-  .monitor-li {
+  .monitor-img3 {
-    width: calc(49% - 40px) !important;
-    margin: 0 20px !important;
-    .monitor-img1 {
-      width: 120px !important;
-      height: 120px !important;
-    }
-    .monitor-img2 {
-      width: 120px !important;
-      height: 80px !important;
-    }
-    .monitor-flex-left {
-      padding: 0 0.3rem !important;
-    }
   }
 }
-@media (min-width: 1240px) and (max-width: 1400px) {
+@media (min-width: 1350px) and (max-width: 1850px) {
   .monitor-li {
     width: calc(49% - 10px) !important;
     margin: 0 5px !important;
@@ -1389,8 +1378,12 @@ export default {
     width: 100px !important;
     height: 60px !important;
   }
+  .monitor-img3 {
+    width: 1.2rem !important;
+    height: 0.9rem !important;
+  }
 }
-@media (max-width: 1240px) {
+@media (max-width: 1350px) {
   .monitor-li {
     width: 100% !important;
     margin: 0 !important;
@@ -1403,6 +1396,10 @@ export default {
       width: 100px !important;
       height: 80px !important;
     }
+    .monitor-img3 {
+      width: 100px !important;
+      height: 80px !important;
+    }
     .monitor-flex-left {
       padding: 0 30px !important;
     }

src/views/hotWater/waterMonitor/index.vue

@@ -801,8 +801,8 @@ export default {
           .replenish {
             position: absolute;
             top: 0.7rem;
-            left: 0.9rem;
+            left: 0rem;
-            width: 1.7rem;
+            width:2.55rem;
             height: 0.34rem;
             z-index: 1;
           }