From a53ece5036c1fa61a63fe5f9e0cd3519210ab928 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 07 Aug 2026 09:44:27 +0800
Subject: [PATCH] feat:兼容分辨率低不出现滚动条
---
applications/task-work-order/src/store/modules/user.js | 43 ++++++++++++++-----------------------------
1 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/applications/task-work-order/src/store/modules/user.js b/applications/task-work-order/src/store/modules/user.js
index 969c21a..dba38b0 100644
--- a/applications/task-work-order/src/store/modules/user.js
+++ b/applications/task-work-order/src/store/modules/user.js
@@ -1,7 +1,7 @@
-import { setToken, setRefreshToken, removeToken, removeRefreshToken, getRefreshToken } from '@/utils/auth'
+import { setToken, setRefreshToken, removeToken, removeRefreshToken, getRefreshToken, getToken } from '@/utils/auth'
import { setStore, getStore } from '@/utils/store'
import { validatenull } from '@/utils/validate'
-import { deepClone } from '@/utils/util'
+import { deepClone, logOutFun } from '@/utils/util'
import defaultAva from '@/assets/images/defaultava.png'
import {
loginByUsername,
@@ -33,6 +33,7 @@
token: getStore({ name: 'token' }) || '',
refreshToken: getStore({ name: 'refreshToken' }) || '',
parentDeptInfo: getStore({ name: 'parentDeptInfo' }) || '',
+ xtToken: getStore({ name: 'xtToken' }) || '',
},
actions: {
//根据用户名登录
@@ -216,7 +217,8 @@
// 登出
LogOut({ commit }) {
return new Promise((resolve, reject) => {
- logout()
+ const promiseRes = getToken() ? logout() : Promise.resolve()
+ promiseRes
.then(() => {
commit('SET_TOKEN', '')
commit('SET_MENU_ALL_NULL', [])
@@ -226,26 +228,13 @@
commit('CLEAR_LOCK')
removeToken()
removeRefreshToken()
+ removeToken()
resolve()
+ localStorage.clear()
})
.catch(error => {
reject(error)
})
- })
- },
- //注销session
- FedLogOut({ commit }) {
- return new Promise(resolve => {
- commit('SET_TOKEN', '')
- commit('SET_MENU_ALL_NULL', [])
- commit('SET_MENU', [])
- commit('SET_ROLES', [])
- commit('DEL_ALL_TAG', [])
- commit('CLEAR_LOCK')
- removeToken()
- removeRefreshToken()
- removeToken()
- resolve()
})
},
GetTopMenu() {
@@ -257,22 +246,14 @@
})
},
GetMenu({ commit, dispatch }, tenantId) {
- const errLogOut = () => {
- dispatch('LogOut').then(() => {
- const env = import.meta.env.VITE_APP_ENV
- const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
- env === 'development'
- ? (window.location.href = '/task-work-order/login')
- : window.location.replace(`${adminUrl}#/login`)
- })
- }
return new Promise(resolve => {
getRoutes({ tenantId, sysType: 6 })
.then(res => {
const data = res.data.data
let menu = deepClone(data)
if (!res.data?.data?.length) {
- errLogOut()
+ ElMessage.warning('当前角色没有配置菜单，请联系管理员配置')
+ setTimeout(logOutFun,1500)
return
}
menu.forEach(ele => formatPath(ele, true))
@@ -282,7 +263,7 @@
resolve(menu)
})
.catch(err => {
- errLogOut()
+ logOutFun()
})
})
},
@@ -297,6 +278,10 @@
},
},
mutations: {
+ setXtToken:(state,token) =>{
+ state.xtToken = token
+ setStore({ name: 'xtToken', content: token })
+ },
SET_PARENT_DEPT_INFO(state, deptId) {
getParentDeptInfo({ deptId: deptId }).then(res => {
const data = res.data.data
--
Gitblit v1.9.3