新风阀新增三种模式、水阀手自动、风机频率手自动

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

@@ -476,6 +476,47 @@
             </div>
             <div>{{ Math.floor(damperHzObj.collectValue / 2) }}Hz</div>
           </div>
+          <div class="context-li" v-if="isObjectValid(damperHzRemoteObj)">
+            <div :class="getTextClass(damperHzRemoteObj, 'wind-text')">
+              风机频率远程手自动:
+            </div>
+            <el-switch
+            style="display: block"
+            v-model="damperHzRemoteObj.collectValue"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-text="手动"
+            inactive-text="自动"
+            @change="handleControlText(damperHzRemoteObj,'手动','自动')"
+          >
+          </el-switch>
+          </div>
+          <div class="context-li" v-if="isObjectValid(damperByHandHzObj)">
+            <div :class="getTextClass(damperByHandHzObj, 'wind-text')">
+              风机频率手动调节:
+            </div>
+            <el-form @submit.native.prevent>
+            <el-form-item>
+              <el-input
+                style="width: 1.2rem"
+                @keyup.enter.native="
+                  handleEnter(damperByHandHzObj, $event, '%')
+                "
+                @input="handleInput(damperByHandHzObj)"
+                @blur="handleBlur()"
+                v-model="damperByHandHzObj.collectValue"
+                size="mini"
+                :disabled="!damperHzRemoteObj.collectValue"
+              >
+                <svg-icon
+                  slot="prefix"
+                  icon-class="percentage-icon"
+                  class="percentage-icon"
+                />
+              </el-input>
+            </el-form-item>
+          </el-form>
+          </div>
         </div>
         <div class="fan-satatus2">
           <div class="context-li" v-if="isObjectValid(waterValveObj)">
@@ -528,7 +569,49 @@
               </el-form-item>
             </el-form>
           </div>
+          <div class="context-li" v-if="isObjectValid(waterValveRemoteObj)">
+            <div :class="getTextClass(waterValveRemoteObj, 'wind-text')">
+              水阀远程手自动:
+            </div>
+            <el-switch
+            style="display: block"
+            v-model="waterValveRemoteObj.collectValue"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-text="手动"
+            inactive-text="自动"
+            @change="handleControlText(waterValveRemoteObj,'手动','自动')"
+          >
+          </el-switch>
+          </div>
+          <div class="context-li" v-if="isObjectValid(waterValveByHandHzObj)">
+            <div :class="getTextClass(waterValveByHandHzObj, 'wind-text')">
+              水阀手动调节:
+            </div>
+            <el-form @submit.native.prevent>
+            <el-form-item>
+              <el-input
+                style="width: 1.2rem"
+                @keyup.enter.native="
+                  handleEnter(waterValveByHandHzObj, $event, '%')
+                "
+                @input="handleInput(waterValveByHandHzObj)"
+                @blur="handleBlur()"
+                v-model="waterValveByHandHzObj.collectValue"
+                size="mini"
+                :disabled="!waterValveRemoteObj.collectValue"
+              >
+                <svg-icon
+                  slot="prefix"
+                  icon-class="percentage-icon"
+                  class="percentage-icon"
+                />
+              </el-input>
+            </el-form-item>
+          </el-form>
+          </div>
         </div>
+
         <div class="fan-satatus4">
           <div
             class="context-li"
@@ -800,6 +883,8 @@ export default {
       backwaterObj: {}, //回水温度
       waterValveObj: {}, //水阀调节
       waterValveObjSet: {}, //水阀调节设置
+      waterValveRemoteObj: {}, //水阀远程手自动选择
+      waterValveByHandHzObj: {}, //水阀手动频率调节
       startControlObj: {}, //启停控制
       runStatusObj: {}, //运行状态
       damperOneObj: {}, //风阀1调节
@@ -820,6 +905,8 @@ export default {
       timeScheduleObj: {}, //时间表启停
       damperHzBackObj: {}, //风机频率反馈
       damperHzObj: {}, //风机频率调节
+      damperHzRemoteObj: {}, //风机频率远程手自动选择
+      damperByHandHzObj: {}, //风机手动频率调节
       modeChangeObj: {}, //模式选择
       modeOneObj: {}, //宴会一厅模式
       modeTwoObj: {}, //餐厅模式
@@ -875,6 +962,18 @@ export default {
           label: "全开模式",
           value: 3,
         },
+        {
+          label: "宴会一厅+餐厅模式",
+          value: 4,
+        },
+        {
+          label: "餐厅+会议模式",
+          value: 5,
+        },
+        {
+          label: "宴会一厅+会议模式",
+          value: 6,
+        },
       ], //模式选择列表
       isShowMode1: false,
       isShowMode2: false,
@@ -976,6 +1075,8 @@ export default {
                 this.backwaterObj = {}; //回水温度
                 this.waterValveObj = {}; //水阀反馈
                 this.waterValveObjSet = {}; //水阀调节
+                this.waterValveByHandHzObj = {};  //水阀手动调节
+                this.waterValveRemoteObj = {};  //水阀远程手自动选择
                 this.startControlObj = {}; //启停控制
                 this.runStatusObj = {}; //运行状态
                 this.airSupplyObj = {}; //送风温度
@@ -997,6 +1098,8 @@ export default {
                 this.timeScheduleObj = {}; //时间表启停
                 this.damperHzBackObj = {}; //风机频率反馈
                 this.damperHzObj = {}; //风机频率调节
+                this.damperHzRemoteObj = {};      //风机频率远程手自动选择
+                this.damperByHandHzObj = {};    //风机手动频率调节
                 this.modeChangeObj = {}; //模式选择
                 this.modeOneObj = {}; //宴会一厅模式
                 this.modeTwoObj = {}; //餐厅模式
@@ -1225,6 +1328,36 @@ export default {
                   ) {
                     this.damperHzObj = item;
                   }
+                  //   风机频率远程手自动调节
+                  else if (
+                    item.paramType === "2" &&
+                    item.collectName.includes("风机频率远程手自动")
+                  ) {
+                    this.damperHzRemoteObj = item;
+                  }
+                  //   风机频率手动调节
+                  else if (
+                    item.paramType === "3" &&
+                    item.collectName.includes("风机频率手动调节")
+                  ) {
+                    this.damperByHandHzObj = item;
+                  }
+                  //   水阀远程手自动调节
+                  else if (
+                    item.paramType === "2" &&
+                    item.collectName.includes("水阀远程手自动")
+                  ) {
+                    this.waterValveRemoteObj = item;
+                    console.log("水阀远程手自动", this.waterValveRemoteObj);
+                  }
+                  //   水阀手动调节
+                  else if (
+                    item.paramType === "3" &&
+                    item.collectName.includes("水阀手动调节")
+                  ) {
+                    this.waterValveByHandHzObj = item;
+                    console.log("水阀手动调节", this.waterValveByHandHzObj);
+                  }
                   //   模式选择
                   else if (
                     item.paramType === "25" &&