From ea912c878ce19a1f4b20dbb167c4420d72737998 Mon Sep 17 00:00:00 2001
From: "1147680382@qq.com" <zhu668899>
Date: Mon, 26 May 2025 11:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E5=90=8E?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/header/components/avatar.vue |  1 +
 src/layout/menu/index.vue               | 35 +++++++++++--------------
 src/router/generateMenu.js              |  5 ----
 src/views/groupManagement/index.vue     | 14 ++++++++++
 src/views/login/index.vue               |  7 ++---
 5 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/layout/header/components/avatar.vue b/src/layout/header/components/avatar.vue
index 817d9c9..425e9fe 100644
--- a/src/layout/header/components/avatar.vue
+++ b/src/layout/header/components/avatar.vue
@@ -34,6 +34,7 @@ onMounted(() => {
 })
 const gotoLogin = () => {
   sessionStorage.removeItem("token");
+  sessionStorage.removeItem("userInfo");
   router.push("/login");
 };
 </script>
diff --git a/src/layout/menu/index.vue b/src/layout/menu/index.vue
index 8fabdea..1e2dbe5 100644
--- a/src/layout/menu/index.vue
+++ b/src/layout/menu/index.vue
@@ -1,13 +1,9 @@
 <template>
-  <div
-    id="guide"
-    class="menu"
-    :style="{
-      width: store.getters.isCollapse == true ? '' : '200px',
-      height: '100%',
-      color: themeConfig.textColor,
-    }"
-  >
+  <div id="guide" class="menu" :style="{
+    width: store.getters.isCollapse == true ? '' : '200px',
+    height: '100%',
+    color: themeConfig.textColor,
+  }">
     <div class="logo" v-if="!store.getters.isCollapse">
       <img src="../../assets/logo.png" alt="" style="margin-right: 5px" /> BIG CUTE
     </div>
@@ -15,16 +11,9 @@
       <img src="../../assets/logo.png" alt="" />
     </div>
     <el-scrollbar style="height: 100%">
-      <el-menu
-        :default-active="activeMenu"
-        :router="true"
-        :collapse="store.getters.isCollapse"
-        :collapse-transition="false"
-        :unique-opened="true"
-        :background-color="themeConfig.backgroundColor"
-        :text-color="themeConfig.textColor"
-        :active-text-color="themeConfig.primary"
-      >
+      <el-menu :default-active="activeMenu" :router="true" :collapse="store.getters.isCollapse"
+        :collapse-transition="false" :unique-opened="true" :background-color="themeConfig.backgroundColor"
+        :text-color="themeConfig.textColor" :active-text-color="themeConfig.primary">
         <menuItems :menuList="menuList"></menuItems>
       </el-menu>
     </el-scrollbar>
@@ -38,7 +27,8 @@ import menuItems from "./components/menuItems.vue";
 // 引入本地路由表渲染导航栏
 // import menuTable from "./menuTable.js";
 import { useRouter, useRoute } from "vue-router";
-import {menuTable} from "../../router/generateMenu.js"
+import { generateMenu } from "../../router/generateMenu.js"
+import routerList from "../../router/originalRoutingTable.js";
 const route = useRoute();
 const activeMenu = computed(() => {
   return route.path;
@@ -54,6 +44,9 @@ const themeConfig = store.getters.themeConfig;
 
 // 菜单表存在后端的操作方式
 onMounted(() => {
+  // 权限检查
+  const userInfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
+  const menuTable = generateMenu(routerList, userInfo.role)
   // 获取本地菜单表渲染
   menuList.value = menuTable;
 });
@@ -61,6 +54,7 @@ onMounted(() => {
 
 <style scoped lang="scss">
 .menu {
+
   // width: 200px;
   .logo {
     height: 48px;
@@ -69,6 +63,7 @@ onMounted(() => {
     list-style: none;
     cursor: pointer;
     position: relative;
+
     img {
       width: 25px;
       vertical-align: middle;
diff --git a/src/router/generateMenu.js b/src/router/generateMenu.js
index 6cb2bbe..c7db977 100644
--- a/src/router/generateMenu.js
+++ b/src/router/generateMenu.js
@@ -1,4 +1,3 @@
-import routerList from "./originalRoutingTable";
 // 递归处理路由列表生成菜单数据
 export const generateMenu = (routes, userRole) => {
     const menuList = [];
@@ -59,10 +58,6 @@ export const generateMenu = (routes, userRole) => {
 
     return menuList;
 };
-// 权限检查
-const userInfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
-console.log(generateMenu(routerList, userInfo.role), "menuTable")
-export const menuTable = generateMenu(routerList, userInfo.role)
 
 // 使用示例
 /*
diff --git a/src/views/groupManagement/index.vue b/src/views/groupManagement/index.vue
index eeb9b2f..a31b072 100644
--- a/src/views/groupManagement/index.vue
+++ b/src/views/groupManagement/index.vue
@@ -206,6 +206,7 @@ import {
   syncUsers,
 } from "../../api/modules/index";
 import { Refresh, Search, Plus } from '@element-plus/icons-vue';
+import { useRouter } from 'vue-router';
 
 // 组别列表数据
 const groupList = ref([]);
@@ -278,6 +279,8 @@ const groupRules = {
   ]
 };
 
+const router = useRouter();
+
 // 获取组别列表
 const fetchGroupList = async () => {
   try {
@@ -345,11 +348,22 @@ const handleRoleChange = async (user, role) => {
     );
     if (res.errcode === 0) {
       ElMessage.success("修改成功");
+      const userInfo = JSON.parse(sessionStorage.getItem("userInfo")) || {}
+      // 检查是否是当前登录用户
+      if (user.userid === userInfo?.userid) {
+        ElMessage.warning("您已修改了自己的角色，需要重新登录");
+        gotoLogin()
+      }
     }
   } catch (error) {
     ElMessage.error("修改失败");
   }
 };
+const gotoLogin = () => {
+  sessionStorage.removeItem("token");
+  sessionStorage.removeItem("userInfo");
+  router.push("/login");
+};
 
 // 移除成员
 const handleRemoveUser = async (user) => {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e145b14..43d167b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -38,8 +38,8 @@ const loginIn = async (code) => {
     type: "success",
   });
   // 拿用户信息
-  obInformation();
-  router.push("/");
+  await obInformation();
+  // router.push("/");
 };
 // 登录判断
 const token = sessionStorage.getItem("token");
@@ -79,7 +79,8 @@ const obInformation = async () => {
   });
 
   sessionStorage.setItem("userInfo", JSON.stringify(userInfo));
-  router.push("/");
+  // router.push("/");
+  router.replace("/")
 };
 </script>