Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pet-business-web
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘怀志
pet-business-web
Commits
29bad824
Commit
29bad824
authored
Sep 06, 2023
by
刘怀志
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
系统提示修改
parent
c955ce68
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
12 deletions
+17
-12
permission.js
src/permission.js
+2
-3
request.js
src/utils/request.js
+15
-9
No files found.
src/permission.js
View file @
29bad824
...
...
@@ -4,7 +4,6 @@ import { Message } from 'element-ui'
import
NProgress
from
'nprogress'
import
'nprogress/nprogress.css'
import
{
getToken
}
from
'@/utils/auth'
import
{
isRelogin
}
from
'@/utils/request'
NProgress
.
configure
({
showSpinner
:
false
})
...
...
@@ -20,10 +19,10 @@ router.beforeEach((to, from, next) => {
NProgress
.
done
()
}
else
{
if
(
store
.
getters
.
roles
.
length
===
0
)
{
isRelogin
.
show
=
true
sessionStorage
.
setItem
(
'isRelogin'
,
'true'
)
// 判断当前用户是否已拉取完user_info信息
store
.
dispatch
(
'GetInfo'
).
then
(()
=>
{
isRelogin
.
show
=
false
sessionStorage
.
setItem
(
'isRelogin'
,
''
)
store
.
dispatch
(
'GenerateRoutes'
).
then
(
accessRoutes
=>
{
// 根据roles权限生成可访问的路由表
router
.
addRoutes
(
accessRoutes
)
// 动态添加可访问路由表
...
...
src/utils/request.js
View file @
29bad824
...
...
@@ -8,8 +8,6 @@ import cache from '@/plugins/cache'
import
{
saveAs
}
from
'file-saver'
let
downloadLoadingInstance
;
// 是否显示重新登录
export
let
isRelogin
=
{
show
:
false
};
axios
.
defaults
.
headers
[
'Content-Type'
]
=
'application/json;charset=utf-8'
// 创建axios实例
...
...
@@ -76,16 +74,24 @@ service.interceptors.response.use(res => {
return
res
.
data
}
if
(
code
===
401
)
{
if
(
!
isRelogin
.
show
)
{
isRelogin
.
show
=
true
;
MessageBox
.
confirm
(
'登录状态已过期,您可以继续留在该页面,或者重新登录'
,
'系统提示'
,
{
confirmButtonText
:
'重新登录'
,
cancelButtonText
:
'取消'
,
cancelButtonClass
:
'resetBtn'
,
if
(
!
sessionStorage
.
getItem
(
'isRelogin'
))
{
sessionStorage
.
setItem
(
'isRelogin'
,
'true'
)
MessageBox
.
confirm
(
'登录状态已过期,您可以继续留在该页面,或者重新登录'
,
'系统提示'
,
{
confirmButtonText
:
'重新登录'
,
cancelButtonText
:
'取消'
,
closeOnClickModal
:
false
,
cancelButtonClass
:
'resetBtn'
,
confirmButtonClass
:
'queryBtn'
,
type
:
'warning'
}).
then
(()
=>
{
isRelogin
.
show
=
false
;
sessionStorage
.
setItem
(
'isRelogin'
,
''
)
store
.
dispatch
(
'LogOut'
).
then
(()
=>
{
location
.
href
=
'/index'
;
})
}).
catch
(()
=>
{
isRelogin
.
show
=
false
;
sessionStorage
.
setItem
(
'isRelogin'
,
''
)
});
}
return
Promise
.
reject
(
'无效的会话,或者会话已过期,请重新登录。'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment