From 233494b19c74c7678f36eef42d481f01ed0b360c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 26 十月 2023 17:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Master/MasterTree.vue |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 735ac38..f24b41c 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="overflow: auto; height: calc(100vh - 150px);">
+  <div class="app">
     <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" @node-click="nodeClick" style="width: fit-content;">
       <template slot-scope="{ node }">
         <span style="display: inline-block;">{{ node.label }}</span>
@@ -149,7 +149,7 @@
           List.forEach(item => {
             let columnItem = {
               label: item.title,
-              prop: item.field,
+              prop: item.queryField,
               // type: this.columnType[item.type],
               sortable: item.sort,
               width: item.minWidth
@@ -170,7 +170,7 @@
       try {
         // console.log(data)
         this.TreeValue=data.label.split(" ")[0].trim();
-        console.log('TreeValue',this.TreeValue)
+        // console.log('TreeValue',this.TreeValue)
         this.$emit('TreeValue',this.TreeValue)
         this.nodeClickList = data;
         this.tableHeadDataFateher = []
@@ -188,6 +188,22 @@
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+.app{
+  overflow: auto;
+  height: calc(100vh - 150px);
+}
+ .app::-webkit-scrollbar {
+  height: 15px ; // 绾靛悜婊氬姩鏉� 蹇呭啓
+  background: white;
+  border: white;
+  width: 10px;
 
+}
+// 婊氬姩鏉$殑婊戝潡
+ .app::-webkit-scrollbar-thumb {
+  background-color: #ececec;
+  border-radius: 20px;
+  border: #ececec;
+}
 </style>

--
Gitblit v1.9.3