From f22211dcc3767d8fb50a37eb424a258a12fe626b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 15:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/authority/ui/uiAuthorization/UIDialog.vue | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 4b92d8d..130cdaf 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
@@ -9,26 +9,28 @@
:close-on-click-modal="false"
@close="cancelDialog">
<el-container style="height: 550px">
- <el-aside>
- <basic-container style="height: 500px">
- <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <el-aside style="height: 500px">
+ <basic-container v-loading="leftLoading">
+ <div style="height: 425px">
+ <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>
</span>
- </avue-tree>
+ </avue-tree>
+ </div>
</basic-container>
</el-aside>
- <el-main>
- <basic-container style="height: 500px">
+ <el-main style="height: 500px">
+ <basic-container v-loading="rightLoading">
<h3 style="margin: 0">妯″潡鏉冮檺閰嶇疆</h3>
<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>
@@ -54,6 +56,8 @@
name: "UIDialog",
data() {
return {
+ leftLoading:false,
+ rightLoading:false,
dialog: {
showDialog: false,
title: "UI鎺堟潈",
@@ -104,18 +108,18 @@
this.dialog.showDialog = false;
},
getTreeList() {
- const loading = this.$loading({});
+ this.leftLoading = true;
gridRoles().then(res => {
this.treeData = res.data.data;
- loading.close();
+ this.leftLoading = false;
}).catch(error=>{
- loading.close();
+ this.leftLoading = false;
})
},
// 瑙掕壊鐐瑰嚮
nodeClick(row,node) {
this.nodeRow = row;
- const loading = this.$loading({});
+ this.rightLoading = true;
const params = {
'conditionMap[roleId]': this.nodeRow.oid,
'conditionMap[type]': this.type,
@@ -136,9 +140,9 @@
label: res.data.data[0].text,
children: res.data.data[0].children
}];
- loading.close();
+ this.rightLoading = false;
}).catch(error => {
- loading.close();
+ this.rightLoading = false;
})
},
//澶勭悊鏍�
--
Gitblit v1.9.3