- Update screen 29 - 14 - Remove mock data dashboard

assets/scss/common/button.scss

@@ -93,6 +93,7 @@
     }
 
     .search-button {
+      height: 40px;
       color: map-deep-get($config, #{$theme}, "search-btn-color");
     }
 

assets/scss/common/grid.scss

@@ -98,6 +98,17 @@
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
+    .grid-title {
+      font-weight: 600;
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0;
+      color: map-deep-get($config,
+        #{$theme},
+        "tui-grid-title-color"
+      );
+    }
+    
     .tui-grid {
       &-table {
         border: 1px solid;

assets/scss/var.scss

@@ -102,6 +102,7 @@ $config: (
     v-calendar-day-color: #fff,
     v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
     v-calendar-is-today-background-color: #2d4571,
+    tui-grid-title-color: #FFFFFFD9,
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
@@ -238,6 +239,7 @@ $config: (
     v-calendar-day-color: #111,
     v-calendar-day-in-not-month-color: #f8f8f8,
     v-calendar-is-today-background-color: #e3eaf3,
+    tui-grid-title-color: #000000E0,
     tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
     tui-grid-header-color: rgba(0, 0, 0, 0.88),
     tui-grid-border-horziontal-color: #e0e0e0,

components/common/chartoptions/GaugeChart.js

@@ -1,5 +1,5 @@
 // Gauge chart options
-export default function getGaugeChartOption({ title, value, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) {
+export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) {
     const colorRanges = isDarkMode
         ? [
             [0.375, '#49AA19'], // Dark Green

components/common/chartoptions/LineChart.js

@@ -2,7 +2,7 @@
 export default function getLineChartOption({
     xAxisData = [],
     seriesData = [],
-    legendData = [],
+    // legendData = [],
     isDarkMode = false,
 }) {
 
@@ -31,7 +31,7 @@ export default function getLineChartOption({
         },
 
         legend: {
-            data: legendData,
+            // data: legendData,
             icon: 'circle',
             top: '0%',
             right: '5%',

components/pages/comm/CommCdTab.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="pb-5 h100">
 		<div class="d-flex align-center justify-space-between">
-			<span class="text-h6">공통그룹코드</span>
+			<span class="grid-title">공통그룹코드</span>
 			<div>
 				<Buttons
 					:parentPrgmId="parentPrgmId"
@@ -126,7 +126,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
 							item => item.commCd == value,

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) {

pages/comm/base/CommCdMngPage.vue

@@ -1,33 +1,65 @@
 <template>
 	<div class="l-layout">
+	    <PageTitle text="공통코드" />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="center" no-gutters>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
 								:label="'시스템구분'"
 								dataKey="sysDivCd"
+								:labelCols="12"
+                 				:textCols="12"
 								:sendParam="{ commGrpCd: 'CO_SYSDIV', useFg: '1' }"
 								:addAll="true"
+								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
 								:label="'사용여부'"
+								:labelCols="12"
+                 				:textCols="12"
 								:dataKey="'useFg'"
+								customClass="select-large"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 							/>
 						</v-col>
-						<v-col :cols="4" class="text-right">
+						<v-col :cols="3">
-							<BtnSearch @click="search" />
+							<InputText
+								:parentPrgmId="myPrgmId"
+								label="그룹코드"
+								valueNm="commGrpCd"
+								:searchOption="true"
+								:labelCols="12"
+								:textCols="12"
+								customClass="input-large"
+
+							/>
+						</v-col>
+						<v-col :cols="3">
+							<InputText
+								:parentPrgmId="myPrgmId"
+								label="그룹코드명"
+								valueNm="commGrpCdNm"
+								:searchOption="true"
+								:labelCols="12"
+								:textCols="12"
+								customClass="input-large"
+
+							/>
+						</v-col>
+						
+						<v-col :cols="12" class="text-right">
+							<BtnSearch style="margin-top:20px" @click="search" />
 						</v-col>
 					</v-row>
-					<v-row align="center" no-gutters>
+					<!-- <v-row align="center" no-gutters>
 						<v-col :cols="4">
 							<InputText
 								:parentPrgmId="myPrgmId"
@@ -48,7 +80,7 @@
 								:textCols="8"
 							/>
 						</v-col>
-					</v-row>
+					</v-row> -->
 				</v-card>
 			</v-col>
 		</v-row>
@@ -85,7 +117,7 @@
 				<v-card class="pb-5">
 					<v-card-title>공통그룹코드 상세</v-card-title>
 					<div class="px-5" style="height:calc(100% - 70px)">
-						<v-tabs v-model="tab" :hide-slider="true">
+						<v-tabs v-model="tab" >
 							<v-tab
 								v-for="item in items"
 								:key="item.id"
@@ -132,6 +164,7 @@ import Form from '~/components/common/form/Form';
 import CommCdTab from '@/components/pages/comm/CommCdTab';
 import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
+import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 let myPrgmId;
@@ -158,6 +191,7 @@ export default {
 		Form,
 		CommCdTab,
 		Grid,
+		PageTitle
 	},
 	data() {
 		return {
@@ -229,6 +263,9 @@ export default {
 
 			const myOptions = {
 				scrollX: false,
+				header: {
+					height: 38,
+				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -241,7 +278,7 @@ export default {
 				{
 					header: '시스템구분',
 					name: 'sysDivCd',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let commCdNm = '';
 						if (sysCdList.length > 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',
 	},
 ];
 </script>

pages/ems/base/DashboardPage.vue

@@ -344,7 +344,7 @@
                 <v-row>
                   <v-col cols="auto" style="text-align: left">
                     <!-- <p class="textInfo">{{ ngDtlCnt }}</p> -->
-                    <p class="card-text-info">200</p>
+                    <p class="card-text-info">{{ ngDtlCnt }}</p>
                   </v-col>
                   <v-col :cols="3" style="text-align: left"> 건 </v-col>
                 </v-row>
@@ -369,7 +369,7 @@
                 <v-row>
                   <v-col cols="auto" style="text-align: left">
                     <!-- <p class="textInfo">{{ ngDtlSolvCnt }}</p> -->
-                    <p class="card-text-info">100</p>
+                    <p class="card-text-info">{{ ngDtlSolvCnt }}</p>
                   </v-col>
                   <v-col :cols="3" style="text-align: left"> 건 </v-col>
                 </v-row>
@@ -580,11 +580,7 @@ export default {
     Chart,
     UnusedStatPopPage,
     EtcStatPopPage,
-    BtnSearch,
+    PageTitle
-    AntCard,
-    CheckBox,
-    RadioStandard,
-    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({
+      const res = await this.postApiReturn({
-      // 	apiKey: 'selectIssueGdIdxData',
+        apiKey: "selectIssueGdIdxData",
-      // 	resKey: 'issueGdIdxData',
+        resKey: "issueGdIdxData",
-      // 	sendParam: {},
+        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,
       });
+      // 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]["dayVal"] = 18.0;
+      // res[0]['mnthVal'] = 507.0;
-      res[0]["mnthVal"] = 507.0;
+      // res[0]['planVal'] = 653.0;
-      res[0]["planVal"] = 653.0;
+      // res[0]['co2DayVal'] = 9.0;
-      res[0]["co2DayVal"] = 9.0;
+      // res[0]['co2MnthVal'] = 238.0;
-      res[0]["co2MnthVal"] = 238.0;
+      // res[0]['co2PlanVal'] = 307.0;
-      res[0]["co2PlanVal"] = 307.0;
+      // res[0]['co2YearVal'] = 1224.0;
-      res[0]["co2YearVal"] = 1224.0;
+      // res[0]['effcRt'] = 77.59;
-      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({
+      const res = await this.postApiReturn({
-      //   apiKey: "selectCompareEqpmTotData",
+        apiKey: "selectCompareEqpmTotData",
-      //   resKey: "compareEqpmTotData",
+        resKey: "compareEqpmTotData",
-      //   sendParam: {},
+        sendParam: {},
-      // });
+      });
-      const res = "abc";
       this.$nextTick(() => {
         this.setChart02Data(res);
       });
@@ -1007,25 +991,24 @@ export default {
     },
     async getTodayEfficiencyStatus() {
       this.loadChart_03 = false;
-      // const res = await this.postApiReturn({
+      const res = await this.postApiReturn({
-      // 	apiKey: 'selectTodayEfficiencyStatus',
+        apiKey: "selectTodayEfficiencyStatus",
-      // 	resKey: 'todayEfficiencyStatus',
+        resKey: "todayEfficiencyStatus",
-      // 	sendParam: {},
+        sendParam: {},
-      // });
+      });
 
       // 대시보드 표기
-      // this.ngDtlCnt = this.numberFormatter(res[0]['ngDtlCnt']);
+      this.ngDtlCnt = this.numberFormatter(res[0]["ngDtlCnt"]);
-      // this.ngDtlSolvCnt = this.numberFormatter(res[0]['ngDtlSolvCnt']);
+      this.ngDtlSolvCnt = this.numberFormatter(res[0]["ngDtlSolvCnt"]);
-      // let effcRt = this.numberFormatter(
+      let effcRt = this.numberFormatter(
-      // 	(res[0]['ngDtlSolvCnt'] / res[0]['ngDtlCnt']) * 100,
+        (res[0]["ngDtlSolvCnt"] / res[0]["ngDtlCnt"]) * 100
-      // );
+      );
-      let effcRt = this.numberFormatter(78.21);
+      // 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({
+      const res = await this.postApiReturn({
-      //   apiKey: "selectTodayNgTopTen",
+        apiKey: "selectTodayNgTopTen",
-      //   resKey: "todayNgTopTen",
+        resKey: "todayNgTopTen",
-      //   sendParam: {},
+        sendParam: {},
-      // });
+      });
-      const res = "abc";
+      this.setPageData({
-      // this.setPageData({
+        chart04Data: res,
-      //   chart04Data: res,
+      });
-      // });
       this.$nextTick(() => {
         this.setChart04Data(res);
       });
@@ -1054,12 +1036,11 @@ export default {
     },
     async getCompareEqpmTGdChart() {
       this.loadChart_05 = false;
-      // const res = await this.postApiReturn({
+      const res = await this.postApiReturn({
-      //   apiKey: "selectCompareEqpmTGdChart",
+        apiKey: "selectCompareEqpmTGdChart",
-      //   resKey: "compareEqpmTGdChart",
+        resKey: "compareEqpmTGdChart",
-      //   sendParam: {},
+        sendParam: {},
-      // });
+      });
-      const res = "aaa";
       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) {
+      if (this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart != undefined) {
-      //   this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart.series = [];
+        this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart.series = [];
-      // }
+      }
-      // if (!data.length) {
+      if (!data.length) {
-      //   return;
+        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) {
+        if (data[i].tm != undefined) {
-        //   xAxisData.push(parseInt(data[i].tm));
+          xAxisData.push(parseInt(data[i].tm));
-        // } else {
+        } else {
-        //   xAxisData.push(i);
-        // }
           xAxisData.push(i);
+        }
 
         // 	//////없애야함//////
-        let num = parseInt(Math.random() * (13 - 7) + 7);
+        // 	let num = parseInt(Math.random() * (13 - 7) + 7);
-        let num2 = parseInt(Math.random() * (11 - 6) + 6);
+        // 	let num2 = parseInt(Math.random() * (11 - 6) + 6);
-        let num3 = parseInt(Math.random() * (10 - 5) + 5);
+        // 	let num3 = parseInt(Math.random() * (10 - 5) + 5);
-        let tempTotal = num + num2 + num3;
+        // 	let tempTotal = num + num2 + num3;
-        total += tempTotal;
+        // 	total += tempTotal;
-        let befBefVal = num;
+        // 	let befBefVal = num;
-        let befVal = num2;
+        // 	let befVal = num2;
-        let dayVal = num3;
+        // 	let dayVal = num3;
         // 	//////////////////
-        // let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
+        let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
-        // let befVal = data[i].befVal != undefined ? data[i].befVal : 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({
+      this.setChartOption({
-      //   chartKey: "compareEqpmTGdChart",
+        chartKey: "compareEqpmTGdChart",
-      //   value: chartOption,
+        value: chartOption,
-      // });
+      });
-
-      this.$store.state.pageData[myPrgmId]["compareEqpmTGdChart"] = chartOption;
     },
     async setChart04Data(data) {
-      // if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
+      if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
-      //   this.$store.state.pageData[this.myPrgmId].todayNgTopTen.series = [];
+        this.$store.state.pageData[this.myPrgmId].todayNgTopTen.series = [];
-      // }
+      }
-      // if (!data.length) {
+      if (!data.length) {
-      //   return;
+        return;
-      // }
+      }
       let seriesData = [
         {
           type: "pie",
@@ -1219,51 +1197,52 @@ export default {
         },
       ];
       let pidChartdata = [];
-      // for (var i = 0; i < data.length; i++) {
+      for (var i = 0; i < data.length; i++) {
-      //   if (data[i].eqpmId != undefined) {
+        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: data[i]["ngDtlCnt"],
-          value: i + parseInt(Math.random() * (9 - 5) + 5),
+            name: data[i]["eqpmId"],
-          name: eqpmNmList[i],
+            groupId: data[i]["eqpmNm"],
-          groupId: eqpmNmList[i],
           });
         }
+      }
+      // 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.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
-      this.$store.state.pageData[myPrgmId]["todayNgTopTen"] = chartOption;
-      this.$store.state.pageData[myPrgmId]["chart04Data"] = chartOption;
     },
     async setChart02Data(data) {
-      // if (this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart != undefined) {
+      if (this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart != undefined) {
-      //   this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart.series = [];
+        this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart.series = [];
-      // }
+      }
-      // if (!data.length) {
+      if (!data.length) {
-      //   return;
+        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++) {
+        if (data[i].tm != undefined) {
+          xAxisData.push(parseInt(data[i].tm));
+        } else {
           xAxisData.push(i);
+        }
+        //////없애야함//////
 
-        let num = parseInt(Math.random() * (13 - 10) + 10)
+        // 	let num = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
-          .toString()
+        // 	let num2 = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
-          .padStart(2, "0");
+        // 	let num3 = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
-        let num2 = parseInt(Math.random() * (9 - 1) + 1)
+        // 	let num4 = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
-          .toString()
+        // 	let num5 = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
-          .padStart(2, "0");
+        // 	let num6  = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
-        let num3 = parseInt(Math.random() * (13 - 10) + 10)
+        // 	let befBefVal = num+num2;
-          .toString()
+        // 	let befVal = num3+num4;
-          .padStart(2, "0");
+        // 	let dayVal = num5+num6;
-        let num4 = parseInt(Math.random() * (9 - 1) + 1)
+        // 	//////없애야함//////
-          .toString()
+        let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
-          .padStart(2, "0");
+        let befVal = data[i].befVal != undefined ? data[i].befVal : 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;
-
         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",
-      // this.setChartOption({
+        value: chartOption,
-      //   chartKey: "compareEqpmTotChart",
+      });
-      //   value: chartOption,
-      // });
     },
     getGuageChartOption(chartName) {
       const gaugeColors = [
@@ -1506,8 +1436,8 @@ export default {
             splitNumber: 10,
             itemStyle: {
               // color: '#FFAB91'
-              // color: 'auto',
+              color: "auto",
-              color: gaugeColors,
+              // color:gaugeColors
             },
             progress: {
               // show: true,
@@ -1518,8 +1448,8 @@ export default {
               // show: false
               show: true,
               itemStyle: {
-                color: "#FFAB91",
+                // color: '#FFAB91',
-                // color: 'auto',
+                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: NaN,
-                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"
               },
             ],
           },
@@ -1909,32 +1711,18 @@ export default {
       });
     },
     topTenChartClickEvent(event) {
-      // let chartData = this.pageData.chart04Data;
+      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']
-
-      let chartData = this.$store.state.pageData[myPrgmId][this.chart_04]["series"][0][
-        "data"
-      ];
-      console.log("select equipment", event["data"]["groupId"]);
       let selectedChartData = chartData.filter((item) => {
         return item.eqpmId == event["data"]["groupId"];
       });
-      console.log("chart data", selectedChartData);
+      var data = {
-      // 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 = {
         cmCycle: "CYC_DAY",
         fromDt: Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),
-        fabId: 4555,
+        fabId: selectedChartData[0].fabId,
-        eqpmKindId: 99988,
+        eqpmKindId: selectedChartData[0].eqpmKindId,
-        eqpmGrpId: 88888,
+        eqpmGrpId: selectedChartData[0].eqpmGrpId,
-        eqpmId: 99900,
+        eqpmId: selectedChartData[0].eqpmId,
       };
       var key = "tick_" + Math.random();
       this.$router.push({
@@ -1944,8 +1732,7 @@ export default {
           // tick:key
         },
         params: {
-          // ...data,
+          ...data,
-          ...fake_data,
           key: key,
         },
       });

pages/ems/base/EnrgResourceCenterMngPage.vue

@@ -12,6 +12,7 @@
 								:textCols="12"
 								:labelCols="12"
 								:parentPrgmId="myPrgmId"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -22,6 +23,7 @@
 								dataKey="searchErcKind"
 								:sendParam="{ commGrpCd: 'EM_ERCKIND', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -34,13 +36,9 @@
 								:addAll="true"
 								:textCols="12"
 								:labelCols="12"
+								:customClass="'select-large'"
 							/>
 						</v-col>
-						<v-col :cols="3" class="text-right">
-							<BtnSearch @click="search" />
-						</v-col>
-					</v-row>
-					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
@@ -49,8 +47,11 @@
 								dataKey="searchChrgKind"
 								:sendParam="{ commGrpCd: 'EM_ENGCHAGKIND', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
@@ -59,6 +60,7 @@
 								dataKey="useFg"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -69,8 +71,14 @@
 								:textCols="12"
 								:labelCols="12"
 								:searchOption="true"
+								:customClass="'input-large'"
 							/>
 						</v-col>
+						<v-col :cols="3">
+						</v-col>
+						<v-col :cols="3" class="text-right">
+							<BtnSearch :size="'default'" @click="search" />
+						</v-col>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -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 = [
+			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
-  }
-]
-;
 
-			// if (this.pageData.blocMstrList.length > 0) {
+			if (this.pageData.blocMstrList.length > 0) {
-			// 	res = await this.postApiReturn({
+				res = await this.postApiReturn({
-			// 		apiKey: 'selectErcInfo',
+					apiKey: 'selectErcInfo',
-			// 		resKey: 'ercInfoData',
+					resKey: 'ercInfoData',
-			// 		sendParam: {
+					sendParam: {
-			// 			blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
+						blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
-			// 			ercKind: this.pageData.searchErcKind,
+						ercKind: this.pageData.searchErcKind,
-			// 			readObjId: this.pageData.searchReadObj,
+						readObjId: this.pageData.searchReadObj,
-			// 			chrgKind: this.pageData.searchChrgKind,
+						chrgKind: this.pageData.searchChrgKind,
-			// 			useFg: this.pageData.useFg,
+						useFg: this.pageData.useFg,
-			// 			ercNmLike: this.pageData.ercNm,
+						ercNmLike: this.pageData.ercNm,
-			// 		},
+					},
-			// 	});
+				});
-			// } else {
+			} else {
-			// 	this.setPageData({ isFind: false });
+				this.setPageData({ isFind: false });
-			// }
+			}
 			const newRes = res.map(item => {
 				const newObj = {
 					...item,
@@ -798,133 +759,8 @@ const defaultData = {
 	/* data 세팅 */
 	// 로컬 gridName 값과 동일한 이름으로 세팅
 	rowGrid: {
-		data: [
+		data: [],
-  {
+		column: [], // myColumns,
-    "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,
 		option: {}, // myOptions
 		defaultRow: {
 			comId: '',
@@ -1160,3 +996,6 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>

pages/ems/effc/EnrgEffcTotSummPage.vue

@@ -195,28 +195,16 @@ export default {
       });
     },
     async getEqpmKind() {
-      // let res = await this.postApiReturn({
+			let res = await this.postApiReturn({
-      //   apiKey: "selectEqpmKindCodeList",
+				apiKey: 'selectEqpmKindCodeList',
-      //   resKey: "eqpmKindCodeLists",
+				resKey: 'eqpmKindCodeLists',
-      //   sendParam: {},
+				sendParam: {},
-      // });
+			});
-
-      let res = [
-        {
-          eqpmKindId: "냉동기저온",
-          eqpmKindNm: "냉동기저온",
-        },
-        {
-          eqpmKindId: "냉동기고온",
-          eqpmKindNm: "냉동기고온",
-        },
-      ];
 
 			if (res.length > 0) {
-        this.selectValueList01 = await res.map((item) => {
+				this.selectValueList01 = await res.map(item => {
 					return {
-            // text: item.eqpmKindNm,
+						text: item.eqpmKindNm,
-            label: item.eqpmKindNm,
 						value: item.eqpmKindId,
 					};
 				});
@@ -233,29 +221,24 @@ export default {
     gridInit() {},
     getRowGridData() {},
     async getData() {
-      //   let res = await this.postApiReturn({
+			let res = await this.postApiReturn({
-      //     apiKey: "selectEnrgEffcTotSumm",
+				apiKey: 'selectEnrgEffcTotSumm',
-      //     resKey: "totSummData",
+				resKey: 'totSummData',
-      //     sendParam: {
+				sendParam: {
-      //       fromDt: this.pageData.fromDt,
+					fromDt: this.pageData.fromDt,
-      //       eqpmKindId: this.selectValue01,
+					eqpmKindId: this.selectValue01,
-      //     },
+				},
-      //   });
+			});
-      let res = ["aaa", "bbb"];
+
 			await this.getChartData(res);
 
-      //   this.selectData = res.filter((item, i) => {
+			this.selectData = res.filter((item, i) => {
-      //     return (
+				return (
-      //       res.findIndex((item2, j) => {
+					res.findIndex((item2, j) => {
-      //         return item.eqpmGrpId === item2.eqpmGrpId;
+						return item.eqpmGrpId === item2.eqpmGrpId;
-      //       }) === i
+					}) === i
-      //     );
+				);
-      //   });
+			});
-
-      this.selectData = [
-        { eqpmGrpId: "G001", eqpmGrpNm: "Group A", otherProp: "..." },
-        { eqpmGrpId: "G002", eqpmGrpNm: "Group B", otherProp: "..." },
-      ];
 		},
     barClick(event, chartName) {
       var data = {};
@@ -302,37 +285,25 @@ export default {
 			//   }
 			// });
 
-      //   data.map((item) => {
+			data.map(item => {
-      //     if (chartDataObj[item.eqpmGrpId] != null) {
+				if (chartDataObj[item.eqpmGrpId] != null) {
-      //       chartDataObj[item.eqpmGrpId].push(item);
+					chartDataObj[item.eqpmGrpId].push(item);
-      //     } else {
+				} else {
-      //       chartDataObj[item.eqpmGrpId] = [item];
+					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.objList['chart_0' + i] = chartDataObj[x];
-        this.chartNameList.push("chart_0" + i);
+				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]]);

pages/ems/effc/TagTrndPage.vue

@@ -103,7 +103,6 @@
 								<component
 									:ref="gridName"
 									class="tagTrndGrid"
-                  v-if="loadGrid"
 									:is="loadGrid ? 'Grid' : null"
 									:gridName="gridName"
 									:parentPrgmId="myPrgmId"
@@ -330,7 +329,6 @@ export default {
 			} else {
 				this.dumyChartFg = false;
 			}
-      this.dumyChartFg = true;
 			if (this.initedFlag && this.tagList.length > 0) {
 				this.search();
 			}
@@ -409,12 +407,12 @@ export default {
       getAddInfoList: "modules/search/getAddInfoList",
 		}),
 		async init() {
-      await this.setPageData({
+			this.setPageData({
 				rowGridSelectKey: 0,
 				rowGridSelectData: null,
 			});
-      await this.gridInit();
+			this.gridInit();
-      this.setChartNull2();
+			this.setChartNull();
 		},
 		async search() {
 			// search가 2번 타는 경우:
@@ -513,12 +511,6 @@ export default {
 				gridKey: this.gridName,
 				value: myColumns,
 			});
-
-      this.setGridData({
-        gridKey: this.gridName,
-        value: newRes,
-      });
-
 			this.loadGrid = true;
 		},
 		getRowData(data) {
@@ -530,6 +522,7 @@ export default {
 		async btnActions(action) {
 			switch (action) {
         case "add" /*  */:
+          console.log('aa:',this.tagList);
 					// if(this.pageData.totalSelectedTags.split('/*wq2a/').length>5){
 					if (this.tagList.length >= 5) {
             alert("TAG는 최대 5개까지 선택 가능합니다.");
@@ -1216,40 +1209,8 @@ const defaultData = {
 	rowGridSelectData: null,
 	/* Griddata 세팅 */
 	rowGrid: {
-    data: [
+		data: [],
-      {
+		column: [],
-        eqpmGrpNm: "냉동기고온",
-        eqpmGrpId: "UT_HT_CH201",
-        eqpmId: "UT_HT_CH201",
-        eqpmNm: "UT_HT_CH201",
-        tagId: "ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV",
-        tagNm: "ICHEON 고온 냉동기 201호기 - 회로1 전류A",
-        // rowStat: "I",
-      },
-      {
-        eqpmGrpNm: "냉동기고온",
-        eqpmGrpId: "UT_HT_CH201",
-        eqpmId: "UT_HT_CH201",
-        eqpmNm: "UT_HT_CH201",
-        tagId: "ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV",
-        tagNm: "ICHEON 고온 냉동기 201호기 - 회로1 전류A",
-        // rowStat: "I",
-      },
-    ],
-    column: [
-      { header: "설비그룹", name: "eqpmGrpNm", align: "left", width: 150 },
-      {
-        header: "설비그룹 ID",
-        name: "eqpmGrpId",
-        align: "center",
-        hidden: true,
-      },
-      { header: "설비ID", name: "eqpmId", align: "left", width: 200 },
-      { header: "설비명", name: "eqpmNm", align: "left", width: 200 },
-      { header: "TAG ID", name: "tagId", align: "left", width: 500 },
-      { header: "TAG 명", name: "tagNm", align: "left" },
-      //   { header: "rowStat", name: "rowStat", align: "center", hidden: true },
-    ],
 		option: {},
 		defaultRow: {
 			eqpmGrpNm: null,