Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master
commit
99c21c78ce
|
@ -35,8 +35,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="left-btn">
|
||||
<div :class="left1Act == 1 && left1Act == 3 ? 'active' : ''">进水泵</div>
|
||||
<div :class="left1Act == 2 && left1Act == 3 ? 'active' : ''">配肥泵</div>
|
||||
<div :class="left1Act == 1 || left1Act == 3 ? 'active' : ''">进水泵</div>
|
||||
<div :class="left1Act == 2 || left1Act == 3 ? 'active' : ''">配肥泵</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -328,7 +328,6 @@ export default {
|
|||
typeList.forEach((el, index) => {
|
||||
|
||||
if (el.value == this.inputData1[typeCode]) {
|
||||
console.log(this.inputData1[typeCode], 111, el.countType);
|
||||
countType = el.countType
|
||||
}
|
||||
})
|
||||
|
@ -502,23 +501,22 @@ export default {
|
|||
}
|
||||
}
|
||||
}
|
||||
console.log(this.right2Index, 123);
|
||||
},
|
||||
//进水泵和出水泵状态
|
||||
getData30() {
|
||||
// var number = this.padString(this.inputData['30'].toString(2), 2)
|
||||
// if (Number(number[0])) {
|
||||
// this.left1Act = 1
|
||||
// }
|
||||
// if (Number(number[1])) {
|
||||
// this.left1Act = 0
|
||||
// }
|
||||
// if (Number(number[0])&&Number(number[1])) {
|
||||
// this.left1Act = 3
|
||||
// }
|
||||
// else {
|
||||
// this.left1Act = -1
|
||||
// }
|
||||
var number = this.padString(this.inputData['30'].toString(2), 2)
|
||||
if (Number(number[0])) {
|
||||
this.left1Act = 1
|
||||
}
|
||||
if (Number(number[1])) {
|
||||
this.left1Act = 0
|
||||
}
|
||||
if (Number(number[0])&&Number(number[1])) {
|
||||
this.left1Act = 3
|
||||
}
|
||||
else {
|
||||
this.left1Act = -1
|
||||
}
|
||||
},
|
||||
dataInit() {
|
||||
const that = this
|
||||
|
|
Loading…
Reference in New Issue