Compare commits
No commits in common. "426534402f6619446c84f2ac0df10adc8a880701" and "8a35d7de59a03f08f8ac6815068fa1e4fc6d52a6" have entirely different histories.
426534402f
...
8a35d7de59
@ -1218,7 +1218,7 @@
|
|||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
</div>
|
</div>
|
||||||
<div class="input-sel input-sel-w180">
|
<div class="input-sel input-sel-w180">
|
||||||
<span>1#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}}</span>
|
<span>{{$t('parameterSet.envTempSelect')}}</span>
|
||||||
<el-dropdown @command="handleCommand1($event, 21740)">
|
<el-dropdown @command="handleCommand1($event, 21740)">
|
||||||
<div class="el-dropdown-link">
|
<div class="el-dropdown-link">
|
||||||
<input
|
<input
|
||||||
@ -1241,102 +1241,6 @@
|
|||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
</div>
|
</div>
|
||||||
<div class="input-sel input-sel-w180">
|
|
||||||
<span>2#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}}</span>
|
|
||||||
<el-dropdown @command="handleCommand1($event, 21794)">
|
|
||||||
<div class="el-dropdown-link">
|
|
||||||
<input
|
|
||||||
v-model="inputDataNew[21794]"
|
|
||||||
type="text"
|
|
||||||
class="input-input"
|
|
||||||
placeholder="无"
|
|
||||||
/>
|
|
||||||
<div class="arrow">
|
|
||||||
<img src="../../assets/image/arrow.png" alt="" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<el-dropdown-menu class="input-menu-180" slot="dropdown">
|
|
||||||
<el-dropdown-item
|
|
||||||
v-for="(item, index) in typeList1"
|
|
||||||
:key="index"
|
|
||||||
:command="item.value"
|
|
||||||
>{{ item.label }}</el-dropdown-item
|
|
||||||
>
|
|
||||||
</el-dropdown-menu>
|
|
||||||
</el-dropdown>
|
|
||||||
</div>
|
|
||||||
<div class="input-sel input-sel-w180">
|
|
||||||
<span>3#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}}</span>
|
|
||||||
<el-dropdown @command="handleCommand1($event, 21795)">
|
|
||||||
<div class="el-dropdown-link">
|
|
||||||
<input
|
|
||||||
v-model="inputDataNew[21795]"
|
|
||||||
type="text"
|
|
||||||
class="input-input"
|
|
||||||
placeholder="无"
|
|
||||||
/>
|
|
||||||
<div class="arrow">
|
|
||||||
<img src="../../assets/image/arrow.png" alt="" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<el-dropdown-menu class="input-menu-180" slot="dropdown">
|
|
||||||
<el-dropdown-item
|
|
||||||
v-for="(item, index) in typeList1"
|
|
||||||
:key="index"
|
|
||||||
:command="item.value"
|
|
||||||
>{{ item.label }}</el-dropdown-item
|
|
||||||
>
|
|
||||||
</el-dropdown-menu>
|
|
||||||
</el-dropdown>
|
|
||||||
</div>
|
|
||||||
<div class="input-sel input-sel-w180">
|
|
||||||
<span>4#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}}</span>
|
|
||||||
<el-dropdown @command="handleCommand1($event, 21796)">
|
|
||||||
<div class="el-dropdown-link">
|
|
||||||
<input
|
|
||||||
v-model="inputDataNew[21796]"
|
|
||||||
type="text"
|
|
||||||
class="input-input"
|
|
||||||
placeholder="无"
|
|
||||||
/>
|
|
||||||
<div class="arrow">
|
|
||||||
<img src="../../assets/image/arrow.png" alt="" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<el-dropdown-menu class="input-menu-180" slot="dropdown">
|
|
||||||
<el-dropdown-item
|
|
||||||
v-for="(item, index) in typeList1"
|
|
||||||
:key="index"
|
|
||||||
:command="item.value"
|
|
||||||
>{{ item.label }}</el-dropdown-item
|
|
||||||
>
|
|
||||||
</el-dropdown-menu>
|
|
||||||
</el-dropdown>
|
|
||||||
</div>
|
|
||||||
<div class="input-sel input-sel-w180">
|
|
||||||
<span>5#{{$t('setParams.wetFan')}}:{{$t('parameterSet.envTempSelect')}}</span>
|
|
||||||
<el-dropdown @command="handleCommand1($event, 21797)">
|
|
||||||
<div class="el-dropdown-link">
|
|
||||||
<input
|
|
||||||
v-model="inputDataNew[21797]"
|
|
||||||
type="text"
|
|
||||||
class="input-input"
|
|
||||||
placeholder="无"
|
|
||||||
/>
|
|
||||||
<div class="arrow">
|
|
||||||
<img src="../../assets/image/arrow.png" alt="" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<el-dropdown-menu class="input-menu-180" slot="dropdown">
|
|
||||||
<el-dropdown-item
|
|
||||||
v-for="(item, index) in typeList1"
|
|
||||||
:key="index"
|
|
||||||
:command="item.value"
|
|
||||||
>{{ item.label }}</el-dropdown-item
|
|
||||||
>
|
|
||||||
</el-dropdown-menu>
|
|
||||||
</el-dropdown>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-view shrink-none border-none">
|
<div class="flex-view shrink-none border-none">
|
||||||
<div class="input-sel input-sel-w180">
|
<div class="input-sel input-sel-w180">
|
||||||
@ -1709,7 +1613,7 @@ export default {
|
|||||||
],
|
],
|
||||||
list1: [
|
list1: [
|
||||||
21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756,
|
21732, 21736, 21740, 21742, 21743, 21744, 21746, 21748, 21752, 21756,
|
||||||
21760, 21764, 21768, 21772, 21774, 21776, 21780, 21784, 21787,21791,21792,21794,21795,21796,21797
|
21760, 21764, 21768, 21772, 21774, 21776, 21780, 21784, 21787,21791,21792
|
||||||
], //温度数组
|
], //温度数组
|
||||||
typeList2: [
|
typeList2: [
|
||||||
{ label: this.$t('parameterSet.avgAirHumidity', {index:1}), value: 1 },
|
{ label: this.$t('parameterSet.avgAirHumidity', {index:1}), value: 1 },
|
||||||
@ -1729,7 +1633,7 @@ export default {
|
|||||||
], //湿度数组
|
], //湿度数组
|
||||||
typeList3: [
|
typeList3: [
|
||||||
{ label: this.$t('parameterSet.targetTemp',{index:1}), value: 1 },
|
{ label: this.$t('parameterSet.targetTemp',{index:1}), value: 1 },
|
||||||
{ label: this.$t('parameterSet.targetTemp',{index:2}), value: 2 },
|
{ label: this.$t('parameterSet.targetTemp',{index:1}), value: 2 },
|
||||||
],
|
],
|
||||||
list3: [
|
list3: [
|
||||||
21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765,
|
21733, 21737, 21741, 21745, 21747, 21749, 21753, 21757, 21761, 21765,
|
||||||
|
|||||||
@ -115,11 +115,11 @@
|
|||||||
<div class="right-view2">
|
<div class="right-view2">
|
||||||
<div>
|
<div>
|
||||||
<div v-for="item, index in rightList2.slice(0, 4)"
|
<div v-for="item, index in rightList2.slice(0, 4)"
|
||||||
:class="right2Index[item.index]=='1' ? 'active' : ''">{{ item.name }}</div>
|
:class="right2Index.indexOf(index) != -1 ? 'active' : ''">{{ item }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div v-for="item, index in rightList2.slice(4, 8)"
|
<div v-for="item, index in rightList2.slice(4, 8)"
|
||||||
:class="right2Index[item.index]=='1' ? 'active' : ''">{{ item.name }}</div>
|
:class="right2Index.indexOf(index + 4) != -1 ? 'active' : ''">{{ item }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="right-view3">
|
<div class="right-view3">
|
||||||
@ -279,14 +279,14 @@ export default {
|
|||||||
return data
|
return data
|
||||||
},
|
},
|
||||||
rightList2(){
|
rightList2(){
|
||||||
var data= [{name:this.$t('status.externalControlSignal1',{index:1}),index:1},
|
var data= [this.$t('status.externalControlSignal1',{index:1}),
|
||||||
{name:this.$t('status.externalControlSignal1',{index:2}),index:0},
|
this.$t('status.externalControlSignal1',{index:2}),
|
||||||
{name:this.$t('status.externalControlSignal1',{index:3}),index:2},
|
this.$t('status.externalControlSignal1',{index:3}),
|
||||||
{name:this.$t('status.externalControlSignal1',{index:4}),index:3},
|
this.$t('status.externalControlSignal1',{index:4}),
|
||||||
{name:this.$t('status.controlSignals.highLevel'),index:4},
|
this.$t('status.controlSignals.highLevel'),
|
||||||
{name:this.$t('status.controlSignals.mediumLevel'),index:5},
|
this.$t('status.controlSignals.mediumLevel'),
|
||||||
{name:this.$t('status.controlSignals.lowLevel'),index:6},
|
this.$t('status.controlSignals.lowLevel'),
|
||||||
{name:this.$t('status.controlSignals.motor'),index:7}
|
this.$t('status.controlSignals.motor')
|
||||||
]
|
]
|
||||||
return data
|
return data
|
||||||
},
|
},
|
||||||
@ -506,35 +506,31 @@ export default {
|
|||||||
//什么方式启动的灌溉
|
//什么方式启动的灌溉
|
||||||
getData29() {
|
getData29() {
|
||||||
var number = this.padString(this.inputData['29'].toString(2), 14)
|
var number = this.padString(this.inputData['29'].toString(2), 14)
|
||||||
|
var index = 6
|
||||||
|
var typeNumber = -1
|
||||||
|
|
||||||
var openListNew = []
|
for (var i = 0; i < index; i++) {
|
||||||
openListNew = number.split("")
|
if (Number(number[i])) {
|
||||||
this.right2Index = openListNew.reverse();
|
typeNumber = i
|
||||||
// var index = 6
|
}
|
||||||
// var typeNumber = -1
|
}
|
||||||
|
this.openType = this.getType29(typeNumber)
|
||||||
|
|
||||||
// for (var i = 0; i < index; i++) {
|
var statusIndex = 8
|
||||||
// if (Number(number[i])) {
|
var list=[]
|
||||||
// typeNumber = i
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// this.openType = this.getType29(typeNumber)
|
|
||||||
|
|
||||||
// var statusIndex = 8
|
for (var j = 0; j < statusIndex; j++) {
|
||||||
// var list=[]
|
if (Number(number[number.length - 1 - j])) {
|
||||||
|
if (j == 0) {
|
||||||
// for (var j = 0; j < statusIndex; j++) {
|
list.push('1')
|
||||||
// if (Number(number[number.length - 1 - j])) {
|
} else if (j == 1) {
|
||||||
// if (j == 0) {
|
list.push('0')
|
||||||
// list.push('1')
|
} else {
|
||||||
// } else if (j == 1) {
|
list.push(j)
|
||||||
// list.push('0')
|
}
|
||||||
// } else {
|
}
|
||||||
// list.push(j)
|
}
|
||||||
// }
|
this.right2Index=list
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// this.right2Index=list
|
|
||||||
},
|
},
|
||||||
//进水泵和出水泵状态
|
//进水泵和出水泵状态
|
||||||
getData30() {
|
getData30() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user