From 8f83e1d60c74b891903c92185aafc9c0682e7560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Tue, 29 Jul 2025 14:58:37 +0700
Subject: [PATCH 01/17] hotfix grid

---
 assets/scss/common.scss              |  2 +-
 mixin/global.js                      |  2 +-
 pages/ems/base/ReadObjectMngPage.vue | 22 ++++++++++------------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index b0d4fa3..cf990d2 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -144,7 +144,7 @@ a {
 
   & .router-tab__container {
     overflow-y: auto;
-    min-height: calc(100vh - 105px);
+    height: calc(100vh - 105px);
     max-height: calc(100vh - 105px);
     padding: 20px;
   }
diff --git a/mixin/global.js b/mixin/global.js
index 7631640..08c1d9c 100644
--- a/mixin/global.js
+++ b/mixin/global.js
@@ -58,7 +58,7 @@ export default {
 		layoutInit() {
 			if (this.$refs.searchFilter) {
 				const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
-				this.$refs.contents.style.minHeight = `calc(100% - ${searchFilterHeight + 20}px)`;
+				this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight + 20}px)`;
 			}
 		},
 		//init() {}
diff --git a/pages/ems/base/ReadObjectMngPage.vue b/pages/ems/base/ReadObjectMngPage.vue
index 0d35b99..ec5e948 100644
--- a/pages/ems/base/ReadObjectMngPage.vue
+++ b/pages/ems/base/ReadObjectMngPage.vue
@@ -59,18 +59,16 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div class="h100 px-5" style="height:calc(100% - 70px)">
-						<div ref="gridParent" class="w100 h100">
-							<component
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								:selectedRowDataWatchFlag="true"
-							/>
-						</div>
+					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
+						<component
+							:ref="gridName"
+							:is="loadGrid ? 'Grid' : null"
+							:gridName="gridName"
+							:parentPrgmId="myPrgmId"
+							@getRowsData="getRowData"
+							@sendSelectedRowStatInfo="getSelectedRowStatInfo"
+							:selectedRowDataWatchFlag="true"
+						/>
 					</div>
 				</v-card>
 			</v-col>

From 34d03b254608cd272b6b62cc8e34cb6bf2e115b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vu=20Trung=20Kien/=28Vu=20Trung=20Kien=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074468@skcc.com>
Date: Tue, 29 Jul 2025 17:18:41 +0900
Subject: [PATCH 02/17] dev-manhph1-fixbug-18-19-21-28

---
 assets/scss/common/input.scss                 |  12 +-
 components/common/PastRsltDatePicker.vue      |  18 ++-
 components/common/modal/EvtObjPop.vue         |  10 +-
 .../pages/ems/TagInfo/TagAddInfoTab.vue       |   2 +-
 pages/ems/base/EqpmKindPage.vue               |   2 +-
 pages/ems/base/EquipmentGroupMngPage.vue      |   7 +-
 pages/ems/base/PastRsltDataReadPage.vue       | 115 +++++++-----------
 pages/ems/base/TagMngPage_Pagination.vue      |  36 +++---
 8 files changed, 95 insertions(+), 107 deletions(-)

diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss
index ccc3e55..1679115 100644
--- a/assets/scss/common/input.scss
+++ b/assets/scss/common/input.scss
@@ -1,5 +1,5 @@
 .v-select__custom {
-  padding: 0.125rem;
+  padding: 0;
   
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;
@@ -78,6 +78,16 @@
     border-color: #d9d9d9;
   }
 
+  &.select-large {
+    .v-input__slot,
+    .v-input__control {
+      height: 40px !important;
+      // border: solid 1px #D9D9D9;
+      border-radius: 8px !important;
+    }
+
+  }
+
   &.surface-name {
     fieldset {
       max-width: 345px;
diff --git a/components/common/PastRsltDatePicker.vue b/components/common/PastRsltDatePicker.vue
index 60377d2..67933f9 100644
--- a/components/common/PastRsltDatePicker.vue
+++ b/components/common/PastRsltDatePicker.vue
@@ -2,7 +2,9 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon>
+				<v-icon small color="primary" 
+				:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+				>$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
@@ -17,14 +19,16 @@
 					readonly
 					outlined
 				>
-					<template #append>
-						<v-icon size="20">$icoCalendar</v-icon>
+					<template #append >
+						<v-icon size="20" v-show="!isRange">$icoCalendar</v-icon>
 					</template>
 					<template #append-outer>
 						<div ref="startpicker-container" id="startpicker-container"></div>
 					</template>
 				</v-text-field>
-				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div>
+				<div v-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
+					<img :src="arrowIcon" alt="">
+				</div>
 				<v-text-field
 					v-show="isRange"
 					id="endpicker"
@@ -129,6 +133,12 @@ export default {
 				this.defaultRange === 'no limite'
 			);
 		},
+		arrowIcon() {
+			if(this.isDarkMode){
+				return require('@/assets/images/arrow_datepicker_dm.png');
+			}
+			return require('@/assets/images/arrow_datepicker.png');
+		}
 	},
 	watch: {
 		myCmCycle() {
diff --git a/components/common/modal/EvtObjPop.vue b/components/common/modal/EvtObjPop.vue
index 6a3bae7..70ef42c 100644
--- a/components/common/modal/EvtObjPop.vue
+++ b/components/common/modal/EvtObjPop.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box" align="center">
+	<v-row class="search-box no-gutters" align="center">
 		<v-col :cols="option.labelCols" class="py-0">
 			<label for="" class="search-box-label">
 				<v-icon v-if="item.iconShow" small
@@ -8,13 +8,11 @@
 			</label>
 		</v-col>
 		<v-col :cols="option.textCols" class="py-0">
-			<v-text-field readonly append-icon="" class="v-input__custom" outlined :hide-details="true"
-				v-model="searchWord" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
+			<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
+				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
 				:required="item.required || false"><template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
-
-
 				</template></v-text-field>
 		</v-col>
 
@@ -43,8 +41,6 @@
 								class="search-button">조회</a-button>
 						</v-row>
 					</v-col>
-
-
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
 				<div :style="'height: 600px'" class="px-5">
diff --git a/components/pages/ems/TagInfo/TagAddInfoTab.vue b/components/pages/ems/TagInfo/TagAddInfoTab.vue
index bf1a6ab..7e4868c 100644
--- a/components/pages/ems/TagInfo/TagAddInfoTab.vue
+++ b/components/pages/ems/TagInfo/TagAddInfoTab.vue
@@ -1,7 +1,7 @@
 <template>
 		<v-card class="pb-5">
 		<v-card-title class="d-flex justify-space-between align-end">
-			<span class="tit ft-size_20 ft-weight_600">TAG 추가 정보</span>
+			<span style="color:#000000A6" class="tit custom-title-4-new">TAG 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
diff --git a/pages/ems/base/EqpmKindPage.vue b/pages/ems/base/EqpmKindPage.vue
index c6f1fbe..1a53cc1 100644
--- a/pages/ems/base/EqpmKindPage.vue
+++ b/pages/ems/base/EqpmKindPage.vue
@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<PageTitle/>
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
diff --git a/pages/ems/base/EquipmentGroupMngPage.vue b/pages/ems/base/EquipmentGroupMngPage.vue
index a36c972..95e229b 100644
--- a/pages/ems/base/EquipmentGroupMngPage.vue
+++ b/pages/ems/base/EquipmentGroupMngPage.vue
@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<PageTitle />
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -480,18 +480,17 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 	},
+	
 	{
 		type: 'CheckBox',
 		label: '사용 여부',
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
+		class: 'py-2 pr-4 pt-4',
 		value: { '1': true, '0': false },
 		required: true,
 		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
diff --git a/pages/ems/base/PastRsltDataReadPage.vue b/pages/ems/base/PastRsltDataReadPage.vue
index d32abfe..2ac204c 100644
--- a/pages/ems/base/PastRsltDataReadPage.vue
+++ b/pages/ems/base/PastRsltDataReadPage.vue
@@ -1,63 +1,26 @@
 <template>
 	<div class="l-layout">
-		<PageTitle text="측정 위치 데이터 조회" />
+		<CommonPageTitle/>
 
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<v-col :cols="2">
-							<component
-								:is="'SelectBlocMstr'"
-								ref="SelectBlocMstr"
-								:parentPrgmId="myPrgmId"
-								:textCols="12"
-								customClass="select-large"
-							/>
-						</v-col>
-						<!-- <v-col :cols="2">
-							<component
-								label="검침개소"
-								:is="'PastRsltDataReadPop'"
-								:parentPrgmId="myPrgmId"
-							/>
-						</v-col> -->
-						<!-- <v-col :cols="2">
-               <component 
-              :is="'SelectTagNmList'"
-              ref="SelectTagNmList"
-              :parentPrgmId="myPrgmId"
-              />
-            </v-col> -->
 						<v-col :cols="3">
-							<!-- <component
-								:is="'PastRsltDataReadTagPop'"
-								:parentPrgmId="myPrgmId"
-								:label="'TAG'"
-							/> -->
-							<component
-								:is="'EvtObjPop'"
-								:parentPrgmId="myPrgmId"
-								:item="evtObjPopItem"
-								customClass="select-large"
-							/>
+							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
+								:textCols="12" customClass="select-large" />
 						</v-col>
-						<v-col :cols="4">
-							<component
-								:is="'Datepicker'"
-								:parentPrgmId="myPrgmId"
-								:label="'조회기간'"
-								:textCols="12"
-							/>
+						<v-col :cols="3">
+							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
+								customClass="select-large" />
 						</v-col>
-						 <v-col :cols="3" class="d-flex align-end justify-end text-right">
-							 <BtnExcelDownload
-							 	class="mr-1"
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								type="primary"
-								size="large"
-							/>
+						<v-col :cols="3">
+							<!-- 대상일 -->
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12"/>
+						</v-col>
+						<v-col :cols="3" class="d-flex align-end justify-end text-right">
+							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
+								size="large" />
 							<BtnSearch @click="search" size="large" />
 						</v-col>
 					</v-row>
@@ -68,11 +31,16 @@
 			<v-col :cols="12" style="height: 100%" class="h100">
 				<v-card class="px-5 py-5 h100">
 					<div ref="gridParent" class="h100 px-5" style="height: 100%">
-						<component
-							ref="myGrid"
-							:is="loadGrid ? 'Grid' : null"
-							:gridName="gridName"
-							:parentPrgmId="myPrgmId"
+						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
+							:parentPrgmId="myPrgmId" />
+					</div>
+					<div class="d-flex align-center justify-space-between">
+						<pagination
+							id="pagination"
+							:total-count="totalCount"
+							:page-num="page"
+							:limit="limit"
+							@loadData="changeGrid"
 						/>
 					</div>
 				</v-card>
@@ -97,7 +65,7 @@ import BtnExcelDownload from '~/components/common/button/BtnExcelDownload';
 import DateUtility from '~/plugins/dateUtility';
 // import Search from "~/components/common/search";
 import EvtObjPop from '~/components/common/modal/EvtObjPop';
-import PageTitle from "~/components/common/PageTitle";
+import pagination from '~/components/Pagination';
 
 let myTitle;
 // const myPrgmId = "PRG0052";
@@ -130,7 +98,7 @@ export default {
 		PastRsltDataReadPop,
 		PastRsltDataReadTagPop,
 		EvtObjPop,
-		PageTitle,
+		pagination,
 	},
 	data() {
 		return {
@@ -146,12 +114,16 @@ export default {
 				valueNm2: 'tagNm',
 				iconShow: true,
 				disabled: false,
-				labelCols: 12,
 				textCols: 12,
 				class: 'py-2',
 				required: false,
 				formFg: false,
 			},
+			itemsPerPage: 10,
+			itemsPerPageArray: [10, 20, 30],
+			limit: 20,
+			page: 1,
+			totalCount: 0,
 		};
 	},
 	computed: {
@@ -164,9 +136,6 @@ export default {
 		chkTagId() {
 			return this.pageData.tagList === undefined ? null : this.pageData.tagId;
 		},
-		// chkTagList() {
-		// 	return this.pageData.tagList;
-		// },
 		chkTagNm() {
 			return this.pageData.tagData.tagNm;
 		},
@@ -176,18 +145,16 @@ export default {
 	},
 	watch: {
 		chkIsFind(val) {
-			if (val) this.search();
+			if (val) {
+				this.page = 1;
+				this.search();
+			}
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
 				this.search();
 			}
 		},
-		// chkTagList() {
-		// 	if(this.initFlag){
-		// 		this.search();
-		// 	}
-		// },
 		chkTagNm() {
 			if (this.initFlag) {
 				this.search();
@@ -207,7 +174,7 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() {},
+	created() { },
 	async mounted() {
 		await this.setFromDt();
 		await this.init();
@@ -381,6 +348,9 @@ export default {
 					apiKey: 'selectTagRawDataByQuarter',
 					resKey: 'pastRsltReadData',
 					sendParam: sendParams,
+					limit: this.limit,
+						page: this.page,
+						offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				});
 
 				this.setGridData({
@@ -393,6 +363,9 @@ export default {
 					fromDt: this.pageData.fromDt,
 					toDt: this.pageData.toDt,
 					yearQuarterList: yearQuarterData['yearQuarterList'],
+					limit: this.limit,
+						page: this.page,
+						offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				};
 				sendParams['tagId'] = this.pageData.tagId;
 				//
@@ -487,6 +460,12 @@ export default {
 			finalResult['yearQuarterList'] = result;
 			return finalResult;
 		},
+		changeGrid: async function(pageNum, limit) {
+			this.page = pageNum;
+			this.limit = limit;
+
+			this.search();
+		},
 	},
 };
 
diff --git a/pages/ems/base/TagMngPage_Pagination.vue b/pages/ems/base/TagMngPage_Pagination.vue
index 86bd449..e8408b5 100644
--- a/pages/ems/base/TagMngPage_Pagination.vue
+++ b/pages/ems/base/TagMngPage_Pagination.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<PageTitle/>
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -58,7 +58,7 @@
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
 						</div>
 					</v-card-actions>
-					<!-- <div class="d-flex align-center justify-space-between">
+					<div class="d-flex align-center justify-space-between">
 						<pagination
 							id="pagination"
 							:total-count="totalCount"
@@ -66,7 +66,7 @@
 							:limit="limit"
 							@loadData="changeGrid"
 						/>
-					</div> -->
+					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">
@@ -107,7 +107,6 @@ import TagAddInfoTab from '@/components/pages/ems/TagInfo/TagAddInfoTab';
 import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
 import pagination from '~/components/Pagination';
-import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 // const myPrgmId = "PRG0051";
@@ -140,13 +139,12 @@ export default {
 		TagAddInfoTab,
 		Grid,
 		pagination,
-		PageTitle
 	},
 	data() {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			items: [
 				{ name: 'TAG 정보', id: 'tagBaseInfoTab', disabledFlag: false },
@@ -275,16 +273,12 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 180;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 16;
 
 			const myOptions = {
 				columnOptions: {
 					resizable: true,
 				},
-				pageOptions: {
-					useClient: true,
-					perPage: 10,
-				},
 				scrollX: true,
 				header: {
 					height: 38,
@@ -527,16 +521,16 @@ export default {
 							//rowKey: 0,
 							rowKey:
 								this.pageData.rowGridSelectKey == '' ||
-									this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 									? 0
 									: this.pageData.rowGridSelectKey ==
-										this.$refs[this.gridName].getData().length - 1
-										? this.pageData.rowGridSelectKey
-										: 0,
+									  this.$refs[this.gridName].getData().length - 1
+									? this.pageData.rowGridSelectKey
+									: 0,
 							columnName: 'tagId',
 							setScroll: true,
 						});
-					} catch (error) { }
+					} catch (error) {}
 					// this.$refs[this.gridName].focus({
 					//   rowKey: 0,
 					//   columnName: "tagId",
@@ -773,7 +767,7 @@ export default {
 		gridEditingFinish(data) {
 			this.$refs[this.gridName].editingFinish(data);
 		},
-		changeGrid: async function (pageNum, limit) {
+		changeGrid: async function(pageNum, limit) {
 			this.page = pageNum;
 			this.limit = limit;
 
@@ -817,9 +811,9 @@ function isValidAlrmVal(obj) {
 			if (Number(obj[keyList[i]]) >= Number(obj[keyList[j]])) {
 				alert(
 					nameList[j] +
-					'값은 ' +
-					nameList[i] +
-					'값보다 큰 숫자를 입력해야 합니다.',
+						'값은 ' +
+						nameList[i] +
+						'값보다 큰 숫자를 입력해야 합니다.',
 				);
 				return false;
 			}
@@ -1112,4 +1106,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
+</script>
\ No newline at end of file

From bea1e0889b08aa47751c7ec7236d59b650b512d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vu=20Trung=20Kien/=28Vu=20Trung=20Kien=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074468@skcc.com>
Date: Tue, 29 Jul 2025 18:30:19 +0900
Subject: [PATCH 03/17] dev-manhph1-add-pagination-28

---
 pages/ems/base/PastRsltDataReadPage.vue | 38 ++++++++++++++++---------
 store/modules/list.js                   |  3 +-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/pages/ems/base/PastRsltDataReadPage.vue b/pages/ems/base/PastRsltDataReadPage.vue
index 2ac204c..d50c5de 100644
--- a/pages/ems/base/PastRsltDataReadPage.vue
+++ b/pages/ems/base/PastRsltDataReadPage.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle/>
+		<CommonPageTitle />
 
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
@@ -16,7 +16,7 @@
 						</v-col>
 						<v-col :cols="3">
 							<!-- 대상일 -->
-							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12"/>
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12" />
 						</v-col>
 						<v-col :cols="3" class="d-flex align-end justify-end text-right">
 							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
@@ -35,13 +35,8 @@
 							:parentPrgmId="myPrgmId" />
 					</div>
 					<div class="d-flex align-center justify-space-between">
-						<pagination
-							id="pagination"
-							:total-count="totalCount"
-							:page-num="page"
-							:limit="limit"
-							@loadData="changeGrid"
-						/>
+						<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
+							@loadData="changeGrid" />
 					</div>
 				</v-card>
 			</v-col>
@@ -297,6 +292,7 @@ export default {
 			this.loadGrid = false;
 
 			let res = [];
+			let res2 = [];
 			let yearQuarterData = [];
 			yearQuarterData = this.yearQuarterMaker([
 				this.pageData.fromDt,
@@ -349,10 +345,17 @@ export default {
 					resKey: 'pastRsltReadData',
 					sendParam: sendParams,
 					limit: this.limit,
-						page: this.page,
-						offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
+					page: this.page,
+					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				});
 
+				res2 = await this.postApiReturn({
+					apiKey: 'selectTagRawDataByQuarterPageTotal',
+					resKey: 'pastRslPageTotal',
+					sendParam: sendParams
+				});
+				this.totalCount = res2[0].totalcount;
+
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -364,8 +367,8 @@ export default {
 					toDt: this.pageData.toDt,
 					yearQuarterList: yearQuarterData['yearQuarterList'],
 					limit: this.limit,
-						page: this.page,
-						offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
+					page: this.page,
+					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				};
 				sendParams['tagId'] = this.pageData.tagId;
 				//
@@ -383,6 +386,13 @@ export default {
 					sendParam: sendParams,
 				});
 
+				res2 = await this.postApiReturn({
+					apiKey: 'selectTagRawDataByQuarterPageTotal',
+					resKey: 'pastRslPageTotal',
+					sendParam: sendParams
+				});
+				this.totalCount = res2[0].totalcount;
+
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -460,7 +470,7 @@ export default {
 			finalResult['yearQuarterList'] = result;
 			return finalResult;
 		},
-		changeGrid: async function(pageNum, limit) {
+		changeGrid: async function (pageNum, limit) {
 			this.page = pageNum;
 			this.limit = limit;
 
diff --git a/store/modules/list.js b/store/modules/list.js
index 18a863e..bd3eb17 100644
--- a/store/modules/list.js
+++ b/store/modules/list.js
@@ -669,7 +669,8 @@ const INIT_URL_STATE = {
 	// prgmId : PRG0052 과거 검침 데이터 조회
 	selectTagRawDataByQuarter:
 		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarter',
-
+	selectTagRawDataByQuarterPageTotal:
+		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarterPageTotal',
 	// prgmId : PRG4107 개인화 대시보드
 	selectIndvWidgetList: 'ems/base/DashboardHfemsCtr/selectIndvWidgetList',
 	selectEnergyUseReadHourAddup:

From b56bd12bb71b5aadd7f416d46fbaab6d04452b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Wed, 30 Jul 2025 08:23:13 +0700
Subject: [PATCH 04/17] update screen 34, 20

---
 components/common/Grid.vue                   | 24 +++-----
 components/pages/ems/EqpmInfo/EqpmIaoTab.vue | 60 ++++++--------------
 pages/comm/base/PrgmMngPage.vue              | 35 +++++++-----
 3 files changed, 46 insertions(+), 73 deletions(-)

diff --git a/components/common/Grid.vue b/components/common/Grid.vue
index 34c3f4b..507da54 100644
--- a/components/common/Grid.vue
+++ b/components/common/Grid.vue
@@ -107,16 +107,13 @@ export default {
 		},
 		chkGridOptions() {
 			const options = {
-				// bodyHeight: 'fitToContent',
-				scrollX: false,
-				scrollY: false,
 				...this.gridData.option,
-				useIcon: false,
 			};
 			options.treeColumnOptions = {
 				useIcon: false,
 				...options.treeColumnOptions,
 			};
+
 			return options;
 		},
 		defaultRow() {
@@ -163,7 +160,7 @@ export default {
 	},
 	created() {},
 	async mounted() {
-		// console.log('--------------DEBUG----gridData: ', this.gridData);
+		// console.log(this.dataPath);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
@@ -271,11 +268,12 @@ export default {
 			});
 		},
 		focusChangeEvt(e) {
+			console.log("------------------DEBUG-------focusChangeEvt:", e);
 			// console.log('focusChangeEvt1...')
-			if (this.preventFocusChangeEvent(e)) {
-				// console.log('prevent focusChangeEvt')
-				return;
-			}
+			// if (this.preventFocusChangeEvent(e)) {
+			// 	// console.log('prevent focusChangeEvt')
+			// 	return;
+			// }
 			// console.log('focusChangeEvt2...')
 			// cell 선택시 row 선택 method
 			if (e.rowKey >= 0) {
@@ -291,6 +289,7 @@ export default {
 			this.sendSelectedRowData(e.rowKey);
 		},
 		startEditing(e) {
+			console.log("------------DEBUG-----startEditing----", e);
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent startEditing')
@@ -666,8 +665,6 @@ export default {
       store.dimension.offsetLeft = offsetLeft;
     },
 		setHeight(_a,height){
-			return; // setting auto height
-			
       // console.log("setHeight");
       var dimension = _a.dimension;
       var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;
@@ -705,11 +702,6 @@ export default {
 </script>
 <style scoped lang="scss">
 ::v-deep .tui-grid-container {
-	
-	// .tui-grid-body-area {
-	// 	overflow: hidden !important;
-	// }
-
 	.tui-grid-content-area {
 		.tui-grid-cell-content {
 			input[type='number'] {
diff --git a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
index 0073f3b..5178a26 100644
--- a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
@@ -4,24 +4,24 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt custom-title-4-new">설비 입출력 정보</span>
+			<span class="txt">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
-			<!-- :is="loadGrid ? 'Grid' : null" -->
+		<div ref="gridParent" style="height: calc(100vh - 800px);">
 			<Grid
 				:ref="gridName"
+				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
 			/>
 		</div>
-		<div style="min-height: calc(100vh - 900px);" class="mt-4">
+		<div style="min-height: calc(100vh - 900px);">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -65,22 +65,6 @@ export default {
 
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
-			dataPathMock: {
-        'rowEqpmIaoGrid' : {
-          column: [
-            { header: '대상항목', name: 'id', headerAlign: 'left' },
-            { header: '에너지원 명', name: 'lable', headerAlign: 'left' },
-            { header: '대상 유형', name: 'type', headerAlign: 'left' },
-            { header: '물리량', name: 'note', headerAlign: 'left' },
-            { header: '계산여부', name: 'field1', headerAlign: 'left' },
-            { header: '분배율', name: 'field2', headerAlign: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {}
-        }
-      },
-
 		};
 	},
 	computed: {
@@ -129,16 +113,16 @@ export default {
 		selectedObjId(val) {
 			console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-2';
-				this.detailList[5].class = 'py-2';
+				this.detailList[2].class = 'py-3 d-none';
+				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
+				this.detailList[4].class = 'py-3';
+				this.detailList[5].class = 'py-3';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[5].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-2';
-				this.detailList[2].class = 'py-2';
+				this.detailList[5].class = 'py-3 d-none';
+				this.detailList[4].class = 'py-3 d-none';
+				this.detailList[3].class = 'py-3 pl-4 pt-1';
+				this.detailList[2].class = 'py-3';
 			}
 		},
 		selectedCalcFg(val) {
@@ -171,7 +155,7 @@ export default {
 		},
 	},
 	mounted() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -296,9 +280,7 @@ export default {
 				value: myColumns,
 			});
 
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
+			this.loadGrid = true;
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
@@ -417,6 +399,7 @@ export default {
 	},
 };
 
+
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -487,7 +470,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목 111',
+		labelContent: '대상 항목',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
@@ -502,7 +485,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'InputText',
-		cols: 5,
+		cols: 6,
 		class: 'py-3 d-none',
 		valueNm: 'objNm',
 		readonly: true,
@@ -615,13 +598,4 @@ const myEqpmIaoDetail = [
 		iconShow: true
 	},
 ];
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-	lable: 'INCHEON 고온 냉동기 101호기 - 호로1',
-	type: '사용', note: '-',
-	field1: '1111',
-	field2: '2222',
-});
 </script>
diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue
index 52bc1fe..0d8c246 100644
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@@ -50,17 +50,16 @@
 							/>
 						</div>
 					</div>
-					<div style="min-height: 60vh">
-						<div ref="gridParent" class="px-5 h100">
-							<component
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
-							/>
-						</div>
+					<div ref="gridParent" style="height: 100vh">
+						<!-- <div ref="gridParent" class="px-5 h100">
+						</div> -->
+						<component
+							:ref="gridName"
+							:is="loadGrid ? 'Grid' : null"
+							:parentPrgmId="myPrgmId"
+							:gridName="gridName"
+							@getRowsData="getRowData"
+						/>
 					</div>
 				</v-card>
 			</v-col>
@@ -262,8 +261,6 @@ export default {
 			});
 
 			// this.getRowGridData();
-
-			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -296,7 +293,8 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-
+			this.loadGrid = true;
+			
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({
@@ -316,6 +314,14 @@ export default {
 			});
 		},
 		async getRowData(data, gridName) {
+			console.log("-----------------------DEBUG--getRowData--------------",
+			{
+				gridKey: gridName,
+				gridSelect: true,
+				rowGridSelectKey: data.rowKey,
+				rowGridSelectData: data,
+			}
+			);
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,
@@ -327,6 +333,7 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
+			
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {

From eeadcd254d15778d3b12470e1e1aa53f8574faa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Wed, 30 Jul 2025 08:32:27 +0700
Subject: [PATCH 05/17] remove console log

---
 components/common/Grid.vue      | 12 ++++++------
 pages/comm/base/PrgmMngPage.vue | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/common/Grid.vue b/components/common/Grid.vue
index 507da54..979ce03 100644
--- a/components/common/Grid.vue
+++ b/components/common/Grid.vue
@@ -268,12 +268,12 @@ export default {
 			});
 		},
 		focusChangeEvt(e) {
-			console.log("------------------DEBUG-------focusChangeEvt:", e);
+			// console.log("------------------DEBUG-------focusChangeEvt:", e);
 			// console.log('focusChangeEvt1...')
-			// if (this.preventFocusChangeEvent(e)) {
-			// 	// console.log('prevent focusChangeEvt')
-			// 	return;
-			// }
+			if (this.preventFocusChangeEvent(e)) {
+				// console.log('prevent focusChangeEvt')
+				return;
+			}
 			// console.log('focusChangeEvt2...')
 			// cell 선택시 row 선택 method
 			if (e.rowKey >= 0) {
@@ -289,7 +289,7 @@ export default {
 			this.sendSelectedRowData(e.rowKey);
 		},
 		startEditing(e) {
-			console.log("------------DEBUG-----startEditing----", e);
+			// console.log("------------DEBUG-----startEditing----", e);
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent startEditing')
diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue
index 0d8c246..29bf534 100644
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@@ -314,14 +314,14 @@ export default {
 			});
 		},
 		async getRowData(data, gridName) {
-			console.log("-----------------------DEBUG--getRowData--------------",
-			{
-				gridKey: gridName,
-				gridSelect: true,
-				rowGridSelectKey: data.rowKey,
-				rowGridSelectData: data,
-			}
-			);
+			// console.log("-----------------------DEBUG--getRowData--------------",
+			// {
+			// 	gridKey: gridName,
+			// 	gridSelect: true,
+			// 	rowGridSelectKey: data.rowKey,
+			// 	rowGridSelectData: data,
+			// }
+			// );
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,

From b4f8e41c7e5ec6677eb3670c906ded9a8682eae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Wed, 30 Jul 2025 09:15:11 +0700
Subject: [PATCH 06/17] update screen 34, fix bug grid - select item

---
 components/common/Grid.vue      | 3 ++-
 pages/comm/base/PrgmMngPage.vue | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/components/common/Grid.vue b/components/common/Grid.vue
index 979ce03..761a321 100644
--- a/components/common/Grid.vue
+++ b/components/common/Grid.vue
@@ -4,13 +4,14 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
-		@focusChange="focusChangeEvt"
+		@mousedown="focusChangeEvt"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
 	/>
+		<!-- @focusChange="focusChangeEvt" -->
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex';
diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue
index 29bf534..0e4b4dc 100644
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@@ -16,7 +16,7 @@
 								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="프로그램명"
@@ -314,14 +314,12 @@ export default {
 			});
 		},
 		async getRowData(data, gridName) {
-			// console.log("-----------------------DEBUG--getRowData--------------",
-			// {
+			// console.log("-----------------------DEBUG--getRowData--------------", {
 			// 	gridKey: gridName,
 			// 	gridSelect: true,
 			// 	rowGridSelectKey: data.rowKey,
 			// 	rowGridSelectData: data,
-			// }
-			// );
+			// });
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,

From 205821fc11b8c2a42eea68b8e21bb7a72d87f3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vu=20Trung=20Kien/=28Vu=20Trung=20Kien=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074468@skcc.com>
Date: Wed, 30 Jul 2025 11:39:45 +0900
Subject: [PATCH 07/17] fix ui EvtObjPop

---
 assets/scss/common/input.scss         | 12 +-----------
 components/common/modal/EvtObjPop.vue |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss
index 1679115..ccc3e55 100644
--- a/assets/scss/common/input.scss
+++ b/assets/scss/common/input.scss
@@ -1,5 +1,5 @@
 .v-select__custom {
-  padding: 0;
+  padding: 0.125rem;
   
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;
@@ -78,16 +78,6 @@
     border-color: #d9d9d9;
   }
 
-  &.select-large {
-    .v-input__slot,
-    .v-input__control {
-      height: 40px !important;
-      // border: solid 1px #D9D9D9;
-      border-radius: 8px !important;
-    }
-
-  }
-
   &.surface-name {
     fieldset {
       max-width: 345px;
diff --git a/components/common/modal/EvtObjPop.vue b/components/common/modal/EvtObjPop.vue
index 70ef42c..14d33da 100644
--- a/components/common/modal/EvtObjPop.vue
+++ b/components/common/modal/EvtObjPop.vue
@@ -9,7 +9,7 @@
 		</v-col>
 		<v-col :cols="option.textCols" class="py-0">
 			<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
-				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
+				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)" style="padding: 0;"
 				:required="item.required || false"><template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>

From c2e2c10a8ab3bbeac8ec6d3d6174821b8490d196 Mon Sep 17 00:00:00 2001
From: Michael <20074391@skcc.com>
Date: Wed, 30 Jul 2025 12:35:12 +0900
Subject: [PATCH 08/17] Update s14 s29 + Fix bugs s1 + Update datepicker height

---
 assets/scss/datepicker.scss                  |   7 +-
 components/common/Datepicker.vue             |   9 +-
 components/common/chartoptions/LineChart.js  |   7 +-
 pages/comm/base/CalendarMngPage.vue          |   2 +-
 pages/comm/base/CommCdMngPage.vue            |   6 +-
 pages/ems/base/DashboardPage.vue             |  33 ++-
 pages/ems/base/EnrgResourceCenterMngPage.vue |  25 +-
 pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue   |   2 +-
 pages/ems/effc/EnrgUseTotSummPage.vue        |  21 +-
 pages/ems/effc/EqpmIndMntrPage.vue           | 295 +++----------------
 10 files changed, 105 insertions(+), 302 deletions(-)

diff --git a/assets/scss/datepicker.scss b/assets/scss/datepicker.scss
index f8963b1..ffc8c88 100644
--- a/assets/scss/datepicker.scss
+++ b/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 {
 
         // ----------------------
diff --git a/components/common/Datepicker.vue b/components/common/Datepicker.vue
index 0a71957..f4b0ce4 100644
--- a/components/common/Datepicker.vue
+++ b/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 {
diff --git a/components/common/chartoptions/LineChart.js b/components/common/chartoptions/LineChart.js
index 7d5ebce..fd53fa9 100644
--- a/components/common/chartoptions/LineChart.js
+++ b/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: {
diff --git a/pages/comm/base/CalendarMngPage.vue b/pages/comm/base/CalendarMngPage.vue
index a966f0d..28134b8 100644
--- a/pages/comm/base/CalendarMngPage.vue
+++ b/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" />
diff --git a/pages/comm/base/CommCdMngPage.vue b/pages/comm/base/CommCdMngPage.vue
index db344e4..db42494 100644
--- a/pages/comm/base/CommCdMngPage.vue
+++ b/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({
diff --git a/pages/ems/base/DashboardPage.vue b/pages/ems/base/DashboardPage.vue
index 861db5a..ef3480a 100644
--- a/pages/ems/base/DashboardPage.vue
+++ b/pages/ems/base/DashboardPage.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="l-layout">
-    <!-- <h1 class="h1-title">대시보드</h1> -->
-    <PageTitle text="대시보드" />
+		<CommonPageTitle/>
     <!-- <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"),
diff --git a/pages/ems/base/EnrgResourceCenterMngPage.vue b/pages/ems/base/EnrgResourceCenterMngPage.vue
index 4598dc5..98cc445 100644
--- a/pages/ems/base/EnrgResourceCenterMngPage.vue
+++ b/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'"
-									:is="'Form'"
-									:parentPrgmId="myPrgmId"
-									:detailList="detailList"
-									@gridEditingFinish="gridEditingFinish"
+										v-if="item.id == 'ercInfoTab'"
+										:is="'Form'"
+										:parentPrgmId="myPrgmId"
+										:detailList="detailList"
+										@gridEditingFinish="gridEditingFinish"
 								/>
 								<ErcChrgInfoTab
-									v-if="item.id == 'ercChrgInfoTab'"
-									:parentPrgmId="myPrgmId"
-									:innerTabGridInfo="{ tab, idx }"
+										v-if="item.id == 'ercChrgInfoTab'"
+										:parentPrgmId="myPrgmId"
+										:innerTabGridInfo="{ tab, idx }"
 								/>
 							</v-tab-item>
 						</v-tabs-items>
diff --git a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
index 973aea7..fe6a834 100644
--- a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
+++ b/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;
     },
diff --git a/pages/ems/effc/EnrgUseTotSummPage.vue b/pages/ems/effc/EnrgUseTotSummPage.vue
index bebfc89..a8b0860 100644
--- a/pages/ems/effc/EnrgUseTotSummPage.vue
+++ b/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({
-      //     apiKey: "selectEnrgUseTotSumm",
-      //     resKey: "data",
-      //     sendParam: {
-      //       fromDt: this.pageData.fromDt,
-      //       eqpmKind: this.selectValue01,
-      //     },
-      //   });
-      let res = [];
+      var res = await this.postApiReturn({
+          apiKey: "selectEnrgUseTotSumm",
+          resKey: "data",
+          sendParam: {
+            fromDt: this.pageData.fromDt,
+            eqpmKind: this.selectValue01,
+          },
+      });
 
       if (this.testFlag == true) {
         res = [
diff --git a/pages/ems/effc/EqpmIndMntrPage.vue b/pages/ems/effc/EqpmIndMntrPage.vue
index efba90d..1b18b7e 100644
--- a/pages/ems/effc/EqpmIndMntrPage.vue
+++ b/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.setQueryParams();
+      await this.getSelectValueList();
+      await this.setQueryParams();
       this.gridInit();
       await this.getGridData();
 
@@ -488,131 +487,41 @@ export default {
       this.loadGrid = false;
       this.enrgUseMainIdxDesc = [];
       var apiKey = null;
-      // var params = {
-      //   fabId: this.selectValue01,
-      //   eqpmKindId: this.selectValue02,
-      //   eqpmGrpId: this.selectValue03,
-      //   fromDt: this.pageData.fromDt,
-      // };
+      var params = {
+        fabId: this.selectValue01,
+        eqpmKindId: this.selectValue02,
+        eqpmGrpId: this.selectValue03,
+        fromDt: this.pageData.fromDt,
+      };
 
-      // if (this.pageData.cmCycle == "CYC_DAY") {
-      //   params["fromDtMm"] = String(this.pageData.fromDt).substring(0, 6);
-      //   apiKey = "selectDailyEnrgUseMainIdx";
-      // } else if (this.pageData.cmCycle == "CYC_MONTH") {
-      //   apiKey = "selectMonthlyEnrgUseMainIdx";
-      // }
+      if (this.pageData.cmCycle == "CYC_DAY") {
+        params["fromDtMm"] = String(this.pageData.fromDt).substring(0, 6);
+        apiKey = "selectDailyEnrgUseMainIdx";
+      } else if (this.pageData.cmCycle == "CYC_MONTH") {
+        apiKey = "selectMonthlyEnrgUseMainIdx";
+      }
 
-      // var res = await this.postApiReturn({
-      //   apiKey: apiKey,
-      //   resKey: "eqpmIndMntrData",
-      //   sendParam: params,
-      // });
+      var res = await this.postApiReturn({
+        apiKey: apiKey,
+        resKey: "eqpmIndMntrData",
+        sendParam: params,
+      });
 
-      // this.enrgUseMainIdxDesc = await this.postApiReturn({
-      //   apiKey: "selectEnrgUseMainIdxDesc",
-      //   resKey: "eqpmIndMntrData",
-      //   sendParam: {
-      //     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,
+      this.enrgUseMainIdxDesc = await this.postApiReturn({
+        apiKey: "selectEnrgUseMainIdxDesc",
+        resKey: "eqpmIndMntrData",
+        sendParam: {
+          eqpmGrpId: this.selectValue03,
         },
-        {
-          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++) {
-      //   newRes.push({
-      //     ...res[i],
-      //     no: i + 1,
-      //   });
-      // }
+      var newRes = [];
+      for (var i = 0; i < res.length; i++) {
+        newRes.push({
+          ...res[i],
+          no: i + 1,
+        });
+      }
 
       this.setGridData({
         gridKey: this.gridName,
@@ -752,141 +661,9 @@ const defaultData = {
   },
   fromDt: Utility.setFormatDate(new Date(), "YYYYMM"), // 조회 시작일
   grid01: {
-    data: [
-      {
-        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,
-      },
-    ],
-    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",
-            ],
-          },
-        ],
-      },
-    },
+    data: [],
+    column: [],
+    option: {},
   },
 };
 

From 2338bbf2ecd758ea656f130c6d05b423be0da84a Mon Sep 17 00:00:00 2001
From: Michael <20074391@skcc.com>
Date: Wed, 30 Jul 2025 15:01:44 +0900
Subject: [PATCH 09/17] Remove log + fix click chart top 10

---
 pages/ems/base/DashboardPage.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pages/ems/base/DashboardPage.vue b/pages/ems/base/DashboardPage.vue
index ef3480a..1cd6979 100644
--- a/pages/ems/base/DashboardPage.vue
+++ b/pages/ems/base/DashboardPage.vue
@@ -1409,7 +1409,6 @@ export default {
       //   series: seriesData,
       // };
       await this.$nextTick(() => {});
-      console.log('line:',chartOption);
       this.setChartOption({
         chartKey: "compareEqpmTotChart",
         value: chartOption,
@@ -1722,13 +1721,10 @@ 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"];
+        return item.eqpmId == event["data"]["name"];
       });
-      console.log('select data:',selectedChartData)
       var data = {
         cmCycle: "CYC_DAY",
         fromDt: Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),

From 6077dddb744b2c8dbc95f27a5e701643965ac4c6 Mon Sep 17 00:00:00 2001
From: Michael <20074391@skcc.com>
Date: Wed, 30 Jul 2025 15:35:41 +0900
Subject: [PATCH 10/17] Remove mockdata screen 5

---
 pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue | 1267 +++++++++-----------
 1 file changed, 540 insertions(+), 727 deletions(-)

diff --git a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
index fe6a834..cea8138 100644
--- a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
@@ -1,7 +1,6 @@
 <template>
   <div ref="mainDiv" class="l-layout">
-    <PageTitle text="에너지 사용량 이력" />
-
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -76,6 +75,7 @@
                 :parentPrgmId="myPrgmId"
                 :isRangeOption="false"
                 :textCols="12"
+                :customClass="'datepicker-large'"
               />
             </v-col>
             <v-col :cols="6" class="text-right">
@@ -249,355 +249,317 @@ let myPrgmId;
 let paramKey;
 
 export default {
-  mixins: [mixinGlobal, resize],
-  async asyncData(context) {
-    const myState = context.store.state;
-    myPrgmId = context.route.query.prgmId;
+	mixins: [mixinGlobal, resize],
+	async asyncData(context) {
+		const myState = context.store.state;
+		myPrgmId = context.route.query.prgmId;
     await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
-    myTitle = await myState.activeMenuInfo.menuNm;
-  },
-  meta: {
-    title: () => {
-      return myTitle;
-    },
-    prgmId: myPrgmId,
-    closable: true,
-  },
-  components: {
-    Utility,
-    SelectBox,
-    SelectCmCycle,
-    DatePicker,
-    Grid,
-    Chart,
-    PageTitle,
-  },
-  data() {
-    return {
-      myPrgmId: myPrgmId,
+		myTitle = await myState.activeMenuInfo.menuNm;
+	},
+	meta: {
+		title: () => {
+			return myTitle;
+		},
+		prgmId: myPrgmId,
+		closable: true,
+	},
+	components: {
+		Utility,
+		SelectBox,
+		SelectCmCycle,
+		DatePicker,
+		Grid,
+		Chart,
+	},
+	data() {
+		return {
+			myPrgmId: myPrgmId,
 
-      initedFlag: false,
-      queryParams: null,
+			initedFlag: false,
+			queryParams: null,
 
-      selectValueList01: [],
-      selectValueList02: [],
-      selectValueList03: [],
-      selectValueList04: [],
+			selectValueList01: [],
+			selectValueList02: [],
+			selectValueList03: [],
+			selectValueList04: [],
 
-      selectValue01: null,
-      selectValue02: null,
-      selectValue03: null,
-      selectValue04: null,
+			selectValue01: null,
+			selectValue02: null,
+			selectValue03: null,
+			selectValue04: null,
 
-      contentData01: {},
+			contentData01: {},
 
-      loadGrid01: false,
-      loadGrid02: false,
+			loadGrid01: false,
+			loadGrid02: false,
       gridName01: "grid01",
       gridName02: "grid02",
 
-      loadTrendChart: false,
-    };
-  },
-  computed: {
-    ...mapState({
+			loadTrendChart: false,
+		};
+	},
+	computed: {
+		...mapState({
       pageData: (state) => state.pageData[myPrgmId],
-    }),
-    fromDt() {
-      return this.pageData.fromDt;
-    },
-  },
-  watch: {
-    async $route(to, from) {
-      if (to.query.prgmId == myPrgmId) {
-        if (to.params.key) {
+		}),
+		fromDt() {
+			return this.pageData.fromDt;
+		},
+	},
+	watch: {
+		async $route(to, from) {
+			if (to.query.prgmId == myPrgmId) {
+				if (to.params.key) {
           document.getElementById("refresh").click();
-        }
-      }
-    },
-    async selectValue01(value) {
-      if (this.initedFlag) {
-        // await this.search();
-        await this.getSelectValueList04();
-      }
-    },
-    async selectValue02(value) {
-      if (this.initedFlag) {
-        await this.getSelectValueList03();
-      }
-    },
-    async selectValue03(value) {
-      if (this.initedFlag) {
-        await this.getSelectValueList04();
-      }
-    },
-    async selectValue04(value) {
-      if (this.initedFlag) {
-        await this.search();
-      }
-    },
-    async fromDt(value) {
-      if (this.initedFlag) {
-        await this.search();
-      }
-    },
-  },
-  async beforeCreate() {
-    myPrgmId = this.$route.query.prgmId;
+				}
+			}
+		},
+		async selectValue01(value) {
+			if (this.initedFlag) {
+				// await this.search();
+				await this.getSelectValueList04();
+			}
+		},
+		async selectValue02(value) {
+			if (this.initedFlag) {
+				await this.getSelectValueList03();
+			}
+		},
+		async selectValue03(value) {
+			if (this.initedFlag) {
+				await this.getSelectValueList04();
+			}
+		},
+		async selectValue04(value) {
+			if (this.initedFlag) {
+				await this.search();
+			}
+		},
+		async fromDt(value) {
+			if (this.initedFlag) {
+				await this.search();
+			}
+		},
+	},
+	async beforeCreate() {
+		myPrgmId = this.$route.query.prgmId;
     await this.$store.dispatch("chkOpenTabList", {
       key: "create",
-      prgmId: myPrgmId,
-      defaultData: defaultData,
-    });
-  },
-  created() {},
-  mounted() {
-    this.init();
-  },
-  beforeDestroy() {
-    this.initedFlag = false;
+			prgmId: myPrgmId,
+			defaultData: defaultData,
+		});
+	},
+	created() {},
+	mounted() {
+		this.init();
+	},
+	beforeDestroy() {
+		this.initedFlag = false;
     this.chkOpenTabList({ key: "destroy", prgmId: myPrgmId });
-  },
-  methods: {
-    ...mapMutations({
+	},
+	methods: {
+		...mapMutations({
       setChartOption: "setChartOption",
-    }),
-    async init() {
-      await this.search();
+		}),
+		async init() {
+			await this.getSelectValueList();
+			await this.setQueryParams();
+			await this.search();
 
-      await this.getSelectValueList();
-      await this.setQueryParams();
+			this.initedFlag = true;
+		},
+		async setQueryParams() {
+			this.queryParams = null;
 
-      this.initedFlag = true;
-    },
-    async setQueryParams() {
-      this.queryParams = null;
-
-      if (paramKey == this.$route.params.key) {
-        return;
-      }
-      if (this.$route.params.key) {
-        paramKey = this.$route.params.key;
-        this.queryParams = this.$route.params;
-      }
+			if (paramKey == this.$route.params.key) {
+				return;
+			}
+			if (this.$route.params.key) {
+				paramKey = this.$route.params.key;
+				this.queryParams = this.$route.params;
+			}
 
       if (this.queryParams && typeof this.queryParams == "object") {
-        this.setPageData({
-          dateInitedFlag: true,
-        });
+				this.setPageData({
+					dateInitedFlag: true,
+				});
         this.selectValue01 = this.queryParams["fabId"];
         this.selectValue02 = this.queryParams["eqpmKindId"];
-        await this.getSelectValueList03();
+				await this.getSelectValueList03();
         this.selectValue03 = this.queryParams["eqpmGrpId"];
-        await this.getSelectValueList04();
+				await this.getSelectValueList04();
         this.selectValue04 = this.queryParams["eqpmId"];
 
-        this.setPageData({
+				this.setPageData({
           fromDt: this.queryParams["fromDt"],
           cmCycle: this.queryParams["cmCycle"],
-        });
-      }
-    },
-    async getSelectValueList() {
-      await this.getSelectValueList01();
-      await this.getSelectValueList02();
-      await this.getSelectValueList03();
-      await this.getSelectValueList04();
-    },
-    async getSelectValueList01() {
-      let res = await this.postApiReturn({
+				});
+			}
+		},
+		async getSelectValueList() {
+			await this.getSelectValueList01();
+			await this.getSelectValueList02();
+			await this.getSelectValueList03();
+			await this.getSelectValueList04();
+		},
+		async getSelectValueList01() {
+			let res = await this.postApiReturn({
         apiKey: "selectFabCodeList",
         resKey: "fabCodeLists",
-        sendParam: {},
-      });
-      if (res.length > 0) {
+				sendParam: {},
+			});
+			if (res.length > 0) {
         this.selectValueList01 = await res.map((item) => {
-          return {
-            text: item.eccNm,
-            value: item.eccId,
-          };
-        });
-        this.selectValue01 = this.selectValueList01[0].value;
-      } else {
-        this.selectValueList01 = [];
-        this.selectValue01 = null;
-      }
-    },
-    async getSelectValueList02() {
-      var res = await this.postApiReturn({
+					return {
+						text: item.eccNm,
+						value: item.eccId,
+					};
+				});
+				this.selectValue01 = this.selectValueList01[0].value;
+			} else {
+				this.selectValueList01 = [];
+				this.selectValue01 = null;
+			}
+		},
+		async getSelectValueList02() {
+			var res = await this.postApiReturn({
         apiKey: "selectEmsEqpmKindList",
         resKey: "eqpmGrpPysclQtyMngData",
-        sendParam: {},
-      });
+				sendParam: {},
+			});
 
-      if (res.length > 0) {
+			if (res.length > 0) {
         this.selectValueList02 = await res.map((item) => {
-          return {
-            text: item.eqpmKindNm,
-            value: item.eqpmKindId,
-            data: {
-              ...item,
-            },
-          };
-        });
-        this.selectValue02 = this.selectValueList02[0].value;
-      } else {
-        this.selectValueList02 = [];
-        this.selectValue02 = null;
-      }
-    },
-    async getSelectValueList03() {
-      var res = await this.postApiReturn({
+					return {
+						text: item.eqpmKindNm,
+						value: item.eqpmKindId,
+						data: {
+							...item,
+						},
+					};
+				});
+				this.selectValue02 = this.selectValueList02[0].value;
+			} else {
+				this.selectValueList02 = [];
+				this.selectValue02 = null;
+			}
+		},
+		async getSelectValueList03() {
+			var res = await this.postApiReturn({
         apiKey: "selectEmsEqpmGrpList",
         resKey: "eqpmGrpPysclQtyMngData",
-        sendParam: {
-          eqpmKindId: this.selectValue02,
-        },
-      });
+				sendParam: {
+					eqpmKindId: this.selectValue02,
+				},
+			});
 
-      if (res.length > 0) {
+			if (res.length > 0) {
         this.selectValueList03 = await res.map((item) => {
-          return {
-            text: item.eqpmGrpNm,
-            value: item.eqpmGrpId,
-            data: {
-              ...item,
-            },
-          };
-        });
-        this.selectValue03 = this.selectValueList03[0].value;
-      } else {
-        this.selectValueList03 = [];
-        this.selectValue03 = null;
-      }
-    },
-    async getSelectValueList04() {
-      var res = await this.postApiReturn({
+					return {
+						text: item.eqpmGrpNm,
+						value: item.eqpmGrpId,
+						data: {
+							...item,
+						},
+					};
+				});
+				this.selectValue03 = this.selectValueList03[0].value;
+			} else {
+				this.selectValueList03 = [];
+				this.selectValue03 = null;
+			}
+		},
+		async getSelectValueList04() {
+			var res = await this.postApiReturn({
         apiKey: "selectFabEqpmList",
         resKey: "enrgUseEqpmDetlMntrData",
-        sendParam: {
-          fabId: this.selectValue01,
-          eqpmGrpId: this.selectValue03,
-        },
-      });
+				sendParam: {
+					fabId: this.selectValue01,
+					eqpmGrpId: this.selectValue03,
+				},
+			});
 
-      if (res.length > 0) {
+			if (res.length > 0) {
         this.selectValueList04 = await res.map((item) => {
-          return {
-            text: item.eqpmNm,
-            value: item.eqpmId,
-            data: {
-              ...item,
-            },
-          };
-        });
-        this.selectValue04 = this.selectValueList04[0].value;
-      } else {
-        this.selectValueList04 = [];
-        this.selectValue04 = null;
-      }
-    },
-    async search() {
-      // console.log('search ...');
-      // console.log('selectValue01 : ', this.selectValue01);
-      // console.log('selectValue02 : ', this.selectValue02);
-      // console.log('selectValue03 : ', this.selectValue03);
-      // console.log('selectValue04 : ', this.selectValue04);
-      // console.log('cmCycle : ', this.pageData.cmCycle);
-      // console.log('fromDt : ', this.fromDt);
+					return {
+						text: item.eqpmNm,
+						value: item.eqpmId,
+						data: {
+							...item,
+						},
+					};
+				});
+				this.selectValue04 = this.selectValueList04[0].value;
+			} else {
+				this.selectValueList04 = [];
+				this.selectValue04 = null;
+			}
+		},
+		async search() {
+			// console.log('search ...');
+			// console.log('selectValue01 : ', this.selectValue01);
+			// console.log('selectValue02 : ', this.selectValue02);
+			// console.log('selectValue03 : ', this.selectValue03);
+			// console.log('selectValue04 : ', this.selectValue04);
+			// console.log('cmCycle : ', this.pageData.cmCycle);
+			// console.log('fromDt : ', this.fromDt);
 
-      await this.setContentData();
+			await this.setContentData();
 
-      this.setPageData({
-        dateInitedFlag: false,
-      });
-    },
+			this.setPageData({
+				dateInitedFlag: false,
+			});
+		},
     reloadChart() {
       this.loadChart = false;
       this.$nextTick(() => {
         this.loadChart = true;
       });
     },
-    async setContentData() {
-      await this.setContentData01();
-      await this.setContentData02();
-      await this.setContentData03();
-      await this.setContentData04();
-
-      //   await this.setContentData01();
-      //   await this.setContentData02();
-      //   await this.setContentData03();
-      //   await this.setContentData04();
-    },
-    async setContentData01() {
-      var apiKey = null;
-      var res = null;
-      this.contentData01 = {};
+		async setContentData() {
+			await this.setContentData01();
+			await this.setContentData02();
+			await this.setContentData03();
+			// await this.setContentData04();
+		},
+		async setContentData01() {
+			var apiKey = null;
+			var res = null;
+			this.contentData01 = {};
 
       if (this.pageData.cmCycle == "CYC_DAY") {
         apiKey = "selectDailyEnrgUseMainGuideIdx";
       } else if (this.pageData.cmCycle == "CYC_MONTH") {
         apiKey = "selectMonthlyEnrgUseMainGuideIdx";
-      }
+			}
 
-      //   res = await this.postApiReturn({
-      //     apiKey: apiKey,
-      //     resKey: "enrgUseEqpmDetlMntrData",
-      //     sendParam: {
-      //       eqpmGrpId: this.selectValue03,
-      //       eqpmId: this.selectValue04,
-      //       fromDt: this.fromDt,
-      //     },
-      //   });
-
-      res = [
-        {
-          gdIdxId: "A01",
-          gdIdxNm: "Temperature",
-          dataNum: 0,
-          totVal: 23.5,
-          timestamp: "2025-07-15T10:00:00Z",
-        },
-        {
-          gdIdxId: "C03",
-          gdIdxNm: "Power Usage",
-          dataNum: 1,
-          totVal: 24.1,
-          timestamp: "2025-07-15T11:00:00Z",
-        },
-        {
-          gdIdxId: "B02",
-          gdIdxNm: "Humidity",
-          dataNum: 0,
-          totVal: 60,
-          timestamp: "2025-07-15T10:00:00Z",
-        },
-        {
-          gdIdxId: "B03",
-          gdIdxNm: "Test",
-          dataNum: 0,
-          totVal: 50,
-          timestamp: "2025-07-19T10:00:00Z",
-        },
-      ];
-
-      this.contentData01 = await this.makeContentData01(res);
+			res = await this.postApiReturn({
+				apiKey: apiKey,
+				resKey: 'enrgUseEqpmDetlMntrData',
+				sendParam: {
+					eqpmGrpId: this.selectValue03,
+					eqpmId: this.selectValue04,
+					fromDt: this.fromDt,
+				},
+			});
+      console.log('res 01:',res)
+			this.contentData01 = await this.makeContentData01(res);
       console.log("content", this.contentData01);
       await this.setChartGroup01(this.contentData01);
       this.reloadChart();
-    },
-    async setContentData02() {
-      const _this = this;
-      const myOptions = {
-        columnOptions: {
-          resizable: true,
-        },
+		},
+		async setContentData02() {
+			const _this = this;
+			const myOptions = {
+				columnOptions: {
+					resizable: true,
+				},
         header: {
           height: 38,
         },
-      };
-      const gridHeight = this.$refs.mainDiv.offsetHeight * 0.17;
-      var columnList = [
+			};
+			const gridHeight = this.$refs.mainDiv.offsetHeight * 0.17;
+			var columnList = [
         { header: "NO", name: "no", width: 40, align: "center" },
         { header: "gdIdxId", name: "gdIdxId", hidden: true },
         { header: "totDttm", name: "totDttm", hidden: true },
@@ -609,384 +571,299 @@ export default {
         { header: "경고값", name: "warnStndVal", hidden: true },
         { header: "알람종류", name: "alrmKind", hidden: true },
         { header: "알람내용", name: "alrmMsg" },
-      ];
-      var res = [];
-      var newRes = [];
+			];
+			var res = [];
+			var newRes = [];
 
-      this.loadGrid01 = false;
+			this.loadGrid01 = false;
 
-      //   res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseGuideAlarmInfo",
-      //     resKey: "enrgUseEqpmDetlMntrData",
-      //     sendParam: {
-      //       cmCycle: this.pageData.cmCycle,
-      //       eqpmId: this.selectValue04,
-      //       fromDt: this.fromDt,
-      //       alrmKind: ["WARN", "CARE"],
-      //     },
-      //   });
-      res = [
-        {
-          gdIdxId: "PQ001",
-          totDttm: "TEMP",
-          totDt: "Temperature",
-          totTm: "Analog",
-          gdIdxNm: "PQ001",
-          totVal: "TEMP",
-          caseStndVal: "Temperature",
-          warnStndVal: "Analog",
-          alrmKind: "PQ001",
-          alrmMsg: "TEMP",
-        },
-        {
-          gdIdxId: "PQ001",
-          totDttm: "TEMP",
-          totDt: "Temperature",
-          totTm: "Analog",
-          gdIdxNm: "PQ001",
-          totVal: "TEMP",
-          caseStndVal: "Temperature",
-          warnStndVal: "Analog",
-          alrmKind: "PQ001",
-          alrmMsg: "TEMP",
-        },
-      ];
+			res = await this.postApiReturn({
+				apiKey: 'selectEnrgUseGuideAlarmInfo',
+				resKey: 'enrgUseEqpmDetlMntrData',
+				sendParam: {
+					cmCycle: this.pageData.cmCycle,
+					eqpmId: this.selectValue04,
+					fromDt: this.fromDt,
+					alrmKind: ['WARN', 'CARE'],
+				},
+			});
 
-      for (var i = 0; i < res.length; i++) {
-        newRes.push({
-          ...res[i],
-          no: i + 1,
-        });
-      }
+			for (var i = 0; i < res.length; i++) {
+				newRes.push({
+					...res[i],
+					no: i + 1,
+				});
+			}
 
-      this.setGridOption({
-        gridKey: this.gridName01,
-        value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
-      });
-      this.setGridColumn({
-        gridKey: this.gridName01,
-        value: columnList,
-      });
-      this.setGridData({
-        gridKey: this.gridName01,
-        value: newRes,
-      });
+			this.setGridOption({
+				gridKey: this.gridName01,
+				value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
+			});
+			this.setGridColumn({
+				gridKey: this.gridName01,
+				value: columnList,
+			});
+			this.setGridData({
+				gridKey: this.gridName01,
+				value: newRes,
+			});
 
-      this.loadGrid01 = true;
-    },
-    async setContentData03() {
-      const _this = this;
-      const myOptions = {
-        columnOptions: {
-          resizable: true,
-        },
+			this.loadGrid01 = true;
+		},
+		async setContentData03() {
+			const _this = this;
+			const myOptions = {
+				columnOptions: {
+					resizable: true,
+				},
         header: {
           height: 38,
         },
-      };
-      const gridHeight = this.$refs.mainDiv.offsetHeight * 0.17;
-      var columnList = [
+			};
+			const gridHeight = this.$refs.mainDiv.offsetHeight * 0.17;
+			var columnList = [
         { header: "NO", name: "no", align: "right", width: 40 },
         { header: "물리량ID", name: "pysclQtyId", width: 100, align: "left" },
         { header: "물리량코드", name: "pysclQtyCd", align: "left" },
         { header: "물리량명", name: "pysclQtyNm", width: 190, align: "left" },
         { header: "물리량타입", name: "pysclQtyTp", width: 100, align: "left" },
-      ];
-      var res = [];
-      var newRes = [];
+			];
+			var res = [];
+			var newRes = [];
 
-      this.loadGrid02 = false;
+			this.loadGrid02 = false;
 
-      //   res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseEqpmDescInfo",
-      //     resKey: "enrgUseEqpmDetlMntrData",
-      //     sendParam: {
-      //       eqpmGrpId: this.selectValue03,
-      //     },
-      //   });
-      res = [
-        {
-          pysclQtyId: "PQ001",
-          pysclQtyCd: "TEMP",
-          pysclQtyNm: "Temperature",
-          pysclQtyTp: "Analog",
-        },
-        {
-          pysclQtyId: "PQ002",
-          pysclQtyCd: "PRESS",
-          pysclQtyNm: "Pressure",
-          pysclQtyTp: "Analog",
-        },
-        {
-          pysclQtyId: "PQ003",
-          pysclQtyCd: "FLOW",
-          pysclQtyNm: "Flow Rate",
-          pysclQtyTp: "Digital",
-        },
-      ];
+			res = await this.postApiReturn({
+				apiKey: 'selectEnrgUseEqpmDescInfo',
+				resKey: 'enrgUseEqpmDetlMntrData',
+				sendParam: {
+					eqpmGrpId: this.selectValue03,
+				},
+			});
 
-      for (var i = 0; i < res.length; i++) {
-        newRes.push({
-          ...res[i],
-          no: i + 1,
-        });
-      }
+			for (var i = 0; i < res.length; i++) {
+				newRes.push({
+					...res[i],
+					no: i + 1,
+				});
+			}
 
-      this.setGridOption({
-        gridKey: this.gridName02,
-        value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
-      });
-      this.setGridColumn({
-        gridKey: this.gridName02,
-        value: columnList,
-      });
-      this.setGridData({
-        gridKey: this.gridName02,
-        value: newRes,
-      });
+			this.setGridOption({
+				gridKey: this.gridName02,
+				value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
+			});
+			this.setGridColumn({
+				gridKey: this.gridName02,
+				value: columnList,
+			});
+			this.setGridData({
+				gridKey: this.gridName02,
+				value: newRes,
+			});
 
-      this.loadGrid02 = true;
+			this.loadGrid02 = true;
 
-      await this.$nextTick();
-      //   this.$refs[this.gridName02].focus({
-      //     rowKey: 0,
-      //     columnName: "no",
-      //     setScroll: true,
-      //   });
-    },
-    async setContentData04(selectedData) {
-      var res = null;
-      var _this = this;
-      var xAxisData = null;
-      var seriesData = null;
-      var sliderHandleSize = 100;
+			await this.$nextTick();
+			this.$refs[this.gridName02].focus({
+				rowKey: 0,
+				columnName: 'no',
+				setScroll: true,
+			});
+		},
+		async setContentData04(selectedData) {
+			var res = null;
+			var _this = this;
+			var xAxisData = null;
+			var seriesData = null;
+			var sliderHandleSize = 100;
 
-      this.loadTrendChart = false;
+			this.loadTrendChart = false;
 
-      xAxisData = this.makeTrendChartXaxisData();
-      console.log("x axis :", xAxisData);
+			xAxisData = this.makeTrendChartXaxisData();
 
       if (this.pageData.cmCycle == "CYC_MONTH") {
-        sliderHandleSize = ((24 / xAxisData.length) * 100 * 24) / 25;
-      }
+				sliderHandleSize = ((24 / xAxisData.length) * 100 * 24) / 25;
+			}
 
-      //   res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseHourlyTrendInfo",
-      //     resKey: "enrgUseEqpmDetlMntrData",
-      //     sendParam: {
-      //       pysclQtyId: selectedData.pysclQtyId,
-      //       eqpmId: this.selectValue04,
-      //       fromDt: this.fromDt,
-      //       cmCycle: this.pageData.cmCycle,
-      //     },
-      //   });
+			res = await this.postApiReturn({
+				apiKey: 'selectEnrgUseHourlyTrendInfo',
+				resKey: 'enrgUseEqpmDetlMntrData',
+				sendParam: {
+					pysclQtyId: selectedData.pysclQtyId,
+					eqpmId: this.selectValue04,
+					fromDt: this.fromDt,
+					cmCycle: this.pageData.cmCycle,
+				},
+			});
 
-      res = [
-        { monthCnt: 0, totVal: 120 },
-        { monthCnt: 1, totVal: 150 },
-        { monthCnt: 2, totVal: 180 },
-        { monthCnt: 3, totVal: 200 },
-      ];
+			seriesData = new Array(xAxisData.length).fill(NaN);
 
-      seriesData = new Array(xAxisData.length).fill(300);
-
-      for (var i = 0; i < res.length; i++) {
+			for (var i = 0; i < res.length; i++) {
         if (this.pageData.cmCycle == "CYC_MONTH") {
           seriesData[res[i]["monthCnt"]] = res[i]["totVal"];
         } else if (this.pageData.cmCycle == "CYC_DAY") {
           seriesData[res[i]["dayCnt"]] = res[i]["totVal"];
-        }
-      }
+				}
+			}
 
-      var seriesData2 = new Array(xAxisData.length).fill(100);
-
-      var chartOption = {
-        grid: {
+			var chartOption = {
+				grid: {
           top: "3%",
           bottom: "25%",
-        },
-        tooltip: {
-          axisPointer: {
-            label: {
+				},
+				tooltip: {
+					axisPointer: {
+						label: {
               formatter: function (value) {
-                value = value.value;
-                return (
-                  value.substring(5, 7) +
+								value = value.value;
+								return (
+									value.substring(5, 7) +
                   "월 " +
-                  value.substring(8, 10) +
+									value.substring(8, 10) +
                   "일 " +
-                  value.substring(11, 13) +
+									value.substring(11, 13) +
                   "시"
-                );
-              },
-            },
-          },
-        },
-        xAxis: {
-          data: xAxisData,
-          axisLabel: {
+								);
+							},
+						},
+					},
+				},
+				xAxis: {
+					data: xAxisData,
+					axisLabel: {
             formatter: function (value) {
               return value.substring(11, 13) + "시";
-            },
-          },
-          axisTick: {
-            interval: 23,
-          },
-        },
-        yAxis: {
+						},
+					},
+					axisTick: {
+						interval: 23,
+					},
+				},
+				yAxis: {
           type: "value",
-        },
-        series: [
-          {
+				},
+				series: [
+					{
             type: "line",
-            data: seriesData,
+						data: seriesData,
             symbol: "none",
             itemStyle: {
               color: "#D32029",
             },
           },
-          {
-            type: "line",
-            data: seriesData2,
-            symbol: "none",
-            itemStyle: {
-              color: "#FAAD14",
-            },
-          },
-        ],
-        dataZoom: [
-          {
+          // {
+          //   type: "line",
+          //   data: seriesData2,
+          //   symbol: "none",
+          //   itemStyle: {
+          //     color: "#FAAD14",
+          //   },
+					// },
+				],
+				dataZoom: [
+					{
             type: "slider",
-            // zoomLock: true,
-            zoomLock: false,
-            brushSelect: false,
-            start: 0, // 0-100 %
-            end: sliderHandleSize, // 0-100 %
-          },
-          {
+						// zoomLock: true,
+						zoomLock: false,
+						brushSelect: false,
+						start: 0, // 0-100 %
+						end: sliderHandleSize, // 0-100 %
+					},
+					{
             type: "inside",
-            zoomOnMouseWheel: false,
-            moveOnMouseMove: false,
-            moveOnMouseWheel: true,
-          },
-        ],
-      };
+						zoomOnMouseWheel: false,
+						moveOnMouseMove: false,
+						moveOnMouseWheel: true,
+					},
+				],
+			};
 
       this.setChartOption({ chartKey: "trendChart", value: chartOption });
-      this.loadTrendChart = true;
-    },
-    async getRowData02(selectedData) {
-      await this.setContentData04(selectedData);
-    },
-    async makeContentData01(data) {
-      var result = {};
-      for (var i = 0; i < data.length; i++) {
+			this.loadTrendChart = true;
+		},
+		async getRowData02(selectedData) {
+			await this.setContentData04(selectedData);
+		},
+		async makeContentData01(data) {
+			var result = {};
+			for (var i = 0; i < data.length; i++) {
         if (!result.hasOwnProperty(data[i]["gdIdxId"])) {
           result[data[i]["gdIdxId"]] = {
             gdIdxId: data[i]["gdIdxId"],
             gdIdxNm: data[i]["gdIdxNm"],
-            data: [],
-          };
+						data: [],
+					};
 
           result[data[i]["gdIdxId"]]["data"].push({
-            ...data[i],
-          });
-        } else {
+						...data[i],
+					});
+				} else {
           result[data[i]["gdIdxId"]]["data"].push({
-            ...data[i],
-          });
-        }
-      }
+						...data[i],
+					});
+				}
+			}
 
-      //   var idxData = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseMainIdxDesc",
-      //     resKey: "eqpmIndMntrData",
-      //     sendParam: {
-      //       eqpmGrpId: this.selectValue03,
-      //     },
-      //   });
+			var idxData = await this.postApiReturn({
+				apiKey: 'selectEnrgUseMainIdxDesc',
+				resKey: 'eqpmIndMntrData',
+				sendParam: {
+					eqpmGrpId: this.selectValue03,
+				},
+			});
 
-      var idxData = [
-        {
-          gdIdxId: "A01",
-          gdIdxNm: "Temperature",
-          unit: "°C",
-          description: "Average temperature reading",
-        },
-        {
-          gdIdxId: "B02",
-          gdIdxNm: "Humidity",
-          unit: "%",
-          description: "Relative humidity level",
-        },
-        {
-          gdIdxId: "C03",
-          gdIdxNm: "Power Usage",
-          unit: "kWh",
-          description: "Total power consumption",
-        },
-        {
-          gdIdxId: "B03",
-          gdIdxNm: "Test",
-          unit: "%",
-          description: "Relative humidity level test",
-        },
-      ];
-
-      for (var i = 0; i < idxData.length; i++) {
+			for (var i = 0; i < idxData.length; i++) {
         if (!result.hasOwnProperty(idxData[i]["gdIdxId"])) {
           result[idxData[i]["gdIdxId"]] = {
             gdIdxId: idxData[i]["gdIdxId"],
             gdIdxNm: idxData[i]["gdIdxNm"],
-            data: [],
-          };
-        }
-      }
+						data: [],
+					};
+				}
+			}
 
-      return result;
-    },
-    async setChartGroup01(data) {
-      this.loadChart = false;
-      await this.$nextTick();
-      this.initChartGroup01(data);
-      this.setChartGroup01Data(data);
-      this.loadChart = true;
-    },
-    initChartGroup01(data) {
-      var dataKeyList = Object.keys(data);
-      var currentChartData = null;
-      var chartKey = null;
-      for (var i = 0; i < dataKeyList.length; i++) {
-        currentChartData = data[dataKeyList[i]];
-        console.log("curr:", currentChartData);
+			return result;
+		},
+		async setChartGroup01(data) {
+			this.loadChart = false;
+			await this.$nextTick();
+			this.initChartGroup01(data);
+			this.setChartGroup01Data(data);
+			this.loadChart = true;
+		},
+		initChartGroup01(data) {
+			var dataKeyList = Object.keys(data);
+			var currentChartData = null;
+			var chartKey = null;
 
-        chartKey = "chartGroup01_" + currentChartData["gdIdxId"];
+			for (var i = 0; i < dataKeyList.length; i++) {
+				currentChartData = data[dataKeyList[i]];
+				chartKey = 'chartGroup01_' + currentChartData['gdIdxId'];
 
-        this.setPageData({
-          [chartKey]: this.getGroup01ChartOption(),
-        });
-      }
-    },
-    setChartGroup01Data(data) {
-      var dataKeyList = Object.keys(data);
-      var currentChartData = null;
-      var chartKey = null;
-      var xAxisData = null;
-      var seriesData = null;
+				this.setPageData({
+					[chartKey]: this.getGroup01ChartOption(),
+				});
+			}
+		},
+		setChartGroup01Data(data) {
+			var dataKeyList = Object.keys(data);
+			var currentChartData = null;
+			var chartKey = null;
+			var xAxisData = null;
+			var seriesData = null;
 
-      xAxisData = this.makeChartGroup01XaxisData();
-      console.log("text xaxis", xAxisData);
+			xAxisData = this.makeChartGroup01XaxisData();
 
-      for (var i = 0; i < dataKeyList.length; i++) {
-        seriesData = new Array(xAxisData.length).fill(10);
+			for (var i = 0; i < dataKeyList.length; i++) {
+				seriesData = new Array(xAxisData.length).fill(NaN);
 
-        currentChartData = data[dataKeyList[i]];
+				currentChartData = data[dataKeyList[i]];
         chartKey = "chartGroup01_" + currentChartData["gdIdxId"];
 
         for (var j = 0; j < currentChartData["data"].length; j++) {
           seriesData[currentChartData["data"][j]["dataNum"]] =
             currentChartData["data"][j]["totVal"];
-        }
+				}
 
         console.log("text seri data", seriesData);
 
@@ -994,10 +871,10 @@ export default {
         this.$store.state.pageData[myPrgmId][chartKey]["series"][0]["data"] = seriesData;
 
         console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
-      }
-    },
-    getGroup01ChartOption() {
-      var chartOption = Utility.defaultChartOption(true);
+			}
+		},
+		getGroup01ChartOption() {
+			var chartOption = Utility.defaultChartOption(true);
 
       chartOption["series"][0]["type"] = "line";
       chartOption["grid"]["bottom"] = "3%";
@@ -1006,77 +883,75 @@ export default {
         color: "#D32029",
       };
 
-      // chartOption["series"][0]["symbol"] = "none";
-      console.log("chartOption: ", chartOption);
-      return chartOption;
-    },
-    makeChartGroup01XaxisData() {
-      var result = [];
-      var paramsDt = this.fromDt;
+			return chartOption;
+		},
+		makeChartGroup01XaxisData() {
+			var result = [];
+			var paramsDt = this.fromDt;
 
       if (this.pageData.cmCycle == "CYC_MONTH") {
-        var tempDate = new Date(
+				var tempDate = new Date(
           paramsDt.substring(0, 4) + "-" + paramsDt.substring(4, 6) + "-01 00:00"
-        );
-        var lastDayOfMonth = getLastDayOfMonth(tempDate);
+				);
+				var lastDayOfMonth = getLastDayOfMonth(tempDate);
 
-        for (var i = 1; i <= lastDayOfMonth; i++) {
-          result.push(i);
-        }
+				for (var i = 1; i <= lastDayOfMonth; i++) {
+					result.push(i);
+				}
       } else if (this.pageData.cmCycle == "CYC_DAY") {
-        for (var i = 0; i < 24; i++) {
-          result.push(i);
-        }
-      }
+				for (var i = 0; i < 24; i++) {
+					result.push(i);
+				}
+			}
 
-      return result;
-    },
-    makeTrendChartXaxisData() {
-      var result = [];
-      var paramsDt = this.fromDt;
-      var timezoneOffset = new Date().getTimezoneOffset() * 60000;
+			return result;
+		},
+		makeTrendChartXaxisData() {
+			var result = [];
+			var paramsDt = this.fromDt;
+			var timezoneOffset = new Date().getTimezoneOffset() * 60000;
 
       if (this.pageData.cmCycle == "CYC_MONTH") {
-        var tempDate = new Date(
+				var tempDate = new Date(
           paramsDt.substring(0, 4) + "-" + paramsDt.substring(4, 6) + "-01 00:00"
-        );
-        var lastDayOfMonth = getLastDayOfMonth(tempDate);
+				);
+				var lastDayOfMonth = getLastDayOfMonth(tempDate);
 
-        tempDate = new Date(tempDate - timezoneOffset);
-        result.push(tempDate.toISOString());
+				tempDate = new Date(tempDate - timezoneOffset);
+				result.push(tempDate.toISOString());
 
-        for (var i = 0; i < 24 * lastDayOfMonth - 1; i++) {
-          tempDate = addHours(1, tempDate);
-          result.push(tempDate.toISOString());
-        }
+				for (var i = 0; i < 24 * lastDayOfMonth - 1; i++) {
+					tempDate = addHours(1, tempDate);
+					result.push(tempDate.toISOString());
+				}
       } else if (this.pageData.cmCycle == "CYC_DAY") {
-        var tempDate = new Date(
-          paramsDt.substring(0, 4) +
+				var tempDate = new Date(
+					paramsDt.substring(0, 4) +
             "-" +
-            paramsDt.substring(4, 6) +
+						paramsDt.substring(4, 6) +
             "-" +
-            paramsDt.substring(6, 8) +
+						paramsDt.substring(6, 8) +
             " 00:00"
-        );
+				);
 
-        tempDate = new Date(tempDate - timezoneOffset);
-        result.push(tempDate.toISOString());
+				tempDate = new Date(tempDate - timezoneOffset);
+				result.push(tempDate.toISOString());
 
-        for (var i = 0; i < 23; i++) {
-          tempDate = addHours(1, tempDate);
-          result.push(tempDate.toISOString());
-        }
-      }
+				for (var i = 0; i < 23; i++) {
+					tempDate = addHours(1, tempDate);
+					result.push(tempDate.toISOString());
+				}
+			}
 
-      return result;
-    },
-  },
+			return result;
+		},
+	},
 };
 
 function addHours(h, date) {
-  date.setTime(date.getTime() + h * 60 * 60 * 1000);
+	date.setTime(date.getTime() + h * 60 * 60 * 1000);
 
-  return date;
+	return date;
 }
 
 function getLastDayOfMonth(date) {
@@ -1084,92 +959,30 @@ function getLastDayOfMonth(date) {
 }
 
 const defaultData = {
-  dateInitedFlag: false,
+	dateInitedFlag: false,
   cmCycle: "CYC_MONTH",
-  cmCycleList: [
+	cmCycleList: [
     { idx: 0, text: "월", value: "CYC_MONTH" },
     { idx: 1, text: "일", value: "CYC_DAY" },
-  ],
-  defaultRange: {
-    CYC_MONTH: 1,
-    CYC_DAY: 1,
-  },
+	],
+	defaultRange: {
+		CYC_MONTH: 1,
+		CYC_DAY: 1,
+	},
   fromDt: Utility.setFormatDate(new Date(), "YYYYMM"), // 조회 시작일
 
-  grid01: {
-    data: [
-      {
-        gdIdxId: "PQ001",
-        totDttm: "TEMP",
-        totDt: "Temperature",
-        totTm: "Analog",
-        gdIdxNm: "PQ001",
-        totVal: "TEMP",
-        caseStndVal: "Temperature",
-        warnStndVal: "Analog",
-        alrmKind: "PQ001",
-        alrmMsg: "TEMP",
-      },
-      {
-        gdIdxId: "PQ001",
-        totDttm: "TEMP",
-        totDt: "Temperature",
-        totTm: "Analog",
-        gdIdxNm: "PQ001",
-        totVal: "TEMP",
-        caseStndVal: "Temperature",
-        warnStndVal: "Analog",
-        alrmKind: "PQ001",
-        alrmMsg: "TEMP",
-      },
-    ],
-    column: [
-      { header: "NO", name: "no", width: 40, align: "right" },
-      { header: "gdIdxId", name: "gdIdxId", hidden: true, align: "left" },
-      { header: "totDttm", name: "totDttm", hidden: true, align: "left" },
-      { header: "발생일", name: "totDt", width: 150, align: "left" },
-      { header: "발생시간대", name: "totTm", width: 100, align: "left" },
-      { header: "가이드지표명", name: "gdIdxNm", width: 200, align: "left" },
-      { header: "가이드값", name: "totVal", hidden: true, align: "left" },
-      { header: "주의값", name: "caseStndVal", hidden: true, align: "left" },
-      { header: "경고값", name: "warnStndVal", hidden: true, align: "left" },
-      { header: "알람종류", name: "alrmKind", hidden: true, align: "left" },
-      { header: "알람내용", name: "alrmMsg", align: "left" },
-    ],
-    option: {},
-  },
+	grid01: {
+		data: [],
+		column: [],
+		option: {},
+	},
 
-  grid02: {
-    data: [
-      {
-        pysclQtyId: "PQ001",
-        pysclQtyCd: "TEMP",
-        pysclQtyNm: "Temperature",
-        pysclQtyTp: "Analog",
-      },
-      {
-        pysclQtyId: "PQ002",
-        pysclQtyCd: "PRESS",
-        pysclQtyNm: "Pressure",
-        pysclQtyTp: "Analog",
-      },
-      {
-        pysclQtyId: "PQ003",
-        pysclQtyCd: "FLOW",
-        pysclQtyNm: "Flow Rate",
-        pysclQtyTp: "Digital",
-      },
-    ],
-    column: [
-      { header: "NO", name: "no", align: "right", width: 40 },
-      { header: "물리량ID", name: "pysclQtyId", width: 100, align: "left" },
-      { header: "물리량코드", name: "pysclQtyCd", align: "left" },
-      { header: "물리량명", name: "pysclQtyNm", width: 190, align: "left" },
-      { header: "물리량타입", name: "pysclQtyTp", width: 100, align: "left" },
-    ],
-    option: {},
-  },
+	grid02: {
+		data: [],
+		column: [],
+		option: {},
+	},
 
-  trendChart: Utility.defaultChartOption(true),
+	trendChart: Utility.defaultChartOption(true),
 };
 </script>

From 9603353ab35fc655429760e27b21407970341143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Wed, 30 Jul 2025 14:03:41 +0700
Subject: [PATCH 11/17] update screen 33, 44, 20, fix bug Grid

---
 assets/scss/common.scss                       |  2 +-
 assets/scss/common/grid.scss                  | 47 +++++----
 assets/scss/common/input.scss                 | 16 ++-
 components/common/Grid.vue                    | 26 +++--
 components/common/ThemeSwitch.vue             |  4 +-
 components/common/form/InputNumber.vue        |  4 +-
 components/common/modal/DrSimulSlctPop.vue    | 12 +--
 components/common/modal/DrSnarExecPop.vue     |  2 +-
 components/common/modal/EgrpPysclQtyPop.vue   |  3 +-
 components/common/modal/EqpmSelectPop_bk.vue  |  6 +-
 components/common/modal/FixedValueModiPop.vue |  2 +-
 components/common/modal/FtnPlcFormPop.vue     | 98 +++++++++----------
 components/common/modal/FtnPlcMultiPop3.vue   |  8 +-
 components/common/modal/OnlnBaseEccPop.vue    | 16 +--
 components/common/modal/PlanPop.vue           |  8 +-
 .../common/modal/ReadPlcDisableFuncPop.vue    |  4 +-
 components/common/select/SelectDsEnrg.vue     |  2 +-
 components/form/CustomInput.vue               |  4 +-
 .../ems/DataSetInfo/DataSetTagRelTab.vue      |  4 +-
 .../pages/ems/EqpmInfo/EqpmAddInfoTab.vue     |  7 +-
 .../pages/ems/EqpmInfo/EqpmConstTab.vue       |  8 +-
 components/pages/ems/EqpmInfo/EqpmIaoTab.vue  | 11 +--
 pages/comm/auth/MenuRoleMngPage.vue           | 74 +++++++-------
 pages/comm/base/PrgmMngPage.vue               |  2 +-
 pages/ems/base/ReadResultCloseMngPage.vue     |  6 +-
 pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue    |  8 +-
 26 files changed, 199 insertions(+), 185 deletions(-)

diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index cf990d2..37e5055 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -486,7 +486,7 @@ a {
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
       .menu-container {
-        max-height:calc(100vh - 60px);
+        height:calc(100vh - 60px);
         overflow-y: auto;
       }
     }
diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss
index 2eeabc9..6abcb48 100644
--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@@ -254,23 +254,36 @@
           "tui-grid-border-vertical-color"
         );
 
-        &-current-row{
-          td {
-            .custom-radio {
-              .radio-mark{
-                border-color: #1677ff;
-                background-color: #fff;
-                &::after {
-                  content: "";
-                  position: absolute;
-                  top: 50%;
-                  left: 50%;
-                  transform: translate(-50%, -50%);
-                  height: 11px;
-                  width: 11px;
-                  border-radius: 50%;
-                  background-color: #1677ff;
-                }
+        // &-current-row{
+        // }
+        td.row-selected {
+          .custom-radio {
+            background-color: map-deep-get($config,
+              #{$theme},
+              "ant-btn-primary-color"
+            );
+            .radio-mark{
+              border-color: map-deep-get($config,
+                #{$theme},
+                "arow-line-color"
+              );
+              background-color: map-deep-get($config,
+                #{$theme},
+                "arow-line-btn-bg-color"
+              );
+              &::after {
+                content: "";
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%, -50%);
+                height: 11px;
+                width: 11px;
+                border-radius: 50%;
+                background-color: map-deep-get($config,
+                  #{$theme},
+                  "arow-line-color"
+                );
               }
             }
           }
diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss
index ccc3e55..659effe 100644
--- a/assets/scss/common/input.scss
+++ b/assets/scss/common/input.scss
@@ -188,7 +188,7 @@
   transform: translateY(-50%);
   height: 18px;
   width: 18px;
-  background-color: white;
+  // background-color: white;
   border: 2px solid #ccc;
   border-radius: 50%;
   transition: all 0.2s ease;
@@ -263,9 +263,6 @@
         "v-input-backgroundColor"
       );
 
-
-      
-
       &:not(.v-input--radio-group, .v-input--checkbox) {
         .v-input__slot {
           background-color: map-deep-get($config,
@@ -372,6 +369,17 @@
         }
       }
     }
+
+    .radio-mark {
+      background-color: map-deep-get($config,
+        #{$theme},
+        "ant-btn-primary-color"
+      );
+      border-color: map-deep-get($config,
+        #{$theme},
+        "v-input-textarea-border"
+      );
+    }
   }
 
   .v-radio {
diff --git a/components/common/Grid.vue b/components/common/Grid.vue
index 761a321..4efae23 100644
--- a/components/common/Grid.vue
+++ b/components/common/Grid.vue
@@ -4,14 +4,14 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
-		@mousedown="focusChangeEvt"
+		@mousedown="onMousedown"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
+		@focusChange="focusChangeEvt"
 	/>
-		<!-- @focusChange="focusChangeEvt" -->
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex';
@@ -184,13 +184,13 @@ export default {
 		}),
 		// true : 현재 행 혹은 연결된 그리드가 수정중인 상태
 		checkGridState() {
-			var rowStatList = ['I', 'U', 'D'];
-			var row = this.gridInstance.invoke('getFocusedCell');
+			const rowStatList = ['I', 'U', 'D'];
+			const row = this.gridInstance.invoke('getFocusedCell');
 
 			if (row) {
-				var rowData = this.gridInstance.invoke('getRow', row.rowKey);
+				const rowData = this.gridInstance.invoke('getRow', row.rowKey);
 				if (rowData) {
-					var rowStat = rowData['rowStat'];
+					const rowStat = rowData['rowStat'];
 					if (rowStatList.includes(rowStat)) {
 						return true;
 					}
@@ -198,8 +198,8 @@ export default {
 			}
 
 			if (this.preventFocusChangeEventTargetGridList) {
-				for (var gridInstance of this.preventFocusChangeEventTargetGridList) {
-					var dataArr = gridInstance.save();
+				for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
+					const dataArr = gridInstance.save();
 
 					if (dataArr.length > 0) {
 						return true;
@@ -251,9 +251,11 @@ export default {
 			this.gridInstance.invoke('check', rowData.rowKey, instance);
 		},
 		setSelectionRange(rowKey) {
+			// console.log("------------------DEBUG-------setSelectionRange:", rowKey);
 			const rowDatas = this.gridInstance.invoke('getData');
 			rowDatas.forEach(item => {
 				if (item.rowKey == rowKey) {
+					// console.log("------------------DEBUG-------setSelectionRange---item:", item);
 					this.gridInstance.invoke(
 						'addRowClassName',
 						item.rowKey,
@@ -268,6 +270,10 @@ export default {
 				}
 			});
 		},
+		onMousedown(evt) {
+			// console.log("------------------DEBUG-------onMousedown:", evt);
+			this.focusChangeEvt(evt);
+		},
 		focusChangeEvt(e) {
 			// console.log("------------------DEBUG-------focusChangeEvt:", e);
 			// console.log('focusChangeEvt1...')
@@ -290,7 +296,7 @@ export default {
 			this.sendSelectedRowData(e.rowKey);
 		},
 		startEditing(e) {
-			// console.log("------------DEBUG-----startEditing----", e);
+			// console.log("------------------DEBUG-------startEditing:", e);
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent startEditing')
@@ -317,6 +323,7 @@ export default {
 			}
 		},
 		async editingFinish(e) {
+			// console.log('------------------DEBUG-------editingFinish:', e);
 			// console.log("Editing END E::", e);
 			// editor 간 이동시 수정되는 문제 수정
 			// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
@@ -678,6 +685,7 @@ export default {
 						? this.gridInstance.invoke('getFocusedCell').rowKey
 						: eventRowKey;
 				var rowData = this.gridInstance.invoke('getRow', rowKey);
+				// console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey});
 				this.$emit('sendSelectedRowStatInfo', rowData);
 			}
 		},
diff --git a/components/common/ThemeSwitch.vue b/components/common/ThemeSwitch.vue
index fd93254..d976a9d 100644
--- a/components/common/ThemeSwitch.vue
+++ b/components/common/ThemeSwitch.vue
@@ -31,8 +31,8 @@ export default {
 			this.mode = !this.mode;
 			this.$vuetify.theme.isDark = this.mode;
 			this.setThemeChange(this.mode);
-			console.log(this.mode)
-			console.log(this.$vuetify.theme.isDark)
+			// console.log(this.mode)
+			// console.log(this.$vuetify.theme.isDark)
 		},
 	},
 };
diff --git a/components/common/form/InputNumber.vue b/components/common/form/InputNumber.vue
index 82b8696..ca84447 100644
--- a/components/common/form/InputNumber.vue
+++ b/components/common/form/InputNumber.vue
@@ -125,7 +125,7 @@ export default {
 		modifyValue(e) {
 			let val = e.target.value.replace(/[^-.0-9]/g, '');
 
-			console.log('val : ', val);
+			// console.log('val : ', val);
 
 			if(this.item.min != undefined && parseFloat(val) < this.item.min){
 				val = this.item.min;
@@ -134,7 +134,7 @@ export default {
 			if(this.item.max != undefined && parseFloat(val) > this.item.max){
 				val = this.item.max;
 			}
-			console.log('val2 : ', val);
+			// console.log('val2 : ', val);
 
 			this.textValue = val;
 			// this.textValue = this.validateNumber(val);
diff --git a/components/common/modal/DrSimulSlctPop.vue b/components/common/modal/DrSimulSlctPop.vue
index 4789ebe..1082cfb 100644
--- a/components/common/modal/DrSimulSlctPop.vue
+++ b/components/common/modal/DrSimulSlctPop.vue
@@ -152,12 +152,12 @@ export default {
 				const snarData = this.searchParam.isMulti
 					? this.searchParam.snarInfoList
 					: this.searchParam.snarInfo;
-				console.log('this.searchParam.isMulti', this.searchParam.isMulti);
-				console.log(
-					'this.searchParam.snarInfoList',
-					this.searchParam.snarInfoList,
-				);
-				console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
+				// console.log('this.searchParam.isMulti', this.searchParam.isMulti);
+				// console.log(
+				// 	'this.searchParam.snarInfoList',
+				// 	this.searchParam.snarInfoList,
+				// );
+				// console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
 				if (Array.isArray(snarData)) {
 					if (snarData.length > 0) {
 						for (const item of snarData) {
diff --git a/components/common/modal/DrSnarExecPop.vue b/components/common/modal/DrSnarExecPop.vue
index ed4c239..57e060f 100644
--- a/components/common/modal/DrSnarExecPop.vue
+++ b/components/common/modal/DrSnarExecPop.vue
@@ -394,7 +394,7 @@ export default {
 					params: {},
 				},
 			});
-			console.log('statusCd', statusCd);
+			// console.log('statusCd', statusCd);
 			if (statusCd.data.retnCd == 0) {
 				const params2 = {
 					simulationId: statusCd.data.dataset.simulId,
diff --git a/components/common/modal/EgrpPysclQtyPop.vue b/components/common/modal/EgrpPysclQtyPop.vue
index 4e640f6..786ec19 100644
--- a/components/common/modal/EgrpPysclQtyPop.vue
+++ b/components/common/modal/EgrpPysclQtyPop.vue
@@ -46,11 +46,10 @@
 										v-model="searchWord" @keyup.enter="search"><template v-slot:append>
 											<!-- Custom SVG icon -->
 											<v-icon>$icoSearch</v-icon>
-
 										</template></v-text-field>
 								</v-col>
 								<v-spacer></v-spacer>
-								<v-col cols="3" class="text-right">
+								<v-col :cols="3" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
 										class="search-button">조회</a-button>
 									<!-- <v-btn :ripple="false" @click="initSearch()">
diff --git a/components/common/modal/EqpmSelectPop_bk.vue b/components/common/modal/EqpmSelectPop_bk.vue
index d1a4820..67025cb 100644
--- a/components/common/modal/EqpmSelectPop_bk.vue
+++ b/components/common/modal/EqpmSelectPop_bk.vue
@@ -286,8 +286,8 @@ export default {
 			// Row selection config
 			rowSelection: {
 				onChange: (selectedRowKeys, selectedRows) => {
-					console.log('Selected Row Keys:', selectedRowKeys);
-					console.log('Selected Rows:', selectedRows);
+					// console.log('Selected Row Keys:', selectedRowKeys);
+					// console.log('Selected Rows:', selectedRows);
 				},
 			}
 		};
@@ -332,7 +332,7 @@ export default {
 		// 	this.getRowGridData();
 		// },
 		searchFab() {
-			console.log('tttttttttttt')
+			// console.log('tttttttttttt')
 			// this.filteredData = this.data.filter(item => {
 			// 	const matchGrp = this.eqpmGrpSelected ? item.group === this.eqpmGrpSelected : true;
 			// 	const matchFab = this.localFabSelected ? item.fab === this.localFabSelected : true;
diff --git a/components/common/modal/FixedValueModiPop.vue b/components/common/modal/FixedValueModiPop.vue
index 6eb2f20..5f0ac34 100644
--- a/components/common/modal/FixedValueModiPop.vue
+++ b/components/common/modal/FixedValueModiPop.vue
@@ -126,7 +126,7 @@ export default {
 		async chkDialog(val) {
 			if (val) {
 				// 열릴 때
-				console.log('dsfafds');
+				// console.log('dsfafds');
 				await this.getData();
 				// console.log("chkDialog: ", val);
 				// if(this.searchParam.selecUserList.length > 0){
diff --git a/components/common/modal/FtnPlcFormPop.vue b/components/common/modal/FtnPlcFormPop.vue
index e7bc743..7ccbe47 100644
--- a/components/common/modal/FtnPlcFormPop.vue
+++ b/components/common/modal/FtnPlcFormPop.vue
@@ -22,37 +22,29 @@
 				outlined
 				:hide-details="true"
 			>
+			<!-- Custom SVG icon -->
 			<template v-slot:append>
-					<!-- Custom SVG icon -->
-					<v-icon>$icoSearch</v-icon>
+				<v-icon>$icoSearch</v-icon>
 			</template>
 		</v-text-field>
 		</v-col>
 
 		<v-dialog v-model="dialog" scrollable width="700px">
 			<v-card style="height: 100%">
-				<v-card-title class="pa-5 d-flex align-center justify-space-between">
+				<v-card-title class="px-6 py-4 d-flex align-center justify-space-between">
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
-					<v-btn
-						icon
-						tile
-						:ripple="false"
-						@click="dialogOpenCloseEvent(dialog)"
-					>
-						<v-icon>mdi-close</v-icon>
-					</v-btn>
+					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
-						<v-col :cols="3">
+						<v-col :cols="12">
 							<label for="" class="search-box-label">
-								<v-icon x-small color="primary" class="mr-1"
-									>mdi-record-circle</v-icon
-								>
+								<!-- <v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon> -->
+								<v-icon small :class="['mr-1 icon-blue']">$icoBulletPoint</v-icon>
 								검색
 							</label>
 						</v-col>
-						<v-col :cols="5">
+						<v-col :cols="9">
 							<v-text-field
 								append-icon="mdi-magnify"
 								class="v-input__custom"
@@ -63,21 +55,19 @@
 							></v-text-field>
 						</v-col>
 						<v-spacer></v-spacer>
-						<v-col cols="4" class="text-right">
-							<v-btn :ripple="false" @click="search()">
+						<v-col :cols="3" class="text-right">
+							<a-button type="primary" @click="search()" icon="search">
 								조회
-							</v-btn>
-							<v-btn :ripple="false" @click="initSearch()">
+							</a-button>
+							<a-button @click="initSearch()">
 								초기화
-							</v-btn>
+							</a-button>
 						</v-col>
 					</v-row>
 				</div>
-				<v-divider></v-divider>
-				<!-- <div :style="'height: calc(65vh)'"> -->
-					<div :style="'height: 429px;'">
-					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
-					<div ref="modalGridParent" class="h100 w100 py-3">
+			<!-- <v-divider></v-divider> -->
+				<div style="height: 429px;" class="py-3 px-5">
+					<div ref="modalGridParent" class="h100 w100">
 						<component
 							:is="loadGrid && dialog ? 'Grid' : null"
 							:gridName="grid_01"
@@ -88,11 +78,9 @@
 						/>
 					</div>
 				</div>
-				<v-card-actions class="pa-5 d-flex align-center justify-center">
-					<v-btn :ripple="false" @click="setUpdate($event)">확인</v-btn>
-					<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)"
-						>닫기</v-btn
-					>
+				<v-card-actions class="pa-5 d-flex align-center justify-end">
+					<a-button class="mr-2" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
+					<a-button type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -336,7 +324,7 @@ export default {
 				}))
 			};
 
-			console.log(res);
+			// console.log(res);
 			
 			this.setModalGridData({
 				modalKey: this.myModalKey,
@@ -395,7 +383,31 @@ var FtnPlcFormPop = {
 </script>
 
 <style lang="scss" scoped>
+// @each $theme in dark, light {
+// 	@include theme($theme);
+// 	.v-application.#{$theme}-mode {
+// 		.v-input--is-readonly {
+// 			border-color: map-deep-get($config,
+// 				#{$theme},
+// 				"v-input-readonly-border-color"
+// 			);
+// 			::v-deep {
+// 				&:not(.v-input--radio-group, .v-input--checkbox) {
+// 					.v-input__slot {
+// 						background-color: map-deep-get($config,
+// 							#{$theme},
+// 							"v-input-backgroundColor"
+// 						) !important;
+// 					}
+// 				}
+// 			}
+
+// 		}
+// 	}
+// }
+
 ::v-deep {
+
 	.v-dialog {
 		overflow-y: hidden !important;
 	}
@@ -418,26 +430,4 @@ var FtnPlcFormPop = {
 	}
 }
 
-@each $theme in dark, light {
-	.v-application.#{$theme}-mode {
-		.v-dialog {
-			.v-card {
-				&__title {
-					color: map-deep-get($color, 'white', '0');
-					@if $theme == dark {
-						background-color: #2d3355;
-						.v-btn {
-							background-color: #2d3355;
-						}
-					} @else {
-						background-color: #3f4d7d;
-						.v-btn {
-							background-color: #3f4d7d;
-						}
-					}
-				}
-			}
-		}
-	}
-}
 </style>
diff --git a/components/common/modal/FtnPlcMultiPop3.vue b/components/common/modal/FtnPlcMultiPop3.vue
index cd656fc..a6dcc99 100644
--- a/components/common/modal/FtnPlcMultiPop3.vue
+++ b/components/common/modal/FtnPlcMultiPop3.vue
@@ -294,10 +294,10 @@ export default {
 			if (this.searchParam.energyCd < 0) {
 				roiIdVal = null;
 			} else {
-				console.log(
-					'this.searchParam.energyList[this.searchParam.energyCd]',
-					this.searchParam.energyList[this.searchParam.energyCd],
-				);
+				// console.log(
+				// 	'this.searchParam.energyList[this.searchParam.energyCd]',
+				// 	this.searchParam.energyList[this.searchParam.energyCd],
+				// );
 				roiIdVal = this.searchParam.energyList[this.searchParam.energyCd + 1]
 					.cd;
 			}
diff --git a/components/common/modal/OnlnBaseEccPop.vue b/components/common/modal/OnlnBaseEccPop.vue
index 967a153..2144754 100644
--- a/components/common/modal/OnlnBaseEccPop.vue
+++ b/components/common/modal/OnlnBaseEccPop.vue
@@ -239,13 +239,13 @@ export default {
 			this.selectedData.eccNm = '';
 
 			if (this.bindOption === null) {
-				console.log('this.bindOption is null...');
+				// console.log('this.bindOption is null...');
 				this.setPageData({
 					modalEccId: '',
 					modalEccNm: '',
 				});
 			} else {
-				console.log('this.bindOption is not null...');
+				// console.log('this.bindOption is not null...');
 				this.setPageData({
 					[this.bindOption.eccId]: '',
 					[this.bindOption.eccNm]: '',
@@ -296,12 +296,12 @@ export default {
 						? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
 						: '',
 			});
-			console.log(
-				'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
-				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
-					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
-					: '',
-			);
+			// console.log(
+			// 	'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
+			// 	localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
+			// 		? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
+			// 		: '',
+			// );
 			this.textFieldData =
 				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
 					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
diff --git a/components/common/modal/PlanPop.vue b/components/common/modal/PlanPop.vue
index 2986c40..3873072 100644
--- a/components/common/modal/PlanPop.vue
+++ b/components/common/modal/PlanPop.vue
@@ -296,25 +296,25 @@ export default {
 			}
 		},
 		strtDt(val) {
-			console.log('strtDt : ', val);
+			// console.log('strtDt : ', val);
 			this.checkStrtAndEndDateTime('start');
 			if (this.startDatepickerInstance3) {
 				this.startDatepickerInstance3.setDate(new Date(this.endDt));
 			}
 		},
 		endDt(val) {
-			console.log('endDt : ', val);
+			// console.log('endDt : ', val);
 			this.checkStrtAndEndDateTime('end');
 			if (this.startDatepickerInstance) {
 				this.startDatepickerInstance.setDate(new Date(this.strtDt));
 			}
 		},
 		strtHh(val) {
-			console.log('strtHh : ', val);
+			// console.log('strtHh : ', val);
 			this.checkStrtAndEndDateTime('start');
 		},
 		endHh(val) {
-			console.log('endHh : ', val);
+			// console.log('endHh : ', val);
 			this.checkStrtAndEndDateTime('end');
 		},
 		strtMm(val) {
diff --git a/components/common/modal/ReadPlcDisableFuncPop.vue b/components/common/modal/ReadPlcDisableFuncPop.vue
index 7eea355..c9e9244 100644
--- a/components/common/modal/ReadPlcDisableFuncPop.vue
+++ b/components/common/modal/ReadPlcDisableFuncPop.vue
@@ -253,7 +253,7 @@ export default {
 					readObjid: this.searchParam.energyCd,
 				},
 			});
-			console.log('getTreeData : ', res);
+			// console.log('getTreeData : ', res);
 			// this.treeData = res;
 			// const ROOT = res[0].plcCd;
 			const setTreeData = await this.setTree({
@@ -327,7 +327,7 @@ export default {
 		// 공정/설비 트리 row 클릭이벤트
 		async getRowData(data) {
 			// console.log("getRowData 시작...");
-			console.log('data', data);
+			// console.log('data', data);
 			this.activeRowData = data;
 			// if(data.enableFg == 1){
 			// this.activeRowData = data;
diff --git a/components/common/select/SelectDsEnrg.vue b/components/common/select/SelectDsEnrg.vue
index d4821c5..de1ebca 100644
--- a/components/common/select/SelectDsEnrg.vue
+++ b/components/common/select/SelectDsEnrg.vue
@@ -70,7 +70,7 @@ export default {
 				return this.searchParam[this.parentPrgmId][this.enrgCd];
 			},
 			set(value) {
-				console.log('value : ', value);
+				// console.log('value : ', value);
 				return this.setPageData({ [this.enrgCd]: value });
 			},
 		},
diff --git a/components/form/CustomInput.vue b/components/form/CustomInput.vue
index 44643fe..4eb02d1 100644
--- a/components/form/CustomInput.vue
+++ b/components/form/CustomInput.vue
@@ -270,8 +270,8 @@ export default {
 			filteredData: [],
 			rowSelection: {
 				onChange: (selectedRowKeys, selectedRows) => {
-					console.log('Selected Row Keys:', selectedRowKeys);
-					console.log('Selected Rows:', selectedRows);
+					// console.log('Selected Row Keys:', selectedRowKeys);
+					// console.log('Selected Rows:', selectedRows);
 				},
 			}
 		};
diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
index a8792d1..d43aa51 100644
--- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
+++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
@@ -213,7 +213,7 @@ export default {
       let dataArr = [];
       switch (action) {
         case 'add':
-          console.log('add this.pageData : '); // , this.pageData);
+          // console.log('add this.pageData : '); // , this.pageData);
           const defaultRow = {
             dataSetId: this.pageData.dataSetId,
             dataSetNm: this.pageData.dataSetNm,
@@ -296,7 +296,7 @@ export default {
         comId: this.selectedComId,
         dataSetId: this.selectedDataSetId,
       };
-      console.log('data : ', data);
+      // console.log('data : ', data);
       this.$emit('jamoviClickEvent', 'view1', data);
     },
   },
diff --git a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
index edd14e0..2987f82 100644
--- a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
@@ -1,10 +1,7 @@
 <template>
 	<div>
-		<div
-			class="d-flex justify-space-between align-center"
-			style="height: 80px;"
-		>
-			<span class="txt custom-title-4-new">설비 추가 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
diff --git a/components/pages/ems/EqpmInfo/EqpmConstTab.vue b/components/pages/ems/EqpmInfo/EqpmConstTab.vue
index 06d78f0..892b426 100644
--- a/components/pages/ems/EqpmInfo/EqpmConstTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmConstTab.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center" style="height: 80px;">
-			<span class="txt custom-title-4-new">설비 상수 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 상수 정보</span>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
@@ -291,8 +291,8 @@ export default {
 
 						dataArr.map(item => {
 							for (var key of Object.keys(item)) {
-								console.log('key : ', key);
-								console.log('item[key] : ', item[key]);
+								// console.log('key : ', key);
+								// console.log('item[key] : ', item[key]);
 								if (!item[key] && requiredKeyList.includes(key)) {
 									validCheck = false;
 								}
diff --git a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
index 5178a26..688214a 100644
--- a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
@@ -1,10 +1,7 @@
 <template>
 	<div>
-		<div
-			class="d-flex justify-space-between align-center"
-			style="height: 80px;"
-		>
-			<span class="txt">설비 입출력 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -111,7 +108,7 @@ export default {
 	},
 	watch: {
 		selectedObjId(val) {
-			console.log('selectedObjId : ', val);
+			// console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
 				this.detailList[2].class = 'py-3 d-none';
 				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
@@ -338,7 +335,7 @@ export default {
 					}
 
 					if (dataArr.length > 0) {
-						console.log('dataArr : ', dataArr);
+						// console.log('dataArr : ', dataArr);
 
 						var requiredKeyList = this.detailList
 							.filter(item => {
diff --git a/pages/comm/auth/MenuRoleMngPage.vue b/pages/comm/auth/MenuRoleMngPage.vue
index 93a5135..d4f9ca8 100644
--- a/pages/comm/auth/MenuRoleMngPage.vue
+++ b/pages/comm/auth/MenuRoleMngPage.vue
@@ -36,19 +36,14 @@
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
-					<div class="px-5" style="height:calc(100% - 100px)">
-						<div
-							ref="gridParent"
-							class="w100 h100"
-						>
-							<component
-								:is="loadGrid ? 'Grid' : null"
-								:ref="gridName + myPrgmId"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
-							/>
-						</div>
+					<div ref="gridParent" class="px-5" style="height: 60vh;">
+						<component
+							:is="loadGrid ? 'Grid' : null"
+							:ref="gridName + myPrgmId"
+							:gridName="gridName"
+							:parentPrgmId="myPrgmId"
+							@getRowsData="getRowData"
+						/>
 					</div>
 				</v-card>
 			</v-col>
@@ -69,19 +64,19 @@
 								:style="{ minHeight: '36px' }"
 								>[미배정]메뉴리스트</span
 							>
-							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
-								<div
+							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
+								<!-- <div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
-									<component
-										:is="loadTreeGrid ? 'Grid' : null"
-										:ref="gridName2 + myPrgmId"
-										:gridName="gridName2"
-										:parentPrgmId="myPrgmId"
-										@getRowsData="getUnAsgnRowData"
-									/>
-								</div>
+							</div> -->
+								<component
+									:is="loadTreeGrid ? 'Grid' : null"
+									:ref="gridName2 + myPrgmId"
+									:gridName="gridName2"
+									:parentPrgmId="myPrgmId"
+									@getRowsData="getUnAsgnRowData"
+								/>
 							</div>
 						</v-col>
 						<v-col :cols="1">
@@ -112,20 +107,20 @@
 									/>
 								</v-col>
 							</v-row>
-							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
-								<div
+							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
+								<!-- <div
 									ref="treeGridParent2"
 									class="w100 h100"
 								>
-									<component
-										:is="loadTreeGrid2 ? 'Grid' : null"
-										:ref="gridName3 + myPrgmId"
-										:gridName="gridName3"
-										:parentPrgmId="myPrgmId"
-										:editorGrid="true"
-										@getRowsData="getAsgnRowData"
-									/>
-								</div>
+							</div> -->
+								<component
+									:is="loadTreeGrid2 ? 'Grid' : null"
+									:ref="gridName3 + myPrgmId"
+									:gridName="gridName3"
+									:parentPrgmId="myPrgmId"
+									:editorGrid="true"
+									@getRowsData="getAsgnRowData"
+								/>
 							</div>
 						</v-col>
 					</v-row>
@@ -408,9 +403,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<label class="custom-radio">
+						return `<span class="custom-radio">
 									<span class="radio-mark"></span>
-								</label>`;
+								</span>`;
 					}
 				},
 				{
@@ -431,9 +426,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<label class="custom-radio">
+						return `<span class="custom-radio">
 									<span class="radio-mark"></span>
-								</label>`;
+								</span>`;
 					}
 				},
 				{ header: '역할ID', name: 'roleId', hidden: true },
@@ -573,6 +568,7 @@ export default {
 			});
 		},
 		async getRowData(data) {
+
 			await this.setPageData({
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: {
@@ -678,6 +674,8 @@ export default {
 		},
 
 		getUnAsgnRowData(data) {
+			console.log("------------------DEBUG-------getUnAsgnRowData:", data);
+
 			const getRowData = data;
 			this.leftSelectRowData = Object.assign({}, getRowData);
 		},
diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue
index 0e4b4dc..e6d4479 100644
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@@ -50,7 +50,7 @@
 							/>
 						</div>
 					</div>
-					<div ref="gridParent" style="height: 100vh">
+					<div ref="gridParent" style="height: 60vh">
 						<!-- <div ref="gridParent" class="px-5 h100">
 						</div> -->
 						<component
diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue
index 03514d9..d696a06 100644
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@@ -91,7 +91,7 @@
               </a-button>
             </div>
           </div>
-          <div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
+          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
@@ -242,6 +242,10 @@ export default {
         columnOptions: {
           resizable: true,
         },
+        pageOptions: {
+					useClient: true,
+					perPage: 13,
+				},
       };
       this.setGridOption({
         gridKey: this.gridName,
diff --git a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
index 973aea7..f28ea37 100644
--- a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
@@ -975,7 +975,7 @@ export default {
       var seriesData = null;
 
       xAxisData = this.makeChartGroup01XaxisData();
-      console.log("text xaxis", xAxisData);
+      // console.log("text xaxis", xAxisData);
 
       for (var i = 0; i < dataKeyList.length; i++) {
         seriesData = new Array(xAxisData.length).fill(10);
@@ -988,12 +988,12 @@ export default {
             currentChartData["data"][j]["totVal"];
         }
 
-        console.log("text seri data", seriesData);
+        // console.log("text seri data", seriesData);
 
         this.$store.state.pageData[myPrgmId][chartKey]["xAxis"]["data"] = xAxisData;
         this.$store.state.pageData[myPrgmId][chartKey]["series"][0]["data"] = seriesData;
 
-        console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
+        // console.log("chart data", this.$store.state.pageData[myPrgmId][chartKey]);
       }
     },
     getGroup01ChartOption() {
@@ -1007,7 +1007,7 @@ export default {
       };
 
       chartOption["series"][0]["symbol"] = "none";
-      console.log("chartOption: ", chartOption);
+      // console.log("chartOption: ", chartOption);
       return chartOption;
     },
     makeChartGroup01XaxisData() {

From 88b59f5f3315d74d7dafd5a18f011f311f688e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com>
Date: Wed, 30 Jul 2025 16:19:54 +0900
Subject: [PATCH 12/17] update code merge

---
 pages/ems/effc/EnrgUsePlanPage.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue
index 45a3471..3a2c44f 100644
--- a/pages/ems/effc/EnrgUsePlanPage.vue
+++ b/pages/ems/effc/EnrgUsePlanPage.vue
@@ -8,9 +8,15 @@
 						<v-col :cols="2.5">
 							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연도'" />
 						</v-col>
-						<v-col :cols="2.5">
-							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" customClass="select-large" />
+						<v-col :cols="3">
+							<component
+								:is="'SelectBox'"
+								ref="SelectBox1"
+								:propsValue="selectValue01"
+								:itemList="selectValueList01"
+								:label="'FAB'"
+								@update:propsValue="selectValue01 = $event"
+							/>
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"

From b2e50837fd16c6aa3f9244a286c25a1e3cf32127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com>
Date: Wed, 30 Jul 2025 16:21:52 +0900
Subject: [PATCH 13/17] update code

---
 .../pages/ems/EccInfo/EccAddInfoTab.vue       |  33 +-
 components/pages/ems/EccInfo/EccIaoTab.vue    |  24 +-
 pages/comm/auth/UserRoleMngPage.vue           | 104 +------
 pages/comm/base/BatchLogMngPage.vue           |  24 +-
 pages/ems/base/AddInfoMngPage.vue             |  59 +---
 pages/ems/effc/EnrgUsePlanPage.vue            | 292 ++++--------------
 6 files changed, 78 insertions(+), 458 deletions(-)

diff --git a/components/pages/ems/EccInfo/EccAddInfoTab.vue b/components/pages/ems/EccInfo/EccAddInfoTab.vue
index 88823b2..312c78c 100644
--- a/components/pages/ems/EccInfo/EccAddInfoTab.vue
+++ b/components/pages/ems/EccInfo/EccAddInfoTab.vue
@@ -20,7 +20,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -54,22 +53,10 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			dataPathMock: {
-				"rowDetailGrid": {
-				column: [
-					{ header: '추가 정보', name: 'readObjId', align: 'left' },
-					{ header: 'Data 구분', name: 'readObjNm', align: 'left' },
-					{ header: '추가 정보 값', name: 'readObjKind', align: 'left' },
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {}
-				}
-			},
 		};
 	},
 	computed: {
@@ -444,22 +431,4 @@ export default {
 		},
 	},
 };
-
-const dataPathDataExample = [
-	{
-	readObjId: 'OBJ001',
-	readObjNm: '서울 본사',
-	readObjKind: 'TYPE01',
-	},
-	{
-	readObjId: 'OBJ002',
-	readObjNm: '부산 지사',
-	readObjKind: 'TYPE02',
-	},
-	{
-	readObjId: 'OBJ003',
-	readObjNm: '대전 공장',
-	readObjKind: 'TYPE03',
-	}
-]
 </script>
diff --git a/components/pages/ems/EccInfo/EccIaoTab.vue b/components/pages/ems/EccInfo/EccIaoTab.vue
index 4e03d6f..9153f96 100644
--- a/components/pages/ems/EccInfo/EccIaoTab.vue
+++ b/components/pages/ems/EccInfo/EccIaoTab.vue
@@ -19,7 +19,6 @@
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 		<div>
@@ -60,24 +59,11 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEccIaoGrid',
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
 			detailList: myDetail,
-			dataPathMock: {
-				"rowEccIaoGrid": {
-				column: [
-					{ header: '검침 대상 ID', name: 'readObjId', align: 'left' },
-					{ header: '검침 대상 명', name: 'readObjNm', align: 'left' },
-					{ header: '검침 대상 유형', name: 'readObjKind', align: 'left' },
-					{ header: '그룹', name: 'grpCd', align: 'left' },
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {}
-				}
-			},
 		};
 	},
 	computed: {
@@ -516,12 +502,4 @@ const myDetail = [
 		iconShow: true,
 	},
 ];
-const dataPathDataExample = [
-	{
-		readObjId: 'OBJ001',
-		readObjNm: '서울 본사',
-		readObjKind: 'TYPE01',
-		grpCd: 'GRP01',
-	},
-]
 </script>
diff --git a/pages/comm/auth/UserRoleMngPage.vue b/pages/comm/auth/UserRoleMngPage.vue
index 8a4599d..cabbed3 100644
--- a/pages/comm/auth/UserRoleMngPage.vue
+++ b/pages/comm/auth/UserRoleMngPage.vue
@@ -12,6 +12,8 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
+								labelCols="12"
+								textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -79,7 +81,6 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -128,7 +129,7 @@
 									<template v-else-if="item.id == 'AsgnRoleByUser'">
 										<v-col :cols="3" class="h100">
 											<v-card-title
-												class="pa-0 custom-title-4"
+												class="pa-0 custom-subtitle-tab"
 												style="min-height:36px;"
 												>역할리스트</v-card-title
 											>
@@ -154,7 +155,7 @@
 										</v-col>
 										<v-col :cols="8" class="h100">
 											<div class="d-flex align-center justify-space-between">
-												<v-card-title class="pa-0 custom-title-4">
+												<v-card-title class="pa-0 custom-subtitle-tab">
 													사용자 역할</v-card-title
 												>
 												<div>
@@ -307,40 +308,10 @@ export default {
 	},
 	methods: {
 		async init() {
-			 this.gridInit();
+			await this.gridInit();
 		},
-
-		gridInitTest() {
-			const rowGrid = {
-				column: [
-				{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
-				{ header: '사용자명', name: 'userNm' },
-				{ header: '사용자ID', name: 'userLoginId' },
-				{ header: '사용자비밀번호', name: 'userPswd', hidden: true },
-				{ header: '사업장', name: 'blocId', hidden: true },
-				{ header: 'email', name: 'email', hidden: true },
-				{ header: '등록자NO', name: 'regUserNo', hidden: true },
-				{ header: '등록일시', name: 'regDttm', hidden: true },
-				{ header: '수정자NO', name: 'procUserNo', hidden: true },
-				{ header: '수정일시', name: 'procDttm', hidden: true },
-				{ header: 'comId', name: 'comId', hidden: true },
-				{ header: 'deptId', name: 'deptId', hidden: true },
-				],
-				data: dataMockExample,
-				defaultRow: dataMockExample,
-				option: [],
-			}
-			this.dataPathMock = {rowGrid};
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
-
 		// 사용자 리스트 그리드 세팅
 		gridInit() {
-
-			// this.gridInitTest(); return
-
 			const gridHeight = this.$refs.gridParent.offsetHeight - 90;
 
 			const myOptions = {
@@ -1100,67 +1071,4 @@ function sha512(str) {
 		.update(str)
 		.digest('hex');
 }
-
-
-
-const dataMockExample = [
-  {
-    userNo: 1,
-    userNm: '홍길동',
-    userLoginId: 'hong123',
-    userPswd: 'password123',
-    blocId: 'B001',
-    email: 'hong@example.com',
-    regUserNo: 100,
-    regDttm: '2025-07-01 10:00:00',
-    procUserNo: 101,
-    procDttm: '2025-07-15 14:30:00',
-    comId: 'C001',
-    deptId: 'D001'
-  },
-  {
-    userNo: 2,
-    userNm: '김영희',
-    userLoginId: 'kimyh',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  },
-  {
-    userNo: 3,
-    userNm: '관리자',
-    userLoginId: 'user',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  },
-  {
-    userNo: 4,
-    userNm: '사용자',
-    userLoginId: 'admin',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  }
-];
-
-
-</script>
+</script>
\ No newline at end of file
diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue
index f82e108..bb0c869 100644
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@@ -4,24 +4,27 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="center" no-gutters>
-						<v-col :cols="2">
+					<v-row align="end" no-gutters>
+						<div></div>
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -29,20 +32,20 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
+								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<component
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
 							/>
 						</v-col>
-						<v-spacer></v-spacer>
-						<v-col :cols="4" class="text-right">
+						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
 							<BtnSearch />
-							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" />
-						</v-col>
+							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
+						</div>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -57,10 +60,11 @@
 						<div ref="gridParent" class="px-5 h100">
 							<component
 								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
+								:is=" 'Grid' "
 								:parentPrgmId="myPrgmId"
 								:gridName="gridName"
 								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
diff --git a/pages/ems/base/AddInfoMngPage.vue b/pages/ems/base/AddInfoMngPage.vue
index 105c73a..46a2c5f 100644
--- a/pages/ems/base/AddInfoMngPage.vue
+++ b/pages/ems/base/AddInfoMngPage.vue
@@ -64,7 +64,6 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -137,24 +136,10 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			detailList: myDetail,
 			initedFlag: false,
-			dataPathMock : {
-				'rowGrid': {
-					column: [
-						{ header: '추가 정보 그룹', name: 'addGrpId', align: 'left' },
-						{ header: '추가 정보 ID', name: 'addInfoId', align: 'left' },
-						{ header: '추가 정보 명', name: 'addInfoNm', align: 'left' },
-						{ header: 'Data 형식', name: 'addInfoDataKind', align: 'center' },
-						{ header: '사용여부', name: 'useFg', align: 'center' },
-					],
-					data: dataMockExample,
-					defaultRow: dataMockExample,
-					option: {},
-				},
-			},
 		};
 	},
 	computed: {
@@ -642,43 +627,7 @@ const myDetail = [
 		placeholder: '시스템 자동입력',
 	},
 ];
-
-const dataMockExample = [
-  {
-    addGrpId: 'GRP001',
-    addInfoId: 'INFO001',
-    addInfoNm: '온도 센서',
-    addInfoDataKind: 'DATA01',
-    useFg: true,
-  },
-  {
-    addGrpId: 'GRP002',
-    addInfoId: 'INFO002',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA02',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP003',
-    addInfoId: 'INFO003',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA03',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP004',
-    addInfoId: 'INFO004',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA04',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP005',
-    addInfoId: 'INFO005',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA05',
-    useFg: false,
-  },
-];
-
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>
diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue
index 3a2c44f..917888c 100644
--- a/pages/ems/effc/EnrgUsePlanPage.vue
+++ b/pages/ems/effc/EnrgUsePlanPage.vue
@@ -16,6 +16,7 @@
 								:itemList="selectValueList01"
 								:label="'FAB'"
 								@update:propsValue="selectValue01 = $event"
+								customClass="select-large"
 							/>
 						</v-col>
 						<v-col :cols="2.5">
@@ -50,12 +51,10 @@
 				</v-card>
 			</v-col>
 		</v-row>
-
-
 	</div>
 </template>
 <script>
-import { mapState, mapActions, mapMutations } from 'vuex';
+import { mapState, mapActions } from 'vuex';
 import mixinGlobal from '@/mixin/global.js';
 import { resize } from '@/mixin/resize.js';
 import SelectBox from '@/components/common/select/SelectBox';
@@ -112,9 +111,6 @@ export default {
 			fromDt: new Date().getFullYear(),
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			dataPathMock: {
-				// "grid01": {}
-			},
 			// gridName: 'rowGrid',
 		};
 	},
@@ -172,12 +168,8 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() { },
+	created() {},
 	async mounted() {
-		// -------
-		// this.initTest();
-		// return;
-		// ========End test===========
 		await this.init();
 		this.initedFlag = true;
 	},
@@ -190,122 +182,6 @@ export default {
 			getBlocMstrList: 'modules/search/getBlocMstrList',
 			getAddInfoList: 'modules/search/getAddInfoList',
 		}),
-		...mapMutations({
-			setPageData: 'setPageData',
-		}),
-		initTest() {
-			let _this = this;
-			// _this.setPageData({ popupDialogFg: true });
-			
-			class MockCustumButton {
-				constructor(props) {
-					const { grid, rowKey, columnInfo } = props;
-					const value = columnInfo.renderer.options.value;
-					
-					const elDiv = document.createElement('div');
-					elDiv.innerHTML = `<span>${value}</span>`;
-					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
-					const el = document.createElement('button');
-					$(el).addClass('edit-btn blue--text');
-					el.innerText = 'Edit';
-
-					el.addEventListener('click', function (event) {
-						// console.log("------DEBUG----_this:", _this);
-						// _this.setPageData({ eqpmNm: selectedGridData[0]?.eqpmNm });
-						_this.setPageData({ popupDialogFg: true });
-					});
-
-					elDiv.appendChild(el);
-					this.elDiv = elDiv;
-				}
-
-				getElement() {
-					return this.elDiv;
-				}
-			}
-			const mockData = {
-				column: [
-					{ header: 'No', name: 'rowNum', align: 'center', width: 40 },
-					{ header: 'FAB', name: 'fab', align: 'left', width: 80 },
-					{ header: '설비 그룹', name: 'eqpmGrpNm', align: 'left', minWidth: 150 },
-					// {
-					// 	header: '설비명', name: 'eqpmNm', align: 'left', minWidth: 150,
-					// 	formatter: ({ value, row }) => {
-					// 		return `
-					// 				<div class="d-flex justify-space-between">
-					// 					<span>${value}</span>
-					// 					<button class="edit-btn blue--text" data-row='${JSON.stringify(row)}'>Edit</button
-					// 				</div>
-					// 			`;
-					// 	}
-					// },
-					{
-						header: '설비명',
-						name: 'eqpmNm',
-						width: 70,
-						align: 'left',
-						minWidth: 150,
-						renderer: {
-							type: MockCustumButton,
-							options: {
-								value: '계획수정',
-							},
-						},
-					},
-					{
-						header: '구분', name: 'gubun', align: 'left', width: 80,
-						formatter({ value }) {
-							let retVal = '';
-							if (value == '1RSLT') {
-								retVal = '전년실적';
-							} else if (value == '2PLAN') {
-								retVal = '계획';
-							} else {
-								retVal = value;
-							}
-							return retVal;
-						},
-					},
-
-					{ header: '1월', name: 'jan', align: 'right', width: 80 },
-					{ header: '2월', name: 'feb', align: 'right', width: 80 },
-					{ header: '3월', name: 'mar', align: 'right', width: 80 },
-					{ header: '4월', name: 'apr', align: 'right', width: 80 },
-					{ header: '5월', name: 'may', align: 'right', width: 80 },
-					{ header: '6월', name: 'jun', align: 'right', width: 80 },
-					{ header: '7월', name: 'jul', align: 'right', width: 80 },
-					{ header: '8월', name: 'aug', align: 'right', width: 80 },
-					{ header: '9월', name: 'sep', align: 'right', width: 80 },
-					{ header: '10월', name: 'oct', align: 'right', width: 80 },
-					{ header: '11월', name: 'nov', align: 'right', width: 80 },
-					{ header: '12월', name: 'dec', align: 'right', width: 80 }
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {
-					columnOptions: {
-						resizable: true,
-					},
-					header: {
-						height: 65,
-						complexColumns: [
-							{
-								header: '2025 년',
-								name: 'yyyyCol',
-								childNames: [
-									'jan', 'feb', 'mar', 'apr', 'may', 'jun',
-									'jul', 'aug', 'sep', 'oct', 'nov', 'dec'
-								],
-							},
-						],
-					}
-				}
-			};
-			this.dataPathMock[this.gridName] = mockData;
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
 		async init() {
 			await this.getFab();
 			await this.getEqpmKind();
@@ -424,25 +300,53 @@ export default {
 
 			class CustumButton {
 				constructor(props) {
+					// v-btn v-btn--is-elevated v-btn--has-bg theme--dark v-size--default
+					const el = document.createElement('button');
 					const { grid, rowKey, columnInfo } = props;
 
-					const gridData = grid.store.data.rawData;
-					const value = gridData[rowKey][columnInfo.name];
+					$(el).addClass('tui-grid-cell-content');
+					// $(el).css('text-align', 'center');
+					el.classList.add('v-btn');
+					// el.style.width = '80%';
+					// el.style.height = '80%';
+					// el.style.boxShadow = '0px 0px 0px 2px #cbced6';
+					// el.style.background = 'linear-gradient(to bottom, #242940 5%, #476e9e 100%)';
+					// el.style.backgroundColor = '#144985';
+					el.style.borderRadius = '7px';
+					el.style.border = '1px solid #4e6096';
+					// el.style.display = 'inline-block';
+					// el.style.cursor = 'pointer';
+					el.style.color = '#ffffff';
+					// el.style.fontFamily = 'Arial';
+					el.style.padding = '6% 3%';
 
+					// el.style.textDecoration = 'none';
+					// el.style.textShadow = '0px 1px 0px #283966';
+
+					el.innerText = columnInfo.renderer.options.value;
+					this.el = el;
 					this.disabled = columnInfo.renderer.options.disabled || false;
-					const elDiv = document.createElement('div');
-					elDiv.innerHTML = `<span>${value}</span>`;
-					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
-					const el2 = document.createElement('button');
-					$(el2).addClass('edit-btn blue--text');
-					el2.innerText = 'Edit';
-					elDiv.appendChild(el2);
-
-					this.el = elDiv;
 
 					if (!this.disabled) {
+						// hover 기능 구현
+						this.el.addEventListener('mouseover', function(event) {
+							// console.log('darkModeFg', _this.darkModeFg);
+							// console.log('event',event.fromElement);
+							// console.log('event',document.defaultView.getComputedStyle(el).getPropertyValue('background-color'));
+							// rgb(85, 130, 220) // light
+							// el.style.backgroundColor = '#26578F';	// rgb(20, 73, 133) // dark
+							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
+							// el.style.backgroundColor = btnColor['mouseOver'];
+						});
+						this.el.addEventListener('mouseout', function(event) {
+							// rgb(71, 119, 217) // light
+							// el.style.backgroundColor = '#144985'; // dark
+							// console.log('event',event.fromElement);
+							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
+							// el.style.backgroundColor = btnColor['mouseOut'];
+						});
 						// click 이벤트
-						el2.addEventListener('click', function (event) {
+						this.el.addEventListener('click', function(event) {
 							let gridData = grid.store.data.rawData;
 							let rowNum = gridData[rowKey].rowNum;
 							let selectedGridData = gridData.filter(item => {
@@ -805,8 +709,8 @@ export default {
 										dataArr[i][qty] == ''
 											? null
 											: parseInt(dataArr[i][qty]) == 0
-												? 0
-												: dataArr[i][qty];
+											? 0
+											: dataArr[i][qty];
 									dataList.push(temp);
 								}
 							}
@@ -948,110 +852,18 @@ const defaultData = {
 		},
 	},
 };
-
-const dataPathDataExample = [
-	{
-		rowNum: 1,
-		fab: 'B01',
-		eqpmGrpNm: '방송기술운',
-		eqpmNm: 'U/T_LT_CH101',
-		gubun: '전력량',
-		jan: 110000,
-		feb: 112000,
-		mar: 115000,
-		apr: 117000,
-		may: 120000,
-		jun: 118000,
-		jul: 119000,
-		aug: 121000,
-		sep: 122000,
-		oct: 123000,
-		nov: 124000,
-		dec: 125000
-	},
-	{
-		rowNum: 2,
-		fab: 'B02',
-		eqpmGrpNm: '방송기술운',
-		eqpmNm: 'U/T_LT_CH102',
-		gubun: '전력량',
-		jan: 81000,
-		feb: 82000,
-		mar: 83000,
-		apr: 84000,
-		may: 85000,
-		jun: 86000,
-		jul: 87000,
-		aug: 88000,
-		sep: 89000,
-		oct: 90000,
-		nov: 91000,
-		dec: 92000
-	},
-	{
-		rowNum: 3, fab: 'C01', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH124', gubun: '수도량',
-		jan: 106178, feb: 104740, mar: 92283, apr: 116081, may: 98945, jun: 126579,
-		jul: 90690, aug: 124243, sep: 97524, oct: 84072, nov: 88160, dec: 118183
-	},
-	{
-		rowNum: 4, fab: 'B01', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH103', gubun: '가스량',
-		jan: 80442, feb: 102867, mar: 114939, apr: 106335, may: 81743, jun: 83711,
-		jul: 86114, aug: 97432, sep: 84146, oct: 84775, nov: 117921, dec: 119417
-	},
-	{
-		rowNum: 5, fab: 'B01', eqpmGrpNm: '설비운영팀', eqpmNm: 'U/T_LT_CH156', gubun: '전력량',
-		jan: 90341, feb: 94072, mar: 122754, apr: 85471, may: 90813, jun: 116831,
-		jul: 90856, aug: 109437, sep: 94029, oct: 96075, nov: 127067, dec: 102503
-	},
-	{
-		rowNum: 6, fab: 'B03', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH183', gubun: '가스량',
-		jan: 104163, feb: 107012, mar: 104631, apr: 83055, may: 106311, jun: 117306,
-		jul: 86434, aug: 117087, sep: 118414, oct: 91499, nov: 93829, dec: 94192
-	},
-	{
-		rowNum: 7, fab: 'C01', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH158', gubun: '가스량',
-		jan: 84821, feb: 128234, mar: 116883, apr: 116718, may: 114738, jun: 88297,
-		jul: 93840, aug: 84700, sep: 98360, oct: 87021, nov: 113098, dec: 94734
-	},
-	{
-		rowNum: 8, fab: 'B02', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH179', gubun: '가스량',
-		jan: 128714, feb: 88797, mar: 124808, apr: 109283, may: 113141, jun: 82873,
-		jul: 114993, aug: 129108, sep: 100885, oct: 125730, nov: 92127, dec: 122286
-	},
-	{
-		rowNum: 9, fab: 'C01', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH191', gubun: '전력량',
-		jan: 107258, feb: 108424, mar: 113604, apr: 116648, may: 124149, jun: 129978,
-		jul: 112215, aug: 129602, sep: 93551, oct: 111272, nov: 89736, dec: 128423
-	},
-	{
-		rowNum: 10, fab: 'B02', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH104', gubun: '전력량',
-		jan: 82089, feb: 102793, mar: 96784, apr: 85238, may: 86153, jun: 123849,
-		jul: 115095, aug: 129484, sep: 102109, oct: 80976, nov: 119841, dec: 106309
-	},
-	{
-		rowNum: 11, fab: 'C02', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH139', gubun: '전력량',
-		jan: 128592, feb: 95647, mar: 85982, apr: 126824, may: 87928, jun: 128967,
-		jul: 94637, aug: 107530, sep: 122533, oct: 97546, nov: 112110, dec: 126250
-	},
-	{
-		rowNum: 12, fab: 'C01', eqpmGrpNm: '설비운영팀', eqpmNm: 'U/T_LT_CH109', gubun: '전력량',
-		jan: 106530, feb: 91716, mar: 111104, apr: 102663, may: 108912, jun: 91464,
-		jul: 121245, aug: 90785, sep: 120586, oct: 105718, nov: 96191, dec: 111513
-	}
-];
-
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
+// @import '@/assets/scss/common.scss';
 @import '@/assets/scss/var.scss';
-
 @each $theme in dark, light {
 	.v-application.#{$theme}-mode {
 		.tui-grid {
-
 			&-row-odd,
 			&-row-even {
-				&:hover>.colrowspan {
-					background-color: map-deep-get($config,
+				&:hover > .colrowspan {
+					background-color: map-deep-get(
+						$config,
 						#{$theme},
 						'tui-grid-cell-backgroundColor'
 					) !important;
@@ -1061,10 +873,10 @@ const dataPathDataExample = [
 					}
 				}
 			}
-
 			&-cell {
 				&.row-selected.colrowspan {
-					background-color: map-deep-get($config,
+					background-color: map-deep-get(
+						$config,
 						#{$theme},
 						'tui-grid-cell-backgroundColor'
 					) !important;

From e600089f7eaec08955ae2d618235aa085450dc41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com>
Date: Wed, 30 Jul 2025 18:15:08 +0900
Subject: [PATCH 14/17] fix bug

---
 pages/comm/base/BatchLogMngPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue
index bb0c869..ff14d43 100644
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@@ -60,7 +60,7 @@
 						<div ref="gridParent" class="px-5 h100">
 							<component
 								:ref="gridName"
-								:is=" 'Grid' "
+								:is="loadGrid ? 'Grid' : null"
 								:parentPrgmId="myPrgmId"
 								:gridName="gridName"
 								@getRowsData="getRowData"

From 9b89a5625bdabec9f0ff7f54ce9cf0abe8c8efee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com>
Date: Wed, 30 Jul 2025 18:34:46 +0900
Subject: [PATCH 15/17] update code fix bug and revert screen 2

---
 pages/ems/base/AddInfoMngPage.vue  |   3 -
 pages/ems/effc/EnrgUsePlanPage.vue | 304 +++++++++++++++++++++++------
 2 files changed, 243 insertions(+), 64 deletions(-)

diff --git a/pages/ems/base/AddInfoMngPage.vue b/pages/ems/base/AddInfoMngPage.vue
index 46a2c5f..8a330ed 100644
--- a/pages/ems/base/AddInfoMngPage.vue
+++ b/pages/ems/base/AddInfoMngPage.vue
@@ -628,6 +628,3 @@ const myDetail = [
 	},
 ];
 </script>
-<style lang="scss">
-@import '@/assets/scss/common.scss';
-</style>
diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue
index 917888c..45a3471 100644
--- a/pages/ems/effc/EnrgUsePlanPage.vue
+++ b/pages/ems/effc/EnrgUsePlanPage.vue
@@ -8,16 +8,9 @@
 						<v-col :cols="2.5">
 							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연도'" />
 						</v-col>
-						<v-col :cols="3">
-							<component
-								:is="'SelectBox'"
-								ref="SelectBox1"
-								:propsValue="selectValue01"
-								:itemList="selectValueList01"
-								:label="'FAB'"
-								@update:propsValue="selectValue01 = $event"
-								customClass="select-large"
-							/>
+						<v-col :cols="2.5">
+							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
+								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" customClass="select-large" />
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"
@@ -51,10 +44,12 @@
 				</v-card>
 			</v-col>
 		</v-row>
+
+
 	</div>
 </template>
 <script>
-import { mapState, mapActions } from 'vuex';
+import { mapState, mapActions, mapMutations } from 'vuex';
 import mixinGlobal from '@/mixin/global.js';
 import { resize } from '@/mixin/resize.js';
 import SelectBox from '@/components/common/select/SelectBox';
@@ -111,6 +106,9 @@ export default {
 			fromDt: new Date().getFullYear(),
 			rowKey: null,
 			edtingFinishFlag: 'Y',
+			dataPathMock: {
+				// "grid01": {}
+			},
 			// gridName: 'rowGrid',
 		};
 	},
@@ -168,8 +166,12 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() {},
+	created() { },
 	async mounted() {
+		// -------
+		// this.initTest();
+		// return;
+		// ========End test===========
 		await this.init();
 		this.initedFlag = true;
 	},
@@ -182,6 +184,122 @@ export default {
 			getBlocMstrList: 'modules/search/getBlocMstrList',
 			getAddInfoList: 'modules/search/getAddInfoList',
 		}),
+		...mapMutations({
+			setPageData: 'setPageData',
+		}),
+		initTest() {
+			let _this = this;
+			// _this.setPageData({ popupDialogFg: true });
+			
+			class MockCustumButton {
+				constructor(props) {
+					const { grid, rowKey, columnInfo } = props;
+					const value = columnInfo.renderer.options.value;
+					
+					const elDiv = document.createElement('div');
+					elDiv.innerHTML = `<span>${value}</span>`;
+					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
+					const el = document.createElement('button');
+					$(el).addClass('edit-btn blue--text');
+					el.innerText = 'Edit';
+
+					el.addEventListener('click', function (event) {
+						// console.log("------DEBUG----_this:", _this);
+						// _this.setPageData({ eqpmNm: selectedGridData[0]?.eqpmNm });
+						_this.setPageData({ popupDialogFg: true });
+					});
+
+					elDiv.appendChild(el);
+					this.elDiv = elDiv;
+				}
+
+				getElement() {
+					return this.elDiv;
+				}
+			}
+			const mockData = {
+				column: [
+					{ header: 'No', name: 'rowNum', align: 'center', width: 40 },
+					{ header: 'FAB', name: 'fab', align: 'left', width: 80 },
+					{ header: '설비 그룹', name: 'eqpmGrpNm', align: 'left', minWidth: 150 },
+					// {
+					// 	header: '설비명', name: 'eqpmNm', align: 'left', minWidth: 150,
+					// 	formatter: ({ value, row }) => {
+					// 		return `
+					// 				<div class="d-flex justify-space-between">
+					// 					<span>${value}</span>
+					// 					<button class="edit-btn blue--text" data-row='${JSON.stringify(row)}'>Edit</button
+					// 				</div>
+					// 			`;
+					// 	}
+					// },
+					{
+						header: '설비명',
+						name: 'eqpmNm',
+						width: 70,
+						align: 'left',
+						minWidth: 150,
+						renderer: {
+							type: MockCustumButton,
+							options: {
+								value: '계획수정',
+							},
+						},
+					},
+					{
+						header: '구분', name: 'gubun', align: 'left', width: 80,
+						formatter({ value }) {
+							let retVal = '';
+							if (value == '1RSLT') {
+								retVal = '전년실적';
+							} else if (value == '2PLAN') {
+								retVal = '계획';
+							} else {
+								retVal = value;
+							}
+							return retVal;
+						},
+					},
+
+					{ header: '1월', name: 'jan', align: 'right', width: 80 },
+					{ header: '2월', name: 'feb', align: 'right', width: 80 },
+					{ header: '3월', name: 'mar', align: 'right', width: 80 },
+					{ header: '4월', name: 'apr', align: 'right', width: 80 },
+					{ header: '5월', name: 'may', align: 'right', width: 80 },
+					{ header: '6월', name: 'jun', align: 'right', width: 80 },
+					{ header: '7월', name: 'jul', align: 'right', width: 80 },
+					{ header: '8월', name: 'aug', align: 'right', width: 80 },
+					{ header: '9월', name: 'sep', align: 'right', width: 80 },
+					{ header: '10월', name: 'oct', align: 'right', width: 80 },
+					{ header: '11월', name: 'nov', align: 'right', width: 80 },
+					{ header: '12월', name: 'dec', align: 'right', width: 80 }
+				],
+				data: dataPathDataExample,
+				defaultRow: dataPathDataExample,
+				option: {
+					columnOptions: {
+						resizable: true,
+					},
+					header: {
+						height: 65,
+						complexColumns: [
+							{
+								header: '2025 년',
+								name: 'yyyyCol',
+								childNames: [
+									'jan', 'feb', 'mar', 'apr', 'may', 'jun',
+									'jul', 'aug', 'sep', 'oct', 'nov', 'dec'
+								],
+							},
+						],
+					}
+				}
+			};
+			this.dataPathMock[this.gridName] = mockData;
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
+		},
 		async init() {
 			await this.getFab();
 			await this.getEqpmKind();
@@ -300,53 +418,25 @@ export default {
 
 			class CustumButton {
 				constructor(props) {
-					// v-btn v-btn--is-elevated v-btn--has-bg theme--dark v-size--default
-					const el = document.createElement('button');
 					const { grid, rowKey, columnInfo } = props;
 
-					$(el).addClass('tui-grid-cell-content');
-					// $(el).css('text-align', 'center');
-					el.classList.add('v-btn');
-					// el.style.width = '80%';
-					// el.style.height = '80%';
-					// el.style.boxShadow = '0px 0px 0px 2px #cbced6';
-					// el.style.background = 'linear-gradient(to bottom, #242940 5%, #476e9e 100%)';
-					// el.style.backgroundColor = '#144985';
-					el.style.borderRadius = '7px';
-					el.style.border = '1px solid #4e6096';
-					// el.style.display = 'inline-block';
-					// el.style.cursor = 'pointer';
-					el.style.color = '#ffffff';
-					// el.style.fontFamily = 'Arial';
-					el.style.padding = '6% 3%';
+					const gridData = grid.store.data.rawData;
+					const value = gridData[rowKey][columnInfo.name];
 
-					// el.style.textDecoration = 'none';
-					// el.style.textShadow = '0px 1px 0px #283966';
-
-					el.innerText = columnInfo.renderer.options.value;
-					this.el = el;
 					this.disabled = columnInfo.renderer.options.disabled || false;
+					const elDiv = document.createElement('div');
+					elDiv.innerHTML = `<span>${value}</span>`;
+					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
+					const el2 = document.createElement('button');
+					$(el2).addClass('edit-btn blue--text');
+					el2.innerText = 'Edit';
+					elDiv.appendChild(el2);
+
+					this.el = elDiv;
 
 					if (!this.disabled) {
-						// hover 기능 구현
-						this.el.addEventListener('mouseover', function(event) {
-							// console.log('darkModeFg', _this.darkModeFg);
-							// console.log('event',event.fromElement);
-							// console.log('event',document.defaultView.getComputedStyle(el).getPropertyValue('background-color'));
-							// rgb(85, 130, 220) // light
-							// el.style.backgroundColor = '#26578F';	// rgb(20, 73, 133) // dark
-							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
-							// el.style.backgroundColor = btnColor['mouseOver'];
-						});
-						this.el.addEventListener('mouseout', function(event) {
-							// rgb(71, 119, 217) // light
-							// el.style.backgroundColor = '#144985'; // dark
-							// console.log('event',event.fromElement);
-							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
-							// el.style.backgroundColor = btnColor['mouseOut'];
-						});
 						// click 이벤트
-						this.el.addEventListener('click', function(event) {
+						el2.addEventListener('click', function (event) {
 							let gridData = grid.store.data.rawData;
 							let rowNum = gridData[rowKey].rowNum;
 							let selectedGridData = gridData.filter(item => {
@@ -709,8 +799,8 @@ export default {
 										dataArr[i][qty] == ''
 											? null
 											: parseInt(dataArr[i][qty]) == 0
-											? 0
-											: dataArr[i][qty];
+												? 0
+												: dataArr[i][qty];
 									dataList.push(temp);
 								}
 							}
@@ -852,18 +942,110 @@ const defaultData = {
 		},
 	},
 };
+
+const dataPathDataExample = [
+	{
+		rowNum: 1,
+		fab: 'B01',
+		eqpmGrpNm: '방송기술운',
+		eqpmNm: 'U/T_LT_CH101',
+		gubun: '전력량',
+		jan: 110000,
+		feb: 112000,
+		mar: 115000,
+		apr: 117000,
+		may: 120000,
+		jun: 118000,
+		jul: 119000,
+		aug: 121000,
+		sep: 122000,
+		oct: 123000,
+		nov: 124000,
+		dec: 125000
+	},
+	{
+		rowNum: 2,
+		fab: 'B02',
+		eqpmGrpNm: '방송기술운',
+		eqpmNm: 'U/T_LT_CH102',
+		gubun: '전력량',
+		jan: 81000,
+		feb: 82000,
+		mar: 83000,
+		apr: 84000,
+		may: 85000,
+		jun: 86000,
+		jul: 87000,
+		aug: 88000,
+		sep: 89000,
+		oct: 90000,
+		nov: 91000,
+		dec: 92000
+	},
+	{
+		rowNum: 3, fab: 'C01', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH124', gubun: '수도량',
+		jan: 106178, feb: 104740, mar: 92283, apr: 116081, may: 98945, jun: 126579,
+		jul: 90690, aug: 124243, sep: 97524, oct: 84072, nov: 88160, dec: 118183
+	},
+	{
+		rowNum: 4, fab: 'B01', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH103', gubun: '가스량',
+		jan: 80442, feb: 102867, mar: 114939, apr: 106335, may: 81743, jun: 83711,
+		jul: 86114, aug: 97432, sep: 84146, oct: 84775, nov: 117921, dec: 119417
+	},
+	{
+		rowNum: 5, fab: 'B01', eqpmGrpNm: '설비운영팀', eqpmNm: 'U/T_LT_CH156', gubun: '전력량',
+		jan: 90341, feb: 94072, mar: 122754, apr: 85471, may: 90813, jun: 116831,
+		jul: 90856, aug: 109437, sep: 94029, oct: 96075, nov: 127067, dec: 102503
+	},
+	{
+		rowNum: 6, fab: 'B03', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH183', gubun: '가스량',
+		jan: 104163, feb: 107012, mar: 104631, apr: 83055, may: 106311, jun: 117306,
+		jul: 86434, aug: 117087, sep: 118414, oct: 91499, nov: 93829, dec: 94192
+	},
+	{
+		rowNum: 7, fab: 'C01', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH158', gubun: '가스량',
+		jan: 84821, feb: 128234, mar: 116883, apr: 116718, may: 114738, jun: 88297,
+		jul: 93840, aug: 84700, sep: 98360, oct: 87021, nov: 113098, dec: 94734
+	},
+	{
+		rowNum: 8, fab: 'B02', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH179', gubun: '가스량',
+		jan: 128714, feb: 88797, mar: 124808, apr: 109283, may: 113141, jun: 82873,
+		jul: 114993, aug: 129108, sep: 100885, oct: 125730, nov: 92127, dec: 122286
+	},
+	{
+		rowNum: 9, fab: 'C01', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH191', gubun: '전력량',
+		jan: 107258, feb: 108424, mar: 113604, apr: 116648, may: 124149, jun: 129978,
+		jul: 112215, aug: 129602, sep: 93551, oct: 111272, nov: 89736, dec: 128423
+	},
+	{
+		rowNum: 10, fab: 'B02', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH104', gubun: '전력량',
+		jan: 82089, feb: 102793, mar: 96784, apr: 85238, may: 86153, jun: 123849,
+		jul: 115095, aug: 129484, sep: 102109, oct: 80976, nov: 119841, dec: 106309
+	},
+	{
+		rowNum: 11, fab: 'C02', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH139', gubun: '전력량',
+		jan: 128592, feb: 95647, mar: 85982, apr: 126824, may: 87928, jun: 128967,
+		jul: 94637, aug: 107530, sep: 122533, oct: 97546, nov: 112110, dec: 126250
+	},
+	{
+		rowNum: 12, fab: 'C01', eqpmGrpNm: '설비운영팀', eqpmNm: 'U/T_LT_CH109', gubun: '전력량',
+		jan: 106530, feb: 91716, mar: 111104, apr: 102663, may: 108912, jun: 91464,
+		jul: 121245, aug: 90785, sep: 120586, oct: 105718, nov: 96191, dec: 111513
+	}
+];
+
 </script>
-<style lang="scss">
-// @import '@/assets/scss/common.scss';
+<style lang="scss" scoped>
 @import '@/assets/scss/var.scss';
+
 @each $theme in dark, light {
 	.v-application.#{$theme}-mode {
 		.tui-grid {
+
 			&-row-odd,
 			&-row-even {
-				&:hover > .colrowspan {
-					background-color: map-deep-get(
-						$config,
+				&:hover>.colrowspan {
+					background-color: map-deep-get($config,
 						#{$theme},
 						'tui-grid-cell-backgroundColor'
 					) !important;
@@ -873,10 +1055,10 @@ const defaultData = {
 					}
 				}
 			}
+
 			&-cell {
 				&.row-selected.colrowspan {
-					background-color: map-deep-get(
-						$config,
+					background-color: map-deep-get($config,
 						#{$theme},
 						'tui-grid-cell-backgroundColor'
 					) !important;

From 719e7cee692d372070500e67207de05084947146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Wed, 30 Jul 2025 17:09:09 +0700
Subject: [PATCH 16/17] fix style grid

---
 assets/scss/common/grid.scss                | 50 ++++++++++++---------
 assets/scss/var.scss                        |  2 +-
 components/common/modal/EgrpPysclQtyPop.vue | 17 +++++--
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss
index 6abcb48..351fc58 100644
--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@@ -134,11 +134,11 @@
       }
 
       &-body-container{
-        border-right: 1px solid;
-        border-right-color: map-deep-get($config,
-          #{$theme},
-          "tui-grid-cell-borderColor"
-        );
+        border-right: 0;
+        // border-right-color: map-deep-get($config,
+        //   #{$theme},
+        //   "tui-grid-cell-borderColor"
+        // );
         width: auto !important;
       }
 
@@ -151,24 +151,27 @@
           width: $scrollbar-width !important;
           height: $scrollbar-width !important;
           -webkit-appearance: initial;
-          background-color: map-deep-get($config,
-            #{$theme},
-            "scrollbar-track"
-          ) !important;
+          // background-color: map-deep-get($config,
+          //   #{$theme},
+          //   "tui-grid-cell-borderColor"
+          // ) !important;
+          background-color: rgba(0, 0, 0, 0) !important;
           border-radius: 3px !important;
         }
 
         & ::-webkit-scrollbar-track {
-          background-color: map-deep-get($config,
-            #{$theme},
-            "scrollbar-track"
-          ) !important;
+          // background-color: map-deep-get($config,
+          //   #{$theme},
+          //   "tui-grid-cell-borderColor"
+          // ) !important;
+          background-color: rgba(0, 0, 0, 0) !important;
         }
 
         & ::-webkit-scrollbar-thumb {
           width: 50px !important;
           height: 50px !important;
           background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
+          // background-color: rgba(0, 0, 0, 0);
           border-radius: 3px;
         }
 
@@ -195,6 +198,7 @@
       &-scrollbar-right-top {
         background-color: rgba(0, 0, 0, 0);
         border: none;
+        display: none;
         // background-color: map-deep-get(
         //   $config,
         //   #{$theme},
@@ -221,12 +225,13 @@
         width: $scrollbar-width !important;
         height: $scrollbar-width !important;
         // display: none !important;
-        border-color: map-deep-get($config, #{$theme}, "scrollbar-track");
-        background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
+        border-color: map-deep-get($config, #{$theme}, "cardBackground");
+        background-color: map-deep-get($config, #{$theme}, "cardBackground");
         // border: none !important;
         // bottom: -1px;
         // right: -2px;
         box-sizing: border-box;
+        // display: none;
       }
 
       &-scrollbar-frozen-border,
@@ -236,13 +241,9 @@
         border-color: transparent !important;
       }
 
-      // &-body-area {
-      //   overflow: auto !important;
-      // }
-
+      &-body-area,
       &-container,
       &-layer-state,
-      &-body-area,
       &-summary-area,
       &-cell {
         background-color: map-deep-get($config,
@@ -315,8 +316,8 @@
       &-header-area,
       &-cell-header {
         // font-family: inherit;
+        // font-style: Semi Bold;
         font-weight: 600;
-        font-style: Semi Bold;
         background-color: map-deep-get($config,
           #{$theme},
           "tui-grid-header-backgroundColor"
@@ -333,8 +334,13 @@
       }
 
       &-header-area {
-        background-color: none;
+        // background-color: none;
         border: none;
+        margin-right: 0 !important;
+        background-color: map-deep-get($config,
+          #{$theme},
+          "tui-grid-cell-backgroundColor"
+        );
       }
 
       &-row-odd,
diff --git a/assets/scss/var.scss b/assets/scss/var.scss
index ec638ff..c1a4bc7 100644
--- a/assets/scss/var.scss
+++ b/assets/scss/var.scss
@@ -106,7 +106,7 @@ $config: (
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
-    tui-grid-border-vertical-color: #212224,
+    tui-grid-border-vertical-color: #FFFFFF0F,
     tui-grid-cell-backgroundColor: #212224,
     tui-grid-cell-color: #fff,
     tui-grid-cell-insert-color: #13636c,
diff --git a/components/common/modal/EgrpPysclQtyPop.vue b/components/common/modal/EgrpPysclQtyPop.vue
index 786ec19..b808f11 100644
--- a/components/common/modal/EgrpPysclQtyPop.vue
+++ b/components/common/modal/EgrpPysclQtyPop.vue
@@ -22,6 +22,7 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
+
 				<div class="px-6 py-4 pt-0">
 					<v-row align="center">
 						<v-col :cols="5">
@@ -58,19 +59,27 @@
 								</v-col>
 							</v-row>
 						</v-col>
+						<v-col :cols="12">
+							<div style="height: 50vh;">
+								<div ref="modalGridParent" class="h100 py-4">
+									<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
+										:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
+										@getRowsData="getRowData" @dblClick="setUpdate($event)" />
+								</div>
+							</div>
+						</v-col>
 					</v-row>
-
 				</div>
 
-				<div :style="'height: calc(50vh)'">
+				<!-- <div style="height: 50vh;">
 					<div ref="modalGridParent" class="h100 px-6 py-4">
 						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
 							:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
 							@getRowsData="getRowData" @dblClick="setUpdate($event)" />
 					</div>
-				</div>
+				</div> -->
+
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					
 					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
 						class="mr-2">닫기</a-button>
 					<a-button v-if="item.closeBtnFg || false" :ripple="false"  type="danger" ghost danger

From e6e1703942051335847c9b85b5756d75a8692b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com>
Date: Wed, 30 Jul 2025 19:16:42 +0900
Subject: [PATCH 17/17] update date pickker

---
 pages/comm/base/BatchLogMngPage.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue
index ff14d43..2ea07c1 100644
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@@ -40,6 +40,7 @@
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
+								customClass="datepicker-large"
 							/>
 						</v-col>
 						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
@@ -64,7 +65,6 @@
 								:parentPrgmId="myPrgmId"
 								:gridName="gridName"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -430,7 +430,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
-<style lang="scss">
-@import '@/assets/scss/common.scss';
-</style>
+</script>
\ No newline at end of file