diff --git a/frontend/src/modules/homeMgt/components/NoticePop.vue b/frontend/src/modules/homeMgt/components/NoticePop.vue index 63fd89b..300a4f5 100644 --- a/frontend/src/modules/homeMgt/components/NoticePop.vue +++ b/frontend/src/modules/homeMgt/components/NoticePop.vue @@ -313,9 +313,9 @@ export default { fd.append('key', new Blob([JSON.stringify(params)], { type: 'application/json' })); - for (var pair of fd.entries()) { + /* for (var pair of fd.entries()) { console.log(pair[0] + ' : ' + pair[1]); - } + } */ homeMgtApi.insertNotice(fd).then((response) => { if (response.data.retCode == '0000') { diff --git a/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue b/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue index 9747734..aa39c19 100644 --- a/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue +++ b/frontend/src/modules/homeMgt/components/NoticeUpdatePop.vue @@ -353,15 +353,11 @@ export default { delFileNo: this.delFileList.join(), }; - console.log(params); - console.log(params.delFileNo); - console.log(typeof params.delFileNo); - fd.append('key', new Blob([JSON.stringify(params)], { type: 'application/json' })); - for (var pair of fd.entries()) { + /* for (var pair of fd.entries()) { console.log(pair[0] + ' : ' + pair[1]); - } + } */ homeMgtApi.updateNotice(fd).then((response) => { if (response.data.retCode == '0000') { diff --git a/frontend/src/modules/homeMgt/router/index.js b/frontend/src/modules/homeMgt/router/index.js index 6891988..38af7e2 100644 --- a/frontend/src/modules/homeMgt/router/index.js +++ b/frontend/src/modules/homeMgt/router/index.js @@ -6,14 +6,12 @@ export default [ path: '/homeMgt/notice', component: Notice, name: 'notice', - props: true, meta: { public: false }, }, { path: '/homeMgt/faq', component: Faq, name: 'faq', - props: true, meta: { public: false }, }, ]; diff --git a/frontend/src/modules/homeMgt/views/notice.vue b/frontend/src/modules/homeMgt/views/notice.vue index 7ef85e1..55caab3 100644 --- a/frontend/src/modules/homeMgt/views/notice.vue +++ b/frontend/src/modules/homeMgt/views/notice.vue @@ -140,7 +140,7 @@ export default { }, { name: 'emgYn', - header: '긴급여부(Y/N)', + header: '긴급여부', align: 'center', width: '10%', formatter: (props) => { diff --git a/frontend/src/router.js b/frontend/src/router.js index 19fa9ad..8bcf82a 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -66,7 +66,11 @@ const router = new Router({ router.beforeEach((to, from, next) => { const isPublic = to.matched.some((record) => record.meta.public); const loggedIn = !!tokenSvc.getToken(); + console.log(isPublic); + console.log(loggedIn); + console.log(to); if (!isPublic && !loggedIn) { + console.log('1'); return next('/login'); } else { var nextUrl = to.fullPath; @@ -77,6 +81,7 @@ router.beforeEach((to, from, next) => { 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') { @@ -179,17 +184,16 @@ router.beforeEach((to, from, next) => { } } } - // url 홈페이지 관리 - if (nextUrl == '/homeMgt/notice' || nextUrl == '/homeMgt/faq') { + /* if (nextUrl == '/homeMgt/notice' || nextUrl == '/homeMgt/faq') { moveFlag = true; - } + } */ // url 배치 모니터링 - if((nextUrl == '/sysMgt/batchList') || '/sysMgt/batchDetail'){ + /* if (nextUrl == '/sysMgt/batchList' || '/sysMgt/batchDetail') { moveFlag = true; } - + */ if (!moveFlag) { if ( fromUrl == '/login' || @@ -197,6 +201,7 @@ router.beforeEach((to, from, next) => { fromUrl == '/view/login/resetPassword' || fromUrl == '/view/login/updatePassword' ) { + console.log('2'); return next('/login'); } // store.commit("login/isErrorPage", true); @@ -209,6 +214,7 @@ router.beforeEach((to, from, next) => { nextUrl == '/view/login/updatePassword' ) { if (fromUrl != '/login') { + console.log('3'); return next('/login'); } } @@ -216,6 +222,7 @@ router.beforeEach((to, from, next) => { if (nextUrl == '/') { const rootUrl = store.getters['login/getRootUrl']; if (rootUrl == null) { + console.log('4'); return next('/login'); } return next(rootUrl); @@ -224,6 +231,7 @@ router.beforeEach((to, from, next) => { if (nextUrl == '/login' && loggedIn) { const rootUrl = store.getters['login/getRootUrl']; if (rootUrl == null) { + console.log('5'); return next('/login'); } return next(rootUrl);