diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 1dc494d..0ee050d 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -1314,18 +1314,24 @@ a { .btn-close-menu-list { min-width: 100px; border-color: transparent; + background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important; .v-list-item { min-height: 30px; } .v-list-item__title { - color: #fff; + color: map-deep-get($config, #{$theme}, "btn-header-select-color"); &:hover { color: #46c0ff; } } + .v-btn { + background-color: transparent !important; + color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important; + } + } [hover-tooltip] { diff --git a/assets/scss/var.scss b/assets/scss/var.scss index fdc3615..7595e02 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -168,6 +168,8 @@ $config: ( ant-btn-default-bg:#FFFFFF2E, ant-btn-default-color:#FFFFFFD9, ant-btn-default-border-outlined:#424242, + btn-header-select-bg: #1F1F1F, + btn-header-select-color:#FFFFFFD9, ), light: (w-g5: $--color-gray_555, g5-w: $--color-white, @@ -300,5 +302,7 @@ $config: ( ant-btn-default-bg:#00000026, ant-btn-default-color:#000000E0, ant-btn-default-border-outlined:#D9D9D9, + btn-header-select-color:#1F1F1F, + btn-header-select-bg:#FFFFFF, ), ); \ No newline at end of file diff --git a/components/common/AdminMenu.vue b/components/common/AdminMenu.vue index 1951036..e6691ec 100644 --- a/components/common/AdminMenu.vue +++ b/components/common/AdminMenu.vue @@ -27,7 +27,7 @@ /> --> - + diff --git a/layouts/default.vue b/layouts/default.vue index 6fbe9fa..e784ca0 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -28,9 +28,7 @@ 닫기 mdi-chevron-down --> - + 전체 닫기 @@ -56,9 +54,7 @@ 즐겨찾기 mdi-chevron-down --> - + {{ item.menuNm @@ -69,7 +65,9 @@ star - + star_border 닫기 mdi-chevron-down - + 전체 닫기 @@ -206,9 +202,7 @@ 즐겨찾기 mdi-chevron-down - + {{ item.menuNm @@ -447,80 +441,71 @@ export default { activeTree: { deep: true, handler(newVal, oldVal) { - var _this = this; - const nv = newVal[0]; - const ov = oldVal[0]; - if (nv !== ov) { - if (!nv) { - // 중복클릭 시 발생 상황 기존 값을 다시 넣어줌 - this.activeTree.push(ov); - } else { - this.myPrgmId = nv; - console.log("menu:", this.menuData); - if (this.menuData[nv].url) { - const menuUrl = this.menuData[nv].url; - const menuId = this.menuData[nv].menuId; + var _this = this; + const nv = newVal[0]; + const ov = oldVal[0]; + if (nv !== ov) { + if (!nv) { + // 중복클릭 시 발생 상황 기존 값을 다시 넣어줌 + this.activeTree.push(ov); + } else { + this.myPrgmId = nv; + if (this.menuData[nv].url) { + const menuUrl = this.menuData[nv].url; + const menuId = this.menuData[nv].menuId; - const isCommMenu = menuUrl.indexOf("comm/"); - const isEmsMenu = menuUrl.indexOf("ems/"); - const isCmmsMenu = menuUrl.indexOf("cmms/"); + const isCommMenu = menuUrl.indexOf('comm/'); + const isEmsMenu = menuUrl.indexOf('ems/'); + const isCmmsMenu = menuUrl.indexOf('cmms/'); - // console.log('activeTree...'); - console.log(isEmsMenu); + // console.log('activeTree...'); - if (isCommMenu > -1 || isEmsMenu > -1 || isCmmsMenu > -1) { - // console.log('activeTree if stmt1'); - // console.log('this.isLoading : ', this.isLoading); - // if(this.isLoading == true){ - // console.log('if isLoading stmt1'); - // return; - // } - console.log("this:", this.menuData[nv].url); - - this.$router.push({ - path: `/${this.menuData[nv].url}?prgmId=${nv}`, - }); - // this.$router.replace("/").then(() => { - // alert("hihi"); - // this.$router.push({ - // path: `${this.menuData[nv].url}?prgmId=${nv}`, - // }); - // }); - - // this.$router.beforeEach((to, from, next) => { - // if(_this.isLoading == true){ - // next(false); - // } - // if (!to.matched.length) { - // next(false); - // } else { - // next(); - // } - // }); - var tmp = 0; - for (var i = 0; i < this.myMenuList.length; i++) { - if (this.myMenuList[i].menuId == menuId) { - tmp = 1; - } - } - this.bookmarkBtn = tmp; - } else { - // console.log('activeTree if stmt2'); - // console.log('this.isLoading : ', this.isLoading); - // if(this.isLoading == true){ - // console.log('if isLoading stmt2'); - // return; - // } - this.$refs.routerTab.openIframe( - encodeURI(`http://localhost:9999${this.menuData[nv].url}?prgmId=${nv}`), - this.menuData[nv].menuNm - ); - } - this.$axios.get(`${this.menuData[nv].url}?$menuId=${menuId}`); - } else alert("지정된 페이지 경로가 없습니다."); - } - } - }, + if (isCommMenu > -1 || isEmsMenu > -1 || isCmmsMenu > -1) { + // console.log('activeTree if stmt1'); + // console.log('this.isLoading : ', this.isLoading); + // if(this.isLoading == true){ + // console.log('if isLoading stmt1'); + // return; + // } + this.$router.push({ + path: `${this.menuData[nv].url}?prgmId=${nv}`, + }); + // this.$router.beforeEach((to, from, next) => { + // if(_this.isLoading == true){ + // next(false); + // } + // if (!to.matched.length) { + // next(false); + // } else { + // next(); + // } + // }); + var tmp = 0; + for (var i = 0; i < this.myMenuList.length; i++) { + if (this.myMenuList[i].menuId == menuId) { + tmp = 1; + } + } + this.bookmarkBtn = tmp; + } else { + // console.log('activeTree if stmt2'); + // console.log('this.isLoading : ', this.isLoading); + // if(this.isLoading == true){ + // console.log('if isLoading stmt2'); + // return; + // } + this.$refs.routerTab.openIframe( + encodeURI( + `http://localhost:9999${this.menuData[nv].url}?prgmId=${nv}`, + ), + this.menuData[nv].menuNm, + ); + } + this.$axios.get(`${this.menuData[nv].url}?$menuId=${menuId}`); + } else alert('지정된 페이지 경로가 없습니다.'); + } + } + }, }, menuData: { deep: true, diff --git a/pages/login/index.vue b/pages/login/index.vue index e6dfcc2..d14b91e 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -275,11 +275,11 @@ export default { } } .v-btn { - @if $theme == dark { - background-color: #18579e; - } @else { - background-color: #3f4d7d; - } + // @if $theme == dark { + // background-color: #18579e; + // } @else { + // background-color: #3f4d7d; + // } } } }