diff --git a/assets/scss/common.scss b/assets/scss/common.scss index aad3c9b..ae9b134 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -444,6 +444,10 @@ a { .v-application.#{$theme}-mode { min-width: 1000px; + .icon-datepicker-color { + color: map-deep-get($config, #{$theme}, "icon-datepicker-color"); + } + .head-logo { gap: 8px; } diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 15484d7..4663d67 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -183,7 +183,8 @@ $config: ( ant-btn-popup-color: #FFFFFFD9, ant-btn-popup-border: #424242, paging-background: #212224, - paging-text: #FFFFFFD9 + paging-text: #FFFFFFD9, + icon-datepicker-color: #FFFFFF73, ), light: (w-g5: $--color-gray_555, g5-w: $--color-white, @@ -330,6 +331,7 @@ $config: ( ant-btn-popup-color: #000000E0, ant-btn-popup-border: #D9D9D9, paging-background: #FFFFFF, - paging-text: #000000E0 + paging-text: #000000E0, + icon-datepicker-color: #00000073, ), ); \ No newline at end of file diff --git a/components/common/CheckBox.vue b/components/common/CheckBox.vue index 31d40ca..f1f5fc2 100644 --- a/components/common/CheckBox.vue +++ b/components/common/CheckBox.vue @@ -61,10 +61,6 @@ export default { require: false, default: true }, - labelClass: { - type: String, - require: false, - }, }, data() { return { diff --git a/components/common/Datepicker.vue b/components/common/Datepicker.vue index b8cc499..00691a6 100644 --- a/components/common/Datepicker.vue +++ b/components/common/Datepicker.vue @@ -43,10 +43,10 @@ outlined > diff --git a/components/common/modal/ChangeUserPswdPopPage.vue b/components/common/modal/ChangeUserPswdPopPage.vue index 1411f52..c11bd18 100644 --- a/components/common/modal/ChangeUserPswdPopPage.vue +++ b/components/common/modal/ChangeUserPswdPopPage.vue @@ -3,12 +3,13 @@ - 사용자 정보 + 사용자 정보
{ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pr-4 mt-2', iconShow: true, required: false, placeholder: '시스템 자동입력', @@ -983,7 +983,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4', + class: 'py-2 pl-4 mt-2', iconShow: true, required: true, }, @@ -996,8 +996,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', - iconShow: true, + class: 'py-2 pr-4 mt-2', required: true, }, { @@ -1007,7 +1006,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4', + class: 'py-2 pl-4 mt-2', iconShow: true, required: true, }, @@ -1018,7 +1017,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pr-4 mt-2', iconShow: true, list: blocCdList.map(item => ({ text: item.blocNm, @@ -1033,7 +1032,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4', + class: 'py-2 pl-4 mt-2', iconShow: true, }, { @@ -1044,7 +1043,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pr-4 mt-2', iconShow: true, placeholder: '시스템 자동입력', }, @@ -1056,7 +1055,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4', + class: 'py-2 pl-4 mt-2', iconShow: true, placeholder: '시스템 자동입력', }, @@ -1068,7 +1067,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pr-4 mt-2', iconShow: true, placeholder: '시스템 자동입력', }, @@ -1080,7 +1079,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4', + class: 'py-2 pl-4 mt-2', iconShow: true, placeholder: '시스템 자동입력', }, diff --git a/pages/ems/base/EnrgCostCenterMngPage.vue b/pages/ems/base/EnrgCostCenterMngPage.vue index ba3c61d..93d7f58 100644 --- a/pages/ems/base/EnrgCostCenterMngPage.vue +++ b/pages/ems/base/EnrgCostCenterMngPage.vue @@ -105,7 +105,7 @@ - 공정 상세
@@ -901,7 +901,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4', + class: 'py-2 px-4', required: true, iconShow: true }, @@ -938,7 +938,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 mb-0 pb-0 pl-4 mt-2', + class: 'py-2 mb-0 pb-0 px-4 mt-2', list: 'locKindList', itemText: 'commCdNm', itemValue: 'commCd', @@ -956,7 +956,7 @@ const myDetail = [ // 공백 처리 type: 'Label', cols: 6, - class: 'py-2 pl-4 mt-2', + class: 'py-2 px-4 mt-2', disabled: false, labelCols: 12, textCols: 12, @@ -985,7 +985,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4 mt-2', + class: 'py-2 px-4 mt-2', inputType: 'number', iconShow: true // onkeydown : "if(this.value > 100) this.value = 100;if(this.value < 0) this.value = 0;if(this.value == '') this.value = 0;" @@ -1012,7 +1012,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pl-4 mt-2', + class: 'py-2 px-4 mt-2', value: { '1': true, '0': false }, iconShow: true, required: true, diff --git a/pages/ems/base/ReadObjectMngPage.vue b/pages/ems/base/ReadObjectMngPage.vue index a23e34c..4f8a11c 100644 --- a/pages/ems/base/ReadObjectMngPage.vue +++ b/pages/ems/base/ReadObjectMngPage.vue @@ -75,7 +75,7 @@ - 검침대상 상세
@@ -742,7 +742,7 @@ const myDetail = [ labelCols: 12, textCols: 12, iconShow: true, - class: 'py-2 pr-2', + class: 'py-2 pr-2 mt-2', required: false, placeholder: '시스템 자동입력', }, @@ -754,7 +754,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2', + class: 'py-2 mt-2', required: true, iconShow: true, }, @@ -766,7 +766,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-2', + class: 'py-2 pr-2 mt-2', list: 'readObjKindDetailList', itemText: 'commCdNm', itemValue: 'commCd', @@ -781,7 +781,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2', + class: 'py-2 mt-2', list: 'readObjGrpList', itemText: 'commCdNm', itemValue: 'commCd', @@ -796,7 +796,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-2', + class: 'py-2 pr-2 mt-2', iconShow: true, inputType: 'number', }, @@ -808,7 +808,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2', + class: 'py-2 mt-2', iconShow: true, inputType: 'number', }, @@ -820,7 +820,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-2', + class: 'py-2 pr-2 mt-2', iconShow: true, inputType: 'number', }, @@ -832,7 +832,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2', + class: 'py-2 mt-2', list: 'unitCdList', itemText: 'commCdNm', itemValue: 'commCd', @@ -847,7 +847,7 @@ const myDetail = [ cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-2', + class: 'py-2 pr-2 mt-2', value: { '1': true, '0': false }, iconShow: true, required: true, diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue index 046b099..e86ff17 100644 --- a/pages/ems/effc/EnrgUsePlanPage.vue +++ b/pages/ems/effc/EnrgUsePlanPage.vue @@ -304,7 +304,7 @@ export default { $(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between'); const el2 = document.createElement('button'); $(el2).addClass('edit-btn blue--text'); - el2.innerText = '편집하다'; + el2.innerText = '수정'; elDiv.appendChild(el2); this.el = elDiv; @@ -415,7 +415,7 @@ export default { { header: '구분', name: 'gubun', - width: 80, + width: 200, align: 'left', // hidden: true, formatter({ value }) { @@ -447,7 +447,7 @@ export default { myColumns.push({ header: i.toString() + '월', name: qty, - width: 73, + width: 80, align: 'right', editor: 'text', formatter: this.numberFormatter,