diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss index 5836aae..e004625 100644 --- a/assets/scss/common/button.scss +++ b/assets/scss/common/button.scss @@ -137,6 +137,11 @@ color:map-deep-get($config, #{$theme}, "ant-btn-default-color"); } + &.ant-btn-popup-default { + background:map-deep-get($config, #{$theme}, "ant-btn-popup-bg"); + color:map-deep-get($config, #{$theme}, "ant-btn-popup-color"); + } + &.ant-btn-danger { &.ant-btn-background-ghost { color:map-deep-get($config, #{$theme}, "ant-btn-danger-color"); diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 85d3aa3..c3355f9 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -177,8 +177,13 @@ $config: ( v-header-border: #424242, v-chart-border: #424242, v-sidebar-border: #303030, +<<<<<<< Updated upstream ant-checkbox-bg: #212224, ant-checkbox-border: #424242, +======= + ant-btn-popup-bg: #212224, + ant-btn-popup-color: #FFFFFFD9, +>>>>>>> Stashed changes ), light: (w-g5: $--color-gray_555, g5-w: $--color-white, @@ -319,7 +324,12 @@ $config: ( v-header-border: #D9D9D9, v-chart-border: #D9D9D9, v-sidebar-border: #F0F0F0, +<<<<<<< Updated upstream ant-checkbox-bg: #FFFFFF, ant-checkbox-border: #D9D9D9, +======= + ant-btn-popup-bg: #FFFFFF, + ant-btn-popup-color: #000000E0, +>>>>>>> Stashed changes ), ); \ No newline at end of file diff --git a/components/common/modal/ChangeUserPswdPopPage.vue b/components/common/modal/ChangeUserPswdPopPage.vue index fc188b7..0dc6939 100644 --- a/components/common/modal/ChangeUserPswdPopPage.vue +++ b/components/common/modal/ChangeUserPswdPopPage.vue @@ -76,7 +76,7 @@
- 삭제 + 닫기 확인 diff --git a/components/common/modal/EnrgUsePlanModiPop.vue b/components/common/modal/EnrgUsePlanModiPop.vue index db7478e..f7f64b4 100644 --- a/components/common/modal/EnrgUsePlanModiPop.vue +++ b/components/common/modal/EnrgUsePlanModiPop.vue @@ -37,6 +37,7 @@ :itemList="selectValueList01" :label="'대상월'" @update:propsValue="selectValue01 = $event" + customClass="select-large" /> @@ -49,9 +50,10 @@ :itemList="selectValueList02" :label="'전년대비절감율'" @update:propsValue="selectValue02 = $event" + customClass="select-large" /> - + @@ -128,7 +130,7 @@
--> - 취소 + 취소 확정 diff --git a/components/common/select/SelectAddGrp.vue b/components/common/select/SelectAddGrp.vue index b6e7147..5c21522 100644 --- a/components/common/select/SelectAddGrp.vue +++ b/components/common/select/SelectAddGrp.vue @@ -81,6 +81,10 @@ export default { type: String, require: false, }, + required: { + type: Boolean, + default: false + }, }, data() { return {}; diff --git a/pages/comm/auth/RoleMngPage.vue b/pages/comm/auth/RoleMngPage.vue index 930c5d7..ccdcbca 100644 --- a/pages/comm/auth/RoleMngPage.vue +++ b/pages/comm/auth/RoleMngPage.vue @@ -1,5 +1,6 @@