From 26136c79e631cccac3c160ee741d01d80112f055 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Wed, 24 Jul 2024 15:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E9=A3=8E=E7=90=B4?=
 =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=AE=BE=E5=A4=87=E4=BE=BF=E6=90=BA=E5=BC=8F?=
 =?UTF-8?q?tree=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tree/device.vue |  6 +++---
 src/components/tree/point.vue  | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/tree/device.vue b/src/components/tree/device.vue
index 3948b2e..e88a1b2 100644
--- a/src/components/tree/device.vue
+++ b/src/components/tree/device.vue
@@ -31,10 +31,10 @@
                 />
             </div>
 
-            <el-collapse accordion v-model="activeName" style="flex: 1; overflow: auto" @change="changeDevice">
+            <el-collapse accordion v-model="activeName" style="flex: 1; height: 100%" @change="changeDevice">
                 <el-collapse-item title="治理设备" :name="0">
                     <el-tree
-                        style="min-height: calc(100vh - 250px)"
+                        style="height: calc(100vh - 350px); overflow: auto"
                         ref="treeRef1"
                         :props="defaultProps"
                         highlight-current
@@ -59,7 +59,7 @@
                 </el-collapse-item>
                 <el-collapse-item title="便携式设备" :name="1">
                     <el-tree
-                        style="min-height: calc(100vh - 250px)"
+                        style="height: calc(100vh - 290px); overflow: auto"
                         ref="treeRef2"
                         :props="defaultProps"
                         highlight-current
diff --git a/src/components/tree/point.vue b/src/components/tree/point.vue
index 9ba4497..8f91826 100644
--- a/src/components/tree/point.vue
+++ b/src/components/tree/point.vue
@@ -12,7 +12,7 @@
             size="18"
             class="fold ml10 mt20 menu-collapse"
             style="cursor: pointer"
-            v-if="route.path!='/admin/govern/reportCore/statistics/index'"
+            v-if="route.path != '/admin/govern/reportCore/statistics/index'"
         />
         <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
             <div style="display: flex; align-items: center" class="mb10">
@@ -28,14 +28,14 @@
                     size="18"
                     class="fold ml10 menu-collapse"
                     style="cursor: pointer"
-                    v-if="props.canExpand&&route.path!='/admin/govern/reportCore/statistics/index'"
+                    v-if="props.canExpand && route.path != '/admin/govern/reportCore/statistics/index'"
                 />
             </div>
 
-            <el-collapse accordion v-model="activeName" style="flex: 1; overflow: auto" @change="changeDevice">
+            <el-collapse accordion v-model="activeName" style="flex: 1; height: 100%" @change="changeDevice">
                 <el-collapse-item title="治理设备" :name="0">
                     <el-tree
-                        style="min-height: calc(100vh - 250px)"
+                        style="height: calc(100vh - 350px); overflow: auto"
                         ref="treeRef1"
                         :props="defaultProps"
                         highlight-current
@@ -60,7 +60,7 @@
                 </el-collapse-item>
                 <el-collapse-item title="便携式设备" :name="1">
                     <el-tree
-                        style="min-height: calc(100vh - 250px)"
+                        style="height: calc(100vh - 290px); overflow: auto"
                         ref="treeRef2"
                         :props="defaultProps"
                         highlight-current
@@ -92,7 +92,7 @@
 import useCurrentInstance from '@/utils/useCurrentInstance'
 import { ElTree } from 'element-plus'
 import { ref, watch } from 'vue'
-import {useRoute} from 'vue-router'
+import { useRoute } from 'vue-router'
 defineOptions({
     name: 'govern/tree'
 })
@@ -111,8 +111,8 @@ const props = withDefaults(defineProps<Props>(), {
     data: []
 })
 
-const route=useRoute()
-console.log(route,"6666677788889")
+const route = useRoute()
+console.log(route, '6666677788889')
 const { proxy } = useCurrentInstance()
 const menuCollapse = ref(false)
 const activeName = ref(0)