From e2077c4c96ab8a0ca21c92282937fd6322cb6adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E5=90=AF=E9=BE=99?= <shiqilong@beyondcent.com>
Date: Tue, 19 Nov 2024 17:17:04 +0800
Subject: [PATCH] style: modify

---
 .../views/data-collection/components/Tree.vue | 24 +++++++++----------
 webs/ams-web/src/views/module/side/index.vue  |  8 +------
 .../src/views/resource/menu/SideMenu.vue      | 24 +++++++++----------
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/webs/ams-web/src/views/data-collection/components/Tree.vue b/webs/ams-web/src/views/data-collection/components/Tree.vue
index 7aabafa..2ddb1e8 100644
--- a/webs/ams-web/src/views/data-collection/components/Tree.vue
+++ b/webs/ams-web/src/views/data-collection/components/Tree.vue
@@ -3,18 +3,16 @@
     <div class="operate">
       <el-input class="filter-input" v-model="filterText" size="mini" placeholder="请输入模型关键字进行过滤" clearable> </el-input>
     </div>
-    <el-scrollbar class="custom-scrollbar" style="height: calc(100% - 50px)">
-      <el-tree class="tree" :data="data" ref="treeRef" highlight-current node-key="id" current-node-key="" @node-click="handleNodeClick" :props="defaultProps" :filter-node-method="filterNode">
-        <span class="custom-tree-node" slot-scope="{ node, data }">
-          <div class="custom-tree-node-wrapper">
-            <span class="custom-tree-node-label">
-              <img class="custom-tree-node-img" v-if="data.iconImage" :src="data.iconImage" alt="" />
-              {{ node.label }}
-            </span>
-          </div>
-        </span>
-      </el-tree>
-    </el-scrollbar>
+    <el-tree class="tree" :data="data" ref="treeRef" highlight-current node-key="id" current-node-key="" @node-click="handleNodeClick" :props="defaultProps" :filter-node-method="filterNode">
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <div class="custom-tree-node-wrapper">
+          <span class="custom-tree-node-label">
+            <img class="custom-tree-node-img" v-if="data.iconImage" :src="data.iconImage" alt="" />
+            {{ node.label }}
+          </span>
+        </div>
+      </span>
+    </el-tree>
   </div>
 </template>
 
@@ -99,7 +97,7 @@ export default defineComponent({
       filterText,
       treeRef,
       handleNodeClick,
-      getData
+      getData,
     }
   },
 })
diff --git a/webs/ams-web/src/views/module/side/index.vue b/webs/ams-web/src/views/module/side/index.vue
index 2d5c22a..32a4e90 100644
--- a/webs/ams-web/src/views/module/side/index.vue
+++ b/webs/ams-web/src/views/module/side/index.vue
@@ -6,9 +6,7 @@
         <i class="el-icon-plus cur-point m-l-xs" @click="handleCreateNode({ title: '新增根分组', operateType: 'create', isRoot: true, type: 'group' })"></i>
       </el-tooltip>
     </div>
-    <el-scrollbar class="custom-scrollbar">
-      <Tree ref="tree" :filterText="filterText" :isShowOperate="type === 'normal' ? true : false" v-on="$listeners" v-bind="$attrs" @handleCreate="handleCreate" @remove="remove" @handleNodeClick="$emit('handleNodeClick', $event)"></Tree>
-    </el-scrollbar>
+    <Tree ref="tree" :filterText="filterText" :isShowOperate="type === 'normal' ? true : false" v-on="$listeners" v-bind="$attrs" @handleCreate="handleCreate" @remove="remove" @handleNodeClick="$emit('handleNodeClick', $event)"></Tree>
     <AddNode :addData="addData" v-if="addData.dialog" @update-success="updateSuccess"></AddNode>
   </el-card>
 </template>
@@ -100,8 +98,4 @@ export default {
   padding: 20px 10px;
   height: 100%;
 }
-.custom-scrollbar {
-  height: calc(100% - 80px);
-  width: 100%;
-}
 </style>
diff --git a/webs/ams-web/src/views/resource/menu/SideMenu.vue b/webs/ams-web/src/views/resource/menu/SideMenu.vue
index 3684d10..5616fc3 100644
--- a/webs/ams-web/src/views/resource/menu/SideMenu.vue
+++ b/webs/ams-web/src/views/resource/menu/SideMenu.vue
@@ -1,19 +1,17 @@
 <template>
   <div class="side-menu">
     <el-input placeholder="输入关键字进行过滤" v-model="filterText" class="m-b" clearable> </el-input>
-    <el-scrollbar class="custom-scrollbar" style="height: calc(100% - 130px)">
-      <el-tree class="tree" highlight-current node-key="id" :load="loadNode" @node-click="handleNodeClick" lazy :props="{ label: 'name', children: 'childrenGroups', isLeaf: isLeaf }" :filter-node-method="filterNode" ref="treeRef">
-        <span class="custom-tree-node" slot-scope="{ node, data }">
-          <div class="custom-tree-node-wrapper">
-            <span class="custom-tree-node-label">
-              <img class="custom-tree-node-img" v-if="data.iconImage" :src="data.iconImage" alt="" />
-              {{ node.label }}
-              <span v-if="data.type === 'module'" class="m-l-xs">({{ data.instanceNum }})</span>
-            </span>
-          </div>
-        </span>
-      </el-tree>
-    </el-scrollbar>
+    <el-tree class="tree" highlight-current node-key="id" :load="loadNode" @node-click="handleNodeClick" lazy :props="{ label: 'name', children: 'childrenGroups', isLeaf: isLeaf }" :filter-node-method="filterNode" ref="treeRef">
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <div class="custom-tree-node-wrapper">
+          <span class="custom-tree-node-label">
+            <img class="custom-tree-node-img" v-if="data.iconImage" :src="data.iconImage" alt="" />
+            {{ node.label }}
+            <span v-if="data.type === 'module'" class="m-l-xs">({{ data.instanceNum }})</span>
+          </span>
+        </div>
+      </span>
+    </el-tree>
   </div>
 </template>