1、热水控制水箱新增显示；

2、水位修改成“米”单位；

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,

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="words-li words-li5" v-show="item.waterLevelSet !== null && item.waterLevelSet !== undefined">
-                  <div class="ash ash2">设置液位:</div>
+                  <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 class="white">米</div>
-                </div> -->
+                </div>
-                <!-- <div class="words-li words-li6">
+                <div class="words-li words-li5" v-show="item.waterLevelErrorSet !== null && item.waterLevelErrorSet !== undefined">
-                  <div class="ash">液位设定延时时间:</div>
+                  <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.waterLevelErrorSet,
-                        item.delayTimeSetId,
+                        item.waterLevelErrorSetId,
-                        '液位设定延时时间',
+                        '液位误差值1',
-                        'min'
+                        '%'
                       )
                     "
                     @input="handleWaterInput(item)"
                   ></el-input>
-                  <div class="white">min</div>
+                  <div class="white">米</div>
                 </div> 
-                <div class="words-li words-li2">
+                <div class="words-li words-li4" v-show="item.waterLevelSet1 !== null && item.waterLevelSet1 !== undefined">
-                  <div class="ash ash2">液位误差值:</div>
+                  <div class="ash ash2">补水液位2:</div>
                   <el-input
                     size="mini"
-                    v-model="item.diffValueSet"
+                    v-model="item.waterLevelSet1"
                     placeholder="请输入"
                     @keyup.enter.native="
                       handleEnter(
                         item,
-                        item.diffValueSet,
+                        item.waterLevelSet1,
-                        item.diffValueSetId,
+                        item.waterLevelSetId1,
-                        '液位误差值',
+                        '液位设置',
                         '%'
                       )
                     "
                     @input="handleWaterInput(item)"
                   ></el-input>
-                  <div class="white">%</div>
+                  <div class="white">米</div>
-                </div> -->
+                </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.waterLevelErrorSet1"
+                    placeholder="请输入"
+                    @keyup.enter.native="
+                      handleEnter(
+                        item,
+                        item.waterLevelErrorSet1,
+                        item.waterLevelErrorSetId1,
+                        '液位误差值2',
+                        '%'
+                      )
+                    "
+                    @input="handleWaterInput(item)"
+                  ></el-input>
+                  <div class="white">米</div>
+                </div> 
                 <div class="words-li words-li2">
                   <div class="ash">时间:</div>
                   <div class="white">{{ item.curTime }}</div>