From e2f7ab51137053842b90990aa5ae23bb9df7be24 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Tue, 22 Jul 2025 12:24:07 +0900
Subject: [PATCH 1/2] merge 2207

---
 assets/scss/common/tabs.scss                  |   8 +-
 assets/scss/var.scss                          |   4 +-
 components/common/Calendar.vue                |   7 +-
 components/common/modal/PlanPop.vue           | 593 ++++++++----------
 components/common/select/SelectBlocMstr.vue   |   7 +-
 components/common/select/SelectReadObj.vue    |   5 -
 .../ems/EffcIdxInfo/EffcIdxAddInfoTab.vue     |   4 +-
 pages/comm/auth/MenuMngPage.vue               |   5 +-
 pages/comm/base/BatchMngPage.vue              |  14 +-
 pages/comm/base/CalendarMngPage.vue           | 315 ++++++----
 pages/ems/base/EqpmGrpPysclQtyMngPage.vue     |  19 +-
 store/modules/menu.js                         |  13 +
 12 files changed, 501 insertions(+), 493 deletions(-)

diff --git a/assets/scss/common/tabs.scss b/assets/scss/common/tabs.scss
index 2242602..69eb549 100644
--- a/assets/scss/common/tabs.scss
+++ b/assets/scss/common/tabs.scss
@@ -28,8 +28,8 @@
 
       .v-slide-group__content {
         border-bottom: 1px solid map-deep-get($config,
-          #{$theme},
-          "v-tabs-items-border-color"
+        #{$theme},
+        "v-tabs-items-border-color"
         );
       }
 
@@ -68,11 +68,11 @@
         }
 
         &:hover {
-          color:  map-deep-get(
+          color: map-deep-get(
             $config,
             #{$theme},
             "v-tabs-hover-color"
-          ) !important
+          ) !important;
         }
 
         &:not(.v-tab--active){
diff --git a/assets/scss/var.scss b/assets/scss/var.scss
index da9a557..5defad7 100644
--- a/assets/scss/var.scss
+++ b/assets/scss/var.scss
@@ -120,7 +120,7 @@ $config: (
     v-tabs-active-border-color: rgba(255, 255, 255, 0.7),
     v-dialog-card-text-color: #fff,
     tui-datepicker-backgroundColor: #0d0f17,
-    tui-datepicker-border-color: rgb(66, 66, 66),
+    tui-datepicker-border-color: rgba(255, 255, 255, 0.3),
     tui-datepicker-selectable-hover-color: #2d3355,
     tui-datepicker-selected-color: #1a4e87,
     tui-datepicker-calendar-color: #fff,
@@ -252,7 +252,7 @@ $config: (
     v-tabs-hover-color: #1677FF,
     v-dialog-card-text-color: #111,
     tui-datepicker-backgroundColor: #fff,
-    tui-datepicker-border-color: #D9D9D9,
+    tui-datepicker-border-color: #b4b8c9,
     tui-datepicker-selectable-hover-color: #e1e7f3,
     tui-datepicker-selected-color: #4777d9,
     tui-datepicker-calendar-color: #111,
diff --git a/components/common/Calendar.vue b/components/common/Calendar.vue
index bbd4ed4..c48a8b3 100644
--- a/components/common/Calendar.vue
+++ b/components/common/Calendar.vue
@@ -170,9 +170,10 @@ export default {
 				month : month,
 				day : day
 			}
-			this.$refs['planPop'].blocId = this.pageData.blocMstrList[
-				this.pageData.blocId
-			].blocId;
+			// commect blocId to run UI
+			// this.$refs['planPop'].blocId = this.pageData.blocMstrList[
+			// 	this.pageData.blocId
+			// ].blocId;
 			this.$refs['planPop'].dialog = true;
 		},
 		updatePlan(val) {
diff --git a/components/common/modal/PlanPop.vue b/components/common/modal/PlanPop.vue
index 33af36e..2986c40 100644
--- a/components/common/modal/PlanPop.vue
+++ b/components/common/modal/PlanPop.vue
@@ -1,268 +1,195 @@
 <template>
 	<div>
 		<!-- <v-btn :ripple="false" @click="dialog = !dialog">경고창</v-btn> -->
-		<v-dialog
-			v-model="dialog"
-			width="700"
-			overlay-color="#000"
-			overlay-opacity="0.8"
-		>
+		<v-dialog v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8">
 			<v-card>
-				<v-toolbar
+				<v-card-title class="px-6 py-4 d-flex align-center justify-space-between">
+					<span class="custom-title-4">{{ label }}</span>
+					<a-button icon="close" type="text" @click="dialog = !dialog"></a-button>
+				</v-card-title>
+				<!-- <v-toolbar
 					:color="isDarkMode ? '#2d3355' : '#3f4d7d'"
 					class="py-4 pr-3 pl-5"
 					height="auto"
 				>
 					<v-toolbar-title>{{ label }}</v-toolbar-title>
-					<!-- <v-btn
-            icon
-            tile
-            small
-            :ripple="false"
-            @click="dialog = !dialog"
-            :style="{ backgroundColor: isDarkMode ? '#2d3355' : '#3f4d7d' }"
-          >
-            <v-icon>mdi-close</v-icon>
-          </v-btn> -->
-				</v-toolbar>
+				</v-toolbar> -->
 				<!-- <v-card-title>  
           일정 상세 내용
         </v-card-title> -->
 				<!-- <template v-for="(item, index) in detailList"> -->
 				<template>
-					<div style="padding : 20px">
-						<v-col :cols="12">
-							<v-row>
-								<v-col :cols="3">
-									<v-row class="search-box" align="center" no-gutters>
-										<label class="search-box-label">
-											<v-icon x-small color="#fb8200" class="mr-1"
-												>mdi-record-circle</v-icon
-											>
-											일정 시작
-										</label>
-									</v-row>
-								</v-col>
-								<v-col :cols="4">
-									<!-- <DatePicker v-model="strtDt" :parentPrgmId="parentPrgmId"/> -->
-									<div class="startpicker-container2">
-										<v-text-field
-											id="startpicker2"
-											ref="startpicker2"
-											v-model="strtDt"
-											:class="'v-input__custom'"
-											:hide-details="true"
-											readonly
-											outlined
-										>
-											<template #append>
-												<v-icon size="20">$icoCalendar</v-icon>
-											</template>
-											<template #append-outer>
-												<div
-													ref="startpicker-container2"
-													id="startpicker-container2"
-												></div>
-											</template>
-										</v-text-field>
+					<div class="pa-6 pt-0">
+						<v-row no-gutters class="mb-4">
+							<v-col :cols="12">
+								<label class="search-box-label">
+									<v-icon small :class="['mr-1', 'icon-orange']">$icoBulletPoint</v-icon>
+									일정 시작
+								</label>
+							</v-col>
+							<v-col :cols="6" class="py-0 pr-2">
+								<!-- <DatePicker v-model="strtDt" :parentPrgmId="parentPrgmId"/> -->
+								<div class="startpicker-container2">
+									<v-text-field id="startpicker2" ref="startpicker2" v-model="strtDt"
+										:class="'v-input__custom'" :hide-details="true" readonly outlined>
+										<template #append>
+											<v-icon size="20">$icoCalendar</v-icon>
+										</template>
+										<template #append-outer>
+											<div ref="startpicker-container2" id="startpicker-container2"></div>
+										</template>
+									</v-text-field>
+								</div>
+							</v-col>
+							<v-col :cols="6" class="py-0 pl-2">
+								<!-- <DatePicker v-model="strtDt" :parentPrgmId="parentPrgmId"/> -->
+								<div class="startpicker-container2">
+									<v-text-field id="startpicker2" ref="startpicker2" v-model="strtDt"
+										:class="'v-input__custom'" :hide-details="true" readonly outlined>
+										<template #append>
+											<v-icon size="20">$icoCalendar</v-icon>
+										</template>
+										<template #append-outer>
+											<div ref="startpicker-container2" id="startpicker-container2"></div>
+										</template>
+									</v-text-field>
+								</div>
+							</v-col>
+							<!-- <v-col :cols="2">
+										<vue-numeric-input v-model="strtHh" :min="0" :max="23" controls-type="updown"
+											class="v-input__slot" width="100%" align="center">
+										</vue-numeric-input>
+									</v-col>
+									<v-col :cols="1" style="text-align: center;">
+										:
+									</v-col>
+									<v-col :cols="2">
+										<vue-numeric-input v-model="strtMm" :min="0" :max="59" controls-type="updown"
+											class="v-input__slot" width="100%" align="center">
+										</vue-numeric-input>
+									</v-col> -->
+						</v-row>
+						<v-row no-gutters class="mb-4">
+							<v-col :cols="12">
+								<label class="search-box-label">
+									<v-icon small :class="['mr-1', 'icon-orange']">$icoBulletPoint</v-icon>
+									일정 종료
+								</label>
+							</v-col>
+							<v-col :cols="6" class="pr-2">
+								<!-- <DatePicker v-model="endDt" :parentPrgmId="parentPrgmId"/> -->
+								<div class="startpicker-container3">
+									<v-text-field id="startpicker3" ref="startpicker3" v-model="endDt"
+										:class="'v-input__custom'" :hide-details="true" readonly outlined>
+										<template #append>
+											<v-icon size="20">$icoCalendar</v-icon>
+										</template>
+										<template #append-outer>
+											<div ref="startpicker-container3" id="startpicker-container3"></div>
+										</template>
+									</v-text-field>
+								</div>
+							</v-col>
+							<v-col :cols="6" class="pl-2">
+								<div class="startpicker-container3">
+									<v-text-field id="startpicker3" ref="startpicker3" v-model="endDt"
+										:class="'v-input__custom'" :hide-details="true" readonly outlined>
+										<template #append>
+											<v-icon size="20">$icoCalendar</v-icon>
+										</template>
+										<template #append-outer>
+											<div ref="startpicker-container3" id="startpicker-container3"></div>
+										</template>
+									</v-text-field>
+								</div>
+							</v-col>
+							<!-- <v-col :cols="2">
+								<vue-numeric-input v-model="endHh" :min="0" :max="23" controls-type="updown"
+									class="v-input__slot" width="100%" align="center">
+								</vue-numeric-input>
+							</v-col>
+							<v-col :cols="1" style="text-align: center;">
+								:
+							</v-col>
+							<v-col :cols="2">
+								<vue-numeric-input v-model="endMm" :min="0" :max="59" controls-type="updown"
+									class="v-input__slot" width="100%" align="center">
+								</vue-numeric-input>
+							</v-col> -->
+						</v-row>
+						<v-row no-gutters class="mb-4">
+							<v-col :cols="12">
+								<label class="search-box-label">
+									<v-icon small :class="['mr-1', 'icon-orange']">$icoBulletPoint</v-icon>
+									일정 제목
+								</label>
+							</v-col>
+							<v-col :cols="12" class="py-0">
+								<v-text-field v-model="planTitle" class="v-input__custom" outlined
+									:hide-details="true"></v-text-field>
+							</v-col>
+						</v-row>
+						<v-row no-gutters class="mb-4">
+							<v-col :cols="12">
+								<label class="search-box-label">
+									<v-icon small :class="['mr-1', 'icon-orange']">$icoBulletPoint</v-icon>
+									일정 상세 내용
+								</label>
+							</v-col>
+							<v-col :cols="12" class="py-0">
+								<v-textarea v-model="planCntn" class="v-input__custom" outlined :hide-details="true"
+									:maxlength="1000"></v-textarea>
+							</v-col>
+						</v-row>
+						<v-row no-gutters class="mb-4">
+							<v-col :cols="12">
+								<label class="search-box-label">
+									<v-icon small :class="['mr-1', 'icon-orange']">$icoBulletPoint</v-icon>
+									표시 색상
+								</label>
+
+							</v-col>
+							<v-col :cols="6">
+								<div class="d-flex calendar-color" style="gap:16px">
+
+									<div id="redDiv" class="colPk redBg" @click="colorClick('red')">
+										<div class="inner-color"></div>
 									</div>
-								</v-col>
-								<v-col :cols="2">
-									<vue-numeric-input
-										v-model="strtHh"
-										:min="0"
-										:max="23"
-										controls-type="updown"
-										class="v-input__slot"
-										width="100%"
-										align="center"
-									>
-									</vue-numeric-input>
-								</v-col>
-								<v-col :cols="1" style="text-align: center;">
-									:
-								</v-col>
-								<v-col :cols="2">
-									<vue-numeric-input
-										v-model="strtMm"
-										:min="0"
-										:max="59"
-										controls-type="updown"
-										class="v-input__slot"
-										width="100%"
-										align="center"
-									>
-									</vue-numeric-input>
-								</v-col>
-							</v-row>
-							<v-row>
-								<v-col :cols="3">
-									<v-row class="search-box" align="center" no-gutters>
-										<label class="search-box-label">
-											<v-icon x-small color="#fb8200" class="mr-1"
-												>mdi-record-circle</v-icon
-											>
-											일정 종료
-										</label>
-									</v-row>
-								</v-col>
-								<v-col :cols="4">
-									<!-- <DatePicker v-model="endDt" :parentPrgmId="parentPrgmId"/> -->
-									<div class="startpicker-container3">
-										<v-text-field
-											id="startpicker3"
-											ref="startpicker3"
-											v-model="endDt"
-											:class="'v-input__custom'"
-											:hide-details="true"
-											readonly
-											outlined
-										>
-											<template #append>
-												<v-icon size="20">$icoCalendar</v-icon>
-											</template>
-											<template #append-outer>
-												<div
-													ref="startpicker-container3"
-													id="startpicker-container3"
-												></div>
-											</template>
-										</v-text-field>
+
+									<div id="blueDiv" class="colPk blueBg" @click="colorClick('blue')">
+										<div class="inner-color"></div>
 									</div>
-								</v-col>
-								<v-col :cols="2">
-									<vue-numeric-input
-										v-model="endHh"
-										:min="0"
-										:max="23"
-										controls-type="updown"
-										class="v-input__slot"
-										width="100%"
-										align="center"
-									>
-									</vue-numeric-input>
-								</v-col>
-								<v-col :cols="1" style="text-align: center;">
-									:
-								</v-col>
-								<v-col :cols="2">
-									<vue-numeric-input
-										v-model="endMm"
-										:min="0"
-										:max="59"
-										controls-type="updown"
-										class="v-input__slot"
-										width="100%"
-										align="center"
-									>
-									</vue-numeric-input>
-								</v-col>
-							</v-row>
-							<v-row>
-								<v-col :cols="3">
-									<v-row class="search-box" align="center" no-gutters>
-										<label class="search-box-label">
-											<v-icon x-small color="#fb8200" class="mr-1"
-												>mdi-record-circle</v-icon
-											>
-											일정 제목
-										</label>
-									</v-row>
-								</v-col>
-								<v-col :cols="9">
-									<v-text-field
-										v-model="planTitle"
-										class="v-input__custom"
-										outlined
-										:hide-details="true"
-									></v-text-field>
-								</v-col>
-							</v-row>
-							<v-row>
-								<v-col :cols="3">
-									<v-row class="search-box" align="center" no-gutters>
-										<label class="search-box-label">
-											<v-icon x-small color="#fb8200" class="mr-1"
-												>mdi-record-circle</v-icon
-											>
-											일정 상세 내용
-										</label>
-									</v-row>
-								</v-col>
-								<v-col :cols="9">
-									<v-textarea
-										v-model="planCntn"
-										class="v-input__custom"
-										outlined
-										:hide-details="true"
-										:maxlength="1000"
-									></v-textarea>
-								</v-col>
-							</v-row>
-							<v-row>
-								<v-col :cols="3">
-									<v-row class="search-box" align="center" no-gutters>
-										<v-icon x-small color="#fb8200" class="mr-1"
-											>mdi-record-circle</v-icon
-										>
-										표시 색상
-									</v-row>
-								</v-col>
-								<v-col :cols="1">
-									<div
-										id="redDiv"
-										class="colPk redBg"
-										@click="colorClick('red')"
-									></div>
-								</v-col>
-								<v-col :cols="1">
-									<div
-										id="blueDiv"
-										class="colPk blueBg"
-										@click="colorClick('blue')"
-									></div>
-								</v-col>
-								<v-col :cols="1">
-									<div
-										id="pupleDiv"
-										class="colPk pupleBg"
-										@click="colorClick('puple')"
-									></div>
-								</v-col>
-								<v-col :cols="1">
-									<div
-										id="greenDiv"
-										class="colPk greenBg"
-										@click="colorClick('green')"
-									></div>
-								</v-col>
-								<v-col :cols="1">
-									<div
-										id="orangeDiv"
-										class="colPk orangeBg"
-										@click="colorClick('orange')"
-									></div>
-								</v-col>
-								<v-col :cols="1">
-									<div
-										id="pinkDiv"
-										class="colPk pinkBg"
-										@click="colorClick('pink')"
-									></div>
-								</v-col>
-							</v-row>
-						</v-col>
+
+
+									<div id="pupleDiv" class="colPk pupleBg" @click="colorClick('puple')">
+										<div class="inner-color"></div>
+									</div>
+
+
+									<div id="greenDiv" class="colPk greenBg" @click="colorClick('green')">
+										<div class="inner-color"></div>
+									</div>
+
+
+									<div id="orangeDiv" class="colPk orangeBg" @click="colorClick('orange')">
+										<div class="inner-color"></div>
+									</div>
+
+
+									<div id="pinkDiv" class="colPk pinkBg" @click="colorClick('pink')">
+										<div class="inner-color"></div>
+									</div>
+
+								</div>
+							</v-col>
+						</v-row>
 					</div>
 				</template>
 				<v-card-actions class="justify-end">
-					<v-btn :ripple="false" @click="btnAction('save')">저장</v-btn>
-					<v-btn
-						v-show="popUpAction === 'update'"
-						:ripple="false"
-						@click="btnAction('delete')"
-						>삭제</v-btn
-					>
-					<v-btn :ripple="false" @click="btnAction('close')">닫기</v-btn>
+					<a-button :ripple="false" @click="btnAction('save')" class="mr-2">저장</a-button>
+					<a-button v-show="popUpAction === 'update'" type="danger" ghost danger :ripple="false"
+						@click="btnAction('delete')" class="mr-2">삭제</a-button>
+					<a-button :ripple="false" type="primary" @click="btnAction('close')" class="mr-2">닫기</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -335,8 +262,8 @@ export default {
 			strtMm: 0,
 			endHh: 1,
 			endMm: 0,
-			strtDt:null,
-			endDt:null,
+			strtDt: null,
+			endDt: null,
 			// strtDt: new Date().toISOString().substr(0, 10),
 			// endDt: new Date().toISOString().substr(0, 10),
 			planColor: '',
@@ -344,7 +271,7 @@ export default {
 			startDatepickerInstance3: null,
 			planSeq: '',
 			blocId: '',
-			addPlanData:{
+			addPlanData: {
 			}
 		};
 	},
@@ -364,21 +291,21 @@ export default {
 			if (val) {
 				this.openDialog();
 
-				this.$nextTick(() => {});
+				this.$nextTick(() => { });
 			} else {
 			}
 		},
-		strtDt(val){		
+		strtDt(val) {
 			console.log('strtDt : ', val);
 			this.checkStrtAndEndDateTime('start');
-			if(this.startDatepickerInstance3){
+			if (this.startDatepickerInstance3) {
 				this.startDatepickerInstance3.setDate(new Date(this.endDt));
 			}
 		},
-		endDt(val){
+		endDt(val) {
 			console.log('endDt : ', val);
 			this.checkStrtAndEndDateTime('end');
-			if(this.startDatepickerInstance){
+			if (this.startDatepickerInstance) {
 				this.startDatepickerInstance.setDate(new Date(this.strtDt));
 			}
 		},
@@ -405,18 +332,18 @@ export default {
 			postUpdateApi: 'modules/list/postUpdateApi',
 			getDomain: 'modules/list/getDomain',
 		}),
-		async checkStrtAndEndDateTime(startEndFlag){
+		async checkStrtAndEndDateTime(startEndFlag) {
 			var startDateTime = this.strtDt + ' ' + this.strtHh + ':' + this.strtMm;
 			var endDateTime = this.endDt + ' ' + this.endHh + ':' + this.endMm;
 
 			startDateTime = new Date(startDateTime);
 			endDateTime = new Date(endDateTime);
 
-			if(startDateTime > endDateTime){
-				if(startEndFlag == 'start'){ // 시작 부분이 변경됨	-> 끝 부분 값을 변경
+			if (startDateTime > endDateTime) {
+				if (startEndFlag == 'start') { // 시작 부분이 변경됨	-> 끝 부분 값을 변경
 					this.endDt = this.convertDateToString(new Date(new Date().setDate(new Date(this.strtDt).getDate() + 1)));
 					this.startDatepickerInstance3.setDate(new Date(this.endDt));
-				}else if(startEndFlag == 'end'){	// 끝 부분이 변경됨 -> 시작 부분 값을 변경
+				} else if (startEndFlag == 'end') {	// 끝 부분이 변경됨 -> 시작 부분 값을 변경
 					this.strtDt = this.convertDateToString(new Date(new Date().setDate(new Date(this.endDt).getDate() - 1)));
 					this.startDatepickerInstance.setDate(new Date(this.strtDt));
 				}
@@ -432,17 +359,17 @@ export default {
 			var dt1 = new Date();
 			var dt2 = new Date();
 
-			if(this.strtDt){
+			if (this.strtDt) {
 				dt1 = this.strtDt;
 			}
 
-			if(this.endDt){
+			if (this.endDt) {
 				dt2 = this.endDt;
 			}
 
 			this.startDatepickerInstance = new TuiDatepicker(startContainer, {
 				// date: new Date(),
-				date : dt1,
+				date: dt1,
 				language: 'ko',
 				type: 'date',
 				input: {
@@ -455,7 +382,7 @@ export default {
 
 			this.startDatepickerInstance3 = new TuiDatepicker(startContainer3, {
 				// date: new Date(),
-				date : dt2,
+				date: dt2,
 				language: 'ko',
 				type: 'date',
 				input: {
@@ -492,8 +419,8 @@ export default {
 			this.endDt = this.convertDateToString(dt);
 			this.startDatepickerInstance3.setDate(new Date(this.endDt));
 		},
-		convertDateToString(dt){
-			return dt.getFullYear() + '-' + String(dt.getMonth()+1).padStart(2, '0') + '-' + String(dt.getDate()).padStart(2, '0');
+		convertDateToString(dt) {
+			return dt.getFullYear() + '-' + String(dt.getMonth() + 1).padStart(2, '0') + '-' + String(dt.getDate()).padStart(2, '0');
 		},
 		convertStringToDateFormat(val) {
 			var result = '';
@@ -526,7 +453,7 @@ export default {
 				}
 			});
 		},
-		async insertPlanData(){
+		async insertPlanData() {
 			var year = this.addPlanData.year;
 			var month = this.addPlanData.month;
 			var day = this.addPlanData.day;
@@ -562,8 +489,8 @@ export default {
 			// this.strtDt = Utility.setFormatDate(this.strtDt, 'YYYY-MM-DD');
 			// this.endDt = Utility.setFormatDate(this.endDt, 'YYYY-MM-DD');
 
-			this.strtDt = year + '-' + String(month).padStart(2, '0')  + '-' + String(day).padStart(2, '0');
-			this.endDt = year + '-' + String(month).padStart(2, '0')  + '-' + String(day).padStart(2, '0');
+			this.strtDt = year + '-' + String(month).padStart(2, '0') + '-' + String(day).padStart(2, '0');
+			this.endDt = year + '-' + String(month).padStart(2, '0') + '-' + String(day).padStart(2, '0');
 		},
 		async getPlanData() {
 			let res = await this.postApiReturn({
@@ -786,100 +713,116 @@ export default {
 	.v-card__actions {
 		padding-bottom: 30px !important;
 	}
+
+	.inner-color {
+		width: 100%;
+		height: 100%;
+		border-radius: 4px;
+	}
+
 	.colPk {
-		width: 25px;
-		height: 25px;
+		width: 28px;
+		height: 28px;
 		text-align: center;
-		border-radius: 5px 5px;
+		border-radius: 6px 6px;
 		cursor: pointer;
+		padding: 4px
 	}
+
 	.colPkSelect {
-		border: 2px solid;
+		border: 1px solid #00000073;
 	}
-	.redBg {
+
+	.redBg .inner-color {
 		background-color: rgba(229, 62, 62, var(--bg-opacity));
-		background-color: #e53e3e;
+		background-color: #FF4D4F;
 	}
-	.blueBg {
+
+	.blueBg .inner-color {
 		background-color: rgba(66, 153, 225, var(--bg-opacity));
-		background-color: #4299e1;
+		background-color: #597EF7;
 	}
-	.pupleBg {
+
+	.pupleBg .inner-color {
 		background-color: rgba(102, 126, 234, var(--bg-opacity));
-		background-color: #667eea;
+		background-color: #9254DE;
 	}
-	.greenBg {
+
+	.greenBg .inner-color {
 		background-color: rgba(56, 178, 172, var(--bg-opacity));
-		background-color: #38b2ac;
+		background-color: #73D13D;
 	}
-	.orangeBg {
+
+	.orangeBg .inner-color {
 		background-color: rgba(237, 137, 54, var(--bg-opacity));
-		background-color: #ed8936;
+		background-color: #FFA940;
 	}
-	.pinkBg {
+
+	.pinkBg .inner-color {
 		background-color: rgba(237, 100, 166, var(--bg-opacity));
-		background-color: #ed64a6;
+		background-color: #F759AB;
 	}
 }
 
-.startpicker-container2 {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	position: relative;
 
-	.v-input {
-		.v-input__append-outer {
-			margin-top: 0;
-			margin-left: 0;
 
-			#startpicker-container2,
-			#endpicker-container2 {
-				width: 100%;
-				position: absolute;
-				top: 36px;
-				left: 0;
-			}
-		}
-	}
-}
-
-.startpicker-container3 {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	position: relative;
-
-	.v-input {
-		.v-input__append-outer {
-			margin-top: 0;
-			margin-left: 0;
-
-			#startpicker-container3,
-			#endpicker-container3 {
-				width: 100%;
-				position: absolute;
-				top: 36px;
-				left: 0;
-			}
-		}
-	}
-}
 
 .v-input__custom {
-	flex: 0 0 auto;
+
+
 	&.half {
 		width: calc(50% - 20px);
 	}
 }
+
 ::v-deep {
 	.tui-timepicker-row {
 		display: flex;
 		justify-content: space-around;
 		background-color: #edf4fc;
+
 		.tui-timepicker-column.tui-timepicker-colon {
 			color: #000 !important;
 		}
 	}
+
+	.startpicker-container2 {
+		position: relative;
+
+		.v-input {
+			.v-input__append-outer {
+				margin-top: 0;
+				margin-left: 0;
+
+				#startpicker-container2,
+				#endpicker-container2 {
+					width: 100%;
+					position: absolute;
+					top: 36px;
+					left: 0;
+				}
+			}
+		}
+	}
+
+
+	.startpicker-container3 {
+		position: relative;
+
+		.v-input {
+			.v-input__append-outer {
+				margin-top: 0;
+				margin-left: 0;
+
+				#startpicker-container3,
+				#endpicker-container3 {
+					width: 100%;
+					position: absolute;
+					top: 36px;
+					left: 0;
+				}
+			}
+		}
+	}
 }
 </style>
diff --git a/components/common/select/SelectBlocMstr.vue b/components/common/select/SelectBlocMstr.vue
index 556c8aa..a489170 100644
--- a/components/common/select/SelectBlocMstr.vue
+++ b/components/common/select/SelectBlocMstr.vue
@@ -5,7 +5,7 @@
 				<v-icon
 					v-if="iconShow"
 					small
-					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+					:class="['mr-1','icon-blue']"
 					>$icoBulletPoint</v-icon
 				>
 				{{ label }}
@@ -57,11 +57,6 @@ export default {
 			require: false,
 			default: 4,
 		},
-		required: {
-			type: Boolean,
-			require: false,
-			default: false
-		},
 		iconShow: {
 			type: Boolean,
 			require: false,
diff --git a/components/common/select/SelectReadObj.vue b/components/common/select/SelectReadObj.vue
index 1d31c81..8d5f2e2 100644
--- a/components/common/select/SelectReadObj.vue
+++ b/components/common/select/SelectReadObj.vue
@@ -72,11 +72,6 @@ export default {
 			require: false,
 			default: 4,
 		},
-		required: {
-			type: Boolean,
-			require: false,
-			default: false
-		},
 		iconShow: {
 			type: Boolean,
 			require: false,
diff --git a/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue b/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue
index 2cc3057..c40f325 100644
--- a/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue
+++ b/components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<v-row>
+		<v-row class="mt-3">
 			<v-col :cols="6" class="py-2 pr-4">
 				<InputText ref="effcIdxId" :parentPrgmId="parentPrgmId" label="효율지표 ID" valueNm="effcIdxId"
 					:required="false" :readonly="true" :textCols="12" :labelCols="12" />
@@ -15,7 +15,7 @@
 					@update:propsValue="selectValue01 = $event" />
 			</v-col>
 		</v-row>
-		<div class="d-flex align-center justify-space-between pa-5">
+		<div class="d-flex align-center justify-space-between pt-3 py-2">
 			<v-card-title class="pa-0 custom-title-4">지표연결정보</v-card-title>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 			<component v-show="false" ref="EgrpPysclQtyPop" :is="'EgrpPysclQtyPop'" :parentPrgmId="parentPrgmId"
diff --git a/pages/comm/auth/MenuMngPage.vue b/pages/comm/auth/MenuMngPage.vue
index 59e53a5..f592c70 100644
--- a/pages/comm/auth/MenuMngPage.vue
+++ b/pages/comm/auth/MenuMngPage.vue
@@ -23,7 +23,7 @@
 		</v-row>
 
 		<v-row ref="contents" class="mt-4">
-			<v-col :cols="6" class="h100">
+			<v-col :cols="6" class="h100 pr-2">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<v-card-title class="pa-0">메뉴 리스트</v-card-title>
@@ -39,7 +39,7 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="6" class="h100">
+			<v-col :cols="6" class="h100 pl-3">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<v-card-title class="pa-0">메뉴 상세</v-card-title>
@@ -480,6 +480,7 @@ const myDetail = [
 		list: 'sysDivCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
+		iconShow: true,
 	},
 	{
 		type: 'CheckBox',
diff --git a/pages/comm/base/BatchMngPage.vue b/pages/comm/base/BatchMngPage.vue
index 588b258..f5f897c 100644
--- a/pages/comm/base/BatchMngPage.vue
+++ b/pages/comm/base/BatchMngPage.vue
@@ -14,7 +14,7 @@
 								:customClass="'input-large'" />
 						</v-col>
 						<v-col :cols="2.5">
-							<!-- <component
+							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
 								:label="'배치 실행 구분'"
@@ -22,17 +22,17 @@
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
 								:addAll="true"
 								:customClass="'select-large'"
-							/> -->
+							/>
 						</v-col>
 						<v-col :cols="2.5">
-							<!-- <component
+							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
 								:label="'사용여부'"
 								:dataKey="'searchUseFg'"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:customClass="'select-large'"
-							/> -->
+							/>
 						</v-col>
 						<BtnSearch size="large" />
 
@@ -41,9 +41,9 @@
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents">
+		<v-row ref="contents" class="mt-4">
 			<!-- 배치 리스트 -->
-			<v-col :cols="6" class="h100">
+			<v-col :cols="6" class="h100 pr-2">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<!-- <v-card-title>
@@ -64,7 +64,7 @@
 				</v-card>
 			</v-col>
 			<!-- 배치 상세 -->
-			<v-col :cols="6" class="h100">
+			<v-col :cols="6" class="h100 pl-3">
 				<v-card class="pd-y-20 h100">
 					<v-card-title class="d-flex justify-space-between align-end pa-4">
 						<span class="tit ft-size_20 ft-weight_600">배치 상세</span>
diff --git a/pages/comm/base/CalendarMngPage.vue b/pages/comm/base/CalendarMngPage.vue
index 03bc365..a966f0d 100644
--- a/pages/comm/base/CalendarMngPage.vue
+++ b/pages/comm/base/CalendarMngPage.vue
@@ -3,65 +3,45 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="center" no-gutters>
-						<v-col cols="2">
-							<component
-								:is="'SelectBlocMstr'"
-								:parentPrgmId="myPrgmId"
-								:sendParam="{ comId }"
-							/>
+					<v-row align="end" no-gutters>
+						<v-col cols="3">
+							<component :is="'SelectBlocMstr'" :parentPrgmId="myPrgmId" :sendParam="{ comId }"
+								:labelCols="12" :textCols="12" :customClass="'select-large'" />
 						</v-col>
 						<v-col cols="3">
 							<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
 							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
 						</v-col>
-						<v-col cols="7" class="text-right">
-							<v-btn :ripple="false" @click="search()">조회</v-btn>
+						<v-col cols="6" class="text-right">
+							<BtnSearch @click="search()" size="large" />
 						</v-col>
 					</v-row>
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" id="CalendarMngContent">
-			<v-col cols="12" lg="4" class="h100">
+		<v-row ref="contents" id="CalendarMngContent" class="mt-4">
+			<v-col cols="12" lg="4" class="h100 pr-2">
 				<v-card class="w100">
 					<v-card-title class="d-flex justify-space-between align-center">
 						<span class="custom-title-4">캘린더 리스트</span>
-						<Buttons
-							:parentPrgmId="myPrgmId"
-							:bindingData="gridName"
-							:btnActionsFnc="btnActions"
-						/>
+						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</v-card-title>
-					<v-card-actions
-						class="pt-0 px-5 pb-5"
-						:style="{ height: 'calc(100% - 72.56px)' }"
-					>
+					<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 72.56px)' }">
 						<div ref="gridParent" class="w100 h100">
-							<component
-								class="w100"
-								:ref="gridName + myPrgmId"
-								:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								:editorGrid="true"
-								@getRowsData="getRowData"
-							/>
+							<component class="w100" :ref="gridName + myPrgmId" :is="loadGrid ? 'Grid' : null"
+								:gridName="gridName" :parentPrgmId="myPrgmId" :editorGrid="true"
+								@getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="8" class="h100">
+			<v-col cols="12" lg="8" class="h100 pl-3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">캘린더 미리보기</span>
 					</v-card-title>
-					<v-card-actions class="px-5" :style="{ height: 'calc(100% - 62px)' }">
-						<Calendar
-							:parentPrgmId="myPrgmId"
-							:gridName="gridName"
-							:headerVisible="false"
-						/>
+					<v-card-actions class="px-5 d-block" :style="{ height: 'calc(100% - 62px)' }">
+						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false" />
 					</v-card-actions>
 				</v-card>
 			</v-col>
@@ -75,6 +55,7 @@ import { mapState, mapMutations, mapActions } from 'vuex';
 import Utility from '~/plugins/utility';
 import Grid from '~/components/common/Grid';
 import Buttons from '~/components/common/button/Buttons';
+import BtnSearch from '~/components/common/button/BtnSearch';
 import SelectBlocMstr from '@/components/common/select/SelectBlocMstr';
 // import SelectDateSolo from "@/components/common/select/SelectDateSolo";
 import InputText from '@/components/common/input/InputText';
@@ -107,12 +88,87 @@ export default {
 		InputText,
 		Calendar,
 		DatePicker,
+		BtnSearch
 	},
 	data() {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
+			dataPathExample: {
+				"rowGrid": {
+					data: [
+						{
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-23",
+							"dtNm": "수요일",
+							"dt": "2025-07-21",
+							"dtNm": "월요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-22",
+							"dtNm": "화요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-24",
+							"dtNm": "목요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-25",
+							"dtNm": "금요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-26",
+							"dtNm": "토요일",
+							"hldyFg": "주말",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-27",
+							"dtNm": "일요일",
+							"hldyFg": "휴일",
+							"hldyNm": "정기휴일"
+						}
+					],
+					column: [
+						{
+							header: '일자',
+							name: 'dt',
+							align: 'center',
+							// formatter({ value }) {
+							// 	return value.split(' ')[0];
+							// },
+						},
+						{
+							header: '요일',
+							name: 'dtNm',
+							align: 'center',
+							// formatter({ value }) {
+							// 	return value + '요일';
+							// },
+						},
+						{
+							header: '구분',
+							name: 'hldyFg',
+							align: 'center',
+							essential: true,
+						},
+						{ header: '휴일명', name: 'hldyNm', editor: 'text' },
+					],
+
+				}
+			},
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 		};
@@ -165,8 +221,8 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() {},
-	mounted() {},
+	created() { },
+	mounted() { },
 	methods: {
 		...mapMutations({
 			setPageData: 'setPageData',
@@ -185,16 +241,16 @@ export default {
 			await this.gridInit();
 		},
 		async search() {
-			await this.getRowGridData();
+			// await this.getRowGridData();
 		},
 		async gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
-			this.setGridOption({
-				gridKey: this.gridName,
-				value: Object.assign(Utility.defaultGridOption(gridHeight), {
-					scrollX: false,
-				}),
-			});
+			// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
+			// this.setGridOption({
+			// 	gridKey: this.gridName,
+			// 	value: Object.assign(Utility.defaultGridOption(gridHeight), {
+			// 		scrollX: false,
+			// 	}),
+			// });
 
 			// this.getRowGridData();
 		},
@@ -229,7 +285,7 @@ export default {
 
 					document
 						.querySelector('#CalendarMngContent')
-						.addEventListener('click', function(event) {
+						.addEventListener('click', function (event) {
 							if (event.target.className == 'calendarOption') {
 								// el.size = 1;
 							}
@@ -294,86 +350,86 @@ export default {
 
 			this.loadGrid = false;
 
-			let res = await this.postApiReturn({
-				apiKey: 'selectWorkCald',
-				resKey: 'workcaldData',
-				sendParam: {
-					blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
-					yymm: this.chkFromDt,
-					comId: this.comId,
-				},
-			});
+			// let res = await this.postApiReturn({
+			// 	apiKey: 'selectWorkCald',
+			// 	resKey: 'workcaldData',
+			// 	sendParam: {
+			// 		blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
+			// 		yymm: this.chkFromDt,
+			// 		comId: this.comId,
+			// 	},
+			// });
 
-			let res2 = await this.postApiReturn({
-				apiKey: 'selectWorkCaldDetl',
-				resKey: 'workcaldDetlData',
-				sendParam: {
-					blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
-					yymm: this.chkFromDt,
-					comId: this.comId,
-				},
-			});
+			// let res2 = await this.postApiReturn({
+			// 	apiKey: 'selectWorkCaldDetl',
+			// 	resKey: 'workcaldDetlData',
+			// 	sendParam: {
+			// 		blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
+			// 		yymm: this.chkFromDt,
+			// 		comId: this.comId,
+			// 	},
+			// });
 
-			for (var i = 0; i < res2.length; i++) {
-				if (
-					!(
-						res2[i].hldyNm == null ||
-						res2[i].hldyNm == '토요일' ||
-						res2[i].hldyNm == '일요일'
-					)
-				) {
-					for (var j = i + 1; j < res2.length; j++) {
-						if (res2[i].hldyNm == res2[j].hldyNm) {
-							res2[i].hldyNm = '';
-						}
-					}
-				}
-			}
+			// for (var i = 0; i < res2.length; i++) {
+			// 	if (
+			// 		!(
+			// 			res2[i].hldyNm == null ||
+			// 			res2[i].hldyNm == '토요일' ||
+			// 			res2[i].hldyNm == '일요일'
+			// 		)
+			// 	) {
+			// 		for (var j = i + 1; j < res2.length; j++) {
+			// 			if (res2[i].hldyNm == res2[j].hldyNm) {
+			// 				res2[i].hldyNm = '';
+			// 			}
+			// 		}
+			// 	}
+			// }
 
-			res = res.map(item => {
-				const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
-				const dtNm = dt.format('ddd'); // 요일
-				const newItem = {
-					...item,
-					dtNm: dtNm,
-					hldyNm: item.hldyNm ? item.hldyNm : '',
-					rowStat: null,
-				};
-				return newItem;
-			});
+			// res = res.map(item => {
+			// 	const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
+			// 	const dtNm = dt.format('ddd'); // 요일
+			// 	const newItem = {
+			// 		...item,
+			// 		dtNm: dtNm,
+			// 		hldyNm: item.hldyNm ? item.hldyNm : '',
+			// 		rowStat: null,
+			// 	};
+			// 	return newItem;
+			// });
 
-			this.loadGrid = true;
-			this.setPageData({ isFind: false });
+			// this.loadGrid = true;
+			// this.setPageData({ isFind: false });
 
-			this.setGridColumn({
-				gridKey: this.gridName,
-				value: myColumns,
-			});
+			// this.setGridColumn({
+			// 	gridKey: this.gridName,
+			// 	value: myColumns,
+			// });
 
-			this.setGridData({
-				gridKey: this.gridName,
-				value: res,
-			});
+			// this.setGridData({
+			// 	gridKey: this.gridName,
+			// 	value: res,
+			// });
 
-			this.setPageData({ planData: res2 });
+			// this.setPageData({ planData: res2 });
 
-			// 첫번째 row 선택상태
-			this.$nextTick(() => {
-				this.$refs[this.gridName + this.myPrgmId].focus({
-					//rowKey: 0,
-					rowKey:
-						this.pageData.rowGridSelectKey == '' ||
-						this.pageData.rowGridSelectKey == null
-							? 0
-							: this.pageData.rowGridSelectKey ==
-							  this.$refs[this.gridName + this.myPrgmId].getData().length - 1
-							? this.pageData.rowGridSelectKey
-							: 0,
-					columnName: 'dt',
-					setScroll: true,
-				});
-				this.setPageData({ isFind: false });
-			});
+			// // 첫번째 row 선택상태
+			// this.$nextTick(() => {
+			// 	this.$refs[this.gridName + this.myPrgmId].focus({
+			// 		//rowKey: 0,
+			// 		rowKey:
+			// 			this.pageData.rowGridSelectKey == '' ||
+			// 				this.pageData.rowGridSelectKey == null
+			// 				? 0
+			// 				: this.pageData.rowGridSelectKey ==
+			// 					this.$refs[this.gridName + this.myPrgmId].getData().length - 1
+			// 					? this.pageData.rowGridSelectKey
+			// 					: 0,
+			// 		columnName: 'dt',
+			// 		setScroll: true,
+			// 	});
+			// 	this.setPageData({ isFind: false });
+			// });
 		},
 		async getRowData(data, gridName) {
 			this.setGridSelectData({
@@ -488,6 +544,7 @@ const defaultData = {
 .selectbox:focus {
 	outline: none;
 }
+
 .calendarOption {
 	box-sizing: border-box;
 	position: relative;
@@ -501,20 +558,26 @@ select.selectbox {
 	box-sizing: border-box;
 	position: relative;
 	width: 100%;
-	height: 100%; /* 높이 초기화 */
+	height: 100%;
+	/* 높이 초기화 */
 	padding: 0;
 	margin: 0;
-	line-height: normal; /* line-height 초기화 */
-	font-family: inherit; /* 폰트 상속 */
+	line-height: normal;
+	/* line-height 초기화 */
+	font-family: inherit;
+	/* 폰트 상속 */
 	border: 0;
 	// opacity: 0;  /* 숨기기 */
 	// filter:alpha(opacity=0);  /* IE8 숨기기 */
 	// -webkit-appearance: none; /* 네이티브 외형 감추기 */
 	// -moz-appearance: none;
 	// appearance: none;
-	opacity: 1; /* 숨기기 */
-	filter: alpha(opacity=1); /* IE8 숨기기 */
-	-webkit-appearance: auto; /* 네이티브 외형 감추기 */
+	opacity: 1;
+	/* 숨기기 */
+	filter: alpha(opacity=1);
+	/* IE8 숨기기 */
+	-webkit-appearance: auto;
+	/* 네이티브 외형 감추기 */
 	-moz-appearance: auto;
 	appearance: auto;
 }
diff --git a/pages/ems/base/EqpmGrpPysclQtyMngPage.vue b/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
index b5dfc9d..8f0364c 100644
--- a/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
+++ b/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
@@ -53,7 +53,7 @@
 				<v-card class="pb-5 px-4">
 					<v-card-title class="px-0">물리량 상세</v-card-title>
 					<v-row no-gutters>
-						<v-col :cols="12" class="py-3">
+						<v-col :cols="6" class="py-3 pr-4">
 							<InputText :parentPrgmId="myPrgmId" label="물리량 ID" valueNm="pysclQtyId" :labelCols="12"
 								:textCols="12" :required="requiredValueList[0]" :disabled="disabledValueList[0]"
 								:readonly="readOnlyValueList[0]" placeholder="시스템 자동입력" />
@@ -73,7 +73,7 @@
 						</v-col>
 					</v-row>
 					<v-row no-gutters>
-						<v-col :cols="12" class="py-3">
+						<v-col :cols="6" class="py-3 pr-4">
 							<InputText :parentPrgmId="myPrgmId" label="물리량명" valueNm="pysclQtyNm" :labelCols="12"
 								:textCols="12" :required="requiredValueList[3]" :disabled="disabledValueList[3]"
 								:readonly="readOnlyValueList[3]" />
@@ -109,7 +109,7 @@
 						</v-col>
 					</v-row>
 					<v-row no-gutters v-show="argContentShowFlag">
-						<v-col :cols="6" class="py-3">
+						<v-col :cols="12" class="py-3">
 							<component :is="'TextArea'" :parentPrgmId="myPrgmId" ref="TextArea" :item="calcDescItem" />
 						</v-col>
 					</v-row>
@@ -121,22 +121,19 @@
 								계산Argument
 							</label>
 						</v-col>
-						<v-col :cols="4" class="py-2">
+						<v-col :cols="6" class="py-2">
 							<InputText :parentPrgmId="myPrgmId" label="ARG갯수" valueNm="argCnt" :labelCols="12"
 								:textCols="12" :iconShow="true" :required="requiredValueList[7]"
 								:disabled="disabledValueList[7]" :readonly="readOnlyValueList[7]" />
 						</v-col>
 						<v-col :cols="4"> </v-col>
-						<v-col :cols="4" class="py-2" align="right">
-							<v-btn :ripple="false" @click="btnAction('add')" :disabled="disabledValueList[7]">추가</v-btn>
-							<!--	<v-btn :ripple="false" @click="btnAction('edit')">수정</v-btn> -->
-							<v-btn :ripple="false" @click="btnAction('remove')"
-								:disabled="disabledValueList[7]">삭제</v-btn>
+						<v-col :cols="12" class="py-2" align="right">
+							<a-button type="primary" @click="btnAction('add')" class="v-btn-add-text mr-1" icon="plus">추가</a-button>
+							<a-button type="danger" @click="btnAction('remove')" ghost danger icon="delete">삭제</a-button>
 						</v-col>
 					</v-row>
 					<v-row style="height:calc(30% - 76px)" v-show="argContentShowFlag">
-						<v-col :cols="2"> </v-col>
-						<v-col :cols="10" style="height:100%">
+						<v-col :cols="12" style="height:100%">
 							<div ref="gridParent2" style="height:100%">
 								<component :ref="gridName2" :is="loadGrid2 ? 'Grid' : null" :gridName="gridName2"
 									:parentPrgmId="myPrgmId" @getRowsData="getRowData2" :dataPath="dataPathExample2" />
diff --git a/store/modules/menu.js b/store/modules/menu.js
index deca6a5..02f742e 100644
--- a/store/modules/menu.js
+++ b/store/modules/menu.js
@@ -244,6 +244,19 @@ export const actions = {
 				url: 'comm/base/NoticeMngPage',
 				lvl: 1
 			},
+			{
+				comId: 'd49',
+				sysDivCd: 'caalendarmng', //시스템구분
+				menuId: 'MNU0007', // MENU_ID (메뉴ID)
+				prgmId: 'PRG0033', // PRGM_ID (프로그램ID)
+				upMenuId: 'menu3', // UP_MENU_ID (상위메뉴ID)
+				menuNm: '13. Calendar Manager',// MENU_NM (메뉴명)
+				sortSeq: 5562, // SORT_SEQ (정렬순서)
+				useFg: 'caalendarmng',// USE_FG (사용여부)
+				rmrk: 'caalendarmng',
+				url: 'comm/base/CalendarMngPage',
+				lvl: 1
+			},
 			{
 				comId: 'd57',
 				sysDivCd: 'energyResource', //시스템구분

From edab77d0c6ed709f6fef5f238fda0a2f2502d3d7 Mon Sep 17 00:00:00 2001
From: Your Name <your.email@example.com>
Date: Tue, 22 Jul 2025 14:41:39 +0900
Subject: [PATCH 2/2] Update

---
 components/common/Calendar.vue              | 3 ++-
 components/common/select/SelectBlocMstr.vue | 7 ++++++-
 components/common/select/SelectReadObj.vue  | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/components/common/Calendar.vue b/components/common/Calendar.vue
index c48a8b3..9c0f096 100644
--- a/components/common/Calendar.vue
+++ b/components/common/Calendar.vue
@@ -170,10 +170,11 @@ export default {
 				month : month,
 				day : day
 			}
-			// commect blocId to run UI
+			// BEGIN TEST UI 
 			// this.$refs['planPop'].blocId = this.pageData.blocMstrList[
 			// 	this.pageData.blocId
 			// ].blocId;
+			// END TEST UI 
 			this.$refs['planPop'].dialog = true;
 		},
 		updatePlan(val) {
diff --git a/components/common/select/SelectBlocMstr.vue b/components/common/select/SelectBlocMstr.vue
index a489170..556c8aa 100644
--- a/components/common/select/SelectBlocMstr.vue
+++ b/components/common/select/SelectBlocMstr.vue
@@ -5,7 +5,7 @@
 				<v-icon
 					v-if="iconShow"
 					small
-					:class="['mr-1','icon-blue']"
+					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
 					>$icoBulletPoint</v-icon
 				>
 				{{ label }}
@@ -57,6 +57,11 @@ export default {
 			require: false,
 			default: 4,
 		},
+		required: {
+			type: Boolean,
+			require: false,
+			default: false
+		},
 		iconShow: {
 			type: Boolean,
 			require: false,
diff --git a/components/common/select/SelectReadObj.vue b/components/common/select/SelectReadObj.vue
index 8d5f2e2..1d31c81 100644
--- a/components/common/select/SelectReadObj.vue
+++ b/components/common/select/SelectReadObj.vue
@@ -72,6 +72,11 @@ export default {
 			require: false,
 			default: 4,
 		},
+		required: {
+			type: Boolean,
+			require: false,
+			default: false
+		},
 		iconShow: {
 			type: Boolean,
 			require: false,