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/5] 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/5] 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/5] 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/5] 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 @@
- + - + - +
+ From 7bca077859e6dd057c935902b4c35c4ad1e4bda4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com> Date: Mon, 4 Aug 2025 15:00:22 +0700 Subject: [PATCH 5/5] fix bug screen 8, 10, menu --- assets/scss/common.scss | 450 ++++++++++++---------- components/common/modal/EqpmSelectPop.vue | 92 ++--- layouts/default.vue | 51 +-- pages/comm/base/NoticeMngPage.vue | 2 +- pages/ems/base/EquipmentMasterMngPage.vue | 2 +- pages/ems/base/ReadResultCloseMngPage.vue | 1 + pages/ems/effc/EnrgMapPage.vue | 6 +- pages/ems/effc/EnrgReptMngPage.vue | 47 +-- 8 files changed, 335 insertions(+), 316 deletions(-) diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 763638a..f3d3a69 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -266,7 +266,7 @@ a { } &>.v-treeview-node__root:hover:before { - opacity: 1 !important; + opacity: 0 !important; } .v-treeview-node__children { @@ -280,13 +280,17 @@ a { .v-treeview-node--click[aria-expanded="true"] { &>.v-treeview-node__root:before { - opacity: 1 !important; + opacity: 0 !important; } } .v-treeview-node[aria-expanded="true"] { - &>.v-treeview-node__root>.v-treeview-node__content>.v-treeview-node__label>button>.v-icon.mdi-chevron-down { - transform: rotate(-180deg); + &>.v-treeview-node__root>.v-treeview-node__content + >.v-treeview-node__label>button { + >.anticon, + >.v-icon.mdi-chevron-down { + transform: rotate(-180deg); + } } } @@ -298,15 +302,17 @@ a { // justify-content: center; } + & .anticon, & .v-icon.mdi-chevron-down { margin-left: auto; + animation-duration: 0.5s; } } } .v-treeview-node--active { &:before { - opacity: 1 !important; + opacity: 0 !important; } } @@ -322,7 +328,8 @@ a { .v-treeview-node__content span:not(.v-icon), .v-treeview-node__root>button, .v-treeview-node__level, - .v-treeview-node__content .v-icon.mdi-chevron-down { + .v-treeview-node__content .v-icon.mdi-chevron-down, + .v-treeview-node__content .anticon { display: none; } @@ -615,36 +622,36 @@ a { .v-navigation-drawer__append { >p { - @if $theme ==dark { - color: rgba(255, 255, 255, 0.6); - } + color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important; + // @if $theme ==dark { + // color: rgba(255, 255, 255, 0.6); + // } - @else { - color: #999; - } + // @else { + // color: #999; + // } } } - .v-footer { - @if $theme ==light { - background-color: #dfdfe5; - color: #767d83; - } - } + // .v-footer { + // @if $theme ==light { + // background-color: #dfdfe5; + // color: #767d83; + // } + // } - .bd { - @if $theme ==dark { - &-r-1 { - border-right: 1px #373f45 solid; - } - } - - @else { - &-r-1 { - border-right: 1px #efefef solid; - } - } - } + // .bd { + // @if $theme ==dark { + // &-r-1 { + // border-right: 1px #373f45 solid; + // } + // } + // @else { + // &-r-1 { + // border-right: 1px #efefef solid; + // } + // } + // } .border-bottom-1 { border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color"); @@ -692,183 +699,224 @@ a { } &>.v-treeview-node { - - .v-treeview-node--active { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-active-bg" - ); - border: 1px solid map-deep-get($config, - #{$theme}, - "v-treeview-node-label-active-border" - ); + .v-treeview-node__root { border-radius: 8px; - - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-subroot-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-icon-active-color" - ); - } - } - - } - - &>.v-treeview-node__root { - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-label-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-icon-color" - ); - } - } - &:hover { - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-label-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-icon-active-color" - ); - } - } + background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" ); } - } - - &>.v-treeview-node__children { - &>.v-treeview-node { - - &>.v-treeview-node__root { - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-node-subroot-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-icon-color" - ); - } - } - - &:not(.v-treeview-node--active):hover { - &:before { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-active-backgroundColor" - ); - } - - &>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-active-color" - ); - } - } - } - } - - &>.v-treeview-node__children { - background-color: map-deep-get($config, - #{$theme}, - "v-treeview-leaf-subchildren-backgroundColor" - ); - } - - &[aria-expanded="true"] { - & .v-treeview-node__root>.v-treeview-node__content { - .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-label-children-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-icon-active-color" - ); - } - } - } - } - } - - &[aria-expanded="true"] { - & .v-treeview-node__root>.v-treeview-node__content { + .v-treeview-node__content { .v-treeview-node__label { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-label-active-color" - ); - } - - .v-icon { - color: map-deep-get($config, - #{$theme}, - "v-treeview-node-root-icon-active-color" - ); + color: map-deep-get($config, #{$theme}, "tui-grid-title-color"); } } + } + + &[aria-expanded="true"]{ + + // Level 1 + &>.v-treeview-node__root { + background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg" ); + border: 1px solid map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border"); + + &:before { + background-color: map-deep-get($config, #{$theme}, "v-treeview-node-subroot-backgroundColor"); + } + + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border"); + } + + .v-icon:first-child, + .v-icon:first-child::before { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + } + } + } + + &>.v-treeview-node__children { + // Level 2 + .v-treeview-node__root { + color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color"); + &:hover { + background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-backgroundColor"); + } + } + &>[aria-expanded="true"] >.v-treeview-node__root, + .v-treeview-node__root.v-treeview-node--active { + background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color" ); + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "card-title-color"); + } + + .v-icon, + .v-icon::before, + .anticon { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + } + } + } + + // Level 3 + .v-treeview-node__children { + .v-treeview-node { + >.v-treeview-node__root { + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "card-default-color"); + } + } + + *:hover, + :hover { + border-width: 0; + } + + &:hover { + border: 1px solid map-deep-get($config, #{$theme}, "v-input-textarea-border"); + border-radius: 8px; + background-color: rgba(0, 0, 0, 0); + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "tui-grid-title-color"); + } + } + + } + + &.v-treeview-node--active { + // color: map-deep-get($config, #{$theme}, "card-title-color"); + background-color: rgba(0, 0, 0, 0); + .v-treeview-node__content { + .v-treeview-node__label { + color: map-deep-get($config, #{$theme}, "tui-grid-title-color"); + } + + .v-icon, + .v-icon::before, + .anticon { + color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" ); + } + } + } + + } + } + + } + + } + + + } + + // &>.v-treeview-node__root { + // &:before { + // background-color: map-deep-get($config, #{$theme}, "v-treeview-node-root-backgroundColor" ); + // } + + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color"); + // } + // } + + // &:hover { + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-node-root-label-active-color" + // ); + // } + + // .v-icon { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-node-root-icon-active-color" + // ); + // } + // } + // } + // } + + // &>.v-treeview-node__children { + // &>.v-treeview-node { + + // &>.v-treeview-node__root { + // &:before { + // background-color: map-deep-get($config, + // #{$theme}, + // "v-treeview-node-subroot-backgroundColor" + // ); + // } + + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, #{$theme}, "v-treeview-node-label-color" ); + // } + + // .v-icon { + // color: map-deep-get($config, #{$theme}, "v-treeview-icon-color" ); + // } + // } + + // &:not(.v-treeview-node--active):hover { + // &:before { + // background-color: map-deep-get($config, + // #{$theme}, + // "v-treeview-leaf-active-backgroundColor" + // ); + // } + + // &>.v-treeview-node__content { + // .v-treeview-node__label { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-leaf-active-color" + // ); + // } + + // .v-icon { + // color: map-deep-get($config, + // #{$theme}, + // "v-treeview-leaf-active-color" + // ); + // } + // } + // } + // } + + // &>.v-treeview-node__children { + // // background-color: map-deep-get($config, + // // #{$theme}, + // // "v-treeview-leaf-subchildren-backgroundColor" + // // ); + // } + + // // &[aria-expanded="true"] { + // // & .v-treeview-node__root>.v-treeview-node__content { + // // .v-treeview-node__label { + // // color: map-deep-get($config, + // // #{$theme}, + // // "v-treeview-node-label-children-color" + // // ); + // // } + + // // .v-icon { + // // color: map-deep-get($config, + // // #{$theme}, + // // "v-treeview-icon-active-color" + // // ); + // // } + // // } + // // } + // } + // } + } } diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue index 0fe794e..959de8b 100644 --- a/components/common/modal/EqpmSelectPop.vue +++ b/components/common/modal/EqpmSelectPop.vue @@ -16,54 +16,52 @@ - - + + 설비 선택
- - - - - - - - - - - - - - - - - + - - - 조회 - - - - + + + 조회 + +
-
-
+ + +
-
+ + 닫기 확인 diff --git a/layouts/default.vue b/layouts/default.vue index 87ee665..7f9304e 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -9,7 +9,6 @@ @@ -40,16 +39,16 @@ @@ -805,7 +786,7 @@ export default { // console.log('if isLoading stmt3'); // return; // } - alert("move to", url); + // alert("move to", url); this.$router.push({ path: url + "?prgmId=" + prgmId, }); diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index e7ecfbb..743c67d 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -10,7 +10,7 @@ 공지사항
- 작성
diff --git a/pages/ems/base/EquipmentMasterMngPage.vue b/pages/ems/base/EquipmentMasterMngPage.vue index acc09f1..938faf2 100644 --- a/pages/ems/base/EquipmentMasterMngPage.vue +++ b/pages/ems/base/EquipmentMasterMngPage.vue @@ -53,7 +53,7 @@ - 설비 상세 + 설비 상세
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/EnrgMapPage.vue b/pages/ems/effc/EnrgMapPage.vue index b3c2e51..fed1f9d 100644 --- a/pages/ems/effc/EnrgMapPage.vue +++ b/pages/ems/effc/EnrgMapPage.vue @@ -5,14 +5,14 @@ - + - + - + diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue index 9db9f28..a22005e 100644 --- a/pages/ems/effc/EnrgReptMngPage.vue +++ b/pages/ems/effc/EnrgReptMngPage.vue @@ -32,7 +32,7 @@ - + @@ -99,6 +99,8 @@ import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop'; import DateUtility from '~/plugins/dateUtility'; import XLSX from 'xlsx'; +import getLineChartOption from "~/components/common/chartoptions/LineChart"; + let myTitle; let myPrgmId; @@ -764,22 +766,14 @@ export default { ]; } - var chartOption = { - legend: { - top: 'top', - }, - grid: { - top: '10%', - bottom: '20%', - }, - yAxis: {}, - xAxis: { - data: xAxisData, - }, - series: seriesData, - tooltip: {}, + const chartOption = getLineChartOption({ + xAxisData: xAxisData, + seriesData: seriesData, dataZoom: dataZoom, - }; + // legendData: legendData, + // isDarkMode: this.isDarkMode, + }); + this.setChartOption({ chartKey: this.chartName01, value: chartOption }); // this.setChartYAxisData({ chartKey: this.chartName01, value: yAxisData }); // this.setChartXAxisData({ chartKey: this.chartName01, value: xAxisData }); @@ -864,22 +858,13 @@ export default { ]; } - var chartOption = { - legend: { - top: 'top', - }, - grid: { - top: '10%', - bottom: '20%', - }, - yAxis: {}, - xAxis: { - data: xAxisData, - }, - series: seriesData, - tooltip: {}, + const chartOption = getLineChartOption({ + xAxisData: xAxisData, + seriesData: seriesData, dataZoom: dataZoom, - }; + // legendData: legendData, + // isDarkMode: this.isDarkMode, + }); this.setChartOption({ chartKey: this.chartName02, value: chartOption }); // this.setChartDataZoom({chartKey : this.chartName02,value: dataZoom});