From 6e8987d4ae75a2f3f3199b1ede5fdc48c3cdac99 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 9 Oct 2024 11:29:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=91=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tree/device.vue | 24 ++++++++++++++----------
 src/components/tree/point.vue  | 29 +++++++++++++++++------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/components/tree/device.vue b/src/components/tree/device.vue
index 2b93ee6..6ae5647 100644
--- a/src/components/tree/device.vue
+++ b/src/components/tree/device.vue
@@ -44,7 +44,7 @@
                         default-expand-all
                         v-bind="$attrs"
                         :data="zlDeviceData"
-                        style="overflow: auto;"
+                        style="overflow: auto"
                     >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
@@ -70,7 +70,7 @@
                         node-key="id"
                         :data="bxsDeviceData"
                         v-bind="$attrs"
-                        style="overflow: auto;"
+                        style="overflow: auto"
                     >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
@@ -139,13 +139,6 @@ watch(
                     })
                 }
             })
-            if (zlDeviceData.value.length != 0) {
-                activeName.value = '0'
-            } else if (bxsDeviceData.value.length != 0) {
-                activeName.value = '1'
-            } else {
-                activeName.value = ''
-            }
         }
     },
     {
@@ -206,7 +199,18 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 defineExpose({ treeRef1, treeRef2 })
 onMounted(() => {
-    changeDevice(activeName.value)
+    setTimeout(() => {
+        if (zlDeviceData.value.length != 0) {
+            activeName.value = '0'
+        }
+        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
+            activeName.value = '1'
+        }
+        if (!zlDeviceData.value && !bxsDeviceData.value) {
+            activeName.value = ''
+        }
+        changeDevice(activeName.value)
+    }, 500)
 })
 </script>
 
diff --git a/src/components/tree/point.vue b/src/components/tree/point.vue
index 3c0bbfb..aa0876a 100644
--- a/src/components/tree/point.vue
+++ b/src/components/tree/point.vue
@@ -43,7 +43,7 @@
                         default-expand-all
                         v-bind="$attrs"
                         :data="zlDeviceData"
-                        style="overflow: auto;"
+                        style="overflow: auto"
                     >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
@@ -69,7 +69,7 @@
                         node-key="id"
                         :data="bxsDeviceData"
                         v-bind="$attrs"
-                        style="overflow: auto;"
+                        style="overflow: auto"
                     >
                         <template #default="{ node, data }">
                             <span class="custom-tree-node">
@@ -122,9 +122,9 @@ const defaultProps = {
     value: 'id'
 }
 //治理设备数据
-const zlDeviceData = ref([])
+const zlDeviceData = ref<any>([])
 //便携式设备数据
-const bxsDeviceData = ref([])
+const bxsDeviceData = ref<any>([])
 watch(
     () => props.data,
     (val, oldVal) => {
@@ -140,13 +140,6 @@ watch(
                     })
                 }
             })
-            if (zlDeviceData.value.length != 0) {
-                activeName.value = '0'
-            } else if (bxsDeviceData.value.length != 0) {
-                activeName.value = '1'
-            } else {
-                activeName.value = ''
-            }
         }
     },
     {
@@ -179,6 +172,7 @@ const changeDevice = (val: any) => {
             arr2.push(item2)
         })
     })
+    activeName.value = val
     if (val == '0') {
         arr2.map((item: any) => {
             item.checked = false
@@ -211,7 +205,18 @@ const treeRef1 = ref<InstanceType<typeof ElTree>>()
 const treeRef2 = ref<InstanceType<typeof ElTree>>()
 defineExpose({ treeRef1, treeRef2 })
 onMounted(() => {
-    changeDevice(activeName.value)
+    setTimeout(() => {
+        if (zlDeviceData.value.length != 0) {
+            activeName.value = '0'
+        }
+        if (zlDeviceData.value.length === 0 && bxsDeviceData.value.length != 0) {
+            activeName.value = '1'
+        }
+        if (!zlDeviceData.value && !bxsDeviceData.value) {
+            activeName.value = ''
+        }
+        changeDevice(activeName.value)
+    }, 500)
 })
 </script>