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

pc-master #7

Merged
clibing merged 4 commits from pc-master into master 2023-10-08 03:44:04 +00:00
Conversation 0 Commits 4 Files Changed 8 +9 -2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd5db517d8 - Show all commits

2
src/store/index.js
View File

@ -61,7 +61,7 @@ export default new Vuex.Store({
{ label: '土壤氮含量', value: 41, countType: 0,unit:'mg/kg' }, { label: '土壤氮含量', value: 41, countType: 0,unit:'mg/kg' },
{ label: '土壤磷含量', value: 42, countType: 0,unit:'mg/kg' }, { label: '土壤磷含量', value: 42, countType: 0,unit:'mg/kg' },
{ label: '土壤钾含量', value: 43, countType: 0,unit:'mg/kg' }, { label: '土壤钾含量', value: 43, countType: 0,unit:'mg/kg' },
{ label: '臭氧', value: 44, countType: 0,unit:'ppm' }, { label: '管道压力', value: 44, countType: 0,unit:'Kpa' },
{ label: '一氧化碳', value: 45, countType: 0,unit:'ppm' }, { label: '一氧化碳', value: 45, countType: 0,unit:'ppm' },
{ label: '氨气', value: 46, countType: 0,unit:'ppm' }, { label: '氨气', value: 46, countType: 0,unit:'ppm' },
{ label: '硫化氢', value: 47, countType: 0,unit:'ppm' }, { label: '硫化氢', value: 47, countType: 0,unit:'ppm' },

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

@ -479,6 +479,7 @@ export default {
var number = this.padString(this.inputData['29'].toString(2), 14) var number = this.padString(this.inputData['29'].toString(2), 14)
var index = 6 var index = 6
var typeNumber = -1 var typeNumber = -1
for (var i = 0; i < index; i++) { for (var i = 0; i < index; i++) {
if (Number(number[i])) { if (Number(number[i])) {
typeNumber = i typeNumber = i
@ -489,9 +490,15 @@ export default {
var statusIndex = 8 var statusIndex = 8
for (var j = 0; j < statusIndex; j++) { for (var j = 0; j < statusIndex; j++) {
if (Number(number[number.length-1 - j])) { if (Number(number[number.length-1 - j])) {
if(j=0){
this.right2Index.push(1)
}else if(j=1){
this.right2Index.push(0)
}else{
this.right2Index.push(j) this.right2Index.push(j)
} }
} }
}
}, },
//进水泵和出水泵状态 //进水泵和出水泵状态
getData30() { getData30() {