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

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

Reviewed-on: #25
pull/34/head^2
xiaomeng 2023-11-09 08:15:30 +00:00
parent b352dc1bb0 95b35bcdf7
commit 54ae501a7b
2 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/page/sensorSet-con.vue
View File

@ -119,7 +119,6 @@ export default {
watch: { watch: {
'active'(newVal, oldVal) { 'active'(newVal, oldVal) {
this.getSensorType() this.getSensorType()
this.getCountData()
}, },
}, },
mounted() { mounted() {
@ -180,23 +179,26 @@ export default {
}, },
//根据类型修改数据 //根据类型修改数据
getCountData() { getCountData() {
for (var i = 0; i < 48; i++) {
this.typeList.forEach((el, index) => { this.typeList.forEach((el, index) => {
if (el.value == this.inputData[20904 + (this.active * 5)]) { if (el.value == this.inputData[20904 + (i * 5)]) {
if (el.countType == 0) { if (el.countType == 0) {
} else if (el.countType == 1) { } else if (el.countType == 1) {
this.inputData[20904 + (this.active * 5 + 2)]=this.countType1(this.inputData[20904 + (this.active * 5 + 2)]) this.inputData[20904 + (i * 5 + 2)] = this.countType1(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (this.active * 5 + 4)]=this.countType1(this.inputData[20904 + (this.active * 5 + 4)]) this.inputData[20904 + (i * 5 + 4)] = this.countType1(this.inputData[20904 + (i * 5 + 4)])
} else if (el.countType == 2) { } else if (el.countType == 2) {
this.inputData[20904 + (this.active * 5 + 2)]=this.countType2(this.inputData[20904 + (this.active * 5 + 2)]) this.inputData[20904 + (i * 5 + 2)] = this.countType2(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (this.active * 5 + 4)]=this.countType2(this.inputData[20904 + (this.active * 5 + 4)]) this.inputData[20904 + (i * 5 + 4)] = this.countType2(this.inputData[20904 + (i * 5 + 4)])
} else if (el.countType == 3) { } else if (el.countType == 3) {
this.inputData[20904 + (this.active * 5 + 2)]=this.countType3(this.inputData[20904 + (this.active * 5 + 2)]) this.inputData[20904 + (i * 5 + 2)] = this.countType3(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (this.active * 5 + 4)]=this.countType3(this.inputData[20904 + (this.active * 5 + 4)]) this.inputData[20904 + (i * 5 + 4)] = this.countType3(this.inputData[20904 + (i * 5 + 4)])
} }
} }
}) })
}
}, },
getSensorType() { getSensorType() {
this.typeList.forEach((el, index) => { this.typeList.forEach((el, index) => {

7
src/views/page/upload-con.vue
View File

@ -400,7 +400,7 @@ selectValue(e) {
value: parseInt(num, 2), value: parseInt(num, 2),
}, },
}; };
this.changeBtn('500', dataNum); this.changeBtn('21500', dataNum);
}, },
selList2(index) { selList2(index) {
if (this.actList2.indexOf(index) == -1) { if (this.actList2.indexOf(index) == -1) {
@ -408,7 +408,7 @@ selectValue(e) {
} else { } else {
this.actList2.splice(this.actList2.indexOf(index), 1) this.actList2.splice(this.actList2.indexOf(index), 1)
} }
this.actList2New=['0','0','0','0','0','0','0','0','0','0','0','0','0','0',] this.actList2New=['0','0','0','0','0','0','0','0','0','0','0']
this.actList2.forEach((el, index) => { this.actList2.forEach((el, index) => {
this.actList2New[this.actList2New.length-el-1] = '1' this.actList2New[this.actList2New.length-el-1] = '1'
}) })
@ -419,7 +419,7 @@ selectValue(e) {
value: parseInt(num, 2), value: parseInt(num, 2),
}, },
}; };
this.changeBtn('501', dataNum); this.changeBtn('21501', dataNum);
}, },
selList3(index) { selList3(index) {
if (this.actList3.indexOf(index) == -1) { if (this.actList3.indexOf(index) == -1) {
@ -450,7 +450,6 @@ selectValue(e) {
this.actList4.forEach((el, index) => { this.actList4.forEach((el, index) => {
this.actList4New[this.actList4New.length-el-1] = '1' this.actList4New[this.actList4New.length-el-1] = '1'
}) })
var num = this.actList4New.join(""); var num = this.actList4New.join("");
var dataNum = { var dataNum = {
target: { target: {