From aca94f4fe6b30555888ac43a03e01711e8c4340e Mon Sep 17 00:00:00 2001
From: "3067418132@qq.com" <ljf25604@163.com>
Date: Thu, 23 Apr 2026 16:48:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=83=AD=E6=B0=B4=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E6=B0=B4=E7=AE=B1=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA=EF=BC=9B?=
 =?UTF-8?q?=202=E3=80=81=E6=B0=B4=E4=BD=8D=E4=BF=AE=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E2=80=9C=E7=B1=B3=E2=80=9D=E5=8D=95=E4=BD=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energyAnalysis/components/waterReport.vue |  2 +-
 src/views/hotWater/waterControl/index.vue     | 59 ++++++++++++-------
 2 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/views/hotWater/energyAnalysis/components/waterReport.vue b/src/views/hotWater/energyAnalysis/components/waterReport.vue
index a29214d..b686cd6 100644
--- a/src/views/hotWater/energyAnalysis/components/waterReport.vue
+++ b/src/views/hotWater/energyAnalysis/components/waterReport.vue
@@ -223,7 +223,7 @@ export default {
     },
     //渲染
     renderingBroken() {
-      this.brokenOption.yAxis.name = "%";
+      this.brokenOption.yAxis.name = "米";
       this.brokenOption.yAxis.nameTextStyle = {
         color: "rgba(255, 255, 255, 1)",
         fontSize: 12,
diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue
index e8a65aa..caf597d 100644
--- a/src/views/hotWater/waterControl/index.vue
+++ b/src/views/hotWater/waterControl/index.vue
@@ -339,8 +339,8 @@
                   <div class="ash">实际温度:</div>
                   <div class="white">{{ item.temp }} ℃</div>
                 </div>
-                <!-- <div class="words-li words-li5">
-                  <div class="ash ash2">设置液位:</div>
+                <div class="words-li words-li5" v-show="item.waterLevelSet !== null && item.waterLevelSet !== undefined">
+                  <div class="ash ash2">补水液位1:</div>
                   <el-input
                     size="mini"
                     v-model="item.waterLevelSet"
@@ -356,46 +356,65 @@
                     "
                     @input="handleWaterInput(item)"
                   ></el-input>
-                  <div class="white">%</div>
-                </div> -->
-                <!-- <div class="words-li words-li6">
-                  <div class="ash">液位设定延时时间:</div>
+                  <div class="white">米</div>
+                </div>
+                <div class="words-li words-li5" v-show="item.waterLevelErrorSet !== null && item.waterLevelErrorSet !== undefined">
+                  <div class="ash ash2">补水误差1:</div>
                   <el-input
                     size="mini"
-                    v-model="item.delayTimeSet"
+                    v-model="item.waterLevelErrorSet"
                     placeholder="请输入"
                     @keyup.enter.native="
                       handleEnter(
                         item,
-                        item.delayTimeSet,
-                        item.delayTimeSetId,
-                        '液位设定延时时间',
-                        'min'
+                        item.waterLevelErrorSet,
+                        item.waterLevelErrorSetId,
+                        '液位误差值1',
+                        '%'
+                      )
+                    "
+                    @input="handleWaterInput(item)"
+                  ></el-input>
+                  <div class="white">米</div>
+                </div> 
+                <div class="words-li words-li4" v-show="item.waterLevelSet1 !== null && item.waterLevelSet1 !== undefined">
+                  <div class="ash ash2">补水液位2:</div>
+                  <el-input
+                    size="mini"
+                    v-model="item.waterLevelSet1"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.waterLevelSet1,
+                        item.waterLevelSetId1,
+                        '液位设置',
+                        '%'
                       )
                     "
                     @input="handleWaterInput(item)"
                   ></el-input>
-                  <div class="white">min</div>
+                  <div class="white">米</div>
                 </div>
-                <div class="words-li words-li2">
-                  <div class="ash ash2">液位误差值:</div>
+                <div class="words-li words-li4" v-show="item.waterLevelErrorSet1 !== null && item.waterLevelErrorSet1 !== undefined">
+                  <div class="ash ash2">补水误差2:</div>
                   <el-input
                     size="mini"
-                    v-model="item.diffValueSet"
+                    v-model="item.waterLevelErrorSet1"
                     placeholder="请输入"
                     @keyup.enter.native="
                       handleEnter(
                         item,
-                        item.diffValueSet,
-                        item.diffValueSetId,
-                        '液位误差值',
+                        item.waterLevelErrorSet1,
+                        item.waterLevelErrorSetId1,
+                        '液位误差值2',
                         '%'
                       )
                     "
                     @input="handleWaterInput(item)"
                   ></el-input>
-                  <div class="white">%</div>
-                </div> -->
+                  <div class="white">米</div>
+                </div> 
                 <div class="words-li words-li2">
                   <div class="ash">时间:</div>
                   <div class="white">{{ item.curTime }}</div>