From f1f4b697a71bc4d5b166023da4a189a1dd2a220e Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Wed, 29 Mar 2023 12:29:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11091=E3=80=8111167=E3=80=8111166?=
 =?UTF-8?q?=E3=80=8111026?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollect/Collector/Point/Scan/Table.vue      | 10 ++++++----
 src/views/DataCollect/Collector/Point/index.vue     |  7 +++----
 src/views/DataCollect/Collector/index.vue           | 11 +++++++++--
 src/views/DataCollect/Dashboard/index.vue           | 13 ++++++++-----
 src/views/DataCollect/Dashboard/tool.ts             |  1 -
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index 4ee32205..cdb19d27 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -107,14 +107,14 @@
                             'value',
                         ]"
                         :rules="[
-                            {
-                                pattern: regOnlyNumber,
-                                message: '请输入0或者正整数',
-                            },
                             {
                                 validator: checkLength,
                                 trigger: 'change',
                             },
+                            {
+                                pattern: regOnlyNumber,
+                                message: '请输入0或者正整数',
+                            },
                         ]"
                     >
                         <j-input
@@ -226,6 +226,8 @@ const checkLength = (_rule: Rule, value: string): Promise<any> =>
             return String(value).length > 64
                 ? reject('最多可输入64个字符')
                 : resolve('');
+        } else {
+            reject('请输入');
         }
     });
 
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 3082c1eb..a7011686 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -333,7 +333,6 @@ const accessModesOption = ref();
 const _selectedRowKeys = ref<string[]>([]);
 const checkAll = ref(false);
 const spinning = ref(false);
-const collectorId = ref(props.data.id);
 
 const defaultParams = ref({
     sorts: [{ name: 'id', order: 'desc' }],
@@ -342,7 +341,7 @@ const defaultParams = ref({
             terms: [
                 {
                     column: 'collectorId',
-                    value: collectorId.value,
+                    value: props.data.id,
                 },
             ],
         },
@@ -449,7 +448,7 @@ const clickBatch = () => {
 const handlAdd = () => {
     visible.saveModBus = true;
     current.value = {
-        collectorId: collectorId.value,
+        collectorId: props.data?.id,
         provider: props.data?.provider || 'MODBUS_TCP',
     };
 };
@@ -548,7 +547,7 @@ const saveChange = (value: object) => {
     }
 };
 
-const onSelectChange = (keys: string[]) => {    
+const onSelectChange = (keys: string[]) => {
     _selectedRowKeys.value = [...keys];
 };
 
diff --git a/src/views/DataCollect/Collector/index.vue b/src/views/DataCollect/Collector/index.vue
index f028e8c6..7d3e24b5 100644
--- a/src/views/DataCollect/Collector/index.vue
+++ b/src/views/DataCollect/Collector/index.vue
@@ -22,8 +22,15 @@ const data = ref();
 const spinning = ref(true);
 
 const changeTree = (row: any) => {
-    data.value = row;
-    spinning.value = false;
+    spinning.value = true;
+    //手动延迟，防止数据库更新不及时
+    setTimeout(() => {
+        data.value = {
+            ...row,
+            collectorId: row?.id,
+        };
+        spinning.value = false;
+    }, 300);
 };
 </script>
 
diff --git a/src/views/DataCollect/Dashboard/index.vue b/src/views/DataCollect/Dashboard/index.vue
index 16db78a9..1b07cfe3 100644
--- a/src/views/DataCollect/Dashboard/index.vue
+++ b/src/views/DataCollect/Dashboard/index.vue
@@ -1,7 +1,7 @@
 <template>
     <page-container>
         <j-row :gutter="24">
-            <j-col :span="8" v-for="item in statusData" :key="item[0].type">
+            <j-col :span="8" v-for="item in StatusData" :key="item[0].type">
                 <TopCard
                     :title="item[0].label"
                     :img="
@@ -27,15 +27,18 @@ import { getImage } from '@/utils/comm';
 import { queryCount } from '@/api/data-collect/dashboard';
 import { defaultParams, statusData } from './tool';
 
+const StatusData = ref(statusData);
 const getNumberData = () => {
-    statusData.forEach(async (item: any) => {
+    StatusData.value.forEach(async (item: any) => {
         const res = await queryCount(item[0].type, {});
         const resp = await queryCount(item[0].type, defaultParams);
-        item[0].total = res?.result || 0;
-        item[0].value = resp?.result || 0;
+        item[0].total = res?.result;
+        item[0].value = resp?.result;
     });
 };
-getNumberData();
+onMounted(() => {
+    getNumberData();
+});
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/DataCollect/Dashboard/tool.ts b/src/views/DataCollect/Dashboard/tool.ts
index 91667bbd..6058bd56 100644
--- a/src/views/DataCollect/Dashboard/tool.ts
+++ b/src/views/DataCollect/Dashboard/tool.ts
@@ -1,5 +1,4 @@
 import dayjs from 'dayjs';
-import dayjs from 'dayjs';
 
 const getParams = (dt: any) => {
     switch (dt.type) {