From 00790ad58c4ab0c9a279c576a2686d15ea173c5d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 08 十二月 2022 16:42:40 +0800
Subject: [PATCH] 1.修改刷新退出bug
---
src/utils/request.js | 2 +-
src/permission.js | 2 +-
src/store/modules/user.js | 4 +---
src/views/scgl/sckbg.vue | 4 ++--
src/store/modules/app.js | 4 +---
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 04bc798..830e395 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -19,7 +19,7 @@
// determine whether the user has logged in
// const hasToken = getToken()
- const hasToken = store.state.app.isGoToIndex
+ const hasToken = getCookie('admin')
if (hasToken) {
if (to.path === '/login') {
// if is logged in, redirect to the home page
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 19b8157..a868bf9 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -6,8 +6,7 @@
withoutAnimation: false
},
device: 'desktop',
- buttonIsDisabled: false, // 鑷畾涔夊叏灞�鍙橀噺鍙傛暟 鎺у埗鎸夐挳鎻愪氦鏃禿isabled
- isGoToIndex: false // 鑷畾涔夊叏灞�鍙橀噺鍙傛暟 鏄惁杩涘叆鍒扮郴缁熼椤�
+ buttonIsDisabled: false // 鑷畾涔夊叏灞�鍙橀噺鍙傛暟 鎺у埗鎸夐挳鎻愪氦鏃禿isabled
}
const mutations = {
@@ -45,7 +44,6 @@
export default {
namespaced: true,
buttonIsDisabled: false,
- isGoToIndex: false,
state,
mutations,
actions
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 462466b..e7e2267 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,6 @@
import { login, logout, getInfo, LoginMenu } from '@/api/user'
import { getToken, setToken, removeToken, setCookie, removeCookie, getCookie } from '@/utils/auth'
import { resetRouter } from '@/router'
-import store from '@/store'
const getDefaultState = () => {
return {
@@ -54,7 +53,7 @@
// if (res.code === '302') {
setCookie('code', res.code)
// }
- store.state.app.isGoToIndex = true
+
// commit('SET_TOKEN', data.token)
// setToken(res)
// commit('SET_TOKEN', res)
@@ -117,7 +116,6 @@
logout(data).then(res => {
if (res.code === '200') {
- store.state.app.isGoToIndex = false
removeToken() // must remove token first
resetRouter()
diff --git a/src/utils/request.js b/src/utils/request.js
index 5f7ded7..3258a67 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -68,7 +68,7 @@
removeCookie('rediskey')
removeCookie('guid')
removeCookie('code')
- store.state.app.isGoToIndex = false
+
setTimeout(() => {
sessionStorage.removeItem('tabViews')
window.location.reload()
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 300e124..0f6c542 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -512,7 +512,7 @@
<div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�">
- <div style="width: 200px">{{ dialogForm.partspec.toString().length === 0 ? '/' : dialogForm.partspec }}</div>
+ <div style="width: 200px">{{ dialogForm.partspec }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�">
<div style="width: 200px">{{ dialogForm.stepname }}</div>
@@ -1005,7 +1005,7 @@
<div style="width: 200px">{{ badDialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�">
- <div style="width: 200px">{{ badDialogForm.partspec.toString().length===0?'/':badDialogForm.partspec }}</div>
+ <div style="width: 200px">{{ badDialogForm.partspec }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�">
<div style="width: 200px">{{ badDialogForm.stepname }}</div>
--
Gitblit v1.9.3