From 5728617d8249cf32dead1ff5257f4da37cd951c1 Mon Sep 17 00:00:00 2001
From: selia-zx <1771203023@qq.com>
Date: Wed, 15 Apr 2026 09:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=83=AD=E6=B0=B4=E5=BE=AA=E7=8E=AF=E6=B3=B5=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hotWater/waterControl/index.vue     | 740 ++++++++----------
 .../waterMonitor/waterMonitorDetails.vue      |  54 +-
 2 files changed, 367 insertions(+), 427 deletions(-)

diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue
index 6d27d92..bde3654 100644
--- a/src/views/hotWater/waterControl/index.vue
+++ b/src/views/hotWater/waterControl/index.vue
@@ -3,19 +3,10 @@
     <div class="left-tree">
       <!-- 为 el-tree 设置一个固定的高度和滚动条 -->
       <div style="height: 7.5rem; overflow-y: auto">
-        <el-tree
-          ref="tree"
-          :data="treeData"
-          node-key="id"
-          :default-expand-all="false"
-          :default-expanded-keys="expandedKeys"
-          :auto-expand-parent="true"
-          icon-class="none"
-          @node-expand="handleNodeExpand"
-          @node-collapse="handleNodeCollapse"
-          :highlight-current="true"
-          @node-click="handleNodeClick"
-        >
+        <el-tree ref="tree" :data="treeData" node-key="id" :default-expand-all="false"
+          :default-expanded-keys="expandedKeys" :auto-expand-parent="true" icon-class="none"
+          @node-expand="handleNodeExpand" @node-collapse="handleNodeCollapse" :highlight-current="true"
+          @node-click="handleNodeClick">
           <template #default="{ node }">
             <span class="custom-tree-node">
               <!-- 根据节点状态动态设置图标类名 -->
@@ -30,53 +21,31 @@
     </div>
     <div class="right-monitor">
       <div class="buildingDiv">
-        <img
-          class="title-bg"
-          src="../../../assets/images/title-bg.png"
-          alt=""
-        />
+        <img class="title-bg" src="../../../assets/images/title-bg.png" alt="" />
         <div class="title-word">楼层：{{ currentName }}</div>
       </div>
       <div class="details-header">
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <!-- 使用 v-for 指令遍历 tabsList 数组 -->
-          <el-tab-pane
-            v-for="device in tabsList"
-            :key="device.id"
-            :label="device.name"
-            :name="device.name"
-          >
+          <el-tab-pane v-for="device in tabsList" :key="device.id" :label="device.name" :name="device.name">
             <!-- 这里可以添加每个 tab 对应的内容 -->
           </el-tab-pane>
         </el-tabs>
       </div>
       <div class="monitor-context">
-        <div
-          class="monitor-li"
-          v-for="item in devicesList"
-          :key="item.deviceId"
-        >
+        <div class="monitor-li" v-for="item in devicesList" :key="item.deviceId">
           <div class="monitor-title">{{ item.name }}</div>
           <div class="monitor-flex">
             <!-- 热泵 -->
             <div class="monitor-flex-left" v-if="activeName.includes('热泵')">
               <div class="control-top">
-                <img
-                  class="monitor-img1"
-                  src="../../../assets/images/starthotpum.png"
-                />
+                <img class="monitor-img1" src="../../../assets/images/starthotpum.png" />
                 <div class="monitor-words">
                   <div class="words-li">
                     <div class="ash">开关控制:</div>
                     <div class="white">
-                      <el-switch
-                        style="display: block"
-                        v-model="item.hotPumpStatus"
-                        active-color="#13ce66"
-                        active-text="开机"
-                        inactive-text="关机"
-                        @change="handleHotPump(item)"
-                      >
+                      <el-switch style="display: block" v-model="item.hotPumpStatus" active-color="#13ce66"
+                        active-text="开机" inactive-text="关机" @change="handleHotPump(item)">
                       </el-switch>
                     </div>
                   </div>
@@ -85,24 +54,15 @@
               <div class="control-bottom">
                 <div class="words-li">
                   <div class="ash">故障信息:</div>
-                  <el-tag
-                    size="mini"
-                    v-if="item.alarmStatus === '无故障'"
-                    type="success"
-                    >{{ item.alarmStatus }}</el-tag
-                  >
+                  <el-tag size="mini" v-if="item.alarmStatus === '无故障'" type="success">{{ item.alarmStatus }}</el-tag>
                   <el-tag size="mini" v-else type="danger">{{
                     item.alarmStatus
                   }}</el-tag>
                 </div>
                 <div class="words-li">
                   <div class="ash">运行状态:</div>
-                  <el-tag
-                    size="mini"
-                    v-if="item.runningStatus === '运行'"
-                    type="success"
-                    >{{ item.runningStatus }}</el-tag
-                  >
+                  <el-tag size="mini" v-if="item.runningStatus === '运行'" type="success">{{ item.runningStatus
+                    }}</el-tag>
                   <el-tag size="mini" v-else type="danger">不运行</el-tag>
                 </div>
                 <div class="words-li">
@@ -112,47 +72,81 @@
                 <div class="words-li">
                   <div class="ash">设定温度:</div>
                   <div class="white">
-                    <el-input
-                      size="mini"
-                      v-model="item.tempSet"
-                      placeholder="请输入"
-                      @keyup.enter.native="
-                        handleEnter(
-                          item,
-                          item.tempSet,
-                          item.tempSetId,
-                          '设定温度',
-                          '℃'
-                        )
-                      "
-                      @input="handleInput(item)"
-                      @blur="handleBlur()"
-                    ></el-input>
+                    <el-input size="mini" v-model="item.tempSet" placeholder="请输入" @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.tempSet,
+                        item.tempSetId,
+                        '设定温度',
+                        '℃'
+                      )
+                      " @input="handleInput(item)" @blur="handleBlur()"></el-input>
                   </div>
                 </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" style="letter-spacing: 5px">
+                      手自动状态:
+                    </div>
+                    <div class="white">
+                      <el-switch style="display: block" v-model="item.handAutomaticSwitch" active-color="#13ce66"
+                        active-text="手动" inactive-text="自动" @change="handAutomatic(item)">
+                      </el-switch>
+                    </div>
+                  </div>
+                  <div class="words-li">
+                    <div class="ash" style="letter-spacing: 7px">
+                      启停&nbsp;控制:
+                    </div>
+                    <div class="white">
+                      <el-switch style="display: block" v-model="item.switchStatus" active-color="#13ce66"
+                        active-text="开启" inactive-text="停止" @change="handleSwitch(item)">
+                      </el-switch>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="control-bottom">
+                <div class="words-li">
+                  <div class="ash">故障信息：</div>
+                  <el-tag size="mini" v-if="item.alarmStatus === '无故障'" type="success">{{ item.alarmStatus }}</el-tag>
+                  <el-tag size="mini" v-else type="danger">{{
+                    item.alarmStatus
+                  }}</el-tag>
+                </div>
+                <div class="words-li">
+                  <div class="ash">运行状态：</div>
+                  <el-tag size="mini" v-if="item.runningStatus === '运行'" type="success">{{ item.runningStatus
+                    }}</el-tag>
+                  <el-tag size="mini" v-else type="danger">{{
+                    item.runningStatus
+                  }}</el-tag>
+                </div>
+                <div class="words-li">
+                  <div class="ash">累计运行:</div>
+                  <div class="white">{{ item.runningTime }}</div>
+                  <div class="white">小时</div>
+                </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"
-                />
+                <img class="monitor-img2" src="../../../assets/images/startpum.png" />
                 <div class="monitor-words">
                   <div class="words-li">
                     <div class="ash" style="letter-spacing: 5px">
                       频率手自动:
                     </div>
                     <div class="white">
-                      <el-switch
-                        style="display: block"
-                        v-model="item.handAutomaticSwitch"
-                        active-color="#13ce66"
-                        active-text="手动"
-                        inactive-text="自动"
-                        @change="handAutomatic(item)"
-                      >
+                      <el-switch style="display: block" v-model="item.handAutomaticSwitch" active-color="#13ce66"
+                        active-text="手动" inactive-text="自动" @change="handAutomatic(item)">
                       </el-switch>
                     </div>
                   </div>
@@ -161,14 +155,8 @@
                       启停&nbsp;控制:
                     </div>
                     <div class="white">
-                      <el-switch
-                        style="display: block"
-                        v-model="item.switchStatus"
-                        active-color="#13ce66"
-                        active-text="开启"
-                        inactive-text="停止"
-                        @change="handleSwitch(item)"
-                      >
+                      <el-switch style="display: block" v-model="item.switchStatus" active-color="#13ce66"
+                        active-text="开启" inactive-text="停止" @change="handleSwitch(item)">
                       </el-switch>
                     </div>
                   </div>
@@ -177,24 +165,15 @@
               <div class="control-bottom">
                 <div class="words-li">
                   <div class="ash">故障信息：</div>
-                  <el-tag
-                    size="mini"
-                    v-if="item.alarmStatus === '无故障'"
-                    type="success"
-                    >{{ item.alarmStatus }}</el-tag
-                  >
+                  <el-tag size="mini" v-if="item.alarmStatus === '无故障'" type="success">{{ item.alarmStatus }}</el-tag>
                   <el-tag size="mini" v-else type="danger">{{
                     item.alarmStatus
                   }}</el-tag>
                 </div>
                 <div class="words-li">
                   <div class="ash">运行状态：</div>
-                  <el-tag
-                    size="mini"
-                    v-if="item.runningStatus === '运行'"
-                    type="success"
-                    >{{ item.runningStatus }}</el-tag
-                  >
+                  <el-tag size="mini" v-if="item.runningStatus === '运行'" type="success">{{ item.runningStatus
+                    }}</el-tag>
                   <el-tag size="mini" v-else type="danger">{{
                     item.runningStatus
                   }}</el-tag>
@@ -205,78 +184,54 @@
                 </div>
                 <div class="words-li">
                   <div class="ash">频率设置:</div>
-                  <el-input
-                    v-model="item.frequencySet"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.frequencySet,
-                        item.frequencySetId,
-                        '频率设置',
-                        'Hz'
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                    size="mini"
-                  ></el-input>
+                  <el-input v-model="item.frequencySet" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.frequencySet,
+                      item.frequencySetId,
+                      '频率设置',
+                      'Hz'
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()" size="mini"></el-input>
                   <div class="white">Hz</div>
                 </div>
                 <div class="words-li">
                   <div class="ash">压力设置:</div>
-                  <el-input
-                    v-model="item.pressureSet"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.pressureSet,
-                        item.pressureSetId,
-                        '压力设置',
-                        'bar'
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                    size="mini"
-                  ></el-input>
+                  <el-input v-model="item.pressureSet" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.pressureSet,
+                      item.pressureSetId,
+                      '压力设置',
+                      'bar'
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()" size="mini"></el-input>
                   <div class="white">bar</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>
+                  <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 class="words-li">
                   <div class="ash">换机时间:</div>
-                  <el-input
-                    v-model="item.counterSet"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.counterSet,
-                        item.counterSetId,
-                        '换机时间',
-                        '次'
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                    size="mini"
-                  ></el-input>
+                  <el-input v-model="item.counterSet" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.counterSet,
+                      item.counterSetId,
+                      '换机时间',
+                      '次'
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()" size="mini"></el-input>
                   <div class="white">次</div>
                 </div>
                 <div class="words-li">
@@ -287,10 +242,7 @@
             <!-- 裙楼供水泵、高区供水泵、中厨回水泵 -->
             <div class="monitor-flex-left" v-if="activeName.includes('回水')">
               <div class="control-top">
-                <img
-                  class="monitor-img3"
-                  src="../../../assets/images/pump.png"
-                />
+                <img class="monitor-img3" src="../../../assets/images/pump.png" />
                 <div class="monitor-words">
                   <div class="words-li">
                     <div class="ash">回水温度:</div>
@@ -298,59 +250,41 @@
                   </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>
+                    <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 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>
+                    <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,
-                          '回水温度设定延时时间',
-                          'min'
-                        )
-                      "
-                      @input="handleInput(item)"
-                      @blur="handleBlur()"
-                      size="mini"
-                    ></el-input>
+                    <el-input v-model="item.delayTimeSet" @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.delayTimeSet,
+                        item.delayTimeSetId,
+                        '回水温度设定延时时间',
+                        'min'
+                      )
+                      " @input="handleInput(item)" @blur="handleBlur()" size="mini"></el-input>
                     <div class="white">min</div>
                   </div>
                 </div>
@@ -469,27 +403,15 @@
               </div>
             </div>
             <!-- 中厨、裙楼 -->
-            <div
-              class="monitor-flex-left"
-              v-if="activeName === '裙楼' || activeName === '中厨'"
-            >
+            <div class="monitor-flex-left" v-if="activeName === '裙楼' || activeName === '中厨'">
               <div class="control-top">
-                <img
-                  class="monitor-img2"
-                  src="../../../assets/images/startpum.png"
-                />
+                <img class="monitor-img2" src="../../../assets/images/startpum.png" />
                 <div class="monitor-words">
                   <div class="words-li">
                     <div class="ash" style="letter-spacing: 8px">一键启动:</div>
                     <div class="white">
-                      <el-switch
-                        style="display: block"
-                        v-model="item.openSwitch"
-                        active-color="#13ce66"
-                        active-text="开启"
-                        inactive-text="停止"
-                        @change="handleAllStart(item)"
-                      >
+                      <el-switch style="display: block" v-model="item.openSwitch" active-color="#13ce66"
+                        active-text="开启" inactive-text="停止" @change="handleAllStart(item)">
                       </el-switch>
                     </div>
                   </div>
@@ -558,12 +480,7 @@
                 </div> -->
                 <div class="words-li words-li3">
                   <div class="ash">故障信息:</div>
-                  <el-tag
-                    size="mini"
-                    v-if="item.alarmStatus === '无故障'"
-                    type="success"
-                    >{{ item.alarmStatus }}</el-tag
-                  >
+                  <el-tag size="mini" v-if="item.alarmStatus === '无故障'" type="success">{{ item.alarmStatus }}</el-tag>
                   <el-tag size="mini" v-else type="danger">{{
                     item.alarmStatus
                   }}</el-tag>
@@ -590,27 +507,15 @@
               </div>
             </div>
             <!-- 高区、中区 -->
-            <div
-              class="monitor-flex-left"
-              v-if="activeName === '高区' || activeName === '中区'"
-            >
+            <div class="monitor-flex-left" v-if="activeName === '高区' || activeName === '中区'">
               <div class="control-top">
-                <img
-                  class="monitor-img2"
-                  src="../../../assets/images/startpum.png"
-                />
+                <img class="monitor-img2" src="../../../assets/images/startpum.png" />
                 <div class="monitor-words">
                   <div class="words-li">
                     <div class="ash" style="letter-spacing: 8px">一键启动:</div>
                     <div class="white">
-                      <el-switch
-                        style="display: block"
-                        v-model="item.openSwitch"
-                        active-color="#13ce66"
-                        active-text="开启"
-                        inactive-text="停止"
-                        @change="handleAllStart(item)"
-                      >
+                      <el-switch style="display: block" v-model="item.openSwitch" active-color="#13ce66"
+                        active-text="开启" inactive-text="停止" @change="handleAllStart(item)">
                       </el-switch>
                     </div>
                   </div>
@@ -637,21 +542,15 @@
                 </div>
                 <div class="words-li words-li4">
                   <div class="ash">供水温度设定:</div>
-                  <el-input
-                    v-model="item.tempSet"
-                    size="mini"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.tempSet,
-                        item.tempSetId,
-                        '供水温度设定',
-                        '℃'
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                  ></el-input>
+                  <el-input v-model="item.tempSet" size="mini" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.tempSet,
+                      item.tempSetId,
+                      '供水温度设定',
+                      '℃'
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()"></el-input>
                   <div class="white">℃</div>
                 </div>
                 <div class="words-li words-li3">
@@ -660,31 +559,20 @@
                 </div>
                 <div class="words-li words-li4">
                   <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>
+                  <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 words-li3">
                   <div class="ash">故障信息:</div>
-                  <el-tag
-                    size="mini"
-                    v-if="item.alarmStatus === '无故障'"
-                    type="success"
-                    >{{ item.alarmStatus }}</el-tag
-                  >
+                  <el-tag size="mini" v-if="item.alarmStatus === '无故障'" type="success">{{ item.alarmStatus }}</el-tag>
                   <el-tag size="mini" v-else type="danger">{{
                     item.alarmStatus
                   }}</el-tag>
@@ -715,104 +603,69 @@
               <div class="control-bottom">
                 <div class="words-li words-li4">
                   <div class="ash">上限:</div>
-                  <el-input
-                    v-model="item.engineeringMaxValue"
-                    size="mini"
-                    placeholder="请输入"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.engineeringMaxValue,
-                        item.engineeringMaxValueId,
-                        '上限',
-                        item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                  ></el-input>
+                  <el-input v-model="item.engineeringMaxValue" size="mini" placeholder="请输入" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.engineeringMaxValue,
+                      item.engineeringMaxValueId,
+                      '上限',
+                      item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()"></el-input>
                   <div class="white" v-if="item.name.includes('温度')">℃</div>
                   <div class="white" v-else-if="item.name.includes('压力')">bar</div>
                   <div class="white" v-else-if="item.name.includes('液位')">m</div>
                 </div>
                 <div class="words-li words-li4">
                   <div class="ash">下限:</div>
-                  <el-input
-                    v-model="item.engineeringMinValue"
-                    size="mini"
-                    placeholder="请输入"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.engineeringMinValue,
-                        item.engineeringMinValueId,
-                        '下限',
-                        item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                  ></el-input>
+                  <el-input v-model="item.engineeringMinValue" size="mini" placeholder="请输入" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.engineeringMinValue,
+                      item.engineeringMinValueId,
+                      '下限',
+                      item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()"></el-input>
                   <div class="white" v-if="item.name.includes('温度')">℃</div>
                   <div class="white" v-else-if="item.name.includes('压力')">bar</div>
                   <div class="white" v-else-if="item.name.includes('液位')">m</div>
                 </div>
                 <div class="words-li words-li4">
                   <div class="ash">数字上限:</div>
-                  <el-input
-                    v-model="item.digitalMaxValue"
-                    size="mini"
-                    placeholder="请输入"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.digitalMaxValue,
-                        item.digitalMaxValueId,
-                        '数字上限',
-                        ''
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                  ></el-input>
+                  <el-input v-model="item.digitalMaxValue" size="mini" placeholder="请输入" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.digitalMaxValue,
+                      item.digitalMaxValueId,
+                      '数字上限',
+                      ''
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()"></el-input>
                 </div>
                 <div class="words-li words-li4">
                   <div class="ash">数字下限:</div>
-                  <el-input
-                    v-model="item.digitalMinValue"
-                    size="mini"
-                    placeholder="请输入"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.digitalMinValue,
-                        item.digitalMinValueId,
-                        '数字下限',
-                        ''
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                  ></el-input>
+                  <el-input v-model="item.digitalMinValue" size="mini" placeholder="请输入" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.digitalMinValue,
+                      item.digitalMinValueId,
+                      '数字下限',
+                      ''
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()"></el-input>
                 </div>
                 <div class="words-li words-li4">
                   <div class="ash">校准值:</div>
-                  <el-input
-                    v-model="item.calibrationValue"
-                    size="mini"
-                    placeholder="请输入"
-                    @keyup.enter.native="
-                      handleEnter(
-                        item,
-                        item.calibrationValue,
-                        item.calibrationValueId,
-                        '校准值',
-                        item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
-                      )
-                    "
-                    @input="handleInput(item)"
-                    @blur="handleBlur()"
-                  ></el-input>
+                  <el-input v-model="item.calibrationValue" size="mini" placeholder="请输入" @keyup.enter.native="
+                    handleEnter(
+                      item,
+                      item.calibrationValue,
+                      item.calibrationValueId,
+                      '校准值',
+                      item.name.includes('温度') ? '℃' : item.name.includes('压力') ? 'bar' : item.name.includes('液位') ? 'm' : ''
+                    )
+                    " @input="handleInput(item)" @blur="handleBlur()"></el-input>
                   <div class="white" v-if="item.name.includes('温度')">℃</div>
                   <div class="white" v-else-if="item.name.includes('压力')">bar</div>
                   <div class="white" v-else-if="item.name.includes('液位')">m</div>
@@ -1029,12 +882,12 @@ export default {
                 Number(item.switchStatus) === 0
                   ? false
                   : Number(item.switchStatus) === 4
-                  ? true
-                  : "", // 热泵开关状态
+                    ? true
+                    : "", // 热泵开关状态
               switchStatus: Number(item.switchStatus) == 0 ? false : true, //启停控制
               alarmStatus: Number(item.alarmStatus) == 0 ? "无故障" : "故障", //故障状态
               handAutomaticSwitch:
-                Number(item.handAutomaticSwitch) == 1 ? false : true, //手自动状态
+                Number(item.handAutomaticSwitch) == 0 ? false : true, //手自动状态
               openSwitch: Number(item.openSwitch) == 0 ? false : true, //一键启动
               closeSwitch: Number(item.closeSwitch) == 0 ? false : true, //一键停止
               // 传感器参数设置相关字段，确保初始化
@@ -1059,7 +912,7 @@ export default {
       }
     },
     // 失去焦点
-    handleBlur() {},
+    handleBlur() { },
     // 获取热水设备列表
     getWaterList() {
       return new Promise((resolve, reject) => {
@@ -1108,8 +961,8 @@ export default {
                         Number(item.switchStatus) === 0
                           ? false
                           : Number(item.switchStatus) === 4
-                          ? true
-                          : "未知状态", // 热泵开关状态
+                            ? true
+                            : "未知状态", // 热泵开关状态
                       switchStatus:
                         Number(item.switchStatus) == 0 ? false : true, //启停控制
                       alarmStatus:
@@ -1155,8 +1008,7 @@ export default {
     // 一键启动
     handleAllStart(item) {
       this.$confirm(
-        `确定要 ${item.openSwitch ? "一键开启" : "关闭一键开启"} ${
-          item.name
+        `确定要 ${item.openSwitch ? "一键开启" : "关闭一键开启"} ${item.name
         }的设备吗?`,
         "提示",
         {
@@ -1183,8 +1035,7 @@ export default {
     // 一键停止
     handleAllEnd(item) {
       this.$confirm(
-        `确定要 ${item.closeSwitch ? "一键停止" : "关闭一键停止"} ${
-          item.name
+        `确定要 ${item.closeSwitch ? "一键停止" : "关闭一键停止"} ${item.name
         }的设备吗?`,
         "提示",
         {
@@ -1222,13 +1073,12 @@ export default {
         .then(() => {
           this.hadleOperationConrol(id, value);
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 设置热泵开关状态
     handleHotPump(item) {
       this.$confirm(
-        `确定要切换设备"${item.name}"的状态为:${
-          item.hotPumpStatus ? "开机" : "关机 吗?"
+        `确定要切换设备"${item.name}"的状态为:${item.hotPumpStatus ? "开机" : "关机 吗?"
         }`,
         "提示",
         {
@@ -1257,8 +1107,7 @@ export default {
     // 设置供水泵手自动状态
     handAutomatic(item) {
       this.$confirm(
-        `确定要切换设备"${item.name}"的状态为:${
-          item.handAutomaticSwitch ? "手动" : "自动 吗?"
+        `确定要切换设备"${item.name}"的状态为:${item.handAutomaticSwitch ? "手动" : "自动 吗?"
         }`,
         "提示",
         {
@@ -1286,8 +1135,7 @@ export default {
     // 设置启停控制
     handleSwitch(item) {
       this.$confirm(
-        `确定要切换设备"${item.name}"的状态为:${
-          item.switchStatus ? "开启" : "停止 吗?"
+        `确定要切换设备"${item.name}"的状态为:${item.switchStatus ? "开启" : "停止 吗?"
         }`,
         "提示",
         {
@@ -1384,17 +1232,20 @@ export default {
   justify-content: space-between;
   align-items: stretch;
   height: 100%;
+
   .left-tree {
     width: 256px;
     padding: 15px 10px;
     border: 1px solid #004b8c;
     min-height: 800px;
+
     .status {
       display: flex;
       flex-direction: row;
       justify-content: space-between;
       flex-wrap: wrap;
       margin-top: 20px;
+
       .status-li {
         width: 50%;
         display: flex;
@@ -1403,6 +1254,7 @@ export default {
         justify-content: center;
         margin-bottom: 15px;
       }
+
       .status1,
       .status2,
       .status3,
@@ -1412,6 +1264,7 @@ export default {
         align-items: center;
         margin-bottom: 5px;
       }
+
       .status1::before {
         content: "";
         width: 10px;
@@ -1420,6 +1273,7 @@ export default {
         background-color: #00d2ff;
         margin-right: 5px;
       }
+
       .status2::before {
         content: "";
         width: 10px;
@@ -1428,6 +1282,7 @@ export default {
         background-color: #ff2f2f;
         margin-right: 5px;
       }
+
       .status3::before {
         content: "";
         width: 10px;
@@ -1436,6 +1291,7 @@ export default {
         background-color: #ff9908;
         margin-right: 5px;
       }
+
       .status4::before {
         content: "";
         width: 10px;
@@ -1446,11 +1302,13 @@ export default {
       }
     }
   }
+
   .right-monitor {
     width: calc(100% - 280px);
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
+
     .buildingDiv {
       padding-left: 54px;
       display: flex;
@@ -1458,6 +1316,7 @@ export default {
       align-items: center;
       margin-bottom: 20px;
       position: relative;
+
       .title-bg {
         width: 208px;
         height: 38px;
@@ -1465,6 +1324,7 @@ export default {
         left: 0;
         z-index: 0;
       }
+
       .title-word {
         z-index: 10;
         font-family: YouSheBiaoTiHei;
@@ -1473,6 +1333,7 @@ export default {
         white-space: nowrap;
       }
     }
+
     .monitor-context {
       height: 640px;
       width: 100%;
@@ -1485,6 +1346,7 @@ export default {
       align-content: flex-start;
     }
   }
+
   .monitor-context {
     height: 650px;
     width: 100%;
@@ -1495,6 +1357,7 @@ export default {
     justify-content: flex-start;
     flex-wrap: wrap;
     align-content: flex-start;
+
     .monitor-li {
       display: flex;
       flex-direction: column;
@@ -1504,14 +1367,13 @@ export default {
       margin: 0 10px;
       padding-bottom: 25px;
       margin-bottom: 16px !important;
-      background: linear-gradient(
-        to top,
-        rgba(0, 94, 173, 0.6) 0%,
-        rgba(0, 94, 173, 0.1) 100%
-      );
+      background: linear-gradient(to top,
+          rgba(0, 94, 173, 0.6) 0%,
+          rgba(0, 94, 173, 0.1) 100%);
       overflow: hidden;
       position: relative;
       border-radius: 10px;
+
       .monitor-title {
         width: 100%;
         height: 50px;
@@ -1525,6 +1387,7 @@ export default {
         color: #ffffff;
         text-align: center;
       }
+
       .monitor-flex {
         width: 100%;
         display: flex;
@@ -1533,30 +1396,36 @@ export default {
         align-items: center;
         justify-content: space-between;
         margin-top: 20px;
+
         .monitor-flex-left {
           padding: 0 0.2rem;
           display: flex;
           flex-direction: column;
           width: 100%;
+
           .control-top {
             display: flex;
             flex-direction: row;
             align-items: center;
             justify-content: space-between;
             width: 100%;
+
             .monitor-img1 {
               width: 1.2rem;
               height: 1.2rem;
             }
+
             .monitor-img2 {
               width: 1.2rem;
               height: 0.8rem;
             }
+
             .monitor-img3 {
               width: 1.2rem;
               height: 0.8rem;
             }
           }
+
           .control-bottom {
             width: 100%;
             display: flex;
@@ -1565,14 +1434,17 @@ export default {
             justify-content: space-between;
             margin-top: 20px;
           }
+
           .ash {
             color: #b8bfcb;
             white-space: nowrap;
             margin-right: 8px;
           }
+
           .white {
             color: #ffffff;
           }
+
           .words-li {
             display: flex;
             flex-direction: row;
@@ -1582,49 +1454,63 @@ export default {
             line-height: 28px;
             margin-bottom: 10px;
           }
+
           .monitor-words {
             flex-wrap: wrap;
+
             .words-li {
               width: 100%;
             }
           }
+
           .control-bottom {
             flex-wrap: wrap;
+
             .words-li {
               width: 45%;
               flex-wrap: nowrap;
             }
+
             .words-li2 {
               width: 100%;
               display: flex;
               flex-direction: row;
               align-items: center;
             }
+
             .words-li3 {
               width: 36%;
             }
+
             .words-li4 {
               width: 45%;
+
               .ash {
                 width: 80px;
               }
             }
+
             .words-li5 {
               width: 45%;
+
               .ash2 {
                 width: 100px;
               }
             }
+
             .words-li6 {
               width: 70%;
+
               .ash2 {
                 width: 100px;
               }
             }
           }
+
           .sigClass {
             width: 40%;
             flex-wrap: wrap;
+
             .words-li {
               width: 100%;
             }
@@ -1632,6 +1518,7 @@ export default {
         }
       }
     }
+
     .monitor-li::before {
       content: "";
       position: absolute;
@@ -1641,31 +1528,39 @@ export default {
       bottom: 0;
       border-radius: 10px;
       border: 1px solid transparent;
-      background: linear-gradient(
-          0deg,
+      background: linear-gradient(0deg,
           #0088f0 0%,
-          rgba(19, 213, 255, 0.2) 100%
-        )
-        border-box;
+          rgba(19, 213, 255, 0.2) 100%) border-box;
       mask: linear-gradient(#fff 0 0) padding-box,
-        /* 内部透明 */ linear-gradient(#fff 0 0); /* 填充整个区域 */
-      mask-composite: exclude; /* 关键属性 */
-      pointer-events: none; /* 防止遮挡点击事件 */
+        /* 内部透明 */
+        linear-gradient(#fff 0 0);
+      /* 填充整个区域 */
+      mask-composite: exclude;
+      /* 关键属性 */
+      pointer-events: none;
+      /* 防止遮挡点击事件 */
     }
   }
 }
+
 .tree-container {
-  height: 300px; /* 设置固定高度 */
-  overflow-y: auto; /* 启用垂直滚动条 */
+  height: 300px;
+  /* 设置固定高度 */
+  overflow-y: auto;
+  /* 启用垂直滚动条 */
 }
+
 // 滚动条
 :-webkit-scrollbar {
-  width: 10px; /* 滚动条宽度 */
+  width: 10px;
+  /* 滚动条宽度 */
 }
 
 ::-webkit-scrollbar-track {
-  background: transparent !important; /* 滚动条轨道背景色 */
+  background: transparent !important;
+  /* 滚动条轨道背景色 */
 }
+
 .custom-tree-node {
   flex: 1;
   display: flex;
@@ -1673,56 +1568,67 @@ export default {
   justify-content: space-between;
   font-size: 14px;
   padding-right: 8px;
+
   .tree-left {
     .custom-tree-icon {
       margin-right: 5px;
     }
   }
 }
+
 @media (min-width: 1350px) and (max-width: 1460px) {
-  .monitor-img3 {
-  }
+  .monitor-img3 {}
 }
+
 @media (min-width: 1350px) and (max-width: 1850px) {
   .monitor-li {
     width: calc(49% - 10px) !important;
     margin: 0 5px !important;
   }
+
   .monitor-img1 {
     width: 100px !important;
     height: 100px !important;
   }
+
   .monitor-img2 {
     width: 100px !important;
     height: 60px !important;
   }
+
   .monitor-img3 {
     width: 1.2rem !important;
     height: 0.9rem !important;
   }
 }
+
 @media (max-width: 1350px) {
   .monitor-li {
     width: 100% !important;
     margin: 0 !important;
     margin-right: 10px !important;
+
     .monitor-img1 {
       width: 100px !important;
       height: 100px !important;
     }
+
     .monitor-img2 {
       width: 100px !important;
       height: 80px !important;
     }
+
     .monitor-img3 {
       width: 100px !important;
       height: 80px !important;
     }
+
     .monitor-flex-left {
       padding: 0 30px !important;
     }
   }
 }
+
 // 媒体查询，适配大于2000px分辨率的大屏样式
 @media (min-width: 2000px) {
   .app-container {
@@ -1730,17 +1636,21 @@ export default {
       width: 2.56rem !important;
       padding: 0.15rem 0.1rem !important;
       min-height: 8rem !important;
+
       .status {
         margin-top: 0.2rem !important;
+
         .status-li {
           margin-bottom: 0.15rem !important;
         }
+
         .status1,
         .status2,
         .status3,
         .status4 {
           margin-bottom: 0.05rem !important;
         }
+
         .status1::before,
         .status2::before,
         .status3::before,
@@ -1751,25 +1661,32 @@ export default {
         }
       }
     }
+
     .right-monitor {
       width: calc(100% - 2.8rem) !important;
+
       .buildingDiv {
         padding-left: 0.54rem !important;
         margin-bottom: 0.2rem !important;
+
         .title-bg {
           width: 2.08rem !important;
           height: 0.38rem !important;
         }
+
         .title-word {
           font-size: 0.24rem !important;
         }
       }
+
       .monitor-context {
         height: 6.4rem !important;
       }
     }
+
     .monitor-context {
       height: 6.5rem !important;
+
       .monitor-li {
         min-height: 1.6rem !important;
         width: calc(33.33% - 0.2rem) !important;
@@ -1777,36 +1694,44 @@ export default {
         padding-bottom: 0.25rem !important;
         margin-bottom: 0.16rem !important;
         border-radius: 0.1rem !important;
+
         .monitor-title {
           height: 0.5rem !important;
           font-size: 0.18rem !important;
           line-height: 0.4rem !important;
         }
+
         .monitor-flex {
           margin-top: 0.2rem !important;
+
           .monitor-flex-left {
             .control-bottom {
               margin-top: 0.2rem !important;
             }
+
             .ash {
               margin-right: 0.08rem !important;
             }
+
             .words-li {
               font-size: 0.16rem !important;
               line-height: 0.28rem !important;
               margin-bottom: 0.1rem !important;
             }
+
             .control-bottom {
               .words-li4 {
                 .ash {
                   width: 1.3rem !important;
                 }
               }
+
               .words-li5 {
                 .ash2 {
                   width: 1rem !important;
                 }
               }
+
               .words-li6 {
                 .ash2 {
                   width: 1rem !important;
@@ -1816,6 +1741,7 @@ export default {
           }
         }
       }
+
       .monitor-li::before {
         border-radius: 0.1rem !important;
       }
@@ -1825,19 +1751,18 @@ export default {
 </style>
 <style scoped>
 /* 自定义高亮颜色 */
-.left-tree
-  >>> .el-tree--highlight-current
-  .el-tree-node.is-current
-  > .el-tree-node__content {
+.left-tree>>>.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
   background-color: #285b9e !important;
   /* color: #f56c6c;  */
   color: #25f1f8;
 }
-.monitor-flex-left >>> .el-input {
+
+.monitor-flex-left>>>.el-input {
   width: 80px !important;
   margin: 0 5px;
 }
-.monitor-flex-left >>> .el-input__inner {
+
+.monitor-flex-left>>>.el-input__inner {
   background-color: #04193a;
   border: 1px solid #1262db;
   color: #3ef0fd;
@@ -1845,9 +1770,10 @@ export default {
   text-align: center;
   padding: 0 0.1rem !important;
 }
+
 /* // 媒体查询，适配大于2000px分辨率的大屏样式 */
 @media (min-width: 2000px) {
-  .monitor-flex-left >>> .el-input {
+  .monitor-flex-left>>>.el-input {
     width: 0.8rem !important;
     margin: 0 0.15rem 0 0.05rem !important;
   }
diff --git a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
index d7ec338..d922ce0 100644
--- a/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
+++ b/src/views/hotWater/waterMonitor/waterMonitorDetails.vue
@@ -62,6 +62,8 @@
               <div class="flow-text text3">无线网关</div>
               <div class="flow-text text4">回水阀</div>
               <div class="flow-text text5">房间</div>
+              <div class="flow-text text20">水箱1</div>
+              <div class="flow-text text21">水箱2</div>
               <!-- 供水定位 -->
               <img class="supply" v-if="
                 this.upWaterState1 === '1' ||
@@ -178,41 +180,41 @@
                 ? require('../../../assets/flowimg/badweb.png')
                 : require('../../../assets/flowimg/onlineweb.png')
                 " alt="" />
-              <!-- 保温水箱1定位 -->
+              <!-- 保温水箱2定位 -->
               <img class="waterBox1" src="../../../assets/flowimg/waterBox.png" alt="" />
 
-              <!-- 温度定位1 -->
+              <!-- 温度定位2 -->
               <img class="tem1" src="../../../assets/flowimg/thermometer.png" alt="" />
               <div class="temContainer1">
-                <div class="temprogress" :style="{ height: temdata1 + '%' }"></div>
+                <div class="temprogress" :style="{ height: temdata2 + '%' }"></div>
               </div>
-              <b class="temdiv1">{{ temdata1 }}℃</b>
-              <!-- 水位定位1 -->
-              <div class="progressContainer1" v-if="progress1 > 50">
-                <div class="progress" :style="{ height: progress1 + '%' }"></div>
-                <b class="propo">{{ progress1 }}%</b>
+              <b class="temdiv1">{{ temdata2 }}℃</b>
+              <!-- 水位定位2 -->
+              <div class="progressContainer1" v-if="progress2 > 50">
+                <div class="progress" :style="{ height: progress2 + '%' }"></div>
+                <b class="propo">{{ progress2 }}%</b>
               </div>
               <div class="progressContainer2" v-else>
-                <div class="progress" :style="{ height: progress1 + '%' }"></div>
-                <b class="propo">{{ progress1 }}%</b>
+                <div class="progress" :style="{ height: progress2 + '%' }"></div>
+                <b class="propo">{{ progress2 }}%</b>
               </div>
 
-              <!-- 保温水箱2定位 -->
+              <!-- 保温水箱1定位 -->
               <img class="waterBox2" src="../../../assets/flowimg/waterBox.png" alt="" />
-              <!-- 温度定位2 -->
+              <!-- 温度定位1 -->
               <img class="tem2" src="../../../assets/flowimg/thermometer.png" alt="" />
               <div class="temContainer2">
-                <div class="temprogress" :style="{ height: temdata2 + '%' }"></div>
+                <div class="temprogress" :style="{ height: temdata1 + '%' }"></div>
               </div>
-              <b class="temdiv2">{{ temdata2 }}℃</b>
-              <!-- 水位定位2 -->
-              <div class="progressContainer3" v-if="progress2 > 50">
-                <div class="progress" :style="{ height: progress2 + '%' }"></div>
-                <b class="propo">{{ progress2 }}%</b>
+              <b class="temdiv2">{{ temdata1 }}℃</b>
+              <!-- 水位定位1 -->
+              <div class="progressContainer3" v-if="progress1 > 50">
+                <div class="progress" :style="{ height: progress1 + '%' }"></div>
+                <b class="propo">{{ progress1 }}%</b>
               </div>
               <div class="progressContainer4" v-else>
-                <div class="progress" :style="{ height: progress2 + '%' }"></div>
-                <b class="propo">{{ progress2 }}%</b>
+                <div class="progress" :style="{ height: progress1 + '%' }"></div>
+                <b class="propo">{{ progress1 }}%</b>
               </div>
             </div>
           </div>
@@ -1274,6 +1276,18 @@ export default {
             left: 3.4rem;
             z-index: 1;
           }
+          .text20 {
+            position: absolute;
+            top: 3.4rem;
+            left: 5.8rem;
+            z-index: 1;
+          }
+          .text21 {
+            position: absolute;
+            top: 3.4rem;
+            left: 3rem;
+            z-index: 1;
+          }
 
           .replenish {
             position: absolute;