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