From 49eca822b23fb3d05848297c0fe2dcbe8ba5cc08 Mon Sep 17 00:00:00 2001
From: "3067418132@qq.com" <ljf25604@163.com>
Date: Fri, 24 Apr 2026 19:10:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=83=AD=E6=B3=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=AE=BE=E5=AE=9A=E6=B8=A9=E5=BA=A6=E6=95=B4=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AA=E8=83=BD=E8=BE=93=E5=85=A5=E6=95=B4=E6=95=B0?=
 =?UTF-8?q?=EF=BC=9B=202=E3=80=81=E5=BE=AA=E7=8E=AF=E6=B3=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=AC=E5=9C=B0=E8=BF=9C=E7=A8=8B=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=9B=203=E3=80=81=E4=BC=A0=E6=84=9F=E5=99=A8=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE=E5=8E=BB=E6=8E=89=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E9=87=8F=E4=B8=8A=E4=B8=8B=E9=99=90=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Copilot <copilot@github.com>
---
 src/views/hotWater/waterControl/index.vue | 29 +++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue
index 42368b9..ed601cc 100644
--- a/src/views/hotWater/waterControl/index.vue
+++ b/src/views/hotWater/waterControl/index.vue
@@ -72,7 +72,7 @@
                 <div class="words-li">
                   <div class="ash">设定温度:</div>
                   <div class="white">
-                    <el-input size="mini" v-model="item.tempSet" placeholder="请输入" @keyup.enter.native="
+                    <el-input size="mini" v-model="item.tempSet" placeholder="请输入" step="1" @keyup.enter.native="
                       handleEnter(
                         item,
                         item.tempSet,
@@ -80,7 +80,7 @@
                         '设定温度',
                         '℃'
                       )
-                      " @input="handleInput(item)" @blur="handleBlur()"></el-input>
+                      " @input="handleInputInt(item)" @blur="handleBlur()"></el-input>
                   </div>
                 </div>
               </div>
@@ -133,6 +133,14 @@
                   <div class="white">{{ item.runningTime }}</div>
                   <div class="white">小时</div>
                 </div>
+                <div class="words-li">
+                  <div class="ash">本地远程信号:</div>
+                  <el-tag size="mini" v-if="item.localRemoteStatus === '远程'" type="success">{{ item.localRemoteStatus
+                  }}</el-tag>
+                  <el-tag size="mini" v-else type="danger">{{
+                    item.localRemoteStatus
+                  }}</el-tag>
+                </div>
               </div>
             </div>
             <!-- 裙楼供水泵、高区供水泵、中厨供水泵 -->
@@ -650,7 +658,7 @@
                   <div class="white" v-else-if="item.name.includes('压力')">bar</div>
                   <div class="white" v-else-if="item.name.includes('液位')">米</div>
                 </div>
-                <div class="words-li words-li4">
+                <!-- <div class="words-li words-li4">
                   <div class="ash">数字上限:</div>
                   <el-input v-model="item.digitalMaxValue" size="mini" placeholder="请输入" @keyup.enter.native="
                     handleEnter(
@@ -673,7 +681,7 @@
                       ''
                     )
                     " @input="handleInput(item)" @blur="handleBlur()"></el-input>
-                </div>
+                </div> -->
                 <div class="words-li words-li4">
                   <div class="ash">设定上限值:</div>
                   <el-input
@@ -984,8 +992,13 @@ export default {
             // 在每次迭代时创建一个新的 deviceItem 对象
             let deviceItem = {
               ...item,
+              tempSet: 
+                (this.activeName.includes('热泵') && item.tempSet) 
+                  ? Math.round(Number(item.tempSet)) 
+                  : item.tempSet || '',
               waterLevel: Number(item.waterLevel),
               runningStatus: Number(item.runningStatus) === 0 ? "停止" : "运行", //运行状态
+              localRemoteStatus: Number(item.localRemoteStatus) == 0 ? "远程" : "本地", //本地/远程控制状态
               hotPumpStatus:
                 Number(item.switchStatus) === 0
                   ? false
@@ -1063,8 +1076,13 @@ export default {
                     // 在每次迭代时创建一个新的 deviceItem 对象
                     let deviceItem = {
                       ...item,
+                      tempSet: 
+                      (this.activeName.includes('热泵') && item.tempSet) 
+                        ? Math.round(Number(item.tempSet)) 
+                        : item.tempSet || '',
                       waterLevel: Number(item.waterLevel),
                       runningStatus: Number(item.runningStatus) === 0 ? "停止" : "运行", //运行状态
+                      localRemoteStatus: Number(item.localRemoteStatus) === 0 ? "远程" : "本地", //本地远程状态
                       hotPumpStatus:
                         Number(item.switchStatus) === 0
                           ? false
@@ -1311,6 +1329,9 @@ export default {
         item.tempSet = parts[0] + "." + parts[1].slice(0, 2);
       }
     },
+    handleInputInt(item) {
+       item.tempSet = String(item.tempSet).replace(/[^\d]/g, "");
+    },
     handleWaterInput(item) {
       item.waterLevelSet = String(item.waterLevelSet).replace(/[^\d.]/g, "");
       // 确保只有一个小数点