Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729

assets/scss/common.scss

@@ -144,7 +144,7 @@ a {
 
   & .router-tab__container {
     overflow-y: auto;
-    min-height: calc(100vh - 105px);
+    height: calc(100vh - 105px);
     max-height: calc(100vh - 105px);
     padding: 20px;
   }
@@ -487,7 +487,7 @@ a {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
 
       .menu-container {
-        max-height: calc(100vh - 60px);
+        height:calc(100vh - 60px);
         overflow-y: auto;
       }
     }

assets/scss/common/grid.scss

@@ -134,11 +134,11 @@
       }
 
       &-body-container{
-        border-right: 1px solid;
+        border-right: 0;
-        border-right-color: map-deep-get($config,
+        // border-right-color: map-deep-get($config,
-          #{$theme},
+        //   #{$theme},
-          "tui-grid-cell-borderColor"
+        //   "tui-grid-cell-borderColor"
-        );
+        // );
         width: auto !important;
       }
 
@@ -151,24 +151,27 @@
           width: $scrollbar-width !important;
           height: $scrollbar-width !important;
           -webkit-appearance: initial;
-          background-color: map-deep-get($config,
+          // background-color: map-deep-get($config,
-            #{$theme},
+          //   #{$theme},
-            "scrollbar-track"
+          //   "tui-grid-cell-borderColor"
-          ) !important;
+          // ) !important;
+          background-color: rgba(0, 0, 0, 0) !important;
           border-radius: 3px !important;
         }
 
         & ::-webkit-scrollbar-track {
-          background-color: map-deep-get($config,
+          // background-color: map-deep-get($config,
-            #{$theme},
+          //   #{$theme},
-            "scrollbar-track"
+          //   "tui-grid-cell-borderColor"
-          ) !important;
+          // ) !important;
+          background-color: rgba(0, 0, 0, 0) !important;
         }
 
         & ::-webkit-scrollbar-thumb {
           width: 50px !important;
           height: 50px !important;
           background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
+          // background-color: rgba(0, 0, 0, 0);
           border-radius: 3px;
         }
 
@@ -195,6 +198,7 @@
       &-scrollbar-right-top {
         background-color: rgba(0, 0, 0, 0);
         border: none;
+        display: none;
         // background-color: map-deep-get(
         //   $config,
         //   #{$theme},
@@ -221,12 +225,13 @@
         width: $scrollbar-width !important;
         height: $scrollbar-width !important;
         // display: none !important;
-        border-color: map-deep-get($config, #{$theme}, "scrollbar-track");
+        border-color: map-deep-get($config, #{$theme}, "cardBackground");
-        background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
+        background-color: map-deep-get($config, #{$theme}, "cardBackground");
         // border: none !important;
         // bottom: -1px;
         // right: -2px;
         box-sizing: border-box;
+        // display: none;
       }
 
       &-scrollbar-frozen-border,
@@ -236,13 +241,9 @@
         border-color: transparent !important;
       }
 
-      // &-body-area {
+      &-body-area,
-      //   overflow: auto !important;
-      // }
-
       &-container,
       &-layer-state,
-      &-body-area,
       &-summary-area,
       &-cell {
         background-color: map-deep-get($config,
@@ -254,12 +255,23 @@
           "tui-grid-border-vertical-color"
         );
 
-        &-current-row{
+        // &-current-row{
-          td {
+        // }
+        td.row-selected {
           .custom-radio {
+            background-color: map-deep-get($config,
+              #{$theme},
+              "ant-btn-primary-color"
+            );
             .radio-mark{
-                border-color: #1677ff;
+              border-color: map-deep-get($config,
-                background-color: #fff;
+                #{$theme},
+                "arow-line-color"
+              );
+              background-color: map-deep-get($config,
+                #{$theme},
+                "arow-line-btn-bg-color"
+              );
               &::after {
                 content: "";
                 position: absolute;
@@ -269,8 +281,10 @@
                 height: 11px;
                 width: 11px;
                 border-radius: 50%;
-                  background-color: #1677ff;
+                background-color: map-deep-get($config,
-                }
+                  #{$theme},
+                  "arow-line-color"
+                );
               }
             }
           }
@@ -302,8 +316,8 @@
       &-header-area,
       &-cell-header {
         // font-family: inherit;
+        // font-style: Semi Bold;
         font-weight: 600;
-        font-style: Semi Bold;
         background-color: map-deep-get($config,
           #{$theme},
           "tui-grid-header-backgroundColor"
@@ -320,8 +334,13 @@
       }
 
       &-header-area {
-        background-color: none;
+        // background-color: none;
         border: none;
+        margin-right: 0 !important;
+        background-color: map-deep-get($config,
+          #{$theme},
+          "tui-grid-cell-backgroundColor"
+        );
       }
 
       &-row-odd,

assets/scss/common/input.scss

@@ -188,7 +188,7 @@
   transform: translateY(-50%);
   height: 18px;
   width: 18px;
-  background-color: white;
+  // background-color: white;
   border: 2px solid #ccc;
   border-radius: 50%;
   transition: all 0.2s ease;
@@ -263,9 +263,6 @@
         "v-input-backgroundColor"
       );
 
-
-      
-
       &:not(.v-input--radio-group, .v-input--checkbox) {
         .v-input__slot {
           background-color: map-deep-get($config,
@@ -372,6 +369,17 @@
         }
       }
     }
+
+    .radio-mark {
+      background-color: map-deep-get($config,
+        #{$theme},
+        "ant-btn-primary-color"
+      );
+      border-color: map-deep-get($config,
+        #{$theme},
+        "v-input-textarea-border"
+      );
+    }
   }
 
   .v-radio {

assets/scss/datepicker.scss

@@ -14,10 +14,13 @@
       position: relative;
       border-radius: 6px;
       border: solid 1px;
-      height: 40px;
+      height: 32px;
       // border-color: #424242;
       border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
+      &.datepicker-large {
+        height: 40px;
+      }
     
       .v-input {
 

assets/scss/var.scss

@@ -108,7 +108,7 @@ $config: (
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
-    tui-grid-border-vertical-color: #212224,
+    tui-grid-border-vertical-color: #FFFFFF0F,
     tui-grid-cell-backgroundColor: #212224,
     tui-grid-cell-color: #fff,
     tui-grid-cell-insert-color: #13636c,

components/common/Datepicker.vue

@@ -9,7 +9,7 @@
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div class="datepicker-container" >
+			<div :class="['datepicker-container', customClass]"  >
 				<v-text-field
 					id="startpicker"
 					ref="startpicker"
@@ -93,7 +93,12 @@ export default {
 			type:Boolean,
 			require:false,
 			default: true
-		}
+		},
+		customClass: {
+			type: String,
+			require: false,
+		},
+
 	},
 	data() {
 		return {

components/common/Grid.vue

@@ -4,12 +4,13 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
-		@focusChange="focusChangeEvt"
+		@mousedown="onMousedown"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
+		@focusChange="focusChangeEvt"
 	/>
 </template>
 <script>
@@ -107,16 +108,13 @@ export default {
 		},
 		chkGridOptions() {
 			const options = {
-				// bodyHeight: 'fitToContent',
-				scrollX: false,
-				scrollY: false,
 				...this.gridData.option,
-				useIcon: false,
 			};
 			options.treeColumnOptions = {
 				useIcon: false,
 				...options.treeColumnOptions,
 			};
+
 			return options;
 		},
 		defaultRow() {
@@ -163,7 +161,7 @@ export default {
 	},
 	created() {},
 	async mounted() {
-		// console.log('--------------DEBUG----gridData: ', this.gridData);
+		// console.log(this.dataPath);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
@@ -186,13 +184,13 @@ export default {
 		}),
 		// true : 현재 행 혹은 연결된 그리드가 수정중인 상태
 		checkGridState() {
-			var rowStatList = ['I', 'U', 'D'];
+			const rowStatList = ['I', 'U', 'D'];
-			var row = this.gridInstance.invoke('getFocusedCell');
+			const row = this.gridInstance.invoke('getFocusedCell');
 
 			if (row) {
-				var rowData = this.gridInstance.invoke('getRow', row.rowKey);
+				const rowData = this.gridInstance.invoke('getRow', row.rowKey);
 				if (rowData) {
-					var rowStat = rowData['rowStat'];
+					const rowStat = rowData['rowStat'];
 					if (rowStatList.includes(rowStat)) {
 						return true;
 					}
@@ -200,8 +198,8 @@ export default {
 			}
 
 			if (this.preventFocusChangeEventTargetGridList) {
-				for (var gridInstance of this.preventFocusChangeEventTargetGridList) {
+				for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
-					var dataArr = gridInstance.save();
+					const dataArr = gridInstance.save();
 
 					if (dataArr.length > 0) {
 						return true;
@@ -253,9 +251,11 @@ export default {
 			this.gridInstance.invoke('check', rowData.rowKey, instance);
 		},
 		setSelectionRange(rowKey) {
+			// console.log("------------------DEBUG-------setSelectionRange:", rowKey);
 			const rowDatas = this.gridInstance.invoke('getData');
 			rowDatas.forEach(item => {
 				if (item.rowKey == rowKey) {
+					// console.log("------------------DEBUG-------setSelectionRange---item:", item);
 					this.gridInstance.invoke(
 						'addRowClassName',
 						item.rowKey,
@@ -270,7 +270,12 @@ export default {
 				}
 			});
 		},
+		onMousedown(evt) {
+			// console.log("------------------DEBUG-------onMousedown:", evt);
+			this.focusChangeEvt(evt);
+		},
 		focusChangeEvt(e) {
+			// console.log("------------------DEBUG-------focusChangeEvt:", e);
 			// console.log('focusChangeEvt1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent focusChangeEvt')
@@ -291,6 +296,7 @@ export default {
 			this.sendSelectedRowData(e.rowKey);
 		},
 		startEditing(e) {
+			// console.log("------------------DEBUG-------startEditing:", e);
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent startEditing')
@@ -317,6 +323,7 @@ export default {
 			}
 		},
 		async editingFinish(e) {
+			// console.log('------------------DEBUG-------editingFinish:', e);
 			// console.log("Editing END E::", e);
 			// editor 간 이동시 수정되는 문제 수정
 			// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
@@ -666,8 +673,6 @@ 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;
@@ -680,6 +685,7 @@ export default {
 						? this.gridInstance.invoke('getFocusedCell').rowKey
 						: eventRowKey;
 				var rowData = this.gridInstance.invoke('getRow', rowKey);
+				// console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey});
 				this.$emit('sendSelectedRowStatInfo', rowData);
 			}
 		},
@@ -705,11 +711,6 @@ export default {
 </script>
 <style scoped lang="scss">
 ::v-deep .tui-grid-container {
-	
-	// .tui-grid-body-area {
-	// 	overflow: hidden !important;
-	// }
-
 	.tui-grid-content-area {
 		.tui-grid-cell-content {
 			input[type='number'] {

components/common/PastRsltDatePicker.vue

@@ -2,7 +2,9 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon>
+				<v-icon small color="primary" 
+				:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+				>$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
@@ -17,14 +19,16 @@
 					readonly
 					outlined
 				>
-					<template #append>
+					<template #append >
-						<v-icon size="20">$icoCalendar</v-icon>
+						<v-icon size="20" v-show="!isRange">$icoCalendar</v-icon>
 					</template>
 					<template #append-outer>
 						<div ref="startpicker-container" id="startpicker-container"></div>
 					</template>
 				</v-text-field>
-				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div>
+				<div v-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
+					<img :src="arrowIcon" alt="">
+				</div>
 				<v-text-field
 					v-show="isRange"
 					id="endpicker"
@@ -129,6 +133,12 @@ export default {
 				this.defaultRange === 'no limite'
 			);
 		},
+		arrowIcon() {
+			if(this.isDarkMode){
+				return require('@/assets/images/arrow_datepicker_dm.png');
+			}
+			return require('@/assets/images/arrow_datepicker.png');
+		}
 	},
 	watch: {
 		myCmCycle() {

components/common/ThemeSwitch.vue

@@ -31,8 +31,8 @@ export default {
 			this.mode = !this.mode;
 			this.$vuetify.theme.isDark = this.mode;
 			this.setThemeChange(this.mode);
-			console.log(this.mode)
+			// console.log(this.mode)
-			console.log(this.$vuetify.theme.isDark)
+			// console.log(this.$vuetify.theme.isDark)
 		},
 	},
 };

components/common/chartoptions/LineChart.js

@@ -16,6 +16,7 @@ export default function getLineChartOption({
         const color = item.color || defaultColors[index % defaultColors.length];
         return {
             ...item,    
+            showSymbol: true,       // Show symbol at each data point
             itemStyle: {
                 color,
             },
@@ -27,9 +28,9 @@ export default function getLineChartOption({
             left: '3%',
             right: '5%',
             top: '25%',
+            bottom: '0%',
             containLabel: true,
         },
-
         legend: {
             // data: legendData,
             icon: 'circle',
@@ -37,7 +38,7 @@ export default function getLineChartOption({
             right: '5%',
             orient: 'horizontal',
             textStyle: {
-                color: isDarkMode ? '#676A7B' : '#676A7B',
+                color: isDarkMode ? 'white' : '#676A7B',
             },
         },
         xAxis: {

components/common/form/InputNumber.vue

@@ -125,7 +125,7 @@ export default {
 		modifyValue(e) {
 			let val = e.target.value.replace(/[^-.0-9]/g, '');
 
-			console.log('val : ', val);
+			// console.log('val : ', val);
 
 			if(this.item.min != undefined && parseFloat(val) < this.item.min){
 				val = this.item.min;
@@ -134,7 +134,7 @@ export default {
 			if(this.item.max != undefined && parseFloat(val) > this.item.max){
 				val = this.item.max;
 			}
-			console.log('val2 : ', val);
+			// console.log('val2 : ', val);
 
 			this.textValue = val;
 			// this.textValue = this.validateNumber(val);

components/common/modal/DrSimulSlctPop.vue

@@ -152,12 +152,12 @@ export default {
 				const snarData = this.searchParam.isMulti
 					? this.searchParam.snarInfoList
 					: this.searchParam.snarInfo;
-				console.log('this.searchParam.isMulti', this.searchParam.isMulti);
+				// console.log('this.searchParam.isMulti', this.searchParam.isMulti);
-				console.log(
+				// console.log(
-					'this.searchParam.snarInfoList',
+				// 	'this.searchParam.snarInfoList',
-					this.searchParam.snarInfoList,
+				// 	this.searchParam.snarInfoList,
-				);
+				// );
-				console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
+				// console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
 				if (Array.isArray(snarData)) {
 					if (snarData.length > 0) {
 						for (const item of snarData) {

components/common/modal/DrSnarExecPop.vue

@@ -394,7 +394,7 @@ export default {
 					params: {},
 				},
 			});
-			console.log('statusCd', statusCd);
+			// console.log('statusCd', statusCd);
 			if (statusCd.data.retnCd == 0) {
 				const params2 = {
 					simulationId: statusCd.data.dataset.simulId,

components/common/modal/EgrpPysclQtyPop.vue

@@ -22,6 +22,7 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
+
 				<div class="px-6 py-4 pt-0">
 					<v-row align="center">
 						<v-col :cols="5">
@@ -46,11 +47,10 @@
 										v-model="searchWord" @keyup.enter="search"><template v-slot:append>
 											<!-- Custom SVG icon -->
 											<v-icon>$icoSearch</v-icon>
-
 										</template></v-text-field>
 								</v-col>
 								<v-spacer></v-spacer>
-								<v-col cols="3" class="text-right">
+								<v-col :cols="3" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
 										class="search-button">조회</a-button>
 									<!-- <v-btn :ripple="false" @click="initSearch()">
@@ -59,17 +59,26 @@
 								</v-col>
 							</v-row>
 						</v-col>
-					</v-row>
+						<v-col :cols="12">
-
+							<div style="height: 50vh;">
-				</div>
+								<div ref="modalGridParent" class="h100 py-4">
-
-				<div :style="'height: calc(50vh)'">
-					<div ref="modalGridParent" class="h100 px-6 py-4">
 									<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
 										:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
 										@getRowsData="getRowData" @dblClick="setUpdate($event)" />
 								</div>
 							</div>
+						</v-col>
+					</v-row>
+				</div>
+
+				<!-- <div style="height: 50vh;">
+					<div ref="modalGridParent" class="h100 px-6 py-4">
+						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
+							:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
+							@getRowsData="getRowData" @dblClick="setUpdate($event)" />
+					</div>
+				</div> -->
+
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
 
 					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>

components/common/modal/EqpmSelectPop_bk.vue

@@ -286,8 +286,8 @@ export default {
 			// Row selection config
 			rowSelection: {
 				onChange: (selectedRowKeys, selectedRows) => {
-					console.log('Selected Row Keys:', selectedRowKeys);
+					// console.log('Selected Row Keys:', selectedRowKeys);
-					console.log('Selected Rows:', selectedRows);
+					// console.log('Selected Rows:', selectedRows);
 				},
 			}
 		};
@@ -332,7 +332,7 @@ export default {
 		// 	this.getRowGridData();
 		// },
 		searchFab() {
-			console.log('tttttttttttt')
+			// console.log('tttttttttttt')
 			// this.filteredData = this.data.filter(item => {
 			// 	const matchGrp = this.eqpmGrpSelected ? item.group === this.eqpmGrpSelected : true;
 			// 	const matchFab = this.localFabSelected ? item.fab === this.localFabSelected : true;

components/common/modal/EvtObjPop.vue

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box" align="center">
+	<v-row class="search-box no-gutters" align="center">
 		<v-col :cols="option.labelCols" class="py-0">
 			<label for="" class="search-box-label">
 				<v-icon v-if="item.iconShow" small
@@ -8,13 +8,11 @@
 			</label>
 		</v-col>
 		<v-col :cols="option.textCols" class="py-0">
-			<v-text-field readonly append-icon="" class="v-input__custom" outlined :hide-details="true"
+			<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
-				v-model="searchWord" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
+				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)" style="padding: 0;"
 				:required="item.required || false"><template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
-
-
 				</template></v-text-field>
 		</v-col>
 
@@ -43,8 +41,6 @@
 								class="search-button">조회</a-button>
 						</v-row>
 					</v-col>
-
-
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
 				<div :style="'height: 600px'" class="px-5">

components/common/modal/FixedValueModiPop.vue

@@ -126,7 +126,7 @@ export default {
 		async chkDialog(val) {
 			if (val) {
 				// 열릴 때
-				console.log('dsfafds');
+				// console.log('dsfafds');
 				await this.getData();
 				// console.log("chkDialog: ", val);
 				// if(this.searchParam.selecUserList.length > 0){

components/common/modal/FtnPlcFormPop.vue

@@ -22,8 +22,8 @@
 				outlined
 				:hide-details="true"
 			>
-			<template v-slot:append>
 			<!-- Custom SVG icon -->
+			<template v-slot:append>
 				<v-icon>$icoSearch</v-icon>
 			</template>
 		</v-text-field>
@@ -31,28 +31,20 @@
 
 		<v-dialog v-model="dialog" scrollable width="700px">
 			<v-card style="height: 100%">
-				<v-card-title class="pa-5 d-flex align-center justify-space-between">
+				<v-card-title class="px-6 py-4 d-flex align-center justify-space-between">
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
-					<v-btn
+					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
-						icon
-						tile
-						:ripple="false"
-						@click="dialogOpenCloseEvent(dialog)"
-					>
-						<v-icon>mdi-close</v-icon>
-					</v-btn>
 				</v-card-title>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
-						<v-col :cols="3">
+						<v-col :cols="12">
 							<label for="" class="search-box-label">
-								<v-icon x-small color="primary" class="mr-1"
+								<!-- <v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon> -->
-									>mdi-record-circle</v-icon
+								<v-icon small :class="['mr-1 icon-blue']">$icoBulletPoint</v-icon>
-								>
 								검색
 							</label>
 						</v-col>
-						<v-col :cols="5">
+						<v-col :cols="9">
 							<v-text-field
 								append-icon="mdi-magnify"
 								class="v-input__custom"
@@ -63,21 +55,19 @@
 							></v-text-field>
 						</v-col>
 						<v-spacer></v-spacer>
-						<v-col cols="4" class="text-right">
+						<v-col :cols="3" class="text-right">
-							<v-btn :ripple="false" @click="search()">
+							<a-button type="primary" @click="search()" icon="search">
 								조회
-							</v-btn>
+							</a-button>
-							<v-btn :ripple="false" @click="initSearch()">
+							<a-button @click="initSearch()">
 								초기화
-							</v-btn>
+							</a-button>
 						</v-col>
 					</v-row>
 				</div>
-				<v-divider></v-divider>
+			<!-- <v-divider></v-divider> -->
-				<!-- <div :style="'height: calc(65vh)'"> -->
+				<div style="height: 429px;" class="py-3 px-5">
-					<div :style="'height: 429px;'">
+					<div ref="modalGridParent" class="h100 w100">
-					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
-					<div ref="modalGridParent" class="h100 w100 py-3">
 						<component
 							:is="loadGrid && dialog ? 'Grid' : null"
 							:gridName="grid_01"
@@ -88,11 +78,9 @@
 						/>
 					</div>
 				</div>
-				<v-card-actions class="pa-5 d-flex align-center justify-center">
+				<v-card-actions class="pa-5 d-flex align-center justify-end">
-					<v-btn :ripple="false" @click="setUpdate($event)">확인</v-btn>
+					<a-button class="mr-2" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
-					<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)"
+					<a-button type="primary" @click="setUpdate($event)">확인</a-button>
-						>닫기</v-btn
-					>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -336,7 +324,7 @@ export default {
 				}))
 			};
 
-			console.log(res);
+			// console.log(res);
 			
 			this.setModalGridData({
 				modalKey: this.myModalKey,
@@ -395,7 +383,31 @@ var FtnPlcFormPop = {
 </script>
 
 <style lang="scss" scoped>
+// @each $theme in dark, light {
+// 	@include theme($theme);
+// 	.v-application.#{$theme}-mode {
+// 		.v-input--is-readonly {
+// 			border-color: map-deep-get($config,
+// 				#{$theme},
+// 				"v-input-readonly-border-color"
+// 			);
+// 			::v-deep {
+// 				&:not(.v-input--radio-group, .v-input--checkbox) {
+// 					.v-input__slot {
+// 						background-color: map-deep-get($config,
+// 							#{$theme},
+// 							"v-input-backgroundColor"
+// 						) !important;
+// 					}
+// 				}
+// 			}
+
+// 		}
+// 	}
+// }
+
 ::v-deep {
+
 	.v-dialog {
 		overflow-y: hidden !important;
 	}
@@ -418,26 +430,4 @@ var FtnPlcFormPop = {
 	}
 }
 
-@each $theme in dark, light {
-	.v-application.#{$theme}-mode {
-		.v-dialog {
-			.v-card {
-				&__title {
-					color: map-deep-get($color, 'white', '0');
-					@if $theme == dark {
-						background-color: #2d3355;
-						.v-btn {
-							background-color: #2d3355;
-						}
-					} @else {
-						background-color: #3f4d7d;
-						.v-btn {
-							background-color: #3f4d7d;
-						}
-					}
-				}
-			}
-		}
-	}
-}
 </style>

components/common/modal/FtnPlcMultiPop3.vue

@@ -294,10 +294,10 @@ export default {
 			if (this.searchParam.energyCd < 0) {
 				roiIdVal = null;
 			} else {
-				console.log(
+				// console.log(
-					'this.searchParam.energyList[this.searchParam.energyCd]',
+				// 	'this.searchParam.energyList[this.searchParam.energyCd]',
-					this.searchParam.energyList[this.searchParam.energyCd],
+				// 	this.searchParam.energyList[this.searchParam.energyCd],
-				);
+				// );
 				roiIdVal = this.searchParam.energyList[this.searchParam.energyCd + 1]
 					.cd;
 			}

components/common/modal/OnlnBaseEccPop.vue

@@ -239,13 +239,13 @@ export default {
 			this.selectedData.eccNm = '';
 
 			if (this.bindOption === null) {
-				console.log('this.bindOption is null...');
+				// console.log('this.bindOption is null...');
 				this.setPageData({
 					modalEccId: '',
 					modalEccNm: '',
 				});
 			} else {
-				console.log('this.bindOption is not null...');
+				// console.log('this.bindOption is not null...');
 				this.setPageData({
 					[this.bindOption.eccId]: '',
 					[this.bindOption.eccNm]: '',
@@ -296,12 +296,12 @@ export default {
 						? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
 						: '',
 			});
-			console.log(
+			// console.log(
-				'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
+			// 	'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
-				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
+			// 	localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
-					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
+			// 		? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
-					: '',
+			// 		: '',
-			);
+			// );
 			this.textFieldData =
 				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
 					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')

components/common/modal/PlanPop.vue

@@ -317,14 +317,14 @@ export default {
 			}
 		},
 		strtDt(val) {
-			console.log('strtDt : ', val);
+			// console.log('strtDt : ', val);
 			this.checkStrtAndEndDateTime('start');
 			if (this.startDatepickerInstance3) {
 				this.startDatepickerInstance3.setDate(new Date(this.endDt));
 			}
 		},
 		endDt(val) {
-			console.log('endDt : ', val);
+			// console.log('endDt : ', val);
 			this.checkStrtAndEndDateTime('end');
 			if (this.startDatepickerInstance) {
 				this.startDatepickerInstance.setDate(new Date(this.strtDt));
@@ -339,7 +339,7 @@ export default {
 			this.checkStrtAndEndDateTime('start');
 		},
 		endHh(val) {
-			console.log('endHh : ', val);
+			// console.log('endHh : ', val);
 			this.checkStrtAndEndDateTime('end');
 		},
 		strtMm(val) {

components/common/modal/ReadPlcDisableFuncPop.vue

@@ -253,7 +253,7 @@ export default {
 					readObjid: this.searchParam.energyCd,
 				},
 			});
-			console.log('getTreeData : ', res);
+			// console.log('getTreeData : ', res);
 			// this.treeData = res;
 			// const ROOT = res[0].plcCd;
 			const setTreeData = await this.setTree({
@@ -327,7 +327,7 @@ export default {
 		// 공정/설비 트리 row 클릭이벤트
 		async getRowData(data) {
 			// console.log("getRowData 시작...");
-			console.log('data', data);
+			// console.log('data', data);
 			this.activeRowData = data;
 			// if(data.enableFg == 1){
 			// this.activeRowData = data;

components/common/select/SelectDsEnrg.vue

@@ -70,7 +70,7 @@ export default {
 				return this.searchParam[this.parentPrgmId][this.enrgCd];
 			},
 			set(value) {
-				console.log('value : ', value);
+				// console.log('value : ', value);
 				return this.setPageData({ [this.enrgCd]: value });
 			},
 		},

components/form/CustomInput.vue

@@ -270,8 +270,8 @@ export default {
 			filteredData: [],
 			rowSelection: {
 				onChange: (selectedRowKeys, selectedRows) => {
-					console.log('Selected Row Keys:', selectedRowKeys);
+					// console.log('Selected Row Keys:', selectedRowKeys);
-					console.log('Selected Rows:', selectedRows);
+					// console.log('Selected Rows:', selectedRows);
 				},
 			}
 		};

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -213,7 +213,7 @@ export default {
       let dataArr = [];
       switch (action) {
         case 'add':
-          console.log('add this.pageData : '); // , this.pageData);
+          // console.log('add this.pageData : '); // , this.pageData);
           const defaultRow = {
             dataSetId: this.pageData.dataSetId,
             dataSetNm: this.pageData.dataSetNm,
@@ -296,7 +296,7 @@ export default {
         comId: this.selectedComId,
         dataSetId: this.selectedDataSetId,
       };
-      console.log('data : ', data);
+      // console.log('data : ', data);
       this.$emit('jamoviClickEvent', 'view1', data);
     },
   },

components/pages/ems/EccInfo/EccAddInfoTab.vue

@@ -20,7 +20,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -54,22 +53,10 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			dataPathMock: {
-				"rowDetailGrid": {
-				column: [
-					{ header: '추가 정보', name: 'readObjId', align: 'left' },
-					{ header: 'Data 구분', name: 'readObjNm', align: 'left' },
-					{ header: '추가 정보 값', name: 'readObjKind', align: 'left' },
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {}
-				}
-			},
 		};
 	},
 	computed: {
@@ -444,22 +431,4 @@ export default {
 		},
 	},
 };
-
-const dataPathDataExample = [
-	{
-	readObjId: 'OBJ001',
-	readObjNm: '서울 본사',
-	readObjKind: 'TYPE01',
-	},
-	{
-	readObjId: 'OBJ002',
-	readObjNm: '부산 지사',
-	readObjKind: 'TYPE02',
-	},
-	{
-	readObjId: 'OBJ003',
-	readObjNm: '대전 공장',
-	readObjKind: 'TYPE03',
-	}
-]
 </script>

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -19,7 +19,6 @@
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 		<div>
@@ -60,24 +59,11 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEccIaoGrid',
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
 			detailList: myDetail,
-			dataPathMock: {
-				"rowEccIaoGrid": {
-				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: {
@@ -516,12 +502,4 @@ const myDetail = [
 		iconShow: true,
 	},
 ];
-const dataPathDataExample = [
-	{
-		readObjId: 'OBJ001',
-		readObjNm: '서울 본사',
-		readObjKind: 'TYPE01',
-		grpCd: 'GRP01',
-	},
-]
 </script>

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -1,10 +1,7 @@
 <template>
 	<div>
-		<div
+		<div class="d-flex justify-space-between align-center my-5" >
-			class="d-flex justify-space-between align-center"
+			<span class="txt custom-subtitle-tab">설비 추가 정보</span>
-			style="height: 80px;"
-		>
-			<span class="txt custom-title-4-new">설비 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center" style="height: 80px;">
+		<div class="d-flex justify-space-between align-center my-5" >
-			<span class="txt custom-title-4-new">설비 상수 정보</span>
+			<span class="txt custom-subtitle-tab">설비 상수 정보</span>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
@@ -291,8 +291,8 @@ export default {
 
 						dataArr.map(item => {
 							for (var key of Object.keys(item)) {
-								console.log('key : ', key);
+								// console.log('key : ', key);
-								console.log('item[key] : ', item[key]);
+								// console.log('item[key] : ', item[key]);
 								if (!item[key] && requiredKeyList.includes(key)) {
 									validCheck = false;
 								}

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -1,27 +1,24 @@
 <template>
 	<div>
-		<div
+		<div class="d-flex justify-space-between align-center my-5" >
-			class="d-flex justify-space-between align-center"
+			<span class="txt custom-subtitle-tab">설비 입출력 정보</span>
-			style="height: 80px;"
-		>
-			<span class="txt custom-title-4-new">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
+		<div ref="gridParent" style="height: calc(100vh - 800px);">
-			<!-- :is="loadGrid ? 'Grid' : null" -->
 			<Grid
 				:ref="gridName"
+				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
 			/>
 		</div>
-		<div style="min-height: calc(100vh - 900px);" class="mt-4">
+		<div style="min-height: calc(100vh - 900px);">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -65,22 +62,6 @@ export default {
 
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
-			dataPathMock: {
-        'rowEqpmIaoGrid' : {
-          column: [
-            { header: '대상항목', name: 'id', headerAlign: 'left' },
-            { header: '에너지원 명', name: 'lable', headerAlign: 'left' },
-            { header: '대상 유형', name: 'type', headerAlign: 'left' },
-            { header: '물리량', name: 'note', headerAlign: 'left' },
-            { header: '계산여부', name: 'field1', headerAlign: 'left' },
-            { header: '분배율', name: 'field2', headerAlign: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {}
-        }
-      },
-
 		};
 	},
 	computed: {
@@ -127,18 +108,18 @@ export default {
 	},
 	watch: {
 		selectedObjId(val) {
-			console.log('selectedObjId : ', val);
+			// console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-2 d-none';
+				this.detailList[2].class = 'py-3 d-none';
-				this.detailList[3].class = 'py-2 d-none';
+				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
-				this.detailList[4].class = 'py-2';
+				this.detailList[4].class = 'py-3';
-				this.detailList[5].class = 'py-2';
+				this.detailList[5].class = 'py-3';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[5].class = 'py-2 d-none';
+				this.detailList[5].class = 'py-3 d-none';
-				this.detailList[4].class = 'py-2 d-none';
+				this.detailList[4].class = 'py-3 d-none';
-				this.detailList[3].class = 'py-2';
+				this.detailList[3].class = 'py-3 pl-4 pt-1';
-				this.detailList[2].class = 'py-2';
+				this.detailList[2].class = 'py-3';
 			}
 		},
 		selectedCalcFg(val) {
@@ -171,7 +152,7 @@ export default {
 		},
 	},
 	mounted() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -296,9 +277,7 @@ export default {
 				value: myColumns,
 			});
 
-			this.$nextTick(() => {
 			this.loadGrid = true;
-			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
@@ -356,7 +335,7 @@ export default {
 					}
 
 					if (dataArr.length > 0) {
-						console.log('dataArr : ', dataArr);
+						// console.log('dataArr : ', dataArr);
 
 						var requiredKeyList = this.detailList
 							.filter(item => {
@@ -417,6 +396,7 @@ export default {
 	},
 };
 
+
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -487,7 +467,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목 111',
+		labelContent: '대상 항목',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
@@ -502,7 +482,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'InputText',
-		cols: 5,
+		cols: 6,
 		class: 'py-3 d-none',
 		valueNm: 'objNm',
 		readonly: true,
@@ -615,13 +595,4 @@ const myEqpmIaoDetail = [
 		iconShow: true
 	},
 ];
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-	lable: 'INCHEON 고온 냉동기 101호기 - 호로1',
-	type: '사용', note: '-',
-	field1: '1111',
-	field2: '2222',
-});
 </script>

components/pages/ems/TagInfo/TagAddInfoTab.vue

@@ -1,7 +1,7 @@
 <template>
 		<v-card class="pb-5">
 		<v-card-title class="d-flex justify-space-between align-end">
-			<span class="tit ft-size_20 ft-weight_600">TAG 추가 정보</span>
+			<span style="color:#000000A6" class="tit custom-title-4-new">TAG 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"

pages/comm/auth/MenuRoleMngPage.vue

@@ -36,11 +36,7 @@
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
-					<div class="px-5" style="height:calc(100% - 100px)">
+					<div ref="gridParent" class="px-5" style="height: 60vh;">
-						<div
-							ref="gridParent"
-							class="w100 h100"
-						>
 						<component
 							:is="loadGrid ? 'Grid' : null"
 							:ref="gridName + myPrgmId"
@@ -49,7 +45,6 @@
 							@getRowsData="getRowData"
 						/>
 					</div>
-					</div>
 				</v-card>
 			</v-col>
 			<v-col cols="12" lg="10" >
@@ -69,11 +64,12 @@
 								:style="{ minHeight: '36px' }"
 								>[미배정]메뉴리스트</span
 							>
-							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
+							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
-								<div
+								<!-- <div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
+							</div> -->
 								<component
 									:is="loadTreeGrid ? 'Grid' : null"
 									:ref="gridName2 + myPrgmId"
@@ -82,7 +78,6 @@
 									@getRowsData="getUnAsgnRowData"
 								/>
 							</div>
-							</div>
 						</v-col>
 						<v-col :cols="1">
 							<ActionButtons
@@ -112,11 +107,12 @@
 									/>
 								</v-col>
 							</v-row>
-							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
+							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
-								<div
+								<!-- <div
 									ref="treeGridParent2"
 									class="w100 h100"
 								>
+							</div> -->
 								<component
 									:is="loadTreeGrid2 ? 'Grid' : null"
 									:ref="gridName3 + myPrgmId"
@@ -126,7 +122,6 @@
 									@getRowsData="getAsgnRowData"
 								/>
 							</div>
-							</div>
 						</v-col>
 					</v-row>
 				</v-card>
@@ -408,9 +403,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<label class="custom-radio">
+						return `<span class="custom-radio">
 									<span class="radio-mark"></span>
-								</label>`;
+								</span>`;
 					}
 				},
 				{
@@ -431,9 +426,9 @@ export default {
 					align: 'center',
 					width: 30,
 					formatter: (props) => {
-						return `<label class="custom-radio">
+						return `<span class="custom-radio">
 									<span class="radio-mark"></span>
-								</label>`;
+								</span>`;
 					}
 				},
 				{ header: '역할ID', name: 'roleId', hidden: true },
@@ -573,6 +568,7 @@ export default {
 			});
 		},
 		async getRowData(data) {
+
 			await this.setPageData({
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: {
@@ -678,6 +674,8 @@ export default {
 		},
 
 		getUnAsgnRowData(data) {
+			console.log("------------------DEBUG-------getUnAsgnRowData:", data);
+
 			const getRowData = data;
 			this.leftSelectRowData = Object.assign({}, getRowData);
 		},

pages/comm/auth/UserRoleMngPage.vue

@@ -12,6 +12,8 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
+								labelCols="12"
+								textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -79,7 +81,6 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -128,7 +129,7 @@
 									<template v-else-if="item.id == 'AsgnRoleByUser'">
 										<v-col :cols="3" class="h100">
 											<v-card-title
-												class="pa-0 custom-title-4"
+												class="pa-0 custom-subtitle-tab"
 												style="min-height:36px;"
 												>역할리스트</v-card-title
 											>
@@ -154,7 +155,7 @@
 										</v-col>
 										<v-col :cols="8" class="h100">
 											<div class="d-flex align-center justify-space-between">
-												<v-card-title class="pa-0 custom-title-4">
+												<v-card-title class="pa-0 custom-subtitle-tab">
 													사용자 역할</v-card-title
 												>
 												<div>
@@ -307,40 +308,10 @@ export default {
 	},
 	methods: {
 		async init() {
-			 this.gridInit();
+			await this.gridInit();
 		},
-
-		gridInitTest() {
-			const rowGrid = {
-				column: [
-				{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
-				{ header: '사용자명', name: 'userNm' },
-				{ header: '사용자ID', name: 'userLoginId' },
-				{ header: '사용자비밀번호', name: 'userPswd', hidden: true },
-				{ header: '사업장', name: 'blocId', hidden: true },
-				{ header: 'email', name: 'email', hidden: true },
-				{ header: '등록자NO', name: 'regUserNo', hidden: true },
-				{ header: '등록일시', name: 'regDttm', hidden: true },
-				{ header: '수정자NO', name: 'procUserNo', hidden: true },
-				{ header: '수정일시', name: 'procDttm', hidden: true },
-				{ header: 'comId', name: 'comId', hidden: true },
-				{ header: 'deptId', name: 'deptId', hidden: true },
-				],
-				data: dataMockExample,
-				defaultRow: dataMockExample,
-				option: [],
-			}
-			this.dataPathMock = {rowGrid};
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
-
 		// 사용자 리스트 그리드 세팅
 		gridInit() {
-
-			// this.gridInitTest(); return
-
 			const gridHeight = this.$refs.gridParent.offsetHeight - 90;
 
 			const myOptions = {
@@ -1100,67 +1071,4 @@ function sha512(str) {
 		.update(str)
 		.digest('hex');
 }
-
-
-
-const dataMockExample = [
-  {
-    userNo: 1,
-    userNm: '홍길동',
-    userLoginId: 'hong123',
-    userPswd: 'password123',
-    blocId: 'B001',
-    email: 'hong@example.com',
-    regUserNo: 100,
-    regDttm: '2025-07-01 10:00:00',
-    procUserNo: 101,
-    procDttm: '2025-07-15 14:30:00',
-    comId: 'C001',
-    deptId: 'D001'
-  },
-  {
-    userNo: 2,
-    userNm: '김영희',
-    userLoginId: 'kimyh',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  },
-  {
-    userNo: 3,
-    userNm: '관리자',
-    userLoginId: 'user',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  },
-  {
-    userNo: 4,
-    userNm: '사용자',
-    userLoginId: 'admin',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  }
-];
-
-
 </script>

pages/comm/base/BatchLogMngPage.vue

@@ -4,24 +4,27 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="center" no-gutters>
+					<v-row align="end" no-gutters>
-						<v-col :cols="2">
+						<div></div>
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -29,20 +32,21 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
+								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<component
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
+								customClass="datepicker-large"
 							/>
 						</v-col>
-						<v-spacer></v-spacer>
+						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
-						<v-col :cols="4" class="text-right">
 							<BtnSearch />
-							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" />
+							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
-						</v-col>
+						</div>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -427,6 +431,3 @@ const myDetail = [
 	},
 ];
 </script>
-<style lang="scss">
-@import '@/assets/scss/common.scss';
-</style>

pages/comm/base/CalendarMngPage.vue

@@ -11,7 +11,7 @@
 						</v-col>
 						<v-col cols="3">
 							<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
-							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
+							<DatePicker :parentPrgmId="myPrgmId" customClass="datepicker-large" :label="'조회연월'" />
 						</v-col>
 						<v-col cols="6" class="text-right">
 							<BtnSearch @click="search()" size="large" />

pages/comm/base/CommCdMngPage.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">
@@ -56,7 +56,7 @@
 						</v-col>
 						
 						<v-col :cols="12" class="text-right">
-							<BtnSearch style="margin-top:20px" @click="search" />
+							<BtnSearch style="margin-top:20px" @click="search" size="large" />
 						</v-col>
 					</v-row>
 					<!-- <v-row align="center" no-gutters>

pages/comm/base/PrgmMngPage.vue

@@ -16,7 +16,7 @@
 								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="프로그램명"
@@ -50,18 +50,17 @@
 							/>
 						</div>
 					</div>
-					<div style="min-height: 60vh">
+					<div ref="gridParent" style="height: 60vh">
-						<div ref="gridParent" class="px-5 h100">
+						<!-- <div ref="gridParent" class="px-5 h100">
+						</div> -->
 						<component
 							:ref="gridName"
 							:is="loadGrid ? 'Grid' : null"
 							:parentPrgmId="myPrgmId"
 							:gridName="gridName"
 							@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 						/>
 					</div>
-					</div>
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
@@ -262,8 +261,6 @@ export default {
 			});
 
 			// this.getRowGridData();
-
-			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -296,6 +293,7 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
+			this.loadGrid = true;
 			
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
@@ -316,6 +314,12 @@ export default {
 			});
 		},
 		async getRowData(data, gridName) {
+			// console.log("-----------------------DEBUG--getRowData--------------", {
+			// 	gridKey: gridName,
+			// 	gridSelect: true,
+			// 	rowGridSelectKey: data.rowKey,
+			// 	rowGridSelectData: data,
+			// });
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,
@@ -327,6 +331,7 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
+			
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {

pages/ems/base/AddInfoMngPage.vue

@@ -64,7 +64,6 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -137,24 +136,10 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			detailList: myDetail,
 			initedFlag: false,
-			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: {
@@ -642,43 +627,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/ems/base/DashboardPage.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="l-layout">
-    <!-- <h1 class="h1-title">대시보드</h1> -->
+		<CommonPageTitle/>
-    <PageTitle text="대시보드" />
     <!-- <CheckBox
       :parentPrgmId="myPrgmId"
       label="사용여부"
@@ -600,7 +599,7 @@ export default {
       this.getEnrgUsage();
     },
     isDarkMode(newVal) {
-      // let chartOption = this.getGuageChartOption2(this.chart_01);
+      // Update color of dark mode or light mode into each charts
       let chartOption = getGaugeChartOption({
         title: this.chart_01,
         isDarkMode: this.isDarkMode,
@@ -610,7 +609,6 @@ export default {
       ]?.series?.[0]?.data?.[0]?.value;
       this.$store.state.pageData[myPrgmId][this.chart_01] = chartOption;
 
-      // let chartOption3 = this.getGuageChartOption2(this.chart_03);
       let chartOption3 = getGaugeChartOption({
         title: this.chart_03,
         isDarkMode: this.isDarkMode,
@@ -620,12 +618,24 @@ export default {
       ]?.series?.[0]?.data?.[0]?.value;
       this.$store.state.pageData[myPrgmId][this.chart_03] = chartOption3;
 
-      let mockres = this.$store.state.pageData[myPrgmId][this.chart_04];
-      this.setChart04Data(mockres);
 
-      this.setChart02Data("test");
+      let chart04Dat = this.$store.state.pageData[myPrgmId]['chart04Data'];
+      this.setChart04Data(chart04Dat);
+
+      let chartOption2 = getLineChartOption({
+            xAxisData: this.$store.state.pageData[myPrgmId][this.chart_02].xAxisData,
+            seriesData: this.$store.state.pageData[myPrgmId][this.chart_02].seriesData,
+            isDarkMode: this.isDarkMode,
+          });
+      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption2
+
+      let chartOption5 = getLineChartOption({
+            xAxisData: this.$store.state.pageData[myPrgmId][this.chart_05].xAxisData,
+            seriesData: this.$store.state.pageData[myPrgmId][this.chart_05].seriesData,
+            isDarkMode: this.isDarkMode,
+          });
+      this.$store.state.pageData[myPrgmId][this.chart_05] = chartOption5
 
-      this.setChart05Data("test");
     },
     // beforeDestroy() {
     // 	this.cancelAutoUpdate();
@@ -1169,6 +1179,7 @@ export default {
         chartKey: "compareEqpmTGdChart",
         value: chartOption,
       });
+      this.$store.state.pageData[myPrgmId][this.chart_05] = chartOption
     },
     async setChart04Data(data) {
       if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
@@ -1268,6 +1279,7 @@ export default {
         },
         series: seriesData,
       };
+
       await this.$nextTick(() => {});
       this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
     },
@@ -1401,6 +1413,7 @@ export default {
         chartKey: "compareEqpmTotChart",
         value: chartOption,
       });
+      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption
     },
     getGuageChartOption(chartName) {
       const gaugeColors = [
@@ -1710,7 +1723,7 @@ export default {
       let chartData = this.pageData.chart04Data;
       // let chartData = this.$store.state.pageData[myPrgmId][this.chart_04]['series'][0]['data']
       let selectedChartData = chartData.filter((item) => {
-        return item.eqpmId == event["data"]["groupId"];
+        return item.eqpmId == event["data"]["name"];
       });
       var data = {
         cmCycle: "CYC_DAY",

pages/ems/base/EnrgResourceCenterMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -83,7 +84,7 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" style="height: calc(100vh - 400px)">
+		<v-row >
 			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex justify-space-between align-end">
@@ -113,7 +114,7 @@
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>에너지원 상세</v-card-title>
-					<div class="px-5" style="height:calc(100% - 70px)">
+					<div class="px-5" style="min-height: auto;">
 						<v-tabs v-model="tab">
 							<v-tab
 								v-for="item in items"
@@ -125,8 +126,8 @@
 						</v-tabs>
 						<v-tabs-items
 							v-model="tab"
-							style="height: calc(100% - 65px);"
 							class="py-6"
+							style="min-height: auto;"
 						>
 							<v-tab-item v-for="(item, idx) in items" :key="item.id">				
 								<component

pages/ems/base/EqpmKindPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<PageTitle/>
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/EquipmentGroupMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<PageTitle />
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -480,18 +480,17 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 	},
+	
 	{
 		type: 'CheckBox',
 		label: '사용 여부',
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
+		class: 'py-2 pr-4 pt-4',
 		value: { '1': true, '0': false },
 		required: true,
 		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'SelectBox',

pages/ems/base/PastRsltDataReadPage.vue

@@ -1,63 +1,26 @@
 <template>
 	<div class="l-layout">
-		<PageTitle text="측정 위치 데이터 조회" />
+		<CommonPageTitle />
 
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<v-col :cols="2">
-							<component
-								:is="'SelectBlocMstr'"
-								ref="SelectBlocMstr"
-								:parentPrgmId="myPrgmId"
-								:textCols="12"
-								customClass="select-large"
-							/>
-						</v-col>
-						<!-- <v-col :cols="2">
-							<component
-								label="검침개소"
-								:is="'PastRsltDataReadPop'"
-								:parentPrgmId="myPrgmId"
-							/>
-						</v-col> -->
-						<!-- <v-col :cols="2">
-               <component 
-              :is="'SelectTagNmList'"
-              ref="SelectTagNmList"
-              :parentPrgmId="myPrgmId"
-              />
-            </v-col> -->
 						<v-col :cols="3">
-							<!-- <component
+							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
-								:is="'PastRsltDataReadTagPop'"
+								:textCols="12" customClass="select-large" />
-								:parentPrgmId="myPrgmId"
-								:label="'TAG'"
-							/> -->
-							<component
-								:is="'EvtObjPop'"
-								:parentPrgmId="myPrgmId"
-								:item="evtObjPopItem"
-								customClass="select-large"
-							/>
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
-							<component
+							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								:is="'Datepicker'"
+								customClass="select-large" />
-								:parentPrgmId="myPrgmId"
+						</v-col>
-								:label="'조회기간'"
+						<v-col :cols="3">
-								:textCols="12"
+							<!-- 대상일 -->
-							/>
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12" />
 						</v-col>
 						<v-col :cols="3" class="d-flex align-end justify-end text-right">
-							 <BtnExcelDownload
+							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
-							 	class="mr-1"
+								size="large" />
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								type="primary"
-								size="large"
-							/>
 							<BtnSearch @click="search" size="large" />
 						</v-col>
 					</v-row>
@@ -68,12 +31,12 @@
 			<v-col :cols="12" style="height: 100%" class="h100">
 				<v-card class="px-5 py-5 h100">
 					<div ref="gridParent" class="h100 px-5" style="height: 100%">
-						<component
+						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
-							ref="myGrid"
+							:parentPrgmId="myPrgmId" />
-							:is="loadGrid ? 'Grid' : null"
+					</div>
-							:gridName="gridName"
+					<div class="d-flex align-center justify-space-between">
-							:parentPrgmId="myPrgmId"
+						<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
-						/>
+							@loadData="changeGrid" />
 					</div>
 				</v-card>
 			</v-col>
@@ -97,7 +60,7 @@ import BtnExcelDownload from '~/components/common/button/BtnExcelDownload';
 import DateUtility from '~/plugins/dateUtility';
 // import Search from "~/components/common/search";
 import EvtObjPop from '~/components/common/modal/EvtObjPop';
-import PageTitle from "~/components/common/PageTitle";
+import pagination from '~/components/Pagination';
 
 let myTitle;
 // const myPrgmId = "PRG0052";
@@ -130,7 +93,7 @@ export default {
 		PastRsltDataReadPop,
 		PastRsltDataReadTagPop,
 		EvtObjPop,
-		PageTitle,
+		pagination,
 	},
 	data() {
 		return {
@@ -146,12 +109,16 @@ export default {
 				valueNm2: 'tagNm',
 				iconShow: true,
 				disabled: false,
-				labelCols: 12,
 				textCols: 12,
 				class: 'py-2',
 				required: false,
 				formFg: false,
 			},
+			itemsPerPage: 10,
+			itemsPerPageArray: [10, 20, 30],
+			limit: 20,
+			page: 1,
+			totalCount: 0,
 		};
 	},
 	computed: {
@@ -164,9 +131,6 @@ export default {
 		chkTagId() {
 			return this.pageData.tagList === undefined ? null : this.pageData.tagId;
 		},
-		// chkTagList() {
-		// 	return this.pageData.tagList;
-		// },
 		chkTagNm() {
 			return this.pageData.tagData.tagNm;
 		},
@@ -176,18 +140,16 @@ export default {
 	},
 	watch: {
 		chkIsFind(val) {
-			if (val) this.search();
+			if (val) {
+				this.page = 1;
+				this.search();
+			}
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
 				this.search();
 			}
 		},
-		// chkTagList() {
-		// 	if(this.initFlag){
-		// 		this.search();
-		// 	}
-		// },
 		chkTagNm() {
 			if (this.initFlag) {
 				this.search();
@@ -207,7 +169,7 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() {},
+	created() { },
 	async mounted() {
 		await this.setFromDt();
 		await this.init();
@@ -330,6 +292,7 @@ export default {
 			this.loadGrid = false;
 
 			let res = [];
+			let res2 = [];
 			let yearQuarterData = [];
 			yearQuarterData = this.yearQuarterMaker([
 				this.pageData.fromDt,
@@ -381,8 +344,18 @@ export default {
 					apiKey: 'selectTagRawDataByQuarter',
 					resKey: 'pastRsltReadData',
 					sendParam: sendParams,
+					limit: this.limit,
+					page: this.page,
+					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				});
 
+				res2 = await this.postApiReturn({
+					apiKey: 'selectTagRawDataByQuarterPageTotal',
+					resKey: 'pastRslPageTotal',
+					sendParam: sendParams
+				});
+				this.totalCount = res2[0].totalcount;
+
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -393,6 +366,9 @@ export default {
 					fromDt: this.pageData.fromDt,
 					toDt: this.pageData.toDt,
 					yearQuarterList: yearQuarterData['yearQuarterList'],
+					limit: this.limit,
+					page: this.page,
+					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				};
 				sendParams['tagId'] = this.pageData.tagId;
 				//
@@ -410,6 +386,13 @@ export default {
 					sendParam: sendParams,
 				});
 
+				res2 = await this.postApiReturn({
+					apiKey: 'selectTagRawDataByQuarterPageTotal',
+					resKey: 'pastRslPageTotal',
+					sendParam: sendParams
+				});
+				this.totalCount = res2[0].totalcount;
+
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -487,6 +470,12 @@ export default {
 			finalResult['yearQuarterList'] = result;
 			return finalResult;
 		},
+		changeGrid: async function (pageNum, limit) {
+			this.page = pageNum;
+			this.limit = limit;
+
+			this.search();
+		},
 	},
 };
 

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"
@@ -71,7 +70,6 @@
 							:selectedRowDataWatchFlag="true"
 						/>
 					</div>
-					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">

pages/ems/base/ReadResultCloseMngPage.vue

@@ -91,7 +91,7 @@
               </a-button>
             </div>
           </div>
-          <div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
+          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
@@ -242,6 +242,10 @@ export default {
         columnOptions: {
           resizable: true,
         },
+        pageOptions: {
+					useClient: true,
+					perPage: 13,
+				},
       };
       this.setGridOption({
         gridKey: this.gridName,

pages/ems/base/TagMngPage_Pagination.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<PageTitle/>
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -58,7 +58,7 @@
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
 						</div>
 					</v-card-actions>
-					<!-- <div class="d-flex align-center justify-space-between">
+					<div class="d-flex align-center justify-space-between">
 						<pagination
 							id="pagination"
 							:total-count="totalCount"
@@ -66,7 +66,7 @@
 							:limit="limit"
 							@loadData="changeGrid"
 						/>
-					</div> -->
+					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">
@@ -107,7 +107,6 @@ import TagAddInfoTab from '@/components/pages/ems/TagInfo/TagAddInfoTab';
 import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
 import pagination from '~/components/Pagination';
-import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 // const myPrgmId = "PRG0051";
@@ -140,13 +139,12 @@ export default {
 		TagAddInfoTab,
 		Grid,
 		pagination,
-		PageTitle
 	},
 	data() {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			items: [
 				{ name: 'TAG 정보', id: 'tagBaseInfoTab', disabledFlag: false },
@@ -275,16 +273,12 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 180;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 16;
 
 			const myOptions = {
 				columnOptions: {
 					resizable: true,
 				},
-				pageOptions: {
-					useClient: true,
-					perPage: 10,
-				},
 				scrollX: true,
 				header: {
 					height: 38,
@@ -536,7 +530,7 @@ export default {
 							columnName: 'tagId',
 							setScroll: true,
 						});
-					} catch (error) { }
+					} catch (error) {}
 					// this.$refs[this.gridName].focus({
 					//   rowKey: 0,
 					//   columnName: "tagId",
@@ -773,7 +767,7 @@ export default {
 		gridEditingFinish(data) {
 			this.$refs[this.gridName].editingFinish(data);
 		},
-		changeGrid: async function (pageNum, limit) {
+		changeGrid: async function(pageNum, limit) {
 			this.page = pageNum;
 			this.limit = limit;
 

pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue

@@ -1,7 +1,6 @@
 <template>
   <div ref="mainDiv" class="l-layout">
-    <PageTitle text="에너지 사용량 이력" />
+    <CommonPageTitle />
-
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -76,6 +75,7 @@
                 :parentPrgmId="myPrgmId"
                 :isRangeOption="false"
                 :textCols="12"
+                :customClass="'datepicker-large'"
               />
             </v-col>
             <v-col :cols="6" class="text-right">
@@ -270,7 +270,6 @@ export default {
 		DatePicker,
 		Grid,
 		Chart,
-    PageTitle,
 	},
 	data() {
 		return {
@@ -363,10 +362,9 @@ export default {
       setChartOption: "setChartOption",
 		}),
 		async init() {
-      await this.search();
-
 			await this.getSelectValueList();
 			await this.setQueryParams();
+			await this.search();
 
 			this.initedFlag = true;
 		},
@@ -522,11 +520,6 @@ export default {
 			await this.setContentData01();
 			await this.setContentData02();
 			await this.setContentData03();
-      await this.setContentData04();
-
-      //   await this.setContentData01();
-      //   await this.setContentData02();
-      //   await this.setContentData03();
 			// await this.setContentData04();
 		},
 		async setContentData01() {
@@ -540,47 +533,16 @@ export default {
         apiKey = "selectMonthlyEnrgUseMainGuideIdx";
 			}
 
-      //   res = await this.postApiReturn({
+			res = await this.postApiReturn({
-      //     apiKey: apiKey,
+				apiKey: apiKey,
-      //     resKey: "enrgUseEqpmDetlMntrData",
+				resKey: 'enrgUseEqpmDetlMntrData',
-      //     sendParam: {
+				sendParam: {
-      //       eqpmGrpId: this.selectValue03,
+					eqpmGrpId: this.selectValue03,
-      //       eqpmId: this.selectValue04,
+					eqpmId: this.selectValue04,
-      //       fromDt: this.fromDt,
+					fromDt: this.fromDt,
-      //     },
-      //   });
-
-      res = [
-        {
-          gdIdxId: "A01",
-          gdIdxNm: "Temperature",
-          dataNum: 0,
-          totVal: 23.5,
-          timestamp: "2025-07-15T10:00:00Z",
 				},
-        {
+			});
-          gdIdxId: "C03",
+      console.log('res 01:',res)
-          gdIdxNm: "Power Usage",
-          dataNum: 1,
-          totVal: 24.1,
-          timestamp: "2025-07-15T11:00:00Z",
-        },
-        {
-          gdIdxId: "B02",
-          gdIdxNm: "Humidity",
-          dataNum: 0,
-          totVal: 60,
-          timestamp: "2025-07-15T10:00:00Z",
-        },
-        {
-          gdIdxId: "B03",
-          gdIdxNm: "Test",
-          dataNum: 0,
-          totVal: 50,
-          timestamp: "2025-07-19T10:00:00Z",
-        },
-      ];
-
 			this.contentData01 = await this.makeContentData01(res);
       console.log("content", this.contentData01);
       await this.setChartGroup01(this.contentData01);
@@ -615,42 +577,16 @@ export default {
 
 			this.loadGrid01 = false;
 
-      //   res = await this.postApiReturn({
+			res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseGuideAlarmInfo",
+				apiKey: 'selectEnrgUseGuideAlarmInfo',
-      //     resKey: "enrgUseEqpmDetlMntrData",
+				resKey: 'enrgUseEqpmDetlMntrData',
-      //     sendParam: {
+				sendParam: {
-      //       cmCycle: this.pageData.cmCycle,
+					cmCycle: this.pageData.cmCycle,
-      //       eqpmId: this.selectValue04,
+					eqpmId: this.selectValue04,
-      //       fromDt: this.fromDt,
+					fromDt: this.fromDt,
-      //       alrmKind: ["WARN", "CARE"],
+					alrmKind: ['WARN', 'CARE'],
-      //     },
-      //   });
-      res = [
-        {
-          gdIdxId: "PQ001",
-          totDttm: "TEMP",
-          totDt: "Temperature",
-          totTm: "Analog",
-          gdIdxNm: "PQ001",
-          totVal: "TEMP",
-          caseStndVal: "Temperature",
-          warnStndVal: "Analog",
-          alrmKind: "PQ001",
-          alrmMsg: "TEMP",
 				},
-        {
+			});
-          gdIdxId: "PQ001",
-          totDttm: "TEMP",
-          totDt: "Temperature",
-          totTm: "Analog",
-          gdIdxNm: "PQ001",
-          totVal: "TEMP",
-          caseStndVal: "Temperature",
-          warnStndVal: "Analog",
-          alrmKind: "PQ001",
-          alrmMsg: "TEMP",
-        },
-      ];
 
 			for (var i = 0; i < res.length; i++) {
 				newRes.push({
@@ -697,33 +633,13 @@ export default {
 
 			this.loadGrid02 = false;
 
-      //   res = await this.postApiReturn({
+			res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseEqpmDescInfo",
+				apiKey: 'selectEnrgUseEqpmDescInfo',
-      //     resKey: "enrgUseEqpmDetlMntrData",
+				resKey: 'enrgUseEqpmDetlMntrData',
-      //     sendParam: {
+				sendParam: {
-      //       eqpmGrpId: this.selectValue03,
+					eqpmGrpId: this.selectValue03,
-      //     },
-      //   });
-      res = [
-        {
-          pysclQtyId: "PQ001",
-          pysclQtyCd: "TEMP",
-          pysclQtyNm: "Temperature",
-          pysclQtyTp: "Analog",
 				},
-        {
+			});
-          pysclQtyId: "PQ002",
-          pysclQtyCd: "PRESS",
-          pysclQtyNm: "Pressure",
-          pysclQtyTp: "Analog",
-        },
-        {
-          pysclQtyId: "PQ003",
-          pysclQtyCd: "FLOW",
-          pysclQtyNm: "Flow Rate",
-          pysclQtyTp: "Digital",
-        },
-      ];
 
 			for (var i = 0; i < res.length; i++) {
 				newRes.push({
@@ -748,11 +664,11 @@ export default {
 			this.loadGrid02 = true;
 
 			await this.$nextTick();
-      //   this.$refs[this.gridName02].focus({
+			this.$refs[this.gridName02].focus({
-      //     rowKey: 0,
+				rowKey: 0,
-      //     columnName: "no",
+				columnName: 'no',
-      //     setScroll: true,
+				setScroll: true,
-      //   });
+			});
 		},
 		async setContentData04(selectedData) {
 			var res = null;
@@ -764,31 +680,23 @@ export default {
 			this.loadTrendChart = false;
 
 			xAxisData = this.makeTrendChartXaxisData();
-      console.log("x axis :", xAxisData);
 
       if (this.pageData.cmCycle == "CYC_MONTH") {
 				sliderHandleSize = ((24 / xAxisData.length) * 100 * 24) / 25;
 			}
 
-      //   res = await this.postApiReturn({
+			res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseHourlyTrendInfo",
+				apiKey: 'selectEnrgUseHourlyTrendInfo',
-      //     resKey: "enrgUseEqpmDetlMntrData",
+				resKey: 'enrgUseEqpmDetlMntrData',
-      //     sendParam: {
+				sendParam: {
-      //       pysclQtyId: selectedData.pysclQtyId,
+					pysclQtyId: selectedData.pysclQtyId,
-      //       eqpmId: this.selectValue04,
+					eqpmId: this.selectValue04,
-      //       fromDt: this.fromDt,
+					fromDt: this.fromDt,
-      //       cmCycle: this.pageData.cmCycle,
+					cmCycle: this.pageData.cmCycle,
-      //     },
+				},
-      //   });
+			});
 
-      res = [
+			seriesData = new Array(xAxisData.length).fill(NaN);
-        { monthCnt: 0, totVal: 120 },
-        { monthCnt: 1, totVal: 150 },
-        { monthCnt: 2, totVal: 180 },
-        { monthCnt: 3, totVal: 200 },
-      ];
-
-      seriesData = new Array(xAxisData.length).fill(300);
 
 			for (var i = 0; i < res.length; i++) {
         if (this.pageData.cmCycle == "CYC_MONTH") {
@@ -798,8 +706,6 @@ export default {
 				}
 			}
 
-      var seriesData2 = new Array(xAxisData.length).fill(100);
-
 			var chartOption = {
 				grid: {
           top: "3%",
@@ -845,14 +751,14 @@ export default {
               color: "#D32029",
             },
           },
-          {
+          // {
-            type: "line",
+          //   type: "line",
-            data: seriesData2,
+          //   data: seriesData2,
-            symbol: "none",
+          //   symbol: "none",
-            itemStyle: {
+          //   itemStyle: {
-              color: "#FAAD14",
+          //     color: "#FAAD14",
-            },
+          //   },
-          },
+					// },
 				],
 				dataZoom: [
 					{
@@ -898,40 +804,13 @@ export default {
 				}
 			}
 
-      //   var idxData = await this.postApiReturn({
+			var idxData = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseMainIdxDesc",
+				apiKey: 'selectEnrgUseMainIdxDesc',
-      //     resKey: "eqpmIndMntrData",
+				resKey: 'eqpmIndMntrData',
-      //     sendParam: {
+				sendParam: {
-      //       eqpmGrpId: this.selectValue03,
+					eqpmGrpId: this.selectValue03,
-      //     },
-      //   });
-
-      var idxData = [
-        {
-          gdIdxId: "A01",
-          gdIdxNm: "Temperature",
-          unit: "°C",
-          description: "Average temperature reading",
 				},
-        {
+			});
-          gdIdxId: "B02",
-          gdIdxNm: "Humidity",
-          unit: "%",
-          description: "Relative humidity level",
-        },
-        {
-          gdIdxId: "C03",
-          gdIdxNm: "Power Usage",
-          unit: "kWh",
-          description: "Total power consumption",
-        },
-        {
-          gdIdxId: "B03",
-          gdIdxNm: "Test",
-          unit: "%",
-          description: "Relative humidity level test",
-        },
-      ];
 
 			for (var i = 0; i < idxData.length; i++) {
         if (!result.hasOwnProperty(idxData[i]["gdIdxId"])) {
@@ -956,11 +835,10 @@ export default {
 			var dataKeyList = Object.keys(data);
 			var currentChartData = null;
 			var chartKey = null;
+
 			for (var i = 0; i < dataKeyList.length; i++) {
 				currentChartData = data[dataKeyList[i]];
-        console.log("curr:", currentChartData);
+				chartKey = 'chartGroup01_' + currentChartData['gdIdxId'];
-
-        chartKey = "chartGroup01_" + currentChartData["gdIdxId"];
 
 				this.setPageData({
 					[chartKey]: this.getGroup01ChartOption(),
@@ -975,10 +853,9 @@ export default {
 			var seriesData = null;
 
 			xAxisData = this.makeChartGroup01XaxisData();
-      console.log("text xaxis", xAxisData);
 
 			for (var i = 0; i < dataKeyList.length; i++) {
-        seriesData = new Array(xAxisData.length).fill(10);
+				seriesData = new Array(xAxisData.length).fill(NaN);
 
 				currentChartData = data[dataKeyList[i]];
         chartKey = "chartGroup01_" + currentChartData["gdIdxId"];
@@ -988,7 +865,7 @@ export default {
             currentChartData["data"][j]["totVal"];
 				}
 
-        console.log("text seri data", seriesData);
+        // console.log("text seri data", seriesData);
 
         this.$store.state.pageData[myPrgmId][chartKey]["xAxis"]["data"] = xAxisData;
         this.$store.state.pageData[myPrgmId][chartKey]["series"][0]["data"] = seriesData;
@@ -1006,8 +883,6 @@ export default {
         color: "#D32029",
       };
 
-      chartOption["series"][0]["symbol"] = "none";
-      console.log("chartOption: ", chartOption);
 			return chartOption;
 		},
 		makeChartGroup01XaxisData() {
@@ -1097,76 +972,14 @@ const defaultData = {
   fromDt: Utility.setFormatDate(new Date(), "YYYYMM"), // 조회 시작일
 
 	grid01: {
-    data: [
+		data: [],
-      {
+		column: [],
-        gdIdxId: "PQ001",
-        totDttm: "TEMP",
-        totDt: "Temperature",
-        totTm: "Analog",
-        gdIdxNm: "PQ001",
-        totVal: "TEMP",
-        caseStndVal: "Temperature",
-        warnStndVal: "Analog",
-        alrmKind: "PQ001",
-        alrmMsg: "TEMP",
-      },
-      {
-        gdIdxId: "PQ001",
-        totDttm: "TEMP",
-        totDt: "Temperature",
-        totTm: "Analog",
-        gdIdxNm: "PQ001",
-        totVal: "TEMP",
-        caseStndVal: "Temperature",
-        warnStndVal: "Analog",
-        alrmKind: "PQ001",
-        alrmMsg: "TEMP",
-      },
-    ],
-    column: [
-      { header: "NO", name: "no", width: 40, align: "right" },
-      { header: "gdIdxId", name: "gdIdxId", hidden: true, align: "left" },
-      { header: "totDttm", name: "totDttm", hidden: true, align: "left" },
-      { header: "발생일", name: "totDt", width: 150, align: "left" },
-      { header: "발생시간대", name: "totTm", width: 100, align: "left" },
-      { header: "가이드지표명", name: "gdIdxNm", width: 200, align: "left" },
-      { header: "가이드값", name: "totVal", hidden: true, align: "left" },
-      { header: "주의값", name: "caseStndVal", hidden: true, align: "left" },
-      { header: "경고값", name: "warnStndVal", hidden: true, align: "left" },
-      { header: "알람종류", name: "alrmKind", hidden: true, align: "left" },
-      { header: "알람내용", name: "alrmMsg", align: "left" },
-    ],
 		option: {},
 	},
 
 	grid02: {
-    data: [
+		data: [],
-      {
+		column: [],
-        pysclQtyId: "PQ001",
-        pysclQtyCd: "TEMP",
-        pysclQtyNm: "Temperature",
-        pysclQtyTp: "Analog",
-      },
-      {
-        pysclQtyId: "PQ002",
-        pysclQtyCd: "PRESS",
-        pysclQtyNm: "Pressure",
-        pysclQtyTp: "Analog",
-      },
-      {
-        pysclQtyId: "PQ003",
-        pysclQtyCd: "FLOW",
-        pysclQtyNm: "Flow Rate",
-        pysclQtyTp: "Digital",
-      },
-    ],
-    column: [
-      { header: "NO", name: "no", align: "right", width: 40 },
-      { header: "물리량ID", name: "pysclQtyId", width: 100, align: "left" },
-      { header: "물리량코드", name: "pysclQtyCd", align: "left" },
-      { header: "물리량명", name: "pysclQtyNm", width: 190, align: "left" },
-      { header: "물리량타입", name: "pysclQtyTp", width: 100, align: "left" },
-    ],
 		option: {},
 	},
 

pages/ems/effc/EnrgUseTotSummPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div ref="mainDiv" class="l-layout">
-    <PageTitle text="냉동기" />
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -180,7 +180,7 @@ export default {
       contentData: {},
       loadChart: false,
 
-      testFlag: true,
+      testFlag: false,
     };
   },
   computed: {
@@ -270,15 +270,14 @@ export default {
       }
     },
     async getEnrgUseTotSummData() {
-      //   var res = await this.postApiReturn({
+      var res = await this.postApiReturn({
-      //     apiKey: "selectEnrgUseTotSumm",
+          apiKey: "selectEnrgUseTotSumm",
-      //     resKey: "data",
+          resKey: "data",
-      //     sendParam: {
+          sendParam: {
-      //       fromDt: this.pageData.fromDt,
+            fromDt: this.pageData.fromDt,
-      //       eqpmKind: this.selectValue01,
+            eqpmKind: this.selectValue01,
-      //     },
+          },
-      //   });
+      });
-      let res = [];
 
       if (this.testFlag == true) {
         res = [

pages/ems/effc/EqpmIndMntrPage.vue

@@ -4,7 +4,7 @@
       <v-avatar size="12" :style="{ backgroundColor: 'currentColor' }"></v-avatar>
       에너지 사용량 실적
     </h1> -->
-    <PageTitle text="에너지 사용량 실적" />
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -255,9 +255,8 @@ export default {
   },
   methods: {
     async init() {
-      // await this.getSelectValueList();
+      await this.getSelectValueList();
-
+      await this.setQueryParams();
-      // await this.setQueryParams();
       this.gridInit();
       await this.getGridData();
 
@@ -488,131 +487,41 @@ export default {
       this.loadGrid = false;
       this.enrgUseMainIdxDesc = [];
       var apiKey = null;
-      // var params = {
+      var params = {
-      //   fabId: this.selectValue01,
+        fabId: this.selectValue01,
-      //   eqpmKindId: this.selectValue02,
+        eqpmKindId: this.selectValue02,
-      //   eqpmGrpId: this.selectValue03,
+        eqpmGrpId: this.selectValue03,
-      //   fromDt: this.pageData.fromDt,
+        fromDt: this.pageData.fromDt,
-      // };
+      };
 
-      // if (this.pageData.cmCycle == "CYC_DAY") {
+      if (this.pageData.cmCycle == "CYC_DAY") {
-      //   params["fromDtMm"] = String(this.pageData.fromDt).substring(0, 6);
+        params["fromDtMm"] = String(this.pageData.fromDt).substring(0, 6);
-      //   apiKey = "selectDailyEnrgUseMainIdx";
+        apiKey = "selectDailyEnrgUseMainIdx";
-      // } else if (this.pageData.cmCycle == "CYC_MONTH") {
+      } else if (this.pageData.cmCycle == "CYC_MONTH") {
-      //   apiKey = "selectMonthlyEnrgUseMainIdx";
+        apiKey = "selectMonthlyEnrgUseMainIdx";
-      // }
+      }
 
-      // var res = await this.postApiReturn({
+      var res = await this.postApiReturn({
-      //   apiKey: apiKey,
+        apiKey: apiKey,
-      //   resKey: "eqpmIndMntrData",
+        resKey: "eqpmIndMntrData",
-      //   sendParam: params,
+        sendParam: params,
-      // });
+      });
 
-      // this.enrgUseMainIdxDesc = await this.postApiReturn({
+      this.enrgUseMainIdxDesc = await this.postApiReturn({
-      //   apiKey: "selectEnrgUseMainIdxDesc",
+        apiKey: "selectEnrgUseMainIdxDesc",
-      //   resKey: "eqpmIndMntrData",
+        resKey: "eqpmIndMntrData",
-      //   sendParam: {
+        sendParam: {
-      //     eqpmGrpId: this.selectValue03,
+          eqpmGrpId: this.selectValue03,
-      //   },
-      // });
-
-      var newRes = [
-        {
-          no: 1,
-          fabId: "FAB001",
-          fabNm: "서울FAB",
-          eqpmGrpId: "GRP01",
-          eqpmGrpNm: "조립라인",
-          eqpmId: "EQ001",
-          eqpmNm: "설비A",
-          planVal: 1000,
-          usedVal: 950,
-          effcRt: "95%",
-          gd01: 88,
-          gd02: 90,
-          gd03: 85,
-          gd04: 87,
-          gd05: 89,
-          gd06: 86,
-          gd07: 90,
-          gd08: 88,
-          gd09: 87,
-          gd10: 89,
         },
-        {
+      });
-          no: 2,
-          fabId: "FAB002",
-          fabNm: "부산FAB",
-          eqpmGrpId: "GRP02",
-          eqpmGrpNm: "검사라인",
-          eqpmId: "EQ002",
-          eqpmNm: "설비B",
-          planVal: 1200,
-          usedVal: 1100,
-          effcRt: "91.7%",
-          gd01: 85,
-          gd02: 84,
-          gd03: 86,
-          gd04: 83,
-          gd05: 82,
-          gd06: 84,
-          gd07: 85,
-          gd08: 86,
-          gd09: 87,
-          gd10: 88,
-        },
-        {
-          no: 3,
-          fabId: "FAB003",
-          fabNm: "대전FAB",
-          eqpmGrpId: "GRP03",
-          eqpmGrpNm: "포장라인",
-          eqpmId: "EQ003",
-          eqpmNm: "설비C",
-          planVal: 900,
-          usedVal: 870,
-          effcRt: "96.7%",
-          gd01: 90,
-          gd02: 91,
-          gd03: 89,
-          gd04: 88,
-          gd05: 90,
-          gd06: 91,
-          gd07: 92,
-          gd08: 90,
-          gd09: 89,
-          gd10: 91,
-        },
-        {
-          no: 4,
-          fabId: "FAB004",
-          fabNm: "광주FAB",
-          eqpmGrpId: "GRP04",
-          eqpmGrpNm: "테스트라인",
-          eqpmId: "EQ004",
-          eqpmNm: "설비D",
-          planVal: 1100,
-          usedVal: 1050,
-          effcRt: "95.5%",
-          gd01: 87,
-          gd02: 88,
-          gd03: 86,
-          gd04: 85,
-          gd05: 86,
-          gd06: 87,
-          gd07: 88,
-          gd08: 89,
-          gd09: 90,
-          gd10: 91,
-        },
-      ];
 
-      // for (var i = 0; i < res.length; i++) {
+      var newRes = [];
-      //   newRes.push({
+      for (var i = 0; i < res.length; i++) {
-      //     ...res[i],
+        newRes.push({
-      //     no: i + 1,
+          ...res[i],
-      //   });
+          no: i + 1,
-      // }
+        });
+      }
 
       this.setGridData({
         gridKey: this.gridName,
@@ -752,141 +661,9 @@ const defaultData = {
   },
   fromDt: Utility.setFormatDate(new Date(), "YYYYMM"), // 조회 시작일
   grid01: {
-    data: [
+    data: [],
-      {
+    column: [],
-        no: 1,
+    option: {},
-        fabId: "FAB001",
-        fabNm: "서울FAB",
-        eqpmGrpId: "GRP01",
-        eqpmGrpNm: "조립라인",
-        eqpmId: "EQ001",
-        eqpmNm: "설비A",
-        planVal: 1000,
-        usedVal: 950,
-        effcRt: "95%",
-        gd01: 88,
-        gd02: 90,
-        gd03: 85,
-        gd04: 87,
-        gd05: 89,
-        gd06: 86,
-        gd07: 90,
-        gd08: 88,
-        gd09: 87,
-        gd10: 89,
-      },
-      {
-        no: 2,
-        fabId: "FAB002",
-        fabNm: "부산FAB",
-        eqpmGrpId: "GRP02",
-        eqpmGrpNm: "검사라인",
-        eqpmId: "EQ002",
-        eqpmNm: "설비B",
-        planVal: 1200,
-        usedVal: 1100,
-        effcRt: "91.7%",
-        gd01: 85,
-        gd02: 84,
-        gd03: 86,
-        gd04: 83,
-        gd05: 82,
-        gd06: 84,
-        gd07: 85,
-        gd08: 86,
-        gd09: 87,
-        gd10: 88,
-      },
-      {
-        no: 3,
-        fabId: "FAB003",
-        fabNm: "대전FAB",
-        eqpmGrpId: "GRP03",
-        eqpmGrpNm: "포장라인",
-        eqpmId: "EQ003",
-        eqpmNm: "설비C",
-        planVal: 900,
-        usedVal: 870,
-        effcRt: "96.7%",
-        gd01: 90,
-        gd02: 91,
-        gd03: 89,
-        gd04: 88,
-        gd05: 90,
-        gd06: 91,
-        gd07: 92,
-        gd08: 90,
-        gd09: 89,
-        gd10: 91,
-      },
-      {
-        no: 4,
-        fabId: "FAB004",
-        fabNm: "광주FAB",
-        eqpmGrpId: "GRP04",
-        eqpmGrpNm: "테스트라인",
-        eqpmId: "EQ004",
-        eqpmNm: "설비D",
-        planVal: 1100,
-        usedVal: 1050,
-        effcRt: "95.5%",
-        gd01: 87,
-        gd02: 88,
-        gd03: 86,
-        gd04: 85,
-        gd05: 86,
-        gd06: 87,
-        gd07: 88,
-        gd08: 89,
-        gd09: 90,
-        gd10: 91,
-      },
-    ],
-    column: [
-      { header: "NO", name: "no", align: "center" },
-      { header: "fabId", name: "fabId", hidden: true },
-      { header: "FAB", name: "fabNm", align: "left" },
-      { header: "eqpmGrpId", name: "eqpmGrpId", hidden: true },
-      { header: "설비그룹", name: "eqpmGrpNm", align: "left" },
-      { header: "eqpmId", name: "eqpmId", hidden: true },
-      { header: "설비명", name: "eqpmNm", align: "left" },
-      { header: "계획량", name: "planVal", align: "right" },
-      { header: "사용량", name: "usedVal", align: "right" },
-      { header: "KPI", name: "effcRt", align: "right" },
-      { header: "지표1", name: "gd01", align: "right" },
-      { header: "지표2", name: "gd02", align: "right" },
-      { header: "지표3", name: "gd03", align: "right" },
-      { header: "지표4", name: "gd04", align: "right" },
-      { header: "지표5", name: "gd05", align: "right" },
-      { header: "지표6", name: "gd06", align: "right" },
-      { header: "지표7", name: "gd07", align: "right" },
-      { header: "지표8", name: "gd08", align: "right" },
-      { header: "지표9", name: "gd09", align: "right" },
-      { header: "지표10", name: "gd10", align: "right" },
-    ],
-    option: {
-      header: {
-        height: 65,
-        complexColumns: [
-          {
-            header: "주요지표",
-            name: "complexColumn01",
-            childNames: [
-              "gd01",
-              "gd02",
-              "gd03",
-              "gd04",
-              "gd05",
-              "gd06",
-              "gd07",
-              "gd08",
-              "gd09",
-              "gd10",
-            ],
-          },
-        ],
-      },
-    },
   },
 };
 

store/modules/list.js

@@ -669,7 +669,8 @@ const INIT_URL_STATE = {
 	// prgmId : PRG0052 과거 검침 데이터 조회
 	selectTagRawDataByQuarter:
 		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarter',
-
+	selectTagRawDataByQuarterPageTotal:
+		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarterPageTotal',
 	// prgmId : PRG4107 개인화 대시보드
 	selectIndvWidgetList: 'ems/base/DashboardHfemsCtr/selectIndvWidgetList',
 	selectEnergyUseReadHourAddup: