- 공통그룹코드
+ 공통그룹코드
item.commCd == value,
diff --git a/components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue b/components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue
index fd8d83b..e3ab3dd 100644
--- a/components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue
+++ b/components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue
@@ -271,63 +271,6 @@ export default {
value: myColumns,
});
- const res = [
- {
- "comId": "COM001",
- "ercId": "ERC001",
- "objMm": "202507",
- "objYm": "2025-07",
- "unitPrce": 120.5,
- "peakPow": 450,
- "baseChrg": 30000,
- "notiChrg": 32500,
- "rmrk": "Standard summer rate",
- "blocId": "BLOC001",
- "regUserNo": "USER001",
- "regDttm": "2025-07-01T09:00:00",
- "procUserNo": "USER002",
- "procDttm": "2025-07-15T14:30:00"
- },
- {
- "comId": "COM002",
- "ercId": "ERC002",
- "objMm": "202507",
- "objYm": "2025-07",
- "unitPrce": 98.75,
- "peakPow": 300,
- "baseChrg": 25000,
- "notiChrg": 27000,
- "rmrk": "Reduced rate for solar",
- "blocId": "BLOC002",
- "regUserNo": "USER003",
- "regDttm": "2025-07-02T10:15:00",
- "procUserNo": "USER004",
- "procDttm": "2025-07-16T11:45:00"
- },
- {
- "comId": "COM003",
- "ercId": "ERC003",
- "objMm": "202507",
- "objYm": "2025-07",
- "unitPrce": 110.0,
- "peakPow": 400,
- "baseChrg": 28000,
- "notiChrg": 29500,
- "rmrk": "Geothermal adjustment",
- "blocId": "BLOC003",
- "regUserNo": "USER005",
- "regDttm": "2025-07-03T08:45:00",
- "procUserNo": "USER006",
- "procDttm": "2025-07-17T13:20:00"
- }
-]
-
- this.setGridData({
- gridKey: this.gridName,
- value: res,
- });
-
-
this.loadGrid = true;
},
async btnActions(action) {
diff --git a/pages/comm/base/CommCdMngPage.vue b/pages/comm/base/CommCdMngPage.vue
index e12aca4..db344e4 100644
--- a/pages/comm/base/CommCdMngPage.vue
+++ b/pages/comm/base/CommCdMngPage.vue
@@ -1,33 +1,65 @@
From c3d01c998c5b5c066c9bc45cf5a4ae2f2d77a3bf Mon Sep 17 00:00:00 2001
From: leonard
Date: Mon, 28 Jul 2025 16:12:24 +0700
Subject: [PATCH 2/5] update screen 2, 8, 9, 10, 27, 33, 34
---
assets/scss/common.scss | 15 +-
assets/scss/common/button.scss | 3 +
components/common/Chart.vue | 10 +-
components/common/Datepicker.vue | 5 +-
components/common/Grid.vue | 4 +-
components/common/button/ActionButtons.vue | 6 +-
.../common/modal/EnrgUsePlanModiPop.vue | 6 +-
components/common/select/SelectBlocMstr.vue | 17 +-
components/common/select/SelectMttList.vue | 5 +
components/common/select/selectCodeList.vue | 6 +-
.../ems/DataSetInfo/DataSetTagRelTab.vue | 22 +-
layouts/default.vue | 28 -
layouts/default_bak.vue | 809 ---------------
layouts/default_bk.vue | 928 ------------------
mixin/global.js | 2 +-
nuxt.config.js | 2 +-
pages/comm/auth/MenuRoleMngPage.vue | 35 +-
pages/comm/base/NoticeMngPage.vue | 65 +-
pages/comm/base/PrgmMngPage.vue | 6 +-
pages/ems/base/ReadResultCloseMngPage.vue | 28 +-
pages/ems/effc/DataSetMngPage.vue | 17 +-
pages/ems/effc/EnrgMapPage.vue | 5 +-
pages/ems/effc/EnrgReptMngPage.vue | 4 +-
pages/ems/effc/EnrgUsePlanPage.vue | 101 +-
plugins/eChart.js | 1 -
store/index.js | 4 +-
26 files changed, 177 insertions(+), 1957 deletions(-)
delete mode 100644 layouts/default_bak.vue
delete mode 100644 layouts/default_bk.vue
diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index bac9445..b0d4fa3 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -12,8 +12,7 @@
html,
body {
- overflow: auto;
-
+ // overflow: auto;
}
a {
@@ -119,7 +118,7 @@ a {
.v-main,
.v-main__wrap,
.container {
- height: 100%;
+ // height: 100%;
}
.v-main__wrap>.container {
@@ -144,7 +143,9 @@ a {
}
& .router-tab__container {
- min-height: calc(100% - 72px);
+ overflow-y: auto;
+ min-height: calc(100vh - 105px);
+ max-height: calc(100vh - 105px);
padding: 20px;
}
@@ -484,6 +485,10 @@ a {
.container--fluid {
background-color: map-deep-get($config, #{$theme}, "container-fluid");
+ .menu-container {
+ max-height:calc(100vh - 60px);
+ overflow-y: auto;
+ }
}
.v-icon {
@@ -529,8 +534,6 @@ a {
}
}
-
-
.router-tab {
.router-tab__header {
background-color: map-deep-get($config, #{$theme}, "router-header");
diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss
index 6f60886..ea229cd 100644
--- a/assets/scss/common/button.scss
+++ b/assets/scss/common/button.scss
@@ -118,6 +118,9 @@
background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
color:map-deep-get($config, #{$theme}, "ant-btn-primary-color");
+ &.ant-btn-background-ghost{
+ color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
+ }
}
&.ant-btn-default {
diff --git a/components/common/Chart.vue b/components/common/Chart.vue
index c9aa472..4dcc7c1 100644
--- a/components/common/Chart.vue
+++ b/components/common/Chart.vue
@@ -351,25 +351,25 @@ export default {
tmpChrtOp.color = light_Col;
}
}
- console.log('ops11:',tmpChrtOp)
+ // console.log('ops11:',tmpChrtOp)
return tmpChrtOp;
},
}),
},
created() {
- console.log('wd data:',this.widgetData)
+ // console.log('wd data:',this.widgetData)
},
methods: {
onClick(event, instance, ECharts) {
- console.log('onClick : ', event);
+ // console.log('onClick : ', event);
this.$emit('click', event);
},
onDblClick(event, instance, ECharts) {
- console.log('onDblClick : ', event);
+ // console.log('onDblClick : ', event);
this.$emit('dblclick', event);
},
onRightClick(event, instance, ECharts) {
- console.log('onRightClick : ', event);
+ // console.log('onRightClick : ', event);
this.$emit('rclick', event);
},
onLegendSelect(params) {
diff --git a/components/common/Datepicker.vue b/components/common/Datepicker.vue
index a17ec0b..0a71957 100644
--- a/components/common/Datepicker.vue
+++ b/components/common/Datepicker.vue
@@ -30,7 +30,7 @@
![]()
+
-
+
-
+
-
-
+
+
+
+
+
+
-
+
@@ -85,7 +117,7 @@
공통그룹코드 상세
-
건
@@ -580,11 +580,7 @@ export default {
Chart,
UnusedStatPopPage,
EtcStatPopPage,
- BtnSearch,
- AntCard,
- CheckBox,
- RadioStandard,
- PageTitle,
+ PageTitle
},
computed: {
...mapState({
@@ -607,7 +603,6 @@ export default {
// let chartOption = this.getGuageChartOption2(this.chart_01);
let chartOption = getGaugeChartOption({
title: this.chart_01,
- value: 75,
isDarkMode: this.isDarkMode,
});
chartOption["series"][0]["data"][0].value = this.$store.state.pageData[myPrgmId][
@@ -618,7 +613,6 @@ export default {
// let chartOption3 = this.getGuageChartOption2(this.chart_03);
let chartOption3 = getGaugeChartOption({
title: this.chart_03,
- value: 75,
isDarkMode: this.isDarkMode,
});
chartOption3["series"][0]["data"][0].value = this.$store.state.pageData[myPrgmId][
@@ -719,13 +713,9 @@ export default {
// this.search();
await this.gridInit();
await new Promise((resolve) => setTimeout(resolve, 1500));
-
- await this.getTodayEfficiencyStatus();
- await this.getEnrgAndCO2Data();
- await this.getGridData();
-
if (this.$router.currentRoute.fullPath == this.myHome.root) {
this.dtToday = Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm");
+
await this.getEnrgAndCO2Data();
await this.getCompareEqpmTotData();
await this.getTodayEfficiencyStatus();
@@ -757,7 +747,6 @@ export default {
gridHeight = this.$refs.gridParent.offsetHeight - 35;
// console.log("gridHeight : ", gridHeight);
}
-
const myOptions = {
// scrollX: false,
setScroll: true,
@@ -770,12 +759,10 @@ export default {
height: 38,
},
};
-
this.setGridOption({
gridKey: this.gridName,
value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
});
-
let hhMapper = {
"00": "00~01",
"01": "01~02",
@@ -807,7 +794,7 @@ export default {
header: "NO",
name: "rowNum",
width: 70,
- align: "right",
+ align: "center",
// hidden: true,
},
{
@@ -855,98 +842,99 @@ export default {
});
this.loadGrid = true;
- this.isGridLoading = false;
-
// this.getGridData();
},
async getGridData() {
this.loadGrid = false;
// console
- // const res = await this.postApiReturn({
- // apiKey: 'selectIssueGdIdxData',
- // resKey: 'issueGdIdxData',
- // sendParam: {},
- // });
- let fakeData = [
- {
- alrmKind: "WARN",
- alrmMsg: "냉동기 전류부하율이 @V1%로 높음 (평균 @V2% 대비 @V3% 낮음) -@EQPM",
- careStndVal: 50,
- warnStndVal: 60,
- eccId: "ECC000004",
- eqpmGrpNm: "냉동기저온1",
- eqpmGrpId: "EQG000001",
- eqpmKindId: "EKIND0001",
- eqpmId: "CHI-201",
- eqpmNm: "CHI-201",
- fabId: "ECC000003",
- fabNm: "삼천1공장",
- gdIdxId: "GD00001",
- gdIdxNm: "전류부하율 평균 편차",
- rowKey: 0,
- rowNum: 1,
- rowSpanMap: {},
- sortKey: 0,
- sortSeq: 1,
- totDttm: Utility.setFormatDate(new Date(), "YYYY-MM-DD"),
- totTime: "2022-12-20 02:43:24",
- totVal: 70,
- },
- {
- alrmKind: "WARN",
- alrmMsg: "냉동기 냉각수 유량 부하율이 @V1%로 높음 -@EQPM",
- careStndVal: 70,
- warnStndVal: 100,
- eccId: "ECC000004",
- eqpmGrpNm: "냉동기고온1",
- eqpmGrpId: "EQG000001",
- eqpmKindId: "EKIND0001",
- eqpmId: "CHI-302",
- eqpmNm: "CHI-302",
- fabId: "ECC000004",
- fabNm: "삼천1공장",
- gdIdxId: "GD00011",
- gdIdxNm: "냉각수 유량 부하율",
- rowKey: 0,
- rowNum: 2,
- rowSpanMap: {},
- sortKey: 0,
- sortSeq: 1,
- totDttm: Utility.setFormatDate(new Date(), "YYYY-MM-DD"),
- totTime: "2022-12-20 07:23:38",
- totVal: 120,
- },
- ];
-
- this.setGridData({
- gridKey: this.gridName,
- value: fakeData,
+ const res = await this.postApiReturn({
+ apiKey: "selectIssueGdIdxData",
+ resKey: "issueGdIdxData",
+ sendParam: {},
});
+ // let fakeData = [
+ // {
+ // 'alrmKind' : "WARN",
+ // 'alrmMsg' : "냉동기 전류부하율이 @V1%로 높음 (평균 @V2% 대비 @V3% 낮음) -@EQPM",
+ // 'careStndVal' : 50,
+ // 'warnStndVal' : 60,
+ // 'eccId' : "ECC000004",
+ // 'eqpmGrpNm' : "냉동기저온1",
+ // 'eqpmGrpId' : "EQG000001",
+ // 'eqpmKindId' : "EKIND0001",
+ // 'eqpmId' : "CHI-201",
+ // 'eqpmNm' : "CHI-201",
+ // 'fabId' : "ECC000003",
+ // 'fabNm' : "삼천1공장",
+ // 'gdIdxId' : "GD00001",
+ // 'gdIdxNm' : "전류부하율 평균 편차",
+ // 'rowKey' : 0,
+ // 'rowNum' : 1,
+ // 'rowSpanMap' : {},
+ // 'sortKey' : 0,
+ // 'sortSeq' : 1,
+ // 'totDttm' : Utility.setFormatDate(new Date(), 'YYYY-MM-DD'),
+ // 'totTime' : '2022-12-20 02:43:24',
+ // 'totVal' : 70
+ // },
+ // {
+ // 'alrmKind' : "WARN",
+ // 'alrmMsg' : "냉동기 냉각수 유량 부하율이 @V1%로 높음 -@EQPM",
+ // 'careStndVal' : 70,
+ // 'warnStndVal' : 100,
+ // 'eccId' : "ECC000004",
+ // 'eqpmGrpNm' : "냉동기고온1",
+ // 'eqpmGrpId' : "EQG000001",
+ // 'eqpmKindId' : "EKIND0001",
+ // 'eqpmId' : "CHI-302",
+ // 'eqpmNm' : "CHI-302",
+ // 'fabId' : "ECC000004",
+ // 'fabNm' : "삼천1공장",
+ // 'gdIdxId' : "GD00011",
+ // 'gdIdxNm' : "냉각수 유량 부하율",
+ // 'rowKey' : 0,
+ // 'rowNum' : 2,
+ // 'rowSpanMap' : {},
+ // 'sortKey' : 0,
+ // 'sortSeq' : 1,
+ // 'totDttm' : Utility.setFormatDate(new Date(), 'YYYY-MM-DD'),
+ // 'totTime' : '2022-12-20 07:23:38',
+ // 'totVal' : 120
+ // }
+
+ // ]
// this.setGridData({
// gridKey: this.gridName,
- // value: res,
+ // value: fakeData,
// });
+ this.setGridData({
+ gridKey: this.gridName,
+ value: res,
+ });
+
this.loadGrid = true;
},
async getEnrgAndCO2Data() {
this.loadChart_01 = false;
- const res = [];
+ const res = await this.postApiReturn({
+ apiKey: "selectEnrgAndCO2Data",
+ resKey: "enrgAndCO2Data",
+ sendParam: {},
+ });
// //////////////////////////////////////////
// // 시연용 data 세팅
- res[0] = {};
- res[0]["dayVal"] = 18.0;
- res[0]["mnthVal"] = 507.0;
- res[0]["planVal"] = 653.0;
- res[0]["co2DayVal"] = 9.0;
- res[0]["co2MnthVal"] = 238.0;
- res[0]["co2PlanVal"] = 307.0;
- res[0]["co2YearVal"] = 1224.0;
- res[0]["effcRt"] = 77.59;
+ // res[0]['dayVal'] = 18.0;
+ // res[0]['mnthVal'] = 507.0;
+ // res[0]['planVal'] = 653.0;
+ // res[0]['co2DayVal'] = 9.0;
+ // res[0]['co2MnthVal'] = 238.0;
+ // res[0]['co2PlanVal'] = 307.0;
+ // res[0]['co2YearVal'] = 1224.0;
+ // res[0]['effcRt'] = 77.59;
// //////////////////////////////////////////
// 대시보드 표기
-
this.enrgUsageDayVal = this.numberFormatter(
parseFloat(res[0]["dayVal"]).toFixed(0)
);
@@ -964,20 +952,17 @@ export default {
parseFloat(res[0]["co2BefMnthVal"]).toFixed(0)
);
this.CO2YearVal = this.numberFormatter(parseFloat(res[0]["co2YearVal"]).toFixed(0));
-
this.$nextTick(() => {
let chartOption = null;
// chartOption = this.getGuageChartOption2(this.chart_01);
chartOption = getGaugeChartOption({
title: "Energy Usage",
- value: 75,
isDarkMode: this.isDarkMode,
});
console.log("charto:", chartOption);
chartOption["series"][0]["data"][0].value =
res[0]["effcRt"] != null ? res[0]["effcRt"] : 0;
this.$store.state.pageData[myPrgmId][this.chart_01] = chartOption;
- console.log("gauge chart ops:", chartOption);
// if(res[0]['effcRt'] == undefined || res[0]['effcRt'] == null){
// res[0]['effcRt'] = null;
// }
@@ -993,12 +978,11 @@ export default {
},
async getCompareEqpmTotData() {
this.loadChart_02 = false;
- // const res = await this.postApiReturn({
- // apiKey: "selectCompareEqpmTotData",
- // resKey: "compareEqpmTotData",
- // sendParam: {},
- // });
- const res = "abc";
+ const res = await this.postApiReturn({
+ apiKey: "selectCompareEqpmTotData",
+ resKey: "compareEqpmTotData",
+ sendParam: {},
+ });
this.$nextTick(() => {
this.setChart02Data(res);
});
@@ -1007,25 +991,24 @@ export default {
},
async getTodayEfficiencyStatus() {
this.loadChart_03 = false;
- // const res = await this.postApiReturn({
- // apiKey: 'selectTodayEfficiencyStatus',
- // resKey: 'todayEfficiencyStatus',
- // sendParam: {},
- // });
+ const res = await this.postApiReturn({
+ apiKey: "selectTodayEfficiencyStatus",
+ resKey: "todayEfficiencyStatus",
+ sendParam: {},
+ });
// 대시보드 표기
- // this.ngDtlCnt = this.numberFormatter(res[0]['ngDtlCnt']);
- // this.ngDtlSolvCnt = this.numberFormatter(res[0]['ngDtlSolvCnt']);
- // let effcRt = this.numberFormatter(
- // (res[0]['ngDtlSolvCnt'] / res[0]['ngDtlCnt']) * 100,
- // );
- let effcRt = this.numberFormatter(78.21);
+ this.ngDtlCnt = this.numberFormatter(res[0]["ngDtlCnt"]);
+ this.ngDtlSolvCnt = this.numberFormatter(res[0]["ngDtlSolvCnt"]);
+ let effcRt = this.numberFormatter(
+ (res[0]["ngDtlSolvCnt"] / res[0]["ngDtlCnt"]) * 100
+ );
+ // let effcRt = this.numberFormatter(78.21)
this.$nextTick(() => {
let chartOption = null;
// chartOption = this.getGuageChartOption2(this.chart_03);
chartOption = getGaugeChartOption({
title: "Today Efficiency",
- value: 75,
isDarkMode: this.isDarkMode,
});
chartOption["series"][0]["data"][0].value = isNaN(effcRt) ? 0 : effcRt;
@@ -1037,15 +1020,14 @@ export default {
},
async getTodayNgTopTen() {
this.loadChart_04 = false;
- // const res = await this.postApiReturn({
- // apiKey: "selectTodayNgTopTen",
- // resKey: "todayNgTopTen",
- // sendParam: {},
- // });
- const res = "abc";
- // this.setPageData({
- // chart04Data: res,
- // });
+ const res = await this.postApiReturn({
+ apiKey: "selectTodayNgTopTen",
+ resKey: "todayNgTopTen",
+ sendParam: {},
+ });
+ this.setPageData({
+ chart04Data: res,
+ });
this.$nextTick(() => {
this.setChart04Data(res);
});
@@ -1054,12 +1036,11 @@ export default {
},
async getCompareEqpmTGdChart() {
this.loadChart_05 = false;
- // const res = await this.postApiReturn({
- // apiKey: "selectCompareEqpmTGdChart",
- // resKey: "compareEqpmTGdChart",
- // sendParam: {},
- // });
- const res = "aaa";
+ const res = await this.postApiReturn({
+ apiKey: "selectCompareEqpmTGdChart",
+ resKey: "compareEqpmTGdChart",
+ sendParam: {},
+ });
this.$nextTick(() => {
this.setChart05Data(res);
});
@@ -1067,12 +1048,12 @@ export default {
this.isLine2Loading = false;
},
async setChart05Data(data) {
- // if (this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart != undefined) {
- // this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart.series = [];
- // }
- // if (!data.length) {
- // return;
- // }
+ if (this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart != undefined) {
+ this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart.series = [];
+ }
+ if (!data.length) {
+ return;
+ }
let xAxisData = [];
let seriesData = [];
// let legendData = {
@@ -1081,7 +1062,7 @@ export default {
// dayVal: "금일",
// };
- let legendData = ["전전일", "전일", "금일"];
+ // let legendData = ["전전일", "전일", "금일"];
let befBefValDataList = {
name: "전전일",
@@ -1109,37 +1090,36 @@ export default {
};
// for (var i = 0; i < data.length; i++) {
//////없애야함//////
- let total = 0;
+ // let total = 0;
let hour = Utility.setFormatDate(
new Date().setTime(new Date().getTime() - 1 * 60 * 60 * 1000),
"HH"
);
//////없애야함//////
for (var i = 0; i < 24; i++) {
- // if (data[i].tm != undefined) {
- // xAxisData.push(parseInt(data[i].tm));
- // } else {
- // xAxisData.push(i);
- // }
- xAxisData.push(i);
+ if (data[i].tm != undefined) {
+ xAxisData.push(parseInt(data[i].tm));
+ } else {
+ xAxisData.push(i);
+ }
// //////없애야함//////
- let num = parseInt(Math.random() * (13 - 7) + 7);
- let num2 = parseInt(Math.random() * (11 - 6) + 6);
- let num3 = parseInt(Math.random() * (10 - 5) + 5);
- let tempTotal = num + num2 + num3;
- total += tempTotal;
- let befBefVal = num;
- let befVal = num2;
- let dayVal = num3;
+ // let num = parseInt(Math.random() * (13 - 7) + 7);
+ // let num2 = parseInt(Math.random() * (11 - 6) + 6);
+ // let num3 = parseInt(Math.random() * (10 - 5) + 5);
+ // let tempTotal = num + num2 + num3;
+ // total += tempTotal;
+ // let befBefVal = num;
+ // let befVal = num2;
+ // let dayVal = num3;
// //////////////////
- // let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
- // let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
+ let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
+ let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
befBefValDataList["data"].push(befBefVal);
befValDataList["data"].push(befVal);
if (i <= parseInt(hour)) {
- // let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
+ let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
dayValDataList["data"].push(dayVal);
}
}
@@ -1151,7 +1131,7 @@ export default {
var chartOption = getLineChartOption({
xAxisData: xAxisData,
- legendData: legendData,
+ // legendData: legendData,
seriesData: seriesData,
isDarkMode: this.isDarkMode,
});
@@ -1188,20 +1168,18 @@ export default {
console.log("chart 5 data:", seriesData);
await this.$nextTick(() => {});
- // this.setChartOption({
- // chartKey: "compareEqpmTGdChart",
- // value: chartOption,
- // });
-
- this.$store.state.pageData[myPrgmId]["compareEqpmTGdChart"] = chartOption;
+ this.setChartOption({
+ chartKey: "compareEqpmTGdChart",
+ value: chartOption,
+ });
},
async setChart04Data(data) {
- // if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
- // this.$store.state.pageData[this.myPrgmId].todayNgTopTen.series = [];
- // }
- // if (!data.length) {
- // return;
- // }
+ if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
+ this.$store.state.pageData[this.myPrgmId].todayNgTopTen.series = [];
+ }
+ if (!data.length) {
+ return;
+ }
let seriesData = [
{
type: "pie",
@@ -1219,51 +1197,52 @@ export default {
},
];
let pidChartdata = [];
- // for (var i = 0; i < data.length; i++) {
- // if (data[i].eqpmId != undefined) {
- // pidChartdata.push({
- // value: data[i]["ngDtlCnt"],
- // name: data[i]["eqpmId"],
- // groupId: data[i]["eqpmNm"],
- // });
- // }
- // }
- let eqpmNmList = [
- "CHI-202",
- "CHI-201",
- "UT_LT_CH101",
- "UT_LT_CH102",
- "UT_LT_CH103",
- "UT_LT_CH104",
- "UT_LT_CH105",
- "U-CH-013",
- "U-CH-014",
- "U-CH-015",
- "U-CH-016",
- "U-CH-017",
- "U-CH-018",
- "U-CH-019",
- "U-CH-015B",
- "U-CH-015C",
- "U-CH-015D",
- "U-CH-015E",
- "UT_HT_CT101",
- "UT_HT_CT102",
- "UT_HT_CT103",
- "UT_HT_CP101",
- "VCB_A",
- "U-CH-012",
- "U-CH-015F",
- "U-CH-016A",
- ];
- for (var i = 1; i < 21; i++) {
- pidChartdata.push({
- // value: data[i]['ngDtlCnt'],
- value: i + parseInt(Math.random() * (9 - 5) + 5),
- name: eqpmNmList[i],
- groupId: eqpmNmList[i],
- });
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].eqpmId != undefined) {
+ pidChartdata.push({
+ value: data[i]["ngDtlCnt"],
+ name: data[i]["eqpmId"],
+ groupId: data[i]["eqpmNm"],
+ });
+ }
}
+ // let eqpmNmList = [
+ // 'CHI-202',
+ // 'CHI-201',
+ // 'UT_LT_CH101',
+ // 'UT_LT_CH102',
+ // 'UT_LT_CH103',
+ // 'UT_LT_CH104',
+ // 'UT_LT_CH105',
+ // 'U-CH-013',
+ // 'U-CH-014',
+ // 'U-CH-015',
+ // 'U-CH-016',
+ // 'U-CH-017',
+ // 'U-CH-018',
+ // 'U-CH-019',
+ // 'U-CH-015B',
+ // 'U-CH-015C',
+ // 'U-CH-015D',
+ // 'U-CH-015E',
+ // 'UT_HT_CT101',
+ // 'UT_HT_CT102',
+ // 'UT_HT_CT103',
+ // 'UT_HT_CP101',
+ // 'VCB_A',
+ // 'U-CH-012',
+ // 'U-CH-015F',
+ // 'U-CH-016A',
+ // ]
+ // for(var i=1; i<21; i++){
+
+ // pidChartdata.push({
+ // // value: data[i]['ngDtlCnt'],
+ // value: i+parseInt(Math.random()*(9-5)+5),
+ // name: eqpmNmList[i],
+ // groupId: eqpmNmList[i]
+ // });
+ // }
seriesData[0]["data"] = [...pidChartdata];
var chartOption = {
grid: {
@@ -1293,17 +1272,15 @@ export default {
series: seriesData,
};
await this.$nextTick(() => {});
- // this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
- this.$store.state.pageData[myPrgmId]["todayNgTopTen"] = chartOption;
- this.$store.state.pageData[myPrgmId]["chart04Data"] = chartOption;
+ this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
},
async setChart02Data(data) {
- // if (this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart != undefined) {
- // this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart.series = [];
- // }
- // if (!data.length) {
- // return;
- // }
+ if (this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart != undefined) {
+ this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart.series = [];
+ }
+ if (!data.length) {
+ return;
+ }
let xAxisData = [];
let seriesData = [];
// let legendMapper = {
@@ -1311,7 +1288,6 @@ export default {
// 'befVal' : '전일',
// 'dayVal' : '금일'
// }
- let legendData = ["전전일", "전일", "금일"];
let befBefValDataList = {
name: "전전일",
type: "line",
@@ -1336,82 +1312,38 @@ export default {
lineStyle: { width: 2 },
data: [],
};
- // // for (var i = 0; i < data.length; i++) {
+ // for (var i = 0; i < data.length; i++) {
let hour = Utility.setFormatDate(
new Date().setTime(new Date().getTime() - 1 * 60 * 60 * 1000),
"HH"
);
- // for (var i = 0; i < 24; i++) {
- // if (data[i].tm != undefined) {
- // xAxisData.push(parseInt(data[i].tm));
- // } else {
- // xAxisData.push(i);
- // }
- // //////없애야함//////
for (var i = 0; i < 24; i++) {
- xAxisData.push(i);
-
- let num = parseInt(Math.random() * (13 - 10) + 10)
- .toString()
- .padStart(2, "0");
- let num2 = parseInt(Math.random() * (9 - 1) + 1)
- .toString()
- .padStart(2, "0");
- let num3 = parseInt(Math.random() * (13 - 10) + 10)
- .toString()
- .padStart(2, "0");
- let num4 = parseInt(Math.random() * (9 - 1) + 1)
- .toString()
- .padStart(2, "0");
- let num5 = parseInt(Math.random() * (13 - 10) + 10)
- .toString()
- .padStart(2, "0");
- let num6 = parseInt(Math.random() * (9 - 1) + 1)
- .toString()
- .padStart(2, "0");
- let befBefVal = num + num2;
- let befVal = num3 + num4;
- let dayVal = num5 + num6;
+ if (data[i].tm != undefined) {
+ xAxisData.push(parseInt(data[i].tm));
+ } else {
+ xAxisData.push(i);
+ }
+ //////없애야함//////
+ // let num = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
+ // let num2 = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
+ // let num3 = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
+ // let num4 = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
+ // let num5 = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
+ // let num6 = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
+ // let befBefVal = num+num2;
+ // let befVal = num3+num4;
+ // let dayVal = num5+num6;
+ // //////없애야함//////
+ let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
+ let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
befBefValDataList["data"].push(befBefVal);
befValDataList["data"].push(befVal);
if (i <= parseInt(hour)) {
- // let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
+ let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
dayValDataList["data"].push(dayVal);
}
}
-
- // let num = parseInt(Math.random() * (13 - 10) + 10)
- // .toString()
- // .padStart(2, "0");
- // let num2 = parseInt(Math.random() * (9 - 1) + 1)
- // .toString()
- // .padStart(2, "0");
- // let num3 = parseInt(Math.random() * (13 - 10) + 10)
- // .toString()
- // .padStart(2, "0");
- // let num4 = parseInt(Math.random() * (9 - 1) + 1)
- // .toString()
- // .padStart(2, "0");
- // let num5 = parseInt(Math.random() * (13 - 10) + 10)
- // .toString()
- // .padStart(2, "0");
- // let num6 = parseInt(Math.random() * (9 - 1) + 1)
- // .toString()
- // .padStart(2, "0");
- // let befBefVal = num + num2;
- // let befVal = num3 + num4;
- // let dayVal = num5 + num6;
- // //////없애야함//////
- // let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
- // let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
- // befBefValDataList["data"].push(befBefVal);
- // befValDataList["data"].push(befVal);
- // if (i <= parseInt(hour)) {
- // let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
- // dayValDataList["data"].push(dayVal);
- // }
- // }
seriesData = [befBefValDataList, befValDataList, dayValDataList];
// seriesData = [
@@ -1433,7 +1365,7 @@ export default {
// ];
var chartOption = getLineChartOption({
xAxisData: xAxisData,
- legendData: legendData,
+ // legendData: legendData,
seriesData: seriesData,
isDarkMode: this.isDarkMode,
});
@@ -1468,12 +1400,10 @@ export default {
// series: seriesData,
// };
await this.$nextTick(() => {});
- this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption;
-
- // this.setChartOption({
- // chartKey: "compareEqpmTotChart",
- // value: chartOption,
- // });
+ this.setChartOption({
+ chartKey: "compareEqpmTotChart",
+ value: chartOption,
+ });
},
getGuageChartOption(chartName) {
const gaugeColors = [
@@ -1506,8 +1436,8 @@ export default {
splitNumber: 10,
itemStyle: {
// color: '#FFAB91'
- // color: 'auto',
- color: gaugeColors,
+ color: "auto",
+ // color:gaugeColors
},
progress: {
// show: true,
@@ -1518,8 +1448,8 @@ export default {
// show: false
show: true,
itemStyle: {
- color: "#FFAB91",
- // color: 'auto',
+ // color: '#FFAB91',
+ color: "auto",
},
},
axisLine: {
@@ -1565,140 +1495,12 @@ export default {
fontSize: 15,
// fontSize: 20,
fontWeight: "bolder",
- formatter: "30%",
+ formatter: "{value} %",
color: "auto",
},
data: [
{
- name: "new",
- value: 344,
- },
- ],
- },
- ],
- };
-
- return guageChartOption;
- },
- getGuageChartOption2(chartName) {
- const gaugeColors = [
- [0, "#ed1c24"],
- [0.6, "#ed1c24"],
- [0.8, "#f7931e"],
- [1.0, "#009245"],
- ];
- const gaugeColors2 = [
- [0, "#009245"],
- [0.6, "#009245"],
- [0.8, "#f7931e"],
- [1.0, "#ed1c24"],
- ];
- var guageChartOption = {
- grid: {
- // top: '-10%',
- bottom: 0,
- },
- title: {},
- graphic: [
- {
- type: "circle",
- left: "center",
- top: "center",
- shape: {
- r: 97, // radius of the background circle
- },
- style: {
- fill: this.isDarkMode ? "#141415" : "#F5F5F5", // Light grey color
- opacity: 0.3, // Semi-transparent
- },
- z: 0, // make sure it's behind the gauge
- },
- ],
-
- series: [
- {
- type: "gauge",
- radius: "90%",
- startAngle: 225,
- endAngle: -45,
- min: 0,
- max: 160,
- // progress: {
- // show: true,
- // width: 15,
- // },
- axisLine: {
- lineStyle: {
- width: 12,
- color: [
- [0.375, "#3CB371"], // Green (0–60)
- [0.5, "#FFD700"], // Yellow (60–80)
- [0.625, "#FFA500"], // Orange (80–100)
- [1, "#FF4500"], // Red (100–160)
- ],
- },
- },
- axisTick: {
- distance: -5,
- length: 5,
- lineStyle: {
- color: "#000000",
- width: 1,
- },
- },
- splitLine: {
- distance: -12,
- length: 8,
- lineStyle: {
- color: "#000000",
- width: 2,
- },
- },
- axisLabel: {
- color: this.isDarkMode ? "#fff" : "#333333",
- distance: 23,
- fontSize: 9,
- },
- pointer: {
- show: true,
- length: "70%",
- width: 6,
- itemStyle: {
- color: "#FA8C16", // Set your desired pointer color here
- },
- },
- title: {
- show: false,
- offsetCenter: [0, "40%"],
- fontSize: 18,
- },
- detail: {
- valueAnimation: true,
- fontWeight: 500, // or "normal", "lighter", "bolder", or a number like 600
- fontFamily: "Oxanium, sans-serif", // or any custom font
- fontSize: 30,
- lineHeight: 25,
- offsetCenter: [0, "60%"],
- color: this.isDarkMode ? "#fff" : "#333333",
- formatter: function (value) {
- return `{valueStyle|${value}}\n{percentStyle|%}`;
- },
- rich: {
- // valueStyle: {
- // fontSize: 25,
- // fontWeight: "bold",
- // },
- percentStyle: {
- fontSize: 10,
- color: this.isDarkMode ? "#fff" : "#333333",
- // fontWeight: "normal",
- },
- },
- },
- data: [
- {
- value: 16,
- name: "에너지사용효율", // "Energy Usage Efficiency"
+ value: NaN,
},
],
},
@@ -1747,85 +1549,85 @@ export default {
// [1.0, '#ff6689'],
// ];
- // var chartOption = {
- // series: [
- // {
- // type: 'gauge',
- // startAngle: 180,
- // endAngle: 0,
- // min: 0,
- // max: 100,
- // radius: '100%',
- // splitNumber: 8,
- // axisLine: {
- // lineStyle: {
- // width: 30,
- // color: this.isDarkMode ? darkGaugeColors : lightGaugeColors,
- // },
- // },
- // splitLine: {
- // show: false,
- // },
- // axisTick: {
- // show: false,
- // },
- // axisLabel: {
- // show: false,
- // },
- // pointer: {
- // length: '80%',
- // width: 5,
- // itemStyle: {
- // color: this.isDarkMode ? '#fff' : '#333333',
- // },
- // },
- // anchor: {
- // show: true,
- // showAbove: true,
- // size: 10,
- // itemStyle: {
- // borderWidth: 10,
- // borderColor: this.isDarkMode ? '#fff' : '#333333',
- // },
- // },
- // title: {
- // offsetCenter: ['90%', '30%'],
- // fontSize: 20,
- // color: this.isDarkMode
- // ? arrDarkColors[data.stat]
- // : arrLightColors[data.stat],
- // fontWeight: 'bold',
- // },
- // detail: {
- // fontSize: 20,
- // offsetCenter: ['-75%', '30%'],
- // valueAnimation: true,
- // formatter: function(value) {
- // return '{value|' + value.toFixed(1) + '}{unit|%}';
- // },
- // rich: {
- // value: {
- // fontSize: 20,
- // color: this.isDarkMode ? '#fff' : '#111111',
- // fontWeight: 'bolder',
- // },
- // unit: {
- // fontSize: 14,
- // color: this.isDarkMode ? '#fff' : '#111111',
- // fontWeight: 'bolder',
- // padding: [0, 0, -5, 0],
+ // var chartOption = {
+ // series: [
+ // {
+ // type: 'gauge',
+ // startAngle: 180,
+ // endAngle: 0,
+ // min: 0,
+ // max: 100,
+ // radius: '100%',
+ // splitNumber: 8,
+ // axisLine: {
+ // lineStyle: {
+ // width: 30,
+ // color: this.isDarkMode ? darkGaugeColors : lightGaugeColors,
// },
// },
- // },
- // data: [
- // {
- // name: data.stat,
- // value: data.effcRt,
+ // splitLine: {
+ // show: false,
// },
- // ],
- // },
- // ],
- // };
+ // axisTick: {
+ // show: false,
+ // },
+ // axisLabel: {
+ // show: false,
+ // },
+ // pointer: {
+ // length: '80%',
+ // width: 5,
+ // itemStyle: {
+ // color: this.isDarkMode ? '#fff' : '#333333',
+ // },
+ // },
+ // anchor: {
+ // show: true,
+ // showAbove: true,
+ // size: 10,
+ // itemStyle: {
+ // borderWidth: 10,
+ // borderColor: this.isDarkMode ? '#fff' : '#333333',
+ // },
+ // },
+ // title: {
+ // offsetCenter: ['90%', '30%'],
+ // fontSize: 20,
+ // color: this.isDarkMode
+ // ? arrDarkColors[data.stat]
+ // : arrLightColors[data.stat],
+ // fontWeight: 'bold',
+ // },
+ // detail: {
+ // fontSize: 20,
+ // offsetCenter: ['-75%', '30%'],
+ // valueAnimation: true,
+ // formatter: function(value) {
+ // return '{value|' + value.toFixed(1) + '}{unit|%}';
+ // },
+ // rich: {
+ // value: {
+ // fontSize: 20,
+ // color: this.isDarkMode ? '#fff' : '#111111',
+ // fontWeight: 'bolder',
+ // },
+ // unit: {
+ // fontSize: 14,
+ // color: this.isDarkMode ? '#fff' : '#111111',
+ // fontWeight: 'bolder',
+ // padding: [0, 0, -5, 0],
+ // },
+ // },
+ // },
+ // data: [
+ // {
+ // name: data.stat,
+ // value: data.effcRt,
+ // },
+ // ],
+ // },
+ // ],
+ // };
// this.setChartOption({ chartKey: 'enrgUsageGauge', value: chartOption });
@@ -1909,32 +1711,18 @@ export default {
});
},
topTenChartClickEvent(event) {
- // let chartData = this.pageData.chart04Data;
- // console.log("chart data first", this.pageData);
-
- let chartData = this.$store.state.pageData[myPrgmId][this.chart_04]["series"][0][
- "data"
- ];
- console.log("select equipment", event["data"]["groupId"]);
+ let chartData = this.pageData.chart04Data;
+ // let chartData = this.$store.state.pageData[myPrgmId][this.chart_04]['series'][0]['data']
let selectedChartData = chartData.filter((item) => {
return item.eqpmId == event["data"]["groupId"];
});
- console.log("chart data", selectedChartData);
- // var data = {
- // cmCycle: "CYC_DAY",
- // fromDt: Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),
- // fabId: selectedChartData[0].fabId,
- // eqpmKindId: selectedChartData[0].eqpmKindId,
- // eqpmGrpId: selectedChartData[0].eqpmGrpId,
- // eqpmId: selectedChartData[0].eqpmId,
- // };
- var fake_data = {
+ var data = {
cmCycle: "CYC_DAY",
fromDt: Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),
- fabId: 4555,
- eqpmKindId: 99988,
- eqpmGrpId: 88888,
- eqpmId: 99900,
+ fabId: selectedChartData[0].fabId,
+ eqpmKindId: selectedChartData[0].eqpmKindId,
+ eqpmGrpId: selectedChartData[0].eqpmGrpId,
+ eqpmId: selectedChartData[0].eqpmId,
};
var key = "tick_" + Math.random();
this.$router.push({
@@ -1944,8 +1732,7 @@ export default {
// tick:key
},
params: {
- // ...data,
- ...fake_data,
+ ...data,
key: key,
},
});
diff --git a/pages/ems/base/EnrgResourceCenterMngPage.vue b/pages/ems/base/EnrgResourceCenterMngPage.vue
index 85afc57..bdead3b 100644
--- a/pages/ems/base/EnrgResourceCenterMngPage.vue
+++ b/pages/ems/base/EnrgResourceCenterMngPage.vue
@@ -12,6 +12,7 @@
:textCols="12"
:labelCols="12"
:parentPrgmId="myPrgmId"
+ :customClass="'select-large'"
/>
@@ -22,6 +23,7 @@
dataKey="searchErcKind"
:sendParam="{ commGrpCd: 'EM_ERCKIND', useFg: '1' }"
:addAll="true"
+ :customClass="'select-large'"
/>
@@ -34,13 +36,9 @@
:addAll="true"
:textCols="12"
:labelCols="12"
+ :customClass="'select-large'"
/>
-
-
-
-
+
+
@@ -69,8 +71,14 @@
:textCols="12"
:labelCols="12"
:searchOption="true"
+ :customClass="'input-large'"
/>
+
+
+
+
@@ -323,6 +331,9 @@ export default {
columnOptions: {
resizable: true,
},
+ header: {
+ height: 38,
+ },
};
this.setGridOption({
gridKey: this.gridName,
@@ -332,12 +343,12 @@ export default {
const _this = this;
const myColumns = [
{ header: '회사 ID', name: 'comId', hidden: true },
- { header: '에너지원ID', name: 'ercId', width: 120, align: 'center' },
+ { header: '에너지원ID', name: 'ercId', width: 120, align: 'left' },
{ header: '에너지원명', name: 'ercNm', align: 'left' },
{
header: '에너지원 유형',
name: 'ercKind',
- align: 'center',
+ align: 'left',
formatter({ value }) {
let retVal = '';
const newValue = _this.pageData.ercKindList.filter(
@@ -450,7 +461,7 @@ export default {
header: '사용 여부',
name: 'useFg',
width: 95,
- align: 'center',
+ align: 'left',
formatter({ value }) {
value = value === true ? '1' : '0';
const newValue = _this.pageData.useFgList.filter(
@@ -479,74 +490,24 @@ export default {
this.loadGrid = true;
},
async getRowGridData() {
- let res = [
- {
- "comId": "COM001",
- "ercId": "ERC001",
- "ercNm": "LNG 가스",
- "ercKind": "GAS",
- "readObjId": "READ001",
- "readPlcId": "PLC001",
- "chrgKind": "FIXED",
- "unitPrce": 120.5,
- "prceFg": "1",
- "peakPow": 500,
- "elecContId": "EC001",
- "elecContNm": "계약A",
- "blocId": "BLOC001",
- "useFg": true
- },
- {
- "comId": "COM002",
- "ercId": "ERC002",
- "ercNm": "태양광",
- "ercKind": "ELEC",
- "readObjId": "READ002",
- "readPlcId": "PLC002",
- "chrgKind": "VARIABLE",
- "unitPrce": 95.0,
- "prceFg": "0",
- "peakPow": 300,
- "elecContId": "EC002",
- "elecContNm": "계약B",
- "blocId": "BLOC002",
- "useFg": false
- },
- {
- "comId": "COM003",
- "ercId": "ERC003",
- "ercNm": "지열",
- "ercKind": "HEAT",
- "readObjId": "READ003",
- "readPlcId": "PLC003",
- "chrgKind": "FIXED",
- "unitPrce": 110.0,
- "prceFg": "1",
- "peakPow": 450,
- "elecContId": "EC003",
- "elecContNm": "계약C",
- "blocId": "BLOC003",
- "useFg": true
- }
-]
-;
+ let res = [];
- // if (this.pageData.blocMstrList.length > 0) {
- // res = await this.postApiReturn({
- // apiKey: 'selectErcInfo',
- // resKey: 'ercInfoData',
- // sendParam: {
- // blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
- // ercKind: this.pageData.searchErcKind,
- // readObjId: this.pageData.searchReadObj,
- // chrgKind: this.pageData.searchChrgKind,
- // useFg: this.pageData.useFg,
- // ercNmLike: this.pageData.ercNm,
- // },
- // });
- // } else {
- // this.setPageData({ isFind: false });
- // }
+ if (this.pageData.blocMstrList.length > 0) {
+ res = await this.postApiReturn({
+ apiKey: 'selectErcInfo',
+ resKey: 'ercInfoData',
+ sendParam: {
+ blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
+ ercKind: this.pageData.searchErcKind,
+ readObjId: this.pageData.searchReadObj,
+ chrgKind: this.pageData.searchChrgKind,
+ useFg: this.pageData.useFg,
+ ercNmLike: this.pageData.ercNm,
+ },
+ });
+ } else {
+ this.setPageData({ isFind: false });
+ }
const newRes = res.map(item => {
const newObj = {
...item,
@@ -798,133 +759,8 @@ const defaultData = {
/* data 세팅 */
// 로컬 gridName 값과 동일한 이름으로 세팅
rowGrid: {
- data: [
- {
- "comId": "COM001",
- "ercId": "ERC001",
- "ercNm": "LNG 가스",
- "ercKind": "GAS",
- "readObjId": "READ001",
- "readPlcId": "PLC001",
- "chrgKind": "FIXED",
- "unitPrce": 120.5,
- "prceFg": "1",
- "peakPow": 500,
- "elecContId": "EC001",
- "elecContNm": "계약A",
- "blocId": "BLOC001",
- "useFg": true
- },
- {
- "comId": "COM002",
- "ercId": "ERC002",
- "ercNm": "태양광",
- "ercKind": "ELEC",
- "readObjId": "READ002",
- "readPlcId": "PLC002",
- "chrgKind": "VARIABLE",
- "unitPrce": 95.0,
- "prceFg": "0",
- "peakPow": 300,
- "elecContId": "EC002",
- "elecContNm": "계약B",
- "blocId": "BLOC002",
- "useFg": false
- },
- {
- "comId": "COM003",
- "ercId": "ERC003",
- "ercNm": "지열",
- "ercKind": "HEAT",
- "readObjId": "READ003",
- "readPlcId": "PLC003",
- "chrgKind": "FIXED",
- "unitPrce": 110.0,
- "prceFg": "1",
- "peakPow": 450,
- "elecContId": "EC003",
- "elecContNm": "계약C",
- "blocId": "BLOC003",
- "useFg": true
- }
-],
- column: [
- { header: '회사 ID', name: 'comId', hidden: true },
- { header: '에너지원ID', name: 'ercId', width: 120, align: 'center' },
- { header: '에너지원명', name: 'ercNm', align: 'left' },
- {
- header: '에너지원 유형',
- name: 'ercKind',
- align: 'center',
- },
- {
- header: '검침대상',
- name: 'readObjId',
- align: 'left',
- },
- {
- header: '검침 개소 ID',
- name: 'readPlcId',
- width: 80,
- align: 'center',
- hidden: true,
- },
- {
- header: '고지 유형',
- name: 'chrgKind',
- width: 80,
- align: 'center',
- hidden: true,
- },
- {
- header: '기본단가',
- name: 'unitPrce',
- width: 100,
- align: 'right',
- hidden: true,
- },
- {
- header: '단가 사용여부',
- name: 'prceFg',
- width: 100,
- align: 'center',
- hidden: true,
- },
- {
- header: '피크 전력',
- name: 'peakPow',
- width: 100,
- align: 'right',
- hidden: true,
- },
- {
- header: '전력 계약',
- name: 'elecContId',
- width: 100,
- align: 'center',
- hidden: true,
- },
- {
- header: '전력 계약',
- name: 'elecContNm',
- width: 100,
- align: 'center',
- hidden: true,
- },
- {
- header: '사업장',
- name: 'blocId',
- width: 100,
- align: 'center',
- hidden: true,
- },
- {
- header: '사용 여부',
- name: 'useFg',
- width: 95,
- align: 'center',
- }
- ], // myColumns,
+ data: [],
+ column: [], // myColumns,
option: {}, // myOptions
defaultRow: {
comId: '',
@@ -1160,3 +996,6 @@ const myDetail = [
},
];
+
diff --git a/pages/ems/effc/EnrgEffcTotSummPage.vue b/pages/ems/effc/EnrgEffcTotSummPage.vue
index ffd389c..a6e53e3 100644
--- a/pages/ems/effc/EnrgEffcTotSummPage.vue
+++ b/pages/ems/effc/EnrgEffcTotSummPage.vue
@@ -195,68 +195,51 @@ export default {
});
},
async getEqpmKind() {
- // let res = await this.postApiReturn({
- // apiKey: "selectEqpmKindCodeList",
- // resKey: "eqpmKindCodeLists",
- // sendParam: {},
- // });
+ let res = await this.postApiReturn({
+ apiKey: 'selectEqpmKindCodeList',
+ resKey: 'eqpmKindCodeLists',
+ sendParam: {},
+ });
- let res = [
- {
- eqpmKindId: "냉동기저온",
- eqpmKindNm: "냉동기저온",
- },
- {
- eqpmKindId: "냉동기고온",
- eqpmKindNm: "냉동기고온",
- },
- ];
-
- if (res.length > 0) {
- this.selectValueList01 = await res.map((item) => {
- return {
- // text: item.eqpmKindNm,
- label: item.eqpmKindNm,
- value: item.eqpmKindId,
- };
- });
- this.selectValue01 = this.selectValueList01[0].value;
- } else {
- this.selectValueList01 = [];
- this.selectValue01 = null;
- }
- this.setPageData({
- eqpmKindList: this.selectValueList01,
- eqpmKindId: this.selectValue01,
- });
- },
+ if (res.length > 0) {
+ this.selectValueList01 = await res.map(item => {
+ return {
+ text: item.eqpmKindNm,
+ value: item.eqpmKindId,
+ };
+ });
+ this.selectValue01 = this.selectValueList01[0].value;
+ } else {
+ this.selectValueList01 = [];
+ this.selectValue01 = null;
+ }
+ this.setPageData({
+ eqpmKindList: this.selectValueList01,
+ eqpmKindId: this.selectValue01,
+ });
+ },
gridInit() {},
getRowGridData() {},
async getData() {
- // let res = await this.postApiReturn({
- // apiKey: "selectEnrgEffcTotSumm",
- // resKey: "totSummData",
- // sendParam: {
- // fromDt: this.pageData.fromDt,
- // eqpmKindId: this.selectValue01,
- // },
- // });
- let res = ["aaa", "bbb"];
- await this.getChartData(res);
+ let res = await this.postApiReturn({
+ apiKey: 'selectEnrgEffcTotSumm',
+ resKey: 'totSummData',
+ sendParam: {
+ fromDt: this.pageData.fromDt,
+ eqpmKindId: this.selectValue01,
+ },
+ });
- // this.selectData = res.filter((item, i) => {
- // return (
- // res.findIndex((item2, j) => {
- // return item.eqpmGrpId === item2.eqpmGrpId;
- // }) === i
- // );
- // });
+ await this.getChartData(res);
- this.selectData = [
- { eqpmGrpId: "G001", eqpmGrpNm: "Group A", otherProp: "..." },
- { eqpmGrpId: "G002", eqpmGrpNm: "Group B", otherProp: "..." },
- ];
- },
+ this.selectData = res.filter((item, i) => {
+ return (
+ res.findIndex((item2, j) => {
+ return item.eqpmGrpId === item2.eqpmGrpId;
+ }) === i
+ );
+ });
+ },
barClick(event, chartName) {
var data = {};
if (chartName == "card") {
@@ -291,52 +274,40 @@ export default {
});
},
async getChartData(data) {
- var chartDataObj = {};
- this.objList = {};
- // let res = await this.postApiReturn({
- // apiKey : 'selectEnrgEffcTotSumm',
- // resKey : 'totSummData',
- // sendParam:{
- // fromDt : this.pageData.fromDt,
- // eqpmKindId : this.pageData.eqpmKindId,
- // }
- // });
+ var chartDataObj = {};
+ this.objList = {};
+ // let res = await this.postApiReturn({
+ // apiKey : 'selectEnrgEffcTotSumm',
+ // resKey : 'totSummData',
+ // sendParam:{
+ // fromDt : this.pageData.fromDt,
+ // eqpmKindId : this.pageData.eqpmKindId,
+ // }
+ // });
- // data.map((item) => {
- // if (chartDataObj[item.eqpmGrpId] != null) {
- // chartDataObj[item.eqpmGrpId].push(item);
- // } else {
- // chartDataObj[item.eqpmGrpId] = [item];
- // }
- // });
+ data.map(item => {
+ if (chartDataObj[item.eqpmGrpId] != null) {
+ chartDataObj[item.eqpmGrpId].push(item);
+ } else {
+ chartDataObj[item.eqpmGrpId] = [item];
+ }
+ });
- chartDataObj = {
- group1: [
- { fabNm: "Fab A", okCnt: 120, ngCnt: 30 },
- { fabNm: "Fab B", okCnt: 150, ngCnt: 20 },
- { fabNm: "Fab C", okCnt: 100, ngCnt: 50 },
- ],
- group2: [
- { fabNm: "Fab D", okCnt: 180, ngCnt: 10 },
- { fabNm: "Fab E", okCnt: 160, ngCnt: 25 },
- { fabNm: "Fab F", okCnt: 140, ngCnt: 35 },
- ],
- };
+ // chartDataObj.keys()[0]
+ var i = 0;
+ for (var x of Object.keys(chartDataObj)) {
+ this.loadChartList.push(false);
+ i++;
+ this.objList['chart_0' + i] = chartDataObj[x];
+ this.chartNameList.push('chart_0' + i);
+ this.setPageData({
+ [this.chartNameList[i - 1]]: Utility.defaultChartOption(true),
+ });
- // chartDataObj.keys()[0]
- var i = 0;
- for (var x of Object.keys(chartDataObj)) {
- this.loadChartList.push(false);
- i++;
- this.objList["chart_0" + i] = chartDataObj[x];
- this.chartNameList.push("chart_0" + i);
- this.setPageData({
- [this.chartNameList[i - 1]]: Utility.defaultChartOption(true),
- });
- this.setChartData(chartDataObj[x], i);
- }
- // this.setChartData(chartDataObj[Object.keys(chartDataObj)[0]]);
- },
+ this.setChartData(chartDataObj[x], i);
+ }
+ // this.setChartData(chartDataObj[Object.keys(chartDataObj)[0]]);
+ },
async setChartData(data, number) {
this.loadChartList[number - 1] = false;
let xAxisData = [];
diff --git a/pages/ems/effc/TagTrndPage.vue b/pages/ems/effc/TagTrndPage.vue
index 7f8a944..14bd014 100644
--- a/pages/ems/effc/TagTrndPage.vue
+++ b/pages/ems/effc/TagTrndPage.vue
@@ -1,37 +1,37 @@
-
+
+
+
+
+
+
-
+
0) {
@@ -278,7 +315,7 @@ export default {
{
header: '사용여부',
name: 'useFg',
- align: 'center',
+ align: 'left',
formatter({ value }) {
const newValue = _this.pageData.useFgList.filter(
item => item.commCd == value,
@@ -554,7 +591,10 @@ const myDetail = [
valueNm: 'commGrpCd',
disabled: true,
cols: 6,
- class: 'py-2',
+ labelCols: 12,
+ textCols: 12,
+ iconShow: true,
+ class: 'py-2 pr-2',
required: true,
},
{
@@ -563,7 +603,10 @@ const myDetail = [
valueNm: 'commGrpNm',
disabled: false,
cols: 6,
- class: 'py-2',
+ labelCols: 12,
+ textCols: 12,
+ iconShow: true,
+ class: 'py-2 pl-2',
required: true,
},
{
@@ -572,7 +615,10 @@ const myDetail = [
valueNm: 'sysDivCd',
disabled: false,
cols: 6,
- class: 'py-2',
+ labelCols: 12,
+ textCols: 12,
+ iconShow: true,
+ class: 'py-2 pr-2 mt-3',
list: 'sysDivCdList',
itemText: 'commCdNm',
itemValue: 'commCd',
@@ -584,7 +630,10 @@ const myDetail = [
valueNm: 'useFg',
disabled: false,
cols: 6,
- class: 'py-2',
+ labelCols: 12,
+ textCols: 12,
+ iconShow: true,
+ class: 'py-2 pl-2 mt-10',
value: { '1': true, '0': false },
required: true,
},
@@ -594,7 +643,10 @@ const myDetail = [
valueNm: 'rmrk',
disabled: false,
cols: 6,
- class: 'py-2',
+ labelCols: 12,
+ textCols: 12,
+ iconShow: true,
+ class: 'py-2 pr-2 mt-3',
},
];
diff --git a/pages/ems/base/DashboardPage.vue b/pages/ems/base/DashboardPage.vue
index 9af9997..980ee05 100644
--- a/pages/ems/base/DashboardPage.vue
+++ b/pages/ems/base/DashboardPage.vue
@@ -325,12 +325,12 @@
@@ -344,19 +344,19 @@
-
건
200
+{{ ngDtlCnt }}
100
+{{ ngDtlSolvCnt }}
+
-
-
-
-
-
+
+
+
+
+
+ :selectFromDtUntilTodayFg="true"
+ :selectToDtUntilTodayFg="true"
+ :selectBoxTimeItemList="selectBoxTimeItemList"
+ />
+
-
+ />
+
@@ -64,21 +64,21 @@
@click="search"
>조회
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
{{
item
}}
-
-
+
-
-
-
-
-
-
-
+ class="w100 h100"
+ :is="'Chart'"
+ :parentPrgmId="myPrgmId"
+ :chartName="chartNameList[0]"
+ :ref="chartNameList[0]"
+ />
+
-
+
+
+
+
TAG 리스트
-
-
+
+
@@ -87,56 +87,55 @@
>
TAG 삭제
-
-
+ >
+
-
-
-
-
+
+
+
+
-
+
+
-
-
-
+
+
+
+
{{
"ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV"
}}
-
+
-
- 
- 
-