diff --git a/front/src/router/index.js b/front/src/router/index.js index 9c0f4ca9..536d6b37 100644 --- a/front/src/router/index.js +++ b/front/src/router/index.js @@ -575,13 +575,13 @@ router.beforeEach((to, from, next) => { // 定义失效时间 const timeOver = 2 * 60 * 60 * 1000 let date = new Date().getTime() - if (date - tokenStartTime > timeOver) { + if (date - tokenStartTime > timeOver && token) { + message.warning('登录失效,请重新登录!') token = null } console.log('判断token失效', token, date - tokenStartTime > timeOver) if (!token) { if (to.path == '/login') return next() - message.warning('登录失效,请重新登录!') return next('/login') } else if (to.path == '/login') { return next('/home') diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index f49180d0..0b7b7ebe 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -8,36 +8,93 @@
- +
- - + + - - + +
- - + + - - + + - - - - + + + + {{ item.name }} @@ -45,32 +102,69 @@
- - + + - 如选项没有系统请新增 + + 如选项没有系统请新增 +
- - + +
- - + +
- + " + type="primary" + html-type="cancle" + @click="resetFields()" + > 退出申请 - + " + type="primary" + html-type="submit" + @click="processStartHandle()" + > 提交申请
@@ -112,802 +215,810 @@