添加回风温度设置、ahu水阀调节

src/views/aircAndWindc/awSysMonitor/components/damperMonitor.vue

@@ -80,6 +80,26 @@
                 @input="handleInput(backAirObj)"
                 @blur="handleBlur()"
                 v-model="backAirObj.collectValue"
+                disabled
+                size="mini"
+              >
+                <svg-icon
+                  slot="prefix"
+                  icon-class="tem_icon"
+                  class="tem-icon"
+                />
+              </el-input> </el-form-item
+          ></el-form>
+        </div>
+        <div class="wind-tem1-set" v-if="isObjectValid(backAirObjSet)">
+          <div class="wind-text">回风温度设置</div>
+          <el-form @submit.native.prevent>
+            <el-form-item>
+              <el-input
+                @keyup.enter.native="handleEnter(backAirObjSet, $event, '℃')"
+                @input="handleInput(backAirObjSet)"
+                @blur="handleBlur()"
+                v-model="backAirObjSet.collectValue"
                 size="mini"
               >
                 <svg-icon
@@ -218,7 +238,7 @@
             v-if="isObjectValid(openingBackObj)"
             style="width: 2.4rem"
           >
-            <div class="wind-text">风阀开度反馈:</div>
+            <div class="wind-text">风阀开度设置:</div>
             <el-form @submit.native.prevent>
               <el-form-item>
                 <el-input
@@ -279,7 +299,7 @@
         </div>
         <div class="fan-satatus2">
           <div class="context-li" v-if="isObjectValid(waterValveObj)">
-            <div class="wind-text">水阀调节</div>
+            <div class="wind-text">水阀反馈</div>
             <el-form @submit.native.prevent>
               <el-form-item>
                 <el-input
@@ -287,6 +307,29 @@
                   @input="handleInput(waterValveObj)"
                   @blur="handleBlur()"
                   v-model="waterValveObj.collectValue"
+                  disabled
+                  size="mini"
+                >
+                  <svg-icon
+                    slot="prefix"
+                    icon-class="percentage-icon"
+                    class="percentage-icon"
+                  />
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+        <div class="fan-satatus2-set">
+          <div class="context-li" v-if="isObjectValid(waterValveObjSet)">
+            <div class="wind-text">水阀调节</div>
+            <el-form @submit.native.prevent>
+              <el-form-item>
+                <el-input
+                  @keyup.enter.native="handleEnter(waterValveObjSet, $event, '%')"
+                  @input="handleInput(waterValveObjSet)"
+                  @blur="handleBlur()"
+                  v-model="waterValveObjSet.collectValue"
                   size="mini"
                 >
                   <svg-icon
@@ -529,6 +572,7 @@ export default {
       loading: false,
       backwaterObj: {}, //回水温度
       waterValveObj: {}, //水阀调节
+      waterValveObjSet: {}, //水阀调节设置
       startControlObj: {}, //启停控制
       runStatusObj: {}, //运行状态
       damperOneObj: {}, //风阀1调节
@@ -550,11 +594,13 @@ export default {
       pressureObj: {}, //压差
       automaticObj: {}, //手自动状态
       backAirObj: {}, //回风温度
+      backAirObjSet: {}, //回风温度设置
       faultAlarmObj: {}, //故障报警
       waterSupplyObj: {}, //供水温度
 
       tableData: [], //系统状态表格数据
       temValue: "℃", //回风温度
+      temValueSet: "℃", //回风温度设置
       valvePercent: "%", //阀比例
       runStatus: false, //运行状态
       autoStatus: false, //手自动状态
@@ -680,7 +726,8 @@ export default {
               if (res.code == 200 && res.rows.length > 0) {
                 let data = res.rows[0].values;
                 this.backwaterObj = {}; //回水温度
-                this.waterValveObj = {}; //水阀调节
+                this.waterValveObj = {}; //水阀反馈
+                this.waterValveObjSet = {}; //水阀调节
                 this.startControlObj = {}; //启停控制
                 this.runStatusObj = {}; //运行状态
                 this.airSupplyObj = {}; //送风温度
@@ -713,12 +760,19 @@ export default {
                   ) {
                     this.backwaterObj = item;
                   }
+                  //水阀反馈
+                  else if (
+                    item.paramType === "4" &&
+                    item.collectName.includes("水阀反馈")
+                  ) {
+                    this.waterValveObj = item;
+                  }
                   //水阀调节
                   else if (
                     item.paramType === "3" &&
                     item.collectName.includes("水阀调节")
                   ) {
-                    this.waterValveObj = item;
+                    this.waterValveObjSet = item;
                   }
                   //   //启停控制 0停止1开启
                   //   else if (item.paramType === "2") {
@@ -758,6 +812,13 @@ export default {
                   ) {
                     this.backAirObj = item;
                   }
+                  //回风温度设置
+                  else if (
+                    item.paramType === "14" &&
+                    item.collectName.includes("回风")
+                  ) {
+                    this.backAirObjSet = item;
+                  }
                   //风阀1调节
                   else if (
                     item.paramType === "3" &&
@@ -1539,7 +1600,22 @@ export default {
     z-index: 10;
     width: 1.3rem;
     position: absolute;
-    top: 0.4rem;
+    top: 0rem;
+    left: 4.7rem;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    .wind-text {
+      color: #00d2ff;
+      font-size: 0.18rem;
+      margin-bottom: 0.15rem;
+    }
+  }
+  .wind-tem1-set {
+    z-index: 10;
+    width: 1.3rem;
+    position: absolute;
+    top: 1rem;
     left: 4.7rem;
     display: flex;
     flex-direction: column;
@@ -1667,6 +1743,28 @@ export default {
       white-space: nowrap;
     }
   }
+  .fan-satatus2-set {
+    position: absolute;
+    top: 5.8rem;
+    left: 3.5rem;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    .context-li {
+      z-index: 10;
+      width: 2rem;
+      margin-bottom: 0.1rem;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+    }
+    .wind-text {
+      color: #00d2ff;
+      font-size: 0.18rem;
+      margin-right: 0.15rem;
+      white-space: nowrap;
+    }
+  }
   .fan-satatus3 {
     position: absolute;
     top: 0.9rem;

src/views/aircAndWindc/awSysMonitor/components/normalMonitor.vue

@@ -72,7 +72,7 @@
           />
         </div>
         <div class="wind-tem1" v-if="isObjectValid(airSupplyObj)">
-          <div class="wind-text">回风温度</div>
+          <div class="wind-text">实际回风温度</div>
           <el-form @submit.native.prevent>
             <el-form-item>
               <el-input
@@ -80,6 +80,26 @@
                 @input="handleInput(backAirObj)"
                 @blur="handleBlur()"
                 v-model="backAirObj.collectValue"
+                disabled
+                size="mini"
+              >
+                <svg-icon
+                  slot="prefix"
+                  icon-class="tem_icon"
+                  class="tem-icon"
+                />
+              </el-input> </el-form-item
+          ></el-form>
+        </div>
+        <div class="wind-tem1-set" v-if="isObjectValid(airSupplyObj)">
+          <div class="wind-text">回风温度设置</div>
+          <el-form @submit.native.prevent>
+            <el-form-item>
+              <el-input
+                @keyup.enter.native="handleEnter(backAirObjSet, $event, '℃')"
+                @input="handleInput(backAirObjSet)"
+                @blur="handleBlur()"
+                v-model="backAirObjSet.collectValue"
                 size="mini"
               >
                 <svg-icon
@@ -133,8 +153,8 @@
               @change="handleAutomaticText(automaticObj)"
             >
             </el-switch> -->
-            <div class="goodStautus" v-if="automaticObj.collectValue">手动</div>
+            <div class="noneStautus" v-if="automaticObj.collectValue">手动</div>
-            <div class="noneStautus" v-else>自动</div>
+            <div class="goodStautus" v-else>自动</div>
           </div>
           <div class="context-li" v-if="isObjectValid(startControlObj)">
             <div class="wind-text">风机启停控制</div>
@@ -351,11 +371,13 @@ export default {
       pressureObj: {}, //压差
       automaticObj: {}, //手自动状态
       backAirObj: {}, //回风温度
+      backAirObjSet: {}, //回风温度
       faultAlarmObj: {}, //故障报警
       waterSupplyObj: {}, //供水温度
 
       tableData: [], //系统状态表格数据
       temValue: "℃", //回风温度
+      temValueSet: "℃", //回风温度设置
       valvePercent: "%", //阀比例
       runStatus: false, //运行状态
       autoStatus: false, //手自动状态
@@ -453,6 +475,7 @@ export default {
                 this.pressureObj = {}; //压差
                 this.automaticObj = {}; //手自动状态
                 this.backAirObj = {}; //回风温度
+                this.backAirObjSet = {}; //回风温度设置
                 this.faultAlarmObj = {}; //故障报警
                 this.waterSupplyObj = {}; //供水温度
                 data.forEach((item) => {
@@ -522,6 +545,13 @@ export default {
                   ) {
                     this.backAirObj = item;
                   }
+                  //回风温度设置
+                  else if (
+                    item.paramType === "14" &&
+                    item.collectName.includes("回风")
+                  ) {
+                    this.backAirObjSet = item;
+                  }
                   //故障报警 0正常 1故障
                   else if (item.paramType === "5") {
                     this.faultAlarmObj = item;
@@ -1019,17 +1049,34 @@ export default {
   }
   .wind-tem1 {
     z-index: 10;
-    width: 1.3rem;
+    width: 2.5rem;
     position: absolute;
     top: 0.3rem;
     left: 7.3rem;
     display: flex;
-    flex-direction: column;
+    flex-direction: row; /* Changed from column to row */
-    align-items: center;
+    align-items: center; /* Align items vertically centered */
     .wind-text {
       color: #00d2ff;
       font-size: 0.18rem;
-      margin-bottom: 0.15rem;
+      margin-right: 0.15rem; /* Add some spacing between text and input */
+      white-space: nowrap;
+    }
+  }
+  .wind-tem1-set {
+    z-index: 10;
+    width: 2.5rem;
+    position: absolute;
+    top: 1rem;
+    left: 7.3rem;
+    display: flex;
+    flex-direction: row; /* Changed from column to row */
+    align-items: center; /* Align items vertically centered */
+    .wind-text {
+      color: #00d2ff;
+      font-size: 0.18rem;
+      margin-right: 0.15rem; /* Add some spacing between text and input */
+      white-space: nowrap;
     }
   }
   .wind-tem2 {