From 4b04a694e335a23155c957136204ec02eb4a0ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=95=E9=98=B3=E5=BE=AE=E7=AC=911?=
<12457268+sunset-smile-1@user.noreply.gitee.com>
Date: Thu, 26 Dec 2024 19:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E7=9A=84?=
=?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/menu/index.ts | 7 +--
src/layout/component/aside.vue | 36 ++++++++++++++-
src/layout/navMenu/vertical.vue | 63 +++++++++++++++++++++++++--
src/views/login/component/account.vue | 11 ++++-
src/views/usermanage/role/dialog.vue | 15 +++----
5 files changed, 111 insertions(+), 21 deletions(-)
diff --git a/src/api/menu/index.ts b/src/api/menu/index.ts
index 80a83ec..78afc32 100644
--- a/src/api/menu/index.ts
+++ b/src/api/menu/index.ts
@@ -1,3 +1,4 @@
+import { baseUrlHost } from '../baseUrlHost';
import request from '/@/utils/request';
/**
@@ -12,11 +13,11 @@ import request from '/@/utils/request';
*/
export function useMenuApi() {
return {
- getAdminMenu: (params?: object) => {
+ getAdminMenu: (id: number) => {
return request({
- url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json',
+ // url: '/gitee/lyt-top/vue-next-admin-images/raw/master/menu/adminMenu.json',
+ url:baseUrlHost + `/acGrouptype/findByUserMenu/${id}`,
method: 'get',
- params,
});
},
getTestMenu: (params?: object) => {
diff --git a/src/layout/component/aside.vue b/src/layout/component/aside.vue
index cb6bd48..781eb90 100644
--- a/src/layout/component/aside.vue
+++ b/src/layout/component/aside.vue
@@ -3,19 +3,23 @@
-
+
+
+
diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue
index 0bb88cc..a4d39c4 100644
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@@ -106,7 +106,8 @@ const onSignIn = async () => {
// 存储 token 到浏览器缓存
Session.set('token', res.data.token);
// usertype判断登录角色
- Cookies.set('userName', res.data.user.usertype === 1 ? 'admin' : 'user');
+ // Cookies.set('userName', res.data.user.usertype === 1 ? 'admin' : 'user');
+ Cookies.set('userName', 'admin');
if (!themeConfig.value.isRequestRoutes) {
// 前端控制路由,2、请注意执行顺序
const isNoPower = await initFrontEndControlRoutes();
@@ -116,7 +117,13 @@ const onSignIn = async () => {
// 添加完动态路由,再进行 router 跳转,否则可能报错 No match found for location with path "/"
const isNoPower = await initBackEndControlRoutes();
// 执行完 initBackEndControlRoutes,再执行 signInSuccess
- signInSuccess(isNoPower);
+ // signInSuccess(isNoPower);
+ if (isNoPower) {
+ // 根据实际需求处理登录成功后的操作
+ signInSuccess(false); // 假设 signInSuccess 接收布尔值表示是否有权限问题
+ } else {
+ throw new Error('权限不足或路由加载失败');
+ }
}
}else{
ElMessage.error(res.errorMsg||res.message);
diff --git a/src/views/usermanage/role/dialog.vue b/src/views/usermanage/role/dialog.vue
index 7976849..3ee6a1e 100644
--- a/src/views/usermanage/role/dialog.vue
+++ b/src/views/usermanage/role/dialog.vue
@@ -197,10 +197,6 @@ const onSubmit = async() => {
if(valid){
state.ruleForm.show = state.ruleForm.show ? 1 : 0;
state.ruleForm.grouptypeid = 1;
- let body = {
- actions:tree.value.getCheckedKeys(true, false),
- groupid:state.ruleForm.id
- }
if (state.dialog.type === 'add') {
try{
const param = {
@@ -209,12 +205,7 @@ const onSubmit = async() => {
}
const res = await roleapi.addRole(param);
if (res?.success) {
- try{
- const data = await roleactionapi.setUprolePermission(body)
- console.log(5555555,data);
- }catch(error){
- console.error(error)
- }
+
emit('reset');
closeDialog();
ElMessage.success('角色新建成功!');
@@ -234,6 +225,10 @@ const onSubmit = async() => {
ElMessage.error('角色新建失败!')
}
} else {
+ let body = {
+ actions:tree.value.getCheckedKeys(true, false),
+ groupid:state.ruleForm.id
+ }
try{
const res = await roleapi.updateRole(state.ruleForm);
if(res?.success){