Showing
1 changed file
with
3 additions
and
3 deletions
| ... | ... | @@ -16281,10 +16281,10 @@ class HandleDataInteraction { |
| 16281 | 16281 | { value: method, required: true, message: '未找到Modbus命令操作类型' }, |
| 16282 | 16282 | { value, required: true, message: '下发值是必填项' }, |
| 16283 | 16283 | ...(method == '05' ? [{ value, message: '下发类型必须为0或1', validator(value) { return value == 0 || value == 1 } }] : []), |
| 16284 | - ...(method == '06' ? [{ value, message: '下发类型必须为整型', validator(value) { return !isNaN(value) && Number(value) % 1 === 0 } }, { value, message: '最大值不能超过65535', validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []), | |
| 16285 | - ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(value) } }] : []) | |
| 16284 | + ...(method == '06' ? [{ value, message: `下发类型必须为整型,缩放因子为${zoomFactor}`, validator(value) { return !isNaN(value) && Number(value) * zoomFactor % 1 === 0 } }, { value: value * zoomFactor, message: `最大值不能超过65535,缩放因子为${zoomFactor}`, validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []), | |
| 16285 | + ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(value * zoomFactor) } }] : []) | |
| 16286 | 16286 | ]) |
| 16287 | - | |
| 16287 | + | |
| 16288 | 16288 | if (method == '06' || method == '16') { |
| 16289 | 16289 | value = value * zoomFactor |
| 16290 | 16290 | } | ... | ... |