Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master

pull/44/head
pangdundun 2023-11-20 10:46:42 +08:00
commit 99c21c78ce
1 changed files with 15 additions and 17 deletions

View File

@ -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