From 40923c06346fafb3fd8357ccd445d84d32ef0d48 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Sat, 11 May 2024 17:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archiveKeeping/deviceManage/index.vue     | 28 +++++++------
 src/views/system/archiveScopeManage/index.vue | 20 +++++----
 src/views/system/archivesCategory/index.vue   |  2 +-
 src/views/system/archivesClassify/index.vue   | 20 +++++----
 src/views/system/fileLibraryManage/index.vue  | 28 +++++++------
 .../system/fourCharacterDetection/index.vue   |  6 ++-
 src/views/system/log/search.vue               |  1 +
 src/views/system/menu/index.vue               |  2 +-
 src/views/system/role/index.vue               |  2 +-
 src/views/system/user/index.vue               | 41 ++++++++++++++++---
 10 files changed, 95 insertions(+), 55 deletions(-)

diff --git a/src/views/archiveKeeping/deviceManage/index.vue b/src/views/archiveKeeping/deviceManage/index.vue
index 2e9f649..d402929 100644
--- a/src/views/archiveKeeping/deviceManage/index.vue
+++ b/src/views/archiveKeeping/deviceManage/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container category-container">
+  <div class="app-container category-container" style="height: calc(100vh - 140px);">
     <!-- 门类列表 -->
     <div class="container-main">
       <div class="elect-cont-left">
@@ -30,19 +30,21 @@
           <span class="left-bottom-line" />
           <!--门类树状结构-->
           <div class="tree-scroll">
-            <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick">
-              <span slot-scope="{ node, data }" class="custom-tree-node">
-                <span v-if="data.isType === 1" class="iconFolder">
-                  {{ data.cnName }}
+            <el-scrollbar style="height: calc(100vh - 240px);">
+              <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick">
+                <span slot-scope="{ node, data }" class="custom-tree-node">
+                  <span v-if="data.isType === 1" class="iconFolder">
+                    {{ data.cnName }}
+                  </span>
+                  <span v-if="data.isType === 2" class="iconStoreHouse">
+                    {{ data.cnName }}
+                  </span>
+                  <span v-if="data.isType === 3" class="iconArea">
+                    {{ data.cnName }}
+                  </span>
                 </span>
-                <span v-if="data.isType === 2" class="iconStoreHouse">
-                  {{ data.cnName }}
-                </span>
-                <span v-if="data.isType === 3" class="iconArea">
-                  {{ data.cnName }}
-                </span>
-              </span>
-            </el-tree>
+              </el-tree>
+            </el-scrollbar>
           </div>
         </div>
       </div>
diff --git a/src/views/system/archiveScopeManage/index.vue b/src/views/system/archiveScopeManage/index.vue
index efe6d8f..a751bb6 100644
--- a/src/views/system/archiveScopeManage/index.vue
+++ b/src/views/system/archiveScopeManage/index.vue
@@ -8,15 +8,17 @@
           <span class="left-bottom-line" />
           <!--门类树状结构-->
           <div class="tree-scroll">
-            <el-tree
-              ref="tree"
-              v-loading="crud.loading"
-              :data="crud.data"
-              node-key="id"
-              :props="defaultProps"
-              :expand-on-click-node="false"
-              @node-click="handleNodeClick"
-            />
+            <el-scrollbar style="height: calc(100vh - 180px);">
+              <el-tree
+                ref="tree"
+                v-loading="crud.loading"
+                :data="crud.data"
+                node-key="id"
+                :props="defaultProps"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
           </div>
         </div>
       </div>
diff --git a/src/views/system/archivesCategory/index.vue b/src/views/system/archivesCategory/index.vue
index 476f27d..a6be251 100644
--- a/src/views/system/archivesCategory/index.vue
+++ b/src/views/system/archivesCategory/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container category-container">
+  <div class="app-container category-container" style="height: calc(100vh - 140px);">
     <!-- 门类列表 -->
     <div class="container-main">
       <div class="elect-cont-left">
diff --git a/src/views/system/archivesClassify/index.vue b/src/views/system/archivesClassify/index.vue
index 02f1358..2f10d2c 100644
--- a/src/views/system/archivesClassify/index.vue
+++ b/src/views/system/archivesClassify/index.vue
@@ -7,15 +7,17 @@
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <div class="tree-scroll">
-            <el-tree
-              ref="tree"
-              v-loading="crud.loading"
-              :data="crud.data"
-              node-key="id"
-              :props="defaultProps"
-              :expand-on-click-node="false"
-              @node-click="handleNodeClick"
-            />
+            <el-scrollbar style="height: calc(100vh - 180px);">
+              <el-tree
+                ref="tree"
+                v-loading="crud.loading"
+                :data="crud.data"
+                node-key="id"
+                :props="defaultProps"
+                :expand-on-click-node="false"
+                @node-click="handleNodeClick"
+              />
+            </el-scrollbar>
           </div>
         </div>
       </div>
diff --git a/src/views/system/fileLibraryManage/index.vue b/src/views/system/fileLibraryManage/index.vue
index d39bbba..2d4c05f 100644
--- a/src/views/system/fileLibraryManage/index.vue
+++ b/src/views/system/fileLibraryManage/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container category-container">
+  <div class="app-container category-container" style="height: calc(100vh - 140px);">
     <!-- 门类列表 -->
     <div class="container-main">
       <div class="elect-cont-left">
@@ -29,19 +29,21 @@
           <span class="left-bottom-line" />
           <!--门类树状结构-->
           <div class="tree-scroll">
-            <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick">
-              <span slot-scope="{ node, data }" class="custom-tree-node">
-                <span v-if="data.isType === 1 " class="iconFolder">
-                  {{ data.cnName }}
+            <el-scrollbar style="height: calc(100vh - 230px);">
+              <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick">
+                <span slot-scope="{ node, data }" class="custom-tree-node">
+                  <span v-if="data.isType === 1 " class="iconFolder">
+                    {{ data.cnName }}
+                  </span>
+                  <span v-if="data.isType === 2" class="iconArch">
+                    {{ data.cnName }}
+                  </span>
+                  <span v-if="data.isType === 3" class="iconFile">
+                    {{ data.cnName }}
+                  </span>
                 </span>
-                <span v-if="data.isType === 2" class="iconArch">
-                  {{ data.cnName }}
-                </span>
-                <span v-if="data.isType === 3" class="iconFile">
-                  {{ data.cnName }}
-                </span>
-              </span>
-            </el-tree>
+              </el-tree>
+            </el-scrollbar>
           </div>
         </div>
       </div>
diff --git a/src/views/system/fourCharacterDetection/index.vue b/src/views/system/fourCharacterDetection/index.vue
index 40f5390..9dbe5a9 100644
--- a/src/views/system/fourCharacterDetection/index.vue
+++ b/src/views/system/fourCharacterDetection/index.vue
@@ -1,12 +1,14 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="height: calc(100vh - 140px);">
     <div class="container-main" style="justify-content: flex-start;">
       <!--侧边部门数据-->
       <div class="elect-cont-left">
         <div class="container-left">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
-          <el-tree ref="tree" :data="fourDatas" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current :default-expanded-keys="defaultExpandedKeys" @node-click="handleNodeClick" />
+          <el-scrollbar style="height: calc(100vh - 180px);">
+            <el-tree ref="tree" :data="fourDatas" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current :default-expanded-keys="defaultExpandedKeys" @node-click="handleNodeClick" />
+          </el-scrollbar>
         </div>
       </div>
       <!--用户数据-->
diff --git a/src/views/system/log/search.vue b/src/views/system/log/search.vue
index cc370ed..8981424 100644
--- a/src/views/system/log/search.vue
+++ b/src/views/system/log/search.vue
@@ -106,6 +106,7 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query[this.optionVal] = this.keyWord
       if (this.blurryTime) {
         this.crud.query.startTime = this.blurryTime[0]
         this.crud.query.endTime = this.blurryTime[1]
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 727be3f..3653ecc 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container row-container">
+  <div class="app-container row-container" style="height: calc(100vh - 140px);">
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle" class="head-search">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index a6aba9b..dd6ebee 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -120,7 +120,7 @@
               @check="fondsChange"
             >
               <template slot-scope="{ node }">
-                <el-tooltip :content="node.label" placement="top-end" effect="dark">
+                <el-tooltip :content="node.label" placement="left" :enterable="false" effect="dark">
                   <span>{{ node.label }}</span>
                 </el-tooltip>
               </template>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 62a091b..82e169e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -7,13 +7,29 @@
           <el-input v-model="filterText" clearable size="small" placeholder="输入部门名称搜索" prefix-icon="el-icon-search" class="filter-item" />
         </div>
         <el-tree ref="tree" v-loading="crud.loading" :data="fondsDatas" :props="defaultProps" :expand-on-click-node="false" :default-expanded-keys="defaultExpandedKeys" node-key="id" highlight-current :filter-node-method="filterNode" @node-click="handleNodeClick">
-          <template slot-scope="{ node, data }">
+          <!-- <template slot-scope="{ node, data }">
             <div :class="{'top-level': data.id === 0}">
               <span>
                 {{ data.fondsName }}
                 <span>{{ data.deptsName }}</span>
               </span>
             </div>
+          </template> -->
+
+          <template
+            slot-scope="{node,data}"
+            class="custom-tree-node"
+          >
+            <el-tooltip
+              v-if="data.fondsName"
+              effect="dark"
+              :content="data.fondsName"
+              :enterable="false"
+              placement="left"
+            >
+              <span class="tree-text"> {{ data.fondsName }}</span>
+            </el-tooltip>
+            <span v-else class="tree-text"> {{ data.deptsName }}</span>
           </template>
         </el-tree>
       </div>
@@ -560,6 +576,7 @@ export default {
           this.$refs.tree.setCurrentKey(this.fondsDatas[0].children[0].children[0].id)
           this.handleNodeClick(this.fondsDatas[0].children[0].children[0])
         })
+        console.log('this.fondsDatas', this.fondsDatas)
       })
     },
     filterNode(value, data) {
@@ -728,11 +745,23 @@ export default {
   .el-tree-node__content{
     font-size: 14px;
     color: #545B65;
+    .tree-text{
+      font-size: 16px;
+      font-weight: 600;
+      color: #0C0E1E;
+    }
   }
-  .top-level{
-    font-size: 16px;
-    font-weight: 600;
-    color: #0C0E1E;
-  }
+  .el-tree-node__children{
+      .tree-text {
+        font-size: 14px !important;
+        font-weight: normal;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        display: inline-block;
+        min-width: 170px;
+        color: #545B65;
+      }
+    }
 }
 </style>