hotfix grid

Reviewed-on: #15

assets/scss/common.scss

@@ -12,8 +12,7 @@
 
 html,
 body {
-  overflow: auto;
+  // overflow: auto;
-
 }
 
 a {
@@ -119,7 +118,7 @@ a {
 .v-main,
 .v-main__wrap,
 .container {
-  height: 100%;
+  // height: 100%;
 }
 
 .v-main__wrap>.container {
@@ -144,7 +143,9 @@ a {
   }
 
   & .router-tab__container {
-    min-height: calc(100% - 72px);
+    overflow-y: auto;
+    height: calc(100vh - 105px);
+    max-height: calc(100vh - 105px);
     padding: 20px;
   }
 
@@ -484,6 +485,10 @@ a {
 
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
+      .menu-container {
+        max-height:calc(100vh - 60px);
+        overflow-y: auto;
+      }
     }
 
     .v-icon {
@@ -529,8 +534,6 @@ a {
       }
     }
 
-
-
     .router-tab {
       .router-tab__header {
         background-color: map-deep-get($config, #{$theme}, "router-header");

assets/scss/common/button.scss

@@ -92,9 +92,12 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
+    .searchFilter{
       .search-button {
+        height: 40px;
         color: map-deep-get($config, #{$theme}, "search-btn-color");
       }
+    }
      
     .v-dialog {
       .ant-btn-icon-only {
@@ -118,6 +121,9 @@
         background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         color:map-deep-get($config, #{$theme}, "ant-btn-primary-color");
+        &.ant-btn-background-ghost{
+          color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
+        }
       }
 
       &.ant-btn-default {
@@ -132,6 +138,15 @@
           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");
+          }
+        }
+      }
     }
   }
 }
@@ -159,3 +174,12 @@
     background:none;
   }
 }
+.ant-btn  {
+  &.expand-btn {
+    .v-icon {
+      span {
+        margin-right: 8px;
+      }
+    }
+  }
+}

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/text.scss

@@ -63,6 +63,12 @@
   line-height: 1.25 !important;
 }
 
+.custom-title-7 {
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  line-height: 22px !important;
+}
+
 .custom-title-8 {
   font-size: 0.75rem !important;
   font-weight: 700 !important;
@@ -76,15 +82,15 @@
 
 .custom-text-2 {
   opacity: 0.6;
-  font-family: SpoqaHanSansNeo;
   font-size: 14px;
-  font-weight: normal;
-  font-stretch: normal;
-  font-style: normal;
   line-height: 2.17;
-  letter-spacing: normal;
+  // font-weight: normal;
-  text-align: right;
+  // font-stretch: normal;
-  color: #fff;
+  // font-style: normal;
+  // letter-spacing: normal;
+  // text-align: right;
+  // color: #fff;
+  // font-family: SpoqaHanSansNeo;
 }
 
 .text-color--white-0 {
@@ -113,6 +119,14 @@
       color: map-deep-get($config, #{$theme}, "h1-title");
     }
 
+
+    .custom-subtitle-tab {
+      font-size: 1.25rem !important;
+      font-weight: 600 !important;
+      line-height: 1.25 !important;
+      color: map-deep-get($config, #{$theme}, "subtitle-tab");
+    }
+
     .v-dialog {
       .custom-title-4 {
         font-size: 16px !important;

assets/scss/var.scss

@@ -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,
@@ -170,6 +171,7 @@ $config: (
     ant-btn-default-border-outlined:#424242,
     btn-header-select-bg: #1F1F1F,
     btn-header-select-color:#FFFFFFD9,
+    subtitle-tab: #FFFFFFA6,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -238,6 +240,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,
@@ -304,5 +307,6 @@ $config: (
     ant-btn-default-border-outlined:#D9D9D9,
     btn-header-select-color:#1F1F1F,
     btn-header-select-bg:#FFFFFF,
+    subtitle-tab: #000000A6,
   ),
 );

components/common/Chart.vue

@@ -351,25 +351,25 @@ export default {
 						tmpChrtOp.color = light_Col;
 					}
 				}
-				console.log('ops11:',tmpChrtOp)
+				// console.log('ops11:',tmpChrtOp)
 				return tmpChrtOp;
 			},
 		}),
 	},
 	created() {
-		console.log('wd data:',this.widgetData)
+		// console.log('wd data:',this.widgetData)
 	},
 	methods: {
 		onClick(event, instance, ECharts) {
-			console.log('onClick : ', event);
+			// console.log('onClick : ', event);
 			this.$emit('click', event);
 		},
 		onDblClick(event, instance, ECharts) {
-			console.log('onDblClick : ', event);
+			// console.log('onDblClick : ', event);
 			this.$emit('dblclick', event);
 		},
 		onRightClick(event, instance, ECharts) {
-			console.log('onRightClick : ', event);
+			// console.log('onRightClick : ', event);
 			this.$emit('rclick', event);
 		},
 		onLegendSelect(params) {

components/common/Datepicker.vue

@@ -30,7 +30,7 @@
 					<img :src="arrowIcon" alt="">
 				</div>
 				<v-text-field
-					v-if="isRange"
+					v-show="isRange"
 					id="endpicker"
 					ref="endpicker"
 					v-model="toDtValue"
@@ -47,9 +47,6 @@
 					</template>
 				</v-text-field>
 			</div>
-			<!-- test -->
-			<!-- <a-button @click="onOpenDatepicker()">Open</a-button> -->
-			<!-- end test -->
 		</v-col>
 	</v-row>
 </template>

components/common/Grid.vue

@@ -163,7 +163,7 @@ export default {
 	},
 	created() {},
 	async mounted() {
-		console.log('--------------DEBUG----gridData: ', this.gridData);
+		// console.log('--------------DEBUG----gridData: ', this.gridData);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
@@ -666,6 +666,8 @@ export default {
       store.dimension.offsetLeft = offsetLeft;
     },
 		setHeight(_a,height){
+			return; // setting auto height
+			
       // console.log("setHeight");
       var dimension = _a.dimension;
       var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;

components/common/button/ActionButtons.vue

@@ -3,8 +3,7 @@
 		<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')">
 			<v-icon>mdi-chevron-right</v-icon>
 		</v-btn> -->
-		<a-button type="default" @click="btnActionsFnc('addLeftToRight')">
+		<a-button @click="btnActionsFnc('addLeftToRight')" type="primary" ghost icon="right" >
-			<RightOutlines/>
 		</a-button>
 
 		<!--<v-btn
@@ -16,8 +15,7 @@
 		>
 			<v-icon>mdi-chevron-left</v-icon>
 		</v-btn> -->
-		<a-button class="mt-2" type="default" @click="btnActionsFnc('removeRightToLeft')">
+		<a-button class="mt-2" @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost icon="left">
-			<LeftOutlines/>
 		</a-button>
 	</div>
 </template>

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/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/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> -->
+					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
-					<!-- <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" icon="delete" type="danger" ghost danger
+					<a-button v-if="item.closeBtnFg || false" :ripple="false"  type="danger" ghost danger
-						@click="deleteBtnAction($event)">삭제</a-button>
+						@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({
+			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();
@@ -388,44 +386,35 @@ 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/EnrgUsePlanModiPop.vue

@@ -318,7 +318,7 @@ export default {
 		// }
 	},
 	mounted(){
-		this.initTest(); return;
+		// this.initTest(); return;
 	},
 	methods: {
 		...mapMutations({
@@ -478,10 +478,6 @@ export default {
 			// })
 		},
 		async setChart(){
-			// test
-			this.initTestChart(); return;
-			// end test
-
 			this.loadChart = false;
 			let xAxisData = [];
 			let seriesData = [];

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-icon v-if="item.iconShow" small
-					v-if="item.iconShow"
+					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
-					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"
+							<component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12"
-								:propsValue="selectValue01" :itemList="selectValueList01" :label="'설비그룹'"
+								:iconShow="true" :propsValue="selectValue01" :itemList="selectValueList01"
-								@update:propsValue="selectValue01 = $event" :readonly="item.openMode == undefined
+								:label="'설비그룹'" @update:propsValue="selectValue01 = $event" :readonly="item.openMode == undefined
 									? openMode
 									: item.openMode == 'ALL'
 										? false
@@ -47,9 +43,9 @@
 										물리량명
 									</label>
 								</v-col>
-								<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom"
+								<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom" outlined
-										outlined :hide-details="true" v-model="searchWord"
+										:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
-										@keyup.enter="search"><template v-slot:append>
+											v-slot:append>
 											<!-- Custom SVG icon -->
 											<v-icon>$icoSearch</v-icon>
 
@@ -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" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
-					<a-button :ripple="false" type="primary" @click="dialogOpenCloseEvent(dialog)"
+					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
-						class="mr-2">닫기</a-button>
+
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -274,36 +270,30 @@ 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();
@@ -341,33 +331,25 @@ 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;
-			// }
-			// grid와 popup eqpmId 값 중복되는 것 제거하는 로직 - 끝
-
-			const res = [
-				{
-					'eqpmId': 'PYSCL00001',
-					'eqpmNm': 'AMP_1A',
 
+			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 값 중복되는 것 제거하는 로직 - 끝
 
 			this.setModalGridData({
 				modalKey: this.myModalKey,
@@ -441,9 +423,9 @@ export default {
 			//   this.dialog = false;
 			//   return;
 			// }
-			// if (this.myBindingData.length <= 0) {
+			if (this.myBindingData.length <= 0) {
-			// 	return alert('설비상세 리스트를 먼저 선택해주세요.');
+				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>
+					<a-button :ripple="false"  @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
-					<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)">닫기</v-btn> -->
+					<a-button :ripple="false" type="primary" @click="setUpdate($event)" >확인</a-button>
-					<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>
@@ -306,38 +304,22 @@ 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) {
+				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/modal/EvtObjPop.vue

@@ -7,12 +7,15 @@
 				{{ option.labelContent }}
 			</label>
 		</v-col>
-		<v-col :cols="option.textCols">
+		<v-col :cols="option.textCols" class="py-0">
-			<v-text-field readonly v-model="selectValue" append-icon="mdi-magnify" 
+			<v-text-field readonly append-icon="" class="v-input__custom" outlined :hide-details="true"
-			  :class="['v-select__custom', customClass]"
+				v-model="searchWord" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
-				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true"
+				:required="item.required || false"><template v-slot:append>
-				:required="item.required || false"></v-text-field>
+					<!-- Custom SVG icon -->
-			<!-- :disabled="item.disabled || false" -->
+					<v-icon>$icoSearch</v-icon>
+
+
+				</template></v-text-field>
 		</v-col>
 
 		<v-dialog v-model="dialog" scrollable width="1000px">
@@ -21,10 +24,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="pa-5" no-gutters>
+				<v-row align="end" class="px-5 pb-3" no-gutters>
 					<v-col :cols="2.5" class="mr-2">
 						<v-row>
-							<v-col :cols="2">
+							<v-col :cols="12" class="py-0">
 								<label for="" class="search-box-label">
 									<!-- <v-icon small 
 									:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
@@ -32,28 +35,30 @@
 									검색
 								</label>
 							</v-col>
-							<v-col :cols="12">
+							<v-col :cols="11" class="py-0 pr-3">
-								<v-text-field append-icon="mdi-magnify" class="v-input__custom" outlined :hide-details="true"
+								<v-text-field append-icon="mdi-magnify" class="v-input__custom" outlined
-									v-model="searchWord" @keyup.enter="search"></v-text-field>
+									:hide-details="true" 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'">
+				<div :style="'height: 600px'" class="px-5">
 					<!-- <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" @getRowsData="getRowData"
+							:dataPath="searchParam.modalData2.evtObjPop" :parentPrgmId="parentPrgmId"
-							@dblClick="setUpdate($event)" />
+							@getRowsData="getRowData" @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" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
+					<a-button type="default" class="mr-2" :ripple="false"
+						@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,12 +37,11 @@
 					<v-row align="center">
 						<v-col v-if="label" cols="12" class="py-0">
 							<label for="" class="search-box-label">
-								<v-icon small
+								<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
-									:class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
 								{{ item.label }}
 							</label>
 						</v-col>
-						<v-col :cols="label ? 6 : ''" class="py-0">
+						<v-col :cols="label ? 8 : ''" 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>
@@ -52,13 +51,10 @@
 
 								</template></v-text-field>
 						</v-col>
-						<v-spacer></v-spacer>
+						<!-- <v-spacer></v-spacer> -->
-						<v-col cols="3" class="text-right">
+						<v-col cols="2" class="text-right">
-							<v-btn :ripple="false" icon tile @click="btnTreeExpand()">
+							<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
-								<!-- {{ 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> -->
@@ -66,6 +62,10 @@
               <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: 500px">
+					<div ref="treeGridParent" style="height: 450px">
 						<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="setUpdate()" class="mr-2">확인</a-button>
+					<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
-					<a-button :ripple="false" type="primary" @click="dialog = false" class="mr-2">닫기</a-button>
+					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -155,7 +155,7 @@ export default {
 
 			myModalKey: 'selectReadObjListTree',
 			gridNameTree: 'treeGrid',
-			loadGrid: true,
+			loadGrid: false,
 
 			dialog: false,
 			treeData: [], // 리턴받은 원본 트리 데이터
@@ -278,7 +278,7 @@ export default {
 					{
 						header: '검침개소명',
 						name: 'readPlcNm',
-						width: 370,
+						width: 300,
 						align: 'left',
 					},
 					{ header: '검침개소', name: 'name', align: 'center' },
@@ -289,73 +289,31 @@ 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 = [
+			// console.log("treeData", res)
-				{
-					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)
 			let myOptionsTree = {
 				treeColumnOptions: {
 					name: 'readPlcNm',
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 			if (this.searchParam.isMulti) {
 				myOptionsTree['rowHeaders'] = [{ type: 'checkbox' }];
@@ -373,26 +331,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;
 
 
@@ -400,7 +358,7 @@ export default {
 				modalKey: this.myModalKey,
 				gridKey: this.gridNameTree,
 				modalDataKey: this.modalDataKey,
-				value: treeData,
+				value: setTreeData.ROOT || [],
 			});
 			this.loadGrid = true;
 
@@ -540,22 +498,4 @@ 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

@@ -2,22 +2,15 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon
+				<v-icon v-if="iconShow" small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
-					v-if="iconShow"
-					small
-					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
-					>$icoBulletPoint</v-icon
-				>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<v-select v-model="selectValue" :items="searchParam[parentPrgmId].blocMstrList" label="사업장을 선택하세요"
+			<v-select v-model="selectValue" :items="searchParam[parentPrgmId].blocMstrList" 
-				item-text="blocNm" item-value="idx" append-icon="" class="v-select__custom" outlined
+				item-text="blocNm" item-value="idx" append-icon="" outlined
 				:hide-details="true" :class="['v-select__custom', customClass]">
-				<template v-slot:append>
+				<template v-slot:append><v-icon>$icoChevronDown</v-icon></template>
-					    <v-icon>$icoChevronDown</v-icon>
-					  </template>
 			</v-select>
 		</v-col>
 	</v-row>

components/common/select/SelectMttList.vue

@@ -85,6 +85,11 @@ export default {
       type: String,
       require: false,
     },
+    required: {
+      type: Boolean,
+      require: false,
+      default: false
+    },
   },
   data() {
     return {

components/common/select/selectCodeList.vue

@@ -11,9 +11,11 @@
 		<v-col :cols="label ? textCols : ''">
 			<v-select v-model="selectValue" :items="searchParam[parentPrgmId][dataKey + 'List']" item-text="commCdNm"
 				item-value="commCd" outlined :hide-details="true" append-icon=""
-				:class="['v-select__custom', customClass]"><template v-slot:append>
+				:class="['v-select__custom', customClass]">
+				<template v-slot:append>
 					<v-icon>$icoChevronDown</v-icon>
-					</template></v-select>
+				</template>
+			</v-select>
 			<!-- @change="updateBlocCode($event)" -->
 		</v-col>
 	</v-row>

components/icons/icoExpandAlt.vue

@@ -0,0 +1,6 @@
+<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/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

@@ -5,7 +5,7 @@
       <Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"
         :btnActionsFnc="btnActions" />
     </div>
-    <div ref="gridParent">
+    <div ref="gridParent" style="min-height: 30vh;">
       <Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
         @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
     </div>
@@ -66,7 +66,7 @@ export default {
   },
   data() {
     return {
-      loadGrid: true,
+      loadGrid: false,
       gridName: 'rowDataSetTagRelGrid',
       detailDataSetTagList: myDataSetTagDetail,
       dataPathMock: {
@@ -128,8 +128,6 @@ export default {
       const gridHeight = this.$refs['gridParent'].offsetHeight - 36;
 
       const myOptions = {
-        // bodyHeight: gridHeight,
-        // minBodyHeight: gridHeight,
         header: {
           height: 28,
         },
@@ -137,14 +135,9 @@ export default {
         minRowHeight: 29,
         selectionUnit: 'row',
         editingEvent: 'click',
-        // columnOptions: {
-        //   resizable: true,
-        //   minWidth: 100
-        // }
       };
       this.setGridOption({
         gridKey: this.gridName,
-        // value: myOptions
         value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
       });
 
@@ -204,16 +197,11 @@ export default {
         value: myColumns,
       });
 
+      this.$nextTick(() => {
         this.loadGrid = true;
+      })
     },
     async getRowData(data, gridName) {
-      // if (data.rowStat === 'I') {
-      // 	this.detailDataSetTagList[0].disabled = false;
-      // 	this.detailDataSetTagList[1].disabled = false;
-      // } else {
-      // 	this.detailDataSetTagList[0].disabled = true;
-      // 	this.detailDataSetTagList[1].disabled = true;
-      // }
       this.setGridSelectData({
         gridKey: gridName,
         gridSelect: true,

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -20,7 +20,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -52,7 +51,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
@@ -343,7 +342,9 @@ export default {
 				value: myColumns,
 			});
 
+			this.$nextTick(() => {
 				this.loadGrid = true;
+			});
 		},
 		async btnActions(action) {
 			let dataArr = [];

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -6,7 +6,7 @@
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
 			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" :dataPath="dataPathMock" />
+				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
 		</div>
 		<div style="min-height: calc(100vh - 900px);" class="mt-4">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailList"
@@ -41,7 +41,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmConstGrid',
 			detailList: myEqpmConstDetail,
 
@@ -232,7 +232,9 @@ export default {
 				value: myColumns,
 			});
 
+			this.$nextTick(() => {
 				this.loadGrid = true;
+			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -19,7 +19,6 @@
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 		<div style="min-height: calc(100vh - 900px);" class="mt-4">
@@ -60,7 +59,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmIaoGrid',
 			detailList: myEqpmIaoDetail,
 
@@ -297,7 +296,9 @@ export default {
 				value: myColumns,
 			});
 
+			this.$nextTick(() => {
 				this.loadGrid = true;
+			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {

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

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -4,7 +4,7 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt">검침 대상 추가 정보</span>
+			<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -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: {
@@ -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,26 +1,12 @@
 <template>
 	<div>
-		<div
+		<div class="d-flex justify-space-between">
-			class="d-flex justify-space-between"
-
-		>
 			<v-card-title class="px-0 pt-0 custom-title-4">검침개소 추가 정보</v-card-title>
-			<Buttons
+			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
-				:parentPrgmId="parentPrgmId"
-				:bindingData="gridName"
-				:btnActionsFnc="btnActions"
-			/>
 		</div>
-		<div ref="gridParent">
+		<div ref="gridParent" style="height: calc(100vh - 520px);">
-			<Grid
+			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-				:ref="gridName"
+				:editorGrid="true" :innerTabGridInfo="innerTabGridInfo" @getRowsData="getRowData" />
-				:gridName="gridName"
-				:parentPrgmId="parentPrgmId"
-				:editorGrid="true"
-				:innerTabGridInfo="innerTabGridInfo"
-				@getRowsData="getRowData"
-				:dataPath="addInfoTabData"
-			/>
 		</div>
 	</div>
 </template>
@@ -53,65 +39,65 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			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;
+			// 				// },
+			// 			},
+			// 			{
+			// 				header: '사용 여부',
+			// 				name: 'useFg',
+			// 				minWidth: 100,
+			// 				align: 'center',
+			// 				// formatter({ value }) {
+			// 				// 	value = value === true ? '1' : '0';
+			// 				// 	const newValue = _this.pageData.useFgList.filter(
+			// 				// 		item => item.commCd == value,
+			// 				// 	);
+			// 				// 	return newValue[0].commCdNm;
+			// 				// },
+			// 			},
+			// 		]
+
+			// 	}
 			// }
-							// 	return retVal;
-							// },
-						},
-						{
-							header: '사용 여부',
-							name: 'useFg',
-							minWidth: 100,
-							align: 'center',
-							// formatter({ value }) {
-							// 	value = value === true ? '1' : '0';
-							// 	const newValue = _this.pageData.useFgList.filter(
-							// 		item => item.commCd == value,
-							// 	);
-							// 	return newValue[0].commCdNm;
-							// },
-						},
-					]
-
-				}
-			}
 		};
 	},
 	computed: {
@@ -166,9 +152,9 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 37,
 				},
-				rowHeight: 29,
+				rowHeight: 37,
 				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
@@ -178,100 +164,101 @@ 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: {
-			// 		//   type: "select",
-			// 		//   options: {
-			// 		//     listItems: addInfoDataKindList
-			// 		//   }
-			// 		// }
-			// 	},
-			// 	{
-			// 		header: '숫자 값',
-			// 		name: 'addInfoNumVal',
-			// 		align: 'right',
-			// 		editor: 'text',
-			// 		hidden: true,
-			// 	},
-			// 	{
-			// 		header: '문자 값',
-			// 		name: 'addInfoTxtVal',
-			// 		align: 'left',
-			// 		editor: 'text',
-			// 		hidden: true,
-			// 	},
-			// 	{
-			// 		header: '추가 정보 값',
-			// 		name: 'addInfoVal',
-			// 		align: 'center',
-			// 		renderer: {
-			// 			type: NewCustomRenderer,
-			// 		},
 					// editor: {
-			// 			type: NewCustomEditor,
+					//   type: "select",
-			// 		},
+					//   options: {
-			// 		formatter(data) {
+					//     listItems: addInfoDataKindList
-			// 			return data.row.addInfoDataKind;
+					//   }
-			// 		},
+					// }
-			// 	},
+				},
-				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
+				{
-				// formatter({ value, row , column}) {
+					header: '숫자 값',
+					name: 'addInfoNumVal',
+					align: 'right',
+					editor: 'text',
+					hidden: true,
+				},
+				{
+					header: '문자 값',
+					name: 'addInfoTxtVal',
+					align: 'left',
+					editor: 'text',
+					hidden: true,
+				},
+				{
+					header: '추가 정보 값',
+					name: 'addInfoVal',
+					align: 'center',
+					renderer: {
+						type: NewCustomRenderer,
+					},
+					editor: {
+						type: NewCustomEditor,
+					},
+					formatter(data) {
+						return data.row.addInfoDataKind;
+					},
+				},
+				// {
+				// 	header: "추가 정보 값", name: "addInfoVal", align: "center", editor: "text",
+				// 	formatter({ value, row, column }) {
 				// 		console.log("addInfoVal row : ", row);
 				// 		console.log("addInfoVal state : ", column);
-				//   if(row.addInfoDataKind === "NUM"){
+				// 		if (row.addInfoDataKind === "NUM") {
 				// 			column.align = "right";
-				//   }else{
+				// 		} else {
 				// 			column.align = "left";
 				// 		}
 				// 		return value;
 				// 	}
-				//},
+				// },
 				/*{
 		  header: "사용여부",
 		  name: "useFg",
@@ -290,16 +277,16 @@ export default {
 			}
 		  }
 		},*/
-				// { 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;
 		},
@@ -379,7 +366,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" :dataPath="imgInfoTabData" />
+				:innerTabGridInfo="innerTabGridInfo"  />
 		</div>
-		<div ref="formParent">
+		<div ref="formParent" style="height: calc((100vh - 400px) /2);">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
 				:detailList="detailReadPlcImgList" @gridEditingFinish="gridEditingFinish" />
 		</div>
@@ -44,26 +44,9 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			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: {
@@ -120,10 +103,11 @@ 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" :dataPath="tagRelTabData" />
+				:innerTabGridInfo="innerTabGridInfo"  />
 		</div>
-		<div ref="formParent" >
+		<div class="mt-3" ref="formParent" style="height: calc((100vh - 400px) /2);">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
 				:detailList="detailReadPlcTagList" @gridEditingFinish="gridEditingFinish" />
 		</div>
@@ -46,78 +46,7 @@ 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: {

layouts/default.vue

@@ -112,13 +112,6 @@
                     }" />
                   <!-- <router-view :key="$route.fullPath"/> -->
                 </div>
-                <!--
-                  v-model="treeValue"
-                  return-object
-                  @input="treeModel"
-                  @update:active="clkTab"
-        
-                   -->
                 <AdminMenu :miniVariant="miniVariant" :userNm="this.userInfo.userNm" :comId="this.userInfo.comId" v-if="false" />
 
                 <component ref="changePswdPop" :is="'ChangePswdPop'" v-show="false" :comId="this.userInfo.comId" />
@@ -148,14 +141,6 @@
                     </button>
                   </template>
                 </v-treeview>
-                <!-- <template #append>
-                  <p
-                    class="text-caption"
-                    :style="{ letterSpacing: '-0.2px !important' }"
-                  >
-                    &copy; 2022. SK C&C all rights reserved.
-                  </p>
-                </template> -->
               </v-navigation-drawer>
             </div>
 
@@ -322,19 +307,6 @@
           </div>
         </div>
       </v-main>
-      <!-- <v-footer
-        :absolute="!fixed"
-        app
-        :class="
-          drawer
-            ? miniVariant
-              ? 'drawerFooter miniFooter'
-              : 'drawerFooter'
-            : 'full-size'
-        "
-      >
-        <span>&copy; 2022. SK C&C all rights reserved.</span>
-      </v-footer> -->
     </fullscreen>
   </v-app>
 </template>

layouts/default_bak.vue

@@ -1,809 +0,0 @@
-<template>
-	<v-app :class="`${isDarkMode ? 'dark-mode' : 'light-mode'}`">
-		<!-- <v-app :class="'light-mode'"> -->
-		<fullscreen :fullscreen.sync="fullscreen">
-			<v-navigation-drawer
-				ref="navigationdrawer"
-				:value="drawer"
-				:mini-variant="miniVariant"
-				:clipped="clipped"
-				:absolute="true"
-				mini-variant-width="60"
-				fixed
-				app
-			>
-				<div class="d-flex align-center justify-space-between py-4 px-3">
-					<router-link class="home" :to="myHome.root">
-						<div class="lnb-logo">
-							<img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
-							<img v-else src="@/assets/images/logo_lm.png" />
-						</div>
-						<!--            <div class="lnb-logo">FEMS</div>-->
-					</router-link>
-					<v-app-bar-nav-icon
-						ref="appbarnavicon"
-						id="appbarnavicon"
-						@click.stop="miniVariant = !miniVariant"
-						@click="updateTreeview"
-						:style="{
-							backgroundColor: 'transparent',
-							color: isDarkMode ? '#fff' : '#111',
-						}"
-					/>
-					<!-- <router-view :key="$route.fullPath"/> -->
-				</div>
-				<!--
-          v-model="treeValue"
-          return-object
-          @input="treeModel"
-          @update:active="clkTab"
-
-           -->
-				<AdminMenu
-					:miniVariant="miniVariant"
-					:userNm="this.userInfo.userNm"
-					:comId="this.userInfo.comId"
-				/>
-				<component
-					ref="changePswdPop"
-					:is="'ChangePswdPop'"
-					v-show="false"
-					:comId="this.userInfo.comId"
-				/>
-				<v-treeview
-					ref="treeview"
-					:active.sync="activeTree"
-					active-class="v-treeview-node--active"
-					:items="treevieItems"
-					activatable
-					hoverable
-					color="#3896ff"
-					open-on-click
-					@update:open="openNode"
-				>
-					<template slot="label" slot-scope="{ item }">
-						<button
-							:class="{ 'justify-center': miniVariant }"
-							@mouseover="doMouseOver"
-						>
-							<v-icon
-								v-if="item.lvl === 1 && menuIconKeys.includes(item.menuId)"
-								v-text="menuIconById[item.menuId]"
-								:class="{ 'mr-2': !miniVariant }"
-								size="20"
-							></v-icon>
-							<v-icon
-								v-else-if="
-									item.lvl === 1 && !menuIconKeys.includes(item.menuId)
-								"
-								:class="{ 'mr-2': !miniVariant }"
-								size="20"
-								>mdi-package-variant-closed</v-icon
-							>
-							<v-icon
-								v-else-if="item.lvl === 2"
-								:class="{ 'mr-2': !miniVariant }"
-								size="10"
-							>
-								mdi-checkbox-blank
-							</v-icon>
-							<v-icon
-								v-else-if="
-									item.lvl >= 3 && item.childeVo.length === 0 && item.url
-								"
-								:class="miniVariant === false ? 'mr-2' : ''"
-								size="9"
-							>
-								$depth3rdBulletDark
-							</v-icon>
-							<span v-if="item.url"
-								>{{ item.menuNm }}
-								<!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
-                <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> -->
-							</span>
-							<span v-else-if="!item.url">{{ item.menuNm }}</span>
-							<v-icon
-								v-if="item.lvl >= 1 && item.childeVo.length > 0 && !item.url"
-							>
-								mdi-chevron-down
-							</v-icon>
-						</button>
-					</template>
-				</v-treeview>
-				<!-- <template #append>
-					<p
-						class="text-caption"
-						:style="{ letterSpacing: '-0.2px !important' }"
-					>
-						&copy; 2022. SK C&C all rights reserved.
-					</p>
-				</template> -->
-			</v-navigation-drawer>
-			<v-main>
-				<v-container fluid>
-					<router-tab
-						ref="routerTab"
-						:tabs="treevieItems"
-						:keep-last-tab="false"
-						:contextmenu="false"
-					>
-						<template slot-scope="{ title, closable, to }">
-							<span>{{ title }}</span>
-							<v-icon
-								size="18"
-								class="ml-2"
-								v-if="closable"
-								@click.stop="onCloseTab(to)"
-								>mdi-close-circle</v-icon
-							>
-						</template>
-						<template #end>
-							<!--<ThemeSwitch />-->
-							<v-menu offset-y>
-								<template v-slot:activator="{ on, attrs }">
-									<v-btn
-										:ripple="false"
-										tile
-										class="btn-close"
-										v-bind="attrs"
-										v-on="on"
-									>
-										<span class="body-2">닫기</span>
-										<v-icon size="20">mdi-chevron-down</v-icon>
-									</v-btn>
-								</template>
-								<v-list
-									class="py-2 btn-close-menu-list"
-									:style="{
-										backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
-									}"
-								>
-									<v-list-item class="px-2">
-										<v-list-item-title @click="delAllTabsData()" class="body-2"
-											>전체 닫기</v-list-item-title
-										>
-									</v-list-item>
-									<v-list-item class="px-2">
-										<v-list-item-title
-											@click="deleteSblingsTab()"
-											class="body-2"
-											>나머지 닫기</v-list-item-title
-										>
-									</v-list-item>
-								</v-list>
-							</v-menu>
-							<v-menu offset-y>
-								<template v-slot:activator="{ on, attrs }">
-									<v-btn
-										:ripple="false"
-										tile
-										class="btn-close"
-										v-bind="attrs"
-										v-on="on"
-										style="width:100px;"
-									>
-										<span class="body-2">즐겨찾기</span>
-										<v-icon size="20">mdi-chevron-down</v-icon>
-									</v-btn>
-								</template>
-								<v-list
-									v-if="myMenuList.length > 0"
-									class="py-2 btn-close-menu-list"
-									:style="{
-										backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
-									}"
-								>
-									<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 }}</v-list-item-title
-										>
-									</v-list-item>
-								</v-list>
-							</v-menu>
-							<v-btn
-								icon
-								tile
-								:ripple="false"
-								@click="removeBookMark()"
-								v-if="bookmarkBtn == 1"
-							>
-								<span
-									class="material-icons"
-									style="font-size: 17px; vertical-align: middle;"
-									>star</span
-								>
-							</v-btn>
-							<v-btn
-								icon
-								tile
-								:ripple="false"
-								@click="addBookMark()"
-								v-if="bookmarkBtn == 0"
-							>
-								<span
-									class="material-icons"
-									style="font-size: 17px; vertical-align: middle;"
-									>star_border</span
-								>
-							</v-btn>
-							<v-btn
-								id="refresh"
-								icon
-								tile
-								:ripple="false"
-								@click="refreshTab()"
-							>
-								<v-icon>mdi-refresh</v-icon>
-							</v-btn>
-							<v-btn icon tile :ripple="false" @click="setDrawer()">
-								<v-icon>mdi-crop-free</v-icon>
-							</v-btn>
-							<!-- <v-btn icon tile :ripple="false" @click="toggle()">
-								<v-icon v-if="!fullscreen">mdi-arrow-expand-all</v-icon>
-								<v-icon v-else>mdi-arrow-collapse-all</v-icon>
-							</v-btn> -->
-						</template>
-					</router-tab>
-				</v-container>
-				<div v-if="loadingStackCnt > 0" class="loading-container">
-					<div class="loading">
-						<Fade-loader />
-					</div>
-				</div>
-			</v-main>
-			<!-- <v-footer
-        :absolute="!fixed"
-        app
-        :class="
-          drawer
-            ? miniVariant
-              ? 'drawerFooter miniFooter'
-              : 'drawerFooter'
-            : 'full-size'
-        "
-      >
-        <span>&copy; 2022. SK C&C all rights reserved.</span>
-      </v-footer> -->
-		</fullscreen>
-	</v-app>
-</template>
-
-<script>
-import { mapState, mapActions, mapMutations } from 'vuex'; // , mapActions
-import ThemeSwitch from '@/components/common/ThemeSwitch';
-import AdminMenu from '@/components/common/AdminMenu';
-import FadeLoader from 'vue-spinner/src/FadeLoader.vue';
-import ChangePswdPop from '~/components/common/modal/ChangePswdPop';
-export default {
-	components: {
-		ThemeSwitch,
-		AdminMenu,
-		FadeLoader,
-		ChangePswdPop,
-	},
-	data() {
-		return {
-			fullscreen: false,
-			activeTree: [],
-			clipped: false,
-			fixed: false,
-			miniVariant: false,
-			// activeTabIdx: "",
-			routerTabInstance: null,
-			// programIdObj: null,
-			myPrgmId: null,
-			treeValue: [],
-			menuIconById: {
-				// MNU0003: 'mdi-chart-line',
-				// MNU0004: 'mdi-alarm-light',
-				// MNU0005: 'mdi-pencil-box-outline',
-				// MNU0006: 'mdi-cog-outline',
-				MNU0002: 'mdi-monitor',
-				MNU0091: 'mdi-chart-box',
-				MNU0102: 'mdi-human-male-board-poll',
-				MNU0103: 'mdi-file-chart-outline',
-				MNU0104: 'mdi-chart-sankey-variant',
-				MNU0106: 'mdi-database-edit-outline',
-				MNU0105: 'mdi-chart-bell-curve',
-				MNU0006: 'mdi-bulletin-board',
-				MNU0007: 'mdi-cog',
-				menu2: 'mdi-monitor',
-				menu3: 'mdi-chart-box',
-				menu4: 'mdi-human-male-board-poll',
-				menu5: 'mdi-file-chart-outline',
-				menu6: 'mdi-chart-sankey-variant',
-				menu7: 'mdi-database-edit-outline',
-				menu8: 'mdi-bulletin-board',
-			},
-			isLoading: false,
-			loadingStackCnt: 0,
-			bookmarkBtn: 0,
-			myMenuList: [],
-			prgmIdList: [],
-			initPageData: {},
-			obj: {},
-			newObj: {},
-		};
-	},
-	computed: {
-		...mapState({
-			myHome: 'myHome',
-			myHomeTabItems: 'myHomeTabItems',
-			indexRoot: 'indexRoot',
-			treevieItems: 'treevieItems',
-			menuData: 'menuData',
-			menuLink: state => state.modules.menu,
-			activeMenuId: state => state.activeMenuInfo.menuId,
-			isDarkMode: 'isDarkMode',
-			drawer: state => state.drawer,
-			userInfo: state => state.userInfo,
-			pageData: 'pageData',
-		}),
-		activeTabs() {
-			if (this.routerTabInstance) {
-				return this.routerTabInstance.activeTab;
-			} else {
-				return this.myHome.root;
-			}
-		},
-		menuIconKeys() {
-			return Object.keys(this.menuIconById);
-		},
-	},
-	watch: {
-		activeTabs: {
-			// 탭 클릭시 좌측 treeview 싱크 맞추가
-			deep: true,
-			handler(value) {
-				if (value) {
-					const prgmId = value.prgmId;
-					let thisPrgmId = this.$route.query.prgmId;
-					var tmp = 0;
-					for (var i = 0; i < this.myMenuList.length; i++) {
-						if (this.myMenuList[i].prgmId == thisPrgmId) {
-							tmp = 1;
-						}
-					}
-					this.bookmarkBtn = tmp;
-					//if (thisPrgmId && this.myPrgmId && this.myPrgmId != thisPrgmId) {
-					this.myPrgmId = prgmId;
-					this.activeTree.pop(); // 기존 황성화 트리 값 삭제
-					this.activeTree.push(thisPrgmId); // 인덱스가 아닐 경우 새로 넣어줌
-					// this.$set(this.activeTree, 0, prgmId); // treeview activetree 새로 셋팅 <= 위 pop() 과 push() 로 대체
-					//}
-				}
-			},
-		},
-		activeTree: {
-			deep: true,
-			handler(newVal, oldVal) {
-				var _this = this;
-				const nv = newVal[0];
-				const ov = oldVal[0];
-				if (nv !== ov) {
-					if (!nv) {
-						// 중복클릭 시 발생 상황 기존 값을 다시 넣어줌
-						this.activeTree.push(ov);
-					} else {
-						this.myPrgmId = nv;
-						if (this.menuData[nv].url) {
-							const menuUrl = this.menuData[nv].url;
-							const menuId = this.menuData[nv].menuId;
-
-							const isCommMenu = menuUrl.indexOf('comm/');
-							const isEmsMenu = menuUrl.indexOf('ems/');
-							const isCmmsMenu = menuUrl.indexOf('cmms/');
-
-							// console.log('activeTree...');
-
-							if (isCommMenu > -1 || isEmsMenu > -1 || isCmmsMenu > -1) {
-								// console.log('activeTree if stmt1');
-								// console.log('this.isLoading : ', this.isLoading);
-								// if(this.isLoading == true){
-								// 	console.log('if isLoading stmt1');
-								// 	return;
-								// }
-								this.$router.push({
-									path: `${this.menuData[nv].url}?prgmId=${nv}`,
-								});			
-								// this.$router.beforeEach((to, from, next) => {
-								// 	if(_this.isLoading == true){
-								// 		next(false);
-								// 	}
-								// 	if (!to.matched.length) {
-								// 		next(false);
-								// 	} else {
-								// 		next();
-								// 	}
-								// });
-								var tmp = 0;
-								for (var i = 0; i < this.myMenuList.length; i++) {
-									if (this.myMenuList[i].menuId == menuId) {
-										tmp = 1;
-									}
-								}
-								this.bookmarkBtn = tmp;
-							} else {
-								// console.log('activeTree if stmt2');
-								// console.log('this.isLoading : ', this.isLoading);
-								// if(this.isLoading == true){
-								// 	console.log('if isLoading stmt2');
-								// 	return;
-								// }
-								this.$refs.routerTab.openIframe(
-									encodeURI(
-										`http://localhost:9999${this.menuData[nv].url}?prgmId=${nv}`,
-									),
-									this.menuData[nv].menuNm,
-								);
-							}
-							this.$axios.get(`${this.menuData[nv].url}?$menuId=${menuId}`);
-						} else alert('지정된 페이지 경로가 없습니다.');
-					}
-				}
-			},
-		},
-		menuData: {
-			deep: true,
-			handler(newVal, oldVal) {},
-		},
-		pageData: {
-			deep: true,
-			handler(newVal, oldVal) {
-				localStorage.setItem('pageData', JSON.stringify(this.pageData));
-				//console.log("localPageData", this.pageData);
-			},
-		},
-		// menuLink: {
-		//   deep: true,
-		//   handler() {
-		//     let prgmIdList = Object.keys(this.menuData);
-		//     let initPageData = {};
-		//     prgmIdList.forEach(item => {
-		//       let newObj = {
-		//         [item] : {}
-		//       };
-		//       initPageData = Object.assign(initPageData, newObj)
-		//     });
-		//   }
-		// }
-	},
-	created() {},
-	beforeUnmount() {
-		//window.removeEventListener('beforeunload', this.unLoadEvent);
-	},
-	async mounted() {
-		//window.addEventListener('beforeunload', this.unLoadEvent);
-		const _this = this;
-		await this.getMenu({});
-		await this.initPageDataFunc();
-		await this.selectMyMenuFunc();
-
-		this.routerTabInstance = this.$refs.routerTab;
-		if (this.$route.fullPath == '/') {
-			this.routerTabInstance.reset();
-			this.$router.replace(this.myHome.root);
-		} else if (this.$route.fullPath != this.myHome.root) {
-			this.$refs.routerTab.items.unshift(this.myHomeTabItems);
-		} else {
-			this.refreshTab();
-		}
-
-		// this.$router.beforeEach((to, from, next) => {
-		// 	_this.isLoading = true;
-		// 	// console.log('$router.beforeEach...');
-		// 	// console.log('_this.isLoading[beforeEach] : ', _this.isLoading);
-		// 	// console.log('_this.loadingStackCnt : ', _this.loadingStackCnt);
-		// 	if(_this.loadingStackCnt > 0 && _this.isLoading){
-		// 		next(false);
-		// 		// return;
-		// 	}else if (!to.matched.length){
-		// 		next(false);
-		// 	}else{
-		// 		next();
-		// 	}
-		// });
-
-		// this.$router.afterEach((to, from, failure) => {
-		// });
-
-		// 요청 인터셉터
-		this.$axios.interceptors.request.use(
-			function(config) {
-				//alert(1)
-				_this.isLoading = true;
-				if(config.url.search('Page')<0){
-					// _this.loadingStackCnt++;
-				}
-				return config;
-			},
-			function(error) {
-				// 에라 나면 로딩 끄기
-				//alert(2)
-				_this.isLoading = false;
-				// if(error.url.search('Page')<0){
-				// 	_this.loadingStackCnt--;
-				// }
-				return Promise.reject(error);
-			},
-		);
-
-		// 응답 인터셉터
-		this.$axios.interceptors.response.use(
-			function(response) {
-				_this.isLoading = false;
-				if(response.config.url.search('Page')<0){
-					_this.loadingStackCnt--;
-				}
-				//alert(3)
-				return response;
-			},
-			function(error) {
-				// 응답 에러 시에도 로딩 끄기
-				//alert(4 )
-				_this.isLoading = false;
-				// if(error.url.search('Page')<0){
-				// 	_this.loadingStackCnt--;
-				// }
-				return Promise.reject(error);
-			},
-		);
-	},
-	methods: {
-		...mapMutations({
-			setDrawer: 'setDrawer', // 사이드메뉴 접고 펼치기
-			setPageDataInit: 'setPageDataInit',
-		}),
-		...mapActions({
-			getMenu: 'modules/menu/getMenu', // 트리메뉴 가져오기
-			chkOpenTabList: 'chkOpenTabList', // 트리메뉴 클릭 시 해당 pprgmId push
-			postUpdateApi: 'modules/list/postUpdateApi',
-			postApiReturn: 'modules/list/postApiReturn',
-		}),
-		// // tabActive(id) {},
-		// clkTab(itemArr) {
-		//   console.log(itemArr[0]);
-		//   if (!itemArr[0].to) return;
-		//   this.$router.push({
-		//     path: itemArr[0].to
-		//   });
-		// },
-		toggle() {
-			this.fullscreen = !this.fullscreen;
-		},
-		refreshTab() {
-			//  console.log("현재 탭 새로고침");
-			//this.routerTabInstance.refresh();
-			this.$nuxt.refresh();
-			this.routerTabInstance.refresh();
-		},
-		delAllTabsData() {
-			// console.log("탭 전체 닫기");
-			// for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
-			//   const diffTo = this.routerTabInstance.items[i].to;
-
-			//   if (diffTo != this.myHome.root) {
-			//     this.routerTabInstance.items.splice(i, 1);
-			//   }
-			// }
-			//if(this.$router.currentRoute.fullPath != this.myHome.root){
-			if (this.routerTabInstance.items.length > 0) {
-				this.routerTabInstance.reset();
-			}
-
-			this.$router.replace(this.myHome.root);
-			//}
-		},
-		deleteSblingsTab() {
-			// console.log("탭 나머지 닫기");
-			// for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
-			//   const activeTo = this.routerTabInstance.activeTab.to;
-			//   const diffTo = this.routerTabInstance.items[i].to;
-
-			//   if (activeTo != diffTo && diffTo != this.myHome.root) {
-			//     this.routerTabInstance.items.splice(i, 1);
-			//   }
-			// }
-			if (this.routerTabInstance.items.length > 1) {
-				for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
-					const activeTo = this.routerTabInstance.activeTab.to;
-					const diffTo = this.routerTabInstance.items[i].to;
-
-					if (activeTo != diffTo && diffTo != this.myHome.root) {
-						this.routerTabInstance.close(diffTo);
-					}
-				}
-			}
-		},
-		tabScrollMove(dir) {
-			const scrollTab = this.routerTabInstance.$refs.scroll;
-			const scrollWidth =
-				scrollTab.scrollData.scrollWidth - scrollTab.scrollData.clientWidth;
-			const scrollLeft = scrollTab.scrollData.scrollLeft;
-
-			const xAxis = this.calcScroll(scrollLeft, scrollWidth, dir);
-			scrollTab.scrollTo(xAxis, 0);
-		},
-		updateTreeview() {
-			if (this.miniVariant) {
-				// sidebar 접혀져 있을 때
-				this.$refs.treeview.updateAll();
-			} else {
-				// sidebar 펼쳐져 있을 때
-			}
-		},
-		// 열려있는 노드의 key 값 리턴(선택된 값이 아님)
-		openNode(node) {
-			//console.log('onOpen');
-			if (this.miniVariant) {
-				// sidebar 접혀져 있을 때
-				if (event.currentTarget.id !== this.$refs.appbarnavicon.$refs.link.id) {
-					this.$refs.appbarnavicon.click(event);
-				}
-			} else {
-				// sidebar 펼쳐져 있을 때
-			}
-		},
-		doMouseOver: function(event) {
-			//console.log(event);
-		},
-		calcScroll(sl, sw, dir) {
-			const deScrW = 60;
-			let returnSl = 0;
-			switch (dir) {
-				case 'prev':
-					returnSl = sl - deScrW <= 0 ? 0 : sl - deScrW;
-					break;
-				case 'next':
-					returnSl = sl + deScrW >= sw ? sw : sl + deScrW;
-					break;
-				default:
-					break;
-			}
-			return returnSl;
-		},
-		initPageDataFunc() {
-			const _this = this;
-			this.prgmIdList = Object.keys(this.menuData);
-			this.initPageData = {};
-			this.prgmIdList.forEach(item => {
-				_this.obj = {};
-				if (_this.pageData[item]) {
-					_this.obj = _this.pageData[item];
-				}
-				_this.newObj = {};
-				_this.newObj = {
-					[item]: _this.obj,
-				};
-				_this.initPageData = Object.assign(
-					{},
-					_this.initPageData,
-					_this.newObj,
-				);
-			});
-			localStorage.setItem('pageData', JSON.stringify(this.initPageData));
-			this.setPageDataInit(this.initPageData);
-		},
-		onCloseTab(to) {
-			const findIndex = this.$tabs.items.findIndex(v => v.to === to);
-			const { to: next } = this.$tabs.items[findIndex - 1];
-			this.$tabs.close(to, null);
-			if (this.$router.currentRoute.fullPath != next) {
-				this.$router.replace(next);
-			}
-		},
-		async addBookMark() {
-			var params = {
-				menuId: this.activeMenuId,
-			};
-			await this.postUpdateApi({
-				apiKey: 'saveBookmark',
-				sendParam: {
-					datas: {
-						bookmarkDt: [params],
-					},
-					params: {},
-				},
-			});
-
-			const res = await this.postApiReturn({
-				apiKey: 'selectMyMenu',
-				resKey: 'menuData',
-				sendParam: {},
-			});
-
-			this.myMenuList = res;
-			this.bookmarkBtn = 1;
-		},
-		async removeBookMark() {
-			var params = {
-				menuId: this.activeMenuId,
-			};
-			await this.postUpdateApi({
-				apiKey: 'deleteBookmark',
-				sendParam: {
-					datas: {
-						bookmarkDt: [params],
-					},
-					params: {},
-				},
-			});
-
-			const res = await this.postApiReturn({
-				apiKey: 'selectMyMenu',
-				resKey: 'menuData',
-				sendParam: {},
-			});
-			this.myMenuList = res;
-			this.bookmarkBtn = 0;
-		},
-		moveToMyMenu(url, menuId, prgmId) {
-			// console.log('moveToMyMenu...');
-			// if(this.isLoading == true){
-			// 	console.log('if isLoading stmt3');
-			// 	return;
-			// }
-			this.$router.push({
-				path: url + '?prgmId=' + prgmId,
-			});
-		},
-		async selectMyMenuFunc() {
-			const headers = {
-				headers: {
-					'X-Fems-MenuId': 'MNU0001',
-				},
-			};
-			const params = { params: {} };
-			const res = await this.$axios.post(
-				'/comm/base/MenuMngCtr/selectMyMenu',
-				params,
-				headers,
-			);
-
-			this.myMenuList = res.data.dataset.menuData;
-		},
-		// unLoadEvent: function (event) {
-		//   //if (this.isLeaveSite) return;
-		//   //this.delAllTabsData();
-		//   this.$router.push({
-		//    path: this.myHome.root
-		//   });
-		//   console.log("event", event)
-		//   event.preventDefault();
-		//   event.returnValue = '';
-
-		// },
-		// treeModel(obj) {
-		//   console.log(">>> treeModel::obj = ", obj);
-		//   this.treeValue[0] = obj;
-		//   this.$refs.treeview.updateAll();
-		//   // console.log(this.$refs.treeview);
-		//   // this.$refs.treeview.activeCache = obj.id;
-		// }
-	},
-};
-</script>
-<style lang="scss" scoped>
-.loading {
-	z-index: 99;
-	position: fixed;
-	top: 50%;
-	left: 50%;
-	width: 100%;
-	height: 100%;
-	transform: translate(-50%, -50%);
-	background-color: rgba(0, 0, 0, 0.4);
-	//box-shadow: rgba(68, 67, 67, 0.9) 0 0 0 9999px;
-}
-.v-spinner {
-	top: 50%;
-	left: 50%;
-}
-</style>

layouts/default_bk.vue

@@ -1,928 +0,0 @@
-<template>
-  <v-app :class="`${isDarkMode ? 'dark-mode' : 'light-mode'}`">
-    <!-- <v-app :class="'light-mode'"> -->
-    <fullscreen :fullscreen.sync="fullscreen">
-      <v-navigation-drawer
-        ref="navigationdrawer"
-        :value="drawer"
-        :mini-variant="miniVariant"
-        :clipped="clipped"
-        :absolute="true"
-        mini-variant-width="60"
-        fixed
-        app
-      >
-        <div class="d-flex align-center justify-space-between py-4 px-3">
-          <router-link class="home" :to="myHome.root">
-            <div class="lnb-logo">
-              <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
-              <img v-else src="@/assets/images/logo_lm.png" />
-            </div>
-            <!--            <div class="lnb-logo">FEMS</div>-->
-          </router-link>
-          <v-app-bar-nav-icon
-            ref="appbarnavicon"
-            id="appbarnavicon"
-            @click.stop="miniVariant = !miniVariant"
-            @click="updateTreeview"
-            :style="{
-              backgroundColor: 'transparent',
-              color: isDarkMode ? '#fff' : '#111',
-            }"
-          />
-          <!-- <router-view :key="$route.fullPath"/> -->
-        </div>
-        <!--
-          v-model="treeValue"
-          return-object
-          @input="treeModel"
-          @update:active="clkTab"
-
-           -->
-        <AdminMenu
-          :miniVariant="miniVariant"
-          :userNm="this.userInfo.userNm"
-          :comId="this.userInfo.comId"
-        />
-        <component
-          ref="changePswdPop"
-          :is="'ChangePswdPop'"
-          v-show="false"
-          :comId="this.userInfo.comId"
-        />
-        <v-treeview
-          ref="treeview"
-          :active.sync="activeTree"
-          active-class="v-treeview-node--active"
-          :items="treevieItems"
-          activatable
-          hoverable
-          color="#3896ff"
-          open-on-click
-          @update:open="openNode"
-        >
-          <template slot="label" slot-scope="{ item }">
-            <button :class="{ 'justify-center': miniVariant }" @mouseover="doMouseOver">
-              <v-icon
-                v-if="item.lvl === 1 && menuIconKeys.includes(item.menuId)"
-                v-text="menuIconById[item.menuId]"
-                :class="{ 'mr-2': !miniVariant }"
-                size="20"
-              ></v-icon>
-              <v-icon
-                v-else-if="item.lvl === 1 && !menuIconKeys.includes(item.menuId)"
-                :class="{ 'mr-2': !miniVariant }"
-                size="20"
-                >mdi-package-variant-closed</v-icon
-              >
-              <v-icon
-                v-else-if="item.lvl === 2"
-                :class="{ 'mr-2': !miniVariant }"
-                size="10"
-              >
-                mdi-checkbox-blank
-              </v-icon>
-              <v-icon
-                v-else-if="item.lvl >= 3 && item.childeVo.length === 0 && item.url"
-                :class="miniVariant === false ? 'mr-2' : ''"
-                size="9"
-              >
-                $depth3rdBulletDark
-              </v-icon>
-              <span v-if="item.url"
-                >{{ item.menuNm }}
-                <!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
-                <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> -->
-              </span>
-              <span v-else-if="!item.url">{{ item.menuNm }}</span>
-              <v-icon v-if="item.lvl >= 1 && item.childeVo.length > 0 && !item.url">
-                mdi-chevron-down
-              </v-icon>
-            </button>
-          </template>
-        </v-treeview>
-        <!-- <template #append>
-					<p
-						class="text-caption"
-						:style="{ letterSpacing: '-0.2px !important' }"
-					>
-						&copy; 2022. SK C&C all rights reserved.
-					</p>
-				</template> -->
-      </v-navigation-drawer>
-      <v-main>
-        <v-container fluid>
-          <router-tab
-            ref="routerTab"
-            :tabs="treevieItems"
-            :keep-last-tab="false"
-            :contextmenu="false"
-          >
-            <template slot-scope="{ title, closable, to }">
-              <span>{{ title }}</span>
-              <v-icon size="18" class="ml-2" v-if="closable" @click.stop="onCloseTab(to)"
-                >mdi-close-circle</v-icon
-              >
-            </template>
-            <template #end>
-              <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">
-                    <span class="body-2">닫기</span>
-                    <v-icon size="20">mdi-chevron-down</v-icon>
-                  </v-btn> -->
-                  <a-button style="width: 80px; height: 36px" class="btn-close">
-                    <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-item class="px-2">
-                    <v-list-item-title @click="delAllTabsData()" class="body-2"
-                      >전체 닫기</v-list-item-title
-                    >
-                  </v-list-item>
-                  <v-list-item class="px-2">
-                    <v-list-item-title @click="deleteSblingsTab()" class="body-2"
-                      >나머지 닫기</v-list-item-title
-                    >
-                  </v-list-item>
-                </v-list>
-              </v-menu>
-              <v-menu offset-y>
-                <template v-slot:activator="{ on, attrs }">
-                  <!-- <v-btn
-                    :ripple="false"
-                    tile
-                    class="btn-close"
-                    v-bind="attrs"
-                    v-on="on"
-                    style="width: 100px"
-                  >
-                    <span class="body-2">즐겨찾기</span>
-                    <v-icon size="20">mdi-chevron-down</v-icon>
-                  </v-btn> -->
-                  <a-button style="width: 100px; height: 36px" class="btn-close">
-                    <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-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 }}</v-list-item-title
-                    >
-                  </v-list-item>
-                </v-list>
-              </v-menu>
-              <!-- <v-btn
-                icon
-                tile
-                :ripple="false"
-                @click="removeBookMark()"
-                v-if="bookmarkBtn == 1"
-              >
-                <span
-                  class="material-icons"
-                  style="font-size: 17px; vertical-align: middle"
-                  >star</span
-                >
-              </v-btn> -->
-
-              <a-button
-                id="refresh"
-                :style="{
-                  padding: '0',
-                  width: '36px',
-                  height: '36px',
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
-                  borderRadius: '4px', // square corners
-                }"
-                type="text"
-                @click="removeBookMark"
-                v-if="bookmarkBtn == 1"
-              >
-                <span
-                  class="material-icons"
-                  style="font-size: 17px; vertical-align: middle"
-                  >star</span
-                >
-              </a-button>
-
-              <!-- <v-btn
-                icon
-                tile
-                :ripple="false"
-                @click="addBookMark()"
-                v-if="bookmarkBtn == 0"
-              >
-                <span
-                  class="material-icons"
-                  style="font-size: 17px; vertical-align: middle"
-                  >star_border</span
-                >
-              </v-btn> -->
-
-              <a-button
-                id="refresh"
-                :style="{
-                  padding: '0',
-                  width: '36px',
-                  height: '36px',
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
-                  borderRadius: '4px', // square corners
-                }"
-                type="text"
-                @click="addBookMark"
-                v-if="bookmarkBtn == 0"
-              >
-                <span
-                  class="material-icons"
-                  style="font-size: 17px; vertical-align: middle"
-                  >star_border</span
-                >
-              </a-button>
-
-              <v-btn
-                style="
-                  background-color: white;
-                  color: #fff;
-                  border: 0.2px solid rgb(217, 217, 217);
-                "
-                id="refresh"
-                icon
-                tile
-                :ripple="false"
-                @click="refreshTab()"
-              >
-                <v-icon style="color: rgba(0, 0, 0, 0.54)">mdi-refresh</v-icon>
-              </v-btn>
-
-              <!-- <a-button
-                id="refresh"
-                :style="{
-                  padding: '0',
-                  width: '36px',
-                  height: '36px',
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
-                  borderRadius: '4px', // square corners
-                }"
-                type="text"
-                @click="refreshTab"
-              >
-                <v-icon >mdi-refresh</v-icon>
-              </a-button> -->
-
-              <!-- <a-button id="refresh" type="text" @click="setDrawer" class="icon-button">
-                    <i class="mdi mdi-crop-free" style="font-size: 20px"></i>  
-              </a-button>
-               
-              <a-button type="text" @click="setDrawer" class="icon-button">
-                    <i class="mdi mdi-crop-free" style="font-size: 20px"></i>  
-              </a-button> -->
-
-              <!-- <a-button
-                :style="{
-                  padding: '0',
-                  width: '36px',
-                  height: '36px',
-                  display: 'flex',
-                  alignItems: 'center',
-                  justifyContent: 'center',
-                  borderRadius: '4px', // square corners
-                }"
-                type="text"
-                @click="toggle"
-              >
-                <v-icon v-if="!fullscreen">mdi-arrow-expand-all</v-icon>  
-                <v-icon v-else>mdi-arrow-collapse-all</v-icon>
-              </a-button> -->
-
-              <v-btn
-                style="
-                  background-color: white;
-                  color: #fff;
-                  border: 0.2px solid rgb(217, 217, 217);
-                "
-                icon
-                tile
-                :ripple="false"
-                @click="toggle()"
-              >
-                <v-icon style="color: rgba(0, 0, 0, 0.54)" v-if="!fullscreen"
-                  >mdi-arrow-expand-all</v-icon
-                >
-                <v-icon style="color: rgba(0, 0, 0, 0.54)" v-else
-                  >mdi-arrow-collapse-all</v-icon
-                >
-              </v-btn>
-            </template>
-          </router-tab>
-        </v-container>
-        <div v-if="loadingStackCnt > 0" class="loading-container">
-          <div class="loading">
-            <Fade-loader />
-          </div>
-        </div>
-      </v-main>
-      <!-- <v-footer
-        :absolute="!fixed"
-        app
-        :class="
-          drawer
-            ? miniVariant
-              ? 'drawerFooter miniFooter'
-              : 'drawerFooter'
-            : 'full-size'
-        "
-      >
-        <span>&copy; 2022. SK C&C all rights reserved.</span>
-      </v-footer> -->
-    </fullscreen>
-  </v-app>
-</template>
-
-<script>
-import { mapState, mapActions, mapMutations } from "vuex"; // , mapActions
-import ThemeSwitch from "@/components/common/ThemeSwitch";
-import AdminMenu from "@/components/common/AdminMenu";
-import FadeLoader from "vue-spinner/src/FadeLoader.vue";
-import ChangePswdPop from "~/components/common/modal/ChangePswdPop";
-export default {
-  components: {
-    ThemeSwitch,
-    AdminMenu,
-    FadeLoader,
-    ChangePswdPop,
-  },
-  data() {
-    return {
-      fullscreen: false,
-      activeTree: [],
-      clipped: false,
-      fixed: false,
-      miniVariant: false,
-      // activeTabIdx: "",
-      routerTabInstance: null,
-      // programIdObj: null,
-      myPrgmId: null,
-      treeValue: [],
-      menuIconById: {
-        // MNU0003: 'mdi-chart-line',
-        // MNU0004: 'mdi-alarm-light',
-        // MNU0005: 'mdi-pencil-box-outline',
-        // MNU0006: 'mdi-cog-outline',
-        MNU0002: "mdi-monitor",
-        MNU0091: "mdi-chart-box",
-        MNU0102: "mdi-human-male-board-poll",
-        MNU0103: "mdi-file-chart-outline",
-        MNU0104: "mdi-chart-sankey-variant",
-        MNU0106: "mdi-database-edit-outline",
-        MNU0105: "mdi-chart-bell-curve",
-        MNU0006: "mdi-bulletin-board",
-        MNU0007: "mdi-cog",
-      },
-      isLoading: false,
-      loadingStackCnt: 0,
-      bookmarkBtn: 0,
-      myMenuList: [],
-      prgmIdList: [],
-      initPageData: {},
-      obj: {},
-      newObj: {},
-    };
-  },
-  computed: {
-    ...mapState({
-      myHome: "myHome",
-      myHomeTabItems: "myHomeTabItems",
-      indexRoot: "indexRoot",
-      treevieItems: "treevieItems",
-      menuData: "menuData",
-      menuLink: (state) => state.modules.menu,
-      activeMenuId: (state) => state.activeMenuInfo.menuId,
-      isDarkMode: "isDarkMode",
-      drawer: (state) => state.drawer,
-      userInfo: (state) => state.userInfo,
-      pageData: "pageData",
-    }),
-    activeTabs() {
-      if (this.routerTabInstance) {
-        return this.routerTabInstance.activeTab;
-      } else {
-        return this.myHome.root;
-      }
-    },
-    menuIconKeys() {
-      return Object.keys(this.menuIconById);
-    },
-  },
-  watch: {
-    activeTabs: {
-      // 탭 클릭시 좌측 treeview 싱크 맞추가
-      deep: true,
-      handler(value) {
-        if (value) {
-          const prgmId = value.prgmId;
-          let thisPrgmId = this.$route.query.prgmId;
-          var tmp = 0;
-          for (var i = 0; i < this.myMenuList.length; i++) {
-            if (this.myMenuList[i].prgmId == thisPrgmId) {
-              tmp = 1;
-            }
-          }
-          this.bookmarkBtn = tmp;
-          //if (thisPrgmId && this.myPrgmId && this.myPrgmId != thisPrgmId) {
-          this.myPrgmId = prgmId;
-          this.activeTree.pop(); // 기존 황성화 트리 값 삭제
-          this.activeTree.push(thisPrgmId); // 인덱스가 아닐 경우 새로 넣어줌
-          // this.$set(this.activeTree, 0, prgmId); // treeview activetree 새로 셋팅 <= 위 pop() 과 push() 로 대체
-          //}
-        }
-      },
-    },
-    activeTree: {
-      deep: true,
-      handler(newVal, oldVal) {
-        var _this = this;
-        const nv = newVal[0];
-        const ov = oldVal[0];
-        if (nv !== ov) {
-          if (!nv) {
-            // 중복클릭 시 발생 상황 기존 값을 다시 넣어줌
-            this.activeTree.push(ov);
-          } else {
-            this.myPrgmId = nv;
-            console.log("menu:", this.menuData);
-            if (this.menuData[nv].url) {
-              const menuUrl = this.menuData[nv].url;
-              const menuId = this.menuData[nv].menuId;
-
-              const isCommMenu = menuUrl.indexOf("comm/");
-              const isEmsMenu = menuUrl.indexOf("ems/");
-              const isCmmsMenu = menuUrl.indexOf("cmms/");
-
-              // console.log('activeTree...');
-              console.log(isEmsMenu);
-
-              if (isCommMenu > -1 || isEmsMenu > -1 || isCmmsMenu > -1) {
-                // console.log('activeTree if stmt1');
-                // console.log('this.isLoading : ', this.isLoading);
-                // if(this.isLoading == true){
-                // 	console.log('if isLoading stmt1');
-                // 	return;
-                // }
-
-                // this.$router.push({
-                //   path: `${this.menuData[nv].url}?prgmId=${nv}`,
-                // });
-
-                this.$router.replace("/").then(() => {
-                  this.$router.push({
-                    path: `${this.menuData[nv].url}?prgmId=${nv}`,
-                  });
-                });
-
-                // this.$router.beforeEach((to, from, next) => {
-                // 	if(_this.isLoading == true){
-                // 		next(false);
-                // 	}
-                // 	if (!to.matched.length) {
-                // 		next(false);
-                // 	} else {
-                // 		next();
-                // 	}
-                // });
-                var tmp = 0;
-                for (var i = 0; i < this.myMenuList.length; i++) {
-                  if (this.myMenuList[i].menuId == menuId) {
-                    tmp = 1;
-                  }
-                }
-                this.bookmarkBtn = tmp;
-              } else {
-                // console.log('activeTree if stmt2');
-                // console.log('this.isLoading : ', this.isLoading);
-                // if(this.isLoading == true){
-                // 	console.log('if isLoading stmt2');
-                // 	return;
-                // }
-                this.$refs.routerTab.openIframe(
-                  encodeURI(`http://localhost:9999${this.menuData[nv].url}?prgmId=${nv}`),
-                  this.menuData[nv].menuNm
-                );
-              }
-              this.$axios.get(`${this.menuData[nv].url}?$menuId=${menuId}`);
-            } else alert("지정된 페이지 경로가 없습니다.");
-          }
-        }
-      },
-    },
-    menuData: {
-      deep: true,
-      handler(newVal, oldVal) {},
-    },
-    pageData: {
-      deep: true,
-      handler(newVal, oldVal) {
-        localStorage.setItem("pageData", JSON.stringify(this.pageData));
-        //console.log("localPageData", this.pageData);
-      },
-    },
-    // menuLink: {
-    //   deep: true,
-    //   handler() {
-    //     let prgmIdList = Object.keys(this.menuData);
-    //     let initPageData = {};
-    //     prgmIdList.forEach(item => {
-    //       let newObj = {
-    //         [item] : {}
-    //       };
-    //       initPageData = Object.assign(initPageData, newObj)
-    //     });
-    //   }
-    // }
-  },
-  created() {
-    this.$vuetify.theme.isDark = false;
-    this.setThemeChange(false);
-  },
-  beforeUnmount() {
-    //window.removeEventListener('beforeunload', this.unLoadEvent);
-  },
-  async mounted() {
-    //window.addEventListener('beforeunload', this.unLoadEvent);
-    const _this = this;
-    await this.getMenu({});
-    await this.initPageDataFunc();
-    await this.selectMyMenuFunc();
-
-    this.routerTabInstance = this.$refs.routerTab;
-    if (this.$route.fullPath == "/") {
-      this.routerTabInstance.reset();
-      this.$router.replace(this.myHome.root);
-    } else if (this.$route.fullPath != this.myHome.root) {
-      this.$refs.routerTab.items.unshift(this.myHomeTabItems);
-    } else {
-      this.refreshTab();
-    }
-
-    this.$router.beforeEach((to, from, next) => {
-      _this.isLoading = true;
-      // console.log('$router.beforeEach...');
-      // console.log('state : ', _this.$store.state)
-      // console.log('activeActionCnt : ', _this.$store.state.activeActionCnt)
-      // console.log('_this.isLoading[beforeEach] : ', _this.isLoading);
-      // console.log('_this.loadingStackCnt : ', _this.loadingStackCnt);
-      // if(_this.loadingStackCnt > 0 && _this.isLoading && _this.$store.state.activeActionCnt > 0){
-      if (_this.loadingStackCnt > 0 && _this.isLoading) {
-        next(false);
-        // return;
-      } else if (!to.matched.length) {
-        next(false);
-      } else {
-        next();
-      }
-    });
-
-    this.$router.afterEach((to, from, failure) => {});
-
-    // 요청 인터셉터
-    this.$axios.interceptors.request.use(
-      function (config) {
-        //alert(1)
-        _this.isLoading = true;
-        if (config.url.search("Page") < 0) {
-          _this.loadingStackCnt++;
-        }
-        return config;
-      },
-      function (error) {
-        // 에라 나면 로딩 끄기
-        //alert(2)
-        _this.isLoading = false;
-        // if(error.url.search('Page')<0){
-        // 	_this.loadingStackCnt--;
-        // }
-        return Promise.reject(error);
-      }
-    );
-
-    // 응답 인터셉터
-    this.$axios.interceptors.response.use(
-      function (response) {
-        _this.isLoading = false;
-        if (response.config.url.search("Page") < 0) {
-          _this.loadingStackCnt--;
-        }
-        //alert(3)
-        return response;
-      },
-      function (error) {
-        // 응답 에러 시에도 로딩 끄기
-        //alert(4 )
-        _this.isLoading = false;
-        // if(error.url.search('Page')<0){
-        // 	_this.loadingStackCnt--;
-        // }
-        return Promise.reject(error);
-      }
-    );
-  },
-  methods: {
-    ...mapMutations({
-      setDrawer: "setDrawer", // 사이드메뉴 접고 펼치기
-      setPageDataInit: "setPageDataInit",
-      setThemeChange: "setThemeChange",
-    }),
-    ...mapActions({
-      getMenu: "modules/menu/getMenu", // 트리메뉴 가져오기
-      chkOpenTabList: "chkOpenTabList", // 트리메뉴 클릭 시 해당 pprgmId push
-      postUpdateApi: "modules/list/postUpdateApi",
-      postApiReturn: "modules/list/postApiReturn",
-    }),
-    // // tabActive(id) {},
-    // clkTab(itemArr) {
-    //   console.log(itemArr[0]);
-    //   if (!itemArr[0].to) return;
-    //   this.$router.push({
-    //     path: itemArr[0].to
-    //   });
-    // },
-    toggle() {
-      this.fullscreen = !this.fullscreen;
-    },
-    refreshTab() {
-      //  console.log("현재 탭 새로고침");
-      //this.routerTabInstance.refresh();
-      this.$nuxt.refresh();
-      this.routerTabInstance.refresh();
-    },
-    delAllTabsData() {
-      // console.log("탭 전체 닫기");
-      // for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
-      //   const diffTo = this.routerTabInstance.items[i].to;
-
-      //   if (diffTo != this.myHome.root) {
-      //     this.routerTabInstance.items.splice(i, 1);
-      //   }
-      // }
-      //if(this.$router.currentRoute.fullPath != this.myHome.root){
-      if (this.routerTabInstance.items.length > 0) {
-        this.routerTabInstance.reset();
-      }
-
-      this.$router.replace(this.myHome.root);
-      //}
-    },
-    deleteSblingsTab() {
-      // console.log("탭 나머지 닫기");
-      // for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
-      //   const activeTo = this.routerTabInstance.activeTab.to;
-      //   const diffTo = this.routerTabInstance.items[i].to;
-
-      //   if (activeTo != diffTo && diffTo != this.myHome.root) {
-      //     this.routerTabInstance.items.splice(i, 1);
-      //   }
-      // }
-      if (this.routerTabInstance.items.length > 1) {
-        for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
-          const activeTo = this.routerTabInstance.activeTab.to;
-          const diffTo = this.routerTabInstance.items[i].to;
-
-          if (activeTo != diffTo && diffTo != this.myHome.root) {
-            this.routerTabInstance.close(diffTo);
-          }
-        }
-      }
-    },
-    tabScrollMove(dir) {
-      const scrollTab = this.routerTabInstance.$refs.scroll;
-      const scrollWidth =
-        scrollTab.scrollData.scrollWidth - scrollTab.scrollData.clientWidth;
-      const scrollLeft = scrollTab.scrollData.scrollLeft;
-
-      const xAxis = this.calcScroll(scrollLeft, scrollWidth, dir);
-      scrollTab.scrollTo(xAxis, 0);
-    },
-    updateTreeview() {
-      if (this.miniVariant) {
-        // sidebar 접혀져 있을 때
-        this.$refs.treeview.updateAll();
-      } else {
-        // sidebar 펼쳐져 있을 때
-      }
-    },
-    // 열려있는 노드의 key 값 리턴(선택된 값이 아님)
-    openNode(node) {
-      //console.log('onOpen');
-      if (this.miniVariant) {
-        // sidebar 접혀져 있을 때
-        if (event.currentTarget.id !== this.$refs.appbarnavicon.$refs.link.id) {
-          this.$refs.appbarnavicon.click(event);
-        }
-      } else {
-        // sidebar 펼쳐져 있을 때
-      }
-    },
-    doMouseOver: function (event) {
-      //console.log(event);
-    },
-    calcScroll(sl, sw, dir) {
-      const deScrW = 60;
-      let returnSl = 0;
-      switch (dir) {
-        case "prev":
-          returnSl = sl - deScrW <= 0 ? 0 : sl - deScrW;
-          break;
-        case "next":
-          returnSl = sl + deScrW >= sw ? sw : sl + deScrW;
-          break;
-        default:
-          break;
-      }
-      return returnSl;
-    },
-    initPageDataFunc() {
-      const _this = this;
-      this.prgmIdList = Object.keys(this.menuData);
-      this.initPageData = {};
-      this.prgmIdList.forEach((item) => {
-        _this.obj = {};
-        if (_this.pageData[item]) {
-          _this.obj = _this.pageData[item];
-        }
-        _this.newObj = {};
-        _this.newObj = {
-          [item]: _this.obj,
-        };
-        _this.initPageData = Object.assign({}, _this.initPageData, _this.newObj);
-      });
-      localStorage.setItem("pageData", JSON.stringify(this.initPageData));
-      this.setPageDataInit(this.initPageData);
-    },
-    onCloseTab(to) {
-      const findIndex = this.$tabs.items.findIndex((v) => v.to === to);
-      const { to: next } = this.$tabs.items[findIndex - 1];
-      this.$tabs.close(to, null);
-      if (this.$router.currentRoute.fullPath != next) {
-        this.$router.replace(next);
-      }
-    },
-    async addBookMark() {
-      var params = {
-        menuId: this.activeMenuId,
-      };
-      await this.postUpdateApi({
-        apiKey: "saveBookmark",
-        sendParam: {
-          datas: {
-            bookmarkDt: [params],
-          },
-          params: {},
-        },
-      });
-
-      const res = await this.postApiReturn({
-        apiKey: "selectMyMenu",
-        resKey: "menuData",
-        sendParam: {},
-      });
-
-      // const res = [
-      //   {
-      //     comId: "abc",
-      //     upMenuId: "abc",
-      //     menuId: "dashboard",
-      //     menuNm: "abc",
-      //     url: "DashboardPage",
-      //     authCd: "yes",
-      //     lvl: 9999,
-      //     prgmId: "PRG0001",
-      //   },
-      //   {
-      //     comId: "abc",
-      //     upMenuId: "dashboard",
-      //     menuId: "test",
-      //     menuNm: "test",
-      //     url: "DashboardPage",
-      //     authCd: "yes",
-      //     lvl: 666,
-      //     prgmId: "PRG0002",
-      //   },
-      // ];
-
-      this.myMenuList = res;
-      this.bookmarkBtn = 1;
-    },
-    async removeBookMark() {
-      var params = {
-        menuId: this.activeMenuId,
-      };
-      await this.postUpdateApi({
-        apiKey: "deleteBookmark",
-        sendParam: {
-          datas: {
-            bookmarkDt: [params],
-          },
-          params: {},
-        },
-      });
-
-      const res = await this.postApiReturn({
-        apiKey: "selectMyMenu",
-        resKey: "menuData",
-        sendParam: {},
-      });
-      this.myMenuList = res;
-      this.bookmarkBtn = 0;
-    },
-    moveToMyMenu(url, menuId, prgmId) {
-      // console.log('moveToMyMenu...');
-      // if(this.isLoading == true){
-      // 	console.log('if isLoading stmt3');
-      // 	return;
-      // }
-      alert("move to", url);
-      this.$router.push({
-        path: url + "?prgmId=" + prgmId,
-      });
-    },
-    async selectMyMenuFunc() {
-      const headers = {
-        headers: {
-          "X-Fems-MenuId": "MNU0001",
-        },
-      };
-      const params = { params: {} };
-      const res = await this.$axios.post(
-        "/comm/base/MenuMngCtr/selectMyMenu",
-        params,
-        headers
-      );
-
-      this.myMenuList = res.data.dataset.menuData;
-    },
-    // unLoadEvent: function (event) {
-    //   //if (this.isLeaveSite) return;
-    //   //this.delAllTabsData();
-    //   this.$router.push({
-    //    path: this.myHome.root
-    //   });
-    //   console.log("event", event)
-    //   event.preventDefault();
-    //   event.returnValue = '';
-
-    // },
-    // treeModel(obj) {
-    //   console.log(">>> treeModel::obj = ", obj);
-    //   this.treeValue[0] = obj;
-    //   this.$refs.treeview.updateAll();
-    //   // console.log(this.$refs.treeview);
-    //   // this.$refs.treeview.activeCache = obj.id;
-    // }
-  },
-};
-</script>
-<style lang="scss" scoped>
-.loading {
-  z-index: 99;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  width: 100%;
-  height: 100%;
-  transform: translate(-50%, -50%);
-  background-color: rgba(0, 0, 0, 0.4);
-  //box-shadow: rgba(68, 67, 67, 0.9) 0 0 0 9999px;
-}
-.v-spinner {
-  top: 50%;
-  left: 50%;
-}
-</style>

mixin/global.js

@@ -58,7 +58,7 @@ export default {
 		layoutInit() {
 			if (this.$refs.searchFilter) {
 				const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
-				this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight}px)`;
+				this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight + 20}px)`;
 			}
 		},
 		//init() {}

pages/comm/auth/MenuRoleMngPage.vue

@@ -22,8 +22,7 @@
 								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="6" class="text-right">
+						<v-col class="text-right d-flex justify-end align-end mr-3">
-							<!-- <v-btn @click="test = !test">WWW</v-btn> -->
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@@ -31,8 +30,8 @@
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents" style="height: 100vh;">
+		<v-row ref="contents" >
-			<v-col cols="12" lg="2" class="h100">
+			<v-col cols="12" lg="2" >
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
@@ -53,7 +52,7 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="10" class="h100">
+			<v-col cols="12" lg="10" >
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 메뉴별 권한</span>
@@ -70,7 +69,7 @@
 								:style="{ minHeight: '36px' }"
 								>[미배정]메뉴리스트</span
 							>
-							<div class="px-5" style="height:calc(100% - 64px)">
+							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
 								<div
 									ref="treeGridParent"
 									class="w100 h100"
@@ -113,7 +112,7 @@
 									/>
 								</v-col>
 							</v-row>
-							<div class="px-5" style="height:calc(100% - 64px)">
+							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
 								<div
 									ref="treeGridParent2"
 									class="w100 h100"
@@ -403,6 +402,17 @@ export default {
 			];
 
 			const myTreeColumns = [
+				{
+					header: '',
+					name: '',
+					align: 'center',
+					width: 30,
+					formatter: (props) => {
+						return `<label class="custom-radio">
+									<span class="radio-mark"></span>
+								</label>`;
+					}
+				},
 				{
 					header: '메뉴명',
 					name: 'menuNm',
@@ -415,6 +425,17 @@ export default {
 				},
 			];
 			const myTreeColumns2 = [
+				{
+					header: '',
+					name: '',
+					align: 'center',
+					width: 30,
+					formatter: (props) => {
+						return `<label class="custom-radio">
+									<span class="radio-mark"></span>
+								</label>`;
+					}
+				},
 				{ header: '역할ID', name: 'roleId', hidden: true },
 				{ header: '메뉴ID', name: 'menuId', hidden: true },
 				{ header: '메뉴명', name: 'menuNm', minWidth: '235' },

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/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">
+						<v-col :cols="3">
-							<BtnSearch @click="search" />
+							<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/comm/base/NoticeMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
 			<v-card class="" >
@@ -14,10 +15,10 @@
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> -->
 							</div>
 						</v-col>
-						<v-col :cols="12" ref="contents" class="mt-5">
+						<v-col :cols="12" ref="contents" class="mt-5" style="min-height: calc(100% - 76px);">
-							<div ref="gridParent" class="h100 px-50">
+							<div ref="gridParent" class="px-50" style="min-height: 70vh;">
-								<component :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
+								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-									ref="noticeMngGrid" @getRowsData="getRowData" :dataPath="dataPathMock" />
+									 @getRowsData="getRowData" />
 							</div>
 						</v-col>
 					</v-row>
@@ -26,7 +27,7 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'" class="h1001">
+		<div v-if="pageActionFlag == 'view'" >
 			<v-card>
 				<v-row class="pa-5">
 					<v-col :cols="12" class="d-flex align-center justify-space-between ">
@@ -44,25 +45,25 @@
 							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12">
+					<v-col :cols="12" class="mt-5">
-						<p class="custom-title-3 mb-2"> 제목 </p>
+						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
-						<v-text-field v-model="viewActionData.title" class="v-input__custom" hide-details :readonly="true">
-						</v-text-field>
 					</v-col>
-					<v-col :cols="12" style="min-height:calc(90vh - 218px);" class="pa-5">
+					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
 						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
 							:initialValue="viewActionData.content" theme="white"
-							:class="isDarkMode ? 'theme--white' : 'theme--black'" />
+							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
 					</v-col>
-					<v-col :cols="6">
+					<v-col :cols="6" class="mt-5">
-						<p class="custom-title-3 mb-2">파일목록</p>
+						<v-card-title class="custom-title-7 pa-0">
+							파일목록
+						</v-card-title>
 						<div v-for="fileData in viewActionData.fileData" 
 							:key="fileData.apndFileId" 
 							class="file-item">
 							<a @click.prevent="downloadFile(fileData)">
-								<div class="d-flex justify-space-between search-box-label">
+								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
+									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@@ -72,28 +73,24 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'" class="h1001">
+		<div v-if="pageActionFlag == 'write'" >
 			<v-card>
 				<div class="pa-5">
 					<v-row class="pa-50">
 						<v-col :cols="12" class="">
 							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 						</v-col>
-						<v-col :cols="12" class="custom-title-4-new mt-4">
+						<v-col :cols="12" class="mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
 							<v-text-field v-model="writeActionData.title" class="v-input__custom" hide-details outlined>
 							</v-text-field>
 						</v-col>
-						<v-col :cols="12" style="min-height: calc(90vh - 270px);">
+						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
 							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
 						</v-col>
 	
-						<v-col :cols="12" class="mt-2">
+						<v-col :cols="6" class="mt-5">
-							<p class="custom-title-3 mb-2">
+							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
-								파일첨부
-							</p>
-						</v-col>
-						<v-col :cols="6">
 							<div class="" v-if="writeActionData.fileData">
 								<div 
 									v-for="(fileData, index) in writeActionData.fileData" 
@@ -129,25 +126,23 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'" class="h1001">
+		<div v-if="pageActionFlag == 'reply'" >
 			<v-card class="pa-5">
 				<v-row align="center" class="mt-0">
 					<v-col :cols="12" class="">
 						<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 					</v-col>
-					<v-col :cols="12">
+					<v-col :cols="12" class="mt-4">
-						<p class="custom-title-3 mb-2">제목</p>
+						<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
-						<v-text-field v-model="replyActionData.title" class="v-input__custom" placeholder="제목" outlined
+						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined
 							hide-details>
 						</v-text-field>
 					</v-col>
 					<v-col :cols="12" style="height: calc(100vh - 270px);" class="mt-2">
 						<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg" />
 					</v-col>
-					<v-col :cols="6" class="mt-4">
+					<v-col :cols="6" class="mt-5">
-						<p class="custom-title-3 mb-2">
+						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
-							파일첨부
-						</p>
 						<div class="" v-if="replyActionData.fileData">
 							<div 
 								v-for="(fileData, index) in replyActionData.fileData" 
@@ -175,7 +170,7 @@
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'" class="h1001">
+		<div v-if="pageActionFlag == 'update'" >
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
@@ -183,16 +178,16 @@
 							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
-							<v-text-field v-model="updateActionData.title" class="v-input__custom" placeholder="" hide-details outlined>
+							<v-text-field v-model="updateActionData.title" class="v-input__custom" hide-details outlined>
 							</v-text-field>
 						</v-col>
 						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4" >
 							<editor ref="tuiUpdateEditor" height="100%" initialEditType="wysiwyg"
 								:initialValue="updateActionData.content" />
 						</v-col>
-						<v-col :cols="6">
+						<v-col :cols="6" class="mt-5">
-								<p class="pa-0 mb-2 custom-title-4-new-1">파일첨부</p>
+								<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 								<div class="" v-if="updateActionData.fileData">
 									<div 
 										v-for="(fileData, index) in updateActionData.fileData"
@@ -266,7 +261,8 @@ export default {
 			myPrgmId: myPrgmId,
 			//comId: "SEMPIO",
 			//comId: this.userInfo.comId,
-			comId: this.$store.state.userInfo.comId,
+			// comId: this.$store.state.userInfo.comId,
+
 			bordNo: null,
 			pageActionFlag: 'list',
 			gridName: 'noticeMngGrid',
@@ -402,7 +398,6 @@ export default {
 			this.getGridData();
 		},
 		gridInit() {
-			this.loadGrid = false;
 			const gridHeight = this.$refs.contents.offsetHeight - 76;
 
 			const myOptions = {};
@@ -466,13 +461,6 @@ export default {
 				gridKey: this.gridName,
 				value: columnList,
 			});
-
-			// -----------------------TEST------------------
-			this.dataPathMock[this.gridName] = {
-				column: columnList,
-				data: dataPathDataExample,
-			}
-			// -----------------------END TEST--------------
 			this.getGridData();
 		},
 		async getGridData() {
@@ -481,22 +469,12 @@ export default {
 			};
 
 			this.loadGrid = false;
-			let res = null;
+
-			try {
+			const res = await this.postApiReturn({
-				res = await this.postApiReturn({
 				apiKey: 'selectPostList',
 				resKey: 'postData',
 				sendParam: params,
 			});
-			}
-			catch (err) { }
-			finally {
-				// -----Test mock data-------------
-				if (null === res) {
-					res = dataPathDataExample;
-				}
-				// -----End test
-			}
 			
 			this.setGridData({
 				gridKey: this.gridName,
@@ -1068,4 +1046,19 @@ const dataPathDataExample = getPathDataExample({
 		color: #1677FF;
 	}
 }
+::v-deep {
+	.v-input__slot {
+		padding-left: 8px;
+		padding-right: 8px;
+	}
+	.custom-view {
+		border: 1px solid;
+		border-radius: 6px;
+		height: 100%;
+		@each $theme in dark, light {
+			@include theme($theme);
+			border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");;
+		}
+	}
+}
 </style>

pages/comm/base/PrgmMngPage.vue

@@ -37,7 +37,7 @@
 
 		<v-row ref="contents">
 			<!-- 프로그램 리스트 -->
-			<v-col :cols="5" class="h100">
+			<v-col :cols="5" >
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">프로그램 리스트</v-card-title>
@@ -50,7 +50,7 @@
 							/>
 						</div>
 					</div>
-					<div style="min-height:calc(100% - 70px)">
+					<div style="min-height: 60vh">
 						<div ref="gridParent" class="px-5 h100">
 							<component
 								:ref="gridName"
@@ -65,7 +65,7 @@
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
-			<v-col :cols="7" class="h100">
+			<v-col :cols="7" >
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">프로그램 상세</v-card-title>

pages/ems/base/DashboardPage.vue

@@ -344,7 +344,7 @@
                 <v-row>
                   <v-col cols="auto" style="text-align: left">
                     <!-- <p class="textInfo">{{ ngDtlCnt }}</p> -->
-                    <p class="card-text-info">200</p>
+                    <p class="card-text-info">{{ ngDtlCnt }}</p>
                   </v-col>
                   <v-col :cols="3" style="text-align: left"> 건 </v-col>
                 </v-row>
@@ -369,7 +369,7 @@
                 <v-row>
                   <v-col cols="auto" style="text-align: left">
                     <!-- <p class="textInfo">{{ ngDtlSolvCnt }}</p> -->
-                    <p class="card-text-info">100</p>
+                    <p class="card-text-info">{{ ngDtlSolvCnt }}</p>
                   </v-col>
                   <v-col :cols="3" style="text-align: left"> 건 </v-col>
                 </v-row>
@@ -580,11 +580,7 @@ export default {
     Chart,
     UnusedStatPopPage,
     EtcStatPopPage,
-    BtnSearch,
+    PageTitle
-    AntCard,
-    CheckBox,
-    RadioStandard,
-    PageTitle,
   },
   computed: {
     ...mapState({
@@ -607,7 +603,6 @@ export default {
       // let chartOption = this.getGuageChartOption2(this.chart_01);
       let chartOption = getGaugeChartOption({
         title: this.chart_01,
-        value: 75,
         isDarkMode: this.isDarkMode,
       });
       chartOption["series"][0]["data"][0].value = this.$store.state.pageData[myPrgmId][
@@ -618,7 +613,6 @@ export default {
       // let chartOption3 = this.getGuageChartOption2(this.chart_03);
       let chartOption3 = getGaugeChartOption({
         title: this.chart_03,
-        value: 75,
         isDarkMode: this.isDarkMode,
       });
       chartOption3["series"][0]["data"][0].value = this.$store.state.pageData[myPrgmId][
@@ -719,13 +713,9 @@ export default {
       // this.search();
       await this.gridInit();
       await new Promise((resolve) => setTimeout(resolve, 1500));
-
-      await this.getTodayEfficiencyStatus();
-      await this.getEnrgAndCO2Data();
-      await this.getGridData();
-
       if (this.$router.currentRoute.fullPath == this.myHome.root) {
         this.dtToday = Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm");
+
         await this.getEnrgAndCO2Data();
         await this.getCompareEqpmTotData();
         await this.getTodayEfficiencyStatus();
@@ -755,9 +745,7 @@ export default {
       if (this.$refs.gridParent != undefined) {
         // gridHeight = gridHeight*0.9
         gridHeight = this.$refs.gridParent.offsetHeight - 35;
-        // console.log("gridHeight : ", gridHeight);
       }
-
       const myOptions = {
         // scrollX: false,
         setScroll: true,
@@ -770,12 +758,10 @@ export default {
           height: 38,
         },
       };
-
       this.setGridOption({
         gridKey: this.gridName,
         value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
       });
-
       let hhMapper = {
         "00": "00~01",
         "01": "01~02",
@@ -807,7 +793,7 @@ export default {
           header: "NO",
           name: "rowNum",
           width: 70,
-          align: "right",
+          align: "center",
           // hidden: true,
         },
         {
@@ -855,98 +841,99 @@ export default {
       });
 
       this.loadGrid = true;
-      this.isGridLoading = false;
-
       // this.getGridData();
     },
     async getGridData() {
       this.loadGrid = false;
       // console
-      // const res = await this.postApiReturn({
+      const res = await this.postApiReturn({
-      // 	apiKey: 'selectIssueGdIdxData',
+        apiKey: "selectIssueGdIdxData",
-      // 	resKey: 'issueGdIdxData',
+        resKey: "issueGdIdxData",
-      // 	sendParam: {},
+        sendParam: {},
-      // });
-      let fakeData = [
-        {
-          alrmKind: "WARN",
-          alrmMsg: "냉동기 전류부하율이 @V1%로 높음 (평균 @V2% 대비 @V3% 낮음) -@EQPM",
-          careStndVal: 50,
-          warnStndVal: 60,
-          eccId: "ECC000004",
-          eqpmGrpNm: "냉동기저온1",
-          eqpmGrpId: "EQG000001",
-          eqpmKindId: "EKIND0001",
-          eqpmId: "CHI-201",
-          eqpmNm: "CHI-201",
-          fabId: "ECC000003",
-          fabNm: "삼천1공장",
-          gdIdxId: "GD00001",
-          gdIdxNm: "전류부하율 평균 편차",
-          rowKey: 0,
-          rowNum: 1,
-          rowSpanMap: {},
-          sortKey: 0,
-          sortSeq: 1,
-          totDttm: Utility.setFormatDate(new Date(), "YYYY-MM-DD"),
-          totTime: "2022-12-20 02:43:24",
-          totVal: 70,
-        },
-        {
-          alrmKind: "WARN",
-          alrmMsg: "냉동기 냉각수 유량 부하율이 @V1%로 높음 -@EQPM",
-          careStndVal: 70,
-          warnStndVal: 100,
-          eccId: "ECC000004",
-          eqpmGrpNm: "냉동기고온1",
-          eqpmGrpId: "EQG000001",
-          eqpmKindId: "EKIND0001",
-          eqpmId: "CHI-302",
-          eqpmNm: "CHI-302",
-          fabId: "ECC000004",
-          fabNm: "삼천1공장",
-          gdIdxId: "GD00011",
-          gdIdxNm: "냉각수 유량 부하율",
-          rowKey: 0,
-          rowNum: 2,
-          rowSpanMap: {},
-          sortKey: 0,
-          sortSeq: 1,
-          totDttm: Utility.setFormatDate(new Date(), "YYYY-MM-DD"),
-          totTime: "2022-12-20 07:23:38",
-          totVal: 120,
-        },
-      ];
-
-      this.setGridData({
-        gridKey: this.gridName,
-        value: fakeData,
       });
+      // let fakeData = [
+      // 	{
+      // 		'alrmKind' : "WARN",
+      // 		'alrmMsg' : "냉동기 전류부하율이 @V1%로 높음 (평균 @V2% 대비 @V3% 낮음) -@EQPM",
+      // 		'careStndVal' : 50,
+      // 		'warnStndVal' : 60,
+      // 		'eccId' : "ECC000004",
+      // 		'eqpmGrpNm' : "냉동기저온1",
+      // 		'eqpmGrpId' : "EQG000001",
+      // 		'eqpmKindId' : "EKIND0001",
+      // 		'eqpmId' : "CHI-201",
+      // 		'eqpmNm' : "CHI-201",
+      // 		'fabId' : "ECC000003",
+      // 		'fabNm' : "삼천1공장",
+      // 		'gdIdxId' : "GD00001",
+      // 		'gdIdxNm' : "전류부하율 평균 편차",
+      // 		'rowKey' : 0,
+      // 		'rowNum' : 1,
+      // 		'rowSpanMap' : {},
+      // 		'sortKey' : 0,
+      // 		'sortSeq' : 1,
+      // 		'totDttm' : Utility.setFormatDate(new Date(), 'YYYY-MM-DD'),
+      // 		'totTime' : '2022-12-20 02:43:24',
+      // 		'totVal' : 70
+      // 	},
+      // 	{
+      // 		'alrmKind' : "WARN",
+      // 		'alrmMsg' : "냉동기 냉각수 유량 부하율이 @V1%로 높음 -@EQPM",
+      // 		'careStndVal' : 70,
+      // 		'warnStndVal' : 100,
+      // 		'eccId' : "ECC000004",
+      // 		'eqpmGrpNm' : "냉동기고온1",
+      // 		'eqpmGrpId' : "EQG000001",
+      // 		'eqpmKindId' : "EKIND0001",
+      // 		'eqpmId' : "CHI-302",
+      // 		'eqpmNm' : "CHI-302",
+      // 		'fabId' : "ECC000004",
+      // 		'fabNm' : "삼천1공장",
+      // 		'gdIdxId' : "GD00011",
+      // 		'gdIdxNm' : "냉각수 유량 부하율",
+      // 		'rowKey' : 0,
+      // 		'rowNum' : 2,
+      // 		'rowSpanMap' : {},
+      // 		'sortKey' : 0,
+      // 		'sortSeq' : 1,
+      // 		'totDttm' : Utility.setFormatDate(new Date(), 'YYYY-MM-DD'),
+      // 		'totTime' : '2022-12-20 07:23:38',
+      // 		'totVal' : 120
+      // 	}
+
+      // ]
 
       // this.setGridData({
       // 	gridKey: this.gridName,
-      // 	value: res,
+      // 	value: fakeData,
       // });
 
+      this.setGridData({
+        gridKey: this.gridName,
+        value: res,
+      });
+
       this.loadGrid = true;
     },
     async getEnrgAndCO2Data() {
       this.loadChart_01 = false;
-      const res = [];
+      const res = await this.postApiReturn({
+        apiKey: "selectEnrgAndCO2Data",
+        resKey: "enrgAndCO2Data",
+        sendParam: {},
+      });
       // //////////////////////////////////////////
       // // 시연용 data 세팅
-      res[0] = {};
+      // res[0]['dayVal'] = 18.0;
-      res[0]["dayVal"] = 18.0;
+      // res[0]['mnthVal'] = 507.0;
-      res[0]["mnthVal"] = 507.0;
+      // res[0]['planVal'] = 653.0;
-      res[0]["planVal"] = 653.0;
+      // res[0]['co2DayVal'] = 9.0;
-      res[0]["co2DayVal"] = 9.0;
+      // res[0]['co2MnthVal'] = 238.0;
-      res[0]["co2MnthVal"] = 238.0;
+      // res[0]['co2PlanVal'] = 307.0;
-      res[0]["co2PlanVal"] = 307.0;
+      // res[0]['co2YearVal'] = 1224.0;
-      res[0]["co2YearVal"] = 1224.0;
+      // res[0]['effcRt'] = 77.59;
-      res[0]["effcRt"] = 77.59;
       // //////////////////////////////////////////
       // 대시보드 표기
-
       this.enrgUsageDayVal = this.numberFormatter(
         parseFloat(res[0]["dayVal"]).toFixed(0)
       );
@@ -964,20 +951,16 @@ export default {
         parseFloat(res[0]["co2BefMnthVal"]).toFixed(0)
       );
       this.CO2YearVal = this.numberFormatter(parseFloat(res[0]["co2YearVal"]).toFixed(0));
-
       this.$nextTick(() => {
         let chartOption = null;
         // chartOption = this.getGuageChartOption2(this.chart_01);
         chartOption = getGaugeChartOption({
           title: "Energy Usage",
-          value: 75,
           isDarkMode: this.isDarkMode,
         });
-        console.log("charto:", chartOption);
         chartOption["series"][0]["data"][0].value =
           res[0]["effcRt"] != null ? res[0]["effcRt"] : 0;
         this.$store.state.pageData[myPrgmId][this.chart_01] = chartOption;
-        console.log("gauge chart ops:", chartOption);
         // if(res[0]['effcRt'] == undefined || res[0]['effcRt'] == null){
         // 	res[0]['effcRt'] = null;
         // }
@@ -993,12 +976,11 @@ export default {
     },
     async getCompareEqpmTotData() {
       this.loadChart_02 = false;
-      // const res = await this.postApiReturn({
+      const res = await this.postApiReturn({
-      //   apiKey: "selectCompareEqpmTotData",
+        apiKey: "selectCompareEqpmTotData",
-      //   resKey: "compareEqpmTotData",
+        resKey: "compareEqpmTotData",
-      //   sendParam: {},
+        sendParam: {},
-      // });
+      });
-      const res = "abc";
       this.$nextTick(() => {
         this.setChart02Data(res);
       });
@@ -1007,25 +989,24 @@ export default {
     },
     async getTodayEfficiencyStatus() {
       this.loadChart_03 = false;
-      // const res = await this.postApiReturn({
+      const res = await this.postApiReturn({
-      // 	apiKey: 'selectTodayEfficiencyStatus',
+        apiKey: "selectTodayEfficiencyStatus",
-      // 	resKey: 'todayEfficiencyStatus',
+        resKey: "todayEfficiencyStatus",
-      // 	sendParam: {},
+        sendParam: {},
-      // });
+      });
 
       // 대시보드 표기
-      // this.ngDtlCnt = this.numberFormatter(res[0]['ngDtlCnt']);
+      this.ngDtlCnt = this.numberFormatter(res[0]["ngDtlCnt"]);
-      // this.ngDtlSolvCnt = this.numberFormatter(res[0]['ngDtlSolvCnt']);
+      this.ngDtlSolvCnt = this.numberFormatter(res[0]["ngDtlSolvCnt"]);
-      // let effcRt = this.numberFormatter(
+      let effcRt = this.numberFormatter(
-      // 	(res[0]['ngDtlSolvCnt'] / res[0]['ngDtlCnt']) * 100,
+        (res[0]["ngDtlSolvCnt"] / res[0]["ngDtlCnt"]) * 100
-      // );
+      );
-      let effcRt = this.numberFormatter(78.21);
+      // let effcRt = this.numberFormatter(78.21)
       this.$nextTick(() => {
         let chartOption = null;
         // chartOption = this.getGuageChartOption2(this.chart_03);
         chartOption = getGaugeChartOption({
           title: "Today Efficiency",
-          value: 75,
           isDarkMode: this.isDarkMode,
         });
         chartOption["series"][0]["data"][0].value = isNaN(effcRt) ? 0 : effcRt;
@@ -1037,15 +1018,14 @@ export default {
     },
     async getTodayNgTopTen() {
       this.loadChart_04 = false;
-      // const res = await this.postApiReturn({
+      const res = await this.postApiReturn({
-      //   apiKey: "selectTodayNgTopTen",
+        apiKey: "selectTodayNgTopTen",
-      //   resKey: "todayNgTopTen",
+        resKey: "todayNgTopTen",
-      //   sendParam: {},
+        sendParam: {},
-      // });
+      });
-      const res = "abc";
+      this.setPageData({
-      // this.setPageData({
+        chart04Data: res,
-      //   chart04Data: res,
+      });
-      // });
       this.$nextTick(() => {
         this.setChart04Data(res);
       });
@@ -1054,12 +1034,11 @@ export default {
     },
     async getCompareEqpmTGdChart() {
       this.loadChart_05 = false;
-      // const res = await this.postApiReturn({
+      const res = await this.postApiReturn({
-      //   apiKey: "selectCompareEqpmTGdChart",
+        apiKey: "selectCompareEqpmTGdChart",
-      //   resKey: "compareEqpmTGdChart",
+        resKey: "compareEqpmTGdChart",
-      //   sendParam: {},
+        sendParam: {},
-      // });
+      });
-      const res = "aaa";
       this.$nextTick(() => {
         this.setChart05Data(res);
       });
@@ -1067,12 +1046,12 @@ export default {
       this.isLine2Loading = false;
     },
     async setChart05Data(data) {
-      // if (this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart != undefined) {
+      if (this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart != undefined) {
-      //   this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart.series = [];
+        this.$store.state.pageData[this.myPrgmId].compareEqpmTGdChart.series = [];
-      // }
+      }
-      // if (!data.length) {
+      if (!data.length) {
-      //   return;
+        return;
-      // }
+      }
       let xAxisData = [];
       let seriesData = [];
       // let legendData = {
@@ -1081,7 +1060,7 @@ export default {
       //   dayVal: "금일",
       // };
 
-      let legendData = ["전전일", "전일", "금일"];
+    //   let legendData = ["전전일", "전일", "금일"];
 
       let befBefValDataList = {
         name: "전전일",
@@ -1109,37 +1088,36 @@ export default {
       };
       // for (var i = 0; i < data.length; i++) {
       //////없애야함//////
-      let total = 0;
+      // let total = 0;
       let hour = Utility.setFormatDate(
         new Date().setTime(new Date().getTime() - 1 * 60 * 60 * 1000),
         "HH"
       );
       //////없애야함//////
       for (var i = 0; i < 24; i++) {
-        // if (data[i].tm != undefined) {
+        if (data[i].tm != undefined) {
-        //   xAxisData.push(parseInt(data[i].tm));
+          xAxisData.push(parseInt(data[i].tm));
-        // } else {
+        } else {
-        //   xAxisData.push(i);
-        // }
           xAxisData.push(i);
+        }
 
         // 	//////없애야함//////
-        let num = parseInt(Math.random() * (13 - 7) + 7);
+        // 	let num = parseInt(Math.random() * (13 - 7) + 7);
-        let num2 = parseInt(Math.random() * (11 - 6) + 6);
+        // 	let num2 = parseInt(Math.random() * (11 - 6) + 6);
-        let num3 = parseInt(Math.random() * (10 - 5) + 5);
+        // 	let num3 = parseInt(Math.random() * (10 - 5) + 5);
-        let tempTotal = num + num2 + num3;
+        // 	let tempTotal = num + num2 + num3;
-        total += tempTotal;
+        // 	total += tempTotal;
-        let befBefVal = num;
+        // 	let befBefVal = num;
-        let befVal = num2;
+        // 	let befVal = num2;
-        let dayVal = num3;
+        // 	let dayVal = num3;
         // 	//////////////////
-        // let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
+        let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
-        // let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
+        let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
 
         befBefValDataList["data"].push(befBefVal);
         befValDataList["data"].push(befVal);
         if (i <= parseInt(hour)) {
-          // let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
+          let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
           dayValDataList["data"].push(dayVal);
         }
       }
@@ -1151,7 +1129,7 @@ export default {
 
       var chartOption = getLineChartOption({
         xAxisData: xAxisData,
-        legendData: legendData,
+        // legendData: legendData,
         seriesData: seriesData,
         isDarkMode: this.isDarkMode,
       });
@@ -1186,22 +1164,19 @@ export default {
       //   series: seriesData,
       // };
 
-      console.log("chart 5 data:", seriesData);
       await this.$nextTick(() => {});
-      // this.setChartOption({
+      this.setChartOption({
-      //   chartKey: "compareEqpmTGdChart",
+        chartKey: "compareEqpmTGdChart",
-      //   value: chartOption,
+        value: chartOption,
-      // });
+      });
-
-      this.$store.state.pageData[myPrgmId]["compareEqpmTGdChart"] = chartOption;
     },
     async setChart04Data(data) {
-      // if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
+      if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
-      //   this.$store.state.pageData[this.myPrgmId].todayNgTopTen.series = [];
+        this.$store.state.pageData[this.myPrgmId].todayNgTopTen.series = [];
-      // }
+      }
-      // if (!data.length) {
+      if (!data.length) {
-      //   return;
+        return;
-      // }
+      }
       let seriesData = [
         {
           type: "pie",
@@ -1219,51 +1194,52 @@ export default {
         },
       ];
       let pidChartdata = [];
-      // for (var i = 0; i < data.length; i++) {
+      for (var i = 0; i < data.length; i++) {
-      //   if (data[i].eqpmId != undefined) {
+        if (data[i].eqpmId != undefined) {
-      //     pidChartdata.push({
-      //       value: data[i]["ngDtlCnt"],
-      //       name: data[i]["eqpmId"],
-      //       groupId: data[i]["eqpmNm"],
-      //     });
-      //   }
-      // }
-      let eqpmNmList = [
-        "CHI-202",
-        "CHI-201",
-        "UT_LT_CH101",
-        "UT_LT_CH102",
-        "UT_LT_CH103",
-        "UT_LT_CH104",
-        "UT_LT_CH105",
-        "U-CH-013",
-        "U-CH-014",
-        "U-CH-015",
-        "U-CH-016",
-        "U-CH-017",
-        "U-CH-018",
-        "U-CH-019",
-        "U-CH-015B",
-        "U-CH-015C",
-        "U-CH-015D",
-        "U-CH-015E",
-        "UT_HT_CT101",
-        "UT_HT_CT102",
-        "UT_HT_CT103",
-        "UT_HT_CP101",
-        "VCB_A",
-        "U-CH-012",
-        "U-CH-015F",
-        "U-CH-016A",
-      ];
-      for (var i = 1; i < 21; i++) {
           pidChartdata.push({
-          // value:  data[i]['ngDtlCnt'],
+            value: data[i]["ngDtlCnt"],
-          value: i + parseInt(Math.random() * (9 - 5) + 5),
+            name: data[i]["eqpmId"],
-          name: eqpmNmList[i],
+            groupId: data[i]["eqpmNm"],
-          groupId: eqpmNmList[i],
           });
         }
+      }
+      // let eqpmNmList  = [
+      // 	'CHI-202',
+      // 	'CHI-201',
+      // 	'UT_LT_CH101',
+      // 	'UT_LT_CH102',
+      // 	'UT_LT_CH103',
+      // 	'UT_LT_CH104',
+      // 	'UT_LT_CH105',
+      // 	'U-CH-013',
+      // 	'U-CH-014',
+      // 	'U-CH-015',
+      // 	'U-CH-016',
+      // 	'U-CH-017',
+      // 	'U-CH-018',
+      // 	'U-CH-019',
+      // 	'U-CH-015B',
+      // 	'U-CH-015C',
+      // 	'U-CH-015D',
+      // 	'U-CH-015E',
+      // 	'UT_HT_CT101',
+      // 	'UT_HT_CT102',
+      // 	'UT_HT_CT103',
+      // 	'UT_HT_CP101',
+      // 	'VCB_A',
+      // 	'U-CH-012',
+      // 	'U-CH-015F',
+      // 	'U-CH-016A',
+      // ]
+      // for(var i=1; i<21; i++){
+
+      // 	pidChartdata.push({
+      // 		// value:  data[i]['ngDtlCnt'],
+      // 		value:  i+parseInt(Math.random()*(9-5)+5),
+      // 		name: eqpmNmList[i],
+      // 		groupId: eqpmNmList[i]
+      // 	});
+      // }
       seriesData[0]["data"] = [...pidChartdata];
       var chartOption = {
         grid: {
@@ -1293,17 +1269,15 @@ export default {
         series: seriesData,
       };
       await this.$nextTick(() => {});
-      // this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
+      this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
-      this.$store.state.pageData[myPrgmId]["todayNgTopTen"] = chartOption;
-      this.$store.state.pageData[myPrgmId]["chart04Data"] = chartOption;
     },
     async setChart02Data(data) {
-      // if (this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart != undefined) {
+      if (this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart != undefined) {
-      //   this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart.series = [];
+        this.$store.state.pageData[this.myPrgmId].compareEqpmTotChart.series = [];
-      // }
+      }
-      // if (!data.length) {
+      if (!data.length) {
-      //   return;
+        return;
-      // }
+      }
       let xAxisData = [];
       let seriesData = [];
       // let legendMapper = {
@@ -1311,7 +1285,6 @@ export default {
       // 	'befVal' : '전일',
       // 	'dayVal' : '금일'
       // }
-      let legendData = ["전전일", "전일", "금일"];
       let befBefValDataList = {
         name: "전전일",
         type: "line",
@@ -1336,82 +1309,38 @@ export default {
         lineStyle: { width: 2 },
         data: [],
       };
-      // // for (var i = 0; i < data.length; i++) {
+      // for (var i = 0; i < data.length; i++) {
       let hour = Utility.setFormatDate(
         new Date().setTime(new Date().getTime() - 1 * 60 * 60 * 1000),
         "HH"
       );
-      // for (var i = 0; i < 24; i++) {
-      //   if (data[i].tm != undefined) {
-      //     xAxisData.push(parseInt(data[i].tm));
-      //   } else {
-      //     xAxisData.push(i);
-      //   }
-      //   //////없애야함//////
       for (var i = 0; i < 24; i++) {
+        if (data[i].tm != undefined) {
+          xAxisData.push(parseInt(data[i].tm));
+        } else {
           xAxisData.push(i);
+        }
+        //////없애야함//////
 
-        let num = parseInt(Math.random() * (13 - 10) + 10)
+        // 	let num = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
-          .toString()
+        // 	let num2 = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
-          .padStart(2, "0");
+        // 	let num3 = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
-        let num2 = parseInt(Math.random() * (9 - 1) + 1)
+        // 	let num4 = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
-          .toString()
+        // 	let num5 = parseInt(Math.random() * (13 - 10) + 10).toString().padStart(2, '0');
-          .padStart(2, "0");
+        // 	let num6  = parseInt(Math.random() * (9 - 1) + 1).toString().padStart(2, '0');
-        let num3 = parseInt(Math.random() * (13 - 10) + 10)
+        // 	let befBefVal = num+num2;
-          .toString()
+        // 	let befVal = num3+num4;
-          .padStart(2, "0");
+        // 	let dayVal = num5+num6;
-        let num4 = parseInt(Math.random() * (9 - 1) + 1)
+        // 	//////없애야함//////
-          .toString()
+        let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
-          .padStart(2, "0");
+        let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
-        let num5 = parseInt(Math.random() * (13 - 10) + 10)
-          .toString()
-          .padStart(2, "0");
-        let num6 = parseInt(Math.random() * (9 - 1) + 1)
-          .toString()
-          .padStart(2, "0");
-        let befBefVal = num + num2;
-        let befVal = num3 + num4;
-        let dayVal = num5 + num6;
-
         befBefValDataList["data"].push(befBefVal);
         befValDataList["data"].push(befVal);
         if (i <= parseInt(hour)) {
-          // let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
+          let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
           dayValDataList["data"].push(dayVal);
         }
       }
-
-      // let num = parseInt(Math.random() * (13 - 10) + 10)
-      //   .toString()
-      //   .padStart(2, "0");
-      // let num2 = parseInt(Math.random() * (9 - 1) + 1)
-      //   .toString()
-      //   .padStart(2, "0");
-      // let num3 = parseInt(Math.random() * (13 - 10) + 10)
-      //   .toString()
-      //   .padStart(2, "0");
-      // let num4 = parseInt(Math.random() * (9 - 1) + 1)
-      //   .toString()
-      //   .padStart(2, "0");
-      // let num5 = parseInt(Math.random() * (13 - 10) + 10)
-      //   .toString()
-      //   .padStart(2, "0");
-      // let num6 = parseInt(Math.random() * (9 - 1) + 1)
-      //   .toString()
-      //   .padStart(2, "0");
-      // let befBefVal = num + num2;
-      // let befVal = num3 + num4;
-      // let dayVal = num5 + num6;
-      // 	//////없애야함//////
-      //   let befBefVal = data[i].befBefVal != undefined ? data[i].befBefVal : 0;
-      //   let befVal = data[i].befVal != undefined ? data[i].befVal : 0;
-      //   befBefValDataList["data"].push(befBefVal);
-      //   befValDataList["data"].push(befVal);
-      //   if (i <= parseInt(hour)) {
-      //     let dayVal = data[i].dayVal != undefined ? data[i].dayVal : 0;
-      //     dayValDataList["data"].push(dayVal);
-      //   }
-      // }
       seriesData = [befBefValDataList, befValDataList, dayValDataList];
 
       // seriesData = [
@@ -1433,7 +1362,7 @@ export default {
       // ];
       var chartOption = getLineChartOption({
         xAxisData: xAxisData,
-        legendData: legendData,
+        // legendData: legendData,
         seriesData: seriesData,
         isDarkMode: this.isDarkMode,
       });
@@ -1468,12 +1397,10 @@ export default {
       //   series: seriesData,
       // };
       await this.$nextTick(() => {});
-      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption;
+      this.setChartOption({
-
+        chartKey: "compareEqpmTotChart",
-      // this.setChartOption({
+        value: chartOption,
-      //   chartKey: "compareEqpmTotChart",
+      });
-      //   value: chartOption,
-      // });
     },
     getGuageChartOption(chartName) {
       const gaugeColors = [
@@ -1506,8 +1433,8 @@ export default {
             splitNumber: 10,
             itemStyle: {
               // color: '#FFAB91'
-              // color: 'auto',
+              color: "auto",
-              color: gaugeColors,
+              // color:gaugeColors
             },
             progress: {
               // show: true,
@@ -1518,8 +1445,8 @@ export default {
               // show: false
               show: true,
               itemStyle: {
-                color: "#FFAB91",
+                // color: '#FFAB91',
-                // color: 'auto',
+                color: "auto",
               },
             },
             axisLine: {
@@ -1565,140 +1492,12 @@ export default {
               fontSize: 15,
               // fontSize: 20,
               fontWeight: "bolder",
-              formatter: "30%",
+              formatter: "{value} %",
               color: "auto",
             },
             data: [
               {
-                name: "new",
+                value: NaN,
-                value: 344,
-              },
-            ],
-          },
-        ],
-      };
-
-      return guageChartOption;
-    },
-    getGuageChartOption2(chartName) {
-      const gaugeColors = [
-        [0, "#ed1c24"],
-        [0.6, "#ed1c24"],
-        [0.8, "#f7931e"],
-        [1.0, "#009245"],
-      ];
-      const gaugeColors2 = [
-        [0, "#009245"],
-        [0.6, "#009245"],
-        [0.8, "#f7931e"],
-        [1.0, "#ed1c24"],
-      ];
-      var guageChartOption = {
-        grid: {
-          // top: '-10%',
-          bottom: 0,
-        },
-        title: {},
-        graphic: [
-          {
-            type: "circle",
-            left: "center",
-            top: "center",
-            shape: {
-              r: 97, // radius of the background circle
-            },
-            style: {
-              fill: this.isDarkMode ? "#141415" : "#F5F5F5", // Light grey color
-              opacity: 0.3, // Semi-transparent
-            },
-            z: 0, // make sure it's behind the gauge
-          },
-        ],
-
-        series: [
-          {
-            type: "gauge",
-            radius: "90%",
-            startAngle: 225,
-            endAngle: -45,
-            min: 0,
-            max: 160,
-            // progress: {
-            //   show: true,
-            //   width: 15,
-            // },
-            axisLine: {
-              lineStyle: {
-                width: 12,
-                color: [
-                  [0.375, "#3CB371"], // Green (0–60)
-                  [0.5, "#FFD700"], // Yellow (60–80)
-                  [0.625, "#FFA500"], // Orange (80–100)
-                  [1, "#FF4500"], // Red (100–160)
-                ],
-              },
-            },
-            axisTick: {
-              distance: -5,
-              length: 5,
-              lineStyle: {
-                color: "#000000",
-                width: 1,
-              },
-            },
-            splitLine: {
-              distance: -12,
-              length: 8,
-              lineStyle: {
-                color: "#000000",
-                width: 2,
-              },
-            },
-            axisLabel: {
-              color: this.isDarkMode ? "#fff" : "#333333",
-              distance: 23,
-              fontSize: 9,
-            },
-            pointer: {
-              show: true,
-              length: "70%",
-              width: 6,
-              itemStyle: {
-                color: "#FA8C16", // Set your desired pointer color here
-              },
-            },
-            title: {
-              show: false,
-              offsetCenter: [0, "40%"],
-              fontSize: 18,
-            },
-            detail: {
-              valueAnimation: true,
-              fontWeight: 500, // or "normal", "lighter", "bolder", or a number like 600
-              fontFamily: "Oxanium, sans-serif", // or any custom font
-              fontSize: 30,
-              lineHeight: 25,
-              offsetCenter: [0, "60%"],
-              color: this.isDarkMode ? "#fff" : "#333333",
-              formatter: function (value) {
-                return `{valueStyle|${value}}\n{percentStyle|%}`;
-              },
-              rich: {
-                // valueStyle: {
-                //   fontSize: 25,
-                //   fontWeight: "bold",
-                // },
-                percentStyle: {
-                  fontSize: 10,
-                  color: this.isDarkMode ? "#fff" : "#333333",
-                  // fontWeight: "normal",
-                },
-              },
-            },
-            data: [
-              {
-                value: 16,
-                name: "에너지사용효율", // "Energy Usage Efficiency"
               },
             ],
           },
@@ -1847,7 +1646,6 @@ export default {
       }[state];
     },
     chartClickEvent(argData, $event) {
-      // console.log('chartClickEvent', argData);
       let pageMapper = {
         dashBoard_enrgUsageGauge: {
           pageName: "ems-effc-EnrgUseTotSummPage",
@@ -1909,32 +1707,18 @@ export default {
       });
     },
     topTenChartClickEvent(event) {
-      // let chartData = this.pageData.chart04Data;
+      let chartData = this.pageData.chart04Data;
-      // console.log("chart data first", this.pageData);
+      // let chartData = this.$store.state.pageData[myPrgmId][this.chart_04]['series'][0]['data']
-
-      let chartData = this.$store.state.pageData[myPrgmId][this.chart_04]["series"][0][
-        "data"
-      ];
-      console.log("select equipment", event["data"]["groupId"]);
       let selectedChartData = chartData.filter((item) => {
         return item.eqpmId == event["data"]["groupId"];
       });
-      console.log("chart data", selectedChartData);
+      var data = {
-      // var data = {
-      //   cmCycle: "CYC_DAY",
-      //   fromDt: Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),
-      //   fabId: selectedChartData[0].fabId,
-      //   eqpmKindId: selectedChartData[0].eqpmKindId,
-      //   eqpmGrpId: selectedChartData[0].eqpmGrpId,
-      //   eqpmId: selectedChartData[0].eqpmId,
-      // };
-      var fake_data = {
         cmCycle: "CYC_DAY",
         fromDt: Utility.setFormatDate(new Date(), "YYYY-MM-DD HH:mm"),
-        fabId: 4555,
+        fabId: selectedChartData[0].fabId,
-        eqpmKindId: 99988,
+        eqpmKindId: selectedChartData[0].eqpmKindId,
-        eqpmGrpId: 88888,
+        eqpmGrpId: selectedChartData[0].eqpmGrpId,
-        eqpmId: 99900,
+        eqpmId: selectedChartData[0].eqpmId,
       };
       var key = "tick_" + Math.random();
       this.$router.push({
@@ -1944,8 +1728,7 @@ export default {
           // tick:key
         },
         params: {
-          // ...data,
+          ...data,
-          ...fake_data,
           key: key,
         },
       });

pages/ems/base/EffcIdxMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<CommonPageTitle />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -16,8 +17,8 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents">
+		<v-row ref="contents" class="pt-2">
-			<v-col :cols="5" style="height:100%">
+			<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 +33,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/EnrgReadPlaceMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<CommonPageTitle />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -19,7 +20,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">
+						<v-col :cols="2.5" class="pr-4">
 							<InputText :parentPrgmId="myPrgmId" label="검침개소명" valueNm="readPlcNm" :labelCols="12"
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
@@ -30,25 +31,25 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" class="mt-4">
+		<v-row ref="contents" class="mt-3">
-			<v-col :cols="5" class="h100">
+			<v-col :cols="5" class="h100 pr-2">
 				<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">
+					<div class="px-4" style="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" :selectedRowDataWatchFlag="true"
-								:dataPath="dataPathExample" />
+								 />
 						</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">
 					<v-card-title class="custom-title-4 pb-1 pa-4">검침개소 상세
 					</v-card-title>
@@ -134,7 +135,7 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			isImgTabDisabled: false,
 			items: [
@@ -157,47 +158,6 @@ 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
 		};
 	},
@@ -312,18 +272,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;
@@ -334,10 +294,12 @@ export default {
 					resizable: true,
 				},
 				treeColumnOptions: {
-					name: 'eccNm',       // Showing tree table
+					name: 'readPlcNm',
-					useIcon: false,      // Not using icon
-					indentWidth: 10,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -531,7 +493,7 @@ export default {
 				if (this.tab == 2) {
 					this.tab = 0;
 				}
-				this.isImgTabDisabled = true;
+				this.isImgTabDisabled = false;
 			} else {
 				this.isImgTabDisabled = false;
 			}
@@ -999,18 +961,6 @@ 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/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 = [
+			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
-  }
-]
-;
 
-			// if (this.pageData.blocMstrList.length > 0) {
+			if (this.pageData.blocMstrList.length > 0) {
-			// 	res = await this.postApiReturn({
+				res = await this.postApiReturn({
-			// 		apiKey: 'selectErcInfo',
+					apiKey: 'selectErcInfo',
-			// 		resKey: 'ercInfoData',
+					resKey: 'ercInfoData',
-			// 		sendParam: {
+					sendParam: {
-			// 			blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
+						blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
-			// 			ercKind: this.pageData.searchErcKind,
+						ercKind: this.pageData.searchErcKind,
-			// 			readObjId: this.pageData.searchReadObj,
+						readObjId: this.pageData.searchReadObj,
-			// 			chrgKind: this.pageData.searchChrgKind,
+						chrgKind: this.pageData.searchChrgKind,
-			// 			useFg: this.pageData.useFg,
+						useFg: this.pageData.useFg,
-			// 			ercNmLike: this.pageData.ercNm,
+						ercNmLike: this.pageData.ercNm,
-			// 		},
+					},
-			// 	});
+				});
-			// } else {
+			} else {
-			// 	this.setPageData({ isFind: false });
+				this.setPageData({ isFind: false });
-			// }
+			}
 			const newRes = res.map(item => {
 				const newObj = {
 					...item,
@@ -798,133 +759,8 @@ const defaultData = {
 	/* data 세팅 */
 	// 로컬 gridName 값과 동일한 이름으로 세팅
 	rowGrid: {
-		data: [
+		data: [],
-  {
+		column: [], // myColumns,
-    "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,
 		option: {}, // myOptions
 		defaultRow: {
 			comId: '',

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<v-row ref="searchFilter">
+		<CommonPageTitle />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -29,10 +30,10 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents">
+		<v-row ref="contents" class="mt-3">
-			<v-col :cols="5" class="h100">
+			<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 +45,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 +137,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 +224,7 @@ export default {
 			formatterSelectList01: [],
 			formatterSelectList02: [],
 
-			loadGrid: true,
+			loadGrid: false,
 			dataPathExample: {
 				"rowGrid": {
 					data: [
@@ -279,59 +280,7 @@ export default {
 
 				}
 			},
-			dataPathExample2: {
+			loadGrid2: false,
-				"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: [
@@ -1001,6 +950,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 
 			this.setGridOption({
@@ -1066,6 +1019,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 
 			this.setGridOption({

pages/ems/base/EquipmentMasterMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -34,23 +35,23 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<v-col :cols="5" class="h100">
+			<v-col :cols="5" >
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<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-5" style="min-height:calc(100% - 76px)">
+					<div ref="gridParent" class="px-5" style="min-height:60vh;">
-						<div ref="gridParent" class="w100 h100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
 							@getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								:selectedRowDataWatchFlag="true" :preventFocusChangeEventFlag="false" :dataPath="dataPathMock" />
+							:selectedRowDataWatchFlag="true" :preventFocusChangeEventFlag="false" />
-						</div>
+						<!-- <div ref="gridParent" class="w100 h100">
+						</div> -->
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100">
+			<v-col :cols="7" >
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4" style="min-height:76px;">설비 상세</v-card-title>
 					<div class="px-5" style="min-height:calc(100% - 76px)">
@@ -287,7 +288,7 @@ export default {
 					blocId: this.userInfo.blocId,
 				},
 			});
-			console.log('res : ', res);
+			// console.log('res : ', res);
 			res.map(item => {
 				const it = { text: item.ercNm, value: item.ercId };
 				ercList.push(it);

pages/ems/base/GdIdxMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<v-row ref="searchFilter">
+		<CommonPageTitle />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -37,11 +38,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 mt-4" >
 							<component :is="'Form'" :parentPrgmId="myPrgmId" :detailList="detailList"
 							@gridEditingFinish="gridEditingFinish" />
 						</div>
@@ -112,7 +113,7 @@ export default {
 			myPrgmId: myPrgmId,
 			initedFlag: false,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			detailList: myDetail,
 			selectValue01: null,
 			selectValueList01: [],
@@ -125,102 +126,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',
-							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;
 			// 			},
-						},
+			// 			{
-						{
+			// 				gdIdxId: 'GD002',
-							header: '상위집계방법',
+			// 				gdIdxNm: '습도 가이드',
-							name: 'upTotMeth',
+			// 				eqpmGrpId: 'EQ002',
-							width: 100,
+			// 				upTotMeth: 'MAX',
-							align: 'center',
+			// 				careStndVal: 30,
-							// formatter({ value }) {
+			// 				warnStndVal: 60,
-							// 	let retVal = '';
+			// 				alrmMsg: '습도가 기준치를 초과했습니다.',
-							// 	const newValue = _this.pageData.upTotMethList.filter(item => item.commCd == value);
-							// 	if (newValue.length > 0) {
-							// 		retVal = newValue[0].commCdNm;
-							// 	}
-							// 	return retVal;
 			// 			},
-						},
+			// 			{
-						{
+			// 				gdIdxId: 'GD003',
-							header: '주의기준',
+			// 				gdIdxNm: '압력 가이드',
-							name: 'careStndVal',
+			// 				eqpmGrpId: 'EQ003',
-							width: 100,
+			// 				upTotMeth: 'SUM',
-							align: 'right',
+			// 				careStndVal: 100,
-						},
+			// 				warnStndVal: 150,
-						{
+			// 				alrmMsg: '압력이 기준치를 초과했습니다.',
-							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 +353,46 @@ 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,
@@ -419,6 +406,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -636,100 +627,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,6 +1,7 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<v-row ref="searchFilter">
+		<CommonPageTitle />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -29,7 +30,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 +116,8 @@
 
 				</v-card>
 
-				<v-row style="height: 40%" class="mt-4">
+				<v-row style="height: 40%" class="mt-3">
-					<v-col :cols="6" style="height: 100%">
+					<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 +127,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 +202,7 @@ export default {
 			readonlyFg: true,
 			initedFlag: false,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			detailList: myDetail,
 			selectValue01: null,
 			selectValueList01: [],
@@ -209,62 +210,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: {
@@ -408,6 +409,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -511,69 +516,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에서 중복되는 값을 제거하는데 사용하기위해 저장 - 시작
+			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,
 			// 	},
-			// 	});
-			// }
 
-			// // 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,
-				},
-
-			]
 			this.setGridData({
 				gridKey: this.gridName,
 				value: newRes,

pages/ems/base/ReadObjectMngPage.vue

@@ -59,8 +59,7 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div class="h100 px-5" style="height:calc(100% - 70px)">
+					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
-						<div ref="gridParent" class="w100 h100">
 						<component
 							:ref="gridName"
 							:is="loadGrid ? 'Grid' : null"
@@ -69,10 +68,8 @@
 							@getRowsData="getRowData"
 							@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 							:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 						/>
 					</div>
-					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">
@@ -81,7 +78,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 +185,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 +703,8 @@ const defaultData = {
 		},
 		buttonAuth: {
 			add: true,
-			save: true,
 			remove: true,
+			save: true,
 			excel: false,
 		},
 	},
@@ -873,40 +852,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/base/ReadResultCloseMngPage.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="l-layout">
-    <!-- <h2 class="title">
+    <CommonPageTitle />
-			<v-icon small color="primary" class="mr-1">mdi-circle</v-icon>
-			계량 데이터 마감 관리
-		</h2> -->
-    <PageTitle text="계량 데이터 마감 관리" />
-
     <v-row ref="searchFilter">
       <!-- 조회조견 -->
       <v-col :cols="12">
@@ -75,8 +70,8 @@
     </v-row>
     <v-row ref="contents">
       <!-- 일일검침정보 목록-->
-      <v-col :cols="12" class="h100">
+      <v-col :cols="12">
-        <v-card class="pb-5">
+        <v-card class="pb-5 w100">
           <div class="d-flex align-center justify-space-between pa-5">
             <v-card-title class="custom-title-4 pa-0">일일검침정보</v-card-title>
             <div class="d-flex align-center">
@@ -91,21 +86,19 @@
                 type="primary"
                 :ripple="false"
                 @click="saveReadResultCloseMng('N')"
-                >일마감</a-button
               >
+                일마감
+              </a-button>
             </div>
           </div>
-          <div class="px-5" style="min-height: calc(100% - 76px)">
+          <div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
-            <div ref="gridParent" class="h100 w100">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
                 :parentPrgmId="myPrgmId"
                 :gridName="gridName"
-                :dataPath="dataPathMock"
               />
           </div>
-          </div>
         </v-card>
       </v-col>
     </v-row>
@@ -123,7 +116,6 @@ import selectCodeList from "@/components/common/select/selectCodeList";
 import SelectMttList from "@/components/common/select/SelectMttList";
 import Datepicker from "~/components/common/Datepicker";
 import BtnExcelDownload from "~/components/common/button/BtnExcelDownload";
-import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 // const myPrgmId = "PRG0018";
@@ -151,13 +143,12 @@ export default {
     Datepicker,
     Search,
     Grid,
-    PageTitle,
   },
   data() {
     return {
       myPrgmId: myPrgmId,
       gridName: "rowGrid",
-      loadGrid: true,
+      loadGrid: false,
       dataPathMock: {
         rowGrid: {
           column: [
@@ -260,7 +251,6 @@ export default {
         gridKey: this.gridName,
         value: myColumns,
       });
-      this.loadGrid = true;
     },
     async search() {
       await this.getRowGridData();
@@ -288,8 +278,12 @@ export default {
             mgnf: item.mgnf || 0,
           })),
         });
+        // console.log('--------------DEBUG-----res-------', res);
       }
       this.setPageData({ isFind: false });
+      this.$nextTick(() => {
+        this.loadGrid = true;
+      })
     },
     //전월 or 일 마감--------------------------------------------------------------------------------------------
     async saveReadResultCloseMng(mnthYn) {

pages/ems/effc/DataSetMngPage.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="l-layout">
+    <CommonPageTitle />
     <!-- Dataset 페이지 시작 -->
     <div v-if="pageActionFlag == 'list'" class="h100">
       <v-row ref="searchFilter">
@@ -34,23 +35,23 @@
         </v-col>
       </v-row>
       <v-row ref="contents">
-        <v-col :cols="5" class="h100">
+        <v-col :cols="5" >
           <v-card class="pb-5">
             <div class="d-flex align-center justify-space-between pa-5">
               <v-card-title class="pa-0 custom-title-4">Data Set 리스트</v-card-title>
               <Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
                 :btnActionsFnc="btnActions" />
             </div>
-            <div class="px-5" style="min-height:calc(100% - 76px)">
+            <div ref="gridParent" class="px-5" style="min-height: 60vh">
-              <div ref="gridParent" class="w100 h100">
               <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
                 @getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
                 :selectedRowDataWatchFlag="true" />
-              </div>
+              <!-- <div ref="gridParent" class="w100 h100">
+              </div> -->
             </div>
           </v-card>
         </v-col>
-        <v-col :cols="7" class="h100">
+        <v-col :cols="7" >
           <v-card class="pb-5">
             <v-card-title class="custom-title-4" style="min-height:76px;">Data Set 상세
             </v-card-title>

pages/ems/effc/EnrgEffcTotSummPage.vue

@@ -195,28 +195,16 @@ export default {
       });
     },
     async getEqpmKind() {
-      // let res = await this.postApiReturn({
+			let res = await this.postApiReturn({
-      //   apiKey: "selectEqpmKindCodeList",
+				apiKey: 'selectEqpmKindCodeList',
-      //   resKey: "eqpmKindCodeLists",
+				resKey: 'eqpmKindCodeLists',
-      //   sendParam: {},
+				sendParam: {},
-      // });
+			});
-
-      let res = [
-        {
-          eqpmKindId: "냉동기저온",
-          eqpmKindNm: "냉동기저온",
-        },
-        {
-          eqpmKindId: "냉동기고온",
-          eqpmKindNm: "냉동기고온",
-        },
-      ];
 
 			if (res.length > 0) {
-        this.selectValueList01 = await res.map((item) => {
+				this.selectValueList01 = await res.map(item => {
 					return {
-            // text: item.eqpmKindNm,
+						text: item.eqpmKindNm,
-            label: item.eqpmKindNm,
 						value: item.eqpmKindId,
 					};
 				});
@@ -233,29 +221,24 @@ export default {
     gridInit() {},
     getRowGridData() {},
     async getData() {
-      //   let res = await this.postApiReturn({
+			let res = await this.postApiReturn({
-      //     apiKey: "selectEnrgEffcTotSumm",
+				apiKey: 'selectEnrgEffcTotSumm',
-      //     resKey: "totSummData",
+				resKey: 'totSummData',
-      //     sendParam: {
+				sendParam: {
-      //       fromDt: this.pageData.fromDt,
+					fromDt: this.pageData.fromDt,
-      //       eqpmKindId: this.selectValue01,
+					eqpmKindId: this.selectValue01,
-      //     },
+				},
-      //   });
+			});
-      let res = ["aaa", "bbb"];
+
 			await this.getChartData(res);
 
-      //   this.selectData = res.filter((item, i) => {
+			this.selectData = res.filter((item, i) => {
-      //     return (
+				return (
-      //       res.findIndex((item2, j) => {
+					res.findIndex((item2, j) => {
-      //         return item.eqpmGrpId === item2.eqpmGrpId;
+						return item.eqpmGrpId === item2.eqpmGrpId;
-      //       }) === i
+					}) === i
-      //     );
+				);
-      //   });
+			});
-
-      this.selectData = [
-        { eqpmGrpId: "G001", eqpmGrpNm: "Group A", otherProp: "..." },
-        { eqpmGrpId: "G002", eqpmGrpNm: "Group B", otherProp: "..." },
-      ];
 		},
     barClick(event, chartName) {
       var data = {};
@@ -302,37 +285,25 @@ export default {
 			//   }
 			// });
 
-      //   data.map((item) => {
+			data.map(item => {
-      //     if (chartDataObj[item.eqpmGrpId] != null) {
+				if (chartDataObj[item.eqpmGrpId] != null) {
-      //       chartDataObj[item.eqpmGrpId].push(item);
+					chartDataObj[item.eqpmGrpId].push(item);
-      //     } else {
+				} else {
-      //       chartDataObj[item.eqpmGrpId] = [item];
+					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.objList['chart_0' + i] = chartDataObj[x];
-        this.chartNameList.push("chart_0" + i);
+				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]]);

pages/ems/effc/EnrgMapPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -158,8 +159,8 @@ export default {
 	},
 	async created() { },
 	async mounted() {
-		this.initTest();
+		// this.initTest();
-		return;
+		// return;
 
 		this.init();
 		// document.querySelector('.icon_arrow').style.width = document.querySelector('.iconArrowCols').clientWidth-20 + "px";

pages/ems/effc/EnrgReptMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<PageTitle text="효율성 지표 보고서" />
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -98,7 +98,6 @@ import Chart from '~/components/common/Chart';
 import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
 import DateUtility from '~/plugins/dateUtility';
 import XLSX from 'xlsx';
-import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 let myPrgmId;
@@ -130,7 +129,6 @@ export default {
 		EqpmSelectPop,
 		DateUtility,
 		XLSX,
-		PageTitle,
 	},
 	data() {
 		return {

pages/ems/effc/EnrgUsePlanPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -9,20 +10,20 @@
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" />
+								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" customClass="select-large" />
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"
-								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" />
+								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" customClass="select-large"/>
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox3" :propsValue="selectValue03" :itemList="selectValueList03"
-								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" />
+								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" customClass="select-large" />
 						</v-col>
 
-						<BtnSearch @click="search" />
+						<BtnSearch size="large" @click="search" />
-						<v-col>
+						<!-- <v-col>
-						</v-col>
+						</v-col> -->
 						<component ref="EnrgUsePlanModiPop" :is="'EnrgUsePlanModiPop'" :label="'test'" :parentPrgmId="myPrgmId"
 							@gridEditingFinish="gridEditingFinish" />
 					</v-row>
@@ -30,18 +31,15 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<v-col :cols="12" style="height: 100%">
+			<v-col :cols="12" >
-				<v-card class="pb-5 h100">
+				<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>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</div>
-					<div class="h100 px-5" style="height:calc(100% - 70px)">
+					<div ref="gridParent" class="px-5" style="min-height: 60vh;">
-						<div ref="gridParent" class="w100 h100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-								:editorGrid="true" @getRowsData="getRowData" :dataPath="dataPathMock" />
+							:editorGrid="true" @getRowsData="getRowData" />
-
-						</div>
 					</div>
 				</v-card>
 			</v-col>
@@ -171,8 +169,8 @@ export default {
 	created() { },
 	async mounted() {
 		// -------
-		this.initTest();
+		// this.initTest();
-		return;
+		// return;
 		// ========End test===========
 		await this.init();
 		this.initedFlag = true;
@@ -420,53 +418,25 @@ export default {
 
 			class CustumButton {
 				constructor(props) {
-					// v-btn v-btn--is-elevated v-btn--has-bg theme--dark v-size--default
-					const el = document.createElement('button');
 					const { grid, rowKey, columnInfo } = props;
 
-					$(el).addClass('tui-grid-cell-content');
+					const gridData = grid.store.data.rawData;
-					// $(el).css('text-align', 'center');
+					const value = gridData[rowKey][columnInfo.name];
-					el.classList.add('v-btn');
-					// el.style.width = '80%';
-					// el.style.height = '80%';
-					// el.style.boxShadow = '0px 0px 0px 2px #cbced6';
-					// el.style.background = 'linear-gradient(to bottom, #242940 5%, #476e9e 100%)';
-					// el.style.backgroundColor = '#144985';
-					el.style.borderRadius = '7px';
-					el.style.border = '1px solid #4e6096';
-					// el.style.display = 'inline-block';
-					// el.style.cursor = 'pointer';
-					el.style.color = '#ffffff';
-					// el.style.fontFamily = 'Arial';
-					el.style.padding = '6% 3%';
 
-					// el.style.textDecoration = 'none';
-					// el.style.textShadow = '0px 1px 0px #283966';
-
-					el.innerText = columnInfo.renderer.options.value;
-					this.el = el;
 					this.disabled = columnInfo.renderer.options.disabled || false;
+					const elDiv = document.createElement('div');
+					elDiv.innerHTML = `<span>${value}</span>`;
+					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
+					const el2 = document.createElement('button');
+					$(el2).addClass('edit-btn blue--text');
+					el2.innerText = 'Edit';
+					elDiv.appendChild(el2);
+
+					this.el = elDiv;
 
 					if (!this.disabled) {
-						// hover 기능 구현
-						this.el.addEventListener('mouseover', function (event) {
-							// console.log('darkModeFg', _this.darkModeFg);
-							// console.log('event',event.fromElement);
-							// console.log('event',document.defaultView.getComputedStyle(el).getPropertyValue('background-color'));
-							// rgb(85, 130, 220) // light
-							// el.style.backgroundColor = '#26578F';	// rgb(20, 73, 133) // dark
-							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
-							// el.style.backgroundColor = btnColor['mouseOver'];
-						});
-						this.el.addEventListener('mouseout', function (event) {
-							// rgb(71, 119, 217) // light
-							// el.style.backgroundColor = '#144985'; // dark
-							// console.log('event',event.fromElement);
-							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
-							// el.style.backgroundColor = btnColor['mouseOut'];
-						});
 						// click 이벤트
-						this.el.addEventListener('click', function (event) {
+						el2.addEventListener('click', function (event) {
 							let gridData = grid.store.data.rawData;
 							let rowNum = gridData[rowKey].rowNum;
 							let selectedGridData = gridData.filter(item => {
@@ -537,18 +507,25 @@ export default {
 					minWidth: 200,
 					align: 'left',
 					// hidden: true,
-					formatter: ({ value, row }) => {
+					// formatter: ({ value, row }) => {
-						return `
+					// 	return `
-						<span>${value}</span>
+					// 	<span>${value}</span>
-						<button class="edit-btn" data-row='${JSON.stringify(row)}'>Edit</button>
+					// 	<button class="edit-btn" data-row='${JSON.stringify(row)}'>Edit</button>
-					`;
+					// `;
-					}
+					// }
+					renderer: {
+						type: CustumButton,
+						options: {
+							value: '계획수정',
+						},
+					},
 				},
 				{
 					header: '',
 					name: 'btnCol',
 					width: 70,
 					align: 'center',
+					hidden: true,
 					renderer: {
 						type: CustumButton,
 						options: {

pages/ems/effc/TagTrndPage.vue

@@ -103,7 +103,6 @@
 								<component
 									:ref="gridName"
 									class="tagTrndGrid"
-                  v-if="loadGrid"
 									:is="loadGrid ? 'Grid' : null"
 									:gridName="gridName"
 									:parentPrgmId="myPrgmId"
@@ -199,7 +198,6 @@ export default {
 	async asyncData(context) {
 		const myState = context.store.state;
 		myPrgmId = context.route.query.prgmId;
-    console.log("menudata:", myState.menuData[myPrgmId]);
     await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
 		myTitle = await myState.activeMenuInfo.menuNm;
 	},
@@ -330,7 +328,6 @@ export default {
 			} else {
 				this.dumyChartFg = false;
 			}
-      this.dumyChartFg = true;
 			if (this.initedFlag && this.tagList.length > 0) {
 				this.search();
 			}
@@ -409,12 +406,12 @@ export default {
       getAddInfoList: "modules/search/getAddInfoList",
 		}),
 		async init() {
-      await this.setPageData({
+			this.setPageData({
 				rowGridSelectKey: 0,
 				rowGridSelectData: null,
 			});
-      await this.gridInit();
+			this.gridInit();
-      this.setChartNull2();
+			this.setChartNull();
 		},
 		async search() {
 			// search가 2번 타는 경우:
@@ -513,12 +510,6 @@ export default {
 				gridKey: this.gridName,
 				value: myColumns,
 			});
-
-      this.setGridData({
-        gridKey: this.gridName,
-        value: newRes,
-      });
-
 			this.loadGrid = true;
 		},
 		getRowData(data) {
@@ -809,7 +800,6 @@ export default {
 				// data SeriesData 추가
         chartDataDict[dataTagTitle]["seriesData"] = seriesData;
 				// data legend 추가
-        console.log("le dat:", legendData);
         chartDataDict[dataTagTitle]["legendList"] = legendData;
 				//
 				//rawData chart data 구성하기
@@ -1216,40 +1206,8 @@ const defaultData = {
 	rowGridSelectData: null,
 	/* Griddata 세팅 */
 	rowGrid: {
-    data: [
+		data: [],
-      {
+		column: [],
-        eqpmGrpNm: "냉동기고온",
-        eqpmGrpId: "UT_HT_CH201",
-        eqpmId: "UT_HT_CH201",
-        eqpmNm: "UT_HT_CH201",
-        tagId: "ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV",
-        tagNm: "ICHEON 고온 냉동기 201호기 - 회로1 전류A",
-        // rowStat: "I",
-      },
-      {
-        eqpmGrpNm: "냉동기고온",
-        eqpmGrpId: "UT_HT_CH201",
-        eqpmId: "UT_HT_CH201",
-        eqpmNm: "UT_HT_CH201",
-        tagId: "ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV",
-        tagNm: "ICHEON 고온 냉동기 201호기 - 회로1 전류A",
-        // rowStat: "I",
-      },
-    ],
-    column: [
-      { header: "설비그룹", name: "eqpmGrpNm", align: "left", width: 150 },
-      {
-        header: "설비그룹 ID",
-        name: "eqpmGrpId",
-        align: "center",
-        hidden: true,
-      },
-      { header: "설비ID", name: "eqpmId", align: "left", width: 200 },
-      { header: "설비명", name: "eqpmNm", align: "left", width: 200 },
-      { header: "TAG ID", name: "tagId", align: "left", width: 500 },
-      { header: "TAG 명", name: "tagNm", align: "left" },
-      //   { header: "rowStat", name: "rowStat", align: "center", hidden: true },
-    ],
 		option: {},
 		defaultRow: {
 			eqpmGrpNm: null,

plugins/eChart.js

@@ -52,5 +52,4 @@ use([
 	// ToolboxComponent, // 그래프 이미지 save
 ]);
 
-console.log('echart plugin', echarts)
 Vue.component('VChart', VChart);

plugins/vuetify.js

@@ -10,6 +10,7 @@ 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';
@@ -73,6 +74,9 @@ export default new Vuetify({
 			icoSend: {
 				component: icoSend,
 			},
+			icoExpandAlt: {
+				component: icoExpandAlt,
+			},
 		},
 	},
 });

store/index.js

@@ -197,8 +197,8 @@ export const mutations = {
 
 	// 페이지 그리드 데이터 set
 	setGridData: (state, payload) => {
-		console.log('check:', state.pageData)
+		// console.log('check:', state.pageData)
-		console.log('payload:', payload)
+		// console.log('payload:', payload)
 		// state.pageData['PRG0001']['dashBoard_grid_01'] = {
 		// 	...state.pageData['PRG0001']['dashBoard_grid_01'],
 		// 	data: payload.value,