diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue index f6289260..4246d110 100644 --- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue +++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue @@ -60,13 +60,10 @@ :precision="0" /> -

+

PLC地址:{{ InitAddress[formData.configuration.function] + - formData.pointKey + formData.pointKey || 0 }}

{ - console.log(2, formRef.value, formRef.value?.validate()); - - const data = await formRef.value?.validate().catch((err) => { - console.log(23, err); - }); - console.log(3, data); - + const data = await formRef.value?.validate(); delete data?.nspwc; const { codec } = data?.configuration; @@ -368,17 +360,21 @@ const checkProvider = (_rule: Rule, value: string): Promise => return checkProviderData[value] > Number(quantity) * 2 ? reject('数据类型长度需 <= 寄存器数量 * 2') : resolve(''); + } else { + return reject(''); } }); const checkPointKey = (_rule: Rule, value: string): Promise => new Promise(async (resolve, reject) => { - if (value) { + if (value || Number(value) === 0) { if (Number(oldPointKey) === Number(value)) return resolve(''); const res: any = await _validateField(collectorId, { pointKey: value, }); return res.result?.passed ? resolve('') : reject(res.result.reason); + } else { + return reject(''); } });