From 9155a2b55e814225f3e57ea56aa61b567f35b21f Mon Sep 17 00:00:00 2001 From: dev Date: Wed, 6 Aug 2025 19:00:29 +0900 Subject: [PATCH] commit 0608 --- assets/scss/common.scss | 2 +- assets/scss/common/grid.scss | 13 ++++ assets/scss/common/input.scss | 12 ++++ .../common/modal/EnrgEffcEqpmDetailPop.vue | 16 +++-- components/common/modal/EqpmSelectPop.vue | 71 +++++++++++-------- .../ems/ReadPlcInfo/ReadPlcTagRelTab.vue | 4 +- pages/comm/base/BatchMngPage.vue | 67 ++++++++--------- pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue | 19 +++-- 8 files changed, 118 insertions(+), 86 deletions(-) diff --git a/assets/scss/common.scss b/assets/scss/common.scss index f3d3a69..7ca6ba8 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -1003,7 +1003,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 39ee11e..c656d02 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -68,6 +68,12 @@ font-weight: 400; } + + th[data-column-name="_checked"] { + padding-left: 0; + } + + } .tui-grid-table{ @@ -75,6 +81,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 959de8b..2059342 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -8,7 +8,7 @@ - - - + + 설비 선택 -
+
- + + :label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event" + :labelCols="12" :textCols="12" :iconShow="true" /> - + @@ -49,9 +47,8 @@ -