From 99789a5a4444858f8c6ea56ab537c38531f21dbe Mon Sep 17 00:00:00 2001
From: selia-zx <1771203023@qq.com>
Date: Wed, 15 Oct 2025 09:20:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=BC=8F=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=87=8C=E9=9D=A2=E7=9A=84=E9=80=89=E6=8B=A9=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=202.=E4=BF=AE=E6=94=B9=E9=A3=8E=E6=9C=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=9A=84=E5=AE=9A=E4=BD=8D=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../awSysMonitor/asSysMonitorDetails.vue      | 10 ++++-
 .../awSysMonitor/components/damperMonitor.vue | 43 ++++++++-----------
 .../awSysMonitor/components/normalMonitor.vue |  2 +-
 3 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue b/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue
index 8a9f966..e2babda 100644
--- a/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue
+++ b/src/views/aircAndWindc/awSysMonitor/asSysMonitorDetails.vue
@@ -342,7 +342,10 @@ export default {
               console.log("当前选中节点层级", this.currentLevel);
               console.log("当前选中节点名称", this.currentName);
               //  传给子组件,触发子组件getWindList()
-              if (this.currentName.includes("新风阀")) {
+              if (
+                this.currentName.includes("新风阀") ||
+                this.currentName.includes("AHU")
+              ) {
                 this.isShowdamper = true;
                 this.$nextTick(() => {
                   this.$refs.damperMonitorRef.getWindList();
@@ -440,7 +443,10 @@ export default {
         console.log("当前选中节点层级", this.currentLevel);
         console.log("当前选中节点名称", this.currentName);
         // 传给子组件,触发子组件getWindList()
-        if (this.currentName.includes("新风阀")) {
+        if (
+          this.currentName.includes("新风阀") ||
+          this.currentName.includes("AHU")
+        ) {
           this.isShowdamper = true;
           this.$nextTick(() => {
             this.$refs.damperMonitorRef.getWindList();
diff --git a/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue b/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue
index f9f80e1..07cbd4c 100644
--- a/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue
+++ b/src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue
@@ -363,9 +363,7 @@
             class="context-li"
             v-if="isObjectValid(remoteManualObj) && startStopValue === 0"
           >
-            <div class="wind-text">
-              远程手动启停:
-            </div>
+            <div class="wind-text">远程手动启停:</div>
             <el-switch
               style="display: block"
               v-model="remoteManualObj.collectValue"
@@ -424,9 +422,7 @@
             </el-form>
           </div>
           <div class="context-li" v-if="isObjectValid(faultAlarmObj)">
-            <div class="wind-text">
-              风机故障状态:
-            </div>
+            <div class="wind-text">风机故障状态:</div>
             <div class="badStautus" v-if="faultAlarmObj.collectValue">故障</div>
             <div class="goodStautus" v-else>正常</div>
           </div>
@@ -442,8 +438,6 @@
             <div class="badStautus" v-if="pressureObj.collectValue">故障</div>
             <div class="goodStautus" v-else>正常</div>
           </div>
-        </div>
-        <div class="fan-satatus1">
           <div class="context-li" v-if="isObjectValid(automaticObj)">
             <div :class="getTextClass(automaticObj, 'wind-text')">
               风机手自动状态:
@@ -470,6 +464,8 @@
             </div>
             <div>{{ damperHzBackObj.collectValue }}Hz</div>
           </div>
+        </div>
+        <div class="fan-satatus1">
           <div class="context-li" v-if="isObjectValid(damperHzObj)">
             <div :class="getTextClass(damperHzObj, 'wind-text')">
               风机频率调节:
@@ -742,7 +738,7 @@
             !automaticObj.collectValue
           "
         >
-          <div v-if="remoteManualObj.collectValue" class="off-bg on-animation">
+          <div v-if="remoteManualObj.collectValue" class="off-bg">
             运行
           </div>
           <div v-else class="off-bg">停止</div>
@@ -1918,16 +1914,12 @@ export default {
     // 处理select的选中值
     selectThink2(children) {
       const oldValue = children._oldValue;
-      let collectText = "";
-      if (this.modeChangeObj.collectValue === 0) {
-        collectText = "宴会一厅模式";
-      } else if (this.modeChangeObj.collectValue === 1) {
-        collectText = "餐厅模式";
-      } else if (this.modeChangeObj.collectValue === 2) {
-        collectText = "会议模式";
-      } else if (this.modeChangeObj.collectValue === 3) {
-        collectText = "全开模式";
-      }
+      // 根据选中的 value 从 modeOptions 中找到对应的 label
+      const selectedOption = this.modeOptions.find(
+        (item) => item.value === children.collectValue
+      );
+      const collectText = selectedOption ? selectedOption.label : "";
+
       this.$confirm(
         `确定要修改"${children.collectName}"的数据为:${collectText}吗?`,
         "提示",
@@ -2414,7 +2406,7 @@ export default {
   .fan-satatus1 {
     position: absolute;
     top: 4.3rem;
-    left: 6.4rem;
+    left: 6rem;
     display: flex;
     flex-direction: column;
     align-items: flex-start;
@@ -2480,7 +2472,7 @@ export default {
   }
   .fan-satatus3 {
     position: absolute;
-    top: 0.8rem;
+    top: 0.1rem;
     left: 6.4rem;
     display: flex;
     flex-direction: column;
@@ -2492,6 +2484,7 @@ export default {
       display: flex;
       flex-direction: row;
       align-items: center;
+      font-size: 0.18rem;
     }
     .wind-text {
       color: #00d2ff;
@@ -2698,8 +2691,8 @@ export default {
     background-image: url(../../../../assets/images/border2.png);
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    top: 5.5rem;
-    left: 6.7rem;
+    top: 5.6rem;
+    left: 7rem;
     z-index: 10;
     display: flex;
     flex-direction: column;
@@ -2855,7 +2848,7 @@ export default {
   .windC {
     transform: scale(0.8);
     .fan-satatus3 {
-      top: 0.2rem !important;
+      top: -0.3rem !important;
     }
   }
 }
@@ -2872,7 +2865,7 @@ export default {
   .windC {
     transform: scale(0.86);
     .fan-satatus3 {
-      top: 0.6rem !important;
+      top: -0.2rem !important;
     }
   }
   .buildingDiv {
diff --git a/src/views/aircAndWindc/awSysMonitor/components/normalMonitor.vue b/src/views/aircAndWindc/awSysMonitor/components/normalMonitor.vue
index b2bd987..3dd67f2 100644
--- a/src/views/aircAndWindc/awSysMonitor/components/normalMonitor.vue
+++ b/src/views/aircAndWindc/awSysMonitor/components/normalMonitor.vue
@@ -152,7 +152,7 @@
           @click="handleOneKeyButton(startControlObj)"
           v-if="!automaticObj.collectValue"
         >
-          <div v-if="startControlObj.collectValue" class="off-bg on-animation">
+          <div v-if="startControlObj.collectValue" class="off-bg">
             运行
           </div>
           <div v-else class="off-bg">停止</div>