diff --git a/src/layouts/admin/components/navMenus.vue b/src/layouts/admin/components/navMenus.vue index a07db93b..8e4412cb 100644 --- a/src/layouts/admin/components/navMenus.vue +++ b/src/layouts/admin/components/navMenus.vue @@ -8,10 +8,7 @@ name="el-icon-BellFilled" size="18" /> - + {{ globalPopUpRef.eventList.length > 99 ? '99+' : globalPopUpRef.eventList.length }} @@ -49,7 +46,7 @@ import { logout } from '@/api/user-boot/user' import Config from './config.vue' import PopupPwd from './popup/password.vue' import AdminInfo from './popup/adminInfo.vue' - +const { replace } = useRouter() // 环境标识 const IS_LNQR = import.meta.env.VITE_NAME === 'LNqr' @@ -64,7 +61,7 @@ const globalPopUpRef = ref() // 状态 const state = reactive({ - currentNavMenu: '', + currentNavMenu: '' }) // 打开暂降事件 @@ -106,7 +103,7 @@ const handleLogout = async () => { redirectToCasLogout() } else { // 普通环境直接跳登录页 - window.location.href = '/login' + replace('/login') } } } @@ -122,12 +119,6 @@ const clearLocalData = () => { // 清空标签页 navTabs.closeTabs() - // 清 Cookie - document.cookie.split(';').forEach(cookie => { - const name = cookie.split('=')[0].trim() - document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;` - }) - console.log('✅ 本地数据已全部清空') } @@ -136,6 +127,11 @@ const redirectToCasLogout = () => { const casLogoutUrl = 'http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/logout?service=http://privilege-epri.dcloud.ln.dc.sgcc.com.cn/cas/login?service=http://PQMonitoring.dcloud.ln.dc.sgcc.com.cn' window.location.href = casLogoutUrl + // 清 Cookie + document.cookie.split(';').forEach(cookie => { + const name = cookie.split('=')[0].trim() + document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;` + }) } @@ -216,8 +212,14 @@ const redirectToCasLogout = () => { } @keyframes twinkle { - 0% { transform: scale(0); } - 80% { transform: scale(1.2); } - 100% { transform: scale(1); } + 0% { + transform: scale(0); + } + 80% { + transform: scale(1.2); + } + 100% { + transform: scale(1); + } } diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue index 90ae4bf9..88fa8fab 100644 --- a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue +++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue @@ -1,6 +1,6 @@