From 53a4a074f3e59efb05b2e5ca76d364f53939d957 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Wed, 18 Mar 2026 16:50:44 +0800
Subject: [PATCH] 修改用户管理
---
src/permission.js | 5 +
src/views/system/user/index.vue | 22 ++++-
src/views/system/user/profile/index.vue | 2
src/store/modules/permission.js | 211 +++++++++++++++++++++++++++-------------------------
4 files changed, 130 insertions(+), 110 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 1f8bdbb..aab7744 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -50,6 +50,11 @@
} else {
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
}
+ }).catch(err=>{
+ ElMessage.error(err)
+ router.push('/login')
+ NProgress.done()
+ return
})
}).catch(err => {
useUserStore().logOut().then(() => {
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 6b699d2..46185e7 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,154 +1,159 @@
-import auth from '@/plugins/auth'
-import router, { constantRoutes, dynamicRoutes } from '@/router'
-import { getRouters } from '@/api/menu'
-import Layout from '@/layout/index'
-import ParentView from '@/components/ParentView'
-import InnerLink from '@/layout/components/InnerLink'
-
+import auth from "@/plugins/auth";
+import router, { constantRoutes, dynamicRoutes } from "@/router";
+import { getRouters } from "@/api/menu";
+import Layout from "@/layout/index";
+import ParentView from "@/components/ParentView";
+import InnerLink from "@/layout/components/InnerLink";
+import { ElMessage } from "element-plus";
// 匹配views里面所有的.vue文件
-const modules = import.meta.glob('./../../views/**/*.vue')
+const modules = import.meta.glob("./../../views/**/*.vue");
-const usePermissionStore = defineStore(
- 'permission',
- {
- state: () => ({
- routes: [],
- addRoutes: [],
- defaultRoutes: [],
- topbarRouters: [],
- sidebarRouters: [],
- indexPage: ''
- }),
- actions: {
- setRoutes(routes) {
- this.addRoutes = routes
- this.routes = constantRoutes.concat(routes)
- },
- setDefaultRoutes(routes) {
- this.defaultRoutes = constantRoutes.concat(routes)
- },
- setTopbarRoutes(routes) {
- this.topbarRouters = routes
- },
- setSidebarRouters(routes) {
- this.sidebarRouters = routes
- },
- setIndexPages(routes) {
- this.indexPage = routes
- },
- generateRoutes(roles) {
- return new Promise(resolve => {
- // 向后端请求路由数据
- getRouters().then(res => {
- const sdata = JSON.parse(JSON.stringify(res.data))
- const rdata = JSON.parse(JSON.stringify(res.data))
- const defaultData = JSON.parse(JSON.stringify(res.data))
- let firstPage = ''
- //通过权限返回菜单去避免 如有首页权限 出现//index 情况
- if (res.data[0].path == '/') {
- firstPage = res.data[0].path + res.data[0].children[0].path
- } else{
- firstPage = res.data[0].path + '/' + res.data[0].children[0].path
+const usePermissionStore = defineStore("permission", {
+ state: () => ({
+ routes: [],
+ addRoutes: [],
+ defaultRoutes: [],
+ topbarRouters: [],
+ sidebarRouters: [],
+ indexPage: "",
+ }),
+ actions: {
+ setRoutes(routes) {
+ this.addRoutes = routes;
+ this.routes = constantRoutes.concat(routes);
+ },
+ setDefaultRoutes(routes) {
+ this.defaultRoutes = constantRoutes.concat(routes);
+ },
+ setTopbarRoutes(routes) {
+ this.topbarRouters = routes;
+ },
+ setSidebarRouters(routes) {
+ this.sidebarRouters = routes;
+ },
+ setIndexPages(routes) {
+ this.indexPage = routes;
+ },
+ generateRoutes(roles) {
+ return new Promise((resolve, reject) => {
+ // 向后端请求路由数据
+ getRouters().then((res) => {
+ const sdata = JSON.parse(JSON.stringify(res.data));
+ const rdata = JSON.parse(JSON.stringify(res.data));
+ const defaultData = JSON.parse(JSON.stringify(res.data));
+ let firstPage = "";
+ //通过权限返回菜单去避免 如有首页权限 出现//index 情况
+ if (!res.data || res.data.length == 0) {
+ reject("请联系管理员为该用户分配角色或配置菜单")
+ return
+ } else {
+ if (res.data[0].path == "/") {
+ firstPage = res.data[0].path + res.data[0].children[0].path;
+ } else {
+ firstPage = res.data[0].path + "/" + res.data[0].children[0].path;
}
- const sidebarRoutes = filterAsyncRouter(sdata)
- const rewriteRoutes = filterAsyncRouter(rdata, false, true)
- const defaultRoutes = filterAsyncRouter(defaultData)
- const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
- asyncRoutes.forEach(route => { router.addRoute(route) })
- this.setRoutes(rewriteRoutes)
- this.setSidebarRouters(constantRoutes.concat(sidebarRoutes))
- this.setDefaultRoutes(sidebarRoutes)
- this.setTopbarRoutes(defaultRoutes)
- this.setIndexPages(firstPage)
- resolve(rewriteRoutes)
- })
- })
- }
- }
- })
+ const sidebarRoutes = filterAsyncRouter(sdata);
+ const rewriteRoutes = filterAsyncRouter(rdata, false, true);
+ const defaultRoutes = filterAsyncRouter(defaultData);
+ const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
+ asyncRoutes.forEach((route) => {
+ router.addRoute(route);
+ });
+ this.setRoutes(rewriteRoutes);
+ this.setSidebarRouters(constantRoutes.concat(sidebarRoutes));
+ this.setDefaultRoutes(sidebarRoutes);
+ this.setTopbarRoutes(defaultRoutes);
+ this.setIndexPages(firstPage);
+ resolve(rewriteRoutes);
+ }
+ });
+ });
+ },
+ },
+});
// 遍历后台传来的路由字符串，转换为组件对象
function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
- return asyncRouterMap.filter(route => {
+ return asyncRouterMap.filter((route) => {
if (type && route.children) {
- route.children = filterChildren(route.children)
+ route.children = filterChildren(route.children);
}
if (route.component) {
// Layout ParentView 组件特殊处理
- if (route.component === 'Layout') {
- route.component = Layout
- } else if (route.component === 'ParentView') {
- route.component = ParentView
- } else if (route.component === 'InnerLink') {
- route.component = InnerLink
+ if (route.component === "Layout") {
+ route.component = Layout;
+ } else if (route.component === "ParentView") {
+ route.component = ParentView;
+ } else if (route.component === "InnerLink") {
+ route.component = InnerLink;
} else {
- route.component = loadView(route.component)
+ route.component = loadView(route.component);
}
}
if (route.children != null && route.children && route.children.length) {
- route.children = filterAsyncRouter(route.children, route, type)
+ route.children = filterAsyncRouter(route.children, route, type);
} else {
- delete route['children']
- delete route['redirect']
+ delete route["children"];
+ delete route["redirect"];
}
- return true
- })
+ return true;
+ });
}
function filterChildren(childrenMap, lastRouter = false) {
- var children = []
+ var children = [];
childrenMap.forEach((el, index) => {
if (el.children && el.children.length) {
- if (el.component === 'ParentView' && !lastRouter) {
- el.children.forEach(c => {
- c.path = el.path + '/' + c.path
+ if (el.component === "ParentView" && !lastRouter) {
+ el.children.forEach((c) => {
+ c.path = el.path + "/" + c.path;
if (c.children && c.children.length) {
- children = children.concat(filterChildren(c.children, c))
- return
+ children = children.concat(filterChildren(c.children, c));
+ return;
}
- children.push(c)
- })
- return
+ children.push(c);
+ });
+ return;
}
}
if (lastRouter) {
- el.path = lastRouter.path + '/' + el.path
+ el.path = lastRouter.path + "/" + el.path;
if (el.children && el.children.length) {
- children = children.concat(filterChildren(el.children, el))
- return
+ children = children.concat(filterChildren(el.children, el));
+ return;
}
}
- children = children.concat(el)
- })
- return children
+ children = children.concat(el);
+ });
+ return children;
}
// 动态路由遍历，验证是否具备权限
export function filterDynamicRoutes(routes) {
- const res = []
- routes.forEach(route => {
+ const res = [];
+ routes.forEach((route) => {
if (route.permissions) {
if (auth.hasPermiOr(route.permissions)) {
- res.push(route)
+ res.push(route);
}
} else if (route.roles) {
if (auth.hasRoleOr(route.roles)) {
- res.push(route)
+ res.push(route);
}
}
- })
- return res
+ });
+ return res;
}
export const loadView = (view) => {
let res;
for (const path in modules) {
- const dir = path.split('views/')[1].split('.vue')[0];
+ const dir = path.split("views/")[1].split(".vue")[0];
if (dir === view) {
res = () => modules[path]();
}
}
return res;
-}
+};
-export default usePermissionStore
+export default usePermissionStore;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 3ba2804..cc2d9f1 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -143,7 +143,11 @@
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="姓名" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
- <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+ <el-table-column label="部门" align="center" key="deptName" prop="depts.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" >
+ <template #default="scope">
+ {{ scope.row.depts?scope.row.depts.map(i=>i.deptName).join('/'): '' }}
+ </template>
+ </el-table-column>
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
<template #default="scope">
@@ -197,14 +201,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="归属部门" prop="deptId">
+ <el-form-item label="归属部门" prop="deptIds">
<el-tree-select
- v-model="form.deptId"
+ v-model="form.deptIds"
:data="deptOptions"
:props="{ value: 'id', label: 'label', children: 'children' }"
value-key="id"
placeholder="请选择归属部门"
check-strictly
+ multiple
+ clearable
/>
</el-form-item>
</el-col>
@@ -273,7 +279,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="角色">
+ <el-form-item label="角色" prop="roleIds">
<el-select v-model="form.roleIds" multiple placeholder="请选择">
<el-option
v-for="item in roleOptions"
@@ -403,7 +409,8 @@
nickName: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
- phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
+ phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
+ roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur" }]
}
});
@@ -556,7 +563,8 @@
status: "0",
remark: undefined,
postIds: [],
- roleIds: []
+ roleIds: [],
+ deptIds: []
};
proxy.resetForm("userRef");
};
@@ -574,6 +582,7 @@
open.value = true;
title.value = "添加用户";
form.value.password = initPassword.value;
+ form.value.deptId = queryParams.value.deptId || null
});
};
/** 修改按钮操作 */
@@ -586,6 +595,7 @@
roleOptions.value = response.roles;
form.value.postIds = response.postIds;
form.value.roleIds = response.roleIds;
+ form.value.deptIds = response.data.depts?.map(i=>i.deptId)
open.value = true;
title.value = "修改用户";
form.password = "";
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 5851f05..3a7ea1c 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -27,7 +27,7 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
- <div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
+ <div class="pull-right" v-if="state.user.depts">{{(state.user.depts&&state.user.depts.length)>0? [...new Set(state.user.depts.map(i=>i.deptName))].join('/'):'暂无' }} <span v-if="state.postGroup && state.postGroup !== ''">-{{ state.postGroup }}</span></div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
--
Gitblit v1.9.2