diff --git a/middleware/middleRouter.js b/middleware/middleRouter.js index 37f1d44..d841be6 100644 --- a/middleware/middleRouter.js +++ b/middleware/middleRouter.js @@ -2,7 +2,8 @@ import $cookie from 'vue-cookie'; export default async function({ store, route, redirect }) { // const menuId = route.query.menuId; - const FEMS_SESSION = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMjM0NTYiLCJyb2xlIjoiYWRtaW4ifQ.sflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'; + // const FEMS_SESSION = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxMjM0NTYiLCJyb2xlIjoiYWRtaW4ifQ.sflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'; + const FEMS_SESSION = $cookie.get('FEMS_SESSION'); if (!FEMS_SESSION) { if (route.name !== 'login') redirect('/login'); } else { diff --git a/nuxt.config.js b/nuxt.config.js index 6031688..d517910 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -61,15 +61,15 @@ module.exports = { styleResources: { scss: ['./assets/scss/*.scss'], }, - // proxy: { - // "/api/": { - // target: "http://0.0.0.0:9999/", - // //target: "http://192.168.0.152:8082/", - // pathRewrite: { - // "^/api/": "" - // } - // } - // }, + proxy: { + "/api/": { + target: "http://0.0.0.0:9999/", + //target: "http://192.168.0.152:8082/", + pathRewrite: { + "^/api/": "" + } + } + }, axios: { //baseURL: "http://dotest.kfems.kr:9997", proxy: true, diff --git a/pages/comm/auth/MenuRoleMngPage.vue b/pages/comm/auth/MenuRoleMngPage.vue index 8227a74..1721950 100644 --- a/pages/comm/auth/MenuRoleMngPage.vue +++ b/pages/comm/auth/MenuRoleMngPage.vue @@ -3,13 +3,14 @@ - + @@ -18,17 +19,19 @@ label="역할명" valueNm="roleNm" :searchOption="true" + customClass="input-large" /> - + - + + diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index 916e6f1..4b80a90 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -1,242 +1,224 @@