1.中央热水监测页面-添加一个生活自来水液位监测

2.1、2号主机详情页面数据对接以及界面调整；
3.修改热水热泵运行记录表格数据样式

src/assets/styles/element-ui.scss

@@ -1452,3 +1452,10 @@
 .el-table__expand-icon{
   color: #fff !important;
 }
+.el-tag.el-tag--danger {
+  font-weight: bold !important;
+}
+.el-tag.el-tag--success{
+  font-weight: bold !important;
+  color: #03a249 !important;
+}

src/views/centerairC/hostRunReport/index.vue

@@ -84,7 +84,7 @@
       ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList" stripe>
+    <el-table v-loading="loading" :data="postList" stripe height="750">
       <!-- <el-table-column label="主机id" align="center" prop="deviceNum" /> -->
       <el-table-column label="时间" align="center" prop="curTime" />
       <el-table-column label="蒸发器">

src/views/centerairC/sysMonitor/hostDetails.vue

@@ -601,7 +601,7 @@ export default {
               item.otherName.includes("冷冻供水温度") ||
               item.otherName.includes("冷却回水温度") ||
               item.otherName.includes("冷却供水温度") ||
-              item.otherName.includes("负载")
+              item.otherName.includes("主机-负载")
             ) {
               let dataItem = {
                 name: item.otherName,

src/views/centerairC/sysMonitor/monitorCenter.vue

@@ -3108,7 +3108,7 @@ export default {
       top: 5.39rem;
       left: 4.15rem;
       width: 1.6rem;
-      // height: 1.2rem;
+      height: 1.2rem;
       // background-color: #007bff;
       border-top-right-radius: 0.3rem;
       cursor: pointer;

src/views/hotWater/hotPumpLog/index.vue

@@ -54,7 +54,15 @@
         </div>
       </div>
     </div>
-    <el-table :data="tableData" border style="width: 100%" v-loading="loading" height="750">
+    <el-table
+      :data="tableData"
+      border
+      style="width: 100%"
+      v-loading="loading"
+      height="700"
+      :cell-style="tableRowStyle"
+      class="log_table"
+    >
       <el-table-column prop="curTime" label="时间"> </el-table-column>
       <el-table-column label="1号热泵">
         <el-table-column prop="tempSetHotPumpOne" label="设定温度℃">
@@ -757,24 +765,15 @@ export default {
       this.dayDate = [start1, end1]; // 更新
     },
     tableRowStyle({ row, column, rowIndex, columnIndex }) {
-      // 修改颜色
-      //   if (columnIndex === 1) {
-      //     return "color: #fd1e00;!important;text-align:center";
-      //   }
-      //   if (columnIndex === 2) {
-      //     return "color: #3390ff;!important;text-align:center";
-      //   }
       if (
-        rowIndex === 8 ||
+        columnIndex === 2 ||
-        rowIndex === 13 ||
+        columnIndex === 6 ||
-        rowIndex === 18 ||
+        columnIndex === 10 ||
-        rowIndex === 21 ||
+        columnIndex === 14
-        rowIndex === 23 ||
-        rowIndex === 25 ||
-        rowIndex === 26
       ) {
-        return "color: #75d148;!important;font-weight: bold;background-color: rgba(0, 71, 125, 0.4)";
+        return "color: #fd1e00;!important;text-align:center;font-weight: bold;";
       }
+      // return "text-align:center";
     },
     // 选中日期事件
     dateChange() {

src/views/hotWater/waterMonitor/waterMonitorDetails.vue

@@ -73,7 +73,7 @@
             </template>
           </el-tree>
         </div>
-        <div class="base-mes">
+        <div class="base-mes" v-if="isShowHotWater">
           <div class="base-title">公共信息</div>
           <div class="base-height">
             <div
@@ -96,7 +96,7 @@
           />
           <div class="title-word">楼层：{{ currentName }}</div>
         </div>
-        <div class="folw">
+        <div class="folw" v-if="isShowHotWater">
           <!-- 动态流程图 -->
           <div class="changeimage">
             <!-- <img class="img-rad" src="" alt="" /> -->
@@ -576,6 +576,41 @@
             </el-table>
           </div>
         </div>
+        <div class="folw" v-else>
+          <!-- 动态流程图 -->
+          <div class="changeimage">
+            <div class="flowimg">
+              <!-- 冷水水箱定位 -->
+              <img
+                class="waterBox"
+                src="../../../assets/flowimg/coolWaterBox.png"
+                alt=""
+              />
+              <!-- 水位定位1 -->
+              <div
+                class="progressContainer1"
+                v-if="getPercentage(progress1) > 50"
+              >
+                <div
+                  class="progress"
+                  :style="{ height: getPercentage(progress1) + '%' }"
+                ></div>
+                <b class="propo">{{ getPercentage(progress1) }}%</b>
+              </div>
+              <div class="progressContainer2" v-else>
+                <div
+                  class="progress"
+                  :style="{ height: getPercentage(progress1) + '%' }"
+                ></div>
+                <b class="propo">{{ getPercentage(progress1) }}%</b>
+              </div>
+              <div class="waterBoxLong">
+                <div>最大值:3.2米</div>
+                <div>实际值:{{ progress1 }}米</div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -633,6 +668,7 @@ export default {
       // 热泵名称
       pumname: "",
       currentWeekday: "",
+      isShowHotWater: false,
     };
   },
   computed: {
@@ -686,7 +722,9 @@ export default {
     this.getDayData();
     // 设置定时器，每 10 秒执行一次
     this.timer = setInterval(() => {
+      if (this.isShowHotWater) {
         this.baseMessgae();
+      }
       this.sysStatus();
     }, 10000);
     // 每秒更新一次时间
@@ -795,7 +833,10 @@ export default {
           if (newRes.data && newRes.data[0] && newRes.data[0].children) {
             newRes.data[0].children = newRes.data[0].children.filter((item) => {
               // 假设子项有一个 label属性，用于检查是否包含 "热水"
-              return item.label && item.label.includes("热水");
+              return (
+                (item.label && item.label.includes("热水")) ||
+                item.label.includes("冷水")
+              );
             });
           }
           // 指定要保留的最大层级（从 1 开始计数），这里假设指定为第 4 级
@@ -829,12 +870,19 @@ export default {
               if (this.currentName === "-1楼") {
                 this.progressName1 = "裙楼";
                 this.progressName2 = "中厨";
+                this.isShowHotWater = true;
+                this.baseMessgae();
+                this.sysStatus();
               } else if (this.currentName === "3楼") {
                 this.progressName1 = "高区";
                 this.progressName2 = "中区";
-              }
+                this.isShowHotWater = true;
                 this.baseMessgae();
                 this.sysStatus();
+              } else {
+                this.isShowHotWater = false;
+                this.sysStatus();
+              }
             }
           });
         }
@@ -921,15 +969,22 @@ export default {
         console.log("当前选中节点ID", this.currentId);
         console.log("当前选中节点层级", this.currentLevel);
         console.log("当前选中节点名称", this.currentName);
-        this.baseMessgae();
-        this.sysStatus();
       }
       if (this.currentName === "-1楼") {
         this.progressName1 = "裙楼";
         this.progressName2 = "中厨";
+        this.isShowHotWater = true;
+        this.baseMessgae();
+        this.sysStatus();
       } else if (this.currentName === "3楼") {
         this.progressName1 = "高区";
         this.progressName2 = "中区";
+        this.isShowHotWater = true;
+        this.baseMessgae();
+        this.sysStatus();
+      } else {
+        this.isShowHotWater = false;
+        this.sysStatus();
       }
     },
     handleClick(tab, event) {
@@ -998,8 +1053,14 @@ export default {
     },
     // 系统状态显示
     sysStatus() {
+      let systemTypeId = "";
+      if (this.isShowHotWater) {
+        systemTypeId = "1";
+      } else {
+        systemTypeId = "6";
+      }
       let data = {
-        systemType: "1",
+        systemType: systemTypeId,
         floorId: this.currentId,
       };
       waterMonitorList(data).then((res) => {
@@ -1029,6 +1090,10 @@ export default {
         }
       });
     },
+    getPercentage(value) {
+      // 将 progress1 的值转换为百分比
+      return ((value / 3.2) * 100).toFixed(2);
+    },
   },
 };
 </script>
@@ -1667,6 +1732,18 @@ export default {
               z-index: 3;
             }
           }
+          .waterBoxLong {
+            font-size: 0.17rem;
+            font-weight: normal;
+            font-stretch: normal;
+            line-height: 0.2rem;
+            letter-spacing: 0.01rem;
+            color: #0a3797;
+            position: absolute;
+            top: 2.4rem;
+            left: 3.6rem;
+            z-index: 3;
+          }
           .progressName1 {
             font-size: 0.17rem;
             font-weight: normal;