diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 8af5310..ea4fca5 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -231,6 +231,35 @@ a { .v-application.#{$theme}-mode { min-width: 1000px; + .ant-checkbox-wrapper.ant-checkbox-wrapper-disabled, + .ant-checkbox-disabled .ant-checkbox-input + { + cursor: default !important; + } + + .v-list-item__title { + font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important; + } + + .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: map-deep-get($config, #{$theme}, "btn-header-select-color") !important; + + &:hover { + color: #46c0ff !important; + cursor: pointer; + } + } + } + .icon-datepicker-color { color: map-deep-get($config, #{$theme}, "icon-datepicker-color"); } @@ -760,7 +789,7 @@ a { .v-list-item__title { color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color"); - } + } } &.v-select-list{ @@ -824,20 +853,11 @@ 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: 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; diff --git a/components/pages/ems/EccInfo/EccIaoTab.vue b/components/pages/ems/EccInfo/EccIaoTab.vue index e8786f9..1698c59 100644 --- a/components/pages/ems/EccInfo/EccIaoTab.vue +++ b/components/pages/ems/EccInfo/EccIaoTab.vue @@ -98,19 +98,17 @@ export default { watch: { selectedObjId(val) { if (val === 'TAG') { - this.detailList[1].class = 'd-none'; - this.detailList[2].class = 'd-block pl-4'; + this.detailList[1].class = 'd-none '; + this.detailList[2].class = 'd-block pl-4 mt-2'; this.detailList[3].class = 'd-block'; + this.detailList[4].class = 'pl-4 mt-2'; } else { // }else if(val==="READ_PLC"){ + this.detailList[4].class = 'pl-4 mt-2'; this.detailList[3].class = 'd-block'; this.detailList[2].class = 'd-none'; - this.detailList[1].class = 'd-block pl-4'; + this.detailList[1].class = 'd-block pl-4 mt-1 pb-0'; } - this.detailList[4].class = 'pl-4 mt-2'; - - console.log(val) - console.log(this.detailList) }, }, created() {}, @@ -380,7 +378,7 @@ const myDetail = [ label: '대상 유형', disabled: false, cols: 6, - class: 'pr-4 py-2', + class: 'pr-4 py-2 mt-1', list: 'emMapDivList', valueNm: 'objKind', itemText: 'commCdNm', diff --git a/layouts/default.vue b/layouts/default.vue index 838b321..adb22e3 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -6,7 +6,7 @@