diff --git a/frontend/src/router.js b/frontend/src/router.js index 57e3517..8a60dae 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -54,8 +54,8 @@ const router = new Router({ ...profileRoutes, ...mntrngRoutes, ...riskmgtRoutes, - ...homeMgtRoutes, ...monthRoutes, + ...homeMgtRoutes, //{path: '*', name: 'error404'} ], }, @@ -66,19 +66,20 @@ const router = new Router({ router.beforeEach((to, from, next) => { const isPublic = to.matched.some((record) => record.meta.public); const loggedIn = !!tokenSvc.getToken(); + store.commit('login/setLoginPathUrl', isPublic + '/' + loggedIn + to.fullPath); if (!isPublic && !loggedIn) { - store.commit('login/setLoginPathUrl', 1); return next('/login'); } else { var nextUrl = to.fullPath; var fromUrl = from.fullPath; + console.log(fromUrl); + var menuUrls = store.getters['login/getMenuUrls']; if (menuUrls.length > 0) { var moveFlag = false; for (var i = 0; i < menuUrls.length; i++) { var targetUrl = menuUrls[i]; - console.log('nextUrl : ' + nextUrl + ' /// targetUrl : ' + targetUrl); if (nextUrl == targetUrl) { moveFlag = true; if (fromUrl != '/' && fromUrl != '/view/error/404' && fromUrl != '/view/error/500') { @@ -174,23 +175,19 @@ router.beforeEach((to, from, next) => { } } // url Check 권한 관리 - if (nextUrl == '/sysMgt/authAdd' || nextUrl == '/sysMgt/authModify') { + if ( + nextUrl == '/sysMgt/authAdd' || + nextUrl == '/sysMgt/authModify' || + nextUrl == '/sysMgt/authModify' || + nextUrl == '/sysMgt/batchDetail' + ) { for (var i = 0; i < menuUrls.length; i++) { if (menuUrls[i] == '/sysMgt/authList') { moveFlag = true; } } } - // url 홈페이지 관리 - /* if (nextUrl == '/homeMgt/notice' || nextUrl == '/homeMgt/faq') { - moveFlag = true; - } */ - // url 배치 모니터링 - /* if (nextUrl == '/sysMgt/batchList' || '/sysMgt/batchDetail') { - moveFlag = true; - } - */ if (!moveFlag) { if ( fromUrl == '/login' || @@ -198,7 +195,6 @@ router.beforeEach((to, from, next) => { fromUrl == '/view/login/resetPassword' || fromUrl == '/view/login/updatePassword' ) { - store.commit('login/setLoginPathUrl', 2); return next('/login'); } // store.commit("login/isErrorPage", true); @@ -211,15 +207,13 @@ router.beforeEach((to, from, next) => { nextUrl == '/view/login/updatePassword' ) { if (fromUrl != '/login') { - store.commit('login/setLoginPathUrl', 3); return next('/login'); } } - if (nextUrl == '/') { + if (nextUrl === '/') { const rootUrl = store.getters['login/getRootUrl']; if (rootUrl == null) { - store.commit('login/setLoginPathUrl', 4); return next('/login'); } return next(rootUrl); @@ -228,7 +222,6 @@ router.beforeEach((to, from, next) => { if (nextUrl == '/login' && loggedIn) { const rootUrl = store.getters['login/getRootUrl']; if (rootUrl == null) { - store.commit('login/setLoginPathUrl', 5); return next('/login'); } return next(rootUrl);