From 621bd1e65350d17756863f35783dbab5619a54d4 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 15 八月 2023 17:27:54 +0800
Subject: [PATCH] 1.组织架构、岗位管理初稿
---
src/permission.js | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 8a798bb..a51a284 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,8 +3,9 @@
import { Message } from 'element-ui'
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
-import { getCookie, getToken } from '@/utils/auth' // get token from cookie
+import { getCookie, getToken, setCookie } from '@/utils/auth' // get token from cookie
import getPageTitle from '@/utils/get-page-title'
+import { decode } from 'jsonwebtoken'
NProgress.configure({ showSpinner: false }) // NProgress Configuration
@@ -27,30 +28,46 @@
next({ path: '/' })
NProgress.done()
} else {
- // const hasGetUserInfo = store.getters.name
const hasGetUserInfo = store.getters.name
- // const hasGetUserInfo = getCookie('usercode')
if (hasGetUserInfo) {
next()
} else {
try {
// 鎷夊彇info
// const info = await store.dispatch('user/getInfo')
+
+ // jwt瑙ｅ瘑鑾峰彇鐢ㄦ埛缂栫爜
+ const jwt = decode(localStorage.getItem('token'))
+ localStorage.setItem('usercode', jwt.usercode)
+ localStorage.setItem('torg_name', jwt.storg_name)
+ localStorage.setItem('torg_code', jwt.storg_code)
+
+ // const code = await store.dispatch('user/getUserTorgData')
+ // if (code === '200') {
// 鎷夊彇鑿滃崟淇℃伅琛�
const menu = await store.dispatch('user/getMenu')
// 鐢熸垚鍙闂殑璺敱琛�
await store.dispatch('permission/generateRoutes', menu)
-
- // eslint-disable-next-line require-atomic-updates
- store.state.settings.orgType = getCookie('description')
-
// 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
router.addRoutes(store.getters.addRouters)
-
// hack鏂规硶 纭繚addRoutes宸插畬鎴�
next({ ...to, replace: true })
-
- // next()
+ // }
+ // // 鎷夊彇鑿滃崟淇℃伅琛�
+ // const menu = await store.dispatch('user/getMenu')
+ // // 鐢熸垚鍙闂殑璺敱琛�
+ // await store.dispatch('permission/generateRoutes', menu)
+ //
+ // // eslint-disable-next-line require-atomic-updates
+ // // store.state.settings.orgType = getCookie('description') //娉ㄩ噴鎺�
+ //
+ // // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
+ // router.addRoutes(store.getters.addRouters)
+ //
+ // // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+ // next({ ...to, replace: true })
+ //
+ // // next()
} catch (error) {
// remove token and go to login page to re-login
await store.dispatch('user/resetToken')
--
Gitblit v1.9.3