2213980799@qq.com 1 سال پیش
والد
کامیت
b8811e4b73
5فایلهای تغییر یافته به همراه105 افزوده شده و 8 حذف شده
  1. 12 3
      src/api/layout/index.js
  2. 60 2
      src/layout/components/header-tools.vue
  3. 23 2
      src/router/index.js
  4. 2 1
      src/store/modules/user.js
  5. 8 0
      src/views/login/index.vue

+ 12 - 3
src/api/layout/index.js

@@ -3,8 +3,8 @@ import request from '@/utils/request';
 /**
  * 获取当前登录的菜单、按钮权限
  */
-export async function getResourcesTree () {
-  const res = await request.get('/system/resources/getResourcesTree');
+ export async function getResourcesTree ({groupId,roleId}) {
+  const res = await request.get('/system/resources/getResourcesTree?groupId='+groupId+'&roleId='+roleId);
   if (res.data.code == 0 && res.data.data) {
     return res.data.data;
   }
@@ -21,7 +21,16 @@ export async function updatePassword (data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
-
+/**
+ * 角色切换 重新获取token
+ */
+ export async function changeRole(data) {
+  const res = await request.post('/main/user/changeRole',data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 /**
  * 查询未读通知
  */

+ 60 - 2
src/layout/components/header-tools.vue

@@ -13,6 +13,28 @@
     <div class="ele-admin-header-tool-item">
       <i18n-icon />
     </div>
+    <div class="ele-admin-header-tool-item">
+      <el-select v-model="groupId" @change="groupIdChange">
+        <el-option
+          v-for="item in loginChangeGroupVOList"
+          :key="item.groupId"
+          :label="item.groupName"
+          :value="item.groupId"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="ele-admin-header-tool-item">
+      <el-select v-model="roleId" @change="roleChange">
+        <el-option
+          v-for="item in loginChangeRoleVOList"
+          :key="item.roleId"
+          :label="item.roleName"
+          :value="item.roleId"
+        >
+        </el-option>
+      </el-select>
+    </div>
     <!-- 消息通知 -->
     <div class="ele-admin-header-tool-item">
       <header-notice />
@@ -66,6 +88,7 @@
   import I18nIcon from './i18n-icon.vue';
   import { logout } from '@/utils/page-tab-util';
   import { userLogout } from '@/api/system/user';
+  import router from '@/router/index';
 
   export default {
     components: { HeaderNotice, PasswordModal, SettingDrawer, I18nIcon },
@@ -78,16 +101,51 @@
         // 是否显示修改密码弹窗
         passwordVisible: false,
         // 是否显示主题设置抽屉
-        settingVisible: false
+        settingVisible: false,
+        groupId: '',
+      roleId: '',
+      currentUser:{
+        currentGroupId:'',
+        currentRoleId:''
+      }
       };
     },
+    created() {
+    this.currentUser = JSON.parse(sessionStorage['currentUser']);
+    this.groupId =  this.currentUser.currentGroupId;
+    this.roleId =  this.currentUser.currentRoleId;
+  },
     computed: {
       // 当前用户信息
       loginUser() {
         return this.$store.state.user.info;
-      }
+      },
+                   // 部门下拉
+    loginChangeGroupVOList() {
+      return this.$store.state.user?.info?.loginChangeGroupVOList;
+    },
+    // 角色下拉
+    loginChangeRoleVOList() {
+      return this.$store.state.user?.info?.loginChangeGroupVOList.find(
+        (item) => item.groupId == this.groupId
+      )?.loginChangeRoleVOList;
+    }
     },
     methods: {
+      groupIdChange(val) {
+      this.roleChange(this.loginChangeRoleVOList[0].roleId);
+    },
+    roleChange(val) {
+      this.roleId = val;
+      this.currentUser.currentGroupId = this.groupId;
+      this.currentUser.currentRoleId = val;
+      sessionStorage['currentUser']=JSON.stringify(this.currentUser)
+      this.$store
+        .dispatch('user/fetchUserInfo')
+        .then(({ menus, homePath, authoritiesRouter }) => {
+          router.roleChange({ menus, homePath, authoritiesRouter });
+        });
+    },
       /* 用户信息下拉点击事件 */
       onUserDropClick(command) {
         if (command === 'password') {

+ 23 - 2
src/router/index.js

@@ -6,9 +6,10 @@ import NProgress from 'nprogress';
 import VueRouter from 'vue-router';
 import { WHITE_LIST, REDIRECT_PATH, LAYOUT_PATH } from '@/config/setting';
 import store from '@/store';
-import { getToken } from '@/utils/token-util';
-import { routes, getMenuRoutes } from './routes';
+import { getToken, setToken } from '@/utils/token-util';
 
+import { routes, getMenuRoutes } from './routes';
+import { changeRole } from '@/api/layout/index';
 Vue.use(VueRouter);
 
 const router = new VueRouter({
@@ -77,5 +78,25 @@ router.afterEach((to) => {
     }, 200);
   }
 });
+router.roleChange = async ({ menus, homePath, authoritiesRouter }) => {
+  const currentUser = JSON.parse(sessionStorage['currentUser']);
+
+  if (menus && menus.length > 0) {
+    router.addRoute(
+      getMenuRoutes([...menus, ...authoritiesRouter], homePath)
+    );
+    if (router.currentRoute.path != (menus[0].redirect || menus[0].path)) {
+      await router.replace({
+        path: menus[0].redirect || menus[0].path,
+      })
+    }
+    const newToken = await changeRole({ groupId: currentUser.currentGroupId, roleId: currentUser.currentRoleId })
+    setToken(newToken)
+    setTimeout(() => {
+      window.location.reload()
+    }, 100);
+  }
 
+  // next({ ...to, replace: true });
+};
 export default router;

+ 2 - 1
src/store/modules/user.js

@@ -116,7 +116,8 @@ export default {
     // },
     //动态路由
     async fetchUserInfo({ commit }) {
-      const result = await getResourcesTree().catch(() => {});
+      let currentUser=JSON.parse(sessionStorage['currentUser'])
+      const result = await getResourcesTree({groupId:currentUser.currentGroupId,roleId:currentUser.currentRoleId}).catch(() => {});
       const list = result.filter((i) => i.path === '/page-eam');
       if (!list.length) {
         return {};

+ 8 - 0
src/views/login/index.vue

@@ -176,6 +176,14 @@
             .then((res) => {
               localStorage.setItem('userId', res.data.userId);
               // 用户信息
+              if (res.data?.loginChangeGroupVOList.length > 0) {
+              sessionStorage['currentUser'] = JSON.stringify({
+                currentGroupId: res.data.loginChangeGroupVOList[0].groupId,
+                currentRoleId:
+                  res.data.loginChangeGroupVOList[0].loginChangeRoleVOList[0]
+                    .roleId
+              });
+            }
               this.$store.commit('user/setUserInfo', res.data);
               this.loading = false;
               this.$message.success(res.message);