|
|
@ -1089,12 +1089,18 @@ |
|
|
|
const duoOff = document.querySelector("#duoji_offset"); |
|
|
|
const ele = document.querySelector(id); |
|
|
|
const { protocol, message } = commonMessage; |
|
|
|
let addr = 0; |
|
|
|
if (duoBase.value && duoOff.value) { |
|
|
|
addr = parseInt(duoBase.value) + parseInt(duoOff.value); |
|
|
|
} else { |
|
|
|
addr = parseInt(duoBase.value); |
|
|
|
} |
|
|
|
const msg = JSON.stringify({ |
|
|
|
protocol, |
|
|
|
message: { |
|
|
|
...message, |
|
|
|
targetId: parseInt(duoId.value), |
|
|
|
ctrlPointAddr: parseInt(duoBase.value) + parseInt(duoOff.value), |
|
|
|
ctrlPointAddr: addr, |
|
|
|
ctrlPointVal: parseInt(ele.value), |
|
|
|
type, |
|
|
|
}, |
|
|
@ -1110,12 +1116,19 @@ |
|
|
|
const duoOff = document.querySelector("#dianji_offset"); |
|
|
|
const ele = document.querySelector(id); |
|
|
|
const { protocol, message } = commonMessage; |
|
|
|
let addr = null; |
|
|
|
if (duoBase.value && duoOff.value) { |
|
|
|
addr = parseInt(duoBase.value) + parseInt(duoOff.value); |
|
|
|
} else { |
|
|
|
addr = parseInt(duoBase.value); |
|
|
|
} |
|
|
|
console.log(addr); |
|
|
|
const msg = JSON.stringify({ |
|
|
|
protocol, |
|
|
|
message: { |
|
|
|
...message, |
|
|
|
targetId: parseInt(duoId.value), |
|
|
|
ctrlPointAddr: parseInt(duoBase.value) + parseInt(duoOff.value), |
|
|
|
ctrlPointAddr: addr, |
|
|
|
ctrlPointVal: parseInt(ele.value), |
|
|
|
type, |
|
|
|
}, |
|
|
|