Update s14 s29 + Fix bugs s1 + Update datepicker height

assets/scss/datepicker.scss

@@ -14,11 +14,14 @@
       position: relative;
       border-radius: 6px;
       border: solid 1px;
-      height: 40px;
+      height: 32px;
       // border-color: #424242;
       border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
-
+      &.datepicker-large {
+        height: 40px;
+      }
+    
       .v-input {
 
         // ----------------------

components/common/Datepicker.vue

@@ -9,7 +9,7 @@
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div class="datepicker-container" >
+			<div :class="['datepicker-container', customClass]"  >
 				<v-text-field
 					id="startpicker"
 					ref="startpicker"
@@ -93,7 +93,12 @@ export default {
 			type:Boolean,
 			require:false,
 			default: true
-		}
+		},
+		customClass: {
+			type: String,
+			require: false,
+		},
+
 	},
 	data() {
 		return {

components/common/chartoptions/LineChart.js

@@ -15,7 +15,8 @@ export default function getLineChartOption({
     const styledSeries = seriesData.map((item, index) => {
         const color = item.color || defaultColors[index % defaultColors.length];
         return {
-            ...item,
+            ...item,    
+            showSymbol: true,       // Show symbol at each data point
             itemStyle: {
                 color,
             },
@@ -27,9 +28,9 @@ export default function getLineChartOption({
             left: '3%',
             right: '5%',
             top: '25%',
+            bottom: '0%',
             containLabel: true,
         },
-
         legend: {
             // data: legendData,
             icon: 'circle',
@@ -37,7 +38,7 @@ export default function getLineChartOption({
             right: '5%',
             orient: 'horizontal',
             textStyle: {
-                color: isDarkMode ? '#676A7B' : '#676A7B',
+                color: isDarkMode ? 'white' : '#676A7B',
             },
         },
         xAxis: {

pages/comm/base/CalendarMngPage.vue

@@ -10,7 +10,7 @@
 						</v-col>
 						<v-col cols="3">
 							<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
-							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
+							<DatePicker :parentPrgmId="myPrgmId" customClass="datepicker-large" :label="'조회연월'" />
 						</v-col>
 						<v-col cols="6" class="text-right">
 							<BtnSearch @click="search()" size="large" />

pages/comm/base/CommCdMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-	    <PageTitle text="공통코드" />
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -56,7 +56,7 @@
 						</v-col>
 						
 						<v-col :cols="12" class="text-right">
-							<BtnSearch style="margin-top:20px" @click="search" />
+							<BtnSearch style="margin-top:20px" @click="search" size="large" />
 						</v-col>
 					</v-row>
 					<!-- <v-row align="center" no-gutters>
@@ -363,7 +363,7 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-			this.loadGrid = true;
+        this.loadGrid = true;
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({

pages/ems/base/DashboardPage.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="l-layout">
-    <!-- <h1 class="h1-title">대시보드</h1> -->
+		<CommonPageTitle/>
-    <PageTitle text="대시보드" />
     <!-- <CheckBox
       :parentPrgmId="myPrgmId"
       label="사용여부"
@@ -600,7 +599,7 @@ export default {
       this.getEnrgUsage();
     },
     isDarkMode(newVal) {
-      // let chartOption = this.getGuageChartOption2(this.chart_01);
+      // Update color of dark mode or light mode into each charts
       let chartOption = getGaugeChartOption({
         title: this.chart_01,
         isDarkMode: this.isDarkMode,
@@ -610,7 +609,6 @@ export default {
       ]?.series?.[0]?.data?.[0]?.value;
       this.$store.state.pageData[myPrgmId][this.chart_01] = chartOption;
 
-      // let chartOption3 = this.getGuageChartOption2(this.chart_03);
       let chartOption3 = getGaugeChartOption({
         title: this.chart_03,
         isDarkMode: this.isDarkMode,
@@ -620,12 +618,24 @@ export default {
       ]?.series?.[0]?.data?.[0]?.value;
       this.$store.state.pageData[myPrgmId][this.chart_03] = chartOption3;
 
-      let mockres = this.$store.state.pageData[myPrgmId][this.chart_04];
-      this.setChart04Data(mockres);
 
-      this.setChart02Data("test");
+      let chart04Dat = this.$store.state.pageData[myPrgmId]['chart04Data'];
+      this.setChart04Data(chart04Dat);
+
+      let chartOption2 = getLineChartOption({
+            xAxisData: this.$store.state.pageData[myPrgmId][this.chart_02].xAxisData,
+            seriesData: this.$store.state.pageData[myPrgmId][this.chart_02].seriesData,
+            isDarkMode: this.isDarkMode,
+          });
+      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption2
+
+      let chartOption5 = getLineChartOption({
+            xAxisData: this.$store.state.pageData[myPrgmId][this.chart_05].xAxisData,
+            seriesData: this.$store.state.pageData[myPrgmId][this.chart_05].seriesData,
+            isDarkMode: this.isDarkMode,
+          });
+      this.$store.state.pageData[myPrgmId][this.chart_05] = chartOption5
 
-      this.setChart05Data("test");
     },
     // beforeDestroy() {
     // 	this.cancelAutoUpdate();
@@ -1169,6 +1179,7 @@ export default {
         chartKey: "compareEqpmTGdChart",
         value: chartOption,
       });
+      this.$store.state.pageData[myPrgmId][this.chart_05] = chartOption
     },
     async setChart04Data(data) {
       if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
@@ -1268,6 +1279,7 @@ export default {
         },
         series: seriesData,
       };
+
       await this.$nextTick(() => {});
       this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
     },
@@ -1397,10 +1409,12 @@ export default {
       //   series: seriesData,
       // };
       await this.$nextTick(() => {});
+      console.log('line:',chartOption);
       this.setChartOption({
         chartKey: "compareEqpmTotChart",
         value: chartOption,
       });
+      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption
     },
     getGuageChartOption(chartName) {
       const gaugeColors = [
@@ -1708,10 +1722,13 @@ export default {
     },
     topTenChartClickEvent(event) {
       let chartData = this.pageData.chart04Data;
+            console.log('select data:',chartData)
+console.log(event["data"])
       // 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('select data:',selectedChartData)
       var data = {
         cmCycle: "CYC_DAY",
         fromDt: Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),

pages/ems/base/EnrgResourceCenterMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -83,7 +84,7 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" style="height: calc(100vh - 400px)">
+		<v-row >
 			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex justify-space-between align-end">
@@ -113,7 +114,7 @@
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>에너지원 상세</v-card-title>
-					<div class="px-5" style="height:calc(100% - 70px)">
+					<div class="px-5" style="min-height: auto;">
 						<v-tabs v-model="tab">
 							<v-tab
 								v-for="item in items"
@@ -125,21 +126,21 @@
 						</v-tabs>
 						<v-tabs-items
 							v-model="tab"
-							style="height: calc(100% - 65px);"
 							class="py-6"
+							style="min-height: auto;"
 						>
-							<v-tab-item v-for="(item, idx) in items" :key="item.id">
+							<v-tab-item v-for="(item, idx) in items" :key="item.id">				
 								<component
-									v-if="item.id == 'ercInfoTab'"
+										v-if="item.id == 'ercInfoTab'"
-									:is="'Form'"
+										:is="'Form'"
-									:parentPrgmId="myPrgmId"
+										:parentPrgmId="myPrgmId"
-									:detailList="detailList"
+										:detailList="detailList"
-									@gridEditingFinish="gridEditingFinish"
+										@gridEditingFinish="gridEditingFinish"
 								/>
 								<ErcChrgInfoTab
-									v-if="item.id == 'ercChrgInfoTab'"
+										v-if="item.id == 'ercChrgInfoTab'"
-									:parentPrgmId="myPrgmId"
+										:parentPrgmId="myPrgmId"
-									:innerTabGridInfo="{ tab, idx }"
+										:innerTabGridInfo="{ tab, idx }"
 								/>
 							</v-tab-item>
 						</v-tabs-items>

pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue

@@ -1006,7 +1006,7 @@ export default {
         color: "#D32029",
       };
 
-      chartOption["series"][0]["symbol"] = "none";
+      // chartOption["series"][0]["symbol"] = "none";
       console.log("chartOption: ", chartOption);
       return chartOption;
     },

pages/ems/effc/EnrgUseTotSummPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div ref="mainDiv" class="l-layout">
-    <PageTitle text="냉동기" />
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -180,7 +180,7 @@ export default {
       contentData: {},
       loadChart: false,
 
-      testFlag: true,
+      testFlag: false,
     };
   },
   computed: {
@@ -270,15 +270,14 @@ export default {
       }
     },
     async getEnrgUseTotSummData() {
-      //   var res = await this.postApiReturn({
+      var res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseTotSumm",
+          apiKey: "selectEnrgUseTotSumm",
-      //     resKey: "data",
+          resKey: "data",
-      //     sendParam: {
+          sendParam: {
-      //       fromDt: this.pageData.fromDt,
+            fromDt: this.pageData.fromDt,
-      //       eqpmKind: this.selectValue01,
+            eqpmKind: this.selectValue01,
-      //     },
+          },
-      //   });
+      });
-      let res = [];
 
       if (this.testFlag == true) {
         res = [

pages/ems/effc/EqpmIndMntrPage.vue

@@ -4,7 +4,7 @@
       <v-avatar size="12" :style="{ backgroundColor: 'currentColor' }"></v-avatar>
       에너지 사용량 실적
     </h1> -->
-    <PageTitle text="에너지 사용량 실적" />
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -255,9 +255,8 @@ export default {
   },
   methods: {
     async init() {
-      // await this.getSelectValueList();
+      await this.getSelectValueList();
-
+      await this.setQueryParams();
-      // await this.setQueryParams();
       this.gridInit();
       await this.getGridData();
 
@@ -488,131 +487,41 @@ export default {
       this.loadGrid = false;
       this.enrgUseMainIdxDesc = [];
       var apiKey = null;
-      // var params = {
+      var params = {
-      //   fabId: this.selectValue01,
+        fabId: this.selectValue01,
-      //   eqpmKindId: this.selectValue02,
+        eqpmKindId: this.selectValue02,
-      //   eqpmGrpId: this.selectValue03,
+        eqpmGrpId: this.selectValue03,
-      //   fromDt: this.pageData.fromDt,
+        fromDt: this.pageData.fromDt,
-      // };
+      };
 
-      // if (this.pageData.cmCycle == "CYC_DAY") {
+      if (this.pageData.cmCycle == "CYC_DAY") {
-      //   params["fromDtMm"] = String(this.pageData.fromDt).substring(0, 6);
+        params["fromDtMm"] = String(this.pageData.fromDt).substring(0, 6);
-      //   apiKey = "selectDailyEnrgUseMainIdx";
+        apiKey = "selectDailyEnrgUseMainIdx";
-      // } else if (this.pageData.cmCycle == "CYC_MONTH") {
+      } else if (this.pageData.cmCycle == "CYC_MONTH") {
-      //   apiKey = "selectMonthlyEnrgUseMainIdx";
+        apiKey = "selectMonthlyEnrgUseMainIdx";
-      // }
+      }
 
-      // var res = await this.postApiReturn({
+      var res = await this.postApiReturn({
-      //   apiKey: apiKey,
+        apiKey: apiKey,
-      //   resKey: "eqpmIndMntrData",
+        resKey: "eqpmIndMntrData",
-      //   sendParam: params,
+        sendParam: params,
-      // });
+      });
 
-      // this.enrgUseMainIdxDesc = await this.postApiReturn({
+      this.enrgUseMainIdxDesc = await this.postApiReturn({
-      //   apiKey: "selectEnrgUseMainIdxDesc",
+        apiKey: "selectEnrgUseMainIdxDesc",
-      //   resKey: "eqpmIndMntrData",
+        resKey: "eqpmIndMntrData",
-      //   sendParam: {
+        sendParam: {
-      //     eqpmGrpId: this.selectValue03,
+          eqpmGrpId: this.selectValue03,
-      //   },
-      // });
-
-      var newRes = [
-        {
-          no: 1,
-          fabId: "FAB001",
-          fabNm: "서울FAB",
-          eqpmGrpId: "GRP01",
-          eqpmGrpNm: "조립라인",
-          eqpmId: "EQ001",
-          eqpmNm: "설비A",
-          planVal: 1000,
-          usedVal: 950,
-          effcRt: "95%",
-          gd01: 88,
-          gd02: 90,
-          gd03: 85,
-          gd04: 87,
-          gd05: 89,
-          gd06: 86,
-          gd07: 90,
-          gd08: 88,
-          gd09: 87,
-          gd10: 89,
         },
-        {
+      });
-          no: 2,
-          fabId: "FAB002",
-          fabNm: "부산FAB",
-          eqpmGrpId: "GRP02",
-          eqpmGrpNm: "검사라인",
-          eqpmId: "EQ002",
-          eqpmNm: "설비B",
-          planVal: 1200,
-          usedVal: 1100,
-          effcRt: "91.7%",
-          gd01: 85,
-          gd02: 84,
-          gd03: 86,
-          gd04: 83,
-          gd05: 82,
-          gd06: 84,
-          gd07: 85,
-          gd08: 86,
-          gd09: 87,
-          gd10: 88,
-        },
-        {
-          no: 3,
-          fabId: "FAB003",
-          fabNm: "대전FAB",
-          eqpmGrpId: "GRP03",
-          eqpmGrpNm: "포장라인",
-          eqpmId: "EQ003",
-          eqpmNm: "설비C",
-          planVal: 900,
-          usedVal: 870,
-          effcRt: "96.7%",
-          gd01: 90,
-          gd02: 91,
-          gd03: 89,
-          gd04: 88,
-          gd05: 90,
-          gd06: 91,
-          gd07: 92,
-          gd08: 90,
-          gd09: 89,
-          gd10: 91,
-        },
-        {
-          no: 4,
-          fabId: "FAB004",
-          fabNm: "광주FAB",
-          eqpmGrpId: "GRP04",
-          eqpmGrpNm: "테스트라인",
-          eqpmId: "EQ004",
-          eqpmNm: "설비D",
-          planVal: 1100,
-          usedVal: 1050,
-          effcRt: "95.5%",
-          gd01: 87,
-          gd02: 88,
-          gd03: 86,
-          gd04: 85,
-          gd05: 86,
-          gd06: 87,
-          gd07: 88,
-          gd08: 89,
-          gd09: 90,
-          gd10: 91,
-        },
-      ];
 
-      // for (var i = 0; i < res.length; i++) {
+      var newRes = [];
-      //   newRes.push({
+      for (var i = 0; i < res.length; i++) {
-      //     ...res[i],
+        newRes.push({
-      //     no: i + 1,
+          ...res[i],
-      //   });
+          no: i + 1,
-      // }
+        });
+      }
 
       this.setGridData({
         gridKey: this.gridName,
@@ -752,141 +661,9 @@ const defaultData = {
   },
   fromDt: Utility.setFormatDate(new Date(), "YYYYMM"), // 조회 시작일
   grid01: {
-    data: [
+    data: [],
-      {
+    column: [],
-        no: 1,
+    option: {},
-        fabId: "FAB001",
-        fabNm: "서울FAB",
-        eqpmGrpId: "GRP01",
-        eqpmGrpNm: "조립라인",
-        eqpmId: "EQ001",
-        eqpmNm: "설비A",
-        planVal: 1000,
-        usedVal: 950,
-        effcRt: "95%",
-        gd01: 88,
-        gd02: 90,
-        gd03: 85,
-        gd04: 87,
-        gd05: 89,
-        gd06: 86,
-        gd07: 90,
-        gd08: 88,
-        gd09: 87,
-        gd10: 89,
-      },
-      {
-        no: 2,
-        fabId: "FAB002",
-        fabNm: "부산FAB",
-        eqpmGrpId: "GRP02",
-        eqpmGrpNm: "검사라인",
-        eqpmId: "EQ002",
-        eqpmNm: "설비B",
-        planVal: 1200,
-        usedVal: 1100,
-        effcRt: "91.7%",
-        gd01: 85,
-        gd02: 84,
-        gd03: 86,
-        gd04: 83,
-        gd05: 82,
-        gd06: 84,
-        gd07: 85,
-        gd08: 86,
-        gd09: 87,
-        gd10: 88,
-      },
-      {
-        no: 3,
-        fabId: "FAB003",
-        fabNm: "대전FAB",
-        eqpmGrpId: "GRP03",
-        eqpmGrpNm: "포장라인",
-        eqpmId: "EQ003",
-        eqpmNm: "설비C",
-        planVal: 900,
-        usedVal: 870,
-        effcRt: "96.7%",
-        gd01: 90,
-        gd02: 91,
-        gd03: 89,
-        gd04: 88,
-        gd05: 90,
-        gd06: 91,
-        gd07: 92,
-        gd08: 90,
-        gd09: 89,
-        gd10: 91,
-      },
-      {
-        no: 4,
-        fabId: "FAB004",
-        fabNm: "광주FAB",
-        eqpmGrpId: "GRP04",
-        eqpmGrpNm: "테스트라인",
-        eqpmId: "EQ004",
-        eqpmNm: "설비D",
-        planVal: 1100,
-        usedVal: 1050,
-        effcRt: "95.5%",
-        gd01: 87,
-        gd02: 88,
-        gd03: 86,
-        gd04: 85,
-        gd05: 86,
-        gd06: 87,
-        gd07: 88,
-        gd08: 89,
-        gd09: 90,
-        gd10: 91,
-      },
-    ],
-    column: [
-      { header: "NO", name: "no", align: "center" },
-      { header: "fabId", name: "fabId", hidden: true },
-      { header: "FAB", name: "fabNm", align: "left" },
-      { header: "eqpmGrpId", name: "eqpmGrpId", hidden: true },
-      { header: "설비그룹", name: "eqpmGrpNm", align: "left" },
-      { header: "eqpmId", name: "eqpmId", hidden: true },
-      { header: "설비명", name: "eqpmNm", align: "left" },
-      { header: "계획량", name: "planVal", align: "right" },
-      { header: "사용량", name: "usedVal", align: "right" },
-      { header: "KPI", name: "effcRt", align: "right" },
-      { header: "지표1", name: "gd01", align: "right" },
-      { header: "지표2", name: "gd02", align: "right" },
-      { header: "지표3", name: "gd03", align: "right" },
-      { header: "지표4", name: "gd04", align: "right" },
-      { header: "지표5", name: "gd05", align: "right" },
-      { header: "지표6", name: "gd06", align: "right" },
-      { header: "지표7", name: "gd07", align: "right" },
-      { header: "지표8", name: "gd08", align: "right" },
-      { header: "지표9", name: "gd09", align: "right" },
-      { header: "지표10", name: "gd10", align: "right" },
-    ],
-    option: {
-      header: {
-        height: 65,
-        complexColumns: [
-          {
-            header: "주요지표",
-            name: "complexColumn01",
-            childNames: [
-              "gd01",
-              "gd02",
-              "gd03",
-              "gd04",
-              "gd05",
-              "gd06",
-              "gd07",
-              "gd08",
-              "gd09",
-              "gd10",
-            ],
-          },
-        ],
-      },
-    },
   },
 };