From 36fce09e2c52c9ac8ee9a9b155ac2be36db6a39a Mon Sep 17 00:00:00 2001
From: selia-zx <1771203023@qq.com>
Date: Wed, 15 Apr 2026 09:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=83=AD=E6=B0=B4=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=B0=B4=E7=AE=B1=E7=9A=84=E6=B8=A9=E5=BA=A6=E3=80=81?=
 =?UTF-8?q?=E4=B8=BB=E6=A5=BC=E5=BE=AA=E7=8E=AF=E6=B3=B5=E7=9A=84=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../waterMonitor/waterMonitorDetails.vue      | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
index c1249ad..d7ec338 100644
--- a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
+++ b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
@@ -98,8 +98,8 @@
 
               <!-- 循环加热泵定位-->
               <img class="cycle-pipeline" src="../../../assets/flowimg/cycle-pipeline.png" alt="" />
-              <img class="cyclepum1" src="../../../assets/flowimg/startpum.png" alt="" />
-              <img class="cyclepum2" src="../../../assets/flowimg/startpum.png" alt="" />
+              <img class="cyclepum1" :src="getCyclePump1Img()" alt="" />
+              <img class="cyclepum2" :src="getCyclePump2Img()" alt="" />
               <!-- 热泵定位 -->
               <div :class="getHotPumPositionClass">
                 <div class="hotPump-li" v-for="(item, index) in tableData" :key="index">
@@ -252,9 +252,9 @@
 
               <!-- 热泵定位 -->
                
-              <img class="circulate3"  :src="isCirculateRunning() ? require('../../../assets/flowimg/singlePipeline.gif') : require('../../../assets/flowimg/singlePipeline.png')"
+              <img class="circulate3"  :src="isHotPumpRunning() ? require('../../../assets/flowimg/singlePipeline.gif') : require('../../../assets/flowimg/singlePipeline.png')"
                 alt="" />
-              <img class="circulate4"  :src="isCirculateRunning() ? require('../../../assets/flowimg/singlePipeline.gif') : require('../../../assets/flowimg/singlePipeline.png')"
+              <img class="circulate4"  :src="isHotPumpRunning() ? require('../../../assets/flowimg/singlePipeline.gif') : require('../../../assets/flowimg/singlePipeline.png')"
                 alt="" />
               <div :class="getHotPumPositionClass">
                 <div class="hotPump-li2" v-for="(item, index) in tableData" :key="index">
@@ -800,8 +800,8 @@ export default {
             //水位 温度 热泵名称
             this.progress1 = this.tableData[0].waterLevel1;
             this.progress2 = this.tableData[0].waterLevel2;
-            this.temdata1 = this.tableData[0].waterTemp;
-            this.temdata2 = this.tableData[1].waterTemp;
+            this.temdata1 = this.tableData[0].tankWaterTemp;
+            this.temdata2 = this.tableData[1].tankWaterTemp2;
             // this.pumname = row.pumpName;
             // // 热泵状态 是否故障
             // this.hotPumState = row.runState;
@@ -817,14 +817,30 @@ export default {
         }
       });
     },
-    getPercentage(value) {
-      // 将 progress1 的值转换为百分比
-      return ((value / 3.2) * 100).toFixed(2);
-    },
-    // 判断循环泵是否运行
+    // 判断主楼-循环泵管道是否运行
     isCirculateRunning() {
+      return this.tableData.some(item => Number(item.loopPumpState1) === 1 || Number(item.loopPumpState2) === 1);
+    },
+    // 判断热泵是否运行
+    isHotPumpRunning() {
       return this.tableData.some(item => Number(item.runState) !== 0);
     },
+    // 获取主楼-循环泵1的图片
+    getCyclePump1Img() {
+      if (this.tableData.length === 0) return require('../../../assets/flowimg/closepum.png');
+      const state = Number(this.tableData[0].loopPumpState1);
+      if (state === 1) return require('../../../assets/flowimg/startpum.png');
+      if (state === 2) return require('../../../assets/flowimg/badpum.png');
+      return require('../../../assets/flowimg/closepum.png');
+    },
+    // 获取主楼-循环泵2的图片
+    getCyclePump2Img() {
+      if (this.tableData.length === 0) return require('../../../assets/flowimg/closepum.png');
+      const state = Number(this.tableData[0].loopPumpState2);
+      if (state === 1) return require('../../../assets/flowimg/startpum.png');
+      if (state === 2) return require('../../../assets/flowimg/badpum.png');
+      return require('../../../assets/flowimg/closepum.png');
+    },
   },
 };
 </script>