Merge pull request 'dev-trungvq7-0729' (#26) from dev-trungvq7-0729 into dev

Reviewed-on: #26

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;
   }
@@ -434,7 +434,7 @@ a {
   .v-application.#{$theme}-mode {
     min-width: 1000px;
 
-    .head-logo{
+    .head-logo {
       gap: 8px;
     }
 
@@ -485,8 +485,9 @@ a {
 
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
+
       .menu-container {
-        max-height:calc(100vh - 60px);
+        height:calc(100vh - 60px);
         overflow-y: auto;
       }
     }
@@ -950,15 +951,24 @@ a {
           "v-calendar-weekday-backgroundColor"
         );
         border-right: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
+        border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
+        border-top: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         color: map-deep-get($config, #{$theme}, "v-calendar-weekday-color");
 
         &:nth-of-type(1) {
-          color: map-deep-get($color, "week", "sun");
+          // color: map-deep-get($config,
+          //   #{$theme},
+          //   "v-calendar-is-sun"
+          // );
+          border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         }
 
-        &:nth-of-type(7) {
-          color: map-deep-get($color, "week", "sat");
-        }
+        // &:nth-of-type(7) {
+        //   color: map-deep-get($config,
+        //     #{$theme},
+        //     "v-calendar-is-sat"
+        //   );
+        // }
       }
 
       >.vc-day {
@@ -967,22 +977,33 @@ a {
 
         .day-hldyNm,
         .day-label.is-holiday {
-          color: map-deep-get($color, "week", "sun");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sun"
+          );
         }
 
         &.weekday-1 {
 
           .day-label,
           .day-hldyNm {
-            color: map-deep-get($color, "week", "sun");
+            color: map-deep-get($config,
+              #{$theme},
+              "v-calendar-is-sun"
+            );
           }
+
+          border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         }
 
         &.weekday-7 {
 
           .day-label,
           .day-hldyNm {
-            color: map-deep-get($color, "week", "sat");
+            color: map-deep-get($config,
+              #{$theme},
+              "v-calendar-is-sat"
+            );
           }
         }
 
@@ -1184,11 +1205,17 @@ a {
         }
 
         th.tui-sun {
-          color: map-deep-get($color, "week", "sun");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sun"
+          );
         }
 
         th.tui-sat {
-          color: map-deep-get($color, "week", "sat");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sat"
+          );
         }
       }
 
@@ -1204,11 +1231,17 @@ a {
         }
 
         td.tui-calendar-sun {
-          color: map-deep-get($color, "week", "sun");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sun"
+          );
         }
 
         td.tui-calendar-sat {
-          color: map-deep-get($color, "week", "sat");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sat"
+          );
         }
       }
     }
@@ -1322,11 +1355,12 @@ a {
         color: #46c0ff;
       }
     }
+
     .v-btn {
       background-color: transparent !important;
       color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
     }
-    
+
   }
 
   [hover-tooltip] {

assets/scss/common/grid.scss

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

assets/scss/common/input.scss

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

assets/scss/common/text.scss

@@ -63,6 +63,12 @@
   line-height: 1.25 !important;
 }
 
+.custom-title-7 {
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  line-height: 22px !important;
+}
+
 .custom-title-8 {
   font-size: 0.75rem !important;
   font-weight: 700 !important;
@@ -76,15 +82,15 @@
 
 .custom-text-2 {
   opacity: 0.6;
-  font-family: SpoqaHanSansNeo;
   font-size: 14px;
-  font-weight: normal;
-  font-stretch: normal;
-  font-style: normal;
   line-height: 2.17;
-  letter-spacing: normal;
-  text-align: right;
-  color: #fff;
+  // font-weight: normal;
+  // font-stretch: normal;
+  // font-style: normal;
+  // letter-spacing: normal;
+  // text-align: right;
+  // color: #fff;
+  // font-family: SpoqaHanSansNeo;
 }
 
 .text-color--white-0 {

assets/scss/datepicker.scss

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

assets/scss/var.scss

@@ -32,8 +32,8 @@ $color: (
   "black": ("0": #000,
     "1": #111),
   "white": ("0": #fff),
-  "week": ("sun": #fb5a83,
-    "sat": #2d8cf6)
+  "week": ("sun": #FF4D4F,
+    "sat": #597EF7)
 );
 
 $config: (
@@ -96,17 +96,19 @@ $config: (
     v-input-disabled-backgroundColor:rgba(255, 255, 255, 0.08),
     v-input-disabled-color: rgba(255, 255, 255, 0.5),
     v-select-label-color: rgba(255, 255, 255, 0.85),
-    v-calendar-weekday-backgroundColor: #383f5d,
-    v-calendar-weekday-color: #fff,
-    v-calendar-weekday-border-color: rgba(255, 255, 255, 0.1),
-    v-calendar-day-color: #fff,
-    v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
-    v-calendar-is-today-background-color: #2d4571,
+    v-calendar-weekday-backgroundColor: #FFFFFF0A,
+    v-calendar-weekday-color: #FFFFFFD9,
+    v-calendar-weekday-border-color: #FFFFFF0F,
+    v-calendar-day-color: #FFFFFFD9,
+    v-calendar-day-in-not-month-color: #FFFFFF14,
+    v-calendar-is-today-background-color: #0A224F,
+    v-calendar-is-sat: #263EA0,
+    v-calendar-is-sun:#A61D24,
     tui-grid-title-color: #FFFFFFD9,
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
-    tui-grid-border-vertical-color: #212224,
+    tui-grid-border-vertical-color: #FFFFFF0F,
     tui-grid-cell-backgroundColor: #212224,
     tui-grid-cell-color: #fff,
     tui-grid-cell-insert-color: #13636c,
@@ -234,12 +236,14 @@ $config: (
     v-input-disabled-backgroundColor: rgba(0, 0, 0, 0.04),
     v-input-disabled-color: rgba(0, 0, 0, 0.25),
     v-select-label-color: rgba(0, 0, 0, 0.88),
-    v-calendar-weekday-backgroundColor: #e0e0e0,
-    v-calendar-weekday-color: #111,
-    v-calendar-weekday-border-color: #d4d4d4,
-    v-calendar-day-color: #111,
-    v-calendar-day-in-not-month-color: #f8f8f8,
-    v-calendar-is-today-background-color: #e3eaf3,
+    v-calendar-weekday-backgroundColor: #00000005,
+    v-calendar-weekday-color: #000000E0,
+    v-calendar-weekday-border-color: #0000000F,
+    v-calendar-day-color: #000000E0,
+    v-calendar-day-in-not-month-color: #0000000A,
+    v-calendar-is-today-background-color: #E6F4FF,
+    v-calendar-is-sat: #597EF7,
+    v-calendar-is-sun:#FF4D4F,
     tui-grid-title-color: #000000E0,
     tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
     tui-grid-header-color: rgba(0, 0, 0, 0.88),

components/common/Calendar.vue

@@ -3,45 +3,28 @@
 		<div class="custom-vc-calender-title text-center" v-if="headerVisible">
 			<span>{{ selectedYear }}년 {{ selectedMonth }}월</span>
 		</div>
-		<vc-calendar
-			ref="myCalendar"
-			:attributes="calendarAttributes"
-			class="custom-calendar"
-		>
+		<vc-calendar locale="ko-KR" ref="myCalendar" :attributes="calendarAttributes" class="custom-calendar">
 			<!-- disable-page-swipe
       is-expanded -->
 			<template v-slot:day-content="{ day, attributes }">
 				<div class="plusButton" style="overflow:auto">
 					<!-- <p class="plusButton mr-1" >+</p> -->
-					<span
-						:class="['day-label', { 'is-holiday': hldyValues(day.day) }]"
-						@click="addPlan(day.year, day.month, day.day)"
-						>{{ day.day }}</span
-					>
+					<span :class="['day-label', { 'is-holiday': hldyValues(day.day) }]"
+						@click="addPlan(day.year, day.month, day.day)">{{ day.day }}</span>
 					<span v-for="attr in attributes" :key="attr.key" class="day-hldyNm">
 						{{ attr.customData.title }}
 					</span>
 					<div class="">
-						<p
-							v-for="attr in attributes"
-							:key="attr.key"
-							:class="attr.customData.planColor"
-							@click="updatePlan(attr.customData.planSeq)"
-						>
+						<p v-for="attr in attributes" :key="attr.key" :class="attr.customData.planColor"
+							@click="updatePlan(attr.customData.planSeq)">
 							{{ attr.customData.planTitle }}
 						</p>
 					</div>
 				</div>
 			</template>
 		</vc-calendar>
-		<component
-			ref="planPop"
-			:is="'PlanPop'"
-			v-show="false"
-			:detailList="detailList"
-			:label="planLabel"
-			:parentPrgmId="parentPrgmId"
-		/>
+		<component ref="planPop" :is="'PlanPop'" v-show="false" :detailList="detailList" :label="planLabel"
+			:parentPrgmId="parentPrgmId" />
 	</div>
 </template>
 <script>
@@ -63,6 +46,10 @@ export default {
 			type: Boolean,
 			default: true,
 		},
+		showTitle: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	computed: {
 		...mapState({
@@ -122,7 +109,7 @@ export default {
 							planColor:
 								// item.endDt < Utility.setFormatDate(new Date(), 'YYYY-MM-DD')
 								// 	? 'grey': 
-									item.planColor,
+								item.planColor,
 						},
 						dates: new Date(yy, mm, dd),
 					});
@@ -166,15 +153,14 @@ export default {
 			this.$refs['planPop'].strtDt = '';
 			this.$refs['planPop'].endDt = '';
 			this.$refs['planPop'].addPlanData = {
-				year : year,
-				month : month,
-				day : day
+				year: year,
+				month: month,
+				day: day
 			}
-			// BEGIN TEST UI 
-			// this.$refs['planPop'].blocId = this.pageData.blocMstrList[
-			// 	this.pageData.blocId
-			// ].blocId;
-			// END TEST UI 
+
+			this.$refs['planPop'].blocId = this.pageData.blocMstrList[
+				this.pageData.blocId
+			].blocId;
 			this.$refs['planPop'].dialog = true;
 		},
 		updatePlan(val) {
@@ -188,7 +174,7 @@ export default {
 			this.$refs['planPop'].dialog = true;
 		},
 	},
-	mounted() {},
+	mounted() { },
 };
 const myDetail = [];
 </script>
@@ -196,36 +182,44 @@ const myDetail = [];
 <style lang="scss" scoped>
 @import '@/assets/scss/var.scss';
 @import '@/assets/scss/mixin.scss';
+
 ::-webkit-scrollbar {
 	width: 0px;
 }
+
 ::-webkit-scrollbar-track {
 	display: none;
 }
+
 .custom-vc-calender {
 	&-title {
 		margin-bottom: 20px;
 	}
 }
+
 ::v-deep {
 	.custom-calendar.vc-container {
 		width: 100%;
 		background-color: transparent;
 		border: 0;
 	}
+
 	.vc-header,
 	.vc-arrows-container {
 		display: none;
 	}
+
 	.vc-weeks {
 		display: flex;
 		flex-wrap: wrap;
 		align-items: center;
 		padding: 0;
-		> div {
+
+		>div {
 			flex: 1 0 calc(100% / 7);
 		}
 	}
+
 	.vc-weekday {
 		display: flex;
 		align-items: center;
@@ -233,6 +227,7 @@ const myDetail = [];
 		height: 36px;
 		padding: 0;
 	}
+
 	.vc-day {
 		height: 10.889vh;
 		min-height: auto;
@@ -241,6 +236,7 @@ const myDetail = [];
 			font-size: 1rem;
 			line-height: 1.235;
 		}
+
 		.day-hldyNm {
 			overflow: hidden;
 			text-overflow: ellipsis;
@@ -251,25 +247,27 @@ const myDetail = [];
 			font-size: 10pt;
 		}
 
-		> div {
+		>div {
 			position: relative;
 			height: 100%;
 			padding: 10px;
 			border-radius: 0 !important;
 		}
 	}
+
 	.vc-day.is-not-in-month {
 		* {
 			opacity: 1 !important;
 		}
 	}
-	.plusButton:hover > span:first-child {
+
+	.plusButton:hover>span:first-child {
 		font-weight: bolder;
 		cursor: pointer;
 	}
+
 	.red {
-		//background-color: rgba(229,62,62,var(--bg-opacity));
-		background-color: #e53e3e !important;
+		background-color: #FF4D4F !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -277,9 +275,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.blue {
-		//background-color: rgba(66,153,225,var(--bg-opacity));
-		background-color: #4299e1 !important;
+		background-color: #597EF7 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -287,9 +285,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.puple {
-		//background-color: rgba(102,126,234,var(--bg-opacity));
-		background-color: #667eea !important;
+		background-color: #9254DE !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -297,9 +295,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.green {
-		//background-color: rgba(56,178,172,var(--bg-opacity));
-		background-color: #38b2ac !important;
+		background-color: #73D13D !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -308,9 +306,9 @@ const myDetail = [];
 		margin-bottom: 0.25rem;
 		width: 90%;
 	}
+
 	.orange {
-		//background-color: rgba(237,137,54,var(--bg-opacity));
-		background-color: #ed8936 !important;
+		background-color: #FFA940 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -318,9 +316,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.pink {
-		//background-color: rgba(237,100,166,var(--bg-opacity));
-		background-color: #ed64a6 !important;
+		background-color: #F759AB !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -328,8 +326,8 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.grey {
-		background-color: #6d6d6d;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;

components/common/Datepicker.vue

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

components/common/Grid.vue

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

components/common/ThemeSwitch.vue

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

components/common/chartoptions/LineChart.js

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

components/common/form/InputNumber.vue

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

components/common/modal/DrSimulSlctPop.vue

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

components/common/modal/DrSnarExecPop.vue

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

components/common/modal/EgrpPysclQtyPop.vue

@@ -22,6 +22,7 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
+
 				<div class="px-6 py-4 pt-0">
 					<v-row align="center">
 						<v-col :cols="5">
@@ -46,11 +47,10 @@
 										v-model="searchWord" @keyup.enter="search"><template v-slot:append>
 											<!-- Custom SVG icon -->
 											<v-icon>$icoSearch</v-icon>
-
 										</template></v-text-field>
 								</v-col>
 								<v-spacer></v-spacer>
-								<v-col cols="3" class="text-right">
+								<v-col :cols="3" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
 										class="search-button">조회</a-button>
 									<!-- <v-btn :ripple="false" @click="initSearch()">
@@ -59,24 +59,32 @@
 								</v-col>
 							</v-row>
 						</v-col>
+						<v-col :cols="12">
+							<div style="height: 50vh;">
+								<div ref="modalGridParent" class="h100 py-4">
+									<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
+										:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
+										@getRowsData="getRowData" @dblClick="setUpdate($event)" />
+								</div>
+							</div>
+						</v-col>
 					</v-row>
-
 				</div>
 
-				<div :style="'height: calc(50vh)'">
+				<!-- <div style="height: 50vh;">
 					<div ref="modalGridParent" class="h100 px-6 py-4">
 						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
 							:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
 							@getRowsData="getRowData" @dblClick="setUpdate($event)" />
 					</div>
-				</div>
+				</div> -->
+
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					
-					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
-						class="mr-2">닫기</a-button>
-					<a-button v-if="item.closeBtnFg || false" :ripple="false"  type="danger" ghost danger
+
+					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
+					<a-button v-if="item.closeBtnFg || false" :ripple="false" type="danger" ghost danger
 						@click="deleteBtnAction($event)" class="mr-2">삭제</a-button>
-					<a-button :ripple="false" type="primary" @click="setUpdate($event)" >확인</a-button>
+					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -148,23 +156,7 @@ export default {
 		return {
 			dialog: false,
 
-			loadGrid: true,
-			dataPathPopExample: {
-				"rowGrid": {
-					data: [
-						{
-							'calcProc': 'AVG_CNT2',
-							'argCnt': '2',
-							'calcDesc': '두개 변수에 대한 평균'
-
-						}
-					],
-					column: [
-						{ header: '계산코드', name: 'calcProc', width: 150 },
-						{ header: '아규먼트갯수', name: 'argCnt', align: 'center', width: 100 },
-					]
-				}
-			},
+			loadGrid: false,
 			grid_01: 'grid_01',
 			myModalKey: 'egrpPysclQtyPop',
 			modalDataKey: 'pyscModalData',
@@ -329,13 +321,6 @@ export default {
 				this.selectValueList01 = [];
 				this.selectValue01 = null;
 			}
-
-			// this.selectValueList01 = [
-			// 	{ label: '냉동기고온', value: '냉동기고온' },
-			// 	{ label: '냉동기저온', value: '냉동기저온' },
-			// 	{ label: '공조기', value: '공조기' },
-			// 	{ label: '보일러', value: '보일러' }
-			// ];
 		},
 		search() {
 			this.getGridData();
@@ -357,7 +342,7 @@ export default {
 				modalDataKey: this.modalDataKey,
 				value: Object.assign(
 					// Utility.defaultGridOption(this.$refs.modalGridParent.offsetHeight - 60, myOptions),
-					// Utility.defaultGridOption(100, myOptions),
+					Utility.defaultGridOption(400, myOptions),
 					myOptions,
 				),
 			});
@@ -415,6 +400,15 @@ export default {
 				}
 			}
 
+			// res = [
+			// 	{
+			// 	'pysclQtyId' : 'PYSCL00001',
+			// 	'pysclQtyCd' : 'AMP_1A',
+			// 	'pysclQtyNm' : '회로1 전류A',
+			// 	'pysclQtyTpNm' : 'TAG'
+
+			// 	}
+			// ]
 			this.setModalGridData({
 				modalKey: this.myModalKey,
 				gridKey: this.grid_01,
@@ -469,10 +463,10 @@ export default {
 			this.dialog = flag;
 		},
 		async dialogOpenCloseEvent(val) {
-			// await this.setSelectValueList01();
-			// if (!this.myBindingData) {
-			// 	return alert('그리드를 먼저 선택해주세요.');
-			// }
+			await this.setSelectValueList01();
+			if (!this.myBindingData) {
+				return alert('그리드를 먼저 선택해주세요.');
+			}
 			this.dialog = !val;
 		},
 		deleteBtnAction(v) {

components/common/modal/EqpmCalcPop.vue

@@ -5,7 +5,7 @@
 				<v-icon
 					v-if="iconShow"
 					small
-					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
 					>$icoBulletPoint</v-icon
 				>
 				{{ option.labelContent }}

components/common/modal/EqpmSelectPop_bk.vue

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

components/common/modal/FixedValueModiPop.vue

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

components/common/modal/FtnPlcFormPop.vue

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

components/common/modal/FtnPlcMultiPop3.vue

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

components/common/modal/OnlnBaseEccPop.vue

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

components/common/modal/PlanPop.vue

@@ -43,7 +43,10 @@
 							</v-col>
 							<v-col :cols="6" class="py-0 pl-2">
 								<!-- <DatePicker v-model="strtDt" :parentPrgmId="parentPrgmId"/> -->
-								<div class="startpicker-container2">
+								<component :parentPrgmId="parentPrgmId" :is="'SelectBoxTime'" ref="SelectBox1"
+									:propsValue="selectTimeValue1" :itemList="selectTimeValueList1" :minInterval="selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
+										" @update:propsValue="selectTimeValue1 = $event" />
+								<!-- <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>
@@ -53,7 +56,7 @@
 											<div ref="startpicker-container2" id="startpicker-container2"></div>
 										</template>
 									</v-text-field>
-								</div>
+								</div> -->
 							</v-col>
 							<!-- <v-col :cols="2">
 										<vue-numeric-input v-model="strtHh" :min="0" :max="23" controls-type="updown"
@@ -91,17 +94,9 @@
 								</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>
+								<component :parentPrgmId="parentPrgmId" :is="'SelectBoxTime'" ref="SelectBox2"
+									:propsValue="selectTimeValue2" :itemList="selectTimeValueList2" :minInterval="selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
+										" @update:propsValue="selectTimeValue2 = $event" />
 							</v-col>
 							<!-- <v-col :cols="2">
 								<vue-numeric-input v-model="endHh" :min="0" :max="23" controls-type="updown"
@@ -186,10 +181,11 @@
 					</div>
 				</template>
 				<v-card-actions class="justify-end">
-					<a-button :ripple="false" @click="btnAction('save')" class="mr-2">저장</a-button>
+					<a-button :ripple="false" @click="btnAction('close')" class="mr-2">닫기</a-button>
+					<a-button type="primary" :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>
+						@click="btnAction('delete')">삭제</a-button>
+
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -210,6 +206,7 @@ import DatePicker from '~/components/common/Datepicker';
 import mixinGlobal from '@/mixin/global.js';
 import Utility from '~/plugins/utility';
 import TuiDatepicker from 'tui-date-picker';
+import SelectBoxTime from "@/components/common/select/SelectBoxTime";
 
 export default {
 	mixins: [mixinGlobal],
@@ -237,6 +234,13 @@ export default {
 			type: String,
 			require: false,
 		},
+		selectBoxTimeItemList: {
+			type: Object,
+			require: false,
+			default: () => {
+				return {};
+			},
+		},
 	},
 	components: {
 		InputText,
@@ -250,6 +254,7 @@ export default {
 		Utility,
 		TuiDatepicker,
 		VueNumericInput,
+		SelectBoxTime,
 	},
 	data() {
 		return {
@@ -272,7 +277,23 @@ export default {
 			planSeq: '',
 			blocId: '',
 			addPlanData: {
-			}
+			},
+			selectTimeValue1:
+				this.selectBoxTimeItemList.selectTimeValue1 != undefined
+					? this.selectBoxTimeItemList.selectTimeValue1
+					: null, // selectBoxTime에 필요한 prop
+			selectTimeValueList1:
+				this.selectBoxTimeItemList.selectTimeValueList1 != undefined
+					? this.selectBoxTimeItemList.selectTimeValueList1
+					: [], // selectBoxTime에 필요한 prop
+			selectTimeValue2:
+				this.selectBoxTimeItemList.selectTimeValue2 != undefined
+					? this.selectBoxTimeItemList.selectTimeValue2
+					: null, // selectBoxTime에 필요한 prop
+			selectTimeValueList2:
+				this.selectBoxTimeItemList.selectTimeValueList2 != undefined
+					? this.selectBoxTimeItemList.selectTimeValueList2
+					: [], // selectBoxTime에 필요한 prop
 		};
 	},
 	computed: {
@@ -296,25 +317,29 @@ export default {
 			}
 		},
 		strtDt(val) {
-			console.log('strtDt : ', val);
+			// console.log('strtDt : ', val);
 			this.checkStrtAndEndDateTime('start');
 			if (this.startDatepickerInstance3) {
 				this.startDatepickerInstance3.setDate(new Date(this.endDt));
 			}
 		},
 		endDt(val) {
-			console.log('endDt : ', val);
+			// console.log('endDt : ', val);
 			this.checkStrtAndEndDateTime('end');
 			if (this.startDatepickerInstance) {
 				this.startDatepickerInstance.setDate(new Date(this.strtDt));
 			}
 		},
 		strtHh(val) {
+
+			// const [hh, mm] = selectTimeValue1.split(':');
+			// console.log(`Hours: ${hh}, Minutes: ${mm}`);
+
 			console.log('strtHh : ', val);
 			this.checkStrtAndEndDateTime('start');
 		},
 		endHh(val) {
-			console.log('endHh : ', val);
+			// console.log('endHh : ', val);
 			this.checkStrtAndEndDateTime('end');
 		},
 		strtMm(val) {
@@ -323,6 +348,12 @@ export default {
 		endMm(val) {
 			this.checkStrtAndEndDateTime('end');
 		},
+		selectTimeValue1(val) {
+			this.setPageData({ selectTimeValue1: val });
+		},
+		selectTimeValue2(val) {
+			this.setPageData({ selectTimeValue2: val });
+		}
 	},
 	methods: {
 		...mapMutations({
@@ -505,10 +536,8 @@ export default {
 			let returnData = res[0];
 			this.strtDt = Utility.setFormatDate(returnData.strtDt, 'YYYY-MM-DD');
 			this.endDt = Utility.setFormatDate(returnData.endDt, 'YYYY-MM-DD');
-			this.strtHh = returnData.strtHh;
-			this.strtMm = returnData.strtMm;
-			this.endHh = returnData.endHh;
-			this.endMm = returnData.endMm;
+			this.selectTimeValue1 = returnData.strtHh+' : '+  returnData.strtMm;
+			this.selectTimeValue2 = returnData.endHh+' : '+  returnData.endMm;
 			this.planTitle = returnData.planTitle;
 			this.planCntn = returnData.planCntn;
 			this.planColor = returnData.planColor;
@@ -525,10 +554,8 @@ export default {
 						if (
 							this.strtDt === '' ||
 							this.endDt === '' ||
-							this.strtHh === '' ||
-							this.strtMm === '' ||
-							this.endHh === '' ||
-							this.endMm === '' ||
+							this.selectTimeValue1 === '' ||
+							this.selectTimeValue2 === '' ||
 							this.planTitle === '' ||
 							this.planCntn === '' ||
 							this.planColor === ''
@@ -542,10 +569,8 @@ export default {
 						if (
 							this.strtDt == '' ||
 							this.endDt == '' ||
-							this.strtHh == '' ||
-							this.strtMm == '' ||
-							this.endHh == '' ||
-							this.endMm == '' ||
+							this.selectTimeValue1 === '' ||
+							this.selectTimeValue2 === '' ||
 							this.planTitle == '' ||
 							this.planCntn == '' ||
 							this.planColor == ''
@@ -565,13 +590,17 @@ export default {
 			//console.log(this);
 		},
 		async insertDetail() {
+
+			const [strtHh, strtMm] = this.selectTimeValue1 ? this.selectTimeValue1.split(':') : '00:00'.split(':');
+			const [endHh, endMm] = this.selectTimeValue2 ? this.selectTimeValue2.split(':') : '01:00'.split(':');
+
 			var params = {
 				strtDt: this.strtDt,
 				endDt: this.endDt,
-				strtHh: this.strtHh.toString(),
-				strtMm: this.strtMm.toString(),
-				endHh: this.endHh.toString(),
-				endMm: this.endMm.toString(),
+				strtHh: strtHh.trim().toString(),
+				strtMm: strtMm.trim().toString(),
+				endHh: endHh.trim().toString(),
+				endMm: endMm.trim().toString(),
 				blocId: this.blocId,
 				planTitle: this.planTitle,
 				planCntn: this.planCntn,
@@ -592,13 +621,16 @@ export default {
 			});
 		},
 		async updateDetail() {
+			const [strtHh, strtMm] = this.selectTimeValue1 ? this.selectTimeValue1.split(':') : '00:00'.split(':');
+			const [endHh, endMm] = this.selectTimeValue2 ? this.selectTimeValue2.split(':') : '01:00'.split(':');
+
 			var params = {
 				strtDt: this.strtDt.substr(0, 10),
 				endDt: this.endDt.substr(0, 10),
-				strtHh: this.strtHh.toString(),
-				strtMm: this.strtMm.toString(),
-				endHh: this.endHh.toString(),
-				endMm: this.endMm.toString(),
+				strtHh: strtHh.trim().toString(),
+				strtMm: strtMm.trim().toString(),
+				endHh: endHh.trim().toString(),
+				endMm: endMm.trim().toString(),
 				planTitle: this.planTitle,
 				planCntn: this.planCntn,
 				planColor: this.planColor,

components/common/modal/ReadPlcDisableFuncPop.vue

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

components/common/modal/ReadPlcPop.vue

@@ -67,7 +67,7 @@
 								Expand All
 							</a-button></v-col>
 					</v-row>
-
+					
 					<!-- <v-btn color="primary" dark @click="btnTreeExpand()">{{
             treeExpand
           }}</v-btn> -->

components/common/select/SelectBoxTime.vue

@@ -22,11 +22,11 @@
         outlined
         :menu-props="{ auto: true, offsetY: true }"
         :hide-details="true"
-        :class="'v-select__custom select-large'"
+        :class="'v-select__custom'"
         :disabled="disabled"
         :readonly="readonly"
         @click="setDatepickerHide"
-        style="width: 170px; border-radius: 6px !important"
+        style="min-width: 170px;"
       >
         <template v-slot:append>
           <a-icon

components/common/select/SelectDsEnrg.vue

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

components/form/CustomInput.vue

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

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

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

components/pages/ems/EccInfo/EccAddInfoTab.vue

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

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -19,7 +19,6 @@
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 		<div>
@@ -60,24 +59,11 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEccIaoGrid',
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
 			detailList: myDetail,
-			dataPathMock: {
-				"rowEccIaoGrid": {
-				column: [
-					{ header: '검침 대상 ID', name: 'readObjId', align: 'left' },
-					{ header: '검침 대상 명', name: 'readObjNm', align: 'left' },
-					{ header: '검침 대상 유형', name: 'readObjKind', align: 'left' },
-					{ header: '그룹', name: 'grpCd', align: 'left' },
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {}
-				}
-			},
 		};
 	},
 	computed: {
@@ -516,12 +502,4 @@ const myDetail = [
 		iconShow: true,
 	},
 ];
-const dataPathDataExample = [
-	{
-		readObjId: 'OBJ001',
-		readObjNm: '서울 본사',
-		readObjKind: 'TYPE01',
-		grpCd: 'GRP01',
-	},
-]
 </script>

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -1,10 +1,7 @@
 <template>
 	<div>
-		<div
-			class="d-flex justify-space-between align-center"
-			style="height: 80px;"
-		>
-			<span class="txt custom-title-4-new">설비 추가 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -20,7 +17,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -52,7 +48,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
@@ -343,7 +339,9 @@ export default {
 				value: myColumns,
 			});
 
-			this.loadGrid = true;
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
 		},
 		async btnActions(action) {
 			let dataArr = [];

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,12 +1,12 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center" style="height: 80px;">
-			<span class="txt custom-title-4-new">설비 상수 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 상수 정보</span>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
 			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" :dataPath="dataPathMock" />
+				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
 		</div>
 		<div style="min-height: calc(100vh - 900px);" class="mt-4">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailList"
@@ -41,7 +41,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmConstGrid',
 			detailList: myEqpmConstDetail,
 
@@ -232,7 +232,9 @@ export default {
 				value: myColumns,
 			});
 
-			this.loadGrid = true;
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
@@ -289,8 +291,8 @@ export default {
 
 						dataArr.map(item => {
 							for (var key of Object.keys(item)) {
-								console.log('key : ', key);
-								console.log('item[key] : ', item[key]);
+								// console.log('key : ', key);
+								// console.log('item[key] : ', item[key]);
 								if (!item[key] && requiredKeyList.includes(key)) {
 									validCheck = false;
 								}

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -1,28 +1,24 @@
 <template>
 	<div>
-		<div
-			class="d-flex justify-space-between align-center"
-			style="height: 80px;"
-		>
-			<span class="txt custom-title-4-new">설비 입출력 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
-			<!-- :is="loadGrid ? 'Grid' : null" -->
+		<div ref="gridParent" style="height: calc(100vh - 800px);">
 			<Grid
 				:ref="gridName"
+				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
-		<div style="min-height: calc(100vh - 900px);" class="mt-4">
+		<div style="min-height: calc(100vh - 900px);">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -60,28 +56,12 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmIaoGrid',
 			detailList: myEqpmIaoDetail,
 
 			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: {
@@ -128,18 +108,18 @@ export default {
 	},
 	watch: {
 		selectedObjId(val) {
-			console.log('selectedObjId : ', val);
+			// console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-2';
-				this.detailList[5].class = 'py-2';
+				this.detailList[2].class = 'py-3 d-none';
+				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
+				this.detailList[4].class = 'py-3';
+				this.detailList[5].class = 'py-3';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[5].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-2';
-				this.detailList[2].class = 'py-2';
+				this.detailList[5].class = 'py-3 d-none';
+				this.detailList[4].class = 'py-3 d-none';
+				this.detailList[3].class = 'py-3 pl-4 pt-1';
+				this.detailList[2].class = 'py-3';
 			}
 		},
 		selectedCalcFg(val) {
@@ -172,7 +152,7 @@ export default {
 		},
 	},
 	mounted() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -355,7 +335,7 @@ export default {
 					}
 
 					if (dataArr.length > 0) {
-						console.log('dataArr : ', dataArr);
+						// console.log('dataArr : ', dataArr);
 
 						var requiredKeyList = this.detailList
 							.filter(item => {
@@ -416,6 +396,7 @@ export default {
 	},
 };
 
+
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -486,7 +467,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목 111',
+		labelContent: '대상 항목',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
@@ -501,7 +482,7 @@ const myEqpmIaoDetail = [
 	},
 	{
 		type: 'InputText',
-		cols: 5,
+		cols: 6,
 		class: 'py-3 d-none',
 		valueNm: 'objNm',
 		readonly: true,
@@ -614,13 +595,4 @@ const myEqpmIaoDetail = [
 		iconShow: true
 	},
 ];
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-	lable: 'INCHEON 고온 냉동기 101호기 - 호로1',
-	type: '사용', note: '-',
-	field1: '1111',
-	field2: '2222',
-});
 </script>

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/auth/MenuMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -34,7 +35,7 @@
 					<div class="h100 px-4" style="height:calc(100% - 70px)">
 						<div ref="treeGridParent" class="w100 h100">
 							<component :ref="gridName + myPrgmId" :is="loadTree ? 'Grid' : null" :gridName="gridName"
-								:parentPrgmId="myPrgmId" @getRowsData="getRowData" :dataPath="dataPathExample" />
+								:parentPrgmId="myPrgmId" @getRowsData="getRowData"  />
 						</div>
 					</div>
 				</v-card>
@@ -91,21 +92,9 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'treeGrid',
-			loadTree: true,
+			loadTree: false,
 			detailList: myDetail,
 			addRowFg: false,
-			dataPathExample: {
-				"treeGrid": {
-					data: sampleData,
-					column: [
-						{ header: '메뉴명', name: 'menuNm' },
-						{ header: 'prgmId ', name: 'prgmId', hidden: true },
-						{ header: 'sysDivCd ', name: 'sysDivCd', hidden: true },
-					],
-					option: myOptions,
-
-				}
-			}
 		};
 	},
 	computed: {
@@ -166,6 +155,10 @@ export default {
 					name: 'menuNm',
 				},
 				scrollX: false,
+				header: {
+					height: 37,
+				},
+				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,

pages/comm/auth/MenuRoleMngPage.vue

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

pages/comm/auth/UserRoleMngPage.vue

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

pages/comm/base/BatchLogMngPage.vue

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

pages/comm/base/BatchMngPage.vue

@@ -1,7 +1,8 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -24,7 +25,7 @@
 								:customClass="'select-large'"
 							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2.5" class="pr-4">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -34,7 +35,7 @@
 								:customClass="'select-large'"
 							/>
 						</v-col>
-						<BtnSearch size="large" />
+						<BtnSearch size="large" class="mr-2" />
 
 					</v-row>
 				</v-card>
@@ -57,7 +58,7 @@
 					<div class="px-4">
 						<div ref="gridParent" class="h100 w100">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
-								:gridName="gridName" @getRowsData="getRowData" :dataPath="dataPathExample" />
+								:gridName="gridName" @getRowsData="getRowData" />
 						</div>
 						<!-- </v-card-actions> -->
 					</div>
@@ -77,7 +78,7 @@
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-dialog ref="popModal" v-model="dialog" width="700" overlay-color="#000" overlay-opacity="0.8" scrollable>
+			<v-dialog ref="popModal" v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8" scrollable>
 				<v-card style="height: 100%">
 					<v-card-title class="v-card__title d-flex align-center justify-space-between">
 						<span class="custom-title-4">DB 프로시져 파라메터 설정</span>
@@ -91,7 +92,6 @@
 							<v-col cols="12" class="text-right"> </v-col>
 						</v-row>
 					</div>
-					<v-divider></v-divider>
 					<v-card-text style="height: 300px;">
 						<div id="gridParent" class="mt-6" style="height:calc(100% - 36px);">
 							<div style="height:calc(100% - 36px);">
@@ -101,7 +101,6 @@
 							</div>
 						</div>
 					</v-card-text>
-					<v-divider></v-divider>
 					<v-card-actions>
 						<v-spacer></v-spacer>
 						<v-btn color="primary" dark @click="setParamChangeData()">확인</v-btn>
@@ -155,76 +154,16 @@ export default {
 	data() {
 		return {
 			myPrgmId: myPrgmId,
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowGrid',
-			dataPathExample: {
-				"rowGrid": {
-					data: [
-						{
-							"batchId": "BATCH001",
-							"batchNm": "일일 데이터 백업",
-							"batchExecTp": "자동 실행",
-							"batchDupExecFg": "N",
-							"useFg": "사용"
-						},
-						{
-							"batchId": "BATCH002",
-							"batchNm": "월간 리포트 생성",
-							"batchExecTp": "수동 실행",
-							"batchDupExecFg": "Y",
-							"useFg": "사용"
-						},
-						{
-							"batchId": "BATCH003",
-							"batchNm": "로그 정리 작업",
-							"batchExecTp": "자동 실행",
-							"batchDupExecFg": "N",
-							"useFg": "미사용"
-						},
-						{
-							"batchId": "BATCH004",
-							"batchNm": "사용자 통계 수집",
-							"batchExecTp": "예약 실행",
-							"batchDupExecFg": "Y",
-							"useFg": "사용"
-						},
-						{
-							"batchId": "BATCH005",
-							"batchNm": "서버 상태 점검",
-							"batchExecTp": "수동 실행",
-							"batchDupExecFg": "N",
-							"useFg": "미사용"
-						}
-					]
-
-					,
-					column: [
-						{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
-						{ header: '배치명', name: 'batchNm', minWidth: 200 },
-						{
-							header: '배치 실행 구분',
-							name: 'batchExecTp',
-							align: 'left',
-							minWidth: 190,
-						},
-						{ header: '배치 중복 여부', name: 'batchDupExecFg', hidden: true },
-						{
-							header: '사용여부',
-							name: 'useFg',
-							align: 'center',
-							width: 145,
-						},
-					],
-
-				}
-			},
+			
 			// rowGridOrigin: [],
 			detailList: myDetail,
 
 			// 파라메터 셋팅용 변수
 			dialog: false,
 			gridNameParam: 'paramGrid',
-			paramLoadGrid: true,
+			paramLoadGrid: false,
 			selectedGridNameParamRow: null,
 		};
 	},
@@ -292,7 +231,7 @@ export default {
 		}),
 		init() {
 			// this.layoutInit();
-			// this.gridInit();
+			this.gridInit();
 			this.gridParamInit();
 		},
 		// layoutInit() {
@@ -309,6 +248,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -384,7 +327,7 @@ export default {
 		},
 		async search() {
 			// console.log("search");
-			// await this.getRowGridData();
+			await this.getRowGridData();
 			await this.setPageData({
 				isFind: false,
 			});
@@ -629,20 +572,20 @@ export default {
 				gridKey: this.gridNameParam,
 				value: myOptions,
 			});
-			// setTimeout(() => { });
+			setTimeout(() => { });
 
-			// let modeList = [];
-			// const modeIn = { text: 'IN', value: 'IN' };
-			// const modeOut = { text: 'OUT', value: 'OUT' };
-			// modeList.push(modeIn);
-			// modeList.push(modeOut);
-			// let typeList = [];
-			// const typeInt = { text: 'INT', value: 'int' };
-			// const typeStr = { text: 'STRING', value: 'str' };
-			// const typeFunc = { text: 'FUNCTION', value: 'function' };
-			// typeList.push(typeInt);
-			// typeList.push(typeStr);
-			// typeList.push(typeFunc);
+			let modeList = [];
+			const modeIn = { text: 'IN', value: 'IN' };
+			const modeOut = { text: 'OUT', value: 'OUT' };
+			modeList.push(modeIn);
+			modeList.push(modeOut);
+			let typeList = [];
+			const typeInt = { text: 'INT', value: 'int' };
+			const typeStr = { text: 'STRING', value: 'str' };
+			const typeFunc = { text: 'FUNCTION', value: 'function' };
+			typeList.push(typeInt);
+			typeList.push(typeStr);
+			typeList.push(typeFunc);
 
 			const myColumns = [
 				{ header: 'ID', name: 'id', editor: 'text' },
@@ -664,27 +607,27 @@ export default {
 					header: 'Type',
 					name: 'type',
 					align: 'center',
-					// formatter({ value }) {
-					// 	let retVal = '';
-					// 	switch (value) {
-					// 		case 'int':
-					// 			retVal = 'INT';
-					// 			break;
-					// 		case 'str':
-					// 			retVal = 'STRING';
-					// 			break;
-					// 		case 'function':
-					// 			retVal = 'FUNCTION';
-					// 			break;
-					// 	}
-					// 	return retVal;
-					// },
-					// editor: {
-					// 	type: 'select',
-					// 	options: {
-					// 		listItems: typeList,
-					// 	},
-					// },
+					formatter({ value }) {
+						let retVal = '';
+						switch (value) {
+							case 'int':
+								retVal = 'INT';
+								break;
+							case 'str':
+								retVal = 'STRING';
+								break;
+							case 'function':
+								retVal = 'FUNCTION';
+								break;
+						}
+						return retVal;
+					},
+					editor: {
+						type: 'select',
+						options: {
+							listItems: typeList,
+						},
+					},
 				},
 				{ header: '값', name: 'val', editor: 'text' },
 				{ header: 'rowStat', name: 'rowStat', hidden: true },
@@ -703,86 +646,49 @@ export default {
 
 			// /* this.pageData.paramStrData 처리 */
 			// // console.log("this.pageData.paramStrData : ", JSON.parse(this.pageData.paramStrData));
-			// let rowData = {};
-			// if (
-			// 	this.pageData.paramStrData.startsWith('{') &&
-			// 	this.pageData.paramStrData.endsWith('}')
-			// ) {
-			// 	rowData = JSON.parse(this.pageData.paramStrData);
-			// }
-			// var keys = Object.keys(rowData); //키를 가져옵니다. 이때, keys 는 반복가능한 객체가 됩니다.
-			// for (var i = 0; i < keys.length; i++) {
-			// 	var key = keys[i];
-			// 	res.push(rowData[key]);
-			// }
+			let rowData = {};
+			if (
+				this.pageData.paramStrData.startsWith('{') &&
+				this.pageData.paramStrData.endsWith('}')
+			) {
+				rowData = JSON.parse(this.pageData.paramStrData);
+			}
+			var keys = Object.keys(rowData); //키를 가져옵니다. 이때, keys 는 반복가능한 객체가 됩니다.
+			for (var i = 0; i < keys.length; i++) {
+				var key = keys[i];
+				res.push(rowData[key]);
+			}
 
-			// const newRes = res.map(item => {
-			// 	const newObj = {
-			// 		...item,
-			// 		rowStat: null,
-			// 		id: item.id || '',
-			// 		mode: item.mode || 'in',
-			// 		type: item.type || 'str',
-			// 		val: item.val || '',
-			// 	};
-			// 	return newObj;
-			// });
+			const newRes = res.map(item => {
+				const newObj = {
+					...item,
+					rowStat: null,
+					id: item.id || '',
+					mode: item.mode || 'in',
+					type: item.type || 'str',
+					val: item.val || '',
+				};
+				return newObj;
+			});
 
-			const newRes = [
-				{
-					"id": "VAR001",
-					"mode": "OUT",
-					"type": "int",
-					"val": "100",
-					"rowStat": "C"
-				},
-				{
-					"id": "VAR002",
-					"mode": "IN",
-					"type": "str",
-					"val": "Hello World",
-					"rowStat": "U"
-				},
-				{
-					"id": "FUNC001",
-					"mode": "out",
-					"type": "function",
-					"val": "calculateSum()",
-					"rowStat": "C"
-				},
-				{
-					"id": "VAR003",
-					"mode": "IN",
-					"type": "int",
-					"val": "42",
-					"rowStat": "D"
-				},
-				{
-					"id": "VAR004",
-					"mode": "OUT",
-					"type": "str",
-					"val": "Sample Text",
-					"rowStat": "C"
-				}
-			];
 
 			this.setGridData({
 				gridKey: this.gridNameParam,
 				value: newRes,
 			});
-			// this.$nextTick(() => {
-			// 	if (newRes.length > 0) {
-			// 		try {
-			// 			this.$refs[this.gridNameParam].focus({
-			// 				//rowKey: 0,
-			// 				rowKey: 0,
-			// 				setScroll: true,
-			// 			});
-			// 		} catch (error) {
-			// 			console.log('error[nextTick grid] : ', error);
-			// 		}
-			// 	}
-			// });
+			this.$nextTick(() => {
+				if (newRes.length > 0) {
+					try {
+						this.$refs[this.gridNameParam].focus({
+							//rowKey: 0,
+							rowKey: 0,
+							setScroll: true,
+						});
+					} catch (error) {
+						console.log('error[nextTick grid] : ', error);
+					}
+				}
+			});
 			this.paramLoadGrid = true;
 		},
 		xlsDataBind(res) {
@@ -812,21 +718,21 @@ export default {
 		inputClick(event, item, valueNm) {
 			if (valueNm == 'refVal1') {
 				this.dialog = true;
-				// const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
-				// 	'getFocusedCell',
-				// ).rowKey;
-				// const selectRowData = this.$refs[this.gridName].gridInstance.invoke(
-				// 	'getRow',
-				// 	rowIdxKey,
-				// );
+				const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
+					'getFocusedCell',
+				).rowKey;
+				const selectRowData = this.$refs[this.gridName].gridInstance.invoke(
+					'getRow',
+					rowIdxKey,
+				);
 
-				// if (selectRowData.batchExecTp == 'DP') {
-				// 	// 여기에 팝업 레이어 띠우기 기능 추가
-				// 	this.pageData.paramStrData = event.target.value;
-				// 	this.pageData.paramChangeDataTarget = event.target;
-				// 	this.getRowParamData();
-				// 	this.dialog = true;
-				// }
+				if (selectRowData.batchExecTp == 'DP') {
+					// 여기에 팝업 레이어 띠우기 기능 추가
+					this.pageData.paramStrData = event.target.value;
+					this.pageData.paramChangeDataTarget = event.target;
+					this.getRowParamData();
+					this.dialog = true;
+				}
 			}
 		},
 		setParamChangeData() {

pages/comm/base/CalendarMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -10,7 +11,7 @@
 						</v-col>
 						<v-col cols="3">
 							<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
-							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
+							<DatePicker :parentPrgmId="myPrgmId" customClass="datepicker-large" :label="'조회연월'" />
 						</v-col>
 						<v-col cols="6" class="text-right">
 							<BtnSearch @click="search()" size="large" />
@@ -20,28 +21,29 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" id="CalendarMngContent" class="mt-4">
-			<v-col cols="12" lg="4" class="h100 pr-2">
+			<v-col cols="12" lg="4" class=" 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" />
 					</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% - 10px)' }">
 						<div ref="gridParent" class="w100 h100">
 							<component class="w100" :ref="gridName + myPrgmId" :is="loadGrid ? 'Grid' : null"
 								:gridName="gridName" :parentPrgmId="myPrgmId" :editorGrid="true"
-								@getRowsData="getRowData" :dataPath="dataPathExample" />
+								@getRowsData="getRowData" />
 						</div>
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="8" class="h100 pl-3">
+			<v-col cols="12" lg="8" class=" pl-3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">캘린더 미리보기</span>
 					</v-card-title>
-					<v-card-actions class="px-5 d-block" :style="{ height: 'calc(100% - 62px)' }">
-						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false" />
+					<v-card-actions class="px-5 d-block" >
+						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false"
+							:showTitle="false" />
 					</v-card-actions>
 				</v-card>
 			</v-col>
@@ -94,81 +96,7 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			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' },
-					],
-
-				}
-			},
+			loadGrid: false,
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 		};
@@ -241,16 +169,19 @@ 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, header: {
+						height: 37,
+					},
+					rowHeight: 37,
+				}),
+			});
 
 			// this.getRowGridData();
 		},
@@ -350,86 +281,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({
@@ -604,4 +535,17 @@ select.selectbox {
 	border-width: 0px;
 	// box-sizing: border-box;
 }
+
+::v-deep {
+	.custom-vc-calender {
+		.vc-header {
+			display: none;
+		}
+
+		.vc-weeks {
+			padding: 0;
+		}
+
+	}
+}
 </style>

pages/comm/base/CommCdMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-	    <PageTitle text="공통코드" />
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -56,7 +56,7 @@
 						</v-col>
 						
 						<v-col :cols="12" class="text-right">
-							<BtnSearch style="margin-top:20px" @click="search" />
+							<BtnSearch style="margin-top:20px" @click="search" size="large" />
 						</v-col>
 					</v-row>
 					<!-- <v-row align="center" no-gutters>
@@ -363,7 +363,7 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-			this.loadGrid = true;
+        this.loadGrid = true;
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({

pages/comm/base/NoticeMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
 			<v-card class="" >
@@ -16,11 +16,9 @@
 							</div>
 						</v-col>
 						<v-col :cols="12" ref="contents" class="mt-5" style="min-height: calc(100% - 76px);">
-							<div ref="gridParent" class="h100 px-50">
-								<!-- <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-									 @getRowsData="getRowData" /> -->
+							<div ref="gridParent" class="px-50" style="min-height: 70vh;">
 								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-                  @getRowsData="getRowData" :selectedRowDataWatchFlag="true" />
+									 @getRowsData="getRowData" />
 							</div>
 						</v-col>
 					</v-row>
@@ -29,7 +27,7 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'" class="h1001">
+		<div v-if="pageActionFlag == 'view'" >
 			<v-card>
 				<v-row class="pa-5">
 					<v-col :cols="12" class="d-flex align-center justify-space-between ">
@@ -47,25 +45,25 @@
 							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12">
-						<p class="custom-title-3 mb-2"> 제목 </p>
-						<v-text-field v-model="viewActionData.title" class="v-input__custom" hide-details :readonly="true">
-						</v-text-field>
+					<v-col :cols="12" class="mt-5">
+						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
 					</v-col>
-					<v-col :cols="12" style="min-height:calc(90vh - 218px);" class="pa-5">
+					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
 						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
 							:initialValue="viewActionData.content" theme="white"
-							:class="isDarkMode ? 'theme--white' : 'theme--black'" />
+							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
 					</v-col>
-					<v-col :cols="6">
-						<p class="custom-title-3 mb-2">파일목록</p>
+					<v-col :cols="6" class="mt-5">
+						<v-card-title class="custom-title-7 pa-0">
+							파일목록
+						</v-card-title>
 						<div v-for="fileData in viewActionData.fileData" 
 							:key="fileData.apndFileId" 
 							class="file-item">
 							<a @click.prevent="downloadFile(fileData)">
-								<div class="d-flex justify-space-between search-box-label">
+								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
+									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@@ -75,28 +73,24 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'" class="h1001">
+		<div v-if="pageActionFlag == 'write'" >
 			<v-card>
 				<div class="pa-5">
 					<v-row class="pa-50">
 						<v-col :cols="12" class="">
 							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 						</v-col>
-						<v-col :cols="12" class="custom-title-4-new mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
+						<v-col :cols="12" class="mt-4">
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
 							<v-text-field v-model="writeActionData.title" class="v-input__custom" hide-details outlined>
 							</v-text-field>
 						</v-col>
-						<v-col :cols="12" style="min-height: calc(90vh - 270px);">
+						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
 							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
 						</v-col>
 	
-						<v-col :cols="12" class="mt-2">
-							<p class="custom-title-3 mb-2">
-								파일첨부
-							</p>
-						</v-col>
-						<v-col :cols="6">
+						<v-col :cols="6" class="mt-5">
+							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 							<div class="" v-if="writeActionData.fileData">
 								<div 
 									v-for="(fileData, index) in writeActionData.fileData" 
@@ -132,25 +126,23 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'" class="h1001">
+		<div v-if="pageActionFlag == 'reply'" >
 			<v-card class="pa-5">
 				<v-row align="center" class="mt-0">
 					<v-col :cols="12" class="">
 						<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 					</v-col>
-					<v-col :cols="12">
-						<p class="custom-title-3 mb-2">제목</p>
-						<v-text-field v-model="replyActionData.title" class="v-input__custom" placeholder="제목" outlined
+					<v-col :cols="12" class="mt-4">
+						<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined
 							hide-details>
 						</v-text-field>
 					</v-col>
 					<v-col :cols="12" style="height: calc(100vh - 270px);" class="mt-2">
 						<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg" />
 					</v-col>
-					<v-col :cols="6" class="mt-4">
-						<p class="custom-title-3 mb-2">
-							파일첨부
-						</p>
+					<v-col :cols="6" class="mt-5">
+						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 						<div class="" v-if="replyActionData.fileData">
 							<div 
 								v-for="(fileData, index) in replyActionData.fileData" 
@@ -178,7 +170,7 @@
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'" class="h1001">
+		<div v-if="pageActionFlag == 'update'" >
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
@@ -186,16 +178,16 @@
 							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
-							<v-text-field v-model="updateActionData.title" class="v-input__custom" placeholder="" hide-details outlined>
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+							<v-text-field v-model="updateActionData.title" class="v-input__custom" hide-details outlined>
 							</v-text-field>
 						</v-col>
 						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4" >
 							<editor ref="tuiUpdateEditor" height="100%" initialEditType="wysiwyg"
 								:initialValue="updateActionData.content" />
 						</v-col>
-						<v-col :cols="6">
-								<p class="pa-0 mb-2 custom-title-4-new-1">파일첨부</p>
+						<v-col :cols="6" class="mt-5">
+								<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 								<div class="" v-if="updateActionData.fileData">
 									<div 
 										v-for="(fileData, index) in updateActionData.fileData"
@@ -406,7 +398,6 @@ export default {
 			this.getGridData();
 		},
 		gridInit() {
-			this.loadGrid = false;
 			const gridHeight = this.$refs.contents.offsetHeight - 76;
 
 			const myOptions = {};
@@ -470,13 +461,6 @@ export default {
 				gridKey: this.gridName,
 				value: columnList,
 			});
-
-			// // -----------------------TEST------------------
-			// this.dataPathMock[this.gridName] = {
-			// 	column: columnList,
-			// 	data: dataPathDataExample,
-			// }
-			// // -----------------------END TEST--------------
 			this.getGridData();
 		},
 		async getGridData() {
@@ -491,26 +475,15 @@ export default {
 				resKey: 'postData',
 				sendParam: params,
 			});
-
-			// console.log('----------DEBUG--------res: ', res);
-			const newRes = res.map(item => {
-        const newObj = {
-          ...item,
-          rowStat: null,
-          dataSetId: item.dataSetId,
-          dataSetNm: item.dataSetNm,
-          useFg: item.useFg === '1' ? true : false, // 화면 개발 편의를 위해 boolean 타입으로 교체, 저장시 "1", "0" 으로 바꿔 보내야 함
-        };
-        return newObj;
-      });
-
+			
 			this.setGridData({
 				gridKey: this.gridName,
-				value: newRes,
+				value: res,
+			});
+			this.$nextTick(() => {
+				this.loadGrid = true;
 			});
-
 			this.setPageData({ isFind: false });
-			this.loadGrid = true;
 		},
 		getRowData(data) {
 			this.selectedRowKey = data.rowKey;
@@ -1073,4 +1046,19 @@ const dataPathDataExample = getPathDataExample({
 		color: #1677FF;
 	}
 }
+::v-deep {
+	.v-input__slot {
+		padding-left: 8px;
+		padding-right: 8px;
+	}
+	.custom-view {
+		border: 1px solid;
+		border-radius: 6px;
+		height: 100%;
+		@each $theme in dark, light {
+			@include theme($theme);
+			border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");;
+		}
+	}
+}
 </style>

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" class="px-5 h100">
-							<component
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
-							/>
-						</div>
+					<div ref="gridParent" style="height: 60vh">
+						<!-- <div ref="gridParent" class="px-5 h100">
+						</div> -->
+						<component
+							:ref="gridName"
+							:is="loadGrid ? 'Grid' : null"
+							:parentPrgmId="myPrgmId"
+							:gridName="gridName"
+							@getRowsData="getRowData"
+						/>
 					</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/AddInfoMngPage.vue

@@ -64,7 +64,6 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -137,24 +136,10 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			detailList: myDetail,
 			initedFlag: false,
-			dataPathMock : {
-				'rowGrid': {
-					column: [
-						{ header: '추가 정보 그룹', name: 'addGrpId', align: 'left' },
-						{ header: '추가 정보 ID', name: 'addInfoId', align: 'left' },
-						{ header: '추가 정보 명', name: 'addInfoNm', align: 'left' },
-						{ header: 'Data 형식', name: 'addInfoDataKind', align: 'center' },
-						{ header: '사용여부', name: 'useFg', align: 'center' },
-					],
-					data: dataMockExample,
-					defaultRow: dataMockExample,
-					option: {},
-				},
-			},
 		};
 	},
 	computed: {
@@ -642,43 +627,4 @@ const myDetail = [
 		placeholder: '시스템 자동입력',
 	},
 ];
-
-const dataMockExample = [
-  {
-    addGrpId: 'GRP001',
-    addInfoId: 'INFO001',
-    addInfoNm: '온도 센서',
-    addInfoDataKind: 'DATA01',
-    useFg: true,
-  },
-  {
-    addGrpId: 'GRP002',
-    addInfoId: 'INFO002',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA02',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP003',
-    addInfoId: 'INFO003',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA03',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP004',
-    addInfoId: 'INFO004',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA04',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP005',
-    addInfoId: 'INFO005',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA05',
-    useFg: false,
-  },
-];
-
 </script>

pages/ems/base/DashboardPage.vue

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

pages/ems/base/EffcIdxMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -25,7 +25,7 @@
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
 
-						<BtnSearch @click="search" size="large" />
+						<BtnSearch @click="search" size="large" class="mr-2" />
 
 					</v-row>
 				</v-card>

pages/ems/base/EnrgResourceCenterMngPage.vue

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

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -31,7 +31,7 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" class="mt-3">
-			<v-col :cols="5" class="h100 pr-2">
+			<v-col :cols="5" class="pr-2">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex align-center justify-space-between pa-5">
 						물리량 리스트
@@ -50,7 +50,7 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100 pl-2">
+			<v-col :cols="7" class="pl-2">
 				<v-card class="pb-5 px-4">
 					<v-card-title class="px-0">물리량 상세</v-card-title>
 					<v-row no-gutters>
@@ -114,7 +114,7 @@
 							<component :is="'TextArea'" :parentPrgmId="myPrgmId" ref="TextArea" :item="calcDescItem" />
 						</v-col>
 					</v-row>
-					<v-row no-gutters v-show="argContentShowFlag">
+					<v-row no-gutters v-show="argContentShowFlag" align="end" >
 						<v-col :cols="12" class="py-2">
 							<label for="">
 								<v-icon small
@@ -122,13 +122,13 @@
 								계산Argument
 							</label>
 						</v-col>
-						<v-col :cols="6" class="py-2">
+						<v-col :cols="6" class="py-2 pr-4">
 							<InputText :parentPrgmId="myPrgmId" label="ARG갯수" valueNm="argCnt" :labelCols="12"
-								:textCols="12" :iconShow="true" :required="requiredValueList[7]"
+								:textCols="12" :iconShow="false" :required="requiredValueList[7]"
 								:disabled="disabledValueList[7]" :readonly="readOnlyValueList[7]" />
 						</v-col>
-						<v-col :cols="4"> </v-col>
-						<v-col :cols="12" class="py-2" align="right">
+						<!-- <v-col :cols="4"> </v-col> -->
+						<v-col :cols="6" 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>
@@ -225,61 +225,6 @@ export default {
 			formatterSelectList02: [],
 
 			loadGrid: false,
-			dataPathExample: {
-				"rowGrid": {
-					data: [
-						{
-							"pysclQtyId": "001",
-							"pysclQtyCd": "TEMP001",
-							"pysclQtyNm": "온도",
-							"pysclQtyTp": "실수"
-						},
-						{
-							"pysclQtyId": "002",
-							"pysclQtyCd": "PRESS001",
-							"pysclQtyNm": "압력",
-							"pysclQtyTp": "실수"
-						},
-						{
-							"pysclQtyId": "003",
-							"pysclQtyCd": "FLOW001",
-							"pysclQtyNm": "유량",
-							"pysclQtyTp": "정수"
-						},
-						{
-							"pysclQtyId": "004",
-							"pysclQtyCd": "HUMID001",
-							"pysclQtyNm": "습도",
-							"pysclQtyTp": "실수"
-						},
-						{
-							"pysclQtyId": "005",
-							"pysclQtyCd": "VOLT001",
-							"pysclQtyNm": "전압",
-							"pysclQtyTp": "실수"
-						}
-					]
-
-					,
-					column: [
-						{
-							header: '물리량 ID',
-							name: 'pysclQtyId',
-							width: 100,
-							align: 'center',
-						},
-						{ header: '물리량코드', name: 'pysclQtyCd', minWidth: 255 },
-						{ header: '물리량명', name: 'pysclQtyNm', width: 150 },
-						{
-							header: '물리량타입',
-							name: 'pysclQtyTp',
-							width: 80,
-						},
-
-					],
-
-				}
-			},
 			loadGrid2: false,
 			detailList: myDetail,
 
@@ -954,6 +899,8 @@ export default {
 					height: 37,
 				},
 				rowHeight: 'auto',
+				scrollX: true,
+				scrollY: true,
 			};
 
 			this.setGridOption({
@@ -967,7 +914,7 @@ export default {
 					header: '물리량 ID',
 					name: 'pysclQtyId',
 					width: 100,
-					align: 'center',
+					align: 'left',
 				},
 				{ header: '설비그룹 ID', name: 'eqpmGrpId', hidden: true },
 				{ header: 'argCnt', name: 'argCnt', hidden: true },

pages/ems/base/EquipmentMasterMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -34,23 +35,23 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<v-col :cols="5" class="h100">
+			<v-col :cols="5" >
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0 custom-title-4">설비 정보</v-card-title>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
 							:btnActionsFnc="btnActions" />
 					</div>
-					<div class="px-5" style="min-height:calc(100% - 76px)">
-						<div ref="gridParent" class="w100 h100">
-							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-								@getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								:selectedRowDataWatchFlag="true" :preventFocusChangeEventFlag="false" :dataPath="dataPathMock" />
-						</div>
+					<div ref="gridParent" class="px-5" style="min-height:60vh;">
+						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
+							@getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
+							:selectedRowDataWatchFlag="true" :preventFocusChangeEventFlag="false" />
+						<!-- <div ref="gridParent" class="w100 h100">
+						</div> -->
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100">
+			<v-col :cols="7" >
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4" style="min-height:76px;">설비 상세</v-card-title>
 					<div class="px-5" style="min-height:calc(100% - 76px)">
@@ -287,7 +288,7 @@ export default {
 					blocId: this.userInfo.blocId,
 				},
 			});
-			console.log('res : ', res);
+			// console.log('res : ', res);
 			res.map(item => {
 				const it = { text: item.ercNm, value: item.ercId };
 				ercList.push(it);

pages/ems/base/GdIdxMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -119,109 +119,6 @@ export default {
 			selectValueList01: [],
 			selectValue02: null,
 			selectValueList02: [],
-			// pyscPopupValueChkList: 'pyscPopupValueChkList',
-			// pyscListChk: {
-			// 	pysclQtyId1 : null,
-			// 	pysclQtyId2 : null,
-			// 	pysclQtyId3 : null,
-			// 	pysclQtyId4 : null
-			// }
-			// dataPathExample: {
-			// 	"rowGrid": {
-			// 		data: [
-
-			// 			{
-			// 				gdIdxId: 'GD001',
-			// 				gdIdxNm: '온도 가이드',
-			// 				eqpmGrpId: 'EQ001',
-			// 				upTotMeth: 'AVG',
-			// 				careStndVal: 50,
-			// 				warnStndVal: 70,
-			// 				alrmMsg: '온도가 기준치를 초과했습니다.',
-			// 			},
-			// 			{
-			// 				gdIdxId: 'GD002',
-			// 				gdIdxNm: '습도 가이드',
-			// 				eqpmGrpId: 'EQ002',
-			// 				upTotMeth: 'MAX',
-			// 				careStndVal: 30,
-			// 				warnStndVal: 60,
-			// 				alrmMsg: '습도가 기준치를 초과했습니다.',
-			// 			},
-			// 			{
-			// 				gdIdxId: 'GD003',
-			// 				gdIdxNm: '압력 가이드',
-			// 				eqpmGrpId: 'EQ003',
-			// 				upTotMeth: 'SUM',
-			// 				careStndVal: 100,
-			// 				warnStndVal: 150,
-			// 				alrmMsg: '압력이 기준치를 초과했습니다.',
-			// 			}
-
-			// 		],
-			// 		column: [
-			// 			{
-			// 				header: '가이드',
-			// 				name: 'gdIdxId',
-			// 				width: 100,
-			// 				align: 'center',
-			// 			},
-			// 			{
-			// 				header: '가이드명',
-			// 				name: 'gdIdxNm',
-			// 				width: 210,
-			// 				align: 'left',
-			// 			},
-			// 			{
-			// 				header: '설비그룹ID',
-			// 				name: 'eqpmGrpId',
-			// 				width: 100,
-			// 				align: 'center',
-			// 				// formatter({ value }) {
-			// 				// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.eqpmGrpList.filter(item => item.value == value);
-			// 				// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].text;
-			// 				// 	}
-			// 				// 	return retVal;
-			// 				// },
-			// 			},
-			// 			{
-			// 				header: '상위집계방법',
-			// 				name: 'upTotMeth',
-			// 				width: 100,
-			// 				align: 'center',
-			// 				// formatter({ value }) {
-			// 				// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.upTotMethList.filter(item => item.commCd == value);
-			// 				// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].commCdNm;
-			// 				// 	}
-			// 				// 	return retVal;
-			// 				// },
-			// 			},
-			// 			{
-			// 				header: '주의기준',
-			// 				name: 'careStndVal',
-			// 				width: 100,
-			// 				align: 'right',
-			// 			},
-			// 			{
-			// 				header: '경고기준',
-			// 				name: 'warnStndVal',
-			// 				width: 100,
-			// 				align: 'right',
-			// 			},
-			// 			{
-			// 				header: '알람메세지',
-			// 				name: 'alrmMsg',
-			// 				minWidth: 860,
-			// 				align: 'left',
-			// 			}
-			// 		]
-
-			// 	}
-			// }
 		};
 	},
 	computed: {
@@ -627,59 +524,7 @@ export default {
 		async getRowGridData() {
 			this.loadGrid = false;
 			let res = [];
-			// const newRes = [
-			// 	{
-			// 		comId: 'COM001',
-			// 		gdIdxId: 'GD001',
-			// 		gdIdxNm: '온도 가이드',
-			// 		eqpmGrpId: 'EQ001',
-			// 		upTotMeth: 'AVG',
-			// 		sortSeq: 1,
-			// 		pysclQtyId1: 'TEMP',
-			// 		pysclQtyId2: null,
-			// 		pysclQtyId3: null,
-			// 		pysclQtyId4: null,
-			// 		ctgr1: '환경',
-			// 		ctgr2: '내부',
-			// 		careStndVal: 50,
-			// 		warnStndVal: 70,
-			// 		gdMeth: '자동',
-			// 		useFg: '1',
-			// 		alrmMsg: '온도가 기준치를 초과했습니다.',
-			// 		calcProc: 'PROC001',
-			// 		calcDesc: '평균 계산',
-			// 		calcMeth: '(A+B)/2',
-			// 		unit: 'C',
-			// 		argCnt: 2,
-			// 		rowStat: null,
-			// 	},
-			// 	{
-			// 		comId: 'COM002',
-			// 		gdIdxId: 'GD002',
-			// 		gdIdxNm: '습도 가이드',
-			// 		eqpmGrpId: 'EQ002',
-			// 		upTotMeth: 'MAX',
-			// 		sortSeq: 2,
-			// 		pysclQtyId1: 'HUMID',
-			// 		pysclQtyId2: null,
-			// 		pysclQtyId3: null,
-			// 		pysclQtyId4: null,
-			// 		ctgr1: '환경',
-			// 		ctgr2: '외부',
-			// 		careStndVal: 30,
-			// 		warnStndVal: 60,
-			// 		gdMeth: '수동',
-			// 		useFg: '0',
-			// 		alrmMsg: '습도가 기준치를 초과했습니다.',
-			// 		calcProc: 'PROC002',
-			// 		calcDesc: '최대값 계산',
-			// 		calcMeth: 'MAX(A,B)',
-			// 		unit: '%',
-			// 		argCnt: 2,
-			// 		rowStat: null,
-			// 	},
-			// ];
-
+		
 			res = await this.postApiReturn({
 				apiKey: 'selectEqpmGdIdxDataList',
 				resKey: 'eqpmGdIdxDataList',
@@ -1453,7 +1298,7 @@ const myDetail = [
 		class: 'pa-3',
 		// required: true,
 		openMode: 'ALL',
-		disabled: false,
+		disabled: true,
 		eqpmKindId: '',
 		eqpmGrpId: '',
 		closeBtnFg: true,

pages/ems/base/GdStndMngPage.vue

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

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="w100 h100">
-							<component
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								:selectedRowDataWatchFlag="true"
-							/>
-						</div>
+					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
+						<component
+							:ref="gridName"
+							:is="loadGrid ? 'Grid' : null"
+							:gridName="gridName"
+							:parentPrgmId="myPrgmId"
+							@getRowsData="getRowData"
+							@sendSelectedRowStatInfo="getSelectedRowStatInfo"
+							:selectedRowDataWatchFlag="true"
+						/>
 					</div>
 				</v-card>
 			</v-col>

pages/ems/base/ReadResultCloseMngPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="l-layout">
-    <common-page-title />
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <!-- 조회조견 -->
       <v-col :cols="12">
@@ -91,7 +91,7 @@
               </a-button>
             </div>
           </div>
-          <div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
+          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
@@ -242,6 +242,10 @@ export default {
         columnOptions: {
           resizable: true,
         },
+        pageOptions: {
+					useClient: true,
+					perPage: 13,
+				},
       };
       this.setGridOption({
         gridKey: this.gridName,

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="center" no-gutters>
@@ -555,7 +556,7 @@ export default {
 				header: {
 					height: 37,
 				},
-				rowHeight: 'auto',
+				rowHeight: 37,
 
 
 				// pageOptions: {

pages/ems/effc/EnrgMapPage.vue

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

pages/ems/effc/EnrgUsePlanPage.vue

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

pages/ems/effc/EnrgUseTotSummPage.vue

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

pages/ems/effc/EqpmIndMntrPage.vue

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