From bfb10320f7577d75852db40ae47537277b216cd2 Mon Sep 17 00:00:00 2001 From: wx <645899409@qq.com> Date: Fri, 22 Nov 2024 13:24:34 +0800 Subject: [PATCH] update --- src/utils/utils.ts | 1 + src/views/sys/login.vue | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 266bf8a..e579384 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -9,6 +9,7 @@ export function getZero(num: any) { } export function useTopTime(startDay = '2018-10-01') { + startDay = startDay || '2018-10-01'; const timeLeft = dayjs().format('YYYY年MM月DD日 HH时mm分ss秒'); const timeRight = dayjs().diff(dayjs(startDay), 'day') + '天'; // + diff --git a/src/views/sys/login.vue b/src/views/sys/login.vue index c02ca44..26a50c6 100644 --- a/src/views/sys/login.vue +++ b/src/views/sys/login.vue @@ -224,7 +224,9 @@ } else if (route.path == PageEnum.BASE_LOGIN) { goPath = PageEnum.BASE_HOME; } else if (route.path == PageEnum.CENTRAL_SCREEN_LOGIN) { - goPath = PageEnum.CENTRAL_SCREEN; + // goPath = PageEnum.CENTRAL_SCREEN; + + goPath = centerInfo?.screenPath || PageEnum.CENTRAL_SCREEN; } } else { if (flag1) { @@ -233,7 +235,7 @@ goPath = PageEnum.BASE_HOME; } else if (flag3) { // goPath = PageEnum.CENTRAL_SCREEN; - goPath = useUserStore().getCenterInfo?.screenPath || PageEnum.CENTRAL_SCREEN; + goPath = centerInfo?.screenPath || PageEnum.CENTRAL_SCREEN; } else { userStore.setToken(''); userStore.setUserInfo({});