diff --git a/src/views/sys/login.vue b/src/views/sys/login.vue index 41da6ab..c02ca44 100644 --- a/src/views/sys/login.vue +++ b/src/views/sys/login.vue @@ -201,9 +201,9 @@ if (code == 200) { let flag1 = result?.codeList?.find((item: any) => ['emergency:screen:show:yinchuan'].includes(item)); let flag2 = result?.codeList?.find((item: any) => ['emergency:screen:show:xian'].includes(item)); - // let flag3 = result?.codeList?.find((item) => ['emergency:screen:show:centralScreen'].includes(item)); let flag3 = - userInfo?.roleCodes.join(',').findIndex((item: any) => item === 'large_screen' || item === 'large_screen_admin') > -1; + result?.codeList?.find((item: any) => ['emergency:screen:show:centralScreen'].includes(item)) || + userInfo?.roleCodes.split(',').findIndex((item: any) => item === 'large_screen' || item === 'large_screen_admin') > -1; userStore.setFlag1(flag1 || ''); userStore.setFlag2(flag2 || ''); userStore.setFlag3(flag3 || ''); @@ -232,7 +232,8 @@ } else if (flag2) { goPath = PageEnum.BASE_HOME; } else if (flag3) { - goPath = PageEnum.CENTRAL_SCREEN; + // goPath = PageEnum.CENTRAL_SCREEN; + goPath = useUserStore().getCenterInfo?.screenPath || PageEnum.CENTRAL_SCREEN; } else { userStore.setToken(''); userStore.setUserInfo({});