diff --git a/components/common/modal/ElecPowChrgPop.vue b/components/common/modal/ElecPowChrgPop.vue index c2e7770..56efac4 100644 --- a/components/common/modal/ElecPowChrgPop.vue +++ b/components/common/modal/ElecPowChrgPop.vue @@ -58,7 +58,7 @@
- + - + - + -
+ + - + + + 초기화 + @@ -310,7 +335,11 @@ export default { }, // 공정/설비 트리 그리드 세팅 gridInit() { - const myOptions = {}; + const myOptions = { + header: { + height: 38, + }, + }; this.setModalGridOption({ modalKey: this.myModalKey, gridKey: this.gridName, @@ -606,11 +635,11 @@ const myColumns = [ { header: '전력계약 ID', name: 'eleclContId', hidden: true}, { header: '전력계약 명', name: 'eleclContNm', hidden: true}, { header: '전력계약구분CD', name: 'elecContKind', hidden: true}, - { header: '전력계약구분', name: 'elecContKindNm', align: 'center'}, + { header: '전력계약구분', name: 'elecContKindNm', align: 'left'}, { header: '전압구분CD', name: 'voltKind', hidden: true }, - { header: '전압구분', name: 'voltKindNm', align: 'center' }, + { header: '전압구분', name: 'voltKindNm', align: 'left' }, { header: '옵션CD', name: 'optKind', hidden: true }, - { header: '옵션', name: 'optKindNm', align: 'center' }, + { header: '옵션', name: 'optKindNm', align: 'left' }, { header: '기본요금(원/kW)', name: 'baseChrg', @@ -620,7 +649,7 @@ const myColumns = [ }, }, { header: '시간대CD', name: 'peakKind', hidden: true }, - { header: '시간대', name: 'peakKindNm', align: 'center' }, + { header: '시간대', name: 'peakKindNm', align: 'left' }, { header: '여름철(6~8월)', name: 'unitPrcSum', diff --git a/components/common/modal/TagTrndTagPop.vue b/components/common/modal/TagTrndTagPop.vue index fa0b2d4..1eccc1d 100644 --- a/components/common/modal/TagTrndTagPop.vue +++ b/components/common/modal/TagTrndTagPop.vue @@ -273,9 +273,9 @@ export default { }); }, async created() { - // await this.setSelectValueList01(); - // await this.setSelectValueList02(); - // await this.setSelectValueList03(); + await this.setSelectValueList01(); + await this.setSelectValueList02(); + await this.setSelectValueList03(); this.init(); // if(this.searchParam.isMulti == true){ // this.setPageData({ @@ -487,40 +487,40 @@ export default { eqpmId: this.selectValue03, searchWord: this.searchWord, }; - let res = [ - { - eqpmGrpNm: "냉각 시스템", - eqpmGrpId: "GRP001", - eqpmId: "EQ001", - eqpmNm: "냉각기 A", - tagId: "TAG001-001", - tagNm: "냉각 온도 센서", - rowStat: "I", - }, - { - eqpmGrpNm: "전력 시스템", - eqpmGrpId: "GRP002", - eqpmId: "EQ002", - eqpmNm: "변압기 B", - tagId: "TAG002-002", - tagNm: "전류 센서", - rowStat: "U", - }, - { - eqpmGrpNm: "공기압 시스템", - eqpmGrpId: "GRP003", - eqpmId: "EQ003", - eqpmNm: "압축기 C", - tagId: "TAG003-003", - tagNm: "압력 센서", - rowStat: "D", - }, - ]; - // res = await this.postApiReturn({ - // apiKey: "selectTagAndEqpmList", - // resKey: "tagTrndDatas", - // sendParam: searchParam, - // }); + // let res = [ + // { + // eqpmGrpNm: "냉각 시스템", + // eqpmGrpId: "GRP001", + // eqpmId: "EQ001", + // eqpmNm: "냉각기 A", + // tagId: "TAG001-001", + // tagNm: "냉각 온도 센서", + // rowStat: "I", + // }, + // { + // eqpmGrpNm: "전력 시스템", + // eqpmGrpId: "GRP002", + // eqpmId: "EQ002", + // eqpmNm: "변압기 B", + // tagId: "TAG002-002", + // tagNm: "전류 센서", + // rowStat: "U", + // }, + // { + // eqpmGrpNm: "공기압 시스템", + // eqpmGrpId: "GRP003", + // eqpmId: "EQ003", + // eqpmNm: "압축기 C", + // tagId: "TAG003-003", + // tagNm: "압력 센서", + // rowStat: "D", + // }, + // ]; + let res = await this.postApiReturn({ + apiKey: "selectTagAndEqpmList", + resKey: "tagTrndDatas", + sendParam: searchParam, + }); let newRes = []; if (this.searchParam["tagList"].length > 0) { newRes = res.filter((item) => { diff --git a/layouts/default.vue b/layouts/default.vue index 7f9304e..f803b26 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -61,10 +61,10 @@ - + star - star_border diff --git a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue index 351da39..0a98351 100644 --- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue +++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue @@ -49,7 +49,7 @@ + :textCols="12" :customClass="'datepicker-large'" /> diff --git a/pages/ems/effc/EnrgEffcTotSummPage.vue b/pages/ems/effc/EnrgEffcTotSummPage.vue index a6e53e3..97b6233 100644 --- a/pages/ems/effc/EnrgEffcTotSummPage.vue +++ b/pages/ems/effc/EnrgEffcTotSummPage.vue @@ -1,5 +1,6 @@