From 1284d5b14fef44634e7ad614530a0c5e65c3298d Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Fri, 1 Aug 2025 11:41:32 +0900 Subject: [PATCH 1/4] Update s1 s29 - Remove mock data s5 s11 --- components/common/modal/ElecPowChrgPop.vue | 49 +- pages/ems/base/ReadResultCloseMngPage.vue | 1 + pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue | 2 +- pages/ems/effc/EnrgEffcTotSummPage.vue | 8 +- pages/ems/effc/EnrgReptMngPage.vue | 2 +- pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue | 30 +- pages/ems/effc/EnrgUseTotSummPage.vue | 4 +- pages/ems/effc/EqpmIndMntrPage.vue | 1 + pages/ems/effc/TagTrndPage.vue | 1642 +++++++++---------- 9 files changed, 865 insertions(+), 874 deletions(-) diff --git a/components/common/modal/ElecPowChrgPop.vue b/components/common/modal/ElecPowChrgPop.vue index c2e7770..a6872aa 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/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue index 8a64eea..0720a38 100644 --- a/pages/ems/base/ReadResultCloseMngPage.vue +++ b/pages/ems/base/ReadResultCloseMngPage.vue @@ -43,6 +43,7 @@ :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" + customClass="datepicker-large" />
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..a443021 100644 --- a/pages/ems/effc/EnrgEffcTotSummPage.vue +++ b/pages/ems/effc/EnrgEffcTotSummPage.vue @@ -25,7 +25,7 @@ @@ -99,7 +99,6 @@ export default { async asyncData(context) { const myState = context.store.state; myPrgmId = context.route.query.prgmId; - console.log("active menu:", myState.menuData); await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]); myTitle = await myState.activeMenuInfo.menuNm; }, @@ -319,8 +318,7 @@ export default { }, }; - console.log("data : ", data); - data.map((item) => { + data.map((item) => { xAxisData.push(item.fabNm); }); @@ -374,8 +372,6 @@ export default { ]; } - // console.log("xAxisData : ", xAxisData); - console.log("seriesData : ", seriesData); var chartOption = { legend: { top: xAxisData.length > 7 ? "top" : "bottom", diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue index 9db9f28..e0ea938 100644 --- a/pages/ems/effc/EnrgReptMngPage.vue +++ b/pages/ems/effc/EnrgReptMngPage.vue @@ -32,7 +32,7 @@ - + diff --git a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue index 5416a1d..cb0f8a5 100644 --- a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue +++ b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue @@ -97,7 +97,7 @@ - +
- +
{{ value["gdIdxNm"] }} -
- - -
+
+ +
- +
@@ -746,10 +732,12 @@ export default { { type: "line", data: seriesData, - symbol: "none", itemStyle: { color: "#D32029", }, + // symbol: "circle", + showSymbol: true, + connectNulls: true, }, // { // type: "line", diff --git a/pages/ems/effc/EnrgUseTotSummPage.vue b/pages/ems/effc/EnrgUseTotSummPage.vue index a8b0860..405cc53 100644 --- a/pages/ems/effc/EnrgUseTotSummPage.vue +++ b/pages/ems/effc/EnrgUseTotSummPage.vue @@ -24,6 +24,7 @@ :is="'DatePicker'" :label="'대상연월'" :parentPrgmId="myPrgmId" + :customClass="'datepicker-large'" /> @@ -429,9 +430,6 @@ export default { var chartKey = null; var chartOption = null; - console.log("data key:", dataKeyList); - console.log("data test:", data); - for (var i = 0; i < dataKeyList.length; i++) { for (var j = 0; j < data[dataKeyList[i]].chartData.length; j++) { currentChartData = data[dataKeyList[i]].chartData[j]; diff --git a/pages/ems/effc/EqpmIndMntrPage.vue b/pages/ems/effc/EqpmIndMntrPage.vue index 1b18b7e..067f144 100644 --- a/pages/ems/effc/EqpmIndMntrPage.vue +++ b/pages/ems/effc/EqpmIndMntrPage.vue @@ -71,6 +71,7 @@ :label="'대상년월'" :parentPrgmId="myPrgmId" :isRangeOption="false" + :customClass="'datepicker-large'" /> diff --git a/pages/ems/effc/TagTrndPage.vue b/pages/ems/effc/TagTrndPage.vue index c0cd56a..ed7e0a6 100644 --- a/pages/ems/effc/TagTrndPage.vue +++ b/pages/ems/effc/TagTrndPage.vue @@ -1,37 +1,37 @@ From 06308055ef224459b171e54313fc2a9563060775 Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Fri, 1 Aug 2025 12:08:43 +0900 Subject: [PATCH 2/4] Remove mock data popup s11 --- components/common/modal/TagTrndTagPop.vue | 74 +++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) 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) => { From df678daedf7dbf5354152c39118fd4c1c1b81332 Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Fri, 1 Aug 2025 16:03:54 +0900 Subject: [PATCH 3/4] Fix duplicate id not reload page date --- layouts/default.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/default.vue b/layouts/default.vue index 87ee665..68f6454 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -62,10 +62,10 @@ - + star - star_border From 6dfda50ebdd96fe647c5ae05cf56edba613e2ac6 Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Mon, 4 Aug 2025 11:21:29 +0900 Subject: [PATCH 4/4] Change style to built in class + Add missing titlte --- components/common/modal/ElecPowChrgPop.vue | 6 +++--- pages/ems/effc/EnrgEffcTotSummPage.vue | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/common/modal/ElecPowChrgPop.vue b/components/common/modal/ElecPowChrgPop.vue index a6872aa..56efac4 100644 --- a/components/common/modal/ElecPowChrgPop.vue +++ b/components/common/modal/ElecPowChrgPop.vue @@ -58,7 +58,7 @@
- + - + - +
+