diff --git a/src/views/page/parameterSet.vue b/src/views/page/parameterSet.vue index 3b50e36b..74c1d675 100644 --- a/src/views/page/parameterSet.vue +++ b/src/views/page/parameterSet.vue @@ -1218,7 +1218,7 @@
- {{$t('parameterSet.envTempSelect')}} + 1#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}} +
+ 2#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}} + + + + {{ item.label }} + + +
+
+ 3#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}} + + + + {{ item.label }} + + +
+
+ 4#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}} + + + + {{ item.label }} + + +
+
+ 5#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}} + + + + {{ item.label }} + + +
@@ -1613,7 +1709,7 @@ export default { ], list1: [ 21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756, - 21760, 21764, 21768, 21772, 21774, 21776, 21780, 21784, 21787,21791,21792 + 21760, 21764, 21768, 21772, 21774, 21776, 21780, 21784, 21787,21791,21792,21794,21795,21796,21797 ], //温度数组 typeList2: [ { label: this.$t('parameterSet.avgAirHumidity', {index:1}), value: 1 }, @@ -1633,7 +1729,7 @@ export default { ], //湿度数组 typeList3: [ { label: this.$t('parameterSet.targetTemp',{index:1}), value: 1 }, - { label: this.$t('parameterSet.targetTemp',{index:1}), value: 2 }, + { label: this.$t('parameterSet.targetTemp',{index:2}), value: 2 }, ], list3: [ 21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765, diff --git a/src/views/page/status.vue b/src/views/page/status.vue index 65296030..0d0112b1 100644 --- a/src/views/page/status.vue +++ b/src/views/page/status.vue @@ -115,11 +115,11 @@
{{ item }}
+ :class="right2Index[item.index]=='1' ? 'active' : ''">{{ item.name }}
{{ item }}
+ :class="right2Index[item.index]=='1' ? 'active' : ''">{{ item.name }}
@@ -279,14 +279,14 @@ export default { return data }, rightList2(){ - var data= [this.$t('status.externalControlSignal1',{index:1}), - this.$t('status.externalControlSignal1',{index:2}), - this.$t('status.externalControlSignal1',{index:3}), - this.$t('status.externalControlSignal1',{index:4}), - this.$t('status.controlSignals.highLevel'), - this.$t('status.controlSignals.mediumLevel'), - this.$t('status.controlSignals.lowLevel'), - this.$t('status.controlSignals.motor') + var data= [{name:this.$t('status.externalControlSignal1',{index:1}),index:1}, + {name:this.$t('status.externalControlSignal1',{index:2}),index:0}, + {name:this.$t('status.externalControlSignal1',{index:3}),index:2}, + {name:this.$t('status.externalControlSignal1',{index:4}),index:3}, + {name:this.$t('status.controlSignals.highLevel'),index:4}, + {name:this.$t('status.controlSignals.mediumLevel'),index:5}, + {name:this.$t('status.controlSignals.lowLevel'),index:6}, + {name:this.$t('status.controlSignals.motor'),index:7} ] return data }, @@ -506,31 +506,35 @@ export default { //什么方式启动的灌溉 getData29() { var number = this.padString(this.inputData['29'].toString(2), 14) - var index = 6 - var typeNumber = -1 - for (var i = 0; i < index; i++) { - if (Number(number[i])) { - typeNumber = i - } - } - this.openType = this.getType29(typeNumber) + var openListNew = [] + openListNew = number.split("") + this.right2Index = openListNew.reverse(); + // var index = 6 + // var typeNumber = -1 - var statusIndex = 8 - var list=[] + // for (var i = 0; i < index; i++) { + // if (Number(number[i])) { + // typeNumber = i + // } + // } + // this.openType = this.getType29(typeNumber) + + // var statusIndex = 8 + // var list=[] - for (var j = 0; j < statusIndex; j++) { - if (Number(number[number.length - 1 - j])) { - if (j == 0) { - list.push('1') - } else if (j == 1) { - list.push('0') - } else { - list.push(j) - } - } - } - this.right2Index=list + // for (var j = 0; j < statusIndex; j++) { + // if (Number(number[number.length - 1 - j])) { + // if (j == 0) { + // list.push('1') + // } else if (j == 1) { + // list.push('0') + // } else { + // list.push(j) + // } + // } + // } + // this.right2Index=list }, //进水泵和出水泵状态 getData30() {