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

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

Reviewed-on: #176
portal
xiaomeng 2024-09-28 00:41:22 +00:00
parent c2b346a609 33d3afe964
commit 8261f38e9a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/page/formula.vue
View File

@ -222,6 +222,7 @@ export default {
dataSel: '',
store: this.$store.state,
loading:null,
numlist:[],
}
},
watch: {
@ -309,14 +310,17 @@ export default {
}, 100);
},
getSeldata3(num) {
var number = this.padString(num.toString(2), 9)
var number = this.padString(num.toString(2), 16)
this.numlist = number.split('')
this.numlist.forEach((el, index) => {
if (Number(el)) {
this.tableData[this.tableData.length - 1 - index].open = true
if(index<this.tableData.length){
if (Number(this.numlist[this.numlist.length - 1 - index])) {
this.tableData[index].open = true
} else {
this.tableData[this.tableData.length - 1 - index].open = false
this.tableData[index].open = false
}
}
})
},
padString(str, length) {

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

@ -252,20 +252,22 @@ return num
var inputData = this.inputData
var list1 = this.padString(inputData['272'].toString(2), 6)
var listData = list1.split('')
if (Number(listData[listData.length - 1 - this.active])) {
if (Number(listData[listData.length - 1 - this.active])==1) {
listData[listData.length - 1 - this.active] = '0'
this.openList.splice(this.openList.indexOf(this.active), 1)
} else {
listData[listData.length - 1 - this.active] = '1'
this.openList.push(this.active)
}
var listNew = listData.join("");
var dataNum = {
target: {
value: parseInt(listNew, 2),
},
};
this.inputData['272']=parseInt(listNew, 2)
this.changeBtn('272', dataNum);
},
getData272() {
@ -275,7 +277,6 @@ return num
this.openList = []
for (var i = 0; i < number; i++) {
console.log(Number(list1[list1.length - 1 - i]));
if (Number(list1[list1.length - 1 - i])) {
this.openList.push(i)
}