From 71394443ac093fb4f13dcbb4cf7d1e931a0a02ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com>
Date: Thu, 7 Aug 2025 19:04:13 +0900
Subject: [PATCH] update code

---
 assets/scss/common/button.scss                |  5 +++++
 assets/scss/var.scss                          | 10 +++++++++
 .../common/modal/ChangeUserPswdPopPage.vue    |  2 +-
 .../common/modal/EnrgUsePlanModiPop.vue       |  6 +++--
 components/common/select/SelectAddGrp.vue     |  4 ++++
 pages/comm/auth/RoleMngPage.vue               |  5 +++--
 pages/comm/auth/UserRoleMngPage.vue           |  3 ++-
 pages/comm/base/BatchLogMngPage.vue           | 11 +++++-----
 pages/comm/base/ReadObjectMngPage.vue         |  1 +
 pages/ems/base/AddInfoMngPage.vue             | 22 +++++++++----------
 pages/ems/base/ReadObjectMngPage.vue          |  1 +
 11 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/assets/scss/common/button.scss b/assets/scss/common/button.scss
index 5836aae..e004625 100644
--- a/assets/scss/common/button.scss
+++ b/assets/scss/common/button.scss
@@ -137,6 +137,11 @@
         color:map-deep-get($config, #{$theme}, "ant-btn-default-color");
       }
 
+      &.ant-btn-popup-default {
+        background:map-deep-get($config, #{$theme}, "ant-btn-popup-bg");
+        color:map-deep-get($config, #{$theme}, "ant-btn-popup-color");
+      }
+
       &.ant-btn-danger {
         &.ant-btn-background-ghost {
           color:map-deep-get($config, #{$theme}, "ant-btn-danger-color");
diff --git a/assets/scss/var.scss b/assets/scss/var.scss
index 85d3aa3..c3355f9 100644
--- a/assets/scss/var.scss
+++ b/assets/scss/var.scss
@@ -177,8 +177,13 @@ $config: (
     v-header-border: #424242,
     v-chart-border: #424242,
     v-sidebar-border: #303030,
+<<<<<<< Updated upstream
     ant-checkbox-bg: #212224,
     ant-checkbox-border: #424242,
+=======
+    ant-btn-popup-bg: #212224,
+    ant-btn-popup-color: #FFFFFFD9,
+>>>>>>> Stashed changes
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -319,7 +324,12 @@ $config: (
     v-header-border: #D9D9D9,
     v-chart-border: #D9D9D9,
     v-sidebar-border: #F0F0F0,
+<<<<<<< Updated upstream
     ant-checkbox-bg: #FFFFFF,
     ant-checkbox-border: #D9D9D9,
+=======
+    ant-btn-popup-bg: #FFFFFF,
+    ant-btn-popup-color: #000000E0,
+>>>>>>> Stashed changes
   ),
 );
\ No newline at end of file
diff --git a/components/common/modal/ChangeUserPswdPopPage.vue b/components/common/modal/ChangeUserPswdPopPage.vue
index fc188b7..0dc6939 100644
--- a/components/common/modal/ChangeUserPswdPopPage.vue
+++ b/components/common/modal/ChangeUserPswdPopPage.vue
@@ -76,7 +76,7 @@
 					<v-spacer></v-spacer>
 					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
 					<div class="pr-3">
-						 <a-button @click="close()" class="btn-default">삭제</a-button>
+						 <a-button @click="close()" class="ant-btn-popup-default">닫기</a-button>
 						 <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
 							 확인
 						 </a-button>
diff --git a/components/common/modal/EnrgUsePlanModiPop.vue b/components/common/modal/EnrgUsePlanModiPop.vue
index db7478e..f7f64b4 100644
--- a/components/common/modal/EnrgUsePlanModiPop.vue
+++ b/components/common/modal/EnrgUsePlanModiPop.vue
@@ -37,6 +37,7 @@
 								:itemList="selectValueList01"
 								:label="'대상월'"
 								@update:propsValue="selectValue01 = $event"
+								customClass="select-large"
 							/>
 						</v-col>
 						<v-col :cols="5.5" class="mr-2">
@@ -49,9 +50,10 @@
 								:itemList="selectValueList02"
 								:label="'전년대비절감율'"
 								@update:propsValue="selectValue02 = $event"
+								customClass="select-large"
 							/>
 						</v-col>
-						<a-button color="primary" dark @click="search()" icon="clock-circle" >
+						<a-button class="ant-btn-popup-default" color="primary" dark @click="search()" icon="check-circle" size="large">
 							<!-- <template #icon>
 								<ClockCircleOutlined />
 							</template> -->
@@ -128,7 +130,7 @@
 					</div> -->
 				
 				<v-card-actions class="pa-5 d-flex align-center justify-end">
-					<a-button color="primary" type="default" class="mr-2" dark @click="closePop()">취소</a-button>					
+					<a-button color="primary" class="mr-2 ant-btn-popup-default" dark @click="closePop()">취소</a-button>					
 					<a-button color="primary" type="primary" dark @click="setUpdate()">확정</a-button>
 				</v-card-actions>
 			</v-card>
diff --git a/components/common/select/SelectAddGrp.vue b/components/common/select/SelectAddGrp.vue
index b6e7147..5c21522 100644
--- a/components/common/select/SelectAddGrp.vue
+++ b/components/common/select/SelectAddGrp.vue
@@ -81,6 +81,10 @@ export default {
 			type: String,
 			require: false,
 		},
+		required: {
+			type: Boolean,
+			default: false
+		},
 	},
 	data() {
 		return {};
diff --git a/pages/comm/auth/RoleMngPage.vue b/pages/comm/auth/RoleMngPage.vue
index 930c5d7..ccdcbca 100644
--- a/pages/comm/auth/RoleMngPage.vue
+++ b/pages/comm/auth/RoleMngPage.vue
@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -205,12 +206,12 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'center' },
+				{ header: '역할ID', name: 'roleId', align: 'left' },
 				{ header: '역할명', name: 'roleNm' },
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
diff --git a/pages/comm/auth/UserRoleMngPage.vue b/pages/comm/auth/UserRoleMngPage.vue
index 23e512d..36b1fec 100644
--- a/pages/comm/auth/UserRoleMngPage.vue
+++ b/pages/comm/auth/UserRoleMngPage.vue
@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -922,7 +923,7 @@ const unAsgnRoleByUserColumns = [
 					</label>`;
 		}
 	},	
-	{ header: '역할ID', name: 'roleId', align: 'center' },
+	{ header: '역할ID', name: 'roleId', align: 'left' },
 	{ header: '역할명', name: 'roleNm' },
 	{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
 	{ header: '적용종료일', name: 'aplyEndDt', hidden: true },
diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue
index df852d8..e6e3115 100644
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -218,14 +219,14 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: 'No.', name: 'batchLogSeq', align: 'center', width: 100 },
-				{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
+				{ header: 'No.', name: 'batchLogSeq', align: 'right', width: 100 },
+				{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
 				{ header: '배치명', name: 'batchNm', align: 'left', width: 150 },
-				{ header: '실행 일자', name: 'execDt', align: 'center', width: 80 },
+				{ header: '실행 일자', name: 'execDt', align: 'right', width: 80 },
 				{
 					header: '실행 결과',
 					name: 'execRsltCd',
-					align: 'center',
+					align: 'left',
 					width: 80,
 					formatter({ value }) {
 						let retVal = '';
@@ -242,7 +243,7 @@ export default {
 				{
 					header: '배치 시작 일시',
 					name: 'batchStrtDttm',
-					align: 'center',
+					align: 'left',
 					width: 160,
 				},
 				{
diff --git a/pages/comm/base/ReadObjectMngPage.vue b/pages/comm/base/ReadObjectMngPage.vue
index 685e353..5868b5f 100644
--- a/pages/comm/base/ReadObjectMngPage.vue
+++ b/pages/comm/base/ReadObjectMngPage.vue
@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
diff --git a/pages/ems/base/AddInfoMngPage.vue b/pages/ems/base/AddInfoMngPage.vue
index 8a330ed..10ab392 100644
--- a/pages/ems/base/AddInfoMngPage.vue
+++ b/pages/ems/base/AddInfoMngPage.vue
@@ -12,7 +12,6 @@
 								dataKey="searchAddGrp"
 								:sendParam="{ useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -22,7 +21,6 @@
 								label="추가 정보명"
 								valueNm="addInfoNm"
 								:searchOption="true"
-								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -336,8 +334,7 @@ export default {
 			this.search();
 		},
 		async search() {
-			//process
-			this.loadGrid = true;
+			this.loadGrid = false;
 			await this.getRowGridData();
 			await this.setPageData({
 				isFind: false,
@@ -547,7 +544,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		required: true,
 	},
 	{
@@ -559,7 +556,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		list: 'addInfoDataKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -574,7 +571,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2 d-flex align-items-center',
 		value: { '1': true, '0': false },
 		required: true,
 	},
@@ -587,7 +584,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -599,7 +596,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -611,7 +608,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -623,8 +620,11 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 ];
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>
diff --git a/pages/ems/base/ReadObjectMngPage.vue b/pages/ems/base/ReadObjectMngPage.vue
index ec5e948..419b51a 100644
--- a/pages/ems/base/ReadObjectMngPage.vue
+++ b/pages/ems/base/ReadObjectMngPage.vue
@@ -1,5 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">