diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 1888a79..0fac17b 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -144,7 +144,7 @@ a { & .router-tab__container { overflow-y: auto; - min-height: calc(100vh - 105px); + height: calc(100vh - 105px); max-height: calc(100vh - 105px); padding: 20px; } @@ -487,7 +487,7 @@ a { background-color: map-deep-get($config, #{$theme}, "container-fluid"); .menu-container { - max-height: calc(100vh - 60px); + height:calc(100vh - 60px); overflow-y: auto; } } diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index 2eeabc9..351fc58 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -134,11 +134,11 @@ } &-body-container{ - border-right: 1px solid; - border-right-color: map-deep-get($config, - #{$theme}, - "tui-grid-cell-borderColor" - ); + border-right: 0; + // border-right-color: map-deep-get($config, + // #{$theme}, + // "tui-grid-cell-borderColor" + // ); width: auto !important; } @@ -151,24 +151,27 @@ width: $scrollbar-width !important; height: $scrollbar-width !important; -webkit-appearance: initial; - background-color: map-deep-get($config, - #{$theme}, - "scrollbar-track" - ) !important; + // background-color: map-deep-get($config, + // #{$theme}, + // "tui-grid-cell-borderColor" + // ) !important; + background-color: rgba(0, 0, 0, 0) !important; border-radius: 3px !important; } & ::-webkit-scrollbar-track { - background-color: map-deep-get($config, - #{$theme}, - "scrollbar-track" - ) !important; + // background-color: map-deep-get($config, + // #{$theme}, + // "tui-grid-cell-borderColor" + // ) !important; + background-color: rgba(0, 0, 0, 0) !important; } & ::-webkit-scrollbar-thumb { width: 50px !important; height: 50px !important; background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb"); + // background-color: rgba(0, 0, 0, 0); border-radius: 3px; } @@ -195,6 +198,7 @@ &-scrollbar-right-top { background-color: rgba(0, 0, 0, 0); border: none; + display: none; // background-color: map-deep-get( // $config, // #{$theme}, @@ -221,12 +225,13 @@ width: $scrollbar-width !important; height: $scrollbar-width !important; // display: none !important; - border-color: map-deep-get($config, #{$theme}, "scrollbar-track"); - background-color: map-deep-get($config, #{$theme}, "scrollbar-track"); + border-color: map-deep-get($config, #{$theme}, "cardBackground"); + background-color: map-deep-get($config, #{$theme}, "cardBackground"); // border: none !important; // bottom: -1px; // right: -2px; box-sizing: border-box; + // display: none; } &-scrollbar-frozen-border, @@ -236,13 +241,9 @@ border-color: transparent !important; } - // &-body-area { - // overflow: auto !important; - // } - + &-body-area, &-container, &-layer-state, - &-body-area, &-summary-area, &-cell { background-color: map-deep-get($config, @@ -254,23 +255,36 @@ "tui-grid-border-vertical-color" ); - &-current-row{ - td { - .custom-radio { - .radio-mark{ - border-color: #1677ff; - background-color: #fff; - &::after { - content: ""; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - height: 11px; - width: 11px; - border-radius: 50%; - background-color: #1677ff; - } + // &-current-row{ + // } + td.row-selected { + .custom-radio { + background-color: map-deep-get($config, + #{$theme}, + "ant-btn-primary-color" + ); + .radio-mark{ + border-color: map-deep-get($config, + #{$theme}, + "arow-line-color" + ); + background-color: map-deep-get($config, + #{$theme}, + "arow-line-btn-bg-color" + ); + &::after { + content: ""; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + height: 11px; + width: 11px; + border-radius: 50%; + background-color: map-deep-get($config, + #{$theme}, + "arow-line-color" + ); } } } @@ -302,8 +316,8 @@ &-header-area, &-cell-header { // font-family: inherit; + // font-style: Semi Bold; font-weight: 600; - font-style: Semi Bold; background-color: map-deep-get($config, #{$theme}, "tui-grid-header-backgroundColor" @@ -320,8 +334,13 @@ } &-header-area { - background-color: none; + // background-color: none; border: none; + margin-right: 0 !important; + background-color: map-deep-get($config, + #{$theme}, + "tui-grid-cell-backgroundColor" + ); } &-row-odd, diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss index ccc3e55..659effe 100644 --- a/assets/scss/common/input.scss +++ b/assets/scss/common/input.scss @@ -188,7 +188,7 @@ transform: translateY(-50%); height: 18px; width: 18px; - background-color: white; + // background-color: white; border: 2px solid #ccc; border-radius: 50%; transition: all 0.2s ease; @@ -263,9 +263,6 @@ "v-input-backgroundColor" ); - - - &:not(.v-input--radio-group, .v-input--checkbox) { .v-input__slot { background-color: map-deep-get($config, @@ -372,6 +369,17 @@ } } } + + .radio-mark { + background-color: map-deep-get($config, + #{$theme}, + "ant-btn-primary-color" + ); + border-color: map-deep-get($config, + #{$theme}, + "v-input-textarea-border" + ); + } } .v-radio { diff --git a/assets/scss/datepicker.scss b/assets/scss/datepicker.scss index f8963b1..ffc8c88 100644 --- a/assets/scss/datepicker.scss +++ b/assets/scss/datepicker.scss @@ -14,11 +14,14 @@ position: relative; border-radius: 6px; border: solid 1px; - height: 40px; + height: 32px; // border-color: #424242; border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color"); - + &.datepicker-large { + height: 40px; + } + .v-input { // ---------------------- diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 1f6d557..11d3973 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -108,7 +108,7 @@ $config: ( tui-grid-header-backgroundColor: #2a2b2d, tui-grid-header-color: #FFFFFFD9, tui-grid-border-horziontal-color: #212224, - tui-grid-border-vertical-color: #212224, + tui-grid-border-vertical-color: #FFFFFF0F, tui-grid-cell-backgroundColor: #212224, tui-grid-cell-color: #fff, tui-grid-cell-insert-color: #13636c, diff --git a/components/common/Datepicker.vue b/components/common/Datepicker.vue index 0a71957..f4b0ce4 100644 --- a/components/common/Datepicker.vue +++ b/components/common/Datepicker.vue @@ -9,7 +9,7 @@ -
+
diff --git a/components/common/modal/FtnPlcMultiPop3.vue b/components/common/modal/FtnPlcMultiPop3.vue index cd656fc..a6dcc99 100644 --- a/components/common/modal/FtnPlcMultiPop3.vue +++ b/components/common/modal/FtnPlcMultiPop3.vue @@ -294,10 +294,10 @@ export default { if (this.searchParam.energyCd < 0) { roiIdVal = null; } else { - console.log( - 'this.searchParam.energyList[this.searchParam.energyCd]', - this.searchParam.energyList[this.searchParam.energyCd], - ); + // console.log( + // 'this.searchParam.energyList[this.searchParam.energyCd]', + // this.searchParam.energyList[this.searchParam.energyCd], + // ); roiIdVal = this.searchParam.energyList[this.searchParam.energyCd + 1] .cd; } diff --git a/components/common/modal/OnlnBaseEccPop.vue b/components/common/modal/OnlnBaseEccPop.vue index 967a153..2144754 100644 --- a/components/common/modal/OnlnBaseEccPop.vue +++ b/components/common/modal/OnlnBaseEccPop.vue @@ -239,13 +239,13 @@ export default { this.selectedData.eccNm = ''; if (this.bindOption === null) { - console.log('this.bindOption is null...'); + // console.log('this.bindOption is null...'); this.setPageData({ modalEccId: '', modalEccNm: '', }); } else { - console.log('this.bindOption is not null...'); + // console.log('this.bindOption is not null...'); this.setPageData({ [this.bindOption.eccId]: '', [this.bindOption.eccNm]: '', @@ -296,12 +296,12 @@ export default { ? localStorage.getItem(this.parentPrgmId + 'ModalEccNm') : '', }); - console.log( - 'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ', - localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null - ? localStorage.getItem(this.parentPrgmId + 'ModalEccNm') - : '', - ); + // console.log( + // 'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ', + // localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null + // ? localStorage.getItem(this.parentPrgmId + 'ModalEccNm') + // : '', + // ); this.textFieldData = localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null ? localStorage.getItem(this.parentPrgmId + 'ModalEccNm') diff --git a/components/common/modal/PlanPop.vue b/components/common/modal/PlanPop.vue index 9134348..ec2306b 100644 --- a/components/common/modal/PlanPop.vue +++ b/components/common/modal/PlanPop.vue @@ -317,14 +317,14 @@ export default { } }, strtDt(val) { - console.log('strtDt : ', val); + // console.log('strtDt : ', val); this.checkStrtAndEndDateTime('start'); if (this.startDatepickerInstance3) { this.startDatepickerInstance3.setDate(new Date(this.endDt)); } }, endDt(val) { - console.log('endDt : ', val); + // console.log('endDt : ', val); this.checkStrtAndEndDateTime('end'); if (this.startDatepickerInstance) { this.startDatepickerInstance.setDate(new Date(this.strtDt)); @@ -339,7 +339,7 @@ export default { this.checkStrtAndEndDateTime('start'); }, endHh(val) { - console.log('endHh : ', val); + // console.log('endHh : ', val); this.checkStrtAndEndDateTime('end'); }, strtMm(val) { diff --git a/components/common/modal/ReadPlcDisableFuncPop.vue b/components/common/modal/ReadPlcDisableFuncPop.vue index 7eea355..c9e9244 100644 --- a/components/common/modal/ReadPlcDisableFuncPop.vue +++ b/components/common/modal/ReadPlcDisableFuncPop.vue @@ -253,7 +253,7 @@ export default { readObjid: this.searchParam.energyCd, }, }); - console.log('getTreeData : ', res); + // console.log('getTreeData : ', res); // this.treeData = res; // const ROOT = res[0].plcCd; const setTreeData = await this.setTree({ @@ -327,7 +327,7 @@ export default { // 공정/설비 트리 row 클릭이벤트 async getRowData(data) { // console.log("getRowData 시작..."); - console.log('data', data); + // console.log('data', data); this.activeRowData = data; // if(data.enableFg == 1){ // this.activeRowData = data; diff --git a/components/common/select/SelectDsEnrg.vue b/components/common/select/SelectDsEnrg.vue index d4821c5..de1ebca 100644 --- a/components/common/select/SelectDsEnrg.vue +++ b/components/common/select/SelectDsEnrg.vue @@ -70,7 +70,7 @@ export default { return this.searchParam[this.parentPrgmId][this.enrgCd]; }, set(value) { - console.log('value : ', value); + // console.log('value : ', value); return this.setPageData({ [this.enrgCd]: value }); }, }, diff --git a/components/form/CustomInput.vue b/components/form/CustomInput.vue index 44643fe..4eb02d1 100644 --- a/components/form/CustomInput.vue +++ b/components/form/CustomInput.vue @@ -270,8 +270,8 @@ export default { filteredData: [], rowSelection: { onChange: (selectedRowKeys, selectedRows) => { - console.log('Selected Row Keys:', selectedRowKeys); - console.log('Selected Rows:', selectedRows); + // console.log('Selected Row Keys:', selectedRowKeys); + // console.log('Selected Rows:', selectedRows); }, } }; diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index a8792d1..d43aa51 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -213,7 +213,7 @@ export default { let dataArr = []; switch (action) { case 'add': - console.log('add this.pageData : '); // , this.pageData); + // console.log('add this.pageData : '); // , this.pageData); const defaultRow = { dataSetId: this.pageData.dataSetId, dataSetNm: this.pageData.dataSetNm, @@ -296,7 +296,7 @@ export default { comId: this.selectedComId, dataSetId: this.selectedDataSetId, }; - console.log('data : ', data); + // console.log('data : ', data); this.$emit('jamoviClickEvent', 'view1', data); }, }, diff --git a/components/pages/ems/EccInfo/EccAddInfoTab.vue b/components/pages/ems/EccInfo/EccAddInfoTab.vue index 88823b2..312c78c 100644 --- a/components/pages/ems/EccInfo/EccAddInfoTab.vue +++ b/components/pages/ems/EccInfo/EccAddInfoTab.vue @@ -20,7 +20,6 @@ :editorGrid="true" :innerTabGridInfo="innerTabGridInfo" @getRowsData="getRowData" - :dataPath="dataPathMock" />
@@ -54,22 +53,10 @@ export default { }, data() { return { - loadGrid: true, + loadGrid: false, gridName: 'rowDetailGrid', rowKey: null, edtingFinishFlag: 'Y', - dataPathMock: { - "rowDetailGrid": { - column: [ - { header: '추가 정보', name: 'readObjId', align: 'left' }, - { header: 'Data 구분', name: 'readObjNm', align: 'left' }, - { header: '추가 정보 값', name: 'readObjKind', align: 'left' }, - ], - data: dataPathDataExample, - defaultRow: dataPathDataExample, - option: {} - } - }, }; }, computed: { @@ -444,22 +431,4 @@ export default { }, }, }; - -const dataPathDataExample = [ - { - readObjId: 'OBJ001', - readObjNm: '서울 본사', - readObjKind: 'TYPE01', - }, - { - readObjId: 'OBJ002', - readObjNm: '부산 지사', - readObjKind: 'TYPE02', - }, - { - readObjId: 'OBJ003', - readObjNm: '대전 공장', - readObjKind: 'TYPE03', - } -] diff --git a/components/pages/ems/EccInfo/EccIaoTab.vue b/components/pages/ems/EccInfo/EccIaoTab.vue index 4e03d6f..9153f96 100644 --- a/components/pages/ems/EccInfo/EccIaoTab.vue +++ b/components/pages/ems/EccInfo/EccIaoTab.vue @@ -19,7 +19,6 @@ :parentPrgmId="parentPrgmId" @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" - :dataPath="dataPathMock" />
@@ -60,24 +59,11 @@ export default { }, data() { return { - loadGrid: true, + loadGrid: false, gridName: 'rowEccIaoGrid', inputList_emMapDiv: [], inputList_cmInOut: [], detailList: myDetail, - dataPathMock: { - "rowEccIaoGrid": { - column: [ - { header: '검침 대상 ID', name: 'readObjId', align: 'left' }, - { header: '검침 대상 명', name: 'readObjNm', align: 'left' }, - { header: '검침 대상 유형', name: 'readObjKind', align: 'left' }, - { header: '그룹', name: 'grpCd', align: 'left' }, - ], - data: dataPathDataExample, - defaultRow: dataPathDataExample, - option: {} - } - }, }; }, computed: { @@ -516,12 +502,4 @@ const myDetail = [ iconShow: true, }, ]; -const dataPathDataExample = [ - { - readObjId: 'OBJ001', - readObjNm: '서울 본사', - readObjKind: 'TYPE01', - grpCd: 'GRP01', - }, -] diff --git a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue index edd14e0..2987f82 100644 --- a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue +++ b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue @@ -1,10 +1,7 @@