diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss index 7528ba3..505da79 100644 --- a/assets/scss/common/button.scss +++ b/assets/scss/common/button.scss @@ -92,24 +92,23 @@ background: map-deep-get($config, #{$theme}, "basic-button-background"); } - .searchFilter{ + .searchFilter { .search-button { height: 40px; color: map-deep-get($config, #{$theme}, "search-btn-color"); } } - + .v-dialog { .ant-btn-icon-only { - color: map-deep-get( - $config, + color: map-deep-get($config, #{$theme}, "icon-color" ); } } - .ant-btn { + .ant-btn { &.ant-btn-outlined { color:map-deep-get($config, #{$theme}, "ant-btn-default-color"); @@ -121,7 +120,8 @@ 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-btn-background-ghost{ + + &.ant-btn-background-ghost { color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); } } @@ -142,6 +142,7 @@ &.expand-btn { .v-icon { color: map-deep-get($config, #{$theme}, "basic-button-color"); + svg { fill: map-deep-get($config, #{$theme}, "basic-button-color"); } @@ -152,15 +153,17 @@ } .v-application { - .ant-btn { + .ant-btn { border-radius: 6px; + &.ant-btn-lg { border-radius: 8px; } + &.ant-btn-default { - border:none !important + border: none !important } - + } } @@ -171,15 +174,16 @@ border: none; width: 16px; height: 16px; - background:none; + background: none; } } -.ant-btn { + +.ant-btn { &.expand-btn { - .v-icon { - span { + span { + &.v-icon { margin-right: 8px; } } } -} +} \ No newline at end of file diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index 9c8e864..b335418 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -470,6 +470,7 @@ } &-tree-button-expand { + z-index: 9999; .tui-grid-btn-tree { i { width: 16px; @@ -488,6 +489,7 @@ } &-tree-button-collapse { + z-index: 9999; .tui-grid-btn-tree { i { width: 16px; diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss index 0dd59ab..c511708 100644 --- a/assets/scss/common/input.scss +++ b/assets/scss/common/input.scss @@ -1,6 +1,6 @@ .v-select__custom { padding: 0.125rem; - + &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot { box-shadow: none; } @@ -175,11 +175,13 @@ margin: 5px; font-size: 16px; } + .custom-radio input[type="radio"] { position: absolute; opacity: 0; cursor: pointer; } + /* Custom radio appearance */ .radio-mark { position: absolute; @@ -222,11 +224,31 @@ color: #424242 !important; } +.ant-checkbox { + .ant-checkbox-inner { + border-radius: 4px + } +} + + @each $theme in dark, light { @include theme($theme); .v-application.#{$theme}-mode { + .ant-checkbox-wrapper { + .ant-checkbox-checked { + .ant-checkbox-inner { + 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"); + } + } + } + } + .v-input-popup__custom { .v-input__slot { padding-left: 12px; @@ -239,17 +261,18 @@ } .v-textarea { - .v-input__slot{ + .v-input__slot { border: map-deep-get($config, - #{$theme}, - "v-input-textarea-border" - ); + #{$theme}, + "v-input-textarea-border" + ); + fieldset { background-color: map-deep-get($config, #{$theme}, "v-input-textarea-bg" ); - + } } } @@ -404,6 +427,12 @@ .v-input--checkbox { .v-icon { + transform: none; + + &.mdi:before { + font-size: 16px; + } + @if $theme ==dark { color: rgba(255, 255, 255, 0.6); } @@ -414,6 +443,9 @@ } } + + + .v-textarea { textarea { padding: 10px; diff --git a/components/common/CheckBox.vue b/components/common/CheckBox.vue index 780f9d3..ebc2a12 100644 --- a/components/common/CheckBox.vue +++ b/components/common/CheckBox.vue @@ -2,26 +2,17 @@ - + + + + @@ -68,10 +59,10 @@ export default { default: 7, }, iconShow: { - type: Boolean, - require: false, - default: true - }, + type: Boolean, + require: false, + default: true + }, }, data() { return { @@ -103,7 +94,8 @@ export default { methods: { ...mapMutations({ setPageData: "setPageData" }), modifyValue(e) { - return this.setPageData({ [this.valueNm]: e }); + const isChecked = e.target.checked; + return this.setPageData({ [this.valueNm]: isChecked }); }, }, }; diff --git a/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue b/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue index c262d54..e3db09b 100644 --- a/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue +++ b/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue @@ -69,55 +69,6 @@ export default { return { loadGrid: false, gridName: 'effcInfoGrid', - // "effcInfoGrid": { - // data: - // [ - // { - // "eqpmKindId": "펌프", - // "eqpmGrpId": "냉각수 시스템", - // "totMethNm": "평균값" - // }, - // { - // "eqpmKindId": "모터", - // "eqpmGrpId": "공기압 시스템", - // "totMethNm": "최대값" - // }, - // { - // "eqpmKindId": "밸브", - // "eqpmGrpId": "스팀 공급", - // "totMethNm": "합계" - // }, - // { - // "eqpmKindId": "센서", - // "eqpmGrpId": "온도 제어", - // "totMethNm": "최소값" - // }, - // { - // "eqpmKindId": "컴프레서", - // "eqpmGrpId": "에어 시스템", - // "totMethNm": "중앙값" - // } - // ] - - // , - // column: [ - - // { - // header: '대상설비종류', - // name: 'eqpmKindId', - - // }, - // { - // header: '대상설비그룹', - // name: 'eqpmGrpId', - // }, - - // { header: '집계방법', name: 'totMethNm', align: 'center' }, - - // ] - - // } - // }, itemList: [], tagTpList: [], // detailList: myDetail, @@ -388,10 +339,10 @@ export default { }, // bodyHeight: gridHeight, // minBodyHeight: gridHeight, - // header: { - // height: 28, - // }, - // rowHeight: 29, + header: { + height: 37, + }, + rowHeight: 37, // minRowHeight: 29, // selectionUnit: 'row', // editingEvent: 'click', @@ -436,7 +387,6 @@ export default { header: '물리량ID', name: 'pysclQtyId', width: 200, - align: 'center', hidden: true, }, { header: '물리량', name: 'pysclQtyCd', hidden: true, minWidth: 200 }, @@ -445,7 +395,7 @@ export default { { header: '가이드지표', name: 'gdIdxId', hidden: true }, { header: '가이드지표명', name: 'gdIdxNm', hidden: true }, { header: '집계방법', name: 'totMeth', hidden: true }, - { header: '집계방법', name: 'totMethNm', align: 'center' }, + { header: '집계방법', name: 'totMethNm',}, ]; if (this.selectValue01 == 'PYSCL') { diff --git a/components/pages/ems/ReadPlcInfo/ReadPlcAddInfoTab.vue b/components/pages/ems/ReadPlcInfo/ReadPlcAddInfoTab.vue index 49c9403..29f47d5 100644 --- a/components/pages/ems/ReadPlcInfo/ReadPlcAddInfoTab.vue +++ b/components/pages/ems/ReadPlcInfo/ReadPlcAddInfoTab.vue @@ -200,7 +200,6 @@ export default { { header: 'Data 구분', name: 'addInfoDataKind', - align: 'center', formatter({ value }) { let retVal = ''; const newValue = addInfoDataKindList.filter( diff --git a/components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue b/components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue index aec9927..88a75a8 100644 --- a/components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue +++ b/components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue @@ -7,7 +7,7 @@
-
@@ -101,9 +101,9 @@ export default { // bodyHeight: gridHeight, // minBodyHeight: gridHeight, header: { - height: 28, + height: 37, }, - // rowHeight: 29, + rowHeight: 37, // minRowHeight: 29, selectionUnit: 'row', editingEvent: 'click', @@ -124,13 +124,12 @@ export default { const myColumns = [ { header: '회사 ID', name: 'comId', hidden: true }, { header: '검침개소 번호', name: 'readPlcId', hidden: true }, - { header: '대상 검침개소 번호', name: 'objReadPlcId', align: 'center' }, + { header: '대상 검침개소 번호', name: 'objReadPlcId'}, { header: '대상 검침개소명', name: 'objReadPlcNm', align: 'left' }, { header: '분배율(1~100)', name: 'distRt', align: 'right' }, { header: '가감유형', name: 'ddctKind', - align: 'center', formatter({ value }) { let retVal = ''; const newValue = ddctKindList.filter(item => item.value == value); diff --git a/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue b/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue index 389f825..9b2a4da 100644 --- a/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue +++ b/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue @@ -153,7 +153,6 @@ export default { { header: '에너지원', name: 'ercId', - align: 'center', width: 100, formatter({ value }) { let retVal = ''; @@ -182,7 +181,6 @@ export default { { header: '대표 TAG 여부', name: 'reprTagFg', - align: 'center', width: 100, // renderer: { // type: CustumChecbox, @@ -198,7 +196,6 @@ export default { { header: '사용여부', name: 'useFg', - align: 'center', width: 100, formatter({ value }) { value = value === true ? '1' : '0'; @@ -214,7 +211,7 @@ export default { // } // } }, - { header: '비고', name: 'rmrk', align: 'left', width: 100 }, + { header: '비고', name: 'rmrk', width: 100 }, { header: '등록 사용자', name: 'regUserNo', hidden: true }, { header: '등록 일자', name: 'regDttm', hidden: true }, { header: '수정 사용자', name: 'procUserNo', hidden: true }, diff --git a/pages/ems/base/EffcIdxMngPage.vue b/pages/ems/base/EffcIdxMngPage.vue index 6eb712f..0cc07bb 100644 --- a/pages/ems/base/EffcIdxMngPage.vue +++ b/pages/ems/base/EffcIdxMngPage.vue @@ -18,7 +18,7 @@ - +
효율지표 리스트 @@ -33,11 +33,11 @@
- + 효율지표 상세 -
+
+ :customClass="'select-large'" /> + :searchOption="true" :iconShow="true" :labelCols="12" :customClass="'input-large'" /> - 조회 + 조회 @@ -38,13 +39,13 @@ :btnActionsFnc="btnActions" />
-
+
-
+
+ @gridEditingFinish="gridEditingFinish" />
@@ -326,14 +327,12 @@ export default { header: 'COM ID', name: 'comId', width: 100, - aling: 'center', hidden: true, }, { header: '가이드', name: 'gdIdxId', width: 100, - align: 'center', }, { header: '가이드명', @@ -345,7 +344,6 @@ export default { header: '설비그룹ID', name: 'eqpmGrpId', width: 100, - align: 'center', // hidden: true, formatter({ value }) { let retVal = ''; @@ -362,7 +360,6 @@ export default { header: '상위집계방법', name: 'upTotMeth', width: 100, - align: 'center', // hidden: true, formatter({ value }) { let retVal = ''; @@ -524,7 +521,7 @@ export default { async getRowGridData() { this.loadGrid = false; let res = []; - + res = await this.postApiReturn({ apiKey: 'selectEqpmGdIdxDataList', resKey: 'eqpmGdIdxDataList', @@ -1122,14 +1119,7 @@ const myDetail = [ required: true, iconShow: true }, - // { - // // 공백 처리 - // type: 'Label', - // cols: 3, - // class: 'py-2', - // // label: "* '주의기준값' 또는 '경고기준값' 중 하나는 필수로 입력해 주세요.", - // disabled: false, - // }, + // { // type: 'CheckBox', // label: '설비기준적용', @@ -1195,7 +1185,8 @@ const myDetail = [ // required: true, labelCols: 12, textCols: 12, - iconShow: true + iconShow: true, + inputType: 'number', }, // { // // 공백 처리 @@ -1243,7 +1234,15 @@ const myDetail = [ { // 공백 처리 type: 'Label', - cols: 9, + cols: 3, + class: 'py-2', + // label: "* '주의기준값' 또는 '경고기준값' 중 하나는 필수로 입력해 주세요.", + disabled: false, + }, + { + // 공백 처리 + type: 'Label', + cols: 6, class: 'py-3', // label: "* '주의기준값' 또는 '경고기준값' 중 하나는 필수로 입력해 주세요.", disabled: false, @@ -1442,9 +1441,3 @@ const myDetail = [ }, ]; - diff --git a/pages/ems/base/GdStndMngPage.vue b/pages/ems/base/GdStndMngPage.vue index fba788e..681cbe0 100644 --- a/pages/ems/base/GdStndMngPage.vue +++ b/pages/ems/base/GdStndMngPage.vue @@ -33,11 +33,11 @@ - +
가이드 정보
-
+
@@ -116,9 +116,9 @@ - - - + + +
설비상세 리스트 @@ -132,8 +132,8 @@
- - + +
설비가이드 기준 정보