From 8ac27687ea17f9fd86d5e567ac906ad203466ea3 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 06 七月 2023 14:40:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 8bce7c9..9794084 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -5,7 +5,7 @@
<el-scrollbar style="height: auto;border-bottom-right-radius:8px ">
<basic-container>
<div class="abox">
- <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"/>
+ <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick"/>
</div>
</basic-container>
</el-scrollbar>
@@ -801,10 +801,10 @@
selChange(row){
this.id=row
},
- selecload(page, params = {}) {
- getPage(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
- console.log(res)
- this.seoptions=res.data.data.content
+ selecload() {
+ getPage(1, -1).then(res => {
+ // console.log(res)
+ this.seoptions=res.data.data.records
});
},
nodeClick(data) {
@@ -967,7 +967,7 @@
if (this.selectionList.length === 1) {
this.roleTreeObj = this.selectionList[0].roleId.split(",");
}
- getRoleTree().then(res => {
+ getRoleTree(this.selectionList[0].tenantId).then(res => {
this.roleGrantList = res.data.data;
this.roleBox = true;
--
Gitblit v1.9.3