From ac91f0837caeb852b7acfe9ef962621c5d358653 Mon Sep 17 00:00:00 2001
From: mh <ljf25604@163.com>
Date: Tue, 27 May 2025 14:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B7=E7=83=AD=E6=BA=90=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aircAndWindc/awSysMonitor/index.vue |  8 +--
 src/views/hotWater/waterControl/index.vue     | 49 ++++++++++---------
 src/views/hotWater/waterMonitor/index.vue     |  2 +-
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/views/aircAndWindc/awSysMonitor/index.vue b/src/views/aircAndWindc/awSysMonitor/index.vue
index b07eb63..100a55d 100644
--- a/src/views/aircAndWindc/awSysMonitor/index.vue
+++ b/src/views/aircAndWindc/awSysMonitor/index.vue
@@ -247,11 +247,11 @@
             </div>
           </div>
           <div class="wind-valve" v-if="isObjectValid(airValveBackObj)">
-            <div class="wind-text">风阀反馈：</div>
+            <div class="wind-text">新风阀反馈：</div>
             <div>{{ airValveBackObj.collectValue }}%</div>
           </div>
           <div class="wind-valve2" v-if="isObjectValid(airValveObj)">
-            <div class="wind-text">风阀调节</div>
+            <div class="wind-text">新风阀调节</div>
             <el-input
               @keyup.enter.native="handleEnter(airValveObj, $event, '%')"
               @input="handleInput(airValveObj)"
@@ -517,7 +517,7 @@ export default {
                 //风阀调节
                 else if (
                   item.paramType === "3" &&
-                  item.collectName.includes("新风风阀")
+                  item.collectName.includes("新风阀")
                 ) {
                   this.airValveObj = item;
                 }
@@ -528,7 +528,7 @@ export default {
                 //水阀调节
                 else if (
                   item.paramType === "3" &&
-                  item.collectName.includes("调节阀")
+                  item.collectName.includes("水阀调节")
                 ) {
                   this.waterValveObj = item;
                 }
diff --git a/src/views/hotWater/waterControl/index.vue b/src/views/hotWater/waterControl/index.vue
index 270f705..a89a211 100644
--- a/src/views/hotWater/waterControl/index.vue
+++ b/src/views/hotWater/waterControl/index.vue
@@ -129,7 +129,7 @@
                 />
                 <div class="monitor-words">
                   <div class="words-li">
-                    <div class="ash">PID手自动:</div>
+                    <div class="ash" style="letter-spacing: 5px;">频率手自动:</div>
                     <div class="white">
                       <el-switch
                         style="display: block"
@@ -143,7 +143,7 @@
                     </div>
                   </div>
                   <div class="words-li">
-                    <div class="ash">启&nbsp;停&nbsp;控&nbsp;制:</div>
+                    <div class="ash" style="letter-spacing: 7px;">启停&nbsp;控制:</div>
                     <div class="white">
                       <el-switch
                         style="display: block"
@@ -160,7 +160,7 @@
               </div>
               <div class="control-bottom">
                 <div class="words-li">
-                  <div class="ash">故障信息:</div>
+                  <div class="ash">故障信息：</div>
                   <el-tag
                     size="mini"
                     v-if="item.alarmStatus === '无故障'"
@@ -172,7 +172,7 @@
                   }}</el-tag>
                 </div>
                 <div class="words-li">
-                  <div class="ash">运行状态:</div>
+                  <div class="ash">运行状态：</div>
                   <el-tag
                     size="mini"
                     v-if="item.runningStatus === '运行'"
@@ -245,23 +245,26 @@
                   <div class="white">S</div>
                 </div>
                 <div class="words-li">
-                  <div class="ash">换机周期:</div>
+                  <div class="ash">换机时间:</div>
                   <el-input
-                    v-model="item.switchTimeSet"
+                    v-model="item.counterSet"
                     @keyup.enter.native="
                       handleEnter(
                         item,
-                        item.switchTimeSet,
-                        item.switchTimeSetId,
-                        '换机周期',
-                        'S'
+                        item.counterSet,
+                        item.counterSetId,
+                        '换机时间',
+                        '次'
                       )
                     "
                     @input="handleInput(item)"
                     @blur="handleBlur()"
                     size="mini"
                   ></el-input>
-                  <div class="white">min</div>
+                  <div class="white">次</div>
+                </div>
+                <div class="words-li">
+                  <div class="white">一次50分钟</div>
                 </div>
               </div>
             </div>
@@ -311,7 +314,7 @@
                   <div class="white">%</div>
                 </div>
                 <div class="words-li words-li5">
-                  <div class="ash">补水延时时间:</div>
+                  <div class="ash">液位设定延时时间:</div>
                   <el-input
                     size="mini"
                     v-model="item.delayTimeSet"
@@ -321,13 +324,13 @@
                         item,
                         item.delayTimeSet,
                         item.delayTimeSetId,
-                        '补水延时时间',
-                        'S'
+                        '液位设定延时时间',
+                        'min'
                       )
                     "
                     @input="handleWaterInput(item)"
                   ></el-input>
-                  <div class="white">S</div>
+                  <div class="white">min</div>
                 </div>
                 <div class="words-li words-li5">
                   <div class="ash ash2">液位误差值:</div>
@@ -369,22 +372,22 @@
                   class="monitor-img2"
                   src="../../../assets/images/startpum.png"
                 />
-                <div class="sigClass">
+                <div class="monitor-words">
                   <div class="words-li">
-                    <div class="ash">启动:</div>
+                    <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=""
+                        active-text="开启"
+                        inactive-text="停止"
                         @change="handleAllStart(item)"
                       >
                       </el-switch>
                     </div>
                   </div>
-                  <div class="words-li">
+                  <!-- <div class="words-li">
                     <div class="ash">停止:</div>
                     <div class="white">
                       <el-switch
@@ -397,7 +400,7 @@
                       >
                       </el-switch>
                     </div>
-                  </div>
+                  </div> -->
                 </div>
               </div>
               <div class="control-bottom">
@@ -459,7 +462,7 @@
                     item.alarmStatus
                   }}</el-tag>
                 </div>
-                <div class="words-li words-li4">
+                <!-- <div class="words-li words-li4">
                   <div class="ash">补水延时时间设定:</div>
                   <el-input
                     v-model="item.delayTimeSet"
@@ -477,7 +480,7 @@
                     size="mini"
                   ></el-input>
                   <div class="white">S</div>
-                </div>
+                </div> -->
               </div>
             </div>
           </div>
diff --git a/src/views/hotWater/waterMonitor/index.vue b/src/views/hotWater/waterMonitor/index.vue
index b15ec7d..88f52d7 100644
--- a/src/views/hotWater/waterMonitor/index.vue
+++ b/src/views/hotWater/waterMonitor/index.vue
@@ -516,7 +516,7 @@ export default {
               baseltem.unit = "℃";
             }
             if (item.name.includes("压力")) {
-              baseltem.unit = "Mpa";
+              baseltem.unit = "bar";
             }
             if (item.value.includes("采集失败")) {
               baseltem.value = "0";