Remove inline style

assets/scss/common/button.scss

@@ -92,11 +92,8 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
-    .searchFilter{
+    .search-button {
-      .search-button {
+      color: map-deep-get($config, #{$theme}, "search-btn-color");
-        height: 40px;
-        color: map-deep-get($config, #{$theme}, "search-btn-color");
-      }
     }
 
     .v-dialog {
@@ -135,6 +132,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");
+          }
+        }
+      }
     }
   }
 }
@@ -162,3 +168,12 @@
     background:none;
   }
 }
+.ant-btn  {
+  &.expand-btn {
+    .v-icon {
+      span {
+        margin-right: 8px;
+      }
+    }
+  }
+}

assets/scss/common/grid.scss

@@ -98,17 +98,6 @@
   @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/var.scss

@@ -102,7 +102,6 @@ $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,
@@ -239,7 +238,6 @@ $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,

components/common/chartoptions/GaugeChart.js

@@ -1,5 +1,5 @@
 // Gauge chart options
-export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) {
+export default function getGaugeChartOption({ title, value, 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/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 = [
-				{
-					readPlcNm: '서울 본사',
-					name: '본사',
-					_children: [
-						{
-							readPlcNm: '서울 본사 - 1층',
-							name: '1층',
-						},
-						{
-							readPlcNm: '서울 본사 - 2층',
-							name: '2층',
-						},
-					],
 				},
-				{
+			});
-					readPlcNm: '부산 지사',
-					name: '지사',
-					_children: [
-						{
-							readPlcNm: '부산 지사 - A동',
-							name: 'A동',
-							_children: [
-								{
-									readPlcNm: '부산 지사 - A동 1층',
-									name: '1층',
-								},
-								{
-									readPlcNm: '부산 지사 - A동 2층',
-									name: '2층',
-								},
-							],
-						},
-						{
-							readPlcNm: '부산 지사 - B동',
-							name: 'B동',
-						},
-					],
-				},
-				{
-					readPlcNm: '대전 창고',
-					name: '창고',
-				},
-			];
 
-
+			// console.log("treeData", res)
-			// // console.log("treeData", res)
 			let myOptionsTree = {
 				treeColumnOptions: {
 					name: 'readPlcNm',
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 'auto',
 			};
 			if (this.searchParam.isMulti) {
 				myOptionsTree['rowHeaders'] = [{ type: 'checkbox' }];
@@ -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

@@ -12,12 +12,10 @@
 			</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/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="grid-title">공통그룹코드</span>
+			<span class="text-h6">공통그룹코드</span>
 			<div>
 				<Buttons
 					:parentPrgmId="parentPrgmId"
@@ -126,7 +126,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
 							item => item.commCd == value,

components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue

@@ -271,6 +271,63 @@ 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/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;
+			// 				// 	return retVal;
-							// },
+			// 				// },
-						},
+			// 			},
-						{
+			// 			{
-							header: '사용 여부',
+			// 				header: '사용 여부',
-							name: 'useFg',
+			// 				name: 'useFg',
-							minWidth: 100,
+			// 				minWidth: 100,
-							align: 'center',
+			// 				align: 'center',
-							// formatter({ value }) {
+			// 				// formatter({ value }) {
-							// 	value = value === true ? '1' : '0';
+			// 				// 	value = value === true ? '1' : '0';
-							// 	const newValue = _this.pageData.useFgList.filter(
+			// 				// 	const newValue = _this.pageData.useFgList.filter(
-							// 		item => item.commCd == value,
+			// 				// 		item => item.commCd == value,
-							// 	);
+			// 				// 	);
-							// 	return newValue[0].commCdNm;
+			// 				// 	return newValue[0].commCdNm;
-							// },
+			// 				// },
-						},
+			// 			},
-					]
+			// 		]
 
-				}
+			// 	}
-			}
+			// }
 		};
 	},
 	computed: {
@@ -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,128 +164,129 @@ export default {
 				value: myOptions,
 			});
 
-			// const _this = this;
+			const _this = this;
-			// let useFgSelectList = [];
+			let useFgSelectList = [];
-			// this.pageData.useFgList.forEach(item => {
+			this.pageData.useFgList.forEach(item => {
-			// 	const it = { text: item.commCdNm, value: item.commCd };
+				const it = { text: item.commCdNm, value: item.commCd };
-			// 	useFgSelectList.push(it);
+				useFgSelectList.push(it);
-			// });
+			});
-			// let addInfoList = [];
+			let addInfoList = [];
-			// this.pageData.addInfoList.forEach(item => {
+			this.pageData.addInfoList.forEach(item => {
-			// 	const it = { text: item.addInfoNm, value: item.addInfoId };
+				const it = { text: item.addInfoNm, value: item.addInfoId };
-			// 	addInfoList.push(it);
+				addInfoList.push(it);
-			// });
+			});
-			// let addInfoDataKindList = [];
+			let addInfoDataKindList = [];
-			// this.pageData.addInfoDataKindList.forEach(item => {
+			this.pageData.addInfoDataKindList.forEach(item => {
-			// 	const it = { text: item.commCdNm, value: item.commCd };
+				const it = { text: item.commCdNm, value: item.commCd };
-			// 	addInfoDataKindList.push(it);
+				addInfoDataKindList.push(it);
-			// });
+			});
 
-			// const myColumns = [
+			const myColumns = [
-			// 	{ header: '회사 ID', name: 'comId', hidden: true },
+				{ header: '회사 ID', name: 'comId', hidden: true },
-			// 	{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
+				{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
-			// 	{
+				{
-			// 		header: '추가 정보',
+					header: '추가 정보',
-			// 		name: 'addInfoId',
+					name: 'addInfoId',
-			// 		align: 'left',
+					align: 'left',
-			// 		formatter({ value }) {
+					formatter({ value }) {
-			// 			let retVal = '';
+						let retVal = '';
-			// 			const newValue = addInfoList.filter(item => item.value == value);
+						const newValue = addInfoList.filter(item => item.value == value);
-			// 			if (newValue.length > 0) {
+						if (newValue.length > 0) {
-			// 				retVal = newValue[0].text;
+							retVal = newValue[0].text;
-			// 			}
+						}
-			// 			return retVal;
+						return retVal;
-			// 		},
+					},
-			// 	},
+				},
-			// 	{
+				{
-			// 		header: 'Data 구분',
+					header: 'Data 구분',
-			// 		name: 'addInfoDataKind',
+					name: 'addInfoDataKind',
-			// 		align: 'center',
+					align: 'center',
-			// 		formatter({ value }) {
+					formatter({ value }) {
-			// 			let retVal = '';
+						let retVal = '';
-			// 			const newValue = addInfoDataKindList.filter(
+						const newValue = addInfoDataKindList.filter(
-			// 				item => item.value == value,
+							item => item.value == value,
-			// 			);
+						);
-			// 			if (newValue.length > 0) {
+						if (newValue.length > 0) {
-			// 				retVal = newValue[0].text;
+							retVal = newValue[0].text;
-			// 			}
+						}
-			// 			return retVal;
+						return retVal;
-			// 		},
+					},
-			// 		// editor: {
+					// editor: {
-			// 		//   type: "select",
+					//   type: "select",
-			// 		//   options: {
+					//   options: {
-			// 		//     listItems: addInfoDataKindList
+					//     listItems: addInfoDataKindList
-			// 		//   }
+					//   }
-			// 		// }
+					// }
-			// 	},
+				},
-			// 	{
+				{
-			// 		header: '숫자 값',
+					header: '숫자 값',
-			// 		name: 'addInfoNumVal',
+					name: 'addInfoNumVal',
-			// 		align: 'right',
+					align: 'right',
-			// 		editor: 'text',
+					editor: 'text',
-			// 		hidden: true,
+					hidden: true,
-			// 	},
+				},
-			// 	{
+				{
-			// 		header: '문자 값',
+					header: '문자 값',
-			// 		name: 'addInfoTxtVal',
+					name: 'addInfoTxtVal',
-			// 		align: 'left',
+					align: 'left',
-			// 		editor: 'text',
+					editor: 'text',
-			// 		hidden: true,
+					hidden: true,
-			// 	},
+				},
-			// 	{
+				{
-			// 		header: '추가 정보 값',
+					header: '추가 정보 값',
-			// 		name: 'addInfoVal',
+					name: 'addInfoVal',
-			// 		align: 'center',
+					align: 'center',
-			// 		renderer: {
+					renderer: {
-			// 			type: NewCustomRenderer,
+						type: NewCustomRenderer,
-			// 		},
+					},
-			// 		editor: {
+					editor: {
-			// 			type: NewCustomEditor,
+						type: NewCustomEditor,
-			// 		},
+					},
-			// 		formatter(data) {
+					formatter(data) {
-			// 			return data.row.addInfoDataKind;
+						return data.row.addInfoDataKind;
-			// 		},
+					},
-			// 	},
+				},
-				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
+				// {
-				// formatter({ value, row , column}) {
+				// 	header: "추가 정보 값", name: "addInfoVal", align: "center", editor: "text",
-				//   console.log("addInfoVal row : ", row);
+				// 	formatter({ value, row, column }) {
-				//   console.log("addInfoVal state : ", column);
+				// 		console.log("addInfoVal row : ", row);
-				//   if(row.addInfoDataKind === "NUM"){
+				// 		console.log("addInfoVal state : ", column);
-				//     column.align = "right";
+				// 		if (row.addInfoDataKind === "NUM") {
-				//   }else{
+				// 			column.align = "right";
-				//     column.align = "left";
+				// 		} else {
-				//   }
+				// 			column.align = "left";
-				//   return value;
+				// 		}
-				// }
+				// 		return value;
-				//},
+				// 	}
+				// },
 				/*{
-          header: "사용여부",
+		  header: "사용여부",
-          name: "useFg",
+		  name: "useFg",
-          align: "center",
+		  align: "center",
-          formatter({ value }) {
+		  formatter({ value }) {
-            return value == "1" ? "사용" : "사용안함";
+			return value == "1" ? "사용" : "사용안함";
-          },
+		  },
-          editor: {
+		  editor: {
-            type: "select",
+			type: "select",
-            options: {
+			options: {
-              // listItems: useFgSelectList
+			  // listItems: useFgSelectList
-              listItems: [
+			  listItems: [
-                {text:"사용", value:"1"},
+				{text:"사용", value:"1"},
-                {text:"사용안함", value:"0"},
+				{text:"사용안함", value:"0"},
-              ]
+			  ]
-            }
+			}
-          }
+		  }
-        },*/
+		},*/
-				// { header: '등록 사용자', name: 'regUserNo', hidden: true },
+				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
-				// { header: '등록 일자', name: 'regDttm', hidden: true },
+				{ header: '등록 일자', name: 'regDttm', hidden: true },
-				// { header: '수정 사용자', name: 'procUserNo', hidden: true },
+				{ header: '수정 사용자', name: 'procUserNo', hidden: true },
-				// { header: '수정 일자', name: 'procDttm', hidden: true },
+				{ header: '수정 일자', name: 'procDttm', hidden: true },
-			// ];
+			];
 
-			// this.setGridColumn({
+			this.setGridColumn({
-			// 	gridKey: this.gridName,
+				gridKey: this.gridName,
-			// 	value: myColumns,
+				value: myColumns,
-			// });
+			});
 
 			this.loadGrid = true;
 		},
@@ -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: {

pages/comm/base/CommCdMngPage.vue

@@ -1,65 +1,33 @@
 <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="3">
+						<v-col :cols="4">
 							<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="3">
+						<v-col :cols="4">
 							<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="3">
+						<v-col :cols="4" class="text-right">
-							<InputText
+							<BtnSearch @click="search" />
-								: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"
@@ -80,7 +48,7 @@
 								:textCols="8"
 							/>
 						</v-col>
-					</v-row> -->
+					</v-row>
 				</v-card>
 			</v-col>
 		</v-row>
@@ -117,7 +85,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" >
+						<v-tabs v-model="tab" :hide-slider="true">
 							<v-tab
 								v-for="item in items"
 								:key="item.id"
@@ -164,7 +132,6 @@ 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;
@@ -191,7 +158,6 @@ export default {
 		Form,
 		CommCdTab,
 		Grid,
-		PageTitle
 	},
 	data() {
 		return {
@@ -263,9 +229,6 @@ export default {
 
 			const myOptions = {
 				scrollX: false,
-				header: {
-					height: 38,
-				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -278,7 +241,7 @@ export default {
 				{
 					header: '시스템구분',
 					name: 'sysDivCd',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let commCdNm = '';
 						if (sysCdList.length > 0) {
@@ -315,7 +278,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
 							item => item.commCd == value,
@@ -591,10 +554,7 @@ const myDetail = [
 		valueNm: 'commGrpCd',
 		disabled: true,
 		cols: 6,
-		labelCols: 12,
+		class: 'py-2',
-		textCols: 12,
-		iconShow: true,
-		class: 'py-2 pr-2',
 		required: true,
 	},
 	{
@@ -603,10 +563,7 @@ const myDetail = [
 		valueNm: 'commGrpNm',
 		disabled: false,
 		cols: 6,
-		labelCols: 12,
+		class: 'py-2',
-		textCols: 12,
-		iconShow: true,
-		class: 'py-2 pl-2',
 		required: true,
 	},
 	{
@@ -615,10 +572,7 @@ const myDetail = [
 		valueNm: 'sysDivCd',
 		disabled: false,
 		cols: 6,
-		labelCols: 12,
+		class: 'py-2',
-		textCols: 12,
-		iconShow: true,
-		class: 'py-2 pr-2 mt-3',
 		list: 'sysDivCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -630,10 +584,7 @@ const myDetail = [
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		labelCols: 12,
+		class: 'py-2',
-		textCols: 12,
-		iconShow: true,
-		class: 'py-2 pl-2 mt-10',
 		value: { '1': true, '0': false },
 		required: true,
 	},
@@ -643,10 +594,7 @@ const myDetail = [
 		valueNm: 'rmrk',
 		disabled: false,
 		cols: 6,
-		labelCols: 12,
+		class: 'py-2',
-		textCols: 12,
-		iconShow: true,
-		class: 'py-2 pr-2 mt-3',
 	},
 ];
 </script>

pages/ems/base/EffcIdxMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<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,
@@ -508,12 +470,12 @@ export default {
 					this.$refs[this.gridName].focus({
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-								this.pageData.rowGridSelectKey == null
+							this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-									this.$refs[this.gridName].getData().length - 1
+								  this.$refs[this.gridName].getData().length - 1
-									? this.pageData.rowGridSelectKey
+								? this.pageData.rowGridSelectKey
-									: 0,
+								: 0,
 						columnName: 'readPlcNm',
 						setScroll: true,
 					});
@@ -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,7 +12,6 @@
 								:textCols="12"
 								:labelCols="12"
 								:parentPrgmId="myPrgmId"
-								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -23,7 +22,6 @@
 								dataKey="searchErcKind"
 								:sendParam="{ commGrpCd: 'EM_ERCKIND', useFg: '1' }"
 								:addAll="true"
-								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -36,9 +34,13 @@
 								: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'"
@@ -47,11 +49,8 @@
 								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'"
@@ -60,7 +59,6 @@
 								dataKey="useFg"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:addAll="true"
-								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -71,14 +69,8 @@
 								: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>
@@ -331,9 +323,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				header: {
-					height: 38,
-				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -343,12 +332,12 @@ export default {
 			const _this = this;
 			const myColumns = [
 				{ header: '회사 ID', name: 'comId', hidden: true },
-				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'left' },
+				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'center' },
 				{ header: '에너지원명', name: 'ercNm', align: 'left' },
 				{
 					header: '에너지원 유형',
 					name: 'ercKind',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.ercKindList.filter(
@@ -461,7 +450,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					width: 95,
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -490,24 +479,74 @@ 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,
@@ -759,8 +798,133 @@ 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">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>

pages/ems/base/GdIdxMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -41,7 +42,7 @@
 							<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>

pages/ems/base/GdStndMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>

pages/ems/effc/EnrgEffcTotSummPage.vue

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

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,
+			},
 		},
 	},
 });