From 3af456e594e77c97254d43df5bc36a29ff6964c0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 21 Nov 2024 13:57:36 +0800
Subject: [PATCH] 用户、角色、机构调整
---
src/views/system/dept.vue | 7 ++++---
vite.config.mjs | 4 ++--
src/api/system/role.js | 9 +++++++++
src/views/system/user.vue | 7 ++++++-
src/api/system/dept.js | 14 ++++++++++----
src/views/authority/role.vue | 13 ++++++++-----
6 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 730ca86..f0fcbc7 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -23,6 +23,14 @@
});
};
+export const getChildLazyTree = (params) => {
+ return request({
+ url: '/blade-system/dept/getChildLazyTree',
+ method: 'get',
+ params: params
+ });
+};
+
export const remove = ids => {
return request({
url: '/blade-system/dept/remove',
@@ -69,13 +77,11 @@
});
};
-export const getDeptLazyTree = parentId => {
+export const getDeptLazyTree = param => {
return request({
url: '/blade-system/dept/lazy-tree',
method: 'get',
- params: {
- parentId,
- },
+ params: param
});
};
diff --git a/src/api/system/role.js b/src/api/system/role.js
index ef57e36..dadd865 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -11,6 +11,15 @@
},
});
};
+
+export const getRoleList = ( params) => {
+ return request({
+ url: '/blade-system/role/getRoleList',
+ method: 'get',
+ params: params
+ });
+};
+
export const grantTree = () => {
return request({
url: '/blade-system/menu/grant-tree',
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index f701574..0fc1a38 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -30,11 +30,12 @@
</el-button>
<el-button
icon="el-icon-setting"
- @click="handleRole"
v-if="userInfo.role_name.includes('admin')"
+ @click="handleRole"
plain
>权限设置
</el-button>
+ <!-- -->
</template>
</avue-crud>
<el-dialog title="角色权限配置" append-to-body v-model="box" width="345px">
@@ -50,7 +51,7 @@
>
</el-tree>
</el-tab-pane>
- <el-tab-pane label="数据权限">
+ <!-- <el-tab-pane label="数据权限">
<el-tree
:data="dataScopeGrantList"
show-checkbox
@@ -71,7 +72,7 @@
:props="props"
>
</el-tree>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<template #footer>
<span class="dialog-footer">
@@ -253,8 +254,10 @@
},
submit() {
const menuList = this.$refs.treeMenu.getCheckedKeys();
- const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
- const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+ // const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
+ const dataScopeList = [];
+ // const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+ const apiScopeList = [];
grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
this.box = false;
this.$message({
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 48af893..66a9305 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -25,6 +25,7 @@
<script>
import {
getLazyList,
+ getChildLazyTree,
remove,
update,
add,
@@ -115,7 +116,8 @@
hide: true,
addDisabled: false,
props: {
- label: 'title',
+ label: 'name',
+ value:'id'
},
labelWidth: 120,
rules: [{
@@ -377,8 +379,7 @@
});
},
treeLoad(tree, treeNode, resolve) {
- const parentId = tree.id;
- getLazyList(parentId).then(res => {
+ getChildLazyTree({parentId:tree.id}).then(res => {
resolve(res.data.data);
});
},
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 55bdd5e..92b8d9c 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -191,7 +191,12 @@
lazy: true,
treeLoad: function (node, resolve) {
const parentId = node.level === 0 ? 0 : node.data.id;
- getDeptLazyTree(parentId).then(res => {
+ console.log(node,666)
+ const param = {
+ parentId:parentId,
+ level:node.level
+ }
+ getDeptLazyTree(param).then(res => {
resolve(
res.data.data.map(item => {
return {
diff --git a/vite.config.mjs b/vite.config.mjs
index b610064..df3da37 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -38,8 +38,8 @@
port: 2888,
proxy: {
'/api': {
- // target: 'http://localhost',
- target: 'https://wrj.shuixiongit.com/api',
+ target: 'http://localhost',
+ // target: 'https://wrj.shuixiongit.com/api',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),
},
--
Gitblit v1.9.3