diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue index 416a52c2..a3047b19 100644 --- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue +++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue @@ -23,12 +23,7 @@

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

(); const id = props.data.id; const collectorId = props.data.collectorId; const provider = props.data.provider; -const oldPointKey = props.data?.configuration?.parameter?.address; +const oldPointKey = props.data.pointKey; const InitAddress = { Coils: 1, @@ -308,7 +305,7 @@ const formData = ref({ quantity: 1, writeByteCount: '', byteCount: 2, - address: undefined, + address: '', }, codec: { provider: undefined, @@ -318,7 +315,6 @@ const formData = ref({ }, }, }, - address: undefined, pointKey: undefined, accessModes: [], nspwc: false, @@ -326,11 +322,6 @@ const formData = ref({ description: '', }); -const plc = computed(() =>{ - const configuration = formData.value.configuration - return configuration.function !== undefined && formData.value.address !== undefined ? InitAddress[configuration.function] + Number(formData.value.address) : 0 -}) - const handleOk = async () => { const data = await formRef.value?.validate(); delete data?.nspwc; @@ -346,16 +337,15 @@ const handleOk = async () => { provider, collectorId, interval, - pointKey: plc.value, }; + // address是多余字段,但是react版本上使用到了这个字段 params.configuration.parameter = { - ...params.configuration.parameter, - address: data?.address, + ...params.configuration.parameter, + address: data?.pointKey, }; loading.value = true; - const response = !id ? await savePointBatch(params).catch(() => {}) : await updatePoint(id, { ...props.data, ...params }).catch(() => {}); @@ -404,23 +394,13 @@ const checkProvider = (_rule: Rule, value: string): Promise => } }); -const checkFunction = (_: any, value: string) => { - if (value) { - formRef.value!.validateFields('address') - } - return Promise.resolve(''); -} const checkPointKey = (_rule: Rule, value: string): Promise => new Promise(async (resolve, reject) => { - console.log(value, formData.value!.configuration?.function) if (value || Number(value) === 0) { if (Number(oldPointKey) === Number(value)) return resolve(''); if (typeof value === 'object') return resolve(''); - if (!formData.value!.configuration?.function) return resolve(''); - - const plc = InitAddress[formData.value!.configuration?.function] + Number(value) const res: any = await _validateField(collectorId, { - pointKey: plc, + pointKey: value, }); return res.result?.passed ? resolve('') : reject(res.result.reason); } else { @@ -463,7 +443,6 @@ watch( const { writeByteCount, byteCount } = _value.configuration.parameter; formData.value = _value; - formData.value.address = _value.configuration?.parameter?.address if (!!_value.accessModes[0]?.value) { formData.value.accessModes = value.accessModes.map( (i: any) => i.value,