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

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

@ -84,7 +84,7 @@
<div class="sensor-type">
<div class="sensor-title">通道输入信号类型</div>
<div class="sensor-type-div" v-for="item, index in openTypeList" :key="index">
<div class="name">第{{ index+1 }}通道</div>
<div class="name">第{{ index + 1 }}通道</div>
<div class="sensor-sel">
<div>
<div @click="changeTypeOpen(index, '0')" :class="item == '1' ? 'no-sel' : 'sel'"></div>
@ -119,7 +119,6 @@ export default {
watch: {
'active'(newVal, oldVal) {
this.getSensorType()
this.getCountData()
},
},
mounted() {
@ -160,7 +159,7 @@ export default {
},
sendCountType3(data) {
var num = (data* 10)+400
var num = (data * 10) + 400
return num
},
@ -179,24 +178,27 @@ export default {
this.changeBtn(20904 + (this.active * 5), dataNum);
},
//根据类型修改数据
getCountData(){
getCountData() {
for (var i = 0; i < 48; i++) {
this.typeList.forEach((el, index) => {
if (el.value == this.inputData[20904 + (this.active * 5)]) {
if(el.countType==0){
if (el.value == this.inputData[20904 + (i * 5)]) {
if (el.countType == 0) {
}else if(el.countType==1){
this.inputData[20904 + (this.active * 5 + 2)]=this.countType1(this.inputData[20904 + (this.active * 5 + 2)])
this.inputData[20904 + (this.active * 5 + 4)]=this.countType1(this.inputData[20904 + (this.active * 5 + 4)])
}else if(el.countType==2){
this.inputData[20904 + (this.active * 5 + 2)]=this.countType2(this.inputData[20904 + (this.active * 5 + 2)])
this.inputData[20904 + (this.active * 5 + 4)]=this.countType2(this.inputData[20904 + (this.active * 5 + 4)])
}else if(el.countType==3){
this.inputData[20904 + (this.active * 5 + 2)]=this.countType3(this.inputData[20904 + (this.active * 5 + 2)])
this.inputData[20904 + (this.active * 5 + 4)]=this.countType3(this.inputData[20904 + (this.active * 5 + 4)])
} else if (el.countType == 1) {
this.inputData[20904 + (i * 5 + 2)] = this.countType1(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (i * 5 + 4)] = this.countType1(this.inputData[20904 + (i * 5 + 4)])
} else if (el.countType == 2) {
this.inputData[20904 + (i * 5 + 2)] = this.countType2(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (i * 5 + 4)] = this.countType2(this.inputData[20904 + (i * 5 + 4)])
} else if (el.countType == 3) {
this.inputData[20904 + (i * 5 + 2)] = this.countType3(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (i * 5 + 4)] = this.countType3(this.inputData[20904 + (i * 5 + 4)])
}
}
})
}
},
getSensorType() {
this.typeList.forEach((el, index) => {
@ -358,18 +360,18 @@ export default {
selectValue(e) {
e.currentTarget.select();
},
getSendData(number){
var number1=number
getSendData(number) {
var number1 = number
this.typeList.some((el, index) => {
if (el.value == this.inputData[20904 + (this.active * 5)]) {
if(el.countType==0){
number1=number
}else if(el.countType==1){
number1=this.sendCountType1(number)
}else if(el.countType==2){
number1=this.sendCountType2(number)
}else if(el.countType==3){
number1=this.sendCountType3(number)
if (el.countType == 0) {
number1 = number
} else if (el.countType == 1) {
number1 = this.sendCountType1(number)
} else if (el.countType == 2) {
number1 = this.sendCountType2(number)
} else if (el.countType == 3) {
number1 = this.sendCountType3(number)
}
}
})
@ -391,7 +393,7 @@ export default {
var data = {
equipmentId: store.equipmentList[store.equipmentIndex - 1].deviceId,
regAddress: code,
num:this.getSendData(el.target.value) ,
num: this.getSendData(el.target.value),
}; //避免开启多个计时器
if (this.timer) {
this.timer && clearInterval(this.timer);

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

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