Compare commits
No commits in common. "54ae501a7be5234161de80009dcbd1f3db7c100e" and "b352dc1bb018f08629b7b869fd4382cbfa3bf02c" have entirely different histories.
54ae501a7b
...
b352dc1bb0
|
|
@ -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,6 +119,7 @@ export default {
|
|||
watch: {
|
||||
'active'(newVal, oldVal) {
|
||||
this.getSensorType()
|
||||
this.getCountData()
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
|
|
@ -130,7 +131,7 @@ export default {
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
//countType计算类型
|
||||
//countType计算类型
|
||||
//0是原数据
|
||||
//1是原数据-400
|
||||
//2是原数据/10
|
||||
|
|
@ -159,10 +160,10 @@ export default {
|
|||
},
|
||||
sendCountType3(data) {
|
||||
|
||||
var num = (data * 10) + 400
|
||||
var num = (data* 10)+400
|
||||
return num
|
||||
},
|
||||
|
||||
|
||||
//类型选择
|
||||
handleCommand(command) {
|
||||
this.typeList.forEach((el, index) => {
|
||||
|
|
@ -178,27 +179,24 @@ export default {
|
|||
this.changeBtn(20904 + (this.active * 5), dataNum);
|
||||
},
|
||||
//根据类型修改数据
|
||||
getCountData() {
|
||||
for (var i = 0; i < 48; i++) {
|
||||
this.typeList.forEach((el, index) => {
|
||||
if (el.value == this.inputData[20904 + (i * 5)]) {
|
||||
if (el.countType == 0) {
|
||||
|
||||
} 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)])
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
getCountData(){
|
||||
this.typeList.forEach((el, index) => {
|
||||
if (el.value == this.inputData[20904 + (this.active * 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)])
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
},
|
||||
getSensorType() {
|
||||
this.typeList.forEach((el, index) => {
|
||||
|
|
@ -360,19 +358,19 @@ export default {
|
|||
selectValue(e) {
|
||||
e.currentTarget.select();
|
||||
},
|
||||
getSendData(number) {
|
||||
var number1 = number
|
||||
this.typeList.some((el, index) => {
|
||||
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)
|
||||
}
|
||||
}
|
||||
})
|
||||
return number1
|
||||
|
|
@ -393,7 +391,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);
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ selectValue(e) {
|
|||
value: parseInt(num, 2),
|
||||
},
|
||||
};
|
||||
this.changeBtn('21500', dataNum);
|
||||
this.changeBtn('500', 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']
|
||||
this.actList2New=['0','0','0','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('21501', dataNum);
|
||||
this.changeBtn('501', dataNum);
|
||||
},
|
||||
selList3(index) {
|
||||
if (this.actList3.indexOf(index) == -1) {
|
||||
|
|
@ -450,6 +450,7 @@ selectValue(e) {
|
|||
this.actList4.forEach((el, index) => {
|
||||
this.actList4New[this.actList4New.length-el-1] = '1'
|
||||
})
|
||||
|
||||
var num = this.actList4New.join("");
|
||||
var dataNum = {
|
||||
target: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue