Commit 29bad824 authored by 刘怀志's avatar 刘怀志

系统提示修改

parent c955ce68
...@@ -4,7 +4,6 @@ import { Message } from 'element-ui' ...@@ -4,7 +4,6 @@ import { Message } from 'element-ui'
import NProgress from 'nprogress' import NProgress from 'nprogress'
import 'nprogress/nprogress.css' import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false }) NProgress.configure({ showSpinner: false })
...@@ -20,10 +19,10 @@ router.beforeEach((to, from, next) => { ...@@ -20,10 +19,10 @@ router.beforeEach((to, from, next) => {
NProgress.done() NProgress.done()
} else { } else {
if (store.getters.roles.length === 0) { if (store.getters.roles.length === 0) {
isRelogin.show = true sessionStorage.setItem('isRelogin', 'true')
// 判断当前用户是否已拉取完user_info信息 // 判断当前用户是否已拉取完user_info信息
store.dispatch('GetInfo').then(() => { store.dispatch('GetInfo').then(() => {
isRelogin.show = false sessionStorage.setItem('isRelogin', '')
store.dispatch('GenerateRoutes').then(accessRoutes => { store.dispatch('GenerateRoutes').then(accessRoutes => {
// 根据roles权限生成可访问的路由表 // 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表 router.addRoutes(accessRoutes) // 动态添加可访问路由表
......
...@@ -8,8 +8,6 @@ import cache from '@/plugins/cache' ...@@ -8,8 +8,6 @@ import cache from '@/plugins/cache'
import { saveAs } from 'file-saver' import { saveAs } from 'file-saver'
let downloadLoadingInstance; let downloadLoadingInstance;
// 是否显示重新登录
export let isRelogin = { show: false };
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例 // 创建axios实例
...@@ -76,17 +74,25 @@ service.interceptors.response.use(res => { ...@@ -76,17 +74,25 @@ service.interceptors.response.use(res => {
return res.data return res.data
} }
if (code === 401) { if (code === 401) {
if (!isRelogin.show) { if (!sessionStorage.getItem('isRelogin')) {
isRelogin.show = true; sessionStorage.setItem('isRelogin','true')
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', cancelButtonClass: 'resetBtn', MessageBox.confirm(
confirmButtonClass: 'queryBtn',type: 'warning' }).then(() => { '登录状态已过期,您可以继续留在该页面,或者重新登录',
isRelogin.show = false; '系统提示',
{
confirmButtonText: '重新登录',
cancelButtonText: '取消',
closeOnClickModal: false,
cancelButtonClass: 'resetBtn',
confirmButtonClass: 'queryBtn',type: 'warning' }).then(() => {
sessionStorage.setItem('isRelogin','')
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
location.href = '/index'; location.href = '/index';
}) })
}).catch(() => { }).catch(() => {
isRelogin.show = false; sessionStorage.setItem('isRelogin','')
});
});
} }
return Promise.reject('无效的会话,或者会话已过期,请重新登录。') return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
} else if (code === 500) { } else if (code === 500) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment