From 3d3e531dd3e5f9972de2d1064fd199f71bff896e Mon Sep 17 00:00:00 2001
From: "3067418132@qq.com" <ljf25604@163.com>
Date: Thu, 2 Apr 2026 13:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E6=B0=B4=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=9B=91=E6=8E=A7=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hotWater/waterControl/index.vue     | 14 +++++++----
 .../waterMonitor/waterMonitorDetails.vue      | 25 +++++++++++++------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue
index 14236c7..6d27d92 100644
--- a/src/views/hotWater/waterControl/index.vue
+++ b/src/views/hotWater/waterControl/index.vue
@@ -361,7 +361,7 @@
               <div class="control-top">
                 <water-tank :waterLevel="item.waterLevel"></water-tank>
                 <div class="monitor-words">
-                  <div class="words-li">
+                  <!-- <div class="words-li">
                     <div class="ash">补水阀启停:</div>
                     <div class="white">
                       <el-switch
@@ -393,7 +393,7 @@
                       @blur="handleBlur()"
                     ></el-input>
                     <div class="white">%</div>
-                  </div>
+                  </div> -->
                 </div>
               </div>
               <div class="control-bottom">
@@ -402,6 +402,10 @@
                   <div class="white">{{ item.waterLevel }} %</div>
                 </div>
                 <div class="words-li words-li5">
+                  <div class="ash">实际温度:</div>
+                  <div class="white">{{ item.temp }} ℃</div>
+                </div>
+                <!-- <div class="words-li words-li5">
                   <div class="ash ash2">设置液位:</div>
                   <el-input
                     size="mini"
@@ -419,8 +423,8 @@
                     @input="handleWaterInput(item)"
                   ></el-input>
                   <div class="white">%</div>
-                </div>
-                <div class="words-li words-li6">
+                </div> -->
+                <!-- <div class="words-li words-li6">
                   <div class="ash">液位设定延时时间:</div>
                   <el-input
                     size="mini"
@@ -457,7 +461,7 @@
                     @input="handleWaterInput(item)"
                   ></el-input>
                   <div class="white">%</div>
-                </div>
+                </div> -->
                 <div class="words-li words-li2">
                   <div class="ash">时间:</div>
                   <div class="white">{{ item.curTime }}</div>
diff --git a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
index 34d378d..9e75359 100644
--- a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
+++ b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
@@ -262,6 +262,7 @@
             <div class="tablemaeta">系统状态显示</div>
             <el-table class="maintable" ref="maintable" :data="tableData" height="200" highlight-current-row
               @row-click="handlerow" :cell-style="tableRowStyle" :show-overflow-tooltip="true"
+              :key="currentName"
               :header-cell-style="{ 'text-align': 'center' }">
               <el-table-column label="序号" min-width="50">
                 <template slot-scope="scope">
@@ -282,29 +283,39 @@
                   <span>{{ row.waterTemp }} </span>
                 </template>
               </el-table-column>
+              <el-table-column prop="tankWaterTemp" label="水箱1温度(℃)" min-width="100">
+                <template slot-scope="{ row }">
+                  <span>{{ row.tankWaterTemp }} </span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="tankWaterTemp2" label="水箱2温度(℃)" min-width="100" v-if="currentName == '主楼'" >
+                <template slot-scope="{ row }">
+                  <span>{{ row.tankWaterTemp2 }} </span>
+                </template>
+              </el-table-column>
               <!-- 裙楼、高区 -->
-              <el-table-column prop="levelSet1" label="设置水位1(%)" min-width="100">
+              <!-- <el-table-column prop="levelSet1" label="设置水位1(%)" min-width="100">
                 <template slot-scope="{ row }">
                   <span>{{ row.levelSet1 }}</span>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column prop="waterLevel1" label="实际水位1(%)" min-width="100">
                 <template slot-scope="{ row }">
                   <span>{{ row.waterLevel1 }} </span>
                 </template>
               </el-table-column>
               <!-- 中厨、中区 -->
-              <el-table-column prop="levelSet2" label="设置水位2(%)" min-width="100">
+              <!-- <el-table-column prop="levelSet2" label="设置水位2(%)" min-width="100">
                 <template slot-scope="{ row }">
                   <span>{{ row.levelSet2 }}</span>
                 </template>
-              </el-table-column>
-              <el-table-column prop="waterLevel2" label="实际水位2(%)" min-width="100">
+              </el-table-column> -->
+              <el-table-column prop="waterLevel2" label="实际水位2(%)" min-width="100" v-if="currentName == '主楼'" >
                 <template slot-scope="{ row }">
                   <span>{{ row.waterLevel2 }} </span>
                 </template>
               </el-table-column>
-              <el-table-column prop="upWaterState" label="补水状态">
+              <!-- <el-table-column prop="upWaterState" label="补水状态">
                 <template slot-scope="{ row }">
                   <span v-if="row.useWaterState === '0'">不运行 </span>
                   <span v-if="row.useWaterState === '1'">运行 </span>
@@ -315,7 +326,7 @@
                   <span v-if="row.backWaterState === '0'">不运行 </span>
                   <span v-if="row.backWaterState === '1'">运行 </span>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column prop="runState" label="热泵状态">
                 <template slot-scope="{ row }">
                   <span v-if="row.runState === '0'">不运行 </span>