1.修改设备监控页面二通阀开度、三通阀开度、位置样式

src/views/heatRecoverySys/deviceMonitor/monitorCenter.vue

@@ -232,7 +232,7 @@
       </div>
       <!-- 二通阀门 -->
       <div class="text valve1">
-        {{ getHotMeterTemp(allValveArr, "二通阀输出百分比", 99) }}%
+        {{ getHotMeterTemp(valveOneArr, "二通阀门_开度反馈", 4) }}%
       </div>
       <!-- 可点击区域 -->
       <div class="text click2" @click="controlValve(valveOneArr, '二通阀门')"></div>
@@ -241,9 +241,11 @@
       <div :class="['text', openPercent <= 0 ? 'text11' : 'text18']">
         三通阀
       </div>
-      <div class="text valve2">{{ openPercent }}%</div>
-      <div :class="['text', openPercent <= 0  ? 'valve4' : 'valve3']">
-        {{ 100 - openPercent }}%
+      <!-- 反馈值 -->
+      <div :class="['text', openPercent <= 0 ? 'valve4' : 'valve3']">{{ openPercent }}%</div>
+      <!-- 计算值 -->
+      <div class="text valve2">
+        {{ (100 - openPercent).toFixed(1) }}%
       </div>
       <div :class="['text', openPercent <= 0 ? 'click3' : 'click4']" @click="controlValve(valveTwoArr, '三通阀门')"></div>
     </div>
@@ -286,11 +288,12 @@
     <el-dialog :title="valveTitle" :visible.sync="openValveDialog" width="600px" append-to-body class="monitor-dialog">
       <div class="hot-list" style="width: 80%;">
         <div class="hot-data">
-          <div class="hot-text">实际温度差值：</div>
-          <el-input readonly v-model="valveFormData.actualTempDiff" size="small" placeholder="实际温度差值"></el-input>
+          <div class="hot-text">{{ valveTitle === '二通阀门' ? '实际温度差值：' : '实际温度值：' }}</div>
+          <el-input readonly v-model="valveFormData.actualTempDiff" size="small"
+            :placeholder="valveTitle === '二通阀门' ? '实际温度差值' : '实际温度值'"></el-input>
         </div>
         <div class="hot-data">
-          <div class="hot-text">设定温度差值：</div>
+          <div class="hot-text">{{ valveTitle === '二通阀门' ? '设定温度差值：' : '设定温度值：' }}</div>
           <el-input v-model="valveFormData.setTempDiff" size="small" placeholder="设定温度差值" clearable
             @keyup.enter.native="handleEnter('设定温度差值', valveFormData.setTempDiffId, valveFormData.setTempDiff, $event)"
             @input="handleInput(valveFormData.setTempDiff)" @blur="handleBlur()"></el-input>
@@ -400,11 +403,12 @@ export default {
     },
     openPercent() {
       // 三通阀百分比数值
-      // return 10;
+      // return 100;
       // 获取原始值并转成数字
       const originVal = Number(
-        this.getHotMeterTemp(this.allValveArr, "三通阀输出百分比", 99)
+        this.getHotMeterTemp(this.valveTwoArr, "三通阀门_开度反馈", 4)
       );
+      console.log("三通阀百分比", Math.max(0, Math.min(100, originVal)))
       // 小于0返回0，大于100返回100，否则返回原值
       return Math.max(0, Math.min(100, originVal));
     },
@@ -710,10 +714,10 @@ export default {
 
       // 水阀输出值：collectName 包含"二通阀输出百分比"的 collectValue
       const outputItem = this.allValveArr.find(
-        item => item.collectName.includes("二通阀输出百分比")
+        item => item.collectName.includes(this.valveModule) && item.collectName.includes("输出百分比")
       );
       if (outputItem) {
-        this.valveFormData.valveOutput = outputItem.collectValue;
+        this.valveFormData.valveOutput = (outputItem.collectValue / 10).toFixed(1);
         this.valveFormData.valveOutputId = outputItem.id;
       }
 
@@ -756,7 +760,7 @@ export default {
     handleBlur() {
     },
     handleEnter(name, id, value, event) {
-      if(!value){
+      if (!value) {
         this.$modal.msgWarning("请输入当前值!");
         return
       }