Fix comment

Reviewed-on: #10

assets/scss/common.scss

@@ -433,6 +433,10 @@ a {
   .v-application.#{$theme}-mode {
     min-width: 1000px;
 
+    .head-logo{
+      gap: 8px;
+    }
+
     .v-navigation-drawer {
       background: map-deep-get($config, #{$theme}, "menu-bg-color");
     }
@@ -474,7 +478,7 @@ a {
 
     .btn-header {
       background-color: map-deep-get($config, #{$theme}, "v-btn-header-background");
-      border: map-deep-get($config, #{$theme}, "v-btn-header-border");
+      border:1px solid map-deep-get($config, #{$theme}, "v-btn-header-border");
       color: map-deep-get($config, #{$theme}, "v-btn-header-text");
     }
 
@@ -1255,19 +1259,11 @@ 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;
-          }
         }
       }
     }
@@ -1310,18 +1306,24 @@ a {
   .btn-close-menu-list {
     min-width: 100px;
     border-color: transparent;
+    background-color: map-deep-get($config, #{$theme}, "btn-header-select-bg") !important;
 
     .v-list-item {
       min-height: 30px;
     }
 
     .v-list-item__title {
-      color: #fff;
+      color: map-deep-get($config, #{$theme}, "btn-header-select-color");
 
       &:hover {
         color: #46c0ff;
       }
     }
+    .v-btn {
+      background-color: transparent !important;
+      color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
+    }
+    
   }
 
   [hover-tooltip] {

assets/scss/common/button.scss

@@ -92,8 +92,11 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
-    .search-button {
-      color: map-deep-get($config, #{$theme}, "search-btn-color");
+    .searchFilter{
+      .search-button {
+        height: 40px;
+        color: map-deep-get($config, #{$theme}, "search-btn-color");
+      }
     }
      
     .v-dialog {
@@ -107,6 +110,13 @@
     }
 
     .ant-btn  {
+
+      &.ant-btn-outlined {
+        color:map-deep-get($config, #{$theme}, "ant-btn-default-color");
+        border:1px solid map-deep-get($config, #{$theme}, "ant-btn-default-border-outlined");
+        background-color: transparent;
+      }
+
       &.ant-btn-primary {
         background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");

assets/scss/common/grid.scss

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

assets/scss/common/input.scss

@@ -1,4 +1,6 @@
 .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;
   }
@@ -42,6 +44,10 @@
   legend {
     width: 0;
   }
+
+  .v-select-list {
+    padding: 0 1rem;
+  }
 }
 
 .v-input__custom {
@@ -221,6 +227,16 @@
 
   .v-application.#{$theme}-mode {
 
+    .v-input-popup__custom {
+      .v-input__slot {
+        padding-left: 12px;
+        padding-right: 12px;
+        border: 1px solid map-deep-get($config,
+          #{$theme},
+          "v-input-popup-password-border"
+        );
+      }
+    }
 
     .v-textarea {
       .v-input__slot{

assets/scss/var.scss

@@ -72,11 +72,11 @@ $config: (
     v-btn-backgroundColor: #144985,
     v-box: #212224,
     v-banner-border-color: rgba(255, 255, 255, 0.1),
-    v-treeview-node-root-backgroundColor: #18579e,
-    v-treeview-node-root-label-color: #fff,
-    v-treeview-node-root-label-active-color: #fff,
-    v-treeview-node-root-icon-color: #fff,
-    v-treeview-node-root-icon-active-color: #fff,
+    v-treeview-node-root-backgroundColor: #212224,
+    v-treeview-node-root-label-color: #FFFFFFD9,
+    v-treeview-node-root-label-active-color: #FFFFFFD9,
+    v-treeview-node-root-icon-color: #FFFFFFD9,
+    v-treeview-node-root-icon-active-color: #FFFFFFD9,
     // v-treeview-node-subroot-backgroundColor: #FFFFFF0A,
     v-treeview-node-subroot-backgroundColor: transparent,
     v-treeview-node-label-color: rgba(255, 255, 255, 0.6),
@@ -102,6 +102,7 @@ $config: (
     v-calendar-day-color: #fff,
     v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
     v-calendar-is-today-background-color: #2d4571,
+    tui-grid-title-color: #FFFFFFD9,
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
@@ -152,6 +153,7 @@ $config: (
     search-btn-background: #1668DC,
     v-btn-color-default: #FFFFFFD9,
     v-btn-bg-default: #FFFFFF2E,
+    v-input-popup-password-border: #424242,
     v-input-textarea-border: #424242,
     v-input-textarea-bg: #212224,
     v-input-textarea-color: #FFFFFFD9,
@@ -166,6 +168,9 @@ $config: (
     ant-btn-default-border:#FFFFFF2E,
     ant-btn-default-bg:#FFFFFF2E,
     ant-btn-default-color:#FFFFFFD9,
+    ant-btn-default-border-outlined:#424242,
+    btn-header-select-bg: #1F1F1F,
+    btn-header-select-color:#FFFFFFD9,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -204,11 +209,11 @@ $config: (
     // v-btn-backgroundColor: #fff,
     v-box: #FFFFFF,
     v-banner-border-color: #ddd,
-    v-treeview-node-root-backgroundColor: #4777d9,
-    v-treeview-node-root-label-color: #111,
-    v-treeview-node-root-label-active-color: #fff,
-    v-treeview-node-root-icon-color: #555,
-    v-treeview-node-root-icon-active-color: #fff,
+    v-treeview-node-root-backgroundColor: #FFFFFF,
+    v-treeview-node-root-label-color: #000000E0,
+    v-treeview-node-root-label-active-color: #000000E0,
+    v-treeview-node-root-icon-color: #000000E0,
+    v-treeview-node-root-icon-active-color: #000000E0,
     // v-treeview-node-subroot-backgroundColor: #00000005,
     v-treeview-node-subroot-backgroundColor: transparent,
     v-treeview-node-label-color: #555,
@@ -234,6 +239,7 @@ $config: (
     v-calendar-day-color: #111,
     v-calendar-day-in-not-month-color: #f8f8f8,
     v-calendar-is-today-background-color: #e3eaf3,
+    tui-grid-title-color: #000000E0,
     tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
     tui-grid-header-color: rgba(0, 0, 0, 0.88),
     tui-grid-border-horziontal-color: #e0e0e0,
@@ -282,6 +288,7 @@ $config: (
     search-btn-background: #1677FF,
     v-btn-bg-default: #00000026,
     v-btn-color-default: #000000E0,
+    v-input-popup-password-border: #D9D9D9,
     v-input-textarea-border: #D9D9D9,
     v-input-textarea-bg: #FFFFFF,
     v-input-textarea-color: #000000E0,
@@ -296,5 +303,8 @@ $config: (
     ant-btn-default-border:#00000026,
     ant-btn-default-bg:#00000026,
     ant-btn-default-color:#000000E0,
+    ant-btn-default-border-outlined:#D9D9D9,
+    btn-header-select-color:#1F1F1F,
+    btn-header-select-bg:#FFFFFF,
   ),
 );

components/common/AdminMenu.vue

@@ -27,7 +27,7 @@
       /> -->
 		</template>
 
-		<v-list class="pa-2">
+		<v-list class="pa-2 btn-close-menu-list" >
 			<!--      <v-list-item class="mb-1">-->
 			<!--        <div class="d-flex align-center">-->
 			<!--          <v-avatar class="mr-1" size="20">-->

components/common/ThemeSwitch.vue

@@ -1,9 +1,11 @@
 <template>
-	<v-switch
-		class="theme-switch"
-		v-model="mode"
-		@change="themeChange"
-	></v-switch>
+	<a-button
+		class="btn-header"
+		:color="mode ? 'dark' : 'light'"
+		@click="themeChange"
+		icon="bulb"
+	>
+  </a-button>
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex';
@@ -26,8 +28,11 @@ export default {
 			setThemeChange: 'setThemeChange',
 		}),
 		themeChange() {
+			this.mode = !this.mode;
 			this.$vuetify.theme.isDark = this.mode;
 			this.setThemeChange(this.mode);
+			console.log(this.mode)
+			console.log(this.$vuetify.theme.isDark)
 		},
 	},
 };
@@ -69,12 +74,14 @@ export default {
 			background-color: #f2f2f2;
 			top: 2px;
 			left: 0;
-			background-image: url(../../assets/images/icon/ico-theme-light.png);
+			// background-image: url(../../assets/images/icon/ico-theme-light.png);
+			content: "light";
 			background-size: 18px 18px;
 			background-position: center center;
 			background-repeat: no-repeat;
 		}
 	}
+	
 	&.v-input--is-label-active {
 		::v-deep {
 			.v-input--switch__track {
@@ -82,7 +89,8 @@ export default {
 			}
 			.v-input--switch__thumb {
 				// transform: translate(38px, 0);
-				background-image: url(../../assets/images/icon/ico-theme-dark.png);
+				// background-image: url(../../assets/images/icon/ico-theme-dark.png);
+				content: 'dark';
 			}
 		}
 	}

components/common/chartoptions/GaugeChart.js

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

components/common/chartoptions/LineChart.js

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

components/common/modal/ChangeUserPswdPopPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<v-row class="search-box" align="center" no-gutters>
-		<v-col v-if="item.label" :cols="item.cols == 12 ? 2 : 4">
+		<v-col v-if="item.label" :cols="item.labelCols !== undefined ? item.labelCols : item.cols == 12 ? 2 : 4">
 			<label for="" class="search-box-label">
 				<v-icon
 					x-small
@@ -28,10 +28,14 @@
 				></v-text-field>
 			</template>
 			<template v-else>
-				<v-btn :ripple="false" @click="dialog = !dialog">
-					<!-- <v-icon>mdi-content-save</v-icon> -->
+				<!-- <v-icon>mdi-content-save</v-icon> -->
+				<!-- <v-btn :ripple="false" @click="dialog = !dialog">
 					<span>비밀번호 {{ isPassword }}</span>
-				</v-btn>
+				</v-btn> -->
+				<a-button :ripple="false" @click="dialog = !dialog" class="ant-btn-outlined">
+					<!-- <v-icon>mdi-content-save</v-icon> -->
+					비밀번호 {{ isPassword }} 
+				</a-button>
 			</template>
 		</v-col>
 
@@ -48,7 +52,7 @@
 						</label>
 						<v-text-field
 							v-model.trim="firstPswd"
-							class="v-input__custom"
+							class="v-input-popup__custom"
 							type="password"
 							:readonly="!isFocused"
 							@focus="isFocused = true"
@@ -61,7 +65,7 @@
 						</label>
 						<v-text-field
 							v-model.trim="secondPswd"
-							class="v-input__custom"
+							class="v-input-popup__custom"
 							type="password"
 							:readonly="!isFocused"
 							@focus="isFocused = true"
@@ -72,8 +76,15 @@
 				<v-divider></v-divider>
 				<v-card-actions>
 					<v-spacer></v-spacer>
-					<v-btn color="primary" dark @click="setUpdate()">확인</v-btn>
-					<v-btn color="primary" dark @click="close()">닫기</v-btn>
+					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
+					<div>
+						 <a-button @click="close()" class="btn-default">삭제</a-button>
+						 <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
+							 확인
+						 </a-button>
+					</div>
+					<!-- <v-btn color="primary" dark @click="close()">닫기</v-btn> -->
+
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -135,8 +146,10 @@ export default {
 				} else {
 					return '';
 				}
+				console.log(value)
 			},
 			set(value) {
+				console.log(value)
 				return value;
 			},
 		},

components/common/modal/EgrpPysclQtyPop.vue

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

components/common/modal/EqpmBaseInfoPop.vue

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

components/common/modal/EqpmCalcPop.vue

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

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/pages/comm/CommCdTab.vue

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

components/pages/ems/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" :dataPath="dataPathMock" />
+        @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
     </div>
     <div ref="formParent" class="mt-4">
       <component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"

components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue

@@ -271,63 +271,6 @@ export default {
 				value: myColumns,
 			});
 
-			const res = [
-  {
-    "comId": "COM001",
-    "ercId": "ERC001",
-    "objMm": "202507",
-    "objYm": "2025-07",
-    "unitPrce": 120.5,
-    "peakPow": 450,
-    "baseChrg": 30000,
-    "notiChrg": 32500,
-    "rmrk": "Standard summer rate",
-    "blocId": "BLOC001",
-    "regUserNo": "USER001",
-    "regDttm": "2025-07-01T09:00:00",
-    "procUserNo": "USER002",
-    "procDttm": "2025-07-15T14:30:00"
-  },
-  {
-    "comId": "COM002",
-    "ercId": "ERC002",
-    "objMm": "202507",
-    "objYm": "2025-07",
-    "unitPrce": 98.75,
-    "peakPow": 300,
-    "baseChrg": 25000,
-    "notiChrg": 27000,
-    "rmrk": "Reduced rate for solar",
-    "blocId": "BLOC002",
-    "regUserNo": "USER003",
-    "regDttm": "2025-07-02T10:15:00",
-    "procUserNo": "USER004",
-    "procDttm": "2025-07-16T11:45:00"
-  },
-  {
-    "comId": "COM003",
-    "ercId": "ERC003",
-    "objMm": "202507",
-    "objYm": "2025-07",
-    "unitPrce": 110.0,
-    "peakPow": 400,
-    "baseChrg": 28000,
-    "notiChrg": 29500,
-    "rmrk": "Geothermal adjustment",
-    "blocId": "BLOC003",
-    "regUserNo": "USER005",
-    "regDttm": "2025-07-03T08:45:00",
-    "procUserNo": "USER006",
-    "procDttm": "2025-07-17T13:20:00"
-  }
-]
-
-	this.setGridData({
-				gridKey: this.gridName,
-				value: res,
-			});
-
-
 			this.loadGrid = true;
 		},
 		async btnActions(action) {

layouts/default.vue

@@ -4,7 +4,7 @@
     <fullscreen :fullscreen.sync="fullscreen">
       <div class="header">
         <v-row class="mx-0">
-          <div class="head-logo pl-4">
+          <div class="head-logo pl-4 d-flex gap-3">
             <router-link class="home" :to="myHome.root">
               <div class="lnb-logo">
                 <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
@@ -13,9 +13,11 @@
               </div>
               <!--            <div class="lnb-logo">FEMS</div>-->
             </router-link>
+            <div class="align-center d-flex">
+              <ThemeSwitch style="margin-right: 20px" />
+            </div>
           </div>
           <v-col col="1" class="d-flex justify-end py-4 px-6 flex-row" style="gap: 8px;">
-            <ThemeSwitch style="margin-right: 20px" />
             <v-menu offset-y>
               <template v-slot:activator="{ on, attrs }">
                 <a-button :ripple="false" tile class="btn-header" v-bind="attrs" v-on="on">
@@ -26,9 +28,7 @@
                   <span class="body-2">닫기</span>
                   <v-icon size="20">mdi-chevron-down</v-icon></a-button> -->
               </template>
-              <v-list class="py-2 btn-close-menu-list" :style="{
-                backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
-              }">
+              <v-list class="py-2 btn-close-menu-list">
                 <v-list-item class="px-2">
                   <v-list-item-title @click="delAllTabsData()" class="body-2">전체 닫기</v-list-item-title>
                 </v-list-item>
@@ -54,9 +54,7 @@
                   <span class="body-2">즐겨찾기</span>
                   <v-icon size="20">mdi-chevron-down</v-icon></a-button> -->
               </template>
-              <v-list v-if="myMenuList.length > 0" class="py-2 btn-close-menu-list" :style="{
-                backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
-              }">
+              <v-list v-if="myMenuList.length > 0" class="py-2 btn-close-menu-list">
                 <v-list-item v-for="item in myMenuList" :key="item.menuId" class="px-2" style="cursor: pointer">
                   <v-list-item-title @click="moveToMyMenu(item.url, item.menuId, item.prgmId)" class="body-2">{{
                     item.menuNm
@@ -67,7 +65,9 @@
             <a-button id="refresh" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
               <span class="material-icons" style="font-size: 17px">star</span>
             </a-button>
-            <a-button id="refresh" class="btn-header" @click="addBookMark" v-if="bookmarkBtn == 0">
+            <a-button id="refresh" class="btn-header" :style="{
+                    display: 'flex',
+                    alignItems: 'center'}" @click="addBookMark" v-if="bookmarkBtn == 0">
               <span class="material-icons" style="font-size: 17px">star_border</span>
             </a-button>
             <a-button
@@ -102,7 +102,9 @@
                       <img v-else src="@/assets/images/logo_lm.png" />
                     </div>
                     <!--            <div class="lnb-logo">FEMS</div>-->
+                    
                   </router-link>
+                  <ThemeSwitch style="margin-right: 20px" />
                   <v-app-bar-nav-icon ref="appbarnavicon" id="appbarnavicon" @click.stop="miniVariant = !miniVariant"
                     @click="updateTreeview" :style="{
                       backgroundColor: 'transparent',
@@ -164,7 +166,6 @@
                   <v-icon size="20" class="ml-2" v-if="closable" @click.stop="onCloseTab(to)">mdi-close</v-icon>
                 </template>
                 <template #end v-if="false">
-                  <ThemeSwitch style="margin-right: 20px" />
                   <v-menu offset-y>
                     <template v-slot:activator="{ on, attrs }">
                       <!-- <v-btn :ripple="false" tile class="btn-close" v-bind="attrs" v-on="on">
@@ -175,9 +176,7 @@
                         <span class="body-2">닫기</span>
                         <v-icon size="20">mdi-chevron-down</v-icon></a-button>
                     </template>
-                    <v-list class="py-2 btn-close-menu-list" :style="{
-                      backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
-                    }">
+                    <v-list class="py-2 btn-close-menu-list" >
                       <v-list-item class="px-2">
                         <v-list-item-title @click="delAllTabsData()" class="body-2">전체 닫기</v-list-item-title>
                       </v-list-item>
@@ -203,9 +202,7 @@
                         <span class="body-2">즐겨찾기</span>
                         <v-icon size="20">mdi-chevron-down</v-icon></a-button>
                     </template>
-                    <v-list v-if="myMenuList.length > 0" class="py-2 btn-close-menu-list" :style="{
-                      backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
-                    }">
+                    <v-list v-if="myMenuList.length > 0" class="py-2 btn-close-menu-list" >
                       <v-list-item v-for="item in myMenuList" :key="item.menuId" class="px-2" style="cursor: pointer">
                         <v-list-item-title @click="moveToMyMenu(item.url, item.menuId, item.prgmId)" class="body-2">{{
                           item.menuNm

pages/comm/auth/UserRoleMngPage.vue

@@ -4,13 +4,14 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="center" no-gutters>
+					<v-row align="end" no-gutters>
 						<v-col :cols="3">
 							<!-- 사업장 -->
 							<component
 								:is="'SelectBlocMstr'"
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
+								customClass="select-large"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -35,6 +36,7 @@
 								label="로그인ID"
 								valueNm="userLoginId"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -43,10 +45,11 @@
 								label="사용자명"
 								valueNm="userNm"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
 						<v-col :cols="3" class="text-right">
-							<BtnSearch />
+							<BtnSearch size="large"/>
 						</v-col>
 					</v-row>
 				</v-card>
@@ -76,6 +79,7 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -303,10 +307,40 @@ export default {
 	},
 	methods: {
 		async init() {
-			await this.gridInit();
+			 this.gridInit();
 		},
+
+		gridInitTest() {
+			const rowGrid = {
+				column: [
+				{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
+				{ header: '사용자명', name: 'userNm' },
+				{ header: '사용자ID', name: 'userLoginId' },
+				{ header: '사용자비밀번호', name: 'userPswd', hidden: true },
+				{ header: '사업장', name: 'blocId', hidden: true },
+				{ header: 'email', name: 'email', hidden: true },
+				{ header: '등록자NO', name: 'regUserNo', hidden: true },
+				{ header: '등록일시', name: 'regDttm', hidden: true },
+				{ header: '수정자NO', name: 'procUserNo', hidden: true },
+				{ header: '수정일시', name: 'procDttm', hidden: true },
+				{ header: 'comId', name: 'comId', hidden: true },
+				{ header: 'deptId', name: 'deptId', hidden: true },
+				],
+				data: dataMockExample,
+				defaultRow: dataMockExample,
+				option: [],
+			}
+			this.dataPathMock = {rowGrid};
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
+		},
+
 		// 사용자 리스트 그리드 세팅
 		gridInit() {
+
+			// this.gridInitTest(); return
+
 			const gridHeight = this.$refs.gridParent.offsetHeight - 90;
 
 			const myOptions = {
@@ -937,7 +971,10 @@ const myDetail = blocCdList => {
 			elseDisabled: 'I', // 선택적 disabled => rowStat 상태가 해당 값이 아닐경우 true
 			readonly: true,
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			required: false,
 			placeholder: '시스템 자동입력',
 		},
@@ -946,7 +983,10 @@ const myDetail = blocCdList => {
 			label: '사용자ID',
 			valueNm: 'userLoginId',
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			required: true,
 		},
 		{
@@ -956,7 +996,10 @@ const myDetail = blocCdList => {
 			valueNm: 'userPswd',
 			// disabled: true,
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			required: true,
 		},
 		{
@@ -964,7 +1007,10 @@ const myDetail = blocCdList => {
 			label: '사용자명',
 			valueNm: 'userNm',
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			required: true,
 		},
 		{
@@ -972,7 +1018,10 @@ const myDetail = blocCdList => {
 			label: '사업장',
 			valueNm: 'blocId',
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			list: blocCdList.map(item => ({
 				text: item.blocNm,
 				value: item.blocId,
@@ -984,7 +1033,10 @@ const myDetail = blocCdList => {
 			label: 'email',
 			valueNm: 'email',
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 		},
 		{
 			type: 'InputText',
@@ -992,7 +1044,10 @@ const myDetail = blocCdList => {
 			valueNm: 'regUserNo',
 			disabled: true,
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
 		{
@@ -1001,7 +1056,10 @@ const myDetail = blocCdList => {
 			valueNm: 'regDttm',
 			disabled: true,
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
 		{
@@ -1010,7 +1068,10 @@ const myDetail = blocCdList => {
 			valueNm: 'procUserNo',
 			disabled: true,
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
 		{
@@ -1019,7 +1080,10 @@ const myDetail = blocCdList => {
 			valueNm: 'procDttm',
 			disabled: true,
 			cols: 6,
-			class: 'py-2',
+			labelCols: 12,
+			textCols: 12,
+			class: 'py-2 pr-4',
+			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
 	];
@@ -1036,4 +1100,67 @@ function sha512(str) {
 		.update(str)
 		.digest('hex');
 }
+
+
+
+const dataMockExample = [
+  {
+    userNo: 1,
+    userNm: '홍길동',
+    userLoginId: 'hong123',
+    userPswd: 'password123',
+    blocId: 'B001',
+    email: 'hong@example.com',
+    regUserNo: 100,
+    regDttm: '2025-07-01 10:00:00',
+    procUserNo: 101,
+    procDttm: '2025-07-15 14:30:00',
+    comId: 'C001',
+    deptId: 'D001'
+  },
+  {
+    userNo: 2,
+    userNm: '김영희',
+    userLoginId: 'kimyh',
+    userPswd: 'securePass456',
+    blocId: 'B002',
+    email: 'kim@example.com',
+    regUserNo: 102,
+    regDttm: '2025-07-02 11:20:00',
+    procUserNo: 103,
+    procDttm: '2025-07-16 09:45:00',
+    comId: 'C002',
+    deptId: 'D002'
+  },
+  {
+    userNo: 3,
+    userNm: '관리자',
+    userLoginId: 'user',
+    userPswd: 'securePass456',
+    blocId: 'B002',
+    email: 'kim@example.com',
+    regUserNo: 102,
+    regDttm: '2025-07-02 11:20:00',
+    procUserNo: 103,
+    procDttm: '2025-07-16 09:45:00',
+    comId: 'C002',
+    deptId: 'D002'
+  },
+  {
+    userNo: 4,
+    userNm: '사용자',
+    userLoginId: 'admin',
+    userPswd: 'securePass456',
+    blocId: 'B002',
+    email: 'kim@example.com',
+    regUserNo: 102,
+    regDttm: '2025-07-02 11:20:00',
+    procUserNo: 103,
+    procDttm: '2025-07-16 09:45:00',
+    comId: 'C002',
+    deptId: 'D002'
+  }
+];
+
+
 </script>

pages/comm/base/CommCdMngPage.vue

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

pages/ems/base/EffcIdxMngPage.vue

@@ -16,8 +16,8 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents">
-			<v-col :cols="5" style="height:100%">
+		<v-row ref="contents" class="pt-2">
+			<v-col :cols="5" style="height:100%" class="pr-2">
 				<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>
@@ -32,7 +32,7 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" style="height:100%">
+			<v-col :cols="7" style="height:100%" class="pl-2">
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4 pa-4 pb-2">효율지표 상세
 					</v-card-title>

pages/ems/base/EnrgResourceCenterMngPage.vue

@@ -12,6 +12,7 @@
 								:textCols="12"
 								:labelCols="12"
 								:parentPrgmId="myPrgmId"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -22,6 +23,7 @@
 								dataKey="searchErcKind"
 								:sendParam="{ commGrpCd: 'EM_ERCKIND', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -34,13 +36,9 @@
 								:addAll="true"
 								:textCols="12"
 								:labelCols="12"
+								:customClass="'select-large'"
 							/>
 						</v-col>
-						<v-col :cols="3" class="text-right">
-							<BtnSearch @click="search" />
-						</v-col>
-					</v-row>
-					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
@@ -49,8 +47,11 @@
 								dataKey="searchChrgKind"
 								:sendParam="{ commGrpCd: 'EM_ENGCHAGKIND', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
@@ -59,6 +60,7 @@
 								dataKey="useFg"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -69,8 +71,14 @@
 								:textCols="12"
 								:labelCols="12"
 								:searchOption="true"
+								:customClass="'input-large'"
 							/>
 						</v-col>
+						<v-col :cols="3">
+						</v-col>
+						<v-col :cols="3" class="text-right">
+							<BtnSearch :size="'default'" @click="search" />
+						</v-col>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -323,6 +331,9 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 38,
+				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -332,12 +343,12 @@ export default {
 			const _this = this;
 			const myColumns = [
 				{ header: '회사 ID', name: 'comId', hidden: true },
-				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'center' },
+				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'left' },
 				{ header: '에너지원명', name: 'ercNm', align: 'left' },
 				{
 					header: '에너지원 유형',
 					name: 'ercKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.ercKindList.filter(
@@ -450,7 +461,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					width: 95,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -479,74 +490,24 @@ export default {
 			this.loadGrid = true;
 		},
 		async getRowGridData() {
-			let res = [
-  {
-    "comId": "COM001",
-    "ercId": "ERC001",
-    "ercNm": "LNG 가스",
-    "ercKind": "GAS",
-    "readObjId": "READ001",
-    "readPlcId": "PLC001",
-    "chrgKind": "FIXED",
-    "unitPrce": 120.5,
-    "prceFg": "1",
-    "peakPow": 500,
-    "elecContId": "EC001",
-    "elecContNm": "계약A",
-    "blocId": "BLOC001",
-    "useFg": true
-  },
-  {
-    "comId": "COM002",
-    "ercId": "ERC002",
-    "ercNm": "태양광",
-    "ercKind": "ELEC",
-    "readObjId": "READ002",
-    "readPlcId": "PLC002",
-    "chrgKind": "VARIABLE",
-    "unitPrce": 95.0,
-    "prceFg": "0",
-    "peakPow": 300,
-    "elecContId": "EC002",
-    "elecContNm": "계약B",
-    "blocId": "BLOC002",
-    "useFg": false
-  },
-  {
-    "comId": "COM003",
-    "ercId": "ERC003",
-    "ercNm": "지열",
-    "ercKind": "HEAT",
-    "readObjId": "READ003",
-    "readPlcId": "PLC003",
-    "chrgKind": "FIXED",
-    "unitPrce": 110.0,
-    "prceFg": "1",
-    "peakPow": 450,
-    "elecContId": "EC003",
-    "elecContNm": "계약C",
-    "blocId": "BLOC003",
-    "useFg": true
-  }
-]
-;
+			let res = [];
 
-			// if (this.pageData.blocMstrList.length > 0) {
-			// 	res = await this.postApiReturn({
-			// 		apiKey: 'selectErcInfo',
-			// 		resKey: 'ercInfoData',
-			// 		sendParam: {
-			// 			blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
-			// 			ercKind: this.pageData.searchErcKind,
-			// 			readObjId: this.pageData.searchReadObj,
-			// 			chrgKind: this.pageData.searchChrgKind,
-			// 			useFg: this.pageData.useFg,
-			// 			ercNmLike: this.pageData.ercNm,
-			// 		},
-			// 	});
-			// } else {
-			// 	this.setPageData({ isFind: false });
-			// }
+			if (this.pageData.blocMstrList.length > 0) {
+				res = await this.postApiReturn({
+					apiKey: 'selectErcInfo',
+					resKey: 'ercInfoData',
+					sendParam: {
+						blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
+						ercKind: this.pageData.searchErcKind,
+						readObjId: this.pageData.searchReadObj,
+						chrgKind: this.pageData.searchChrgKind,
+						useFg: this.pageData.useFg,
+						ercNmLike: this.pageData.ercNm,
+					},
+				});
+			} else {
+				this.setPageData({ isFind: false });
+			}
 			const newRes = res.map(item => {
 				const newObj = {
 					...item,
@@ -798,133 +759,8 @@ const defaultData = {
 	/* data 세팅 */
 	// 로컬 gridName 값과 동일한 이름으로 세팅
 	rowGrid: {
-		data: [
-  {
-    "comId": "COM001",
-    "ercId": "ERC001",
-    "ercNm": "LNG 가스",
-    "ercKind": "GAS",
-    "readObjId": "READ001",
-    "readPlcId": "PLC001",
-    "chrgKind": "FIXED",
-    "unitPrce": 120.5,
-    "prceFg": "1",
-    "peakPow": 500,
-    "elecContId": "EC001",
-    "elecContNm": "계약A",
-    "blocId": "BLOC001",
-    "useFg": true
-  },
-  {
-    "comId": "COM002",
-    "ercId": "ERC002",
-    "ercNm": "태양광",
-    "ercKind": "ELEC",
-    "readObjId": "READ002",
-    "readPlcId": "PLC002",
-    "chrgKind": "VARIABLE",
-    "unitPrce": 95.0,
-    "prceFg": "0",
-    "peakPow": 300,
-    "elecContId": "EC002",
-    "elecContNm": "계약B",
-    "blocId": "BLOC002",
-    "useFg": false
-  },
-  {
-    "comId": "COM003",
-    "ercId": "ERC003",
-    "ercNm": "지열",
-    "ercKind": "HEAT",
-    "readObjId": "READ003",
-    "readPlcId": "PLC003",
-    "chrgKind": "FIXED",
-    "unitPrce": 110.0,
-    "prceFg": "1",
-    "peakPow": 450,
-    "elecContId": "EC003",
-    "elecContNm": "계약C",
-    "blocId": "BLOC003",
-    "useFg": true
-  }
-],
-		column: [
-			{ header: '회사 ID', name: 'comId', hidden: true },
-				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'center' },
-				{ header: '에너지원명', name: 'ercNm', align: 'left' },
-				{
-					header: '에너지원 유형',
-					name: 'ercKind',
-					align: 'center',
-				},
-				{
-					header: '검침대상',
-					name: 'readObjId',
-					align: 'left',
-				},
-				{
-					header: '검침 개소 ID',
-					name: 'readPlcId',
-					width: 80,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '고지 유형',
-					name: 'chrgKind',
-					width: 80,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '기본단가',
-					name: 'unitPrce',
-					width: 100,
-					align: 'right',
-					hidden: true,
-				},
-				{
-					header: '단가 사용여부',
-					name: 'prceFg',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '피크 전력',
-					name: 'peakPow',
-					width: 100,
-					align: 'right',
-					hidden: true,
-				},
-				{
-					header: '전력 계약',
-					name: 'elecContId',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '전력 계약',
-					name: 'elecContNm',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '사업장',
-					name: 'blocId',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '사용 여부',
-					name: 'useFg',
-					width: 95,
-					align: 'center',
-				}
-		], // myColumns,
+		data: [],
+		column: [], // myColumns,
 		option: {}, // myOptions
 		defaultRow: {
 			comId: '',

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

@@ -29,10 +29,10 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents">
-			<v-col :cols="5" class="h100">
+		<v-row ref="contents" class="mt-3">
+			<v-col :cols="5" class="h100 pr-2">
 				<v-card class="pb-5">
-					<v-card-title class="d-flex align-center justify-space-between pa-4">
+					<v-card-title class="d-flex align-center justify-space-between pa-5">
 						물리량 리스트
 
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
@@ -44,12 +44,12 @@
 								:parentPrgmId="myPrgmId" @getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true"
 								:preventFocusChangeEventFlag="true"
-								:preventFocusChangeEventTargetGridList="editingGridList" :dataPath="dataPathExample" />
+								:preventFocusChangeEventTargetGridList="editingGridList" />
 						</div>
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100">
+			<v-col :cols="7" class="h100 pl-2">
 				<v-card class="pb-5 px-4">
 					<v-card-title class="px-0">물리량 상세</v-card-title>
 					<v-row no-gutters>
@@ -136,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" :dataPath="dataPathExample2" />
+									:parentPrgmId="myPrgmId" @getRowsData="getRowData2" />
 							</div>
 						</v-col>
 					</v-row>
@@ -223,7 +223,7 @@ export default {
 			formatterSelectList01: [],
 			formatterSelectList02: [],
 
-			loadGrid: true,
+			loadGrid: false,
 			dataPathExample: {
 				"rowGrid": {
 					data: [
@@ -279,59 +279,7 @@ export default {
 
 				}
 			},
-			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,
+			loadGrid2: false,
 			detailList: myDetail,
 
 			readOnlyValueList: [
@@ -1001,6 +949,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 
 			this.setGridOption({
@@ -1066,6 +1018,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 
 			this.setGridOption({

pages/ems/base/GdIdxMngPage.vue

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

pages/ems/base/GdStndMngPage.vue

@@ -29,7 +29,7 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" class="mt-4">
+		<v-row ref="contents" class="mt-3">
 			<v-col :cols="12" style="height: 100%">
 				<!-- <v-card class="py-5"> -->
 				<v-card style="height: 60%">
@@ -115,8 +115,8 @@
 
 				</v-card>
 
-				<v-row style="height: 40%" class="mt-4">
-					<v-col :cols="6" style="height: 100%">
+				<v-row style="height: 40%" class="mt-3">
+					<v-col :cols="6" style="height: 100%" class="pr-2">
 						<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>
@@ -126,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%">
+					<v-col :cols="6" style="height: 100%" class="pl-2">
 						<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>
@@ -201,7 +201,7 @@ export default {
 			readonlyFg: true,
 			initedFlag: false,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			detailList: myDetail,
 			selectValue01: null,
 			selectValueList01: [],
@@ -209,62 +209,62 @@ export default {
 			selectValueList02: [],
 			selectValue03: null,
 			selectValueList03: [],
-			dataPathExample: {
-				"rowGrid": {
-					data: [
+			// dataPathExample: {
+			// 	"rowGrid": {
+			// 		data: [
 
-						{
-							eqpmId: 'EQ001',
-							originEqpmId: 'ORIG001',
-							eqpmNm: '냉각기 A',
-							careStndVal: 75,
-							warnStndVal: 90,
-						},
-						{
-							eqpmId: 'EQ002',
-							originEqpmId: 'ORIG002',
-							eqpmNm: '펌프 B',
-							careStndVal: 60,
-							warnStndVal: 80,
-						},
-						{
-							eqpmId: 'EQ003',
-							originEqpmId: 'ORIG003',
-							eqpmNm: '모터 C',
-							careStndVal: 50,
-							warnStndVal: 70,
-						},
-						{
-							eqpmId: 'EQ004',
-							originEqpmId: 'ORIG004',
-							eqpmNm: '밸브 D',
-							careStndVal: 65,
-							warnStndVal: 85,
-						},
-						{
-							eqpmId: 'EQ005',
-							originEqpmId: 'ORIG005',
-							eqpmNm: '컨트롤러 E',
-							careStndVal: 55,
-							warnStndVal: 75,
-						},
+			// 			{
+			// 				eqpmId: 'EQ001',
+			// 				originEqpmId: 'ORIG001',
+			// 				eqpmNm: '냉각기 A',
+			// 				careStndVal: 75,
+			// 				warnStndVal: 90,
+			// 			},
+			// 			{
+			// 				eqpmId: 'EQ002',
+			// 				originEqpmId: 'ORIG002',
+			// 				eqpmNm: '펌프 B',
+			// 				careStndVal: 60,
+			// 				warnStndVal: 80,
+			// 			},
+			// 			{
+			// 				eqpmId: 'EQ003',
+			// 				originEqpmId: 'ORIG003',
+			// 				eqpmNm: '모터 C',
+			// 				careStndVal: 50,
+			// 				warnStndVal: 70,
+			// 			},
+			// 			{
+			// 				eqpmId: 'EQ004',
+			// 				originEqpmId: 'ORIG004',
+			// 				eqpmNm: '밸브 D',
+			// 				careStndVal: 65,
+			// 				warnStndVal: 85,
+			// 			},
+			// 			{
+			// 				eqpmId: 'EQ005',
+			// 				originEqpmId: 'ORIG005',
+			// 				eqpmNm: '컨트롤러 E',
+			// 				careStndVal: 55,
+			// 				warnStndVal: 75,
+			// 			},
 
-					],
-					column: [
-						{ header: '설비', name: 'eqpmId', align: 'left' },
-						{
-							header: 'origin설비',
-							name: 'originEqpmId',
-							align: 'center',
-							hidden: true,
-						},
-						{ header: '설비명', name: 'eqpmNm', align: 'left' },
-						{ header: '주의기준', name: 'careStndVal', align: 'right' },
-						{ header: '심각기준', name: 'warnStndVal', align: 'right' },
-					]
+			// 		],
+			// 		column: [
+			// 			{ header: '설비', name: 'eqpmId', align: 'left' },
+			// 			{
+			// 				header: 'origin설비',
+			// 				name: 'originEqpmId',
+			// 				align: 'center',
+			// 				hidden: true,
+			// 			},
+			// 			{ header: '설비명', name: 'eqpmNm', align: 'left' },
+			// 			{ header: '주의기준', name: 'careStndVal', align: 'right' },
+			// 			{ header: '심각기준', name: 'warnStndVal', align: 'right' },
+			// 		]
 
-				}
-			}
+			// 	}
+			// }
 		};
 	},
 	computed: {
@@ -408,6 +408,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -511,69 +515,69 @@ export default {
 			this.loadGrid = false;
 			let res = [];
 
-			// if (this.selectValue01 && this.selectValue02 && this.selectValue03) {
-			// 	res = await this.postApiReturn({
-			// 		apiKey: 'selectEqpmGdDetl',
-			// 		resKey: 'eqpmGdDetlData',
-			// 		sendParam: {
-			// 			gdIdxId: this.selectValue03,
-			// 		},
-			// 	});
-			// }
+			if (this.selectValue01 && this.selectValue02 && this.selectValue03) {
+				res = await this.postApiReturn({
+					apiKey: 'selectEqpmGdDetl',
+					resKey: 'eqpmGdDetlData',
+					sendParam: {
+						gdIdxId: this.selectValue03,
+					},
+				});
+			}
 
-			// // grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 시작
-			// let eqpmIdList = res.map(item => {
-			// 	return item.eqpmId;
-			// });
-			// this.setPageData({ nowGridEqpmIdList: eqpmIdList });
-			// // grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 끝
-			// const newRes = res.map(item => {
-			// 	const newObj = {
-			// 		...item,
-			// 		rowStat: null,
-			// 	};
-			// 	return newObj;
-			// });
-			const newRes = [
+			// grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 시작
+			let eqpmIdList = res.map(item => {
+				return item.eqpmId;
+			});
+			this.setPageData({ nowGridEqpmIdList: eqpmIdList });
+			// grid에서 eqpmId를 기억해서 popup에서 중복되는 값을 제거하는데 사용하기위해 저장 - 끝
+			const newRes = res.map(item => {
+				const newObj = {
+					...item,
+					rowStat: null,
+				};
+				return newObj;
+			});
+			// const newRes = [
 
 
-				{
-					eqpmId: 'EQ001',
-					originEqpmId: 'ORIG001',
-					eqpmNm: '냉각기 A',
-					careStndVal: 75,
-					warnStndVal: 90,
-				},
-				{
-					eqpmId: 'EQ002',
-					originEqpmId: 'ORIG002',
-					eqpmNm: '펌프 B',
-					careStndVal: 60,
-					warnStndVal: 80,
-				},
-				{
-					eqpmId: 'EQ003',
-					originEqpmId: 'ORIG003',
-					eqpmNm: '모터 C',
-					careStndVal: 50,
-					warnStndVal: 70,
-				},
-				{
-					eqpmId: 'EQ004',
-					originEqpmId: 'ORIG004',
-					eqpmNm: '밸브 D',
-					careStndVal: 65,
-					warnStndVal: 85,
-				},
-				{
-					eqpmId: 'EQ005',
-					originEqpmId: 'ORIG005',
-					eqpmNm: '컨트롤러 E',
-					careStndVal: 55,
-					warnStndVal: 75,
-				},
+			// 	{
+			// 		eqpmId: 'EQ001',
+			// 		originEqpmId: 'ORIG001',
+			// 		eqpmNm: '냉각기 A',
+			// 		careStndVal: 75,
+			// 		warnStndVal: 90,
+			// 	},
+			// 	{
+			// 		eqpmId: 'EQ002',
+			// 		originEqpmId: 'ORIG002',
+			// 		eqpmNm: '펌프 B',
+			// 		careStndVal: 60,
+			// 		warnStndVal: 80,
+			// 	},
+			// 	{
+			// 		eqpmId: 'EQ003',
+			// 		originEqpmId: 'ORIG003',
+			// 		eqpmNm: '모터 C',
+			// 		careStndVal: 50,
+			// 		warnStndVal: 70,
+			// 	},
+			// 	{
+			// 		eqpmId: 'EQ004',
+			// 		originEqpmId: 'ORIG004',
+			// 		eqpmNm: '밸브 D',
+			// 		careStndVal: 65,
+			// 		warnStndVal: 85,
+			// 	},
+			// 	{
+			// 		eqpmId: 'EQ005',
+			// 		originEqpmId: 'ORIG005',
+			// 		eqpmNm: '컨트롤러 E',
+			// 		careStndVal: 55,
+			// 		warnStndVal: 75,
+			// 	},
 
-			]
+			// ]
 			this.setGridData({
 				gridKey: this.gridName,
 				value: newRes,

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" :dataPath="dataPathMock"
+                  @getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
                   :selectedRowDataWatchFlag="true" />
               </div>
             </div>

pages/ems/effc/EnrgEffcTotSummPage.vue

@@ -195,68 +195,51 @@ export default {
       });
     },
     async getEqpmKind() {
-      // let res = await this.postApiReturn({
-      //   apiKey: "selectEqpmKindCodeList",
-      //   resKey: "eqpmKindCodeLists",
-      //   sendParam: {},
-      // });
+			let res = await this.postApiReturn({
+				apiKey: 'selectEqpmKindCodeList',
+				resKey: 'eqpmKindCodeLists',
+				sendParam: {},
+			});
 
-      let res = [
-        {
-          eqpmKindId: "냉동기저온",
-          eqpmKindNm: "냉동기저온",
-        },
-        {
-          eqpmKindId: "냉동기고온",
-          eqpmKindNm: "냉동기고온",
-        },
-      ];
-
-      if (res.length > 0) {
-        this.selectValueList01 = await res.map((item) => {
-          return {
-            // text: item.eqpmKindNm,
-            label: item.eqpmKindNm,
-            value: item.eqpmKindId,
-          };
-        });
-        this.selectValue01 = this.selectValueList01[0].value;
-      } else {
-        this.selectValueList01 = [];
-        this.selectValue01 = null;
-      }
-      this.setPageData({
-        eqpmKindList: this.selectValueList01,
-        eqpmKindId: this.selectValue01,
-      });
-    },
+			if (res.length > 0) {
+				this.selectValueList01 = await res.map(item => {
+					return {
+						text: item.eqpmKindNm,
+						value: item.eqpmKindId,
+					};
+				});
+				this.selectValue01 = this.selectValueList01[0].value;
+			} else {
+				this.selectValueList01 = [];
+				this.selectValue01 = null;
+			}
+			this.setPageData({
+				eqpmKindList: this.selectValueList01,
+				eqpmKindId: this.selectValue01,
+			});
+		},
     gridInit() {},
     getRowGridData() {},
     async getData() {
-      //   let res = await this.postApiReturn({
-      //     apiKey: "selectEnrgEffcTotSumm",
-      //     resKey: "totSummData",
-      //     sendParam: {
-      //       fromDt: this.pageData.fromDt,
-      //       eqpmKindId: this.selectValue01,
-      //     },
-      //   });
-      let res = ["aaa", "bbb"];
-      await this.getChartData(res);
+			let res = await this.postApiReturn({
+				apiKey: 'selectEnrgEffcTotSumm',
+				resKey: 'totSummData',
+				sendParam: {
+					fromDt: this.pageData.fromDt,
+					eqpmKindId: this.selectValue01,
+				},
+			});
 
-      //   this.selectData = res.filter((item, i) => {
-      //     return (
-      //       res.findIndex((item2, j) => {
-      //         return item.eqpmGrpId === item2.eqpmGrpId;
-      //       }) === i
-      //     );
-      //   });
+			await this.getChartData(res);
 
-      this.selectData = [
-        { eqpmGrpId: "G001", eqpmGrpNm: "Group A", otherProp: "..." },
-        { eqpmGrpId: "G002", eqpmGrpNm: "Group B", otherProp: "..." },
-      ];
-    },
+			this.selectData = res.filter((item, i) => {
+				return (
+					res.findIndex((item2, j) => {
+						return item.eqpmGrpId === item2.eqpmGrpId;
+					}) === i
+				);
+			});
+		},
     barClick(event, chartName) {
       var data = {};
       if (chartName == "card") {
@@ -291,52 +274,40 @@ export default {
       });
     },
     async getChartData(data) {
-      var chartDataObj = {};
-      this.objList = {};
-      // let res = await this.postApiReturn({
-      //   apiKey : 'selectEnrgEffcTotSumm',
-      //   resKey : 'totSummData',
-      //   sendParam:{
-      //     fromDt  : this.pageData.fromDt,
-      //     eqpmKindId : this.pageData.eqpmKindId,
-      //   }
-      // });
+			var chartDataObj = {};
+			this.objList = {};
+			// let res = await this.postApiReturn({
+			//   apiKey : 'selectEnrgEffcTotSumm',
+			//   resKey : 'totSummData',
+			//   sendParam:{
+			//     fromDt  : this.pageData.fromDt,
+			//     eqpmKindId : this.pageData.eqpmKindId,
+			//   }
+			// });
 
-      //   data.map((item) => {
-      //     if (chartDataObj[item.eqpmGrpId] != null) {
-      //       chartDataObj[item.eqpmGrpId].push(item);
-      //     } else {
-      //       chartDataObj[item.eqpmGrpId] = [item];
-      //     }
-      //   });
+			data.map(item => {
+				if (chartDataObj[item.eqpmGrpId] != null) {
+					chartDataObj[item.eqpmGrpId].push(item);
+				} else {
+					chartDataObj[item.eqpmGrpId] = [item];
+				}
+			});
 
-      chartDataObj = {
-        group1: [
-          { fabNm: "Fab A", okCnt: 120, ngCnt: 30 },
-          { fabNm: "Fab B", okCnt: 150, ngCnt: 20 },
-          { fabNm: "Fab C", okCnt: 100, ngCnt: 50 },
-        ],
-        group2: [
-          { fabNm: "Fab D", okCnt: 180, ngCnt: 10 },
-          { fabNm: "Fab E", okCnt: 160, ngCnt: 25 },
-          { fabNm: "Fab F", okCnt: 140, ngCnt: 35 },
-        ],
-      };
+			// chartDataObj.keys()[0]
+			var i = 0;
+			for (var x of Object.keys(chartDataObj)) {
+				this.loadChartList.push(false);
+				i++;
+				this.objList['chart_0' + i] = chartDataObj[x];
+				this.chartNameList.push('chart_0' + i);
+				this.setPageData({
+					[this.chartNameList[i - 1]]: Utility.defaultChartOption(true),
+				});
 
-      // chartDataObj.keys()[0]
-      var i = 0;
-      for (var x of Object.keys(chartDataObj)) {
-        this.loadChartList.push(false);
-        i++;
-        this.objList["chart_0" + i] = chartDataObj[x];
-        this.chartNameList.push("chart_0" + i);
-        this.setPageData({
-          [this.chartNameList[i - 1]]: Utility.defaultChartOption(true),
-        });
-        this.setChartData(chartDataObj[x], i);
-      }
-      // this.setChartData(chartDataObj[Object.keys(chartDataObj)[0]]);
-    },
+				this.setChartData(chartDataObj[x], i);
+			}
+			// this.setChartData(chartDataObj[Object.keys(chartDataObj)[0]]);
+		},
     async setChartData(data, number) {
       this.loadChartList[number - 1] = false;
       let xAxisData = [];

pages/ems/effc/EnrgReptMngPage.vue

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

pages/login/index.vue

@@ -275,11 +275,11 @@ export default {
 			}
 		}
 		.v-btn {
-			@if $theme == dark {
-				background-color: #18579e;
-			} @else {
-				background-color: #3f4d7d;
-			}
+			// @if $theme == dark {
+			// 	background-color: #18579e;
+			// } @else {
+			// 	background-color: #3f4d7d;
+			// }
 		}
 	}
 }