From 968c68efba4abe6f22a199bb189f543f21551c3f Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Sat, 1 Apr 2023 14:37:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug#11097=20=E4=BF=AE=E5=A4=8D=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E5=99=A8=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollect/Collector/Point/Save/SaveModBus.vue      | 2 ++
 src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue | 2 ++
 .../Collector/Point/components/BatchUpdate/index.vue     | 9 ++++++---
 src/views/DataCollect/Collector/Tree/index.vue           | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 062475ca..40dd552b 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -330,11 +330,13 @@ const handleOk = async () => {
     if (data?.configuration.function !== 'HoldingRegisters') {
         codec.provider = 'int8';
     }
+    const { interval } = formData.value.configuration;
     const params = {
         ...props.data,
         ...data,
         provider,
         collectorId,
+        interval,
     };
 
     // address是多余字段，但是react版本上使用到了这个字段
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue b/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
index 869d0954..3192c66e 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
@@ -132,11 +132,13 @@ const formData = ref({
 
 const handleOk = async () => {
     const data = await formRef.value?.validate();
+    const { interval } = formData.value.configuration;
     const params = {
         ...props.data,
         ...data,
         provider,
         collectorId,
+        interval,
     };
 
     loading.value = true;
diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
index ab4cb85a..4e5354a3 100644
--- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
@@ -101,7 +101,7 @@ const formRef = ref<FormInstance>();
 
 const formData = ref({
     accessModes: [],
-    interval: '',
+    interval: undefined,
     features: [],
 });
 
@@ -118,7 +118,10 @@ const handleOk = async () => {
     const data = cloneDeep(formData.value);
     const { accessModes, features, interval } = data;
     const ischange =
-        accessModes.length !== 0 || features.length !== 0 || !!interval;
+        accessModes.length !== 0 ||
+        features.length !== 0 ||
+        Number(interval) === 0 ||
+        !!interval;
     if (ischange) {
         const params = cloneDeep(props.data);
         params.forEach((i: any) => {
@@ -132,7 +135,7 @@ const handleOk = async () => {
                 }
             }
             features.length !== 0 && (i.features = data.features);
-            if (!!interval) {
+            if (!!interval || Number(interval) === 0) {
                 i.interval = data.interval;
                 i.configuration = {
                     ...i.configuration,
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index 5a2f7259..29cfecd0 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -310,6 +310,9 @@ watch(
     :deep(.ant-tree-list-holder-inner) {
         width: 90%;
     }
+    :deep(.ant-tree-list) {
+        width: 110%;
+    }
 
     :deep(.ant-tree-treenode) {
         width: 100%;