xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 9db095d1e1 f88a36a07d
commit 99c21c78ce
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/page/status.vue
View File

@ -35,8 +35,8 @@
</div> </div>
</div> </div>
<div class="left-btn"> <div class="left-btn">
<div :class="left1Act == 1 && left1Act == 3 ? 'active' : ''">进水泵</div> <div :class="left1Act == 1 || left1Act == 3 ? 'active' : ''">进水泵</div>
<div :class="left1Act == 2 && left1Act == 3 ? 'active' : ''">配肥泵</div> <div :class="left1Act == 2 || left1Act == 3 ? 'active' : ''">配肥泵</div>
</div> </div>
</div> </div>
@ -328,7 +328,6 @@ export default {
typeList.forEach((el, index) => { typeList.forEach((el, index) => {
if (el.value == this.inputData1[typeCode]) { if (el.value == this.inputData1[typeCode]) {
console.log(this.inputData1[typeCode], 111, el.countType);
countType = el.countType countType = el.countType
} }
}) })
@ -502,23 +501,22 @@ export default {
} }
} }
} }
console.log(this.right2Index, 123);
}, },
//进水泵和出水泵状态 //进水泵和出水泵状态
getData30() { getData30() {
// var number = this.padString(this.inputData['30'].toString(2), 2) var number = this.padString(this.inputData['30'].toString(2), 2)
// if (Number(number[0])) { if (Number(number[0])) {
// this.left1Act = 1 this.left1Act = 1
// } }
// if (Number(number[1])) { if (Number(number[1])) {
// this.left1Act = 0 this.left1Act = 0
// } }
// if (Number(number[0])&&Number(number[1])) { if (Number(number[0])&&Number(number[1])) {
// this.left1Act = 3 this.left1Act = 3
// } }
// else { else {
// this.left1Act = -1 this.left1Act = -1
// } }
}, },
dataInit() { dataInit() {
const that = this const that = this