From 2e61dd380b8a0f94f386684060af91b79e4d45f0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 09 十月 2024 17:23:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
index ad0703b..a1d02f2 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/index.vue
@@ -4,7 +4,7 @@
<basic-container>
<div ref="TreeBox" style="height: calc(100vh - 154px);!important;">
<!-- 宸︿晶鏍� -->
- <div style="height: calc(100vh - 200px);">
+ <div style="height: calc(100vh - 195px);">
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
@@ -24,7 +24,7 @@
<div>
<el-button icon="el-icon-place" plain size="small" type="primary" @click="saveHandler">鎺堟潈</el-button>
<el-button icon="el-icon-close" plain size="small" type="primary" @click="clearValue" style="margin-right: 40px;">閲嶇疆</el-button>
- 涓氬姟绫诲瀷锛�<el-select v-model="type" placeholder="璇烽�夋嫨" :clearable="true" @change="typeChange" style="width: 350px;margin-right: 20px;">
+ 涓氬姟绫诲瀷锛�<el-select v-model="type" placeholder="璇烽�夋嫨" size="small" :clearable="true" @change="typeChange" style="width: 300px;margin-right: 20px;">
<el-option
v-for="item in typeData"
:key="item.oid"
@@ -32,7 +32,7 @@
:value="item.attributes.name">
</el-option>
</el-select>
- UI涓婁笅鏂囷細<el-select v-model="context" placeholder="璇烽�夋嫨" :clearable="true" @change="contextChange" style="width: 350px;">
+ UI涓婁笅鏂囷細<el-select v-model="context" placeholder="璇烽�夋嫨" size="small" :clearable="true" @change="contextChange" style="width: 350px;">
<el-option
v-for="item in contextData"
:key="item.oid"
@@ -41,7 +41,7 @@
</el-option>
</el-select>
</div>
- <div style="height: calc(100vh - 277px);margin-top: 10px;">
+ <div style="height: calc(100vh - 232px);margin-top: 10px;">
<avue-tree ref="uiTree" :data="uiTreeData" :option="uiTreeOption">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
@@ -81,7 +81,7 @@
treeData: [],
defaultExpandKeys:[],
uiTreeOption: {
- defaultExpandKeys:[],
+ defaultExpandedKeys:this.defaultExpandKeys,
multiple: true,
menu: false,
addBtn: false,
@@ -127,7 +127,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,
@@ -149,7 +149,7 @@
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){
@@ -165,7 +165,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.10.0