diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 8f4859e0..e0369bd0 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -107,6 +107,7 @@ export const useUserStore = defineStore({ if (res !== undefined) { const token = res?.data this.setToken(token) + return return this.afterLoginAction(true) } } catch (error) { @@ -117,12 +118,7 @@ export const useUserStore = defineStore({ if (!this.getToken) return null // get user info const userInfo = await this.getUserInfoAction() - // const res: API.DataResult = await getCollectWarningCount() - // console.log(res) - const sessionTimeout = this.sessionTimeout - - console.log(sessionTimeout) if (sessionTimeout) { this.setSessionTimeout(false) } else { @@ -183,7 +179,7 @@ export const useUserStore = defineStore({ this.setToken(undefined) this.setSessionTimeout(false) this.setUserInfo(null) - localStorage.clear() + // localStorage.clear() goLogin && router.push(PageEnum.BASE_LOGIN) }, @@ -199,9 +195,9 @@ export const useUserStore = defineStore({ content: () => h('span', t('sys.app.logoutMessage')), onOk: async () => { await this.logout(true) - }, + } }) - }, + } }, }) diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue index c66e5672..ca68de08 100644 --- a/src/views/operation/seaexport/index.vue +++ b/src/views/operation/seaexport/index.vue @@ -66,8 +66,6 @@ - - - -

-

-->

{{ item.fieldName }}:

{{ item.targetVal }}

@@ -143,10 +137,6 @@ >

{{ item.fieldName }}:

{{ item.reqVal }}

-

{{ item.fieldName }}:

{{ item.targetVal }}

@@ -158,11 +148,10 @@