diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 3c6f2d4..30bbcb5 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -860,7 +860,7 @@ a { ); .day-label { - color: map-deep-get($config, #{$theme}, "non-activate"); + color: map-deep-get($config, #{$theme}, "card-text-title-color"); } } } diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index baa07d9..095009b 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -56,6 +56,12 @@ font-weight: 400; } + + th[data-column-name="_checked"] { + padding-left: 0; + } + + } .tui-grid-table{ @@ -63,6 +69,13 @@ .tui-grid-cell-has-input .tui-grid-cell-content { padding: 8px; } + + th[data-column-name="_checked"] { + &.tui-grid-cell-header { + padding-left: 0; + } + + } } .treeGrid { diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss index c511708..ba15cd1 100644 --- a/assets/scss/common/input.scss +++ b/assets/scss/common/input.scss @@ -230,6 +230,10 @@ } } +input[type="checkbox"] { + width: 16px; + height: 16px +} @each $theme in dark, light { @include theme($theme); @@ -242,6 +246,7 @@ background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); color:map-deep-get($config, #{$theme}, "ant-btn-primary-color"); + &.ant-checkbox-inner::after { border-color: map-deep-get($config, #{$theme}, "ant-btn-primary-color"); } @@ -403,6 +408,13 @@ "v-input-textarea-border" ); } + + input[type="checkbox"] { + accent-color: map-deep-get($config, + #{$theme}, + "ant-btn-primary-bg" + ); + } } .v-radio { diff --git a/components/common/modal/EnrgEffcEqpmDetailPop.vue b/components/common/modal/EnrgEffcEqpmDetailPop.vue index bd9e0f5..53704b9 100644 --- a/components/common/modal/EnrgEffcEqpmDetailPop.vue +++ b/components/common/modal/EnrgEffcEqpmDetailPop.vue @@ -119,8 +119,7 @@ /> --> - - + 확인 @@ -275,7 +274,12 @@ export default { // const gridHeight = this.$refs.gridParent.offsetHeight - 30; const myOptions = { - rowHeaders: ['rowNum'], + rowHeaders: [ + { + type: 'rowNum', + align: 'right', + }, + ], columnOptions: { resizable: true, minWidth: 100 @@ -319,19 +323,19 @@ export default { header: '주의', width: 100, name: 'careStndVal', - align: 'center' + align: 'right' }, { header: '경고', width: 100, name: 'warnStndVal', - align: 'center' + align: 'right' }, { header: '가이드값', width: 100, name: 'totVal', - align: 'center' + align: 'right' }, { header: '알람내용', diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue index 1d5f863..f601239 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -8,47 +8,35 @@ - -