From 34d03b254608cd272b6b62cc8e34cb6bf2e115b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vu=20Trung=20Kien/=28Vu=20Trung=20Kien=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074468@skcc.com>
Date: Tue, 29 Jul 2025 17:18:41 +0900
Subject: [PATCH] dev-manhph1-fixbug-18-19-21-28

---
 assets/scss/common/input.scss                 |  12 +-
 components/common/PastRsltDatePicker.vue      |  18 ++-
 components/common/modal/EvtObjPop.vue         |  10 +-
 .../pages/ems/TagInfo/TagAddInfoTab.vue       |   2 +-
 pages/ems/base/EqpmKindPage.vue               |   2 +-
 pages/ems/base/EquipmentGroupMngPage.vue      |   7 +-
 pages/ems/base/PastRsltDataReadPage.vue       | 115 +++++++-----------
 pages/ems/base/TagMngPage_Pagination.vue      |  36 +++---
 8 files changed, 95 insertions(+), 107 deletions(-)

diff --git a/assets/scss/common/input.scss b/assets/scss/common/input.scss
index ccc3e55..1679115 100644
--- a/assets/scss/common/input.scss
+++ b/assets/scss/common/input.scss
@@ -1,5 +1,5 @@
 .v-select__custom {
-  padding: 0.125rem;
+  padding: 0;
   
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;
@@ -78,6 +78,16 @@
     border-color: #d9d9d9;
   }
 
+  &.select-large {
+    .v-input__slot,
+    .v-input__control {
+      height: 40px !important;
+      // border: solid 1px #D9D9D9;
+      border-radius: 8px !important;
+    }
+
+  }
+
   &.surface-name {
     fieldset {
       max-width: 345px;
diff --git a/components/common/PastRsltDatePicker.vue b/components/common/PastRsltDatePicker.vue
index 60377d2..67933f9 100644
--- a/components/common/PastRsltDatePicker.vue
+++ b/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>
-						<v-icon size="20">$icoCalendar</v-icon>
+					<template #append >
+						<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() {
diff --git a/components/common/modal/EvtObjPop.vue b/components/common/modal/EvtObjPop.vue
index 6a3bae7..70ef42c 100644
--- a/components/common/modal/EvtObjPop.vue
+++ b/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-model="searchWord" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
+			<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
+				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
 				: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">
diff --git a/components/pages/ems/TagInfo/TagAddInfoTab.vue b/components/pages/ems/TagInfo/TagAddInfoTab.vue
index bf1a6ab..7e4868c 100644
--- a/components/pages/ems/TagInfo/TagAddInfoTab.vue
+++ b/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"
diff --git a/pages/ems/base/EqpmKindPage.vue b/pages/ems/base/EqpmKindPage.vue
index c6f1fbe..1a53cc1 100644
--- a/pages/ems/base/EqpmKindPage.vue
+++ b/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">
diff --git a/pages/ems/base/EquipmentGroupMngPage.vue b/pages/ems/base/EquipmentGroupMngPage.vue
index a36c972..95e229b 100644
--- a/pages/ems/base/EquipmentGroupMngPage.vue
+++ b/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',
diff --git a/pages/ems/base/PastRsltDataReadPage.vue b/pages/ems/base/PastRsltDataReadPage.vue
index d32abfe..2ac204c 100644
--- a/pages/ems/base/PastRsltDataReadPage.vue
+++ b/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
-								:is="'PastRsltDataReadTagPop'"
-								:parentPrgmId="myPrgmId"
-								:label="'TAG'"
-							/> -->
-							<component
-								:is="'EvtObjPop'"
-								:parentPrgmId="myPrgmId"
-								:item="evtObjPopItem"
-								customClass="select-large"
-							/>
+							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
+								:textCols="12" customClass="select-large" />
 						</v-col>
-						<v-col :cols="4">
-							<component
-								:is="'Datepicker'"
-								:parentPrgmId="myPrgmId"
-								:label="'조회기간'"
-								:textCols="12"
-							/>
+						<v-col :cols="3">
+							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
+								customClass="select-large" />
 						</v-col>
-						 <v-col :cols="3" class="d-flex align-end justify-end text-right">
-							 <BtnExcelDownload
-							 	class="mr-1"
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								type="primary"
-								size="large"
-							/>
+						<v-col :cols="3">
+							<!-- 대상일 -->
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12"/>
+						</v-col>
+						<v-col :cols="3" class="d-flex align-end justify-end text-right">
+							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
+								size="large" />
 							<BtnSearch @click="search" size="large" />
 						</v-col>
 					</v-row>
@@ -68,11 +31,16 @@
 			<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
-							ref="myGrid"
-							:is="loadGrid ? 'Grid' : null"
-							:gridName="gridName"
-							:parentPrgmId="myPrgmId"
+						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
+							:parentPrgmId="myPrgmId" />
+					</div>
+					<div class="d-flex align-center justify-space-between">
+						<pagination
+							id="pagination"
+							:total-count="totalCount"
+							:page-num="page"
+							:limit="limit"
+							@loadData="changeGrid"
 						/>
 					</div>
 				</v-card>
@@ -97,7 +65,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 +98,7 @@ export default {
 		PastRsltDataReadPop,
 		PastRsltDataReadTagPop,
 		EvtObjPop,
-		PageTitle,
+		pagination,
 	},
 	data() {
 		return {
@@ -146,12 +114,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 +136,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 +145,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 +174,7 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() {},
+	created() { },
 	async mounted() {
 		await this.setFromDt();
 		await this.init();
@@ -381,6 +348,9 @@ export default {
 					apiKey: 'selectTagRawDataByQuarter',
 					resKey: 'pastRsltReadData',
 					sendParam: sendParams,
+					limit: this.limit,
+						page: this.page,
+						offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				});
 
 				this.setGridData({
@@ -393,6 +363,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;
 				//
@@ -487,6 +460,12 @@ export default {
 			finalResult['yearQuarterList'] = result;
 			return finalResult;
 		},
+		changeGrid: async function(pageNum, limit) {
+			this.page = pageNum;
+			this.limit = limit;
+
+			this.search();
+		},
 	},
 };
 
diff --git a/pages/ems/base/TagMngPage_Pagination.vue b/pages/ems/base/TagMngPage_Pagination.vue
index 86bd449..e8408b5 100644
--- a/pages/ems/base/TagMngPage_Pagination.vue
+++ b/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.pageData.rowGridSelectKey
-										: 0,
+									  this.$refs[this.gridName].getData().length - 1
+									? this.pageData.rowGridSelectKey
+									: 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>
\ No newline at end of file