Merge pull request 'fix ui EvtObjPop' (#21) from dev-manhph1-fixbug-18-19-21-28 into dev

Reviewed-on: #21

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;
   }

components/common/Grid.vue

@@ -4,13 +4,14 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
-		@focusChange="focusChangeEvt"
+		@mousedown="focusChangeEvt"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
 	/>
+		<!-- @focusChange="focusChangeEvt" -->
 </template>
 <script>
 import { mapState, mapMutations } from 'vuex';
@@ -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];
 
@@ -271,6 +269,7 @@ export default {
 			});
 		},
 		focusChangeEvt(e) {
+			// console.log("------------------DEBUG-------focusChangeEvt:", e);
 			// console.log('focusChangeEvt1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent focusChangeEvt')
@@ -291,6 +290,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')
@@ -666,8 +666,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;
@@ -705,11 +703,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/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/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -4,24 +4,24 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt custom-title-4-new">설비 입출력 정보</span>
+			<span class="txt">설비 입출력 정보</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 +65,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: {
@@ -129,16 +113,16 @@ export default {
 		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 +155,7 @@ export default {
 		},
 	},
 	mounted() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -296,9 +280,7 @@ export default {
 				value: myColumns,
 			});
 
-			this.$nextTick(() => {
+			this.loadGrid = true;
-				this.loadGrid = true;
-			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
@@ -417,6 +399,7 @@ export default {
 	},
 };
 
+
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -487,7 +470,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목 111',
+		labelContent: '대상 항목',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
@@ -502,7 +485,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'InputText',
-		cols: 5,
+		cols: 6,
 		class: 'py-3 d-none',
 		valueNm: 'objNm',
 		readonly: true,
@@ -615,13 +598,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"

mixin/global.js

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

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,17 +50,16 @@
 							/>
 						</div>
 					</div>
-					<div style="min-height: 60vh">
+					<div ref="gridParent" style="height: 100vh">
-						<div ref="gridParent" class="px-5 h100">
+						<!-- <div ref="gridParent" class="px-5 h100">
-							<component
+						</div> -->
-								:ref="gridName"
+						<component
-								:is="loadGrid ? 'Grid' : null"
+							:ref="gridName"
-								:parentPrgmId="myPrgmId"
+							:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
+							:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
+							:gridName="gridName"
-								:dataPath="dataPathMock"
+							@getRowsData="getRowData"
-							/>
+						/>
-						</div>
 					</div>
 				</v-card>
 			</v-col>
@@ -262,8 +261,6 @@ export default {
 			});
 
 			// this.getRowGridData();
-
-			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -296,7 +293,8 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-
+			this.loadGrid = true;
+			
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({
@@ -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/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"
-								:label="'조회기간'"
-								:textCols="12"
-							/>
 						</v-col>
-						 <v-col :cols="3" class="d-flex align-end justify-end text-right">
+						<v-col :cols="3">
-							 <BtnExcelDownload
+							<!-- 대상일 -->
-							 	class="mr-1"
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12" />
-								:parentPrgmId="myPrgmId"
+						</v-col>
-								:gridName="gridName"
+						<v-col :cols="3" class="d-flex align-end justify-end text-right">
-								type="primary"
+							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
-								size="large"
+								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,18 +59,16 @@
 							: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
-							<component
+							:ref="gridName"
-								:ref="gridName"
+							:is="loadGrid ? 'Grid' : null"
-								:is="loadGrid ? 'Grid' : null"
+							:gridName="gridName"
-								:gridName="gridName"
+							:parentPrgmId="myPrgmId"
-								:parentPrgmId="myPrgmId"
+							@getRowsData="getRowData"
-								@getRowsData="getRowData"
+							@sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
+							:selectedRowDataWatchFlag="true"
-								:selectedRowDataWatchFlag="true"
+						/>
-							/>
-						</div>
 					</div>
 				</v-card>
 			</v-col>

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,
@@ -527,16 +521,16 @@ export default {
 							//rowKey: 0,
 							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: '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;
 
@@ -817,9 +811,9 @@ function isValidAlrmVal(obj) {
 			if (Number(obj[keyList[i]]) >= Number(obj[keyList[j]])) {
 				alert(
 					nameList[j] +
-					'값은 ' +
+						'값은 ' +
-					nameList[i] +
+						nameList[i] +
-					'값보다 큰 숫자를 입력해야 합니다.',
+						'값보다 큰 숫자를 입력해야 합니다.',
 				);
 				return false;
 			}
@@ -1112,4 +1106,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
+</script>

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: