From 7b17adc477d38f633f6cf9ae80379a6a642413e8 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Mon, 27 Mar 2023 21:39:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11023=20=E4=BF=AE=E5=A4=8D=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E5=99=A8=E7=82=B9=E4=BD=8D=E6=96=B0=E5=A2=9E=E6=97=A0?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Collector/Point/Save/SaveModBus.vue       | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

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"
                 />
             </j-form-item>
-            <p
-                style="color: #616161"
-                v-if="formData.configuration.function && formData.pointKey"
-            >
+            <p style="color: #616161" v-if="formData.configuration.function">
                 PLC地址:{{
                     InitAddress[formData.configuration.function] +
-                    formData.pointKey
+                        formData.pointKey || 0
                 }}
             </p>
             <j-form-item
@@ -268,6 +265,7 @@ const id = props.data.id;
 const collectorId = props.data.collectorId;
 const provider = props.data.provider;
 const oldPointKey = props.data.pointKey;
+console.log(22, props.data);
 
 const InitAddress = {
     Coils: 1,
@@ -293,7 +291,7 @@ const formData = ref({
             },
         },
     },
-    pointKey: '',
+    pointKey: undefined,
     accessModes: [],
     nspwc: false,
     features: [],
@@ -301,13 +299,7 @@ const formData = ref({
 });
 
 const handleOk = async () => {
-    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<any> =>
             return checkProviderData[value] > Number(quantity) * 2
                 ? reject('数据类型长度需 <= 寄存器数量 * 2')
                 : resolve('');
+        } else {
+            return reject('');
         }
     });
 
 const checkPointKey = (_rule: Rule, value: string): Promise<any> =>
     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('');
         }
     });