From 8bc25357d5742f07710baa7a6f1d6ac4023da3ac Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 25 十二月 2024 12:00:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
index 8347c23..b574401 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue
@@ -13,7 +13,7 @@
       <basic-container style="height: 500px">
         <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
           <span slot-scope="{ node, data }" class="el-tree-node__label">
-           <span style="font-size: 15px">
+           <span>
               <i class="el-icon-user-solid"></i>
                 {{ (node || {}).label }}
             </span>
@@ -28,7 +28,7 @@
         <div style="height: 445px;">
           <avue-tree ref="uiTree" :data="uiTreeData" :option="uiTreeOption">
           <span slot-scope="{ node, data }" class="el-tree-node__label">
-            <span style="font-size: 15px">
+            <span>
               <i :class="data.icon"></i>
                 {{ (node || {}).label }}
             </span>
@@ -77,7 +77,7 @@
       uiTreeOption: {
         nodeKey:'oid',
         checkOnClickNode:true,
-        defaultExpandKeys:[],
+        defaultExpandedKeys:this.defaultExpandKeys,
         multiple: true,
         menu: false,
         addBtn: false,
@@ -124,7 +124,7 @@
       this.defaultExpandKeys=['root'];
       getUIAuthor(params).then(res => {
         this.processChildren(res.data.data[0]); // 澶勭悊姣忎釜鑺傜偣
-        this.uiTreeOption.defaultExpandKeys=this.defaultExpandKeys;
+        this.uiTreeOption.defaultExpandedKeys=this.defaultExpandKeys;
         this.uiTreeData = [{
           attributes: {},
           checked: false,
@@ -145,12 +145,12 @@
     processChildren(item) {
       if (item.children && item.children.length > 0) {
         item.children = item.children.map(child => {
-          if(child.level<5){
+          if(child.level<4){
             this.defaultExpandKeys.push(child.oid)
           }
           if(child.level==1){
             child.icon='el-icon-s-promotion';
-            child.label=child.data.label+'锛�'+child.data.name+'锛�'
+            child.label=child.data.label+'('+child.data.name+')'
           }else if(child.level==2){
             child.icon='el-icon-s-order';
             child.label=child.text
@@ -161,7 +161,7 @@
             child.icon='el-icon-document';
             child.label=child.text
           }else if(child.level==5){
-            child.icon='el-icon-s-ticket';
+            child.icon='el-icon-s-tools';
             child.label=child.text
           }
           this.processChildren(child); // 閫掑綊澶勭悊姣忎釜瀛愯妭鐐�

--
Gitblit v1.9.3