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

Merge pull request '1' (#106) from pc-master into portal 

Reviewed-on: #106
portal
xiaomeng 2024-01-26 01:04:06 +00:00
parent d671034103 d25457df51
commit 442fd76f40
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
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]==1 ? 'active' : ''">进水泵</div>
<div :class="left1Act == 2 || left1Act == 3 ? 'active' : ''">配肥泵</div> <div :class="left1Act[0]==1 ? 'active' : ''">配肥泵</div>
</div> </div>
</div> </div>
@ -140,7 +140,7 @@ export default {
data() { data() {
return { return {
pageTimer: null, pageTimer: null,
left1Act: -1, left1Act: [0,0],
openType: '', openType: '',
left2List: [ left2List: [
{ {
@ -323,9 +323,9 @@ export default {
}, },
countType4(data) { countType4(data) {
var num = (data - 1000) / 10 var num = (data - 1000) / 10
return num.toFixed(2) return num.toFixed(2)
}, },
getTypeData(dataCode, typeCode) { getTypeData(dataCode, typeCode) {
var typeList = this.$store.state.typeList var typeList = this.$store.state.typeList
@ -509,19 +509,20 @@ return num.toFixed(2)
}, },
//进水泵和出水泵状态 //进水泵和出水泵状态
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])) { this.left1Act=number
this.left1Act = 1 // if (Number(number[0])) {
} // this.left1Act = 1
if (Number(number[1])) { // }
this.left1Act = 0 // if (Number(number[1])) {
} // this.left1Act = 0
if (Number(number[0])&&Number(number[1])) { // }
this.left1Act = 3 // if (Number(number[0]) && Number(number[1])) {
} // this.left1Act = 3
else { // }
this.left1Act = -1 // else {
} // this.left1Act = -1
// }
}, },
dataInit() { dataInit() {
const that = this const that = this
@ -559,7 +560,7 @@ return num.toFixed(2)
week: week[this.inputData[5]], week: week[this.inputData[5]],
time: h + ":" + m, time: h + ":" + m,
} }
this.$bus.$emit('refreshTime',time) this.$bus.$emit('refreshTime', time)
} else { } else {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
} }