updatecode

assets/scss/common.scss

@@ -1259,11 +1259,19 @@ a {
           opacity: 0;
         }
 
+        .v-list-item__content {
+          background-color: currentColor;
+        }
+
         .v-list-item__title {
           color: map-deep-get($config,
             #{$theme},
             "tui-datepicker-calendar-color"
           );
+
+          @if $theme ==light {
+            color: #fff !important;
+          }
         }
       }
     }

assets/scss/common/button.scss

@@ -132,15 +132,6 @@
           background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
         }
       }
-
-      &.expand-btn {
-        .v-icon {
-          color: map-deep-get($config, #{$theme}, "basic-button-color");
-          svg {
-            fill: map-deep-get($config, #{$theme}, "basic-button-color");
-          }
-        }
-      }
     }
   }
 }
@@ -167,13 +158,4 @@
     height: 16px;
     background:none;
   }
-}
+}
-.ant-btn  {
-  &.expand-btn {
-    .v-icon {
-      span {
-        margin-right: 8px;
-      }
-    }
-  }
-}

assets/scss/common/input.scss

@@ -1,6 +1,4 @@
 .v-select__custom {
-  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;
   }
@@ -44,10 +42,6 @@
   legend {
     width: 0;
   }
-
-  .v-select-list {
-    padding: 0 1rem;
-  }
 }
 
 .v-input__custom {

components/common/button/BtnExcelDownload.vue

@@ -45,7 +45,7 @@ export default {
 		size: {
 			type: String,
 			require: false,
-			default: "middle", // small, middle, large
+			default: "default", // small, middle, large
 		}
 	},
 	data() {

components/common/modal/EgrpPysclQtyPop.vue

@@ -71,12 +71,14 @@
 					</div>
 				</div>
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					
+					<!-- <v-btn :ripple="false" @click="setUpdate($event)">확인</v-btn>
-					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
+					<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)">닫기</v-btn> -->
+					<!-- <v-btn v-if="item.closeBtnFg || false" :ripple="false" @click="deleteBtnAction($event)">삭제</v-btn> -->
+					<a-button :ripple="false" @click="setUpdate($event)" class="mr-2">확인</a-button>
+					<a-button :ripple="false" type="primary" @click="dialogOpenCloseEvent(dialog)"
 						class="mr-2">닫기</a-button>
-					<a-button v-if="item.closeBtnFg || false" :ripple="false"  type="danger" ghost danger
+					<a-button v-if="item.closeBtnFg || false" :ripple="false" icon="delete" type="danger" ghost danger
-						@click="deleteBtnAction($event)" class="mr-2">삭제</a-button>
+						@click="deleteBtnAction($event)">삭제</a-button>
-					<a-button :ripple="false" type="primary" @click="setUpdate($event)" >확인</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -296,46 +298,46 @@ export default {
 		},
 		async setSelectValueList01() {
 			// form으로 popup 사용할 때 인자로 eqpmKindId, eqpmGrpId 보내줘야한다.
-			let res = await this.postApiReturn({
+			// let res = await this.postApiReturn({
-				apiKey: 'selectEqpmGrpCodeList',
+			// 	apiKey: 'selectEqpmGrpCodeList',
-				resKey: 'eqpmGrpCodeLists',
+			// 	resKey: 'eqpmGrpCodeLists',
-				sendParam: {
+			// 	sendParam: {
-					eqpmKindId:
+			// 		eqpmKindId:
-						this.item.eqpmKindId != undefined
+			// 			this.item.eqpmKindId != undefined
-							? this.item.eqpmKindId
+			// 				? this.item.eqpmKindId
-							: this.searchParam.eqpmKindId,
+			// 				: this.searchParam.eqpmKindId,
-				},
+			// 	},
-				// form을 통해 popup을 사용할 경우 -> this.item.eqpmKindId 사용
+			// 	// form을 통해 popup을 사용할 경우 -> this.item.eqpmKindId 사용
-				// 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다.
+			// 	// 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다.
-			});
+			// });
-			if (res.length > 0) {
+			// if (res.length > 0) {
-				this.selectValueList01 = await res.map(obj => {
+			// 	this.selectValueList01 = await res.map(obj => {
-					return {
+			// 		return {
-						text: obj.eqpmGrpNm,
+			// 			text: obj.eqpmGrpNm,
-						value: obj.eqpmGrpId,
+			// 			value: obj.eqpmGrpId,
-					};
+			// 		};
-				});
+			// 	});
-				// form을 통해 popup을 사용할 경우 -> this.item.eqpmGrpId 사용
+			// 	// form을 통해 popup을 사용할 경우 -> this.item.eqpmGrpId 사용
-				// 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택
+			// 	// 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택
-				// console.log('this.item.eqpmGrpId : ', this.item.eqpmGrpId);
+			// 	// console.log('this.item.eqpmGrpId : ', this.item.eqpmGrpId);
-				// console.log('this.searchParam.eqpmGrpId : ', this.searchParam.eqpmGrpId);
+			// 	// console.log('this.searchParam.eqpmGrpId : ', this.searchParam.eqpmGrpId);
-				this.selectValue01 =
+			// 	this.selectValue01 =
-					this.item.eqpmGrpId != undefined
+			// 		this.item.eqpmGrpId != undefined
-						? this.item.eqpmGrpId
+			// 			? this.item.eqpmGrpId
-						: this.searchParam.eqpmGrpId != undefined
+			// 			: this.searchParam.eqpmGrpId != undefined
-							? this.searchParam.eqpmGrpId
+			// 				? this.searchParam.eqpmGrpId
-							: this.selectValueList01[0].value;
+			// 				: this.selectValueList01[0].value;
-			} else {
+			// } else {
-				this.selectValueList01 = [];
+			// 	this.selectValueList01 = [];
-				this.selectValue01 = null;
+			// 	this.selectValue01 = null;
-			}
+			// }
 
-			// this.selectValueList01 = [
+			this.selectValueList01 = [
-			// 	{ label: '냉동기고온', value: '냉동기고온' },
+				{ label: '냉동기고온', value: '냉동기고온' },
-			// 	{ label: '냉동기저온', value: '냉동기저온' },
+				{ label: '냉동기저온', value: '냉동기저온' },
-			// 	{ label: '공조기', value: '공조기' },
+				{ label: '공조기', value: '공조기' },
-			// 	{ label: '보일러', value: '보일러' }
+				{ label: '보일러', value: '보일러' }
-			// ];
+			];
 		},
 		search() {
 			this.getGridData();
@@ -386,35 +388,44 @@ export default {
 			this.loadGrid = false;
 
 			let res = [];
-			res = await this.postApiReturn({
+			// res = await this.postApiReturn({
-				apiKey: 'selectEgrpPysclQtyPop',
+			// 	apiKey: 'selectEgrpPysclQtyPop',
-				resKey: 'egrpPysclQtyData',
+			// 	resKey: 'egrpPysclQtyData',
-				sendParam: {
+			// 	sendParam: {
-					searchWord: this.searchWord,
+			// 		searchWord: this.searchWord,
-					eqpmGrpId: this.selectValue01,
+			// 		eqpmGrpId: this.selectValue01,
-					openMode: this.item.openMode,
+			// 		openMode: this.item.openMode,
-				},
+			// 	},
-			});
+			// });
-			let newRes = [];
+			// let newRes = [];
-			let tempTagList = this.pyscPopVal.split('/*wq2a/');
+			// let tempTagList = this.pyscPopVal.split('/*wq2a/');
-			let tagList = tempTagList.filter(item => item != '');
+			// let tagList = tempTagList.filter(item => item != '');
-			if (tagList.length > 0) {
+			// if (tagList.length > 0) {
-				newRes = res.filter(item => {
+			// 	newRes = res.filter(item => {
-					return !tagList.includes(item.pysclQtyId);
+			// 		return !tagList.includes(item.pysclQtyId);
-				});
+			// 	});
-				res = newRes;
+			// 	res = newRes;
-			}
+			// }
+
+			// //이미 선택된 값들 제거(배열)
+			// if (this.item.dataList) {
+			// 	if (this.item.dataList.length > 0) {
+			// 		newRes = res.filter(item => {
+			// 			return !this.item.dataList.includes(item.pysclQtyId);
+			// 		});
+			// 		res = newRes;
+			// 	}
+			// }
+
+			res = [
+				{
+					'pysclQtyId': 'PYSCL00001',
+					'pysclQtyCd': 'AMP_1A',
+					'pysclQtyNm': '회로1 전류A',
+					'pysclQtyTpNm': 'TAG'
 
-			//이미 선택된 값들 제거(배열)
-			if (this.item.dataList) {
-				if (this.item.dataList.length > 0) {
-					newRes = res.filter(item => {
-						return !this.item.dataList.includes(item.pysclQtyId);
-					});
-					res = newRes;
 				}
-			}
+			]
-
 			this.setModalGridData({
 				modalKey: this.myModalKey,
 				gridKey: this.grid_01,

components/common/modal/EqpmBaseInfoPop.vue

@@ -2,8 +2,12 @@
 	<v-row class="search-box" align="center">
 		<v-col :cols="option.labelCols" class="py-0">
 			<label for="" class="search-box-label">
-				<v-icon v-if="item.iconShow" small
+				<v-icon
-					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
+					v-if="item.iconShow"
+					small
+					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
+					>$icoBulletPoint</v-icon
+				>
 				{{ option.labelContent }}
 			</label>
 		</v-col>
@@ -26,9 +30,9 @@
 				<div class="pa-6 pt-0">
 					<v-row align="center">
 						<v-col :cols="5">
-							<component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12"
+							<component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12" :iconShow="true"
-								:iconShow="true" :propsValue="selectValue01" :itemList="selectValueList01"
+								:propsValue="selectValue01" :itemList="selectValueList01" :label="'설비그룹'"
-								:label="'설비그룹'" @update:propsValue="selectValue01 = $event" :readonly="item.openMode == undefined
+								@update:propsValue="selectValue01 = $event" :readonly="item.openMode == undefined
 									? openMode
 									: item.openMode == 'ALL'
 										? false
@@ -43,14 +47,14 @@
 										물리량명
 									</label>
 								</v-col>
-								<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom" outlined
+								<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom"
-										:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
+										outlined :hide-details="true" v-model="searchWord"
-											v-slot:append>
+										@keyup.enter="search"><template v-slot:append>
-											<!-- Custom SVG icon -->
+					<!-- Custom SVG icon -->
-											<v-icon>$icoSearch</v-icon>
+					<v-icon>$icoSearch</v-icon>
 
 
-										</template></v-text-field></v-col>
+				</template></v-text-field></v-col>
 								<v-spacer></v-spacer>
 								<v-col cols="3" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
@@ -72,9 +76,9 @@
 					</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 :ripple="false" @click="setUpdate($event)" class="mr-2">확인</a-button>
-					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
+					<a-button :ripple="false" type="primary" @click="dialogOpenCloseEvent(dialog)"
-
+						class="mr-2">닫기</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -270,30 +274,36 @@ export default {
 			this.gridInit();
 		},
 		async setSelectValueList01() {
-			let res = await this.postApiReturn({
+			// let res = await this.postApiReturn({
-				apiKey: 'selectEqpmGrpCodeList',
+			// 	apiKey: 'selectEqpmGrpCodeList',
-				resKey: 'eqpmGrpCodeLists',
+			// 	resKey: 'eqpmGrpCodeLists',
-				sendParam: { eqpmKindId: this.searchParam.eqpmKindId },
+			// 	sendParam: { eqpmKindId: this.searchParam.eqpmKindId },
-				// 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다.
+			// 	// 부모 페이지에서 설비종류인 eqpmKindId 값을 꼭 가져와야한다.
-			});
+			// });
-			if (res.length > 0) {
+			// if (res.length > 0) {
-				this.selectValueList01 = await res.map(obj => {
+			// 	this.selectValueList01 = await res.map(obj => {
-					return {
+			// 		return {
-						text: obj.eqpmGrpNm,
+			// 			text: obj.eqpmGrpNm,
-						value: obj.eqpmGrpId,
+			// 			value: obj.eqpmGrpId,
-					};
+			// 		};
-				});
+			// 	});
-				// 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택
+			// 	// 부모 페이지에서 설비그룹을 선택한 값이 있다면(eqpmGrpId) 그 값으로 바인딩 아닐 경우 조회한 데이터의 첫번째 값으로 선택
-				this.selectValue01 =
+			// 	this.selectValue01 =
-					this.searchParam.eqpmGrpId != undefined
+			// 		this.searchParam.eqpmGrpId != undefined
-						? this.searchParam.eqpmGrpId
+			// 			? this.searchParam.eqpmGrpId
-						: this.selectValueList01[0].value;
+			// 			: this.selectValueList01[0].value;
-				// this.selectValue01 = this.selectValueList01[0].value;
+			// 	// this.selectValue01 = this.selectValueList01[0].value;
-			} else {
+			// } else {
-				this.selectValueList01 = [];
+			// 	this.selectValueList01 = [];
-				this.selectValue01 = null;
+			// 	this.selectValue01 = null;
-			}
+			// }
 
+			this.selectValueList01 = [
+				{ label: '냉동기고온', value: '냉동기고온' },
+				{ label: '냉동기저온', value: '냉동기저온' },
+				{ label: '공조기', value: '공조기' },
+				{ label: '보일러', value: '보일러' }
+			];
 		},
 		search() {
 			this.getGridData();
@@ -331,26 +341,34 @@ export default {
 		},
 		async getGridData() {
 			this.loadGrid = false;
-
+			// let res = [];
-			let res = await this.postApiReturn({
+			// let res = await this.postApiReturn({
-				apiKey: 'selectEqpmBaseInfoPop',
+			// 	apiKey: 'selectEqpmBaseInfoPop',
-				resKey: 'epqmBaseInfoData',
+			// 	resKey: 'epqmBaseInfoData',
-				sendParam: {
+			// 	sendParam: {
-					eqpmGrpId: this.selectValue01,
+			// 		eqpmGrpId: this.selectValue01,
-					searchWord: this.searchWord,
+			// 		searchWord: this.searchWord,
-					// openMode : this.item.openMode == undefined ? this.openMode : this.item.openMode
+			// 		// openMode : this.item.openMode == undefined ? this.openMode : this.item.openMode
-				},
+			// 	},
-			});
+			// });
-			// grid와 popup eqpmId 값 중복되는 것 제거하는 로직 - 시작
+			// // grid와 popup eqpmId 값 중복되는 것 제거하는 로직 - 시작
-			let newRes = [];
+			// let newRes = [];
-			if (this.bindingGridEqpmIdList.length > 0) {
+			// if (this.bindingGridEqpmIdList.length > 0) {
-				newRes = res.filter(item => {
+			// 	newRes = res.filter(item => {
-					return !this.bindingGridEqpmIdList.includes(item.eqpmId);
+			// 		return !this.bindingGridEqpmIdList.includes(item.eqpmId);
-				});
+			// 	});
-				res = newRes;
+			// 	res = newRes;
-			}
+			// }
 			// grid와 popup eqpmId 값 중복되는 것 제거하는 로직 - 끝
 
+			const res = [
+				{
+					'eqpmId': 'PYSCL00001',
+					'eqpmNm': 'AMP_1A',
+
+				}
+			]
+
 			this.setModalGridData({
 				modalKey: this.myModalKey,
 				gridKey: this.gridName,
@@ -423,9 +441,9 @@ export default {
 			//   this.dialog = false;
 			//   return;
 			// }
-			if (this.myBindingData.length <= 0) {
+			// if (this.myBindingData.length <= 0) {
-				return alert('설비상세 리스트를 먼저 선택해주세요.');
+			// 	return alert('설비상세 리스트를 먼저 선택해주세요.');
-			}
+			// }
 			this.dialog = !val;
 		},
 	},
@@ -463,7 +481,7 @@ var eqpmBaseInfoPop = {
 	// 	.v-dialog {
 	// 		.v-card {
 	// 			&__title {
-
+			
 
 	// 				@if $theme ==dark {
 	// 					background-color: #2d3355;

components/common/modal/EqpmCalcPop.vue

@@ -36,7 +36,7 @@
 								계산설명
 							</label>
 						</v-col>
-						<v-col :cols="11" class="pr-8 py-0" >
+						<v-col :cols="10" class="mr-4 py-0"  >
 							<v-text-field append-icon="" class="v-input__custom" outlined
 								:hide-details="true" v-model="searchWord" @keyup.enter="search"><template v-slot:append>
 					<!-- Custom SVG icon -->
@@ -45,7 +45,7 @@
 
 				</template></v-text-field>
 						</v-col>
-						<v-col cols="1" class="py-0" style="display: flex; justify-content: flex-end;">
+						<v-col cols="1" class="py-0">
 							<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
 							<!-- <v-btn :ripple="false" @click="initSearch()">
                 초기화
@@ -63,8 +63,10 @@
 					</div>
 				</div>
 				<v-card-actions class="pa-5 d-flex align-center justify-end">
-					<a-button :ripple="false"  @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
+					<!-- <v-btn :ripple="false" @click="setUpdate($event)">확인</v-btn>
-					<a-button :ripple="false" type="primary" @click="setUpdate($event)" >확인</a-button>
+					<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)">닫기</v-btn> -->
+					<a-button :ripple="false" @click="setUpdate($event)" class="mr-2">확인</a-button>
+					<a-button :ripple="false" type="primary" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -304,22 +306,38 @@ export default {
 		},
 		async getGridData() {
 			this.loadGrid = false;
-			let res = await this.postApiReturn({
+			// let res = await this.postApiReturn({
-				apiKey: 'selectEqpmCalcPop',
+			// 	apiKey: 'selectEqpmCalcPop',
-				resKey: 'eqpmCalcPopData',
+			// 	resKey: 'eqpmCalcPopData',
-				sendParam: {
+			// 	sendParam: {
-					calcDescLike: this.searchWord,
+			// 		calcDescLike: this.searchWord,
-					openMode: this.item.openMode != undefined ? this.item.openMode : this.openMode
+			// 		openMode: this.item.openMode != undefined ? this.item.openMode : this.openMode
+			// 	},
+			// });
+			// if (this.myBindingData['calcProc'] != '' || this.myBindingData['calcProc'] != null || this.myBindingData['calcProc'] != undefined) {
+			// 	let newRes = [];
+			// 	newRes = res.filter(item => {
+			// 		return item.calcProc != this.myBindingData['calcProc']
+			// 	});
+			// 	res = newRes;
+			// }
+
+			const res = [
+				{
+					'calcProc': 'AVG_CNT2',
+					'argCnt': '2',
+					'calcDesc': '두개 변수에 대한 평균'
+
 				},
-			});
+
-			if (this.myBindingData['calcProc'] != '' || this.myBindingData['calcProc'] != null || this.myBindingData['calcProc'] != undefined) {
+				{ 'calcProc': 'PROC001', argCnt: 2, 'calcDesc': '덧셈 연산' },
-				let newRes = [];
+				{ 'calcProc': 'PROC002', argCnt: 1, 'calcDesc': '제곱 연산' },
-				newRes = res.filter(item => {
+				{ 'calcProc': 'PROC003', argCnt: 2, 'calcDesc': '곱셈 연산' },
-					return item.calcProc != this.myBindingData['calcProc']
+				{ 'calcProc': 'PROC004', argCnt: 1, 'calcDesc': '루트 연산' },
-				});
+				{ 'calcProc': 'PROC005', argCnt: 3, 'calcDesc': '최대값 계산' },
-				res = newRes;
+				{ 'calcProc': 'PROC006', argCnt: 3, 'calcDesc': '최소값 계산' },
-			}
+
-			
+			]
 			this.setModalGridData({
 				modalKey: this.myModalKey,
 				gridKey: this.grid_01,

components/common/modal/EvtObjPop.vue

@@ -7,15 +7,12 @@
 				{{ option.labelContent }}
 			</label>
 		</v-col>
-		<v-col :cols="option.textCols" class="py-0">
+		<v-col :cols="option.textCols">
-			<v-text-field readonly append-icon="" class="v-input__custom" outlined :hide-details="true"
+			<v-text-field readonly v-model="selectValue" append-icon="mdi-magnify" 
-				v-model="searchWord" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
+			  :class="['v-select__custom', customClass]"
-				:required="item.required || false"><template v-slot:append>
+				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true"
-					<!-- Custom SVG icon -->
+				:required="item.required || false"></v-text-field>
-					<v-icon>$icoSearch</v-icon>
+			<!-- :disabled="item.disabled || false" -->
-
-
-				</template></v-text-field>
 		</v-col>
 
 		<v-dialog v-model="dialog" scrollable width="1000px">
@@ -24,10 +21,10 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<v-icon @click="dialogOpenCloseEvent(dialog)">mdi-close</v-icon>
 				</v-card-title>
-				<v-row align="end" class="px-5 pb-3" no-gutters>
+				<v-row align="end" class="pa-5" no-gutters>
 					<v-col :cols="2.5" class="mr-2">
 						<v-row>
-							<v-col :cols="12" class="py-0">
+							<v-col :cols="2">
 								<label for="" class="search-box-label">
 									<!-- <v-icon small 
 									:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
@@ -35,30 +32,28 @@
 									검색
 								</label>
 							</v-col>
-							<v-col :cols="11" class="py-0 pr-3">
+							<v-col :cols="12">
-								<v-text-field append-icon="mdi-magnify" class="v-input__custom" outlined
+								<v-text-field append-icon="mdi-magnify" class="v-input__custom" outlined :hide-details="true"
-									:hide-details="true" v-model="searchWord" @keyup.enter="search"></v-text-field>
+									v-model="searchWord" @keyup.enter="search"></v-text-field>
 							</v-col>
-							<a-button icon="search" :ripple="false" type="primary" @click="search()"
-								class="search-button">조회</a-button>
 						</v-row>
 					</v-col>
-
+					<a-button type="primary" :ripple="false" @click="search()">
-
+						조회
+					</a-button>
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
-				<div :style="'height: 600px'" class="px-5">
+				<div :style="'height: 600px'">
 					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
 					<div ref="modalGridParent" class="h100 py-3">
 						<!-- :is="loadGrid && dialog ? 'Grid' : null" -->
 						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
-							:dataPath="searchParam.modalData2.evtObjPop" :parentPrgmId="parentPrgmId"
+							:dataPath="searchParam.modalData2.evtObjPop" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
-							@getRowsData="getRowData" @dblClick="setUpdate($event)" />
+							@dblClick="setUpdate($event)" />
 					</div>
 				</div>
 				<v-card-actions class="pa-5 d-flex align-center justify-end">
-					<a-button type="default" class="mr-2" :ripple="false"
+					<a-button type="default" class="mr-2" :ripple="false" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
-						@click="dialogOpenCloseEvent(dialog)">닫기</a-button>
 					<a-button type="primary" class="mr-2" :ripple="false" @click="setUpdate('init')">초기화</a-button>
 					<a-button type="primary" :ripple="false" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>

components/common/modal/ReadPlcPop.vue

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box" align="center">
+	<v-row class="search-box" align="center" >
 		<!-- <v-col v-if="label" cols="2"> -->
 		<v-col v-if="item.label" :cols="item.labelCols" class="py-0">
 			<label for="" class="search-box-label">
@@ -37,11 +37,12 @@
 					<v-row align="center">
 						<v-col v-if="label" cols="12" class="py-0">
 							<label for="" class="search-box-label">
-								<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
+								<v-icon small
+									:class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
 								{{ item.label }}
 							</label>
 						</v-col>
-						<v-col :cols="label ? 8 : ''" class="py-0">
+						<v-col :cols="label ? 6 : ''" class="py-0">
 							<!-- :value="textfield" -->
 							<v-text-field append-icon="" class="v-input__custom" outlined :hide-details="true"
 								v-model="searchWord" @keyup.enter="typeEnterKey"><template v-slot:append>
@@ -51,10 +52,13 @@
 
 								</template></v-text-field>
 						</v-col>
-						<!-- <v-spacer></v-spacer> -->
+						<v-spacer></v-spacer>
-						<v-col cols="2" 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" icon tile @click="btnTreeExpand()">
-
+								<!-- {{ treeExpand }} -->
+								<v-icon size="30"
+									v-text="treeExpandAll ? 'mdi-chevron-up' : 'mdi-chevron-down'"></v-icon>
+							</v-btn>
 							<!-- <v-btn color="primary" dark>펼치기</v-btn> -->
 							<!-- <v-btn color="primary" dark>접기</v-btn> -->
 							<!-- <v-btn :ripple="false">초기화</v-btn> -->
@@ -62,10 +66,6 @@
               <v-btn v-if="!searchParam.isMulti" :ripple="false" @click="search()">검색</v-btn> -->
 							<!-- as-is 롤 봐도 초기화가 하는 기능을 모르겠음.. -->
 						</v-col>
-						<v-col cols="2" class="text-right"><a-button class="expand-btn" :ripple="false" @click="btnTreeExpand()">
-								<v-icon small>$icoExpandAlt</v-icon>
-								Expand All
-							</a-button></v-col>
 					</v-row>
 
 					<!-- <v-btn color="primary" dark @click="btnTreeExpand()">{{
@@ -78,7 +78,7 @@
 				</div>
 
 				<v-card-text>
-					<div ref="treeGridParent" style="height: 450px">
+					<div ref="treeGridParent" style="height: 500px">
 						<component :ref="'treeGrid' + parentPrgmId" :is="loadGrid && dialog ? 'Grid' : null"
 							:gridName="gridNameTree" :dataPath="searchParam.modalData.selectReadObjListTree"
 							:parentPrgmId="parentPrgmId" :bindingData="bindingData" @getRowsData="getRowData"
@@ -89,10 +89,10 @@
             :tree-data="ftnPlcListTreeData"
           /> -->
 				</v-card-text>
-
+				<v-divider></v-divider>
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
+					<a-button :ripple="false" @click="setUpdate()" class="mr-2">확인</a-button>
-					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
+					<a-button :ripple="false" type="primary" @click="dialog = false" class="mr-2">닫기</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -155,7 +155,7 @@ export default {
 
 			myModalKey: 'selectReadObjListTree',
 			gridNameTree: 'treeGrid',
-			loadGrid: false,
+			loadGrid: true,
 
 			dialog: false,
 			treeData: [], // 리턴받은 원본 트리 데이터
@@ -278,7 +278,7 @@ export default {
 					{
 						header: '검침개소명',
 						name: 'readPlcNm',
-						width: 300,
+						width: 370,
 						align: 'left',
 					},
 					{ header: '검침개소', name: 'name', align: 'center' },
@@ -289,31 +289,73 @@ export default {
 		async getTreeData() {
 			this.loadGrid = false;
 
-			const res = await this.postApiReturn({
+			// const res = await this.postApiReturn({
-				apiKey: 'selectReadPlcBaseInfo',
+			// 	apiKey: 'selectReadPlcBaseInfo',
-				resKey: 'readPlcBaseInfoData',
+			// 	resKey: 'readPlcBaseInfoData',
-				sendParam: {
+			// 	sendParam: {
-					blocId:
+			// 		blocId:
-						this.searchParam.blocMstrList.length > 0
+			// 			this.searchParam.blocMstrList.length > 0
-							? this.searchParam.blocMstrList[this.searchParam.blocId].blocId
+			// 				? this.searchParam.blocMstrList[this.searchParam.blocId].blocId
-							: this.searchParam.blocId, //"BL0001",
+			// 				: this.searchParam.blocId, //"BL0001",
-					// readObjId: this.searchParam.readObj, // "MTT00001" // 전력 코드 고정
+			// 		// readObjId: this.searchParam.readObj, // "MTT00001" // 전력 코드 고정
-					readObjId: this.searchParam.searchReadObj, // "MTT00001" // 전력 코드 고정
+			// 		readObjId: this.searchParam.searchReadObj, // "MTT00001" // 전력 코드 고정
 
-					useFg: '1',
+			// 		useFg: '1',
-					readPlcNmLike: this.searchWord,
+			// 		readPlcNmLike: this.searchWord,
+			// 	},
+			// });
+
+			const treeData = [
+				{
+					readPlcNm: '서울 본사',
+					name: '본사',
+					_children: [
+						{
+							readPlcNm: '서울 본사 - 1층',
+							name: '1층',
+						},
+						{
+							readPlcNm: '서울 본사 - 2층',
+							name: '2층',
+						},
+					],
 				},
-			});
+				{
+					readPlcNm: '부산 지사',
+					name: '지사',
+					_children: [
+						{
+							readPlcNm: '부산 지사 - A동',
+							name: 'A동',
+							_children: [
+								{
+									readPlcNm: '부산 지사 - A동 1층',
+									name: '1층',
+								},
+								{
+									readPlcNm: '부산 지사 - A동 2층',
+									name: '2층',
+								},
+							],
+						},
+						{
+							readPlcNm: '부산 지사 - B동',
+							name: 'B동',
+						},
+					],
+				},
+				{
+					readPlcNm: '대전 창고',
+					name: '창고',
+				},
+			];
 
-			// console.log("treeData", res)
+
+			// // console.log("treeData", res)
 			let myOptionsTree = {
 				treeColumnOptions: {
 					name: 'readPlcNm',
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 'auto',
 			};
 			if (this.searchParam.isMulti) {
 				myOptionsTree['rowHeaders'] = [{ type: 'checkbox' }];
@@ -331,26 +373,26 @@ export default {
 
 			// this.treeData = res;
 			// const ROOT = res[0].plcCd;
-			const setTreeData = await this.setTree({
+			// const setTreeData = await this.setTree({
-				gridKey: this.gridNameTree,
+			// 	gridKey: this.gridNameTree,
-				treeKey: 'READ_PLC_ID',
+			// 	treeKey: 'READ_PLC_ID',
-				value: res.map(item => ({
+			// 	value: res.map(item => ({
-					...item,
+			// 		...item,
-					rowStat: null,
+			// 		rowStat: null,
-					readPlcId: item.readPlcId,
+			// 		readPlcId: item.readPlcId,
-					readPlcIdNm: item.readPlcId,
+			// 		readPlcIdNm: item.readPlcId,
-					upReadPlcId:
+			// 		upReadPlcId:
-						item.upReadPlcId == null || item.upReadPlcId == ''
+			// 			item.upReadPlcId == null || item.upReadPlcId == ''
-							? ''
+			// 				? ''
-							: item.upReadPlcId,
+			// 				: item.upReadPlcId,
-					upReadPlcNm:
+			// 		upReadPlcNm:
-						item.upReadPlcNm == null || item.upReadPlcNm == ''
+			// 			item.upReadPlcNm == null || item.upReadPlcNm == ''
-							? ''
+			// 				? ''
-							: item.upReadPlcNm,
+			// 				: item.upReadPlcNm,
-					blocId: item.blocId,
+			// 		blocId: item.blocId,
-					useFg: item.useFg === '1' ? true : false,
+			// 		useFg: item.useFg === '1' ? true : false,
-				})),
+			// 	})),
-			});
+			// });
 			// this.treeData = setTreeData;
 
 
@@ -358,7 +400,7 @@ export default {
 				modalKey: this.myModalKey,
 				gridKey: this.gridNameTree,
 				modalDataKey: this.modalDataKey,
-				value: setTreeData.ROOT || [],
+				value: treeData,
 			});
 			this.loadGrid = true;
 
@@ -498,4 +540,22 @@ const selectReadObjListTree = {
 	}
 }
 
+@each $theme in dark, light {
+	.v-application.#{$theme}-mode {
+		.v-dialog {
+			.v-card {
+				&__title {
+
+					@if $theme ==dark {
+						background-color: #2d3355;
+
+						.v-btn {
+							background-color: #2d3355;
+						}
+					}
+				}
+			}
+		}
+	}
+}
 </style>

components/common/select/SelectBlocMstr.vue

@@ -12,10 +12,12 @@
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<v-select v-model="selectValue" :items="searchParam[parentPrgmId].blocMstrList" 
+			<v-select v-model="selectValue" :items="searchParam[parentPrgmId].blocMstrList" label="사업장을 선택하세요"
-				item-text="blocNm" item-value="idx" append-icon="" outlined
+				item-text="blocNm" item-value="idx" append-icon="" class="v-select__custom" outlined
 				:hide-details="true" :class="['v-select__custom', customClass]">
-				<template v-slot:append><v-icon>$icoChevronDown</v-icon></template>
+				<template v-slot:append>
+					    <v-icon>$icoChevronDown</v-icon>
+					  </template>
 			</v-select>
 		</v-col>
 	</v-row>

components/common/select/SelectBoxMulti.vue

@@ -20,10 +20,10 @@
 				outlined
 				:multiple="multiple"
 				:hide-details="true"
+				append-icon=""
 				:class="['v-select__custom', customClass]"
 				:disabled="disabled"
 				:readonly="readonly"
-				append-icon=""
 				><template v-slot:append>
 					<v-icon>$icoChevronDown</v-icon>
 				</template></v-select>

components/icons/icoExpandAlt.vue

@@ -1,6 +0,0 @@
-<template>
-    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" class="v-icon" xmlns="http://www.w3.org/2000/svg">
-        <path
-            d="M14.1248 1.71225L10.7462 2.13189C10.6283 2.14617 10.5801 2.28903 10.6623 2.37296L11.6391 3.34975L8.89799 6.09082C8.8714 6.11767 8.85649 6.15392 8.85649 6.19171C8.85649 6.2295 8.8714 6.26575 8.89799 6.2926L9.70335 7.09796C9.7587 7.15332 9.84977 7.15332 9.90513 7.09796L12.648 4.3551L13.6248 5.33189C13.6436 5.35072 13.6674 5.36387 13.6934 5.36981C13.7193 5.37576 13.7465 5.37427 13.7716 5.36551C13.7968 5.35675 13.819 5.34107 13.8356 5.32028C13.8523 5.29949 13.8628 5.27443 13.8658 5.24796L14.2837 1.87117C14.2867 1.84961 14.2846 1.82765 14.2776 1.80702C14.2707 1.78639 14.2591 1.76765 14.2437 1.75226C14.2283 1.73687 14.2096 1.72524 14.1889 1.7183C14.1683 1.71136 14.1463 1.70929 14.1248 1.71225ZM6.2962 8.89439C6.26935 8.8678 6.23309 8.85289 6.19531 8.85289C6.15752 8.85289 6.12127 8.8678 6.09442 8.89439L3.35334 11.6372L2.37656 10.6605C2.35771 10.6416 2.33394 10.6285 2.30797 10.6225C2.282 10.6166 2.25487 10.6181 2.22971 10.6268C2.20455 10.6356 2.18236 10.6513 2.16569 10.6721C2.14903 10.6929 2.13856 10.7179 2.13549 10.7444L1.71584 14.1212C1.70513 14.214 1.78192 14.2908 1.87477 14.2801L5.25335 13.8605C5.3712 13.8462 5.41942 13.7033 5.33727 13.6194L4.36049 12.6426L7.10334 9.89974C7.1587 9.84439 7.1587 9.75332 7.10334 9.69796L6.2962 8.89439Z" />
-    </svg>
-</template>

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -7,7 +7,7 @@
     </div>
     <div ref="gridParent">
       <Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-        @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
+        @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" :dataPath="dataPathMock" />
     </div>
     <div ref="formParent" class="mt-4">
       <component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -20,8 +20,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:selectedRowDataWatchFlag="true"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -55,23 +53,10 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			dataPathMock: {
-				"rowDetailGrid": {
-				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: {
@@ -276,7 +261,7 @@ export default {
 				{ header: '검침 대상 ID', name: 'readObjId', hidden: true },
 				{
 					header: '추가 정보',
-					name: 'addInfoId', 
+					name: 'addInfoId',
 					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
@@ -461,25 +446,4 @@ export default {
 		search() {},
 	},
 };
-const dataPathDataExample = [
-	{
-	readObjId: 'OBJ001',
-	readObjNm: '서울 본사',
-	readObjKind: 'TYPE01',
-	grpCd: 'GRP01',
-	},
-	{
-	readObjId: 'OBJ002',
-	readObjNm: '부산 지사',
-	readObjKind: 'TYPE02',
-	grpCd: 'GRP02',
-	},
-	{
-	readObjId: 'OBJ003',
-	readObjNm: '대전 공장',
-	readObjKind: 'TYPE03',
-	grpCd: 'GRP01',
-	}
-];
-
 </script>

components/pages/ems/ReadPlcInfo/ReadPlcAddInfoTab.vue

@@ -1,12 +1,26 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between">
+		<div
+			class="d-flex justify-space-between"
+
+		>
 			<v-card-title class="px-0 pt-0 custom-title-4">검침개소 추가 정보</v-card-title>
-			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
+			<Buttons
+				:parentPrgmId="parentPrgmId"
+				:bindingData="gridName"
+				:btnActionsFnc="btnActions"
+			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 520px);">
+		<div ref="gridParent">
-			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
+			<Grid
-				:editorGrid="true" :innerTabGridInfo="innerTabGridInfo" @getRowsData="getRowData" />
+				:ref="gridName"
+				:gridName="gridName"
+				:parentPrgmId="parentPrgmId"
+				:editorGrid="true"
+				:innerTabGridInfo="innerTabGridInfo"
+				@getRowsData="getRowData"
+				:dataPath="addInfoTabData"
+			/>
 		</div>
 	</div>
 </template>
@@ -39,65 +53,65 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			// addInfoTabData: {
+			addInfoTabData: {
-			// 	"rowDetailGrid": {
+				"rowDetailGrid": {
-			// 		data: [
+					data: [
 
 
 
-			// 			{
+						{
-			// 				readPlcNm: '서울 본사',
+							readPlcNm: '서울 본사',
-			// 				plcKind: '전기',
+							plcKind: '전기',
-			// 				useFg: '1',
+							useFg: '1',
-			// 			},
+						},
 
 
-			// 		],
+					],
-			// 		column: [
+					column: [
-			// 			// { header: '회사 ID', name: 'comId', hidden: true },
+						// { header: '회사 ID', name: 'comId', hidden: true },
-			// 			{
+						{
-			// 				header: '검침개소명',
+							header: '검침개소명',
-			// 				name: 'readPlcNm',
+							name: 'readPlcNm',
-			// 				align: 'left',
+							align: 'left',
-			// 				minWidth: 400,
+							minWidth: 400,
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '개소 종류',
+							header: '개소 종류',
-			// 				name: 'plcKind',
+							name: 'plcKind',
-			// 				minWidth: 100,
+							minWidth: 100,
-			// 				align: 'center',
+							align: 'center',
-			// 				// formatter({ value }) {
+							// formatter({ value }) {
-			// 				// 	let retVal = '';
+							// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.plcKindList.filter(
+							// 	const newValue = _this.pageData.plcKindList.filter(
-			// 				// 		item => item.commCd == value,
+							// 		item => item.commCd == value,
-			// 				// 	);
+							// 	);
-			// 				// 	if (newValue.length > 0) {
+							// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].commCdNm;
+							// 		retVal = newValue[0].commCdNm;
-			// 				// 	}
+							// 	}
-			// 				// 	return retVal;
+							// 	return retVal;
-			// 				// },
+							// },
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '사용 여부',
+							header: '사용 여부',
-			// 				name: 'useFg',
+							name: 'useFg',
-			// 				minWidth: 100,
+							minWidth: 100,
-			// 				align: 'center',
+							align: 'center',
-			// 				// formatter({ value }) {
+							// formatter({ value }) {
-			// 				// 	value = value === true ? '1' : '0';
+							// 	value = value === true ? '1' : '0';
-			// 				// 	const newValue = _this.pageData.useFgList.filter(
+							// 	const newValue = _this.pageData.useFgList.filter(
-			// 				// 		item => item.commCd == value,
+							// 		item => item.commCd == value,
-			// 				// 	);
+							// 	);
-			// 				// 	return newValue[0].commCdNm;
+							// 	return newValue[0].commCdNm;
-			// 				// },
+							// },
-			// 			},
+						},
-			// 		]
+					]
 
-			// 	}
+				}
-			// }
+			}
 		};
 	},
 	computed: {
@@ -152,9 +166,9 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 37,
+					height: 28,
 				},
-				rowHeight: 37,
+				rowHeight: 29,
 				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
@@ -164,129 +178,128 @@ export default {
 				value: myOptions,
 			});
 
-			const _this = this;
+			// const _this = this;
-			let useFgSelectList = [];
+			// let useFgSelectList = [];
-			this.pageData.useFgList.forEach(item => {
+			// this.pageData.useFgList.forEach(item => {
-				const it = { text: item.commCdNm, value: item.commCd };
+			// 	const it = { text: item.commCdNm, value: item.commCd };
-				useFgSelectList.push(it);
+			// 	useFgSelectList.push(it);
-			});
+			// });
-			let addInfoList = [];
+			// let addInfoList = [];
-			this.pageData.addInfoList.forEach(item => {
+			// this.pageData.addInfoList.forEach(item => {
-				const it = { text: item.addInfoNm, value: item.addInfoId };
+			// 	const it = { text: item.addInfoNm, value: item.addInfoId };
-				addInfoList.push(it);
+			// 	addInfoList.push(it);
-			});
+			// });
-			let addInfoDataKindList = [];
+			// let addInfoDataKindList = [];
-			this.pageData.addInfoDataKindList.forEach(item => {
+			// this.pageData.addInfoDataKindList.forEach(item => {
-				const it = { text: item.commCdNm, value: item.commCd };
+			// 	const it = { text: item.commCdNm, value: item.commCd };
-				addInfoDataKindList.push(it);
+			// 	addInfoDataKindList.push(it);
-			});
+			// });
 
-			const myColumns = [
+			// const myColumns = [
-				{ header: '회사 ID', name: 'comId', hidden: true },
+			// 	{ header: '회사 ID', name: 'comId', hidden: true },
-				{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
+			// 	{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
-				{
+			// 	{
-					header: '추가 정보',
+			// 		header: '추가 정보',
-					name: 'addInfoId',
+			// 		name: 'addInfoId',
-					align: 'left',
+			// 		align: 'left',
-					formatter({ value }) {
+			// 		formatter({ value }) {
-						let retVal = '';
+			// 			let retVal = '';
-						const newValue = addInfoList.filter(item => item.value == value);
+			// 			const newValue = addInfoList.filter(item => item.value == value);
-						if (newValue.length > 0) {
+			// 			if (newValue.length > 0) {
-							retVal = newValue[0].text;
+			// 				retVal = newValue[0].text;
-						}
+			// 			}
-						return retVal;
+			// 			return retVal;
-					},
+			// 		},
-				},
+			// 	},
-				{
+			// 	{
-					header: 'Data 구분',
+			// 		header: 'Data 구분',
-					name: 'addInfoDataKind',
+			// 		name: 'addInfoDataKind',
-					align: 'center',
+			// 		align: 'center',
-					formatter({ value }) {
+			// 		formatter({ value }) {
-						let retVal = '';
+			// 			let retVal = '';
-						const newValue = addInfoDataKindList.filter(
+			// 			const newValue = addInfoDataKindList.filter(
-							item => item.value == value,
+			// 				item => item.value == value,
-						);
+			// 			);
-						if (newValue.length > 0) {
+			// 			if (newValue.length > 0) {
-							retVal = newValue[0].text;
+			// 				retVal = newValue[0].text;
-						}
+			// 			}
-						return retVal;
+			// 			return retVal;
-					},
+			// 		},
-					// editor: {
+			// 		// editor: {
-					//   type: "select",
+			// 		//   type: "select",
-					//   options: {
+			// 		//   options: {
-					//     listItems: addInfoDataKindList
+			// 		//     listItems: addInfoDataKindList
-					//   }
+			// 		//   }
-					// }
+			// 		// }
-				},
+			// 	},
-				{
+			// 	{
-					header: '숫자 값',
+			// 		header: '숫자 값',
-					name: 'addInfoNumVal',
+			// 		name: 'addInfoNumVal',
-					align: 'right',
+			// 		align: 'right',
-					editor: 'text',
+			// 		editor: 'text',
-					hidden: true,
+			// 		hidden: true,
-				},
+			// 	},
-				{
+			// 	{
-					header: '문자 값',
+			// 		header: '문자 값',
-					name: 'addInfoTxtVal',
+			// 		name: 'addInfoTxtVal',
-					align: 'left',
+			// 		align: 'left',
-					editor: 'text',
+			// 		editor: 'text',
-					hidden: true,
+			// 		hidden: true,
-				},
+			// 	},
-				{
+			// 	{
-					header: '추가 정보 값',
+			// 		header: '추가 정보 값',
-					name: 'addInfoVal',
+			// 		name: 'addInfoVal',
-					align: 'center',
+			// 		align: 'center',
-					renderer: {
+			// 		renderer: {
-						type: NewCustomRenderer,
+			// 			type: NewCustomRenderer,
-					},
+			// 		},
-					editor: {
+			// 		editor: {
-						type: NewCustomEditor,
+			// 			type: NewCustomEditor,
-					},
+			// 		},
-					formatter(data) {
+			// 		formatter(data) {
-						return data.row.addInfoDataKind;
+			// 			return data.row.addInfoDataKind;
-					},
+			// 		},
-				},
+			// 	},
-				// {
+				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
-				// 	header: "추가 정보 값", name: "addInfoVal", align: "center", editor: "text",
+				// formatter({ value, row , column}) {
-				// 	formatter({ value, row, column }) {
+				//   console.log("addInfoVal row : ", row);
-				// 		console.log("addInfoVal row : ", row);
+				//   console.log("addInfoVal state : ", column);
-				// 		console.log("addInfoVal state : ", column);
+				//   if(row.addInfoDataKind === "NUM"){
-				// 		if (row.addInfoDataKind === "NUM") {
+				//     column.align = "right";
-				// 			column.align = "right";
+				//   }else{
-				// 		} else {
+				//     column.align = "left";
-				// 			column.align = "left";
+				//   }
-				// 		}
+				//   return value;
-				// 		return value;
+				// }
-				// 	}
+				//},
-				// },
 				/*{
-		  header: "사용여부",
+          header: "사용여부",
-		  name: "useFg",
+          name: "useFg",
-		  align: "center",
+          align: "center",
-		  formatter({ value }) {
+          formatter({ value }) {
-			return value == "1" ? "사용" : "사용안함";
+            return value == "1" ? "사용" : "사용안함";
-		  },
+          },
-		  editor: {
+          editor: {
-			type: "select",
+            type: "select",
-			options: {
+            options: {
-			  // listItems: useFgSelectList
+              // listItems: useFgSelectList
-			  listItems: [
+              listItems: [
-				{text:"사용", value:"1"},
+                {text:"사용", value:"1"},
-				{text:"사용안함", value:"0"},
+                {text:"사용안함", value:"0"},
-			  ]
+              ]
-			}
+            }
-		  }
+          }
-		},*/
+        },*/
-				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
+				// { header: '등록 사용자', name: 'regUserNo', hidden: true },
-				{ header: '등록 일자', name: 'regDttm', hidden: true },
+				// { header: '등록 일자', name: 'regDttm', hidden: true },
-				{ header: '수정 사용자', name: 'procUserNo', hidden: true },
+				// { header: '수정 사용자', name: 'procUserNo', hidden: true },
-				{ header: '수정 일자', name: 'procDttm', hidden: true },
+				// { header: '수정 일자', name: 'procDttm', hidden: true },
-			];
+			// ];
 
-			this.setGridColumn({
+			// this.setGridColumn({
-				gridKey: this.gridName,
+			// 	gridKey: this.gridName,
-				value: myColumns,
+			// 	value: myColumns,
-			});
+			// });
 
 			this.loadGrid = true;
 		},
@@ -366,7 +379,7 @@ export default {
 		gridEditingFinish2(data, bindingData) {
 			this.$refs[bindingData].editingFinish(data);
 		},
-		search() { },
+		search() {},
 	},
 };
 </script>

components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue

@@ -8,9 +8,9 @@
 
 		<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
 			<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
-				:innerTabGridInfo="innerTabGridInfo"  />
+				:innerTabGridInfo="innerTabGridInfo" :dataPath="imgInfoTabData" />
 		</div>
-		<div ref="formParent" style="height: calc((100vh - 400px) /2);">
+		<div ref="formParent">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
 				:detailList="detailReadPlcImgList" @gridEditingFinish="gridEditingFinish" />
 		</div>
@@ -44,9 +44,26 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowReadPlcImgGrid',
 			detailReadPlcImgList: myReadPlcImgDetail,
+			imgInfoTabData: {
+				"rowReadPlcImgGrid": {
+					data:
+						[
+							{ "objReadPlcId": "1001", "objReadPlcNm": "서울역", "distRt": 12 },
+							{ "objReadPlcId": "1002", "objReadPlcNm": "강남역", "distRt": 8 },
+							{ "objReadPlcId": "1003", "objReadPlcNm": "잠실역", "distRt": 15 },
+						]
+					,
+					column: [
+						{ header: '대상 검침개소 번호', name: 'objReadPlcId', align: 'center' },
+						{ header: '대상 검침개소명', name: 'objReadPlcNm', align: 'left' },
+						{ header: '분배율(1~100)', name: 'distRt', align: 'right' },
+					]
+
+				}
+			}
 		};
 	},
 	computed: {
@@ -103,11 +120,10 @@ export default {
 				header: {
 					height: 28,
 				},
-				// rowHeight: 29,
+				rowHeight: 29,
-				// minRowHeight: 29,
+				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
-				rowHeight: 'auto',
 			};
 			this.setGridOption({
 				gridKey: this.gridName,

components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue

@@ -7,9 +7,9 @@
 		</div>
 		<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
 			<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
-				:innerTabGridInfo="innerTabGridInfo"  />
+				:innerTabGridInfo="innerTabGridInfo" :dataPath="tagRelTabData" />
 		</div>
-		<div class="mt-3" ref="formParent" style="height: calc((100vh - 400px) /2);">
+		<div ref="formParent" >
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
 				:detailList="detailReadPlcTagList" @gridEditingFinish="gridEditingFinish" />
 		</div>
@@ -46,7 +46,78 @@ export default {
 			loadGrid: false,
 			gridName: 'rowReadPlcTagRelGrid',
 			detailReadPlcTagList: myReadPlcTagDetail,
+			tagRelTabData: {
+				"rowReadPlcTagRelGrid": {
+					data:
+						[
 
+							{
+								"tagNm": "TAG_001",
+								"ercId": "전기",
+								"distRt": 10,
+								"reprTagFg": "1",
+								"useFg": "Y",
+								"rmrk": "기본 설정",
+								"tagId": "TAG_001"
+							},
+							{
+								"tagNm": "TAG_002",
+								"ercId": "가스",
+								"distRt": 15,
+								"reprTagFg": "0",
+								"useFg": "Y",
+								"rmrk": "",
+								"tagId": "TAG_002"
+							},
+							{
+								"tagNm": "TAG_003",
+								"ercId": "수도",
+								"distRt": 8,
+								"reprTagFg": "0",
+								"useFg": "N",
+								"rmrk": "테스트용",
+								"tagId": "TAG_003"
+							},
+
+						]
+					,
+					column: [
+						{ header: 'TAG 명', name: 'tagNm', align: 'left' },
+						{
+							header: '에너지원',
+							name: 'ercId',
+							align: 'center',
+							width: 100,
+						},
+						{
+							header: '분배율(1~100)',
+							name: 'distRt',
+							align: 'right',
+							width: 100,
+						},
+						{
+							header: '대표 TAG 여부',
+							name: 'reprTagFg',
+							align: 'center',
+							width: 100,
+							formatter({ value }) {
+								return value == '1' ? '예' : '아니오';
+							},
+						},
+						{
+							header: '사용여부',
+							name: 'useFg',
+							align: 'center',
+							width: 100,
+
+						},
+						{ header: '비고', name: 'rmrk', align: 'left', width: 100 },
+						{ header: 'TAG ID', name: 'tagId', align: 'center', hidden: true },
+
+					]
+
+				}
+			}
 		};
 	},
 	computed: {

pages/comm/auth/RoleMngPage.vue

@@ -67,7 +67,6 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -132,22 +131,8 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			detailList: myDetail,
-			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: {
@@ -518,43 +503,4 @@ 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>

pages/comm/base/BatchLogMngPage.vue

@@ -4,28 +4,24 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="end" no-gutters>
+					<v-row align="center" no-gutters>
-						<v-col :cols="2.5">
+						<v-col :cols="2">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
-								:iconShow="true"
-								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
-								:iconShow="true"
-								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -33,21 +29,19 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
-								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2">
 							<component
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
-								:customClass="'input-large'"
 							/>
 						</v-col>
-						<v-col :cols="2" class="text-right d-flex align-end justify-end ga-1" style="gap: 4px">
+						<v-spacer></v-spacer>
-							<BtnSearch size="large" />
+						<v-col :cols="4" class="text-right">
-							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
+							<BtnSearch />
+							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" />
 						</v-col>
 					</v-row>
 				</v-card>
@@ -63,11 +57,10 @@
 						<div ref="gridParent" class="px-5 h100">
 							<component
 								:ref="gridName"
-								:is=" 'Grid' "
+								:is="loadGrid ? 'Grid' : null"
 								:parentPrgmId="myPrgmId"
 								:gridName="gridName"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -140,56 +133,10 @@ export default {
 	data() {
 		return {
 			myPrgmId: myPrgmId,
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowGrid',
 			// rowGridOrigin: [],
 			detailList: myDetail,
-			dataPathMock : {
-				'rowGrid': {
-					column: [
-					{ header: 'No.', name: 'batchLogSeq', align: 'center', width: 100 },
-					{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
-					{ header: '배치명', name: 'batchNm', align: 'left', width: 150 },
-					{ header: '실행 일자', name: 'execDt', align: 'center', width: 80 },
-					{
-						header: '실행 결과',
-						name: 'execRsltCd',
-						align: 'center',
-						width: 80,
-						// formatter({ value }) {
-						// 	let retVal = '';
-						// 	const newValue = _this.pageData.execRsltCdList.filter(
-						// 		item => item.commCd == value,
-						// 	);
-						// 	if (newValue.length > 0) {
-						// 		retVal = newValue[0].commCdNm;
-						// 	}
-						// 	return retVal;
-						// },
-					}, // "1": 프로그램, "2": 팝업
-					{ header: '실행 로그', name: 'execLogCont', minWidth: 150 },
-					{
-						header: '배치 시작 일시',
-						name: 'batchStrtDttm',
-						align: 'center',
-						width: 160,
-					},
-					{
-						header: '배치 종료 일시',
-						name: 'batchEndDttm',
-						align: 'center',
-						width: 160,
-					},
-					{ header: '등록자NO', name: 'regUserNo', width: 120 },
-					{ header: '등록일시', name: 'regDttm', align: 'center', width: 160 },
-					{ header: '수정자NO', name: 'procUserNo', width: 120 },
-					{ header: '수정일시', name: 'procDttm', align: 'center', width: 160 },
-					],
-					data: dataMockExample,
-					defaultRow: dataMockExample,
-					option: {},
-				},
-			},
 		};
 	},
 	computed: {
@@ -248,14 +195,6 @@ export default {
 		init() {
 			// this.layoutInit();
 			this.gridInit();
-			
-			// _this.pageData = {
-			// execRsltCdList: [
-			// 	{ commCd: '1', commCdNm: '성공' },
-			// 	{ commCd: '2', commCdNm: '실패' },
-			// ],
-			// };
-
 		},
 		// layoutInit() {
 		//   const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
@@ -368,13 +307,10 @@ export default {
 				}
 			});
 		},
-		// async getRowData(data) {
+		async getRowData(data) {
-		async getRowData() {
-			console.log("something")
 			this.setPageData({
-				// rowGridSelectKey: data.rowKey,
+				rowGridSelectKey: data.rowKey,
-				rowGridSelectKey: 1,
+				rowGridSelectData: data,
-				rowGridSelectData: fakeRowData,
 			});
 		},
 		compareData(type, newDt) {
@@ -481,86 +417,16 @@ const defaultData = {
 	},
 };
 
-const dataMockExample = [
-  {
-    batchLogSeq: 1,
-    batchId: 'BATCH001',
-    batchNm: '일일 데이터 백업',
-    execDt: '2025-07-15',
-    execRsltCd: '1', // sẽ được formatter thành "성공" hoặc tương tự
-    execLogCont: '백업 완료. 오류 없음.',
-    batchStrtDttm: '2025-07-15 01:00:00',
-    batchEndDttm: '2025-07-15 01:30:00',
-    regUserNo: 'admin01',
-    regDttm: '2025-07-15 01:00:00',
-    procUserNo: 'admin02',
-    procDttm: '2025-07-15 01:35:00',
-  },
-  {
-    batchLogSeq: 2,
-    batchId: 'BATCH002',
-    batchNm: '월간 리포트 생성',
-    execDt: '2025-07-01',
-    execRsltCd: '2',
-    execLogCont: '리포트 생성 중 오류 발생: 파일 접근 실패.',
-    batchStrtDttm: '2025-07-01 03:00:00',
-    batchEndDttm: '2025-07-01 03:10:00',
-    regUserNo: 'reportUser',
-    regDttm: '2025-07-01 03:00:00',
-    procUserNo: 'admin03',
-    procDttm: '2025-07-01 03:15:00',
-  },
-  {
-    batchLogSeq: 3,
-    batchId: 'BATCH003',
-    batchNm: '사용자 통계 갱신',
-    execDt: '2025-07-14',
-    execRsltCd: '1',
-    execLogCont: '통계 갱신 완료.',
-    batchStrtDttm: '2025-07-14 23:00:00',
-    batchEndDttm: '2025-07-14 23:20:00',
-    regUserNo: 'statUser',
-    regDttm: '2025-07-14 23:00:00',
-    procUserNo: 'admin01',
-    procDttm: '2025-07-14 23:25:00',
-  },
-];
-
-const fakeRowData = {
-  rowKey: 1,
-  batchLogSeq: 1,
-  batchId: 'BATCH001',
-  batchNm: '일일 데이터 백업',
-  execDt: '2025-07-15',
-  execRsltCd: '1',
-  execLogCont: JSON.stringify({
-    session: {
-      userNo: 'admin01',
-      userNm: '관리자',
-      comId: 'SKCC',
-      locale: 'ko_KR',
-    },
-    batch: {
-      comId: 'SKCC',
-      totStdDt: '20230110',
-    },
-  }),
-  batchStrtDttm: '2025-07-15 01:00:00',
-  batchEndDttm: '2025-07-15 01:30:00',
-  regUserNo: 'admin01',
-  regDttm: '2025-07-15 01:00:00',
-  procUserNo: 'admin02',
-  procDttm: '2025-07-15 01:35:00',
-};
-
-
 const myDetail = [
 	{
 		type: 'TextArea',
 		valueNm: 'execLogCont',
 		readonly: true,
 		cols: 12,
-		class: 'py-2 transparent',
+		class: 'py-2',
 	},
 ];
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>

pages/ems/base/EffcIdxMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<v-row ref="searchFilter">
-		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -17,8 +16,8 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" class="pt-2">
+		<v-row ref="contents">
-			<v-col :cols="5" style="height:100%" class="pr-2">
+			<v-col :cols="5" style="height:100%">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<v-card-title class="pa-0 custom-title-4">효율지표 리스트</v-card-title>
@@ -33,7 +32,7 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" style="height:100%" class="pl-2">
+			<v-col :cols="7" style="height:100%">
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4 pa-4 pb-2">효율지표 상세
 					</v-card-title>

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<v-row ref="searchFilter">
-		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -20,7 +19,7 @@
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }" :addAll="true" :labelCols="12"
 								:textCols="12" :customClass="'select-large'" :iconShow="true" />
 						</v-col>
-						<v-col :cols="2.5" class="pr-4">
+						<v-col :cols="2.5">
 							<InputText :parentPrgmId="myPrgmId" label="검침개소명" valueNm="readPlcNm" :labelCols="12"
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
@@ -31,25 +30,25 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" class="mt-3">
+		<v-row ref="contents" class="mt-4">
-			<v-col :cols="5" class="h100 pr-2">
+			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4 pb-6">
 						<v-card-title class="pa-0 custom-title-4">검침개소 정보</v-card-title>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
 							:btnActionsFnc="btnActions" />
 					</div>
-					<div class="px-4" style="height:calc(100% - 76px)">
+					<div class="px-4">
 						<div ref="gridParent" class="w100 h100">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 								:parentPrgmId="myPrgmId" @getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true"
-								 />
+								:dataPath="dataPathExample" />
 						</div>
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100 pl-2">
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4 pb-1 pa-4">검침개소 상세
 					</v-card-title>
@@ -135,7 +134,7 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			tab: null,
 			isImgTabDisabled: false,
 			items: [
@@ -158,6 +157,47 @@ export default {
 			],
 			detailList: myDetail,
 			defaultUseFg: 1,
+			dataPathExample: {
+				"rowGrid": {
+					data: sampleData,
+					column: [
+						{
+							header: '',
+							name: '',
+							align: 'center',
+							width: 50,
+							formatter: (props) => {
+								return `<label class="custom-radio">
+											<span class="radio-mark"></span>
+										</label>`;
+							}
+						},
+						{
+							header: '검침개소명',
+							name: 'readPlcNm',
+							align: 'left',
+							minWidth: 400,
+						},
+						{
+							header: '개소 종류',
+							name: 'plcKind',
+							minWidth: 100,
+							align: 'center',
+
+						},
+						{
+							header: '사용 여부',
+							name: 'useFg',
+							minWidth: 100,
+							align: 'center',
+
+						},
+
+					],
+					option: myOptions,
+
+				}
+			}
 			// loadTree: false
 		};
 	},
@@ -272,18 +312,18 @@ export default {
 		},
 		async initData() {
 			let ercList = [];
-			const res = await this.postApiReturn({
+			// const res = await this.postApiReturn({
-				apiKey: 'selectErcInfo',
+			// 	apiKey: 'selectErcInfo',
-				resKey: 'ercInfoData',
+			// 	resKey: 'ercInfoData',
-				sendParam: {
+			// 	sendParam: {
-					blocId: this.userInfo.blocId,
+			// 		blocId: this.userInfo.blocId,
-				},
+			// 	},
-			});
+			// });
-			res.forEach(item => {
+			// res.forEach(item => {
-				const it = { text: item.ercNm, value: item.ercId };
+			// 	const it = { text: item.ercNm, value: item.ercId };
-				ercList.push(it);
+			// 	ercList.push(it);
-			});
+			// });
-			this.setPageData({ ercNmList: ercList });
+			// this.setPageData({ ercNmList: ercList });
 		},
 		gridInit() {
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
@@ -294,12 +334,10 @@ export default {
 					resizable: true,
 				},
 				treeColumnOptions: {
-					name: 'readPlcNm',
+					name: 'eccNm',       // Showing tree table
+					useIcon: false,      // Not using icon
+					indentWidth: 10,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -470,12 +508,12 @@ export default {
 					this.$refs[this.gridName].focus({
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName].getData().length - 1
+									this.$refs[this.gridName].getData().length - 1
-								? this.pageData.rowGridSelectKey
+									? this.pageData.rowGridSelectKey
-								: 0,
+									: 0,
 						columnName: 'readPlcNm',
 						setScroll: true,
 					});
@@ -493,7 +531,7 @@ export default {
 				if (this.tab == 2) {
 					this.tab = 0;
 				}
-				this.isImgTabDisabled = false;
+				this.isImgTabDisabled = true;
 			} else {
 				this.isImgTabDisabled = false;
 			}
@@ -961,6 +999,18 @@ const sampleData = [
 ];
 
 
+
+const myOptions = {
+	columnOptions: {
+		resizable: true,
+	},
+	treeColumnOptions: {
+		name: 'readPlcNm',       // Showing tree table
+		useIcon: false,      // Not using icon
+		indentWidth: 10,
+	},
+}
+
 const myDetail = [
 	{
 		type: 'InputText',

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<common-page-title />
+		<v-row ref="searchFilter">
-		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -30,10 +29,10 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" class="mt-3">
+		<v-row ref="contents">
-			<v-col :cols="5" class="h100 pr-2">
+			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
-					<v-card-title class="d-flex align-center justify-space-between pa-5">
+					<v-card-title class="d-flex align-center justify-space-between pa-4">
 						물리량 리스트
 
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
@@ -45,12 +44,12 @@
 								:parentPrgmId="myPrgmId" @getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true"
 								:preventFocusChangeEventFlag="true"
-								:preventFocusChangeEventTargetGridList="editingGridList" />
+								:preventFocusChangeEventTargetGridList="editingGridList" :dataPath="dataPathExample" />
 						</div>
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100 pl-2">
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5 px-4">
 					<v-card-title class="px-0">물리량 상세</v-card-title>
 					<v-row no-gutters>
@@ -137,7 +136,7 @@
 						<v-col :cols="12" style="height:100%">
 							<div ref="gridParent2" style="height:100%">
 								<component :ref="gridName2" :is="loadGrid2 ? 'Grid' : null" :gridName="gridName2"
-									:parentPrgmId="myPrgmId" @getRowsData="getRowData2" />
+									:parentPrgmId="myPrgmId" @getRowsData="getRowData2" :dataPath="dataPathExample2" />
 							</div>
 						</v-col>
 					</v-row>
@@ -224,7 +223,7 @@ export default {
 			formatterSelectList01: [],
 			formatterSelectList02: [],
 
-			loadGrid: false,
+			loadGrid: true,
 			dataPathExample: {
 				"rowGrid": {
 					data: [
@@ -280,7 +279,59 @@ export default {
 
 				}
 			},
-			loadGrid2: false,
+			dataPathExample2: {
+				"rowGrid2": {
+					data:
+						[
+							{
+								"argSeq": "1",
+								"argPysclQtyId": "001",
+								"eqpmGrpId": "EQPM-GRP-A",
+								"pysclQtyCd": "TEMP001"
+							},
+							{
+								"argSeq": "2",
+								"argPysclQtyId": "002",
+								"eqpmGrpId": "EQPM-GRP-B",
+								"pysclQtyCd": "PRESS001"
+							},
+							{
+								"argSeq": "3",
+								"argPysclQtyId": "003",
+								"eqpmGrpId": "EQPM-GRP-C",
+								"pysclQtyCd": "FLOW001"
+							},
+							{
+								"argSeq": "4",
+								"argPysclQtyId": "004",
+								"eqpmGrpId": "EQPM-GRP-D",
+								"pysclQtyCd": "HUMID001"
+							},
+							{
+								"argSeq": "5",
+								"argPysclQtyId": "005",
+								"eqpmGrpId": "EQPM-GRP-E",
+								"pysclQtyCd": "VOLT001"
+							}
+						]
+
+
+					,
+					column: [
+						{ header: '순번', name: 'argSeq', editor: 'text' },
+						{ header: '물리량 ID', name: 'argPysclQtyId' },
+						{
+							header: '설비그룹',
+							name: 'eqpmGrpId',
+
+						},
+						{ header: '물리량 코드', name: 'pysclQtyCd' },
+
+					],
+
+				}
+			},
+			loadGrid2: true,
 			detailList: myDetail,
 
 			readOnlyValueList: [
@@ -950,10 +1001,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 'auto',
 			};
 
 			this.setGridOption({
@@ -1019,10 +1066,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 'auto',
 			};
 
 			this.setGridOption({

pages/ems/base/GdIdxMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<common-page-title />
+		<v-row ref="searchFilter">
-		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -38,11 +37,11 @@
 							:btnActionsFnc="btnActions" />
 					</div>
 					<div class="h100 px-4" style="height:calc(100% - 70px)">
-						<div ref="gridParent" style="height: 30%">
+						<div ref="gridParent" >
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 								:parentPrgmId="myPrgmId" @getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
-						<div class="d-flex py-4 mt-4" >
+						<div class="d-flex py-4">
 							<component :is="'Form'" :parentPrgmId="myPrgmId" :detailList="detailList"
 							@gridEditingFinish="gridEditingFinish" />
 						</div>
@@ -113,7 +112,7 @@ export default {
 			myPrgmId: myPrgmId,
 			initedFlag: false,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			detailList: myDetail,
 			selectValue01: null,
 			selectValueList01: [],
@@ -126,102 +125,102 @@ export default {
 			// 	pysclQtyId3 : null,
 			// 	pysclQtyId4 : null
 			// }
-			// dataPathExample: {
+			dataPathExample: {
-			// 	"rowGrid": {
+				"rowGrid": {
-			// 		data: [
+					data: [
 
-			// 			{
+						{
-			// 				gdIdxId: 'GD001',
+							gdIdxId: 'GD001',
-			// 				gdIdxNm: '온도 가이드',
+							gdIdxNm: '온도 가이드',
-			// 				eqpmGrpId: 'EQ001',
+							eqpmGrpId: 'EQ001',
-			// 				upTotMeth: 'AVG',
+							upTotMeth: 'AVG',
-			// 				careStndVal: 50,
+							careStndVal: 50,
-			// 				warnStndVal: 70,
+							warnStndVal: 70,
-			// 				alrmMsg: '온도가 기준치를 초과했습니다.',
+							alrmMsg: '온도가 기준치를 초과했습니다.',
-			// 			},
+						},
-			// 			{
+						{
-			// 				gdIdxId: 'GD002',
+							gdIdxId: 'GD002',
-			// 				gdIdxNm: '습도 가이드',
+							gdIdxNm: '습도 가이드',
-			// 				eqpmGrpId: 'EQ002',
+							eqpmGrpId: 'EQ002',
-			// 				upTotMeth: 'MAX',
+							upTotMeth: 'MAX',
-			// 				careStndVal: 30,
+							careStndVal: 30,
-			// 				warnStndVal: 60,
+							warnStndVal: 60,
-			// 				alrmMsg: '습도가 기준치를 초과했습니다.',
+							alrmMsg: '습도가 기준치를 초과했습니다.',
-			// 			},
+						},
-			// 			{
+						{
-			// 				gdIdxId: 'GD003',
+							gdIdxId: 'GD003',
-			// 				gdIdxNm: '압력 가이드',
+							gdIdxNm: '압력 가이드',
-			// 				eqpmGrpId: 'EQ003',
+							eqpmGrpId: 'EQ003',
-			// 				upTotMeth: 'SUM',
+							upTotMeth: 'SUM',
-			// 				careStndVal: 100,
+							careStndVal: 100,
-			// 				warnStndVal: 150,
+							warnStndVal: 150,
-			// 				alrmMsg: '압력이 기준치를 초과했습니다.',
+							alrmMsg: '압력이 기준치를 초과했습니다.',
-			// 			}
+						}
 
-			// 		],
+					],
-			// 		column: [
+					column: [
-			// 			{
+						{
-			// 				header: '가이드',
+							header: '가이드',
-			// 				name: 'gdIdxId',
+							name: 'gdIdxId',
-			// 				width: 100,
+							width: 100,
-			// 				align: 'center',
+							align: 'center',
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '가이드명',
+							header: '가이드명',
-			// 				name: 'gdIdxNm',
+							name: 'gdIdxNm',
-			// 				width: 210,
+							width: 210,
-			// 				align: 'left',
+							align: 'left',
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '설비그룹ID',
+							header: '설비그룹ID',
-			// 				name: 'eqpmGrpId',
+							name: 'eqpmGrpId',
-			// 				width: 100,
+							width: 100,
-			// 				align: 'center',
+							align: 'center',
-			// 				// formatter({ value }) {
+							// formatter({ value }) {
-			// 				// 	let retVal = '';
+							// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.eqpmGrpList.filter(item => item.value == value);
+							// 	const newValue = _this.pageData.eqpmGrpList.filter(item => item.value == value);
-			// 				// 	if (newValue.length > 0) {
+							// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].text;
+							// 		retVal = newValue[0].text;
-			// 				// 	}
+							// 	}
-			// 				// 	return retVal;
+							// 	return retVal;
-			// 				// },
+							// },
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '상위집계방법',
+							header: '상위집계방법',
-			// 				name: 'upTotMeth',
+							name: 'upTotMeth',
-			// 				width: 100,
+							width: 100,
-			// 				align: 'center',
+							align: 'center',
-			// 				// formatter({ value }) {
+							// formatter({ value }) {
-			// 				// 	let retVal = '';
+							// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.upTotMethList.filter(item => item.commCd == value);
+							// 	const newValue = _this.pageData.upTotMethList.filter(item => item.commCd == value);
-			// 				// 	if (newValue.length > 0) {
+							// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].commCdNm;
+							// 		retVal = newValue[0].commCdNm;
-			// 				// 	}
+							// 	}
-			// 				// 	return retVal;
+							// 	return retVal;
-			// 				// },
+							// },
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '주의기준',
+							header: '주의기준',
-			// 				name: 'careStndVal',
+							name: 'careStndVal',
-			// 				width: 100,
+							width: 100,
-			// 				align: 'right',
+							align: 'right',
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '경고기준',
+							header: '경고기준',
-			// 				name: 'warnStndVal',
+							name: 'warnStndVal',
-			// 				width: 100,
+							width: 100,
-			// 				align: 'right',
+							align: 'right',
-			// 			},
+						},
-			// 			{
+						{
-			// 				header: '알람메세지',
+							header: '알람메세지',
-			// 				name: 'alrmMsg',
+							name: 'alrmMsg',
-			// 				minWidth: 860,
+							minWidth: 860,
-			// 				align: 'left',
+							align: 'left',
-			// 			}
+						}
-			// 		]
+					]
 
-			// 	}
+				}
-			// }
+			}
 		};
 	},
 	computed: {
@@ -353,46 +352,60 @@ export default {
 			});
 		},
 		async getEqpmKind() {
-			let res = await this.postApiReturn({
+			// let res = await this.postApiReturn({
-				apiKey: 'selectEqpmKindCodeList',
+			// 	apiKey: 'selectEqpmKindCodeList',
-				resKey: 'eqpmKindCodeLists',
+			// 	resKey: 'eqpmKindCodeLists',
-				sendParam: {},
+			// 	sendParam: {},
-			});
+			// });
-			if (res.length > 0) {
+			// if (res.length > 0) {
-				this.selectValueList01 = await res.map(item => {
+			// 	this.selectValueList01 = await res.map(item => {
-					return {
+			// 		return {
-						text: item.eqpmKindNm,
+			// 			text: item.eqpmKindNm,
-						value: item.eqpmKindId,
+			// 			value: item.eqpmKindId,
-					};
+			// 		};
-				});
+			// 	});
-				this.selectValue01 = this.selectValueList01[0].value;
+			// 	this.selectValue01 = this.selectValueList01[0].value;
-			} else {
+			// } else {
-				this.selectValueList01 = [];
+			// 	this.selectValueList01 = [];
-				this.selectValue01 = null;
+			// 	this.selectValue01 = null;
-			}
+			// }
+
+			this.selectValueList01 = [
+				{ label: 'Etcher', value: 'EQK001' },
+				{ label: 'Deposition', value: 'EQK002' },
+				{ label: 'Inspection', value: 'EQK003' },
+			];
+
+			this.selectValue01 = 'EQK001';
 			this.setPageData({
 				eqpmKindList: this.selectValueList01,
 				eqpmKindId: this.selectValue01,
 			});
 		},
 		async getEqpmGrp() {
-			let res = await this.postApiReturn({
+			// let res = await this.postApiReturn({
-				apiKey: 'selectEqpmGrpCodeList',
+			// 	apiKey: 'selectEqpmGrpCodeList',
-				resKey: 'eqpmGrpCodeLists',
+			// 	resKey: 'eqpmGrpCodeLists',
-				sendParam: { eqpmKindId: this.selectValue01 },
+			// 	sendParam: { eqpmKindId: this.selectValue01 },
-			});
+			// });
-			if (res.length > 0) {
+			// if (res.length > 0) {
-				this.selectValueList02 = await res.map(item => {
+			// 	this.selectValueList02 = await res.map(item => {
-					return {
+			// 		return {
-						text: item.eqpmGrpNm,
+			// 			text: item.eqpmGrpNm,
-						value: item.eqpmGrpId,
+			// 			value: item.eqpmGrpId,
-					};
+			// 		};
-				});
+			// 	});
-				this.selectValue02 = this.selectValueList02[0].value;
+			// 	this.selectValue02 = this.selectValueList02[0].value;
-			} else {
+			// } else {
-				this.selectValueList02 = [];
+			// 	this.selectValueList02 = [];
-				this.selectValue02 = null;
+			// 	this.selectValue02 = null;
-			}
+			// }
+			this.selectValueList02 = [
+				{ label: '냉동기고온', value: '냉동기고온' },
+				{ label: '냉동기저온', value: '냉동기저온' },
+				{ label: '공조기', value: '공조기' },
+				{ label: '보일러', value: '보일러' }
+			];
 
 			this.setPageData({
 				eqpmGrpList: this.selectValueList02,
@@ -406,10 +419,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 'auto',
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -627,100 +636,100 @@ export default {
 		async getRowGridData() {
 			this.loadGrid = false;
 			let res = [];
-			// const newRes = [
+			const newRes = [
-			// 	{
+				{
-			// 		comId: 'COM001',
+					comId: 'COM001',
-			// 		gdIdxId: 'GD001',
+					gdIdxId: 'GD001',
-			// 		gdIdxNm: '온도 가이드',
+					gdIdxNm: '온도 가이드',
-			// 		eqpmGrpId: 'EQ001',
+					eqpmGrpId: 'EQ001',
-			// 		upTotMeth: 'AVG',
+					upTotMeth: 'AVG',
-			// 		sortSeq: 1,
+					sortSeq: 1,
-			// 		pysclQtyId1: 'TEMP',
+					pysclQtyId1: 'TEMP',
-			// 		pysclQtyId2: null,
+					pysclQtyId2: null,
-			// 		pysclQtyId3: null,
+					pysclQtyId3: null,
-			// 		pysclQtyId4: null,
+					pysclQtyId4: null,
-			// 		ctgr1: '환경',
+					ctgr1: '환경',
-			// 		ctgr2: '내부',
+					ctgr2: '내부',
-			// 		careStndVal: 50,
+					careStndVal: 50,
-			// 		warnStndVal: 70,
+					warnStndVal: 70,
-			// 		gdMeth: '자동',
+					gdMeth: '자동',
-			// 		useFg: '1',
+					useFg: '1',
-			// 		alrmMsg: '온도가 기준치를 초과했습니다.',
+					alrmMsg: '온도가 기준치를 초과했습니다.',
-			// 		calcProc: 'PROC001',
+					calcProc: 'PROC001',
-			// 		calcDesc: '평균 계산',
+					calcDesc: '평균 계산',
-			// 		calcMeth: '(A+B)/2',
+					calcMeth: '(A+B)/2',
-			// 		unit: 'C',
+					unit: 'C',
-			// 		argCnt: 2,
+					argCnt: 2,
-			// 		rowStat: null,
-			// 	},
-			// 	{
-			// 		comId: 'COM002',
-			// 		gdIdxId: 'GD002',
-			// 		gdIdxNm: '습도 가이드',
-			// 		eqpmGrpId: 'EQ002',
-			// 		upTotMeth: 'MAX',
-			// 		sortSeq: 2,
-			// 		pysclQtyId1: 'HUMID',
-			// 		pysclQtyId2: null,
-			// 		pysclQtyId3: null,
-			// 		pysclQtyId4: null,
-			// 		ctgr1: '환경',
-			// 		ctgr2: '외부',
-			// 		careStndVal: 30,
-			// 		warnStndVal: 60,
-			// 		gdMeth: '수동',
-			// 		useFg: '0',
-			// 		alrmMsg: '습도가 기준치를 초과했습니다.',
-			// 		calcProc: 'PROC002',
-			// 		calcDesc: '최대값 계산',
-			// 		calcMeth: 'MAX(A,B)',
-			// 		unit: '%',
-			// 		argCnt: 2,
-			// 		rowStat: null,
-			// 	},
-			// ];
-
-			res = await this.postApiReturn({
-				apiKey: 'selectEqpmGdIdxDataList',
-				resKey: 'eqpmGdIdxDataList',
-				sendParam: {
-					eqpmGrpId: this.selectValue02,
-					gdIdxNmLike: this.pageData.gdIdxNm,
-				},
-			});
-			const newRes = res.map(item => {
-				const newObj = {
-					...item,
 					rowStat: null,
-				};
+				},
-				return newObj;
+				{
-			});
+					comId: 'COM002',
+					gdIdxId: 'GD002',
+					gdIdxNm: '습도 가이드',
+					eqpmGrpId: 'EQ002',
+					upTotMeth: 'MAX',
+					sortSeq: 2,
+					pysclQtyId1: 'HUMID',
+					pysclQtyId2: null,
+					pysclQtyId3: null,
+					pysclQtyId4: null,
+					ctgr1: '환경',
+					ctgr2: '외부',
+					careStndVal: 30,
+					warnStndVal: 60,
+					gdMeth: '수동',
+					useFg: '0',
+					alrmMsg: '습도가 기준치를 초과했습니다.',
+					calcProc: 'PROC002',
+					calcDesc: '최대값 계산',
+					calcMeth: 'MAX(A,B)',
+					unit: '%',
+					argCnt: 2,
+					rowStat: null,
+				},
+			];
+
+			// res = await this.postApiReturn({
+			// 	apiKey: 'selectEqpmGdIdxDataList',
+			// 	resKey: 'eqpmGdIdxDataList',
+			// 	sendParam: {
+			// 		eqpmGrpId: this.selectValue02,
+			// 		gdIdxNmLike: this.pageData.gdIdxNm,
+			// 	},
+			// });
+			// const newRes = res.map(item => {
+			// 	const newObj = {
+			// 		...item,
+			// 		rowStat: null,
+			// 	};
+			// 	return newObj;
+			// });
 			this.setGridData({
 				gridKey: this.gridName,
 				value: newRes,
 			});
 			//this.loadGrid = true;
-			this.$nextTick(() => {
+			// this.$nextTick(() => {
-				if (newRes.length > 0) {
+			// 	if (newRes.length > 0) {
-					try {
+			// 		try {
-						this.$refs[this.gridName].focus({
+			// 			this.$refs[this.gridName].focus({
-							//rowKey: 0,
+			// 				//rowKey: 0,
-							rowKey:
+			// 				rowKey:
-								this.pageData.rowGridSelectKey == '' ||
+			// 					this.pageData.rowGridSelectKey == '' ||
-									this.pageData.rowGridSelectKey == null
+			// 						this.pageData.rowGridSelectKey == null
-									? 0
+			// 						? 0
-									: this.pageData.rowGridSelectKey ==
+			// 						: this.pageData.rowGridSelectKey ==
-										this.$refs[this.gridName].getData().length - 1
+			// 							this.$refs[this.gridName].getData().length - 1
-										? this.pageData.rowGridSelectKey
+			// 							? this.pageData.rowGridSelectKey
-										: 0,
+			// 							: 0,
-							columnName: 'gdIdxId',
+			// 				columnName: 'gdIdxId',
-							setScroll: true,
+			// 				setScroll: true,
-						});
+			// 			});
-					} catch (error) { }
+			// 		} catch (error) { }
-				} else {
+			// 	} else {
-					this.detailDataInit();
+			// 		this.detailDataInit();
-				}
+			// 	}
-			});
+			// });
 			this.loadGrid = true;
 		},
 		async getRowData(data) {

pages/ems/base/GdStndMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<common-page-title />
+		<v-row ref="searchFilter">
-		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -30,7 +29,7 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" class="mt-3">
+		<v-row ref="contents" class="mt-4">
 			<v-col :cols="12" style="height: 100%">
 				<!-- <v-card class="py-5"> -->
 				<v-card style="height: 60%">
@@ -116,8 +115,8 @@
 
 				</v-card>
 
-				<v-row style="height: 40%" class="mt-3">
+				<v-row style="height: 40%" class="mt-4">
-					<v-col :cols="6" style="height: 100%" class="pr-2">
+					<v-col :cols="6" style="height: 100%">
 						<v-card class="pb-5">
 							<div class="d-flex align-center justify-space-between pa-4">
 								<v-card-title class="pa-0 custom-title-4 ">설비상세 리스트</v-card-title>
@@ -127,12 +126,12 @@
 								<div ref="gridParent" class="w100 h100">
 									<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 										:parentPrgmId="myPrgmId" @getRowsData="getRowData"
-										/>
+										:dataPath="dataPathExample" />
 								</div>
 							</div>
 						</v-card>
 					</v-col>
-					<v-col :cols="6" style="height: 100%" class="pl-2">
+					<v-col :cols="6" style="height: 100%">
 						<v-card class="pb-5">
 							<div class="d-flex align-center justify-space-between pa-4">
 								<v-card-title class="pa-0 custom-title-4">설비가이드 기준 정보</v-card-title>
@@ -202,7 +201,7 @@ export default {
 			readonlyFg: true,
 			initedFlag: false,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			detailList: myDetail,
 			selectValue01: null,
 			selectValueList01: [],
@@ -210,62 +209,62 @@ export default {
 			selectValueList02: [],
 			selectValue03: null,
 			selectValueList03: [],
-			// dataPathExample: {
+			dataPathExample: {
-			// 	"rowGrid": {
+				"rowGrid": {
-			// 		data: [
+					data: [
 
-			// 			{
+						{
-			// 				eqpmId: 'EQ001',
+							eqpmId: 'EQ001',
-			// 				originEqpmId: 'ORIG001',
+							originEqpmId: 'ORIG001',
-			// 				eqpmNm: '냉각기 A',
+							eqpmNm: '냉각기 A',
-			// 				careStndVal: 75,
+							careStndVal: 75,
-			// 				warnStndVal: 90,
+							warnStndVal: 90,
-			// 			},
+						},
-			// 			{
+						{
-			// 				eqpmId: 'EQ002',
+							eqpmId: 'EQ002',
-			// 				originEqpmId: 'ORIG002',
+							originEqpmId: 'ORIG002',
-			// 				eqpmNm: '펌프 B',
+							eqpmNm: '펌프 B',
-			// 				careStndVal: 60,
+							careStndVal: 60,
-			// 				warnStndVal: 80,
+							warnStndVal: 80,
-			// 			},
+						},
-			// 			{
+						{
-			// 				eqpmId: 'EQ003',
+							eqpmId: 'EQ003',
-			// 				originEqpmId: 'ORIG003',
+							originEqpmId: 'ORIG003',
-			// 				eqpmNm: '모터 C',
+							eqpmNm: '모터 C',
-			// 				careStndVal: 50,
+							careStndVal: 50,
-			// 				warnStndVal: 70,
+							warnStndVal: 70,
-			// 			},
+						},
-			// 			{
+						{
-			// 				eqpmId: 'EQ004',
+							eqpmId: 'EQ004',
-			// 				originEqpmId: 'ORIG004',
+							originEqpmId: 'ORIG004',
-			// 				eqpmNm: '밸브 D',
+							eqpmNm: '밸브 D',
-			// 				careStndVal: 65,
+							careStndVal: 65,
-			// 				warnStndVal: 85,
+							warnStndVal: 85,
-			// 			},
+						},
-			// 			{
+						{
-			// 				eqpmId: 'EQ005',
+							eqpmId: 'EQ005',
-			// 				originEqpmId: 'ORIG005',
+							originEqpmId: 'ORIG005',
-			// 				eqpmNm: '컨트롤러 E',
+							eqpmNm: '컨트롤러 E',
-			// 				careStndVal: 55,
+							careStndVal: 55,
-			// 				warnStndVal: 75,
+							warnStndVal: 75,
-			// 			},
+						},
 
-			// 		],
+					],
-			// 		column: [
+					column: [
-			// 			{ header: '설비', name: 'eqpmId', align: 'left' },
+						{ header: '설비', name: 'eqpmId', align: 'left' },
-			// 			{
+						{
-			// 				header: 'origin설비',
+							header: 'origin설비',
-			// 				name: 'originEqpmId',
+							name: 'originEqpmId',
-			// 				align: 'center',
+							align: 'center',
-			// 				hidden: true,
+							hidden: true,
-			// 			},
+						},
-			// 			{ header: '설비명', name: 'eqpmNm', align: 'left' },
+						{ header: '설비명', name: 'eqpmNm', align: 'left' },
-			// 			{ header: '주의기준', name: 'careStndVal', align: 'right' },
+						{ header: '주의기준', name: 'careStndVal', align: 'right' },
-			// 			{ header: '심각기준', name: 'warnStndVal', align: 'right' },
+						{ header: '심각기준', name: 'warnStndVal', align: 'right' },
-			// 		]
+					]
 
-			// 	}
+				}
-			// }
+			}
 		};
 	},
 	computed: {
@@ -409,10 +408,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 'auto',
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -516,69 +511,69 @@ export default {
 			this.loadGrid = false;
 			let res = [];
 
-			if (this.selectValue01 && this.selectValue02 && this.selectValue03) {
+			// if (this.selectValue01 && this.selectValue02 && this.selectValue03) {
-				res = await this.postApiReturn({
+			// 	res = await this.postApiReturn({
-					apiKey: 'selectEqpmGdDetl',
+			// 		apiKey: 'selectEqpmGdDetl',
-					resKey: 'eqpmGdDetlData',
+			// 		resKey: 'eqpmGdDetlData',
-					sendParam: {
+			// 		sendParam: {
-						gdIdxId: this.selectValue03,
+			// 			gdIdxId: this.selectValue03,
-					},
+			// 		},
-				});
+			// 	});
-			}
+			// }
 
-			// grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 시작
+			// // grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 시작
-			let eqpmIdList = res.map(item => {
+			// let eqpmIdList = res.map(item => {
-				return item.eqpmId;
+			// 	return item.eqpmId;
-			});
+			// });
-			this.setPageData({ nowGridEqpmIdList: eqpmIdList });
+			// this.setPageData({ nowGridEqpmIdList: eqpmIdList });
-			// grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 끝
+			// // grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 끝
-			const newRes = res.map(item => {
+			// const newRes = res.map(item => {
-				const newObj = {
+			// 	const newObj = {
-					...item,
+			// 		...item,
-					rowStat: null,
+			// 		rowStat: null,
-				};
+			// 	};
-				return newObj;
+			// 	return newObj;
-			});
+			// });
-			// const newRes = [
+			const newRes = [
 
 
-			// 	{
+				{
-			// 		eqpmId: 'EQ001',
+					eqpmId: 'EQ001',
-			// 		originEqpmId: 'ORIG001',
+					originEqpmId: 'ORIG001',
-			// 		eqpmNm: '냉각기 A',
+					eqpmNm: '냉각기 A',
-			// 		careStndVal: 75,
+					careStndVal: 75,
-			// 		warnStndVal: 90,
+					warnStndVal: 90,
-			// 	},
+				},
-			// 	{
+				{
-			// 		eqpmId: 'EQ002',
+					eqpmId: 'EQ002',
-			// 		originEqpmId: 'ORIG002',
+					originEqpmId: 'ORIG002',
-			// 		eqpmNm: '펌프 B',
+					eqpmNm: '펌프 B',
-			// 		careStndVal: 60,
+					careStndVal: 60,
-			// 		warnStndVal: 80,
+					warnStndVal: 80,
-			// 	},
+				},
-			// 	{
+				{
-			// 		eqpmId: 'EQ003',
+					eqpmId: 'EQ003',
-			// 		originEqpmId: 'ORIG003',
+					originEqpmId: 'ORIG003',
-			// 		eqpmNm: '모터 C',
+					eqpmNm: '모터 C',
-			// 		careStndVal: 50,
+					careStndVal: 50,
-			// 		warnStndVal: 70,
+					warnStndVal: 70,
-			// 	},
+				},
-			// 	{
+				{
-			// 		eqpmId: 'EQ004',
+					eqpmId: 'EQ004',
-			// 		originEqpmId: 'ORIG004',
+					originEqpmId: 'ORIG004',
-			// 		eqpmNm: '밸브 D',
+					eqpmNm: '밸브 D',
-			// 		careStndVal: 65,
+					careStndVal: 65,
-			// 		warnStndVal: 85,
+					warnStndVal: 85,
-			// 	},
+				},
-			// 	{
+				{
-			// 		eqpmId: 'EQ005',
+					eqpmId: 'EQ005',
-			// 		originEqpmId: 'ORIG005',
+					originEqpmId: 'ORIG005',
-			// 		eqpmNm: '컨트롤러 E',
+					eqpmNm: '컨트롤러 E',
-			// 		careStndVal: 55,
+					careStndVal: 55,
-			// 		warnStndVal: 75,
+					warnStndVal: 75,
-			// 	},
+				},
 
-			// ]
+			]
 			this.setGridData({
 				gridKey: this.gridName,
 				value: newRes,

pages/ems/base/ReadObjectMngPage.vue

@@ -28,7 +28,7 @@
 								customClass="select-large"
 							/>
 						</v-col>
-						<v-col  :cols="3">
+						<v-col :cols="3">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="검침대상명"
@@ -69,7 +69,6 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -81,7 +80,7 @@
 						>검침대상 상세
 					</v-card-title>
 					<div class="px-5" style="height:calc(100% - 76px)">
-						<v-tabs v-model="tab" >
+						<v-tabs v-model="tab">
 							<v-tab
 								v-for="item in items"
 								:key="item.id"
@@ -188,26 +187,8 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
-			dataPathMock: {
-				"rowGrid": {
-				column: [
-					{ header: '검침 대상 ID', name: 'readObjId', align: 'left' },
-					{ header: '검침 대상 명', name: 'readObjNm', align: 'left' },
-					{ header: '검침 대상 유형', name: 'readObjKind', align: 'left' },
-					{ header: '그룹', name: 'grpCd', align: 'left' },
-					{ header: 'TJ 환산계수', name: 'tjCvrtCoef', align: 'right' },
-					{ header: 'TOE 환산계수', name: 'toeCvrtCoef', align: 'right' },
-					{ header: 'CO2 환산계수', name: 'co2CvrtCoef', align: 'right' },
-					{ header: '단위', name: 'unitCd', align: 'left' },
-					{ header: '사용 여부', name: 'useFg', align: 'center' },
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {}
-				}
-			},
 			items: [
 				{
 					name: '검침 대상 정보',
@@ -724,8 +705,8 @@ const defaultData = {
 		},
 		buttonAuth: {
 			add: true,
-			save: true,
 			remove: true,
+			save: true,
 			excel: false,
 		},
 	},
@@ -873,40 +854,7 @@ const myDetail = [
 		required: true,
 	},
 ];
-const dataPathDataExample = [
-	{
-	readObjId: 'OBJ001',
-	readObjNm: '서울 본사',
-	readObjKind: 'TYPE01',
-	grpCd: 'GRP01',
-	tjCvrtCoef: 1.25,
-	toeCvrtCoef: 0.85,
-	co2CvrtCoef: 2.1,
-	unitCd: 'kWh',
-	useFg: '1',
-	},
-	{
-	readObjId: 'OBJ002',
-	readObjNm: '부산 지사',
-	readObjKind: 'TYPE02',
-	grpCd: 'GRP02',
-	tjCvrtCoef: 1.10,
-	toeCvrtCoef: 0.90,
-	co2CvrtCoef: 1.8,
-	unitCd: 'MJ',
-	useFg: '0',
-	},
-	{
-	readObjId: 'OBJ003',
-	readObjNm: '대전 공장',
-	readObjKind: 'TYPE03',
-	grpCd: 'GRP01',
-	tjCvrtCoef: 1.30,
-	toeCvrtCoef: 0.95,
-	co2CvrtCoef: 2.3,
-	unitCd: 'GJ',
-	useFg: '1',
-	}
-];
-
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>

pages/ems/effc/DataSetMngPage.vue

@@ -44,7 +44,7 @@
             <div class="px-5" style="min-height:calc(100% - 76px)">
               <div ref="gridParent" class="w100 h100">
                 <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-                  @getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
+                  @getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo" :dataPath="dataPathMock"
                   :selectedRowDataWatchFlag="true" />
               </div>
             </div>

pages/ems/effc/EnrgReptMngPage.vue

@@ -266,8 +266,8 @@ export default {
 	},
 	created() { },
 	async mounted() {
-		// console.log('----DEBUG---');
+		console.log('----DEBUG---');
-		// await this.initTest();
+		await this.initTest();
 		// End Debug Test---
 		await this.init();
 		this.initedFlag = true;

plugins/vuetify.js

@@ -10,7 +10,6 @@ import icoBulletPoint from '~/components/icons/icoBulletPoint';
 import icoChevronDown from '~/components/icons/icoChevronDown';
 import icoSearch from '~/components/icons/icoSearch';
 import icoSend from '~/components/icons/icoSend';
-import icoExpandAlt from '~/components/icons/icoExpandAlt';
 import '@mdi/font/css/materialdesignicons.css'; // Ensure you are using css-loader
 import 'material-design-icons-iconfont/dist/material-design-icons.css';
 import Vue from 'vue';
@@ -74,9 +73,6 @@ export default new Vuetify({
 			icoSend: {
 				component: icoSend,
 			},
-			icoExpandAlt: {
-				component: icoExpandAlt,
-			},
 		},
 	},
 });