- Update screen 29 - 14 - Remove mock data dashboard

assets/scss/common.scss

@@ -12,7 +12,8 @@
 
 html,
 body {
-  // overflow: auto;
+  overflow: auto;
+
 }
 
 a {
@@ -118,7 +119,7 @@ a {
 .v-main,
 .v-main__wrap,
 .container {
-  // height: 100%;
+  height: 100%;
 }
 
 .v-main__wrap>.container {
@@ -143,9 +144,7 @@ a {
   }
 
   & .router-tab__container {
-    overflow-y: auto;
-    height: calc(100vh - 105px);
-    max-height: calc(100vh - 105px);
+    min-height: calc(100% - 72px);
     padding: 20px;
   }
 
@@ -434,7 +433,7 @@ a {
   .v-application.#{$theme}-mode {
     min-width: 1000px;
 
-    .head-logo {
+    .head-logo{
       gap: 8px;
     }
 
@@ -485,11 +484,6 @@ a {
 
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
-
-      .menu-container {
-        height:calc(100vh - 60px);
-        overflow-y: auto;
-      }
     }
 
     .v-icon {
@@ -535,6 +529,8 @@ a {
       }
     }
 
+
+
     .router-tab {
       .router-tab__header {
         background-color: map-deep-get($config, #{$theme}, "router-header");
@@ -951,24 +947,15 @@ 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($config,
-          //   #{$theme},
-          //   "v-calendar-is-sun"
-          // );
-          border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
+          color: map-deep-get($color, "week", "sun");
         }
 
-        // &:nth-of-type(7) {
-        //   color: map-deep-get($config,
-        //     #{$theme},
-        //     "v-calendar-is-sat"
-        //   );
-        // }
+        &:nth-of-type(7) {
+          color: map-deep-get($color, "week", "sat");
+        }
       }
 
       >.vc-day {
@@ -977,33 +964,22 @@ a {
 
         .day-hldyNm,
         .day-label.is-holiday {
-          color: map-deep-get($config,
-            #{$theme},
-            "v-calendar-is-sun"
-          );
+          color: map-deep-get($color, "week", "sun");
         }
 
         &.weekday-1 {
 
           .day-label,
           .day-hldyNm {
-            color: map-deep-get($config,
-              #{$theme},
-              "v-calendar-is-sun"
-            );
+            color: map-deep-get($color, "week", "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($config,
-              #{$theme},
-              "v-calendar-is-sat"
-            );
+            color: map-deep-get($color, "week", "sat");
           }
         }
 
@@ -1205,17 +1181,11 @@ a {
         }
 
         th.tui-sun {
-          color: map-deep-get($config,
-            #{$theme},
-            "v-calendar-is-sun"
-          );
+          color: map-deep-get($color, "week", "sun");
         }
 
         th.tui-sat {
-          color: map-deep-get($config,
-            #{$theme},
-            "v-calendar-is-sat"
-          );
+          color: map-deep-get($color, "week", "sat");
         }
       }
 
@@ -1231,17 +1201,11 @@ a {
         }
 
         td.tui-calendar-sun {
-          color: map-deep-get($config,
-            #{$theme},
-            "v-calendar-is-sun"
-          );
+          color: map-deep-get($color, "week", "sun");
         }
 
         td.tui-calendar-sat {
-          color: map-deep-get($config,
-            #{$theme},
-            "v-calendar-is-sat"
-          );
+          color: map-deep-get($color, "week", "sat");
         }
       }
     }
@@ -1355,12 +1319,11 @@ 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/button.scss

@@ -92,13 +92,11 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
-    .searchFilter{
-      .search-button {
-        height: 40px;
-        color: map-deep-get($config, #{$theme}, "search-btn-color");
-      }
+    .search-button {
+      height: 40px;
+      color: map-deep-get($config, #{$theme}, "search-btn-color");
     }
-     
+
     .v-dialog {
       .ant-btn-icon-only {
         color: map-deep-get(
@@ -121,9 +119,6 @@
         background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         color:map-deep-get($config, #{$theme}, "ant-btn-primary-color");
-        &.ant-btn-background-ghost{
-          color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
-        }
       }
 
       &.ant-btn-default {
@@ -138,15 +133,6 @@
           background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
         }
       }
-
-      &.expand-btn {
-        .v-icon {
-          color: map-deep-get($config, #{$theme}, "basic-button-color");
-          svg {
-            fill: map-deep-get($config, #{$theme}, "basic-button-color");
-          }
-        }
-      }
     }
   }
 }
@@ -173,13 +159,4 @@
     height: 16px;
     background:none;
   }
-}
-.ant-btn  {
-  &.expand-btn {
-    .v-icon {
-      span {
-        margin-right: 8px;
-      }
-    }
-  }
-}
+}

assets/scss/common/grid.scss

@@ -134,11 +134,11 @@
       }
 
       &-body-container{
-        border-right: 0;
-        // border-right-color: map-deep-get($config,
-        //   #{$theme},
-        //   "tui-grid-cell-borderColor"
-        // );
+        border-right: 1px solid;
+        border-right-color: map-deep-get($config,
+          #{$theme},
+          "tui-grid-cell-borderColor"
+        );
         width: auto !important;
       }
 
@@ -151,27 +151,24 @@
           width: $scrollbar-width !important;
           height: $scrollbar-width !important;
           -webkit-appearance: initial;
-          // background-color: map-deep-get($config,
-          //   #{$theme},
-          //   "tui-grid-cell-borderColor"
-          // ) !important;
-          background-color: rgba(0, 0, 0, 0) !important;
+          background-color: map-deep-get($config,
+            #{$theme},
+            "scrollbar-track"
+          ) !important;
           border-radius: 3px !important;
         }
 
         & ::-webkit-scrollbar-track {
-          // background-color: map-deep-get($config,
-          //   #{$theme},
-          //   "tui-grid-cell-borderColor"
-          // ) !important;
-          background-color: rgba(0, 0, 0, 0) !important;
+          background-color: map-deep-get($config,
+            #{$theme},
+            "scrollbar-track"
+          ) !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;
         }
 
@@ -198,7 +195,6 @@
       &-scrollbar-right-top {
         background-color: rgba(0, 0, 0, 0);
         border: none;
-        display: none;
         // background-color: map-deep-get(
         //   $config,
         //   #{$theme},
@@ -225,13 +221,12 @@
         width: $scrollbar-width !important;
         height: $scrollbar-width !important;
         // display: none !important;
-        border-color: map-deep-get($config, #{$theme}, "cardBackground");
-        background-color: map-deep-get($config, #{$theme}, "cardBackground");
+        border-color: map-deep-get($config, #{$theme}, "scrollbar-track");
+        background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
         // border: none !important;
         // bottom: -1px;
         // right: -2px;
         box-sizing: border-box;
-        // display: none;
       }
 
       &-scrollbar-frozen-border,
@@ -241,9 +236,13 @@
         border-color: transparent !important;
       }
 
-      &-body-area,
+      // &-body-area {
+      //   overflow: auto !important;
+      // }
+
       &-container,
       &-layer-state,
+      &-body-area,
       &-summary-area,
       &-cell {
         background-color: map-deep-get($config,
@@ -255,36 +254,23 @@
           "tui-grid-border-vertical-color"
         );
 
-        // &-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: 8px;
-                width: 8px;
-                border-radius: 50%;
-                background-color: map-deep-get($config,
-                  #{$theme},
-                  "arow-line-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;
+                }
               }
             }
           }
@@ -316,8 +302,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"
@@ -334,13 +320,8 @@
       }
 
       &-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

@@ -171,8 +171,8 @@
   align-items: center;
   cursor: pointer;
   position: relative;
-  padding-left: 0;
-  margin: 5px;
+  padding-left: 28px;
+  margin: 10px;
   font-size: 16px;
 }
 .custom-radio input[type="radio"] {
@@ -183,13 +183,13 @@
 /* Custom radio appearance */
 .radio-mark {
   position: absolute;
-  left: -8px;
+  left: 0;
   top: 50%;
   transform: translateY(-50%);
-  height: 14px;
-  width: 14px;
-  // background-color: white;
-  border: 1px solid #ccc;
+  height: 18px;
+  width: 18px;
+  background-color: white;
+  border: 2px solid #ccc;
   border-radius: 50%;
   transition: all 0.2s ease;
 }
@@ -263,6 +263,9 @@
         "v-input-backgroundColor"
       );
 
+
+      
+
       &:not(.v-input--radio-group, .v-input--checkbox) {
         .v-input__slot {
           background-color: map-deep-get($config,
@@ -369,17 +372,6 @@
         }
       }
     }
-
-    .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,12 +63,6 @@
   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;
@@ -82,15 +76,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;
-  // font-weight: normal;
-  // font-stretch: normal;
-  // font-style: normal;
-  // letter-spacing: normal;
-  // text-align: right;
-  // color: #fff;
-  // font-family: SpoqaHanSansNeo;
+  letter-spacing: normal;
+  text-align: right;
+  color: #fff;
 }
 
 .text-color--white-0 {
@@ -119,14 +113,6 @@
       color: map-deep-get($config, #{$theme}, "h1-title");
     }
 
-
-    .custom-subtitle-tab {
-      font-size: 1.25rem !important;
-      font-weight: 600 !important;
-      line-height: 1.25 !important;
-      color: map-deep-get($config, #{$theme}, "subtitle-tab");
-    }
-
     .v-dialog {
       .custom-title-4 {
         font-size: 16px !important;

assets/scss/datepicker.scss

@@ -14,14 +14,11 @@
       position: relative;
       border-radius: 6px;
       border: solid 1px;
-      height: 32px;
+      height: 40px;
       // 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": #FF4D4F,
-    "sat": #597EF7)
+  "week": ("sun": #fb5a83,
+    "sat": #2d8cf6)
 );
 
 $config: (
@@ -96,19 +96,17 @@ $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: #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,
+    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,
     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: #FFFFFF0F,
+    tui-grid-border-vertical-color: #212224,
     tui-grid-cell-backgroundColor: #212224,
     tui-grid-cell-color: #fff,
     tui-grid-cell-insert-color: #13636c,
@@ -173,7 +171,6 @@ $config: (
     ant-btn-default-border-outlined:#424242,
     btn-header-select-bg: #1F1F1F,
     btn-header-select-color:#FFFFFFD9,
-    subtitle-tab: #FFFFFFA6,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -236,14 +233,12 @@ $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: #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,
+    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,
     tui-grid-title-color: #000000E0,
     tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
     tui-grid-header-color: rgba(0, 0, 0, 0.88),
@@ -311,6 +306,5 @@ $config: (
     ant-btn-default-border-outlined:#D9D9D9,
     btn-header-select-color:#1F1F1F,
     btn-header-select-bg:#FFFFFF,
-    subtitle-tab: #000000A6,
   ),
 );

components/common/Calendar.vue

@@ -3,28 +3,45 @@
 		<div class="custom-vc-calender-title text-center" v-if="headerVisible">
 			<span>{{ selectedYear }}년 {{ selectedMonth }}월</span>
 		</div>
-		<vc-calendar locale="ko-KR" ref="myCalendar" :attributes="calendarAttributes" class="custom-calendar">
+		<vc-calendar
+			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>
@@ -46,10 +63,6 @@ export default {
 			type: Boolean,
 			default: true,
 		},
-		showTitle: {
-			type: Boolean,
-			default: false,
-		},
 	},
 	computed: {
 		...mapState({
@@ -109,7 +122,7 @@ export default {
 							planColor:
 								// item.endDt < Utility.setFormatDate(new Date(), 'YYYY-MM-DD')
 								// 	? 'grey': 
-								item.planColor,
+									item.planColor,
 						},
 						dates: new Date(yy, mm, dd),
 					});
@@ -153,14 +166,15 @@ 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
 			}
-
-			this.$refs['planPop'].blocId = this.pageData.blocMstrList[
-				this.pageData.blocId
-			].blocId;
+			// BEGIN TEST UI 
+			// this.$refs['planPop'].blocId = this.pageData.blocMstrList[
+			// 	this.pageData.blocId
+			// ].blocId;
+			// END TEST UI 
 			this.$refs['planPop'].dialog = true;
 		},
 		updatePlan(val) {
@@ -174,7 +188,7 @@ export default {
 			this.$refs['planPop'].dialog = true;
 		},
 	},
-	mounted() { },
+	mounted() {},
 };
 const myDetail = [];
 </script>
@@ -182,44 +196,36 @@ 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;
@@ -227,7 +233,6 @@ const myDetail = [];
 		height: 36px;
 		padding: 0;
 	}
-
 	.vc-day {
 		height: 10.889vh;
 		min-height: auto;
@@ -236,7 +241,6 @@ const myDetail = [];
 			font-size: 1rem;
 			line-height: 1.235;
 		}
-
 		.day-hldyNm {
 			overflow: hidden;
 			text-overflow: ellipsis;
@@ -247,27 +251,25 @@ 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: #FF4D4F !important;
+		//background-color: rgba(229,62,62,var(--bg-opacity));
+		background-color: #e53e3e !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -275,9 +277,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
-
 	.blue {
-		background-color: #597EF7 !important;
+		//background-color: rgba(66,153,225,var(--bg-opacity));
+		background-color: #4299e1 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -285,9 +287,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
-
 	.puple {
-		background-color: #9254DE !important;
+		//background-color: rgba(102,126,234,var(--bg-opacity));
+		background-color: #667eea !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -295,9 +297,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
-
 	.green {
-		background-color: #73D13D !important;
+		//background-color: rgba(56,178,172,var(--bg-opacity));
+		background-color: #38b2ac !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -306,9 +308,9 @@ const myDetail = [];
 		margin-bottom: 0.25rem;
 		width: 90%;
 	}
-
 	.orange {
-		background-color: #FFA940 !important;
+		//background-color: rgba(237,137,54,var(--bg-opacity));
+		background-color: #ed8936 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -316,9 +318,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
-
 	.pink {
-		background-color: #F759AB !important;
+		//background-color: rgba(237,100,166,var(--bg-opacity));
+		background-color: #ed64a6 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -326,8 +328,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/Chart.vue

@@ -351,25 +351,25 @@ export default {
 						tmpChrtOp.color = light_Col;
 					}
 				}
-				// console.log('ops11:',tmpChrtOp)
+				console.log('ops11:',tmpChrtOp)
 				return tmpChrtOp;
 			},
 		}),
 	},
 	created() {
-		// console.log('wd data:',this.widgetData)
+		console.log('wd data:',this.widgetData)
 	},
 	methods: {
 		onClick(event, instance, ECharts) {
-			// console.log('onClick : ', event);
+			console.log('onClick : ', event);
 			this.$emit('click', event);
 		},
 		onDblClick(event, instance, ECharts) {
-			// console.log('onDblClick : ', event);
+			console.log('onDblClick : ', event);
 			this.$emit('dblclick', event);
 		},
 		onRightClick(event, instance, ECharts) {
-			// console.log('onRightClick : ', event);
+			console.log('onRightClick : ', event);
 			this.$emit('rclick', event);
 		},
 		onLegendSelect(params) {

components/common/Datepicker.vue

@@ -9,7 +9,7 @@
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div :class="['datepicker-container', customClass]"  >
+			<div class="datepicker-container" >
 				<v-text-field
 					id="startpicker"
 					ref="startpicker"
@@ -30,7 +30,7 @@
 					<img :src="arrowIcon" alt="">
 				</div>
 				<v-text-field
-					v-show="isRange"
+					v-if="isRange"
 					id="endpicker"
 					ref="endpicker"
 					v-model="toDtValue"
@@ -47,6 +47,9 @@
 					</template>
 				</v-text-field>
 			</div>
+			<!-- test -->
+			<!-- <a-button @click="onOpenDatepicker()">Open</a-button> -->
+			<!-- end test -->
 		</v-col>
 	</v-row>
 </template>
@@ -93,12 +96,7 @@ export default {
 			type:Boolean,
 			require:false,
 			default: true
-		},
-		customClass: {
-			type: String,
-			require: false,
-		},
-
+		}
 	},
 	data() {
 		return {

components/common/Grid.vue

@@ -4,13 +4,12 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
-		@mousedown="onMousedown"
+		@focusChange="focusChangeEvt"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
-		@focusChange="focusChangeEvt"
 	/>
 </template>
 <script>
@@ -108,13 +107,16 @@ 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() {
@@ -161,7 +163,7 @@ export default {
 	},
 	created() {},
 	async mounted() {
-		// console.log(this.dataPath);
+		console.log('--------------DEBUG----gridData: ', this.gridData);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
@@ -184,13 +186,13 @@ export default {
 		}),
 		// true : 현재 행 혹은 연결된 그리드가 수정중인 상태
 		checkGridState() {
-			const rowStatList = ['I', 'U', 'D'];
-			const row = this.gridInstance.invoke('getFocusedCell');
+			var rowStatList = ['I', 'U', 'D'];
+			var row = this.gridInstance.invoke('getFocusedCell');
 
 			if (row) {
-				const rowData = this.gridInstance.invoke('getRow', row.rowKey);
+				var rowData = this.gridInstance.invoke('getRow', row.rowKey);
 				if (rowData) {
-					const rowStat = rowData['rowStat'];
+					var rowStat = rowData['rowStat'];
 					if (rowStatList.includes(rowStat)) {
 						return true;
 					}
@@ -198,8 +200,8 @@ export default {
 			}
 
 			if (this.preventFocusChangeEventTargetGridList) {
-				for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
-					const dataArr = gridInstance.save();
+				for (var gridInstance of this.preventFocusChangeEventTargetGridList) {
+					var dataArr = gridInstance.save();
 
 					if (dataArr.length > 0) {
 						return true;
@@ -251,11 +253,9 @@ 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,12 +270,7 @@ 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')
@@ -296,7 +291,6 @@ export default {
 			this.sendSelectedRowData(e.rowKey);
 		},
 		startEditing(e) {
-			// console.log("------------------DEBUG-------startEditing:", e);
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent startEditing')
@@ -323,7 +317,6 @@ 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
@@ -685,7 +678,6 @@ 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);
 			}
 		},
@@ -711,6 +703,11 @@ export default {
 </script>
 <style scoped lang="scss">
 ::v-deep .tui-grid-container {
+	
+	// .tui-grid-body-area {
+	// 	overflow: hidden !important;
+	// }
+
 	.tui-grid-content-area {
 		.tui-grid-cell-content {
 			input[type='number'] {

components/common/PastRsltDatePicker.vue

@@ -2,14 +2,12 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon small color="primary" 
-				:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
-				>$icoBulletPoint</v-icon>
+				<v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div :class="['datepicker-container', customClass]"  >
+			<div class="datepicker-container">
 				<v-text-field
 					id="startpicker"
 					ref="startpicker"
@@ -19,16 +17,14 @@
 					readonly
 					outlined
 				>
-					<template #append >
-						<v-icon size="20" v-show="!isRange">$icoCalendar</v-icon>
+					<template #append>
+						<v-icon size="20">$icoCalendar</v-icon>
 					</template>
 					<template #append-outer>
 						<div ref="startpicker-container" id="startpicker-container"></div>
 					</template>
 				</v-text-field>
-				<div v-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
-					<img :src="arrowIcon" alt="">
-				</div>
+				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div>
 				<v-text-field
 					v-show="isRange"
 					id="endpicker"
@@ -79,10 +75,6 @@ export default {
 			require: false,
 			default: 8,
 		},
-		customClass: {
-			type: String,
-			require: false,
-		},
 	},
 	data() {
 		return {
@@ -137,12 +129,6 @@ export default {
 				this.defaultRange === 'no limite'
 			);
 		},
-		arrowIcon() {
-			if(this.isDarkMode){
-				return require('@/assets/images/arrow_datepicker_dm.png');
-			}
-			return require('@/assets/images/arrow_datepicker.png');
-		}
 	},
 	watch: {
 		myCmCycle() {

components/common/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/button/ActionButtons.vue

@@ -3,7 +3,8 @@
 		<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')">
 			<v-icon>mdi-chevron-right</v-icon>
 		</v-btn> -->
-		<a-button @click="btnActionsFnc('addLeftToRight')" type="primary" ghost icon="right" >
+		<a-button type="default" @click="btnActionsFnc('addLeftToRight')">
+			<RightOutlines/>
 		</a-button>
 
 		<!--<v-btn
@@ -15,7 +16,8 @@
 		>
 			<v-icon>mdi-chevron-left</v-icon>
 		</v-btn> -->
-		<a-button class="mt-2" @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost icon="left">
+		<a-button class="mt-2" type="default" @click="btnActionsFnc('removeRightToLeft')">
+			<LeftOutlines/>
 		</a-button>
 	</div>
 </template>

components/common/button/BtnExcelDownload.vue

@@ -45,7 +45,7 @@ export default {
 		size: {
 			type: String,
 			require: false,
-			default: "default", // small, middle, large
+			default: "middle", // small, middle, large
 		}
 	},
 	data() {

components/common/chartoptions/LineChart.js

@@ -15,8 +15,7 @@ export default function getLineChartOption({
     const styledSeries = seriesData.map((item, index) => {
         const color = item.color || defaultColors[index % defaultColors.length];
         return {
-            ...item,    
-            showSymbol: true,       // Show symbol at each data point
+            ...item,
             itemStyle: {
                 color,
             },
@@ -28,9 +27,9 @@ export default function getLineChartOption({
             left: '3%',
             right: '5%',
             top: '25%',
-            bottom: '0%',
             containLabel: true,
         },
+
         legend: {
             // data: legendData,
             icon: 'circle',
@@ -38,7 +37,7 @@ export default function getLineChartOption({
             right: '5%',
             orient: 'horizontal',
             textStyle: {
-                color: isDarkMode ? 'white' : '#676A7B',
+                color: isDarkMode ? '#676A7B' : '#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,7 +22,6 @@
 					<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">
@@ -47,10 +46,11 @@
 										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,32 +59,24 @@
 								</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: 50vh;">
+				<div :style="'height: calc(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>
@@ -156,7 +148,23 @@ export default {
 		return {
 			dialog: false,
 
-			loadGrid: 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 },
+					]
+				}
+			},
 			grid_01: 'grid_01',
 			myModalKey: 'egrpPysclQtyPop',
 			modalDataKey: 'pyscModalData',
@@ -321,6 +329,13 @@ export default {
 				this.selectValueList01 = [];
 				this.selectValue01 = null;
 			}
+
+			// this.selectValueList01 = [
+			// 	{ label: '냉동기고온', value: '냉동기고온' },
+			// 	{ label: '냉동기저온', value: '냉동기저온' },
+			// 	{ label: '공조기', value: '공조기' },
+			// 	{ label: '보일러', value: '보일러' }
+			// ];
 		},
 		search() {
 			this.getGridData();
@@ -342,7 +357,7 @@ export default {
 				modalDataKey: this.modalDataKey,
 				value: Object.assign(
 					// Utility.defaultGridOption(this.$refs.modalGridParent.offsetHeight - 60, myOptions),
-					Utility.defaultGridOption(400, myOptions),
+					// Utility.defaultGridOption(100, myOptions),
 					myOptions,
 				),
 			});
@@ -400,15 +415,6 @@ export default {
 				}
 			}
 
-			// res = [
-			// 	{
-			// 	'pysclQtyId' : 'PYSCL00001',
-			// 	'pysclQtyCd' : 'AMP_1A',
-			// 	'pysclQtyNm' : '회로1 전류A',
-			// 	'pysclQtyTpNm' : 'TAG'
-
-			// 	}
-			// ]
 			this.setModalGridData({
 				modalKey: this.myModalKey,
 				gridKey: this.grid_01,
@@ -463,10 +469,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/EnrgUsePlanModiPop.vue

@@ -318,7 +318,7 @@ export default {
 		// }
 	},
 	mounted(){
-		// this.initTest(); return;
+		this.initTest(); return;
 	},
 	methods: {
 		...mapMutations({
@@ -478,6 +478,10 @@ export default {
 			// })
 		},
 		async setChart(){
+			// test
+			this.initTestChart(); return;
+			// end test
+
 			this.loadChart = false;
 			let xAxisData = [];
 			let seriesData = [];

components/common/modal/EqpmCalcPop.vue

@@ -5,7 +5,7 @@
 				<v-icon
 					v-if="iconShow"
 					small
-					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
+					:class="['mr-1', 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/EvtObjPop.vue

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box no-gutters" align="center">
+	<v-row class="search-box" align="center">
 		<v-col :cols="option.labelCols" class="py-0">
 			<label for="" class="search-box-label">
 				<v-icon v-if="item.iconShow" small
@@ -7,13 +7,12 @@
 				{{ option.labelContent }}
 			</label>
 		</v-col>
-		<v-col :cols="option.textCols" class="py-0">
-			<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
-				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)" style="padding: 0;"
-				:required="item.required || false"><template v-slot:append>
-					<!-- Custom SVG icon -->
-					<v-icon>$icoSearch</v-icon>
-				</template></v-text-field>
+		<v-col :cols="option.textCols">
+			<v-text-field readonly v-model="selectValue" append-icon="mdi-magnify" 
+			  :class="['v-select__custom', customClass]"
+				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true"
+				:required="item.required || false"></v-text-field>
+			<!-- :disabled="item.disabled || false" -->
 		</v-col>
 
 		<v-dialog v-model="dialog" scrollable width="1000px">
@@ -22,10 +21,10 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<v-icon @click="dialogOpenCloseEvent(dialog)">mdi-close</v-icon>
 				</v-card-title>
-				<v-row align="end" class="px-5 pb-3" no-gutters>
+				<v-row align="end" class="pa-5" no-gutters>
 					<v-col :cols="2.5" class="mr-2">
 						<v-row>
-							<v-col :cols="12" class="py-0">
+							<v-col :cols="2">
 								<label for="" class="search-box-label">
 									<!-- <v-icon small 
 									:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
@@ -33,28 +32,28 @@
 									검색
 								</label>
 							</v-col>
-							<v-col :cols="11" class="py-0 pr-3">
-								<v-text-field append-icon="mdi-magnify" class="v-input__custom" outlined
-									:hide-details="true" v-model="searchWord" @keyup.enter="search"></v-text-field>
+							<v-col :cols="12">
+								<v-text-field append-icon="mdi-magnify" class="v-input__custom" outlined :hide-details="true"
+									v-model="searchWord" @keyup.enter="search"></v-text-field>
 							</v-col>
-							<a-button icon="search" :ripple="false" type="primary" @click="search()"
-								class="search-button">조회</a-button>
 						</v-row>
 					</v-col>
+					<a-button type="primary" :ripple="false" @click="search()">
+						조회
+					</a-button>
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
-				<div :style="'height: 600px'" class="px-5">
+				<div :style="'height: 600px'">
 					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
 					<div ref="modalGridParent" class="h100 py-3">
 						<!-- :is="loadGrid && dialog ? 'Grid' : null" -->
 						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
-							:dataPath="searchParam.modalData2.evtObjPop" :parentPrgmId="parentPrgmId"
-							@getRowsData="getRowData" @dblClick="setUpdate($event)" />
+							:dataPath="searchParam.modalData2.evtObjPop" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
+							@dblClick="setUpdate($event)" />
 					</div>
 				</div>
 				<v-card-actions class="pa-5 d-flex align-center justify-end">
-					<a-button type="default" class="mr-2" :ripple="false"
-						@click="dialogOpenCloseEvent(dialog)">닫기</a-button>
+					<a-button type="default" class="mr-2" :ripple="false" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
 					<a-button type="primary" class="mr-2" :ripple="false" @click="setUpdate('init')">초기화</a-button>
 					<a-button type="primary" :ripple="false" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>

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,29 +22,37 @@
 				outlined
 				:hide-details="true"
 			>
-			<!-- Custom SVG icon -->
 			<template v-slot:append>
-				<v-icon>$icoSearch</v-icon>
+					<!-- Custom SVG 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="px-6 py-4 d-flex align-center justify-space-between">
+				<v-card-title class="pa-5 d-flex align-center justify-space-between">
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
-					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
+					<v-btn
+						icon
+						tile
+						:ripple="false"
+						@click="dialogOpenCloseEvent(dialog)"
+					>
+						<v-icon>mdi-close</v-icon>
+					</v-btn>
 				</v-card-title>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
-						<v-col :cols="12">
+						<v-col :cols="3">
 							<label for="" class="search-box-label">
-								<!-- <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>
+								<v-icon x-small color="primary" class="mr-1"
+									>mdi-record-circle</v-icon
+								>
 								검색
 							</label>
 						</v-col>
-						<v-col :cols="9">
+						<v-col :cols="5">
 							<v-text-field
 								append-icon="mdi-magnify"
 								class="v-input__custom"
@@ -55,19 +63,21 @@
 							></v-text-field>
 						</v-col>
 						<v-spacer></v-spacer>
-						<v-col :cols="3" class="text-right">
-							<a-button type="primary" @click="search()" icon="search">
+						<v-col cols="4" class="text-right">
+							<v-btn :ripple="false" @click="search()">
 								조회
-							</a-button>
-							<a-button @click="initSearch()">
+							</v-btn>
+							<v-btn :ripple="false" @click="initSearch()">
 								초기화
-							</a-button>
+							</v-btn>
 						</v-col>
 					</v-row>
 				</div>
-			<!-- <v-divider></v-divider> -->
-				<div style="height: 429px;" class="py-3 px-5">
-					<div ref="modalGridParent" class="h100 w100">
+				<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">
 						<component
 							:is="loadGrid && dialog ? 'Grid' : null"
 							:gridName="grid_01"
@@ -78,9 +88,11 @@
 						/>
 					</div>
 				</div>
-				<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 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>
 			</v-card>
 		</v-dialog>
@@ -324,7 +336,7 @@ export default {
 				}))
 			};
 
-			// console.log(res);
+			console.log(res);
 			
 			this.setModalGridData({
 				modalKey: this.myModalKey,
@@ -383,31 +395,7 @@ 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;
 	}
@@ -430,4 +418,26 @@ 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,10 +43,7 @@
 							</v-col>
 							<v-col :cols="6" class="py-0 pl-2">
 								<!-- <DatePicker v-model="strtDt" :parentPrgmId="parentPrgmId"/> -->
-								<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">
+								<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>
@@ -56,7 +53,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"
@@ -94,9 +91,17 @@
 								</div>
 							</v-col>
 							<v-col :cols="6" class="pl-2">
-								<component :parentPrgmId="parentPrgmId" :is="'SelectBoxTime'" ref="SelectBox2"
-									:propsValue="selectTimeValue2" :itemList="selectTimeValueList2" :minInterval="selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
-										" @update:propsValue="selectTimeValue2 = $event" />
+								<div class="startpicker-container3">
+									<v-text-field id="startpicker3" ref="startpicker3" v-model="endDt"
+										:class="'v-input__custom'" :hide-details="true" readonly outlined>
+										<template #append>
+											<v-icon size="20">$icoCalendar</v-icon>
+										</template>
+										<template #append-outer>
+											<div ref="startpicker-container3" id="startpicker-container3"></div>
+										</template>
+									</v-text-field>
+								</div>
 							</v-col>
 							<!-- <v-col :cols="2">
 								<vue-numeric-input v-model="endHh" :min="0" :max="23" controls-type="updown"
@@ -181,11 +186,10 @@
 					</div>
 				</template>
 				<v-card-actions class="justify-end">
-					<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 :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')">삭제</a-button>
-
+						@click="btnAction('delete')" class="mr-2">삭제</a-button>
+					<a-button :ripple="false" type="primary" @click="btnAction('close')" class="mr-2">닫기</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -206,7 +210,6 @@ 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],
@@ -234,13 +237,6 @@ export default {
 			type: String,
 			require: false,
 		},
-		selectBoxTimeItemList: {
-			type: Object,
-			require: false,
-			default: () => {
-				return {};
-			},
-		},
 	},
 	components: {
 		InputText,
@@ -254,7 +250,6 @@ export default {
 		Utility,
 		TuiDatepicker,
 		VueNumericInput,
-		SelectBoxTime,
 	},
 	data() {
 		return {
@@ -277,23 +272,7 @@ 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: {
@@ -317,29 +296,25 @@ 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) {
@@ -348,12 +323,6 @@ export default {
 		endMm(val) {
 			this.checkStrtAndEndDateTime('end');
 		},
-		selectTimeValue1(val) {
-			this.setPageData({ selectTimeValue1: val });
-		},
-		selectTimeValue2(val) {
-			this.setPageData({ selectTimeValue2: val });
-		}
 	},
 	methods: {
 		...mapMutations({
@@ -536,8 +505,10 @@ 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.selectTimeValue1 = returnData.strtHh+' : '+  returnData.strtMm;
-			this.selectTimeValue2 = returnData.endHh+' : '+  returnData.endMm;
+			this.strtHh = returnData.strtHh;
+			this.strtMm = returnData.strtMm;
+			this.endHh = returnData.endHh;
+			this.endMm = returnData.endMm;
 			this.planTitle = returnData.planTitle;
 			this.planCntn = returnData.planCntn;
 			this.planColor = returnData.planColor;
@@ -554,8 +525,10 @@ export default {
 						if (
 							this.strtDt === '' ||
 							this.endDt === '' ||
-							this.selectTimeValue1 === '' ||
-							this.selectTimeValue2 === '' ||
+							this.strtHh === '' ||
+							this.strtMm === '' ||
+							this.endHh === '' ||
+							this.endMm === '' ||
 							this.planTitle === '' ||
 							this.planCntn === '' ||
 							this.planColor === ''
@@ -569,8 +542,10 @@ export default {
 						if (
 							this.strtDt == '' ||
 							this.endDt == '' ||
-							this.selectTimeValue1 === '' ||
-							this.selectTimeValue2 === '' ||
+							this.strtHh == '' ||
+							this.strtMm == '' ||
+							this.endHh == '' ||
+							this.endMm == '' ||
 							this.planTitle == '' ||
 							this.planCntn == '' ||
 							this.planColor == ''
@@ -590,17 +565,13 @@ 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: strtHh.trim().toString(),
-				strtMm: strtMm.trim().toString(),
-				endHh: endHh.trim().toString(),
-				endMm: endMm.trim().toString(),
+				strtHh: this.strtHh.toString(),
+				strtMm: this.strtMm.toString(),
+				endHh: this.endHh.toString(),
+				endMm: this.endMm.toString(),
 				blocId: this.blocId,
 				planTitle: this.planTitle,
 				planCntn: this.planCntn,
@@ -621,16 +592,13 @@ 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: strtHh.trim().toString(),
-				strtMm: strtMm.trim().toString(),
-				endHh: endHh.trim().toString(),
-				endMm: endMm.trim().toString(),
+				strtHh: this.strtHh.toString(),
+				strtMm: this.strtMm.toString(),
+				endHh: this.endHh.toString(),
+				endMm: this.endMm.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

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box" align="center">
+	<v-row class="search-box" align="center" >
 		<!-- <v-col v-if="label" cols="2"> -->
 		<v-col v-if="item.label" :cols="item.labelCols" class="py-0">
 			<label for="" class="search-box-label">
@@ -37,11 +37,12 @@
 					<v-row align="center">
 						<v-col v-if="label" cols="12" class="py-0">
 							<label for="" class="search-box-label">
-								<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
+								<v-icon small
+									:class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
 								{{ item.label }}
 							</label>
 						</v-col>
-						<v-col :cols="label ? 8 : ''" class="py-0">
+						<v-col :cols="label ? 6 : ''" class="py-0">
 							<!-- :value="textfield" -->
 							<v-text-field append-icon="" class="v-input__custom" outlined :hide-details="true"
 								v-model="searchWord" @keyup.enter="typeEnterKey"><template v-slot:append>
@@ -51,10 +52,13 @@
 
 								</template></v-text-field>
 						</v-col>
-						<!-- <v-spacer></v-spacer> -->
-						<v-col cols="2" class="text-right">
-							<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
-
+						<v-spacer></v-spacer>
+						<v-col cols="3" class="text-right">
+							<v-btn :ripple="false" icon tile @click="btnTreeExpand()">
+								<!-- {{ treeExpand }} -->
+								<v-icon size="30"
+									v-text="treeExpandAll ? 'mdi-chevron-up' : 'mdi-chevron-down'"></v-icon>
+							</v-btn>
 							<!-- <v-btn color="primary" dark>펼치기</v-btn> -->
 							<!-- <v-btn color="primary" dark>접기</v-btn> -->
 							<!-- <v-btn :ripple="false">초기화</v-btn> -->
@@ -62,12 +66,8 @@
               <v-btn v-if="!searchParam.isMulti" :ripple="false" @click="search()">검색</v-btn> -->
 							<!-- as-is 롤 봐도 초기화가 하는 기능을 모르겠음.. -->
 						</v-col>
-						<v-col cols="2" class="text-right"><a-button class="expand-btn" :ripple="false" @click="btnTreeExpand()">
-								<v-icon small>$icoExpandAlt</v-icon>
-								Expand All
-							</a-button></v-col>
 					</v-row>
-					
+
 					<!-- <v-btn color="primary" dark @click="btnTreeExpand()">{{
             treeExpand
           }}</v-btn> -->
@@ -78,7 +78,7 @@
 				</div>
 
 				<v-card-text>
-					<div ref="treeGridParent" style="height: 450px">
+					<div ref="treeGridParent" style="height: 500px">
 						<component :ref="'treeGrid' + parentPrgmId" :is="loadGrid && dialog ? 'Grid' : null"
 							:gridName="gridNameTree" :dataPath="searchParam.modalData.selectReadObjListTree"
 							:parentPrgmId="parentPrgmId" :bindingData="bindingData" @getRowsData="getRowData"
@@ -89,10 +89,10 @@
             :tree-data="ftnPlcListTreeData"
           /> -->
 				</v-card-text>
-
+				<v-divider></v-divider>
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
-					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
+					<a-button :ripple="false" @click="setUpdate()" class="mr-2">확인</a-button>
+					<a-button :ripple="false" type="primary" @click="dialog = false" class="mr-2">닫기</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -155,7 +155,7 @@ export default {
 
 			myModalKey: 'selectReadObjListTree',
 			gridNameTree: 'treeGrid',
-			loadGrid: false,
+			loadGrid: true,
 
 			dialog: false,
 			treeData: [], // 리턴받은 원본 트리 데이터
@@ -268,7 +268,7 @@ export default {
 						header: '',
 						name: '',
 						align: 'center',
-						width: 20,
+						width: 50,
 						formatter: (props) => {
 							return `<label class="custom-radio">
 										<span class="radio-mark"></span>
@@ -278,10 +278,10 @@ export default {
 					{
 						header: '검침개소명',
 						name: 'readPlcNm',
-						width: 500,
+						width: 370,
 						align: 'left',
 					},
-					{ header: '검침개소', name: 'name', align: 'left', width: 200 },
+					{ header: '검침개소', name: 'name', align: 'center' },
 				],
 			});
 		},
@@ -289,34 +289,73 @@ export default {
 		async getTreeData() {
 			this.loadGrid = false;
 
-			const res = await this.postApiReturn({
-				apiKey: 'selectReadPlcBaseInfo',
-				resKey: 'readPlcBaseInfoData',
-				sendParam: {
-					blocId:
-						this.searchParam.blocMstrList.length > 0
-							? this.searchParam.blocMstrList[this.searchParam.blocId].blocId
-							: this.searchParam.blocId, //"BL0001",
-					// readObjId: this.searchParam.readObj, // "MTT00001" // 전력 코드 고정
-					readObjId: this.searchParam.searchReadObj, // "MTT00001" // 전력 코드 고정
+			// const res = await this.postApiReturn({
+			// 	apiKey: 'selectReadPlcBaseInfo',
+			// 	resKey: 'readPlcBaseInfoData',
+			// 	sendParam: {
+			// 		blocId:
+			// 			this.searchParam.blocMstrList.length > 0
+			// 				? this.searchParam.blocMstrList[this.searchParam.blocId].blocId
+			// 				: this.searchParam.blocId, //"BL0001",
+			// 		// readObjId: this.searchParam.readObj, // "MTT00001" // 전력 코드 고정
+			// 		readObjId: this.searchParam.searchReadObj, // "MTT00001" // 전력 코드 고정
 
-					useFg: '1',
-					readPlcNmLike: this.searchWord,
+			// 		useFg: '1',
+			// 		readPlcNmLike: this.searchWord,
+			// 	},
+			// });
+
+			const treeData = [
+				{
+					readPlcNm: '서울 본사',
+					name: '본사',
+					_children: [
+						{
+							readPlcNm: '서울 본사 - 1층',
+							name: '1층',
+						},
+						{
+							readPlcNm: '서울 본사 - 2층',
+							name: '2층',
+						},
+					],
 				},
-			});
+				{
+					readPlcNm: '부산 지사',
+					name: '지사',
+					_children: [
+						{
+							readPlcNm: '부산 지사 - A동',
+							name: 'A동',
+							_children: [
+								{
+									readPlcNm: '부산 지사 - A동 1층',
+									name: '1층',
+								},
+								{
+									readPlcNm: '부산 지사 - A동 2층',
+									name: '2층',
+								},
+							],
+						},
+						{
+							readPlcNm: '부산 지사 - B동',
+							name: 'B동',
+						},
+					],
+				},
+				{
+					readPlcNm: '대전 창고',
+					name: '창고',
+				},
+			];
 
-			// console.log("treeData", res)
+
+			// // console.log("treeData", res)
 			let myOptionsTree = {
-				columnOptions: {
-					resizable: true,
-				},
 				treeColumnOptions: {
 					name: 'readPlcNm',
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 'auto',
 			};
 			if (this.searchParam.isMulti) {
 				myOptionsTree['rowHeaders'] = [{ type: 'checkbox' }];
@@ -334,26 +373,26 @@ export default {
 
 			// this.treeData = res;
 			// const ROOT = res[0].plcCd;
-			const setTreeData = await this.setTree({
-				gridKey: this.gridNameTree,
-				treeKey: 'READ_PLC_ID',
-				value: res.map(item => ({
-					...item,
-					rowStat: null,
-					readPlcId: item.readPlcId,
-					readPlcIdNm: item.readPlcId,
-					upReadPlcId:
-						item.upReadPlcId == null || item.upReadPlcId == ''
-							? ''
-							: item.upReadPlcId,
-					upReadPlcNm:
-						item.upReadPlcNm == null || item.upReadPlcNm == ''
-							? ''
-							: item.upReadPlcNm,
-					blocId: item.blocId,
-					useFg: item.useFg === '1' ? true : false,
-				})),
-			});
+			// const setTreeData = await this.setTree({
+			// 	gridKey: this.gridNameTree,
+			// 	treeKey: 'READ_PLC_ID',
+			// 	value: res.map(item => ({
+			// 		...item,
+			// 		rowStat: null,
+			// 		readPlcId: item.readPlcId,
+			// 		readPlcIdNm: item.readPlcId,
+			// 		upReadPlcId:
+			// 			item.upReadPlcId == null || item.upReadPlcId == ''
+			// 				? ''
+			// 				: item.upReadPlcId,
+			// 		upReadPlcNm:
+			// 			item.upReadPlcNm == null || item.upReadPlcNm == ''
+			// 				? ''
+			// 				: item.upReadPlcNm,
+			// 		blocId: item.blocId,
+			// 		useFg: item.useFg === '1' ? true : false,
+			// 	})),
+			// });
 			// this.treeData = setTreeData;
 
 
@@ -361,7 +400,7 @@ export default {
 				modalKey: this.myModalKey,
 				gridKey: this.gridNameTree,
 				modalDataKey: this.modalDataKey,
-				value: setTreeData.ROOT || [],
+				value: treeData,
 			});
 			this.loadGrid = true;
 
@@ -501,4 +540,22 @@ const selectReadObjListTree = {
 	}
 }
 
+@each $theme in dark, light {
+	.v-application.#{$theme}-mode {
+		.v-dialog {
+			.v-card {
+				&__title {
+
+					@if $theme ==dark {
+						background-color: #2d3355;
+
+						.v-btn {
+							background-color: #2d3355;
+						}
+					}
+				}
+			}
+		}
+	}
+}
 </style>

components/common/select/SelectBlocMstr.vue

@@ -2,15 +2,22 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon v-if="iconShow" small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
+				<v-icon
+					v-if="iconShow"
+					small
+					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+					>$icoBulletPoint</v-icon
+				>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<v-select v-model="selectValue" :items="searchParam[parentPrgmId].blocMstrList" 
-				item-text="blocNm" item-value="idx" append-icon="" outlined
+			<v-select v-model="selectValue" :items="searchParam[parentPrgmId].blocMstrList" label="사업장을 선택하세요"
+				item-text="blocNm" item-value="idx" append-icon="" class="v-select__custom" outlined
 				:hide-details="true" :class="['v-select__custom', customClass]">
-				<template v-slot:append><v-icon>$icoChevronDown</v-icon></template>
+				<template v-slot:append>
+					    <v-icon>$icoChevronDown</v-icon>
+					  </template>
 			</v-select>
 		</v-col>
 	</v-row>

components/common/select/SelectBoxTime.vue

@@ -22,11 +22,11 @@
         outlined
         :menu-props="{ auto: true, offsetY: true }"
         :hide-details="true"
-        :class="'v-select__custom'"
+        :class="'v-select__custom select-large'"
         :disabled="disabled"
         :readonly="readonly"
         @click="setDatepickerHide"
-        style="min-width: 170px;"
+        style="width: 170px; border-radius: 6px !important"
       >
         <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/common/select/SelectMttList.vue

@@ -85,11 +85,6 @@ export default {
       type: String,
       require: false,
     },
-    required: {
-      type: Boolean,
-      require: false,
-      default: false
-    },
   },
   data() {
     return {

components/common/select/selectCodeList.vue

@@ -11,11 +11,9 @@
 		<v-col :cols="label ? textCols : ''">
 			<v-select v-model="selectValue" :items="searchParam[parentPrgmId][dataKey + 'List']" item-text="commCdNm"
 				item-value="commCd" outlined :hide-details="true" append-icon=""
-				:class="['v-select__custom', customClass]">
-				<template v-slot:append>
+				:class="['v-select__custom', customClass]"><template v-slot:append>
 					<v-icon>$icoChevronDown</v-icon>
-				</template>
-			</v-select>
+					</template></v-select>
 			<!-- @change="updateBlocCode($event)" -->
 		</v-col>
 	</v-row>

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/icons/icoExpandAlt.vue

@@ -1,6 +0,0 @@
-<template>
-    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" class="v-icon" xmlns="http://www.w3.org/2000/svg">
-        <path
-            d="M14.1248 1.71225L10.7462 2.13189C10.6283 2.14617 10.5801 2.28903 10.6623 2.37296L11.6391 3.34975L8.89799 6.09082C8.8714 6.11767 8.85649 6.15392 8.85649 6.19171C8.85649 6.2295 8.8714 6.26575 8.89799 6.2926L9.70335 7.09796C9.7587 7.15332 9.84977 7.15332 9.90513 7.09796L12.648 4.3551L13.6248 5.33189C13.6436 5.35072 13.6674 5.36387 13.6934 5.36981C13.7193 5.37576 13.7465 5.37427 13.7716 5.36551C13.7968 5.35675 13.819 5.34107 13.8356 5.32028C13.8523 5.29949 13.8628 5.27443 13.8658 5.24796L14.2837 1.87117C14.2867 1.84961 14.2846 1.82765 14.2776 1.80702C14.2707 1.78639 14.2591 1.76765 14.2437 1.75226C14.2283 1.73687 14.2096 1.72524 14.1889 1.7183C14.1683 1.71136 14.1463 1.70929 14.1248 1.71225ZM6.2962 8.89439C6.26935 8.8678 6.23309 8.85289 6.19531 8.85289C6.15752 8.85289 6.12127 8.8678 6.09442 8.89439L3.35334 11.6372L2.37656 10.6605C2.35771 10.6416 2.33394 10.6285 2.30797 10.6225C2.282 10.6166 2.25487 10.6181 2.22971 10.6268C2.20455 10.6356 2.18236 10.6513 2.16569 10.6721C2.14903 10.6929 2.13856 10.7179 2.13549 10.7444L1.71584 14.1212C1.70513 14.214 1.78192 14.2908 1.87477 14.2801L5.25335 13.8605C5.3712 13.8462 5.41942 13.7033 5.33727 13.6194L4.36049 12.6426L7.10334 9.89974C7.1587 9.84439 7.1587 9.75332 7.10334 9.69796L6.2962 8.89439Z" />
-    </svg>
-</template>

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -5,7 +5,7 @@
       <Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"
         :btnActionsFnc="btnActions" />
     </div>
-    <div ref="gridParent" style="min-height: 30vh;">
+    <div ref="gridParent">
       <Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
         @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
     </div>
@@ -66,7 +66,7 @@ export default {
   },
   data() {
     return {
-      loadGrid: false,
+      loadGrid: true,
       gridName: 'rowDataSetTagRelGrid',
       detailDataSetTagList: myDataSetTagDetail,
       dataPathMock: {
@@ -128,6 +128,8 @@ export default {
       const gridHeight = this.$refs['gridParent'].offsetHeight - 36;
 
       const myOptions = {
+        // bodyHeight: gridHeight,
+        // minBodyHeight: gridHeight,
         header: {
           height: 28,
         },
@@ -135,9 +137,14 @@ export default {
         minRowHeight: 29,
         selectionUnit: 'row',
         editingEvent: 'click',
+        // columnOptions: {
+        //   resizable: true,
+        //   minWidth: 100
+        // }
       };
       this.setGridOption({
         gridKey: this.gridName,
+        // value: myOptions
         value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
       });
 
@@ -197,11 +204,16 @@ export default {
         value: myColumns,
       });
 
-      this.$nextTick(() => {
-        this.loadGrid = true;
-      })
+      this.loadGrid = true;
     },
     async getRowData(data, gridName) {
+      // if (data.rowStat === 'I') {
+      // 	this.detailDataSetTagList[0].disabled = false;
+      // 	this.detailDataSetTagList[1].disabled = false;
+      // } else {
+      // 	this.detailDataSetTagList[0].disabled = true;
+      // 	this.detailDataSetTagList[1].disabled = true;
+      // }
       this.setGridSelectData({
         gridKey: gridName,
         gridSelect: true,
@@ -213,7 +225,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 +308,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,6 +20,7 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
+				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -53,10 +54,22 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			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: {
@@ -431,4 +444,22 @@ 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,6 +19,7 @@
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
+				:dataPath="dataPathMock"
 			/>
 		</div>
 		<div>
@@ -59,11 +60,24 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			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: {
@@ -502,4 +516,12 @@ const myDetail = [
 		iconShow: true,
 	},
 ];
+const dataPathDataExample = [
+	{
+		readObjId: 'OBJ001',
+		readObjNm: '서울 본사',
+		readObjKind: 'TYPE01',
+		grpCd: 'GRP01',
+	},
+]
 </script>

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

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

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -4,7 +4,7 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
+			<span class="txt">검침 대상 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -20,6 +20,8 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
+				:selectedRowDataWatchFlag="true"
+				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -53,10 +55,23 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
+			dataPathMock: {
+				"rowDetailGrid": {
+				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: {
@@ -261,7 +276,7 @@ export default {
 				{ header: '검침 대상 ID', name: 'readObjId', hidden: true },
 				{
 					header: '추가 정보',
-					name: 'addInfoId',
+					name: 'addInfoId', 
 					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
@@ -446,4 +461,25 @@ export default {
 		search() {},
 	},
 };
+const dataPathDataExample = [
+	{
+	readObjId: 'OBJ001',
+	readObjNm: '서울 본사',
+	readObjKind: 'TYPE01',
+	grpCd: 'GRP01',
+	},
+	{
+	readObjId: 'OBJ002',
+	readObjNm: '부산 지사',
+	readObjKind: 'TYPE02',
+	grpCd: 'GRP02',
+	},
+	{
+	readObjId: 'OBJ003',
+	readObjNm: '대전 공장',
+	readObjKind: 'TYPE03',
+	grpCd: 'GRP01',
+	}
+];
+
 </script>

components/pages/ems/ReadPlcInfo/ReadPlcAddInfoTab.vue

@@ -1,12 +1,26 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between">
+		<div
+			class="d-flex justify-space-between"
+
+		>
 			<v-card-title class="px-0 pt-0 custom-title-4">검침개소 추가 정보</v-card-title>
-			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
+			<Buttons
+				:parentPrgmId="parentPrgmId"
+				:bindingData="gridName"
+				:btnActionsFnc="btnActions"
+			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 520px);">
-			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-				:editorGrid="true" :innerTabGridInfo="innerTabGridInfo" @getRowsData="getRowData" />
+		<div ref="gridParent">
+			<Grid
+				:ref="gridName"
+				:gridName="gridName"
+				:parentPrgmId="parentPrgmId"
+				:editorGrid="true"
+				:innerTabGridInfo="innerTabGridInfo"
+				@getRowsData="getRowData"
+				:dataPath="addInfoTabData"
+			/>
 		</div>
 	</div>
 </template>
@@ -39,65 +53,65 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			// addInfoTabData: {
-			// 	"rowDetailGrid": {
-			// 		data: [
+			addInfoTabData: {
+				"rowDetailGrid": {
+					data: [
 
 
 
-			// 			{
-			// 				readPlcNm: '서울 본사',
-			// 				plcKind: '전기',
-			// 				useFg: '1',
-			// 			},
+						{
+							readPlcNm: '서울 본사',
+							plcKind: '전기',
+							useFg: '1',
+						},
 
 
-			// 		],
-			// 		column: [
-			// 			// { header: '회사 ID', name: 'comId', hidden: true },
-			// 			{
-			// 				header: '검침개소명',
-			// 				name: 'readPlcNm',
-			// 				align: 'left',
-			// 				minWidth: 400,
-			// 			},
-			// 			{
-			// 				header: '개소 종류',
-			// 				name: 'plcKind',
-			// 				minWidth: 100,
-			// 				align: 'center',
-			// 				// formatter({ value }) {
-			// 				// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.plcKindList.filter(
-			// 				// 		item => item.commCd == value,
-			// 				// 	);
-			// 				// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].commCdNm;
-			// 				// 	}
-			// 				// 	return retVal;
-			// 				// },
-			// 			},
-			// 			{
-			// 				header: '사용 여부',
-			// 				name: 'useFg',
-			// 				minWidth: 100,
-			// 				align: 'center',
-			// 				// formatter({ value }) {
-			// 				// 	value = value === true ? '1' : '0';
-			// 				// 	const newValue = _this.pageData.useFgList.filter(
-			// 				// 		item => item.commCd == value,
-			// 				// 	);
-			// 				// 	return newValue[0].commCdNm;
-			// 				// },
-			// 			},
-			// 		]
+					],
+					column: [
+						// { header: '회사 ID', name: 'comId', hidden: true },
+						{
+							header: '검침개소명',
+							name: 'readPlcNm',
+							align: 'left',
+							minWidth: 400,
+						},
+						{
+							header: '개소 종류',
+							name: 'plcKind',
+							minWidth: 100,
+							align: 'center',
+							// formatter({ value }) {
+							// 	let retVal = '';
+							// 	const newValue = _this.pageData.plcKindList.filter(
+							// 		item => item.commCd == value,
+							// 	);
+							// 	if (newValue.length > 0) {
+							// 		retVal = newValue[0].commCdNm;
+							// 	}
+							// 	return retVal;
+							// },
+						},
+						{
+							header: '사용 여부',
+							name: 'useFg',
+							minWidth: 100,
+							align: 'center',
+							// formatter({ value }) {
+							// 	value = value === true ? '1' : '0';
+							// 	const newValue = _this.pageData.useFgList.filter(
+							// 		item => item.commCd == value,
+							// 	);
+							// 	return newValue[0].commCdNm;
+							// },
+						},
+					]
 
-			// 	}
-			// }
+				}
+			}
 		};
 	},
 	computed: {
@@ -152,9 +166,9 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 37,
+					height: 28,
 				},
-				rowHeight: 37,
+				rowHeight: 29,
 				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
@@ -164,129 +178,128 @@ export default {
 				value: myOptions,
 			});
 
-			const _this = this;
-			let useFgSelectList = [];
-			this.pageData.useFgList.forEach(item => {
-				const it = { text: item.commCdNm, value: item.commCd };
-				useFgSelectList.push(it);
-			});
-			let addInfoList = [];
-			this.pageData.addInfoList.forEach(item => {
-				const it = { text: item.addInfoNm, value: item.addInfoId };
-				addInfoList.push(it);
-			});
-			let addInfoDataKindList = [];
-			this.pageData.addInfoDataKindList.forEach(item => {
-				const it = { text: item.commCdNm, value: item.commCd };
-				addInfoDataKindList.push(it);
-			});
+			// const _this = this;
+			// let useFgSelectList = [];
+			// this.pageData.useFgList.forEach(item => {
+			// 	const it = { text: item.commCdNm, value: item.commCd };
+			// 	useFgSelectList.push(it);
+			// });
+			// let addInfoList = [];
+			// this.pageData.addInfoList.forEach(item => {
+			// 	const it = { text: item.addInfoNm, value: item.addInfoId };
+			// 	addInfoList.push(it);
+			// });
+			// let addInfoDataKindList = [];
+			// this.pageData.addInfoDataKindList.forEach(item => {
+			// 	const it = { text: item.commCdNm, value: item.commCd };
+			// 	addInfoDataKindList.push(it);
+			// });
 
-			const myColumns = [
-				{ header: '회사 ID', name: 'comId', hidden: true },
-				{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
-				{
-					header: '추가 정보',
-					name: 'addInfoId',
-					align: 'left',
-					formatter({ value }) {
-						let retVal = '';
-						const newValue = addInfoList.filter(item => item.value == value);
-						if (newValue.length > 0) {
-							retVal = newValue[0].text;
-						}
-						return retVal;
-					},
-				},
-				{
-					header: 'Data 구분',
-					name: 'addInfoDataKind',
-					align: 'center',
-					formatter({ value }) {
-						let retVal = '';
-						const newValue = addInfoDataKindList.filter(
-							item => item.value == value,
-						);
-						if (newValue.length > 0) {
-							retVal = newValue[0].text;
-						}
-						return retVal;
-					},
-					// editor: {
-					//   type: "select",
-					//   options: {
-					//     listItems: addInfoDataKindList
-					//   }
-					// }
-				},
-				{
-					header: '숫자 값',
-					name: 'addInfoNumVal',
-					align: 'right',
-					editor: 'text',
-					hidden: true,
-				},
-				{
-					header: '문자 값',
-					name: 'addInfoTxtVal',
-					align: 'left',
-					editor: 'text',
-					hidden: true,
-				},
-				{
-					header: '추가 정보 값',
-					name: 'addInfoVal',
-					align: 'center',
-					renderer: {
-						type: NewCustomRenderer,
-					},
-					editor: {
-						type: NewCustomEditor,
-					},
-					formatter(data) {
-						return data.row.addInfoDataKind;
-					},
-				},
-				// {
-				// 	header: "추가 정보 값", name: "addInfoVal", align: "center", editor: "text",
-				// 	formatter({ value, row, column }) {
-				// 		console.log("addInfoVal row : ", row);
-				// 		console.log("addInfoVal state : ", column);
-				// 		if (row.addInfoDataKind === "NUM") {
-				// 			column.align = "right";
-				// 		} else {
-				// 			column.align = "left";
-				// 		}
-				// 		return value;
-				// 	}
-				// },
+			// const myColumns = [
+			// 	{ header: '회사 ID', name: 'comId', hidden: true },
+			// 	{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
+			// 	{
+			// 		header: '추가 정보',
+			// 		name: 'addInfoId',
+			// 		align: 'left',
+			// 		formatter({ value }) {
+			// 			let retVal = '';
+			// 			const newValue = addInfoList.filter(item => item.value == value);
+			// 			if (newValue.length > 0) {
+			// 				retVal = newValue[0].text;
+			// 			}
+			// 			return retVal;
+			// 		},
+			// 	},
+			// 	{
+			// 		header: 'Data 구분',
+			// 		name: 'addInfoDataKind',
+			// 		align: 'center',
+			// 		formatter({ value }) {
+			// 			let retVal = '';
+			// 			const newValue = addInfoDataKindList.filter(
+			// 				item => item.value == value,
+			// 			);
+			// 			if (newValue.length > 0) {
+			// 				retVal = newValue[0].text;
+			// 			}
+			// 			return retVal;
+			// 		},
+			// 		// editor: {
+			// 		//   type: "select",
+			// 		//   options: {
+			// 		//     listItems: addInfoDataKindList
+			// 		//   }
+			// 		// }
+			// 	},
+			// 	{
+			// 		header: '숫자 값',
+			// 		name: 'addInfoNumVal',
+			// 		align: 'right',
+			// 		editor: 'text',
+			// 		hidden: true,
+			// 	},
+			// 	{
+			// 		header: '문자 값',
+			// 		name: 'addInfoTxtVal',
+			// 		align: 'left',
+			// 		editor: 'text',
+			// 		hidden: true,
+			// 	},
+			// 	{
+			// 		header: '추가 정보 값',
+			// 		name: 'addInfoVal',
+			// 		align: 'center',
+			// 		renderer: {
+			// 			type: NewCustomRenderer,
+			// 		},
+			// 		editor: {
+			// 			type: NewCustomEditor,
+			// 		},
+			// 		formatter(data) {
+			// 			return data.row.addInfoDataKind;
+			// 		},
+			// 	},
+				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
+				// formatter({ value, row , column}) {
+				//   console.log("addInfoVal row : ", row);
+				//   console.log("addInfoVal state : ", column);
+				//   if(row.addInfoDataKind === "NUM"){
+				//     column.align = "right";
+				//   }else{
+				//     column.align = "left";
+				//   }
+				//   return value;
+				// }
+				//},
 				/*{
-		  header: "사용여부",
-		  name: "useFg",
-		  align: "center",
-		  formatter({ value }) {
-			return value == "1" ? "사용" : "사용안함";
-		  },
-		  editor: {
-			type: "select",
-			options: {
-			  // listItems: useFgSelectList
-			  listItems: [
-				{text:"사용", value:"1"},
-				{text:"사용안함", value:"0"},
-			  ]
-			}
-		  }
-		},*/
-				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
-				{ header: '등록 일자', name: 'regDttm', hidden: true },
-				{ header: '수정 사용자', name: 'procUserNo', hidden: true },
-				{ header: '수정 일자', name: 'procDttm', hidden: true },
-			];
+          header: "사용여부",
+          name: "useFg",
+          align: "center",
+          formatter({ value }) {
+            return value == "1" ? "사용" : "사용안함";
+          },
+          editor: {
+            type: "select",
+            options: {
+              // listItems: useFgSelectList
+              listItems: [
+                {text:"사용", value:"1"},
+                {text:"사용안함", value:"0"},
+              ]
+            }
+          }
+        },*/
+				// { header: '등록 사용자', name: 'regUserNo', hidden: true },
+				// { header: '등록 일자', name: 'regDttm', hidden: true },
+				// { header: '수정 사용자', name: 'procUserNo', hidden: true },
+				// { header: '수정 일자', name: 'procDttm', hidden: true },
+			// ];
 
-			this.setGridColumn({
-				gridKey: this.gridName,
-				value: myColumns,
-			});
+			// this.setGridColumn({
+			// 	gridKey: this.gridName,
+			// 	value: myColumns,
+			// });
 
 			this.loadGrid = true;
 		},
@@ -366,7 +379,7 @@ export default {
 		gridEditingFinish2(data, bindingData) {
 			this.$refs[bindingData].editingFinish(data);
 		},
-		search() { },
+		search() {},
 	},
 };
 </script>

components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue

@@ -8,9 +8,9 @@
 
 		<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
 			<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
-				:innerTabGridInfo="innerTabGridInfo"  />
+				:innerTabGridInfo="innerTabGridInfo" :dataPath="imgInfoTabData" />
 		</div>
-		<div ref="formParent" style="height: calc((100vh - 400px) /2);">
+		<div ref="formParent">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
 				:detailList="detailReadPlcImgList" @gridEditingFinish="gridEditingFinish" />
 		</div>
@@ -44,9 +44,26 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowReadPlcImgGrid',
 			detailReadPlcImgList: myReadPlcImgDetail,
+			imgInfoTabData: {
+				"rowReadPlcImgGrid": {
+					data:
+						[
+							{ "objReadPlcId": "1001", "objReadPlcNm": "서울역", "distRt": 12 },
+							{ "objReadPlcId": "1002", "objReadPlcNm": "강남역", "distRt": 8 },
+							{ "objReadPlcId": "1003", "objReadPlcNm": "잠실역", "distRt": 15 },
+						]
+					,
+					column: [
+						{ header: '대상 검침개소 번호', name: 'objReadPlcId', align: 'center' },
+						{ header: '대상 검침개소명', name: 'objReadPlcNm', align: 'left' },
+						{ header: '분배율(1~100)', name: 'distRt', align: 'right' },
+					]
+
+				}
+			}
 		};
 	},
 	computed: {
@@ -103,11 +120,10 @@ export default {
 				header: {
 					height: 28,
 				},
-				// rowHeight: 29,
-				// minRowHeight: 29,
+				rowHeight: 29,
+				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
-				rowHeight: 'auto',
 			};
 			this.setGridOption({
 				gridKey: this.gridName,

components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue

@@ -6,23 +6,12 @@
 				:btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
-			<Grid
-				:ref="gridName"
-				:is="loadGrid ? 'Grid' : null"
-				:gridName="gridName"
-				:parentPrgmId="parentPrgmId"
-				@getRowsData="getRowData"
-				:innerTabGridInfo="innerTabGridInfo"
-			/>
+			<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
+				:innerTabGridInfo="innerTabGridInfo" :dataPath="tagRelTabData" />
 		</div>
-		<div ref="formParent" style="height: calc((100vh - 400px) /2);">
-			<component
-				:is="'Form'"
-				:parentPrgmId="parentPrgmId"
-				:bindingData="gridName"
-				:detailList="detailReadPlcTagList"
-				@gridEditingFinish="gridEditingFinish"
-			/>
+		<div ref="formParent" >
+			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
+				:detailList="detailReadPlcTagList" @gridEditingFinish="gridEditingFinish" />
 		</div>
 	</div>
 </template>
@@ -57,7 +46,78 @@ export default {
 			loadGrid: false,
 			gridName: 'rowReadPlcTagRelGrid',
 			detailReadPlcTagList: myReadPlcTagDetail,
+			tagRelTabData: {
+				"rowReadPlcTagRelGrid": {
+					data:
+						[
 
+							{
+								"tagNm": "TAG_001",
+								"ercId": "전기",
+								"distRt": 10,
+								"reprTagFg": "1",
+								"useFg": "Y",
+								"rmrk": "기본 설정",
+								"tagId": "TAG_001"
+							},
+							{
+								"tagNm": "TAG_002",
+								"ercId": "가스",
+								"distRt": 15,
+								"reprTagFg": "0",
+								"useFg": "Y",
+								"rmrk": "",
+								"tagId": "TAG_002"
+							},
+							{
+								"tagNm": "TAG_003",
+								"ercId": "수도",
+								"distRt": 8,
+								"reprTagFg": "0",
+								"useFg": "N",
+								"rmrk": "테스트용",
+								"tagId": "TAG_003"
+							},
+
+						]
+					,
+					column: [
+						{ header: 'TAG 명', name: 'tagNm', align: 'left' },
+						{
+							header: '에너지원',
+							name: 'ercId',
+							align: 'center',
+							width: 100,
+						},
+						{
+							header: '분배율(1~100)',
+							name: 'distRt',
+							align: 'right',
+							width: 100,
+						},
+						{
+							header: '대표 TAG 여부',
+							name: 'reprTagFg',
+							align: 'center',
+							width: 100,
+							formatter({ value }) {
+								return value == '1' ? '예' : '아니오';
+							},
+						},
+						{
+							header: '사용여부',
+							name: 'useFg',
+							align: 'center',
+							width: 100,
+
+						},
+						{ header: '비고', name: 'rmrk', align: 'left', width: 100 },
+						{ header: 'TAG ID', name: 'tagId', align: 'center', hidden: true },
+
+					]
+
+				}
+			}
 		};
 	},
 	computed: {
@@ -110,9 +170,9 @@ export default {
 				// bodyHeight: gridHeight,
 				// minBodyHeight: gridHeight,
 				header: {
-					height: 37,
+					height: 28,
 				},
-				rowHeight: 37,
+				rowHeight: 29,
 				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',

components/pages/ems/TagInfo/TagAddInfoTab.vue

@@ -1,7 +1,7 @@
 <template>
 		<v-card class="pb-5">
 		<v-card-title class="d-flex justify-space-between align-end">
-			<span style="color:#000000A6" class="tit custom-title-4-new">TAG 추가 정보</span>
+			<span class="tit ft-size_20 ft-weight_600">TAG 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -107,7 +107,8 @@ export default {
 				header: {
 					height: 38,
 				},
-
+				rowHeight: 22,
+				minRowHeight: 22,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -268,7 +269,7 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(

layouts/default.vue

@@ -112,6 +112,13 @@
                     }" />
                   <!-- <router-view :key="$route.fullPath"/> -->
                 </div>
+                <!--
+                  v-model="treeValue"
+                  return-object
+                  @input="treeModel"
+                  @update:active="clkTab"
+        
+                   -->
                 <AdminMenu :miniVariant="miniVariant" :userNm="this.userInfo.userNm" :comId="this.userInfo.comId" v-if="false" />
 
                 <component ref="changePswdPop" :is="'ChangePswdPop'" v-show="false" :comId="this.userInfo.comId" />
@@ -141,6 +148,14 @@
                     </button>
                   </template>
                 </v-treeview>
+                <!-- <template #append>
+                  <p
+                    class="text-caption"
+                    :style="{ letterSpacing: '-0.2px !important' }"
+                  >
+                    &copy; 2022. SK C&C all rights reserved.
+                  </p>
+                </template> -->
               </v-navigation-drawer>
             </div>
 
@@ -307,6 +322,19 @@
           </div>
         </div>
       </v-main>
+      <!-- <v-footer
+        :absolute="!fixed"
+        app
+        :class="
+          drawer
+            ? miniVariant
+              ? 'drawerFooter miniFooter'
+              : 'drawerFooter'
+            : 'full-size'
+        "
+      >
+        <span>&copy; 2022. SK C&C all rights reserved.</span>
+      </v-footer> -->
     </fullscreen>
   </v-app>
 </template>

layouts/default_bak.vue

@@ -0,0 +1,809 @@
+<template>
+	<v-app :class="`${isDarkMode ? 'dark-mode' : 'light-mode'}`">
+		<!-- <v-app :class="'light-mode'"> -->
+		<fullscreen :fullscreen.sync="fullscreen">
+			<v-navigation-drawer
+				ref="navigationdrawer"
+				:value="drawer"
+				:mini-variant="miniVariant"
+				:clipped="clipped"
+				:absolute="true"
+				mini-variant-width="60"
+				fixed
+				app
+			>
+				<div class="d-flex align-center justify-space-between py-4 px-3">
+					<router-link class="home" :to="myHome.root">
+						<div class="lnb-logo">
+							<img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
+							<img v-else src="@/assets/images/logo_lm.png" />
+						</div>
+						<!--            <div class="lnb-logo">FEMS</div>-->
+					</router-link>
+					<v-app-bar-nav-icon
+						ref="appbarnavicon"
+						id="appbarnavicon"
+						@click.stop="miniVariant = !miniVariant"
+						@click="updateTreeview"
+						:style="{
+							backgroundColor: 'transparent',
+							color: isDarkMode ? '#fff' : '#111',
+						}"
+					/>
+					<!-- <router-view :key="$route.fullPath"/> -->
+				</div>
+				<!--
+          v-model="treeValue"
+          return-object
+          @input="treeModel"
+          @update:active="clkTab"
+
+           -->
+				<AdminMenu
+					:miniVariant="miniVariant"
+					:userNm="this.userInfo.userNm"
+					:comId="this.userInfo.comId"
+				/>
+				<component
+					ref="changePswdPop"
+					:is="'ChangePswdPop'"
+					v-show="false"
+					:comId="this.userInfo.comId"
+				/>
+				<v-treeview
+					ref="treeview"
+					:active.sync="activeTree"
+					active-class="v-treeview-node--active"
+					:items="treevieItems"
+					activatable
+					hoverable
+					color="#3896ff"
+					open-on-click
+					@update:open="openNode"
+				>
+					<template slot="label" slot-scope="{ item }">
+						<button
+							:class="{ 'justify-center': miniVariant }"
+							@mouseover="doMouseOver"
+						>
+							<v-icon
+								v-if="item.lvl === 1 && menuIconKeys.includes(item.menuId)"
+								v-text="menuIconById[item.menuId]"
+								:class="{ 'mr-2': !miniVariant }"
+								size="20"
+							></v-icon>
+							<v-icon
+								v-else-if="
+									item.lvl === 1 && !menuIconKeys.includes(item.menuId)
+								"
+								:class="{ 'mr-2': !miniVariant }"
+								size="20"
+								>mdi-package-variant-closed</v-icon
+							>
+							<v-icon
+								v-else-if="item.lvl === 2"
+								:class="{ 'mr-2': !miniVariant }"
+								size="10"
+							>
+								mdi-checkbox-blank
+							</v-icon>
+							<v-icon
+								v-else-if="
+									item.lvl >= 3 && item.childeVo.length === 0 && item.url
+								"
+								:class="miniVariant === false ? 'mr-2' : ''"
+								size="9"
+							>
+								$depth3rdBulletDark
+							</v-icon>
+							<span v-if="item.url"
+								>{{ item.menuNm }}
+								<!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
+                <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> -->
+							</span>
+							<span v-else-if="!item.url">{{ item.menuNm }}</span>
+							<v-icon
+								v-if="item.lvl >= 1 && item.childeVo.length > 0 && !item.url"
+							>
+								mdi-chevron-down
+							</v-icon>
+						</button>
+					</template>
+				</v-treeview>
+				<!-- <template #append>
+					<p
+						class="text-caption"
+						:style="{ letterSpacing: '-0.2px !important' }"
+					>
+						&copy; 2022. SK C&C all rights reserved.
+					</p>
+				</template> -->
+			</v-navigation-drawer>
+			<v-main>
+				<v-container fluid>
+					<router-tab
+						ref="routerTab"
+						:tabs="treevieItems"
+						:keep-last-tab="false"
+						:contextmenu="false"
+					>
+						<template slot-scope="{ title, closable, to }">
+							<span>{{ title }}</span>
+							<v-icon
+								size="18"
+								class="ml-2"
+								v-if="closable"
+								@click.stop="onCloseTab(to)"
+								>mdi-close-circle</v-icon
+							>
+						</template>
+						<template #end>
+							<!--<ThemeSwitch />-->
+							<v-menu offset-y>
+								<template v-slot:activator="{ on, attrs }">
+									<v-btn
+										:ripple="false"
+										tile
+										class="btn-close"
+										v-bind="attrs"
+										v-on="on"
+									>
+										<span class="body-2">닫기</span>
+										<v-icon size="20">mdi-chevron-down</v-icon>
+									</v-btn>
+								</template>
+								<v-list
+									class="py-2 btn-close-menu-list"
+									:style="{
+										backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
+									}"
+								>
+									<v-list-item class="px-2">
+										<v-list-item-title @click="delAllTabsData()" class="body-2"
+											>전체 닫기</v-list-item-title
+										>
+									</v-list-item>
+									<v-list-item class="px-2">
+										<v-list-item-title
+											@click="deleteSblingsTab()"
+											class="body-2"
+											>나머지 닫기</v-list-item-title
+										>
+									</v-list-item>
+								</v-list>
+							</v-menu>
+							<v-menu offset-y>
+								<template v-slot:activator="{ on, attrs }">
+									<v-btn
+										:ripple="false"
+										tile
+										class="btn-close"
+										v-bind="attrs"
+										v-on="on"
+										style="width:100px;"
+									>
+										<span class="body-2">즐겨찾기</span>
+										<v-icon size="20">mdi-chevron-down</v-icon>
+									</v-btn>
+								</template>
+								<v-list
+									v-if="myMenuList.length > 0"
+									class="py-2 btn-close-menu-list"
+									:style="{
+										backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
+									}"
+								>
+									<v-list-item
+										v-for="item in myMenuList"
+										:key="item.menuId"
+										class="px-2"
+										style="cursor:pointer;"
+									>
+										<v-list-item-title
+											@click="moveToMyMenu(item.url, item.menuId, item.prgmId)"
+											class="body-2"
+											>{{ item.menuNm }}</v-list-item-title
+										>
+									</v-list-item>
+								</v-list>
+							</v-menu>
+							<v-btn
+								icon
+								tile
+								:ripple="false"
+								@click="removeBookMark()"
+								v-if="bookmarkBtn == 1"
+							>
+								<span
+									class="material-icons"
+									style="font-size: 17px; vertical-align: middle;"
+									>star</span
+								>
+							</v-btn>
+							<v-btn
+								icon
+								tile
+								:ripple="false"
+								@click="addBookMark()"
+								v-if="bookmarkBtn == 0"
+							>
+								<span
+									class="material-icons"
+									style="font-size: 17px; vertical-align: middle;"
+									>star_border</span
+								>
+							</v-btn>
+							<v-btn
+								id="refresh"
+								icon
+								tile
+								:ripple="false"
+								@click="refreshTab()"
+							>
+								<v-icon>mdi-refresh</v-icon>
+							</v-btn>
+							<v-btn icon tile :ripple="false" @click="setDrawer()">
+								<v-icon>mdi-crop-free</v-icon>
+							</v-btn>
+							<!-- <v-btn icon tile :ripple="false" @click="toggle()">
+								<v-icon v-if="!fullscreen">mdi-arrow-expand-all</v-icon>
+								<v-icon v-else>mdi-arrow-collapse-all</v-icon>
+							</v-btn> -->
+						</template>
+					</router-tab>
+				</v-container>
+				<div v-if="loadingStackCnt > 0" class="loading-container">
+					<div class="loading">
+						<Fade-loader />
+					</div>
+				</div>
+			</v-main>
+			<!-- <v-footer
+        :absolute="!fixed"
+        app
+        :class="
+          drawer
+            ? miniVariant
+              ? 'drawerFooter miniFooter'
+              : 'drawerFooter'
+            : 'full-size'
+        "
+      >
+        <span>&copy; 2022. SK C&C all rights reserved.</span>
+      </v-footer> -->
+		</fullscreen>
+	</v-app>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from 'vuex'; // , mapActions
+import ThemeSwitch from '@/components/common/ThemeSwitch';
+import AdminMenu from '@/components/common/AdminMenu';
+import FadeLoader from 'vue-spinner/src/FadeLoader.vue';
+import ChangePswdPop from '~/components/common/modal/ChangePswdPop';
+export default {
+	components: {
+		ThemeSwitch,
+		AdminMenu,
+		FadeLoader,
+		ChangePswdPop,
+	},
+	data() {
+		return {
+			fullscreen: false,
+			activeTree: [],
+			clipped: false,
+			fixed: false,
+			miniVariant: false,
+			// activeTabIdx: "",
+			routerTabInstance: null,
+			// programIdObj: null,
+			myPrgmId: null,
+			treeValue: [],
+			menuIconById: {
+				// MNU0003: 'mdi-chart-line',
+				// MNU0004: 'mdi-alarm-light',
+				// MNU0005: 'mdi-pencil-box-outline',
+				// MNU0006: 'mdi-cog-outline',
+				MNU0002: 'mdi-monitor',
+				MNU0091: 'mdi-chart-box',
+				MNU0102: 'mdi-human-male-board-poll',
+				MNU0103: 'mdi-file-chart-outline',
+				MNU0104: 'mdi-chart-sankey-variant',
+				MNU0106: 'mdi-database-edit-outline',
+				MNU0105: 'mdi-chart-bell-curve',
+				MNU0006: 'mdi-bulletin-board',
+				MNU0007: 'mdi-cog',
+				menu2: 'mdi-monitor',
+				menu3: 'mdi-chart-box',
+				menu4: 'mdi-human-male-board-poll',
+				menu5: 'mdi-file-chart-outline',
+				menu6: 'mdi-chart-sankey-variant',
+				menu7: 'mdi-database-edit-outline',
+				menu8: 'mdi-bulletin-board',
+			},
+			isLoading: false,
+			loadingStackCnt: 0,
+			bookmarkBtn: 0,
+			myMenuList: [],
+			prgmIdList: [],
+			initPageData: {},
+			obj: {},
+			newObj: {},
+		};
+	},
+	computed: {
+		...mapState({
+			myHome: 'myHome',
+			myHomeTabItems: 'myHomeTabItems',
+			indexRoot: 'indexRoot',
+			treevieItems: 'treevieItems',
+			menuData: 'menuData',
+			menuLink: state => state.modules.menu,
+			activeMenuId: state => state.activeMenuInfo.menuId,
+			isDarkMode: 'isDarkMode',
+			drawer: state => state.drawer,
+			userInfo: state => state.userInfo,
+			pageData: 'pageData',
+		}),
+		activeTabs() {
+			if (this.routerTabInstance) {
+				return this.routerTabInstance.activeTab;
+			} else {
+				return this.myHome.root;
+			}
+		},
+		menuIconKeys() {
+			return Object.keys(this.menuIconById);
+		},
+	},
+	watch: {
+		activeTabs: {
+			// 탭 클릭시 좌측 treeview 싱크 맞추가
+			deep: true,
+			handler(value) {
+				if (value) {
+					const prgmId = value.prgmId;
+					let thisPrgmId = this.$route.query.prgmId;
+					var tmp = 0;
+					for (var i = 0; i < this.myMenuList.length; i++) {
+						if (this.myMenuList[i].prgmId == thisPrgmId) {
+							tmp = 1;
+						}
+					}
+					this.bookmarkBtn = tmp;
+					//if (thisPrgmId && this.myPrgmId && this.myPrgmId != thisPrgmId) {
+					this.myPrgmId = prgmId;
+					this.activeTree.pop(); // 기존 황성화 트리 값 삭제
+					this.activeTree.push(thisPrgmId); // 인덱스가 아닐 경우 새로 넣어줌
+					// this.$set(this.activeTree, 0, prgmId); // treeview activetree 새로 셋팅 <= 위 pop() 과 push() 로 대체
+					//}
+				}
+			},
+		},
+		activeTree: {
+			deep: true,
+			handler(newVal, oldVal) {
+				var _this = this;
+				const nv = newVal[0];
+				const ov = oldVal[0];
+				if (nv !== ov) {
+					if (!nv) {
+						// 중복클릭 시 발생 상황 기존 값을 다시 넣어줌
+						this.activeTree.push(ov);
+					} else {
+						this.myPrgmId = nv;
+						if (this.menuData[nv].url) {
+							const menuUrl = this.menuData[nv].url;
+							const menuId = this.menuData[nv].menuId;
+
+							const isCommMenu = menuUrl.indexOf('comm/');
+							const isEmsMenu = menuUrl.indexOf('ems/');
+							const isCmmsMenu = menuUrl.indexOf('cmms/');
+
+							// console.log('activeTree...');
+
+							if (isCommMenu > -1 || isEmsMenu > -1 || isCmmsMenu > -1) {
+								// console.log('activeTree if stmt1');
+								// console.log('this.isLoading : ', this.isLoading);
+								// if(this.isLoading == true){
+								// 	console.log('if isLoading stmt1');
+								// 	return;
+								// }
+								this.$router.push({
+									path: `${this.menuData[nv].url}?prgmId=${nv}`,
+								});			
+								// this.$router.beforeEach((to, from, next) => {
+								// 	if(_this.isLoading == true){
+								// 		next(false);
+								// 	}
+								// 	if (!to.matched.length) {
+								// 		next(false);
+								// 	} else {
+								// 		next();
+								// 	}
+								// });
+								var tmp = 0;
+								for (var i = 0; i < this.myMenuList.length; i++) {
+									if (this.myMenuList[i].menuId == menuId) {
+										tmp = 1;
+									}
+								}
+								this.bookmarkBtn = tmp;
+							} else {
+								// console.log('activeTree if stmt2');
+								// console.log('this.isLoading : ', this.isLoading);
+								// if(this.isLoading == true){
+								// 	console.log('if isLoading stmt2');
+								// 	return;
+								// }
+								this.$refs.routerTab.openIframe(
+									encodeURI(
+										`http://localhost:9999${this.menuData[nv].url}?prgmId=${nv}`,
+									),
+									this.menuData[nv].menuNm,
+								);
+							}
+							this.$axios.get(`${this.menuData[nv].url}?$menuId=${menuId}`);
+						} else alert('지정된 페이지 경로가 없습니다.');
+					}
+				}
+			},
+		},
+		menuData: {
+			deep: true,
+			handler(newVal, oldVal) {},
+		},
+		pageData: {
+			deep: true,
+			handler(newVal, oldVal) {
+				localStorage.setItem('pageData', JSON.stringify(this.pageData));
+				//console.log("localPageData", this.pageData);
+			},
+		},
+		// menuLink: {
+		//   deep: true,
+		//   handler() {
+		//     let prgmIdList = Object.keys(this.menuData);
+		//     let initPageData = {};
+		//     prgmIdList.forEach(item => {
+		//       let newObj = {
+		//         [item] : {}
+		//       };
+		//       initPageData = Object.assign(initPageData, newObj)
+		//     });
+		//   }
+		// }
+	},
+	created() {},
+	beforeUnmount() {
+		//window.removeEventListener('beforeunload', this.unLoadEvent);
+	},
+	async mounted() {
+		//window.addEventListener('beforeunload', this.unLoadEvent);
+		const _this = this;
+		await this.getMenu({});
+		await this.initPageDataFunc();
+		await this.selectMyMenuFunc();
+
+		this.routerTabInstance = this.$refs.routerTab;
+		if (this.$route.fullPath == '/') {
+			this.routerTabInstance.reset();
+			this.$router.replace(this.myHome.root);
+		} else if (this.$route.fullPath != this.myHome.root) {
+			this.$refs.routerTab.items.unshift(this.myHomeTabItems);
+		} else {
+			this.refreshTab();
+		}
+
+		// this.$router.beforeEach((to, from, next) => {
+		// 	_this.isLoading = true;
+		// 	// console.log('$router.beforeEach...');
+		// 	// console.log('_this.isLoading[beforeEach] : ', _this.isLoading);
+		// 	// console.log('_this.loadingStackCnt : ', _this.loadingStackCnt);
+		// 	if(_this.loadingStackCnt > 0 && _this.isLoading){
+		// 		next(false);
+		// 		// return;
+		// 	}else if (!to.matched.length){
+		// 		next(false);
+		// 	}else{
+		// 		next();
+		// 	}
+		// });
+
+		// this.$router.afterEach((to, from, failure) => {
+		// });
+
+		// 요청 인터셉터
+		this.$axios.interceptors.request.use(
+			function(config) {
+				//alert(1)
+				_this.isLoading = true;
+				if(config.url.search('Page')<0){
+					// _this.loadingStackCnt++;
+				}
+				return config;
+			},
+			function(error) {
+				// 에라 나면 로딩 끄기
+				//alert(2)
+				_this.isLoading = false;
+				// if(error.url.search('Page')<0){
+				// 	_this.loadingStackCnt--;
+				// }
+				return Promise.reject(error);
+			},
+		);
+
+		// 응답 인터셉터
+		this.$axios.interceptors.response.use(
+			function(response) {
+				_this.isLoading = false;
+				if(response.config.url.search('Page')<0){
+					_this.loadingStackCnt--;
+				}
+				//alert(3)
+				return response;
+			},
+			function(error) {
+				// 응답 에러 시에도 로딩 끄기
+				//alert(4 )
+				_this.isLoading = false;
+				// if(error.url.search('Page')<0){
+				// 	_this.loadingStackCnt--;
+				// }
+				return Promise.reject(error);
+			},
+		);
+	},
+	methods: {
+		...mapMutations({
+			setDrawer: 'setDrawer', // 사이드메뉴 접고 펼치기
+			setPageDataInit: 'setPageDataInit',
+		}),
+		...mapActions({
+			getMenu: 'modules/menu/getMenu', // 트리메뉴 가져오기
+			chkOpenTabList: 'chkOpenTabList', // 트리메뉴 클릭 시 해당 pprgmId push
+			postUpdateApi: 'modules/list/postUpdateApi',
+			postApiReturn: 'modules/list/postApiReturn',
+		}),
+		// // tabActive(id) {},
+		// clkTab(itemArr) {
+		//   console.log(itemArr[0]);
+		//   if (!itemArr[0].to) return;
+		//   this.$router.push({
+		//     path: itemArr[0].to
+		//   });
+		// },
+		toggle() {
+			this.fullscreen = !this.fullscreen;
+		},
+		refreshTab() {
+			//  console.log("현재 탭 새로고침");
+			//this.routerTabInstance.refresh();
+			this.$nuxt.refresh();
+			this.routerTabInstance.refresh();
+		},
+		delAllTabsData() {
+			// console.log("탭 전체 닫기");
+			// for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
+			//   const diffTo = this.routerTabInstance.items[i].to;
+
+			//   if (diffTo != this.myHome.root) {
+			//     this.routerTabInstance.items.splice(i, 1);
+			//   }
+			// }
+			//if(this.$router.currentRoute.fullPath != this.myHome.root){
+			if (this.routerTabInstance.items.length > 0) {
+				this.routerTabInstance.reset();
+			}
+
+			this.$router.replace(this.myHome.root);
+			//}
+		},
+		deleteSblingsTab() {
+			// console.log("탭 나머지 닫기");
+			// for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
+			//   const activeTo = this.routerTabInstance.activeTab.to;
+			//   const diffTo = this.routerTabInstance.items[i].to;
+
+			//   if (activeTo != diffTo && diffTo != this.myHome.root) {
+			//     this.routerTabInstance.items.splice(i, 1);
+			//   }
+			// }
+			if (this.routerTabInstance.items.length > 1) {
+				for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
+					const activeTo = this.routerTabInstance.activeTab.to;
+					const diffTo = this.routerTabInstance.items[i].to;
+
+					if (activeTo != diffTo && diffTo != this.myHome.root) {
+						this.routerTabInstance.close(diffTo);
+					}
+				}
+			}
+		},
+		tabScrollMove(dir) {
+			const scrollTab = this.routerTabInstance.$refs.scroll;
+			const scrollWidth =
+				scrollTab.scrollData.scrollWidth - scrollTab.scrollData.clientWidth;
+			const scrollLeft = scrollTab.scrollData.scrollLeft;
+
+			const xAxis = this.calcScroll(scrollLeft, scrollWidth, dir);
+			scrollTab.scrollTo(xAxis, 0);
+		},
+		updateTreeview() {
+			if (this.miniVariant) {
+				// sidebar 접혀져 있을 때
+				this.$refs.treeview.updateAll();
+			} else {
+				// sidebar 펼쳐져 있을 때
+			}
+		},
+		// 열려있는 노드의 key 값 리턴(선택된 값이 아님)
+		openNode(node) {
+			//console.log('onOpen');
+			if (this.miniVariant) {
+				// sidebar 접혀져 있을 때
+				if (event.currentTarget.id !== this.$refs.appbarnavicon.$refs.link.id) {
+					this.$refs.appbarnavicon.click(event);
+				}
+			} else {
+				// sidebar 펼쳐져 있을 때
+			}
+		},
+		doMouseOver: function(event) {
+			//console.log(event);
+		},
+		calcScroll(sl, sw, dir) {
+			const deScrW = 60;
+			let returnSl = 0;
+			switch (dir) {
+				case 'prev':
+					returnSl = sl - deScrW <= 0 ? 0 : sl - deScrW;
+					break;
+				case 'next':
+					returnSl = sl + deScrW >= sw ? sw : sl + deScrW;
+					break;
+				default:
+					break;
+			}
+			return returnSl;
+		},
+		initPageDataFunc() {
+			const _this = this;
+			this.prgmIdList = Object.keys(this.menuData);
+			this.initPageData = {};
+			this.prgmIdList.forEach(item => {
+				_this.obj = {};
+				if (_this.pageData[item]) {
+					_this.obj = _this.pageData[item];
+				}
+				_this.newObj = {};
+				_this.newObj = {
+					[item]: _this.obj,
+				};
+				_this.initPageData = Object.assign(
+					{},
+					_this.initPageData,
+					_this.newObj,
+				);
+			});
+			localStorage.setItem('pageData', JSON.stringify(this.initPageData));
+			this.setPageDataInit(this.initPageData);
+		},
+		onCloseTab(to) {
+			const findIndex = this.$tabs.items.findIndex(v => v.to === to);
+			const { to: next } = this.$tabs.items[findIndex - 1];
+			this.$tabs.close(to, null);
+			if (this.$router.currentRoute.fullPath != next) {
+				this.$router.replace(next);
+			}
+		},
+		async addBookMark() {
+			var params = {
+				menuId: this.activeMenuId,
+			};
+			await this.postUpdateApi({
+				apiKey: 'saveBookmark',
+				sendParam: {
+					datas: {
+						bookmarkDt: [params],
+					},
+					params: {},
+				},
+			});
+
+			const res = await this.postApiReturn({
+				apiKey: 'selectMyMenu',
+				resKey: 'menuData',
+				sendParam: {},
+			});
+
+			this.myMenuList = res;
+			this.bookmarkBtn = 1;
+		},
+		async removeBookMark() {
+			var params = {
+				menuId: this.activeMenuId,
+			};
+			await this.postUpdateApi({
+				apiKey: 'deleteBookmark',
+				sendParam: {
+					datas: {
+						bookmarkDt: [params],
+					},
+					params: {},
+				},
+			});
+
+			const res = await this.postApiReturn({
+				apiKey: 'selectMyMenu',
+				resKey: 'menuData',
+				sendParam: {},
+			});
+			this.myMenuList = res;
+			this.bookmarkBtn = 0;
+		},
+		moveToMyMenu(url, menuId, prgmId) {
+			// console.log('moveToMyMenu...');
+			// if(this.isLoading == true){
+			// 	console.log('if isLoading stmt3');
+			// 	return;
+			// }
+			this.$router.push({
+				path: url + '?prgmId=' + prgmId,
+			});
+		},
+		async selectMyMenuFunc() {
+			const headers = {
+				headers: {
+					'X-Fems-MenuId': 'MNU0001',
+				},
+			};
+			const params = { params: {} };
+			const res = await this.$axios.post(
+				'/comm/base/MenuMngCtr/selectMyMenu',
+				params,
+				headers,
+			);
+
+			this.myMenuList = res.data.dataset.menuData;
+		},
+		// unLoadEvent: function (event) {
+		//   //if (this.isLeaveSite) return;
+		//   //this.delAllTabsData();
+		//   this.$router.push({
+		//    path: this.myHome.root
+		//   });
+		//   console.log("event", event)
+		//   event.preventDefault();
+		//   event.returnValue = '';
+
+		// },
+		// treeModel(obj) {
+		//   console.log(">>> treeModel::obj = ", obj);
+		//   this.treeValue[0] = obj;
+		//   this.$refs.treeview.updateAll();
+		//   // console.log(this.$refs.treeview);
+		//   // this.$refs.treeview.activeCache = obj.id;
+		// }
+	},
+};
+</script>
+<style lang="scss" scoped>
+.loading {
+	z-index: 99;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 100%;
+	height: 100%;
+	transform: translate(-50%, -50%);
+	background-color: rgba(0, 0, 0, 0.4);
+	//box-shadow: rgba(68, 67, 67, 0.9) 0 0 0 9999px;
+}
+.v-spinner {
+	top: 50%;
+	left: 50%;
+}
+</style>

layouts/default_bk.vue

@@ -0,0 +1,928 @@
+<template>
+  <v-app :class="`${isDarkMode ? 'dark-mode' : 'light-mode'}`">
+    <!-- <v-app :class="'light-mode'"> -->
+    <fullscreen :fullscreen.sync="fullscreen">
+      <v-navigation-drawer
+        ref="navigationdrawer"
+        :value="drawer"
+        :mini-variant="miniVariant"
+        :clipped="clipped"
+        :absolute="true"
+        mini-variant-width="60"
+        fixed
+        app
+      >
+        <div class="d-flex align-center justify-space-between py-4 px-3">
+          <router-link class="home" :to="myHome.root">
+            <div class="lnb-logo">
+              <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
+              <img v-else src="@/assets/images/logo_lm.png" />
+            </div>
+            <!--            <div class="lnb-logo">FEMS</div>-->
+          </router-link>
+          <v-app-bar-nav-icon
+            ref="appbarnavicon"
+            id="appbarnavicon"
+            @click.stop="miniVariant = !miniVariant"
+            @click="updateTreeview"
+            :style="{
+              backgroundColor: 'transparent',
+              color: isDarkMode ? '#fff' : '#111',
+            }"
+          />
+          <!-- <router-view :key="$route.fullPath"/> -->
+        </div>
+        <!--
+          v-model="treeValue"
+          return-object
+          @input="treeModel"
+          @update:active="clkTab"
+
+           -->
+        <AdminMenu
+          :miniVariant="miniVariant"
+          :userNm="this.userInfo.userNm"
+          :comId="this.userInfo.comId"
+        />
+        <component
+          ref="changePswdPop"
+          :is="'ChangePswdPop'"
+          v-show="false"
+          :comId="this.userInfo.comId"
+        />
+        <v-treeview
+          ref="treeview"
+          :active.sync="activeTree"
+          active-class="v-treeview-node--active"
+          :items="treevieItems"
+          activatable
+          hoverable
+          color="#3896ff"
+          open-on-click
+          @update:open="openNode"
+        >
+          <template slot="label" slot-scope="{ item }">
+            <button :class="{ 'justify-center': miniVariant }" @mouseover="doMouseOver">
+              <v-icon
+                v-if="item.lvl === 1 && menuIconKeys.includes(item.menuId)"
+                v-text="menuIconById[item.menuId]"
+                :class="{ 'mr-2': !miniVariant }"
+                size="20"
+              ></v-icon>
+              <v-icon
+                v-else-if="item.lvl === 1 && !menuIconKeys.includes(item.menuId)"
+                :class="{ 'mr-2': !miniVariant }"
+                size="20"
+                >mdi-package-variant-closed</v-icon
+              >
+              <v-icon
+                v-else-if="item.lvl === 2"
+                :class="{ 'mr-2': !miniVariant }"
+                size="10"
+              >
+                mdi-checkbox-blank
+              </v-icon>
+              <v-icon
+                v-else-if="item.lvl >= 3 && item.childeVo.length === 0 && item.url"
+                :class="miniVariant === false ? 'mr-2' : ''"
+                size="9"
+              >
+                $depth3rdBulletDark
+              </v-icon>
+              <span v-if="item.url"
+                >{{ item.menuNm }}
+                <!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
+                <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> -->
+              </span>
+              <span v-else-if="!item.url">{{ item.menuNm }}</span>
+              <v-icon v-if="item.lvl >= 1 && item.childeVo.length > 0 && !item.url">
+                mdi-chevron-down
+              </v-icon>
+            </button>
+          </template>
+        </v-treeview>
+        <!-- <template #append>
+					<p
+						class="text-caption"
+						:style="{ letterSpacing: '-0.2px !important' }"
+					>
+						&copy; 2022. SK C&C all rights reserved.
+					</p>
+				</template> -->
+      </v-navigation-drawer>
+      <v-main>
+        <v-container fluid>
+          <router-tab
+            ref="routerTab"
+            :tabs="treevieItems"
+            :keep-last-tab="false"
+            :contextmenu="false"
+          >
+            <template slot-scope="{ title, closable, to }">
+              <span>{{ title }}</span>
+              <v-icon size="18" class="ml-2" v-if="closable" @click.stop="onCloseTab(to)"
+                >mdi-close-circle</v-icon
+              >
+            </template>
+            <template #end>
+              <ThemeSwitch style="margin-right: 20px" />
+              <v-menu offset-y>
+                <template v-slot:activator="{ on, attrs }">
+                  <!-- <v-btn :ripple="false" tile class="btn-close" v-bind="attrs" v-on="on">
+                    <span class="body-2">닫기</span>
+                    <v-icon size="20">mdi-chevron-down</v-icon>
+                  </v-btn> -->
+                  <a-button style="width: 80px; height: 36px" class="btn-close">
+                    <span class="body-2">닫기</span>
+                    <v-icon size="20">mdi-chevron-down</v-icon></a-button
+                  >
+                </template>
+                <v-list
+                  class="py-2 btn-close-menu-list"
+                  :style="{
+                    backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
+                  }"
+                >
+                  <v-list-item class="px-2">
+                    <v-list-item-title @click="delAllTabsData()" class="body-2"
+                      >전체 닫기</v-list-item-title
+                    >
+                  </v-list-item>
+                  <v-list-item class="px-2">
+                    <v-list-item-title @click="deleteSblingsTab()" class="body-2"
+                      >나머지 닫기</v-list-item-title
+                    >
+                  </v-list-item>
+                </v-list>
+              </v-menu>
+              <v-menu offset-y>
+                <template v-slot:activator="{ on, attrs }">
+                  <!-- <v-btn
+                    :ripple="false"
+                    tile
+                    class="btn-close"
+                    v-bind="attrs"
+                    v-on="on"
+                    style="width: 100px"
+                  >
+                    <span class="body-2">즐겨찾기</span>
+                    <v-icon size="20">mdi-chevron-down</v-icon>
+                  </v-btn> -->
+                  <a-button style="width: 100px; height: 36px" class="btn-close">
+                    <span class="body-2">즐겨찾기</span>
+                    <v-icon size="20">mdi-chevron-down</v-icon></a-button
+                  >
+                </template>
+                <v-list
+                  v-if="myMenuList.length > 0"
+                  class="py-2 btn-close-menu-list"
+                  :style="{
+                    backgroundColor: isDarkMode ? '#144985' : '#3f4d7d',
+                  }"
+                >
+                  <v-list-item
+                    v-for="item in myMenuList"
+                    :key="item.menuId"
+                    class="px-2"
+                    style="cursor: pointer"
+                  >
+                    <v-list-item-title
+                      @click="moveToMyMenu(item.url, item.menuId, item.prgmId)"
+                      class="body-2"
+                      >{{ item.menuNm }}</v-list-item-title
+                    >
+                  </v-list-item>
+                </v-list>
+              </v-menu>
+              <!-- <v-btn
+                icon
+                tile
+                :ripple="false"
+                @click="removeBookMark()"
+                v-if="bookmarkBtn == 1"
+              >
+                <span
+                  class="material-icons"
+                  style="font-size: 17px; vertical-align: middle"
+                  >star</span
+                >
+              </v-btn> -->
+
+              <a-button
+                id="refresh"
+                :style="{
+                  padding: '0',
+                  width: '36px',
+                  height: '36px',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  borderRadius: '4px', // square corners
+                }"
+                type="text"
+                @click="removeBookMark"
+                v-if="bookmarkBtn == 1"
+              >
+                <span
+                  class="material-icons"
+                  style="font-size: 17px; vertical-align: middle"
+                  >star</span
+                >
+              </a-button>
+
+              <!-- <v-btn
+                icon
+                tile
+                :ripple="false"
+                @click="addBookMark()"
+                v-if="bookmarkBtn == 0"
+              >
+                <span
+                  class="material-icons"
+                  style="font-size: 17px; vertical-align: middle"
+                  >star_border</span
+                >
+              </v-btn> -->
+
+              <a-button
+                id="refresh"
+                :style="{
+                  padding: '0',
+                  width: '36px',
+                  height: '36px',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  borderRadius: '4px', // square corners
+                }"
+                type="text"
+                @click="addBookMark"
+                v-if="bookmarkBtn == 0"
+              >
+                <span
+                  class="material-icons"
+                  style="font-size: 17px; vertical-align: middle"
+                  >star_border</span
+                >
+              </a-button>
+
+              <v-btn
+                style="
+                  background-color: white;
+                  color: #fff;
+                  border: 0.2px solid rgb(217, 217, 217);
+                "
+                id="refresh"
+                icon
+                tile
+                :ripple="false"
+                @click="refreshTab()"
+              >
+                <v-icon style="color: rgba(0, 0, 0, 0.54)">mdi-refresh</v-icon>
+              </v-btn>
+
+              <!-- <a-button
+                id="refresh"
+                :style="{
+                  padding: '0',
+                  width: '36px',
+                  height: '36px',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  borderRadius: '4px', // square corners
+                }"
+                type="text"
+                @click="refreshTab"
+              >
+                <v-icon >mdi-refresh</v-icon>
+              </a-button> -->
+
+              <!-- <a-button id="refresh" type="text" @click="setDrawer" class="icon-button">
+                    <i class="mdi mdi-crop-free" style="font-size: 20px"></i>  
+              </a-button>
+               
+              <a-button type="text" @click="setDrawer" class="icon-button">
+                    <i class="mdi mdi-crop-free" style="font-size: 20px"></i>  
+              </a-button> -->
+
+              <!-- <a-button
+                :style="{
+                  padding: '0',
+                  width: '36px',
+                  height: '36px',
+                  display: 'flex',
+                  alignItems: 'center',
+                  justifyContent: 'center',
+                  borderRadius: '4px', // square corners
+                }"
+                type="text"
+                @click="toggle"
+              >
+                <v-icon v-if="!fullscreen">mdi-arrow-expand-all</v-icon>  
+                <v-icon v-else>mdi-arrow-collapse-all</v-icon>
+              </a-button> -->
+
+              <v-btn
+                style="
+                  background-color: white;
+                  color: #fff;
+                  border: 0.2px solid rgb(217, 217, 217);
+                "
+                icon
+                tile
+                :ripple="false"
+                @click="toggle()"
+              >
+                <v-icon style="color: rgba(0, 0, 0, 0.54)" v-if="!fullscreen"
+                  >mdi-arrow-expand-all</v-icon
+                >
+                <v-icon style="color: rgba(0, 0, 0, 0.54)" v-else
+                  >mdi-arrow-collapse-all</v-icon
+                >
+              </v-btn>
+            </template>
+          </router-tab>
+        </v-container>
+        <div v-if="loadingStackCnt > 0" class="loading-container">
+          <div class="loading">
+            <Fade-loader />
+          </div>
+        </div>
+      </v-main>
+      <!-- <v-footer
+        :absolute="!fixed"
+        app
+        :class="
+          drawer
+            ? miniVariant
+              ? 'drawerFooter miniFooter'
+              : 'drawerFooter'
+            : 'full-size'
+        "
+      >
+        <span>&copy; 2022. SK C&C all rights reserved.</span>
+      </v-footer> -->
+    </fullscreen>
+  </v-app>
+</template>
+
+<script>
+import { mapState, mapActions, mapMutations } from "vuex"; // , mapActions
+import ThemeSwitch from "@/components/common/ThemeSwitch";
+import AdminMenu from "@/components/common/AdminMenu";
+import FadeLoader from "vue-spinner/src/FadeLoader.vue";
+import ChangePswdPop from "~/components/common/modal/ChangePswdPop";
+export default {
+  components: {
+    ThemeSwitch,
+    AdminMenu,
+    FadeLoader,
+    ChangePswdPop,
+  },
+  data() {
+    return {
+      fullscreen: false,
+      activeTree: [],
+      clipped: false,
+      fixed: false,
+      miniVariant: false,
+      // activeTabIdx: "",
+      routerTabInstance: null,
+      // programIdObj: null,
+      myPrgmId: null,
+      treeValue: [],
+      menuIconById: {
+        // MNU0003: 'mdi-chart-line',
+        // MNU0004: 'mdi-alarm-light',
+        // MNU0005: 'mdi-pencil-box-outline',
+        // MNU0006: 'mdi-cog-outline',
+        MNU0002: "mdi-monitor",
+        MNU0091: "mdi-chart-box",
+        MNU0102: "mdi-human-male-board-poll",
+        MNU0103: "mdi-file-chart-outline",
+        MNU0104: "mdi-chart-sankey-variant",
+        MNU0106: "mdi-database-edit-outline",
+        MNU0105: "mdi-chart-bell-curve",
+        MNU0006: "mdi-bulletin-board",
+        MNU0007: "mdi-cog",
+      },
+      isLoading: false,
+      loadingStackCnt: 0,
+      bookmarkBtn: 0,
+      myMenuList: [],
+      prgmIdList: [],
+      initPageData: {},
+      obj: {},
+      newObj: {},
+    };
+  },
+  computed: {
+    ...mapState({
+      myHome: "myHome",
+      myHomeTabItems: "myHomeTabItems",
+      indexRoot: "indexRoot",
+      treevieItems: "treevieItems",
+      menuData: "menuData",
+      menuLink: (state) => state.modules.menu,
+      activeMenuId: (state) => state.activeMenuInfo.menuId,
+      isDarkMode: "isDarkMode",
+      drawer: (state) => state.drawer,
+      userInfo: (state) => state.userInfo,
+      pageData: "pageData",
+    }),
+    activeTabs() {
+      if (this.routerTabInstance) {
+        return this.routerTabInstance.activeTab;
+      } else {
+        return this.myHome.root;
+      }
+    },
+    menuIconKeys() {
+      return Object.keys(this.menuIconById);
+    },
+  },
+  watch: {
+    activeTabs: {
+      // 탭 클릭시 좌측 treeview 싱크 맞추가
+      deep: true,
+      handler(value) {
+        if (value) {
+          const prgmId = value.prgmId;
+          let thisPrgmId = this.$route.query.prgmId;
+          var tmp = 0;
+          for (var i = 0; i < this.myMenuList.length; i++) {
+            if (this.myMenuList[i].prgmId == thisPrgmId) {
+              tmp = 1;
+            }
+          }
+          this.bookmarkBtn = tmp;
+          //if (thisPrgmId && this.myPrgmId && this.myPrgmId != thisPrgmId) {
+          this.myPrgmId = prgmId;
+          this.activeTree.pop(); // 기존 황성화 트리 값 삭제
+          this.activeTree.push(thisPrgmId); // 인덱스가 아닐 경우 새로 넣어줌
+          // this.$set(this.activeTree, 0, prgmId); // treeview activetree 새로 셋팅 <= 위 pop() 과 push() 로 대체
+          //}
+        }
+      },
+    },
+    activeTree: {
+      deep: true,
+      handler(newVal, oldVal) {
+        var _this = this;
+        const nv = newVal[0];
+        const ov = oldVal[0];
+        if (nv !== ov) {
+          if (!nv) {
+            // 중복클릭 시 발생 상황 기존 값을 다시 넣어줌
+            this.activeTree.push(ov);
+          } else {
+            this.myPrgmId = nv;
+            console.log("menu:", this.menuData);
+            if (this.menuData[nv].url) {
+              const menuUrl = this.menuData[nv].url;
+              const menuId = this.menuData[nv].menuId;
+
+              const isCommMenu = menuUrl.indexOf("comm/");
+              const isEmsMenu = menuUrl.indexOf("ems/");
+              const isCmmsMenu = menuUrl.indexOf("cmms/");
+
+              // console.log('activeTree...');
+              console.log(isEmsMenu);
+
+              if (isCommMenu > -1 || isEmsMenu > -1 || isCmmsMenu > -1) {
+                // console.log('activeTree if stmt1');
+                // console.log('this.isLoading : ', this.isLoading);
+                // if(this.isLoading == true){
+                // 	console.log('if isLoading stmt1');
+                // 	return;
+                // }
+
+                // this.$router.push({
+                //   path: `${this.menuData[nv].url}?prgmId=${nv}`,
+                // });
+
+                this.$router.replace("/").then(() => {
+                  this.$router.push({
+                    path: `${this.menuData[nv].url}?prgmId=${nv}`,
+                  });
+                });
+
+                // this.$router.beforeEach((to, from, next) => {
+                // 	if(_this.isLoading == true){
+                // 		next(false);
+                // 	}
+                // 	if (!to.matched.length) {
+                // 		next(false);
+                // 	} else {
+                // 		next();
+                // 	}
+                // });
+                var tmp = 0;
+                for (var i = 0; i < this.myMenuList.length; i++) {
+                  if (this.myMenuList[i].menuId == menuId) {
+                    tmp = 1;
+                  }
+                }
+                this.bookmarkBtn = tmp;
+              } else {
+                // console.log('activeTree if stmt2');
+                // console.log('this.isLoading : ', this.isLoading);
+                // if(this.isLoading == true){
+                // 	console.log('if isLoading stmt2');
+                // 	return;
+                // }
+                this.$refs.routerTab.openIframe(
+                  encodeURI(`http://localhost:9999${this.menuData[nv].url}?prgmId=${nv}`),
+                  this.menuData[nv].menuNm
+                );
+              }
+              this.$axios.get(`${this.menuData[nv].url}?$menuId=${menuId}`);
+            } else alert("지정된 페이지 경로가 없습니다.");
+          }
+        }
+      },
+    },
+    menuData: {
+      deep: true,
+      handler(newVal, oldVal) {},
+    },
+    pageData: {
+      deep: true,
+      handler(newVal, oldVal) {
+        localStorage.setItem("pageData", JSON.stringify(this.pageData));
+        //console.log("localPageData", this.pageData);
+      },
+    },
+    // menuLink: {
+    //   deep: true,
+    //   handler() {
+    //     let prgmIdList = Object.keys(this.menuData);
+    //     let initPageData = {};
+    //     prgmIdList.forEach(item => {
+    //       let newObj = {
+    //         [item] : {}
+    //       };
+    //       initPageData = Object.assign(initPageData, newObj)
+    //     });
+    //   }
+    // }
+  },
+  created() {
+    this.$vuetify.theme.isDark = false;
+    this.setThemeChange(false);
+  },
+  beforeUnmount() {
+    //window.removeEventListener('beforeunload', this.unLoadEvent);
+  },
+  async mounted() {
+    //window.addEventListener('beforeunload', this.unLoadEvent);
+    const _this = this;
+    await this.getMenu({});
+    await this.initPageDataFunc();
+    await this.selectMyMenuFunc();
+
+    this.routerTabInstance = this.$refs.routerTab;
+    if (this.$route.fullPath == "/") {
+      this.routerTabInstance.reset();
+      this.$router.replace(this.myHome.root);
+    } else if (this.$route.fullPath != this.myHome.root) {
+      this.$refs.routerTab.items.unshift(this.myHomeTabItems);
+    } else {
+      this.refreshTab();
+    }
+
+    this.$router.beforeEach((to, from, next) => {
+      _this.isLoading = true;
+      // console.log('$router.beforeEach...');
+      // console.log('state : ', _this.$store.state)
+      // console.log('activeActionCnt : ', _this.$store.state.activeActionCnt)
+      // console.log('_this.isLoading[beforeEach] : ', _this.isLoading);
+      // console.log('_this.loadingStackCnt : ', _this.loadingStackCnt);
+      // if(_this.loadingStackCnt > 0 && _this.isLoading && _this.$store.state.activeActionCnt > 0){
+      if (_this.loadingStackCnt > 0 && _this.isLoading) {
+        next(false);
+        // return;
+      } else if (!to.matched.length) {
+        next(false);
+      } else {
+        next();
+      }
+    });
+
+    this.$router.afterEach((to, from, failure) => {});
+
+    // 요청 인터셉터
+    this.$axios.interceptors.request.use(
+      function (config) {
+        //alert(1)
+        _this.isLoading = true;
+        if (config.url.search("Page") < 0) {
+          _this.loadingStackCnt++;
+        }
+        return config;
+      },
+      function (error) {
+        // 에라 나면 로딩 끄기
+        //alert(2)
+        _this.isLoading = false;
+        // if(error.url.search('Page')<0){
+        // 	_this.loadingStackCnt--;
+        // }
+        return Promise.reject(error);
+      }
+    );
+
+    // 응답 인터셉터
+    this.$axios.interceptors.response.use(
+      function (response) {
+        _this.isLoading = false;
+        if (response.config.url.search("Page") < 0) {
+          _this.loadingStackCnt--;
+        }
+        //alert(3)
+        return response;
+      },
+      function (error) {
+        // 응답 에러 시에도 로딩 끄기
+        //alert(4 )
+        _this.isLoading = false;
+        // if(error.url.search('Page')<0){
+        // 	_this.loadingStackCnt--;
+        // }
+        return Promise.reject(error);
+      }
+    );
+  },
+  methods: {
+    ...mapMutations({
+      setDrawer: "setDrawer", // 사이드메뉴 접고 펼치기
+      setPageDataInit: "setPageDataInit",
+      setThemeChange: "setThemeChange",
+    }),
+    ...mapActions({
+      getMenu: "modules/menu/getMenu", // 트리메뉴 가져오기
+      chkOpenTabList: "chkOpenTabList", // 트리메뉴 클릭 시 해당 pprgmId push
+      postUpdateApi: "modules/list/postUpdateApi",
+      postApiReturn: "modules/list/postApiReturn",
+    }),
+    // // tabActive(id) {},
+    // clkTab(itemArr) {
+    //   console.log(itemArr[0]);
+    //   if (!itemArr[0].to) return;
+    //   this.$router.push({
+    //     path: itemArr[0].to
+    //   });
+    // },
+    toggle() {
+      this.fullscreen = !this.fullscreen;
+    },
+    refreshTab() {
+      //  console.log("현재 탭 새로고침");
+      //this.routerTabInstance.refresh();
+      this.$nuxt.refresh();
+      this.routerTabInstance.refresh();
+    },
+    delAllTabsData() {
+      // console.log("탭 전체 닫기");
+      // for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
+      //   const diffTo = this.routerTabInstance.items[i].to;
+
+      //   if (diffTo != this.myHome.root) {
+      //     this.routerTabInstance.items.splice(i, 1);
+      //   }
+      // }
+      //if(this.$router.currentRoute.fullPath != this.myHome.root){
+      if (this.routerTabInstance.items.length > 0) {
+        this.routerTabInstance.reset();
+      }
+
+      this.$router.replace(this.myHome.root);
+      //}
+    },
+    deleteSblingsTab() {
+      // console.log("탭 나머지 닫기");
+      // for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
+      //   const activeTo = this.routerTabInstance.activeTab.to;
+      //   const diffTo = this.routerTabInstance.items[i].to;
+
+      //   if (activeTo != diffTo && diffTo != this.myHome.root) {
+      //     this.routerTabInstance.items.splice(i, 1);
+      //   }
+      // }
+      if (this.routerTabInstance.items.length > 1) {
+        for (let i = this.routerTabInstance.items.length - 1; i > -1; --i) {
+          const activeTo = this.routerTabInstance.activeTab.to;
+          const diffTo = this.routerTabInstance.items[i].to;
+
+          if (activeTo != diffTo && diffTo != this.myHome.root) {
+            this.routerTabInstance.close(diffTo);
+          }
+        }
+      }
+    },
+    tabScrollMove(dir) {
+      const scrollTab = this.routerTabInstance.$refs.scroll;
+      const scrollWidth =
+        scrollTab.scrollData.scrollWidth - scrollTab.scrollData.clientWidth;
+      const scrollLeft = scrollTab.scrollData.scrollLeft;
+
+      const xAxis = this.calcScroll(scrollLeft, scrollWidth, dir);
+      scrollTab.scrollTo(xAxis, 0);
+    },
+    updateTreeview() {
+      if (this.miniVariant) {
+        // sidebar 접혀져 있을 때
+        this.$refs.treeview.updateAll();
+      } else {
+        // sidebar 펼쳐져 있을 때
+      }
+    },
+    // 열려있는 노드의 key 값 리턴(선택된 값이 아님)
+    openNode(node) {
+      //console.log('onOpen');
+      if (this.miniVariant) {
+        // sidebar 접혀져 있을 때
+        if (event.currentTarget.id !== this.$refs.appbarnavicon.$refs.link.id) {
+          this.$refs.appbarnavicon.click(event);
+        }
+      } else {
+        // sidebar 펼쳐져 있을 때
+      }
+    },
+    doMouseOver: function (event) {
+      //console.log(event);
+    },
+    calcScroll(sl, sw, dir) {
+      const deScrW = 60;
+      let returnSl = 0;
+      switch (dir) {
+        case "prev":
+          returnSl = sl - deScrW <= 0 ? 0 : sl - deScrW;
+          break;
+        case "next":
+          returnSl = sl + deScrW >= sw ? sw : sl + deScrW;
+          break;
+        default:
+          break;
+      }
+      return returnSl;
+    },
+    initPageDataFunc() {
+      const _this = this;
+      this.prgmIdList = Object.keys(this.menuData);
+      this.initPageData = {};
+      this.prgmIdList.forEach((item) => {
+        _this.obj = {};
+        if (_this.pageData[item]) {
+          _this.obj = _this.pageData[item];
+        }
+        _this.newObj = {};
+        _this.newObj = {
+          [item]: _this.obj,
+        };
+        _this.initPageData = Object.assign({}, _this.initPageData, _this.newObj);
+      });
+      localStorage.setItem("pageData", JSON.stringify(this.initPageData));
+      this.setPageDataInit(this.initPageData);
+    },
+    onCloseTab(to) {
+      const findIndex = this.$tabs.items.findIndex((v) => v.to === to);
+      const { to: next } = this.$tabs.items[findIndex - 1];
+      this.$tabs.close(to, null);
+      if (this.$router.currentRoute.fullPath != next) {
+        this.$router.replace(next);
+      }
+    },
+    async addBookMark() {
+      var params = {
+        menuId: this.activeMenuId,
+      };
+      await this.postUpdateApi({
+        apiKey: "saveBookmark",
+        sendParam: {
+          datas: {
+            bookmarkDt: [params],
+          },
+          params: {},
+        },
+      });
+
+      const res = await this.postApiReturn({
+        apiKey: "selectMyMenu",
+        resKey: "menuData",
+        sendParam: {},
+      });
+
+      // const res = [
+      //   {
+      //     comId: "abc",
+      //     upMenuId: "abc",
+      //     menuId: "dashboard",
+      //     menuNm: "abc",
+      //     url: "DashboardPage",
+      //     authCd: "yes",
+      //     lvl: 9999,
+      //     prgmId: "PRG0001",
+      //   },
+      //   {
+      //     comId: "abc",
+      //     upMenuId: "dashboard",
+      //     menuId: "test",
+      //     menuNm: "test",
+      //     url: "DashboardPage",
+      //     authCd: "yes",
+      //     lvl: 666,
+      //     prgmId: "PRG0002",
+      //   },
+      // ];
+
+      this.myMenuList = res;
+      this.bookmarkBtn = 1;
+    },
+    async removeBookMark() {
+      var params = {
+        menuId: this.activeMenuId,
+      };
+      await this.postUpdateApi({
+        apiKey: "deleteBookmark",
+        sendParam: {
+          datas: {
+            bookmarkDt: [params],
+          },
+          params: {},
+        },
+      });
+
+      const res = await this.postApiReturn({
+        apiKey: "selectMyMenu",
+        resKey: "menuData",
+        sendParam: {},
+      });
+      this.myMenuList = res;
+      this.bookmarkBtn = 0;
+    },
+    moveToMyMenu(url, menuId, prgmId) {
+      // console.log('moveToMyMenu...');
+      // if(this.isLoading == true){
+      // 	console.log('if isLoading stmt3');
+      // 	return;
+      // }
+      alert("move to", url);
+      this.$router.push({
+        path: url + "?prgmId=" + prgmId,
+      });
+    },
+    async selectMyMenuFunc() {
+      const headers = {
+        headers: {
+          "X-Fems-MenuId": "MNU0001",
+        },
+      };
+      const params = { params: {} };
+      const res = await this.$axios.post(
+        "/comm/base/MenuMngCtr/selectMyMenu",
+        params,
+        headers
+      );
+
+      this.myMenuList = res.data.dataset.menuData;
+    },
+    // unLoadEvent: function (event) {
+    //   //if (this.isLeaveSite) return;
+    //   //this.delAllTabsData();
+    //   this.$router.push({
+    //    path: this.myHome.root
+    //   });
+    //   console.log("event", event)
+    //   event.preventDefault();
+    //   event.returnValue = '';
+
+    // },
+    // treeModel(obj) {
+    //   console.log(">>> treeModel::obj = ", obj);
+    //   this.treeValue[0] = obj;
+    //   this.$refs.treeview.updateAll();
+    //   // console.log(this.$refs.treeview);
+    //   // this.$refs.treeview.activeCache = obj.id;
+    // }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.loading {
+  z-index: 99;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  width: 100%;
+  height: 100%;
+  transform: translate(-50%, -50%);
+  background-color: rgba(0, 0, 0, 0.4);
+  //box-shadow: rgba(68, 67, 67, 0.9) 0 0 0 9999px;
+}
+.v-spinner {
+  top: 50%;
+  left: 50%;
+}
+</style>

mixin/global.js

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

nuxt.config.js

@@ -49,7 +49,7 @@ module.exports = {
 
 	// Auto import components: https://go.nuxtjs.dev/config-components
 	components: true,
-	
+
 	// Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules
 	buildModules: [
 		// https://go.nuxtjs.dev/vuetify

pages/comm/auth/MenuMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -35,7 +34,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" />
+								:parentPrgmId="myPrgmId" @getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
 					</div>
 				</v-card>
@@ -92,9 +91,21 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'treeGrid',
-			loadTree: false,
+			loadTree: true,
 			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: {
@@ -151,17 +162,10 @@ export default {
 		gridInit() {
 			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 30;
 			const myOptionsTree = {
-				columnOptions: {
-					resizable: true,
-				},
 				treeColumnOptions: {
 					name: 'menuNm',
 				},
 				scrollX: false,
-				header: {
-					height: 37,
-				},
-				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -174,17 +178,6 @@ export default {
 			this.setGridColumn({
 				gridKey: this.gridName,
 				value: [
-					{
-						header: '',
-						name: '',
-						align: 'center',
-						width: 20,
-						formatter: (props) => {
-							return `<label class="custom-radio">
-										<span class="radio-mark"></span>
-									</label>`;
-						}
-					},
 					{ header: '메뉴명', name: 'menuNm' },
 					{ header: 'prgmId ', name: 'prgmId', hidden: true },
 					{ header: 'sysDivCd ', name: 'sysDivCd', hidden: true },

pages/comm/auth/MenuRoleMngPage.vue

@@ -22,7 +22,8 @@
 								customClass="input-large"
 							/>
 						</v-col>
-						<v-col class="text-right d-flex justify-end align-end mr-3">
+						<v-col :cols="6" class="text-right">
+							<!-- <v-btn @click="test = !test">WWW</v-btn> -->
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@@ -30,24 +31,29 @@
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents" >
-			<v-col cols="12" lg="2" >
+		<v-row ref="contents" style="height: 100vh;">
+			<v-col cols="12" lg="2" class="h100">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
-					<div ref="gridParent" class="px-5" style="height: 60vh;">
-						<component
-							:is="loadGrid ? 'Grid' : null"
-							:ref="gridName + myPrgmId"
-							:gridName="gridName"
-							:parentPrgmId="myPrgmId"
-							@getRowsData="getRowData"
-						/>
+					<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>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="10" >
+			<v-col cols="12" lg="10" class="h100">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 메뉴별 권한</span>
@@ -64,19 +70,19 @@
 								:style="{ minHeight: '36px' }"
 								>[미배정]메뉴리스트</span
 							>
-							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
-								<!-- <div
+							<div class="px-5" style="height:calc(100% - 64px)">
+								<div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
-							</div> -->
-								<component
-									:is="loadTreeGrid ? 'Grid' : null"
-									:ref="gridName2 + myPrgmId"
-									:gridName="gridName2"
-									:parentPrgmId="myPrgmId"
-									@getRowsData="getUnAsgnRowData"
-								/>
+									<component
+										:is="loadTreeGrid ? 'Grid' : null"
+										:ref="gridName2 + myPrgmId"
+										:gridName="gridName2"
+										:parentPrgmId="myPrgmId"
+										@getRowsData="getUnAsgnRowData"
+									/>
+								</div>
 							</div>
 						</v-col>
 						<v-col :cols="1">
@@ -107,20 +113,20 @@
 									/>
 								</v-col>
 							</v-row>
-							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
-								<!-- <div
+							<div class="px-5" style="height:calc(100% - 64px)">
+								<div
 									ref="treeGridParent2"
 									class="w100 h100"
 								>
-							</div> -->
-								<component
-									:is="loadTreeGrid2 ? 'Grid' : null"
-									:ref="gridName3 + myPrgmId"
-									:gridName="gridName3"
-									:parentPrgmId="myPrgmId"
-									:editorGrid="true"
-									@getRowsData="getAsgnRowData"
-								/>
+									<component
+										:is="loadTreeGrid2 ? 'Grid' : null"
+										:ref="gridName3 + myPrgmId"
+										:gridName="gridName3"
+										:parentPrgmId="myPrgmId"
+										:editorGrid="true"
+										@getRowsData="getAsgnRowData"
+									/>
+								</div>
 							</div>
 						</v-col>
 					</v-row>
@@ -397,17 +403,6 @@ export default {
 			];
 
 			const myTreeColumns = [
-				{
-					header: '',
-					name: '',
-					align: 'center',
-					width: 30,
-					formatter: (props) => {
-						return `<span class="custom-radio">
-									<span class="radio-mark"></span>
-								</span>`;
-					}
-				},
 				{
 					header: '메뉴명',
 					name: 'menuNm',
@@ -420,17 +415,6 @@ export default {
 				},
 			];
 			const myTreeColumns2 = [
-				{
-					header: '',
-					name: '',
-					align: 'center',
-					width: 30,
-					formatter: (props) => {
-						return `<span class="custom-radio">
-									<span class="radio-mark"></span>
-								</span>`;
-					}
-				},
 				{ header: '역할ID', name: 'roleId', hidden: true },
 				{ header: '메뉴ID', name: 'menuId', hidden: true },
 				{ header: '메뉴명', name: 'menuNm', minWidth: '235' },
@@ -568,7 +552,6 @@ export default {
 			});
 		},
 		async getRowData(data) {
-
 			await this.setPageData({
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: {
@@ -674,8 +657,6 @@ export default {
 		},
 
 		getUnAsgnRowData(data) {
-			console.log("------------------DEBUG-------getUnAsgnRowData:", data);
-
 			const getRowData = data;
 			this.leftSelectRowData = Object.assign({}, getRowData);
 		},

pages/comm/auth/RoleMngPage.vue

@@ -67,6 +67,7 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -131,8 +132,22 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			detailList: myDetail,
+			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: {
@@ -503,4 +518,43 @@ 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/comm/auth/UserRoleMngPage.vue

@@ -12,8 +12,6 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
-								labelCols="12"
-								textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -81,6 +79,7 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -129,7 +128,7 @@
 									<template v-else-if="item.id == 'AsgnRoleByUser'">
 										<v-col :cols="3" class="h100">
 											<v-card-title
-												class="pa-0 custom-subtitle-tab"
+												class="pa-0 custom-title-4"
 												style="min-height:36px;"
 												>역할리스트</v-card-title
 											>
@@ -155,7 +154,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-subtitle-tab">
+												<v-card-title class="pa-0 custom-title-4">
 													사용자 역할</v-card-title
 												>
 												<div>
@@ -308,10 +307,40 @@ export default {
 	},
 	methods: {
 		async init() {
-			await this.gridInit();
+			 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 = {
@@ -1071,4 +1100,67 @@ function sha512(str) {
 		.update(str)
 		.digest('hex');
 }
-</script>
+
+
+
+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>

pages/comm/base/BatchLogMngPage.vue

@@ -5,13 +5,13 @@
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<div></div>
 						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
+								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -21,6 +21,7 @@
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
+								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -32,6 +33,7 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
+								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -40,13 +42,13 @@
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
-								customClass="datepicker-large"
+								:customClass="'input-large'"
 							/>
 						</v-col>
-						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
-							<BtnSearch />
+						<v-col :cols="2" class="text-right d-flex align-end justify-end ga-1" style="gap: 4px">
+							<BtnSearch size="large" />
 							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
-						</div>
+						</v-col>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -61,10 +63,11 @@
 						<div ref="gridParent" class="px-5 h100">
 							<component
 								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
+								:is=" 'Grid' "
 								:parentPrgmId="myPrgmId"
 								:gridName="gridName"
 								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -137,10 +140,56 @@ export default {
 	data() {
 		return {
 			myPrgmId: myPrgmId,
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowGrid',
 			// rowGridOrigin: [],
 			detailList: myDetail,
+			dataPathMock : {
+				'rowGrid': {
+					column: [
+					{ header: 'No.', name: 'batchLogSeq', align: 'center', width: 100 },
+					{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
+					{ header: '배치명', name: 'batchNm', align: 'left', width: 150 },
+					{ header: '실행 일자', name: 'execDt', align: 'center', width: 80 },
+					{
+						header: '실행 결과',
+						name: 'execRsltCd',
+						align: 'center',
+						width: 80,
+						// formatter({ value }) {
+						// 	let retVal = '';
+						// 	const newValue = _this.pageData.execRsltCdList.filter(
+						// 		item => item.commCd == value,
+						// 	);
+						// 	if (newValue.length > 0) {
+						// 		retVal = newValue[0].commCdNm;
+						// 	}
+						// 	return retVal;
+						// },
+					}, // "1": 프로그램, "2": 팝업
+					{ header: '실행 로그', name: 'execLogCont', minWidth: 150 },
+					{
+						header: '배치 시작 일시',
+						name: 'batchStrtDttm',
+						align: 'center',
+						width: 160,
+					},
+					{
+						header: '배치 종료 일시',
+						name: 'batchEndDttm',
+						align: 'center',
+						width: 160,
+					},
+					{ header: '등록자NO', name: 'regUserNo', width: 120 },
+					{ header: '등록일시', name: 'regDttm', align: 'center', width: 160 },
+					{ header: '수정자NO', name: 'procUserNo', width: 120 },
+					{ header: '수정일시', name: 'procDttm', align: 'center', width: 160 },
+					],
+					data: dataMockExample,
+					defaultRow: dataMockExample,
+					option: {},
+				},
+			},
 		};
 	},
 	computed: {
@@ -199,6 +248,14 @@ export default {
 		init() {
 			// this.layoutInit();
 			this.gridInit();
+			
+			// _this.pageData = {
+			// execRsltCdList: [
+			// 	{ commCd: '1', commCdNm: '성공' },
+			// 	{ commCd: '2', commCdNm: '실패' },
+			// ],
+			// };
+
 		},
 		// layoutInit() {
 		//   const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
@@ -311,10 +368,13 @@ export default {
 				}
 			});
 		},
-		async getRowData(data) {
+		// async getRowData(data) {
+		async getRowData() {
+			console.log("something")
 			this.setPageData({
-				rowGridSelectKey: data.rowKey,
-				rowGridSelectData: data,
+				// rowGridSelectKey: data.rowKey,
+				rowGridSelectKey: 1,
+				rowGridSelectData: fakeRowData,
 			});
 		},
 		compareData(type, newDt) {
@@ -421,13 +481,86 @@ const defaultData = {
 	},
 };
 
+const dataMockExample = [
+  {
+    batchLogSeq: 1,
+    batchId: 'BATCH001',
+    batchNm: '일일 데이터 백업',
+    execDt: '2025-07-15',
+    execRsltCd: '1', // sẽ được formatter thành "성공" hoặc tương tự
+    execLogCont: '백업 완료. 오류 없음.',
+    batchStrtDttm: '2025-07-15 01:00:00',
+    batchEndDttm: '2025-07-15 01:30:00',
+    regUserNo: 'admin01',
+    regDttm: '2025-07-15 01:00:00',
+    procUserNo: 'admin02',
+    procDttm: '2025-07-15 01:35:00',
+  },
+  {
+    batchLogSeq: 2,
+    batchId: 'BATCH002',
+    batchNm: '월간 리포트 생성',
+    execDt: '2025-07-01',
+    execRsltCd: '2',
+    execLogCont: '리포트 생성 중 오류 발생: 파일 접근 실패.',
+    batchStrtDttm: '2025-07-01 03:00:00',
+    batchEndDttm: '2025-07-01 03:10:00',
+    regUserNo: 'reportUser',
+    regDttm: '2025-07-01 03:00:00',
+    procUserNo: 'admin03',
+    procDttm: '2025-07-01 03:15:00',
+  },
+  {
+    batchLogSeq: 3,
+    batchId: 'BATCH003',
+    batchNm: '사용자 통계 갱신',
+    execDt: '2025-07-14',
+    execRsltCd: '1',
+    execLogCont: '통계 갱신 완료.',
+    batchStrtDttm: '2025-07-14 23:00:00',
+    batchEndDttm: '2025-07-14 23:20:00',
+    regUserNo: 'statUser',
+    regDttm: '2025-07-14 23:00:00',
+    procUserNo: 'admin01',
+    procDttm: '2025-07-14 23:25:00',
+  },
+];
+
+const fakeRowData = {
+  rowKey: 1,
+  batchLogSeq: 1,
+  batchId: 'BATCH001',
+  batchNm: '일일 데이터 백업',
+  execDt: '2025-07-15',
+  execRsltCd: '1',
+  execLogCont: JSON.stringify({
+    session: {
+      userNo: 'admin01',
+      userNm: '관리자',
+      comId: 'SKCC',
+      locale: 'ko_KR',
+    },
+    batch: {
+      comId: 'SKCC',
+      totStdDt: '20230110',
+    },
+  }),
+  batchStrtDttm: '2025-07-15 01:00:00',
+  batchEndDttm: '2025-07-15 01:30:00',
+  regUserNo: 'admin01',
+  regDttm: '2025-07-15 01:00:00',
+  procUserNo: 'admin02',
+  procDttm: '2025-07-15 01:35:00',
+};
+
+
 const myDetail = [
 	{
 		type: 'TextArea',
 		valueNm: 'execLogCont',
 		readonly: true,
 		cols: 12,
-		class: 'py-2',
+		class: 'py-2 transparent',
 	},
 ];
-</script>
+</script>

pages/comm/base/BatchMngPage.vue

@@ -1,8 +1,7 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
-		<common-page-title />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -25,7 +24,7 @@
 								:customClass="'select-large'"
 							/>
 						</v-col>
-						<v-col :cols="2.5" class="pr-4">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -35,7 +34,7 @@
 								:customClass="'select-large'"
 							/>
 						</v-col>
-						<BtnSearch size="large" class="mr-2" />
+						<BtnSearch size="large" />
 
 					</v-row>
 				</v-card>
@@ -58,7 +57,7 @@
 					<div class="px-4">
 						<div ref="gridParent" class="h100 w100">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
-								:gridName="gridName" @getRowsData="getRowData" />
+								:gridName="gridName" @getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
 						<!-- </v-card-actions> -->
 					</div>
@@ -78,7 +77,7 @@
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-dialog ref="popModal" v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8" scrollable>
+			<v-dialog ref="popModal" v-model="dialog" width="700" 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>
@@ -92,6 +91,7 @@
 							<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,6 +101,7 @@
 							</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>
@@ -154,16 +155,76 @@ export default {
 	data() {
 		return {
 			myPrgmId: myPrgmId,
-			loadGrid: false,
+			loadGrid: true,
 			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: false,
+			paramLoadGrid: true,
 			selectedGridNameParamRow: null,
 		};
 	},
@@ -231,7 +292,7 @@ export default {
 		}),
 		init() {
 			// this.layoutInit();
-			this.gridInit();
+			// this.gridInit();
 			this.gridParamInit();
 		},
 		// layoutInit() {
@@ -248,10 +309,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -327,7 +384,7 @@ export default {
 		},
 		async search() {
 			// console.log("search");
-			await this.getRowGridData();
+			// await this.getRowGridData();
 			await this.setPageData({
 				isFind: false,
 			});
@@ -572,20 +629,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' },
@@ -607,27 +664,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 },
@@ -646,49 +703,86 @@ 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) {
@@ -718,21 +812,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,7 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -11,7 +10,7 @@
 						</v-col>
 						<v-col cols="3">
 							<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
-							<DatePicker :parentPrgmId="myPrgmId" customClass="datepicker-large" :label="'조회연월'" />
+							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
 						</v-col>
 						<v-col cols="6" class="text-right">
 							<BtnSearch @click="search()" size="large" />
@@ -21,29 +20,28 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" id="CalendarMngContent" class="mt-4">
-			<v-col cols="12" lg="4" class=" pr-2">
+			<v-col cols="12" lg="4" class="h100 pr-2">
 				<v-card class="w100">
 					<v-card-title class="d-flex justify-space-between align-center">
 						<span class="custom-title-4">캘린더 리스트</span>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</v-card-title>
-					<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 10px)' }">
+					<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 72.56px)' }">
 						<div ref="gridParent" class="w100 h100">
 							<component class="w100" :ref="gridName + myPrgmId" :is="loadGrid ? 'Grid' : null"
 								:gridName="gridName" :parentPrgmId="myPrgmId" :editorGrid="true"
-								@getRowsData="getRowData" />
+								@getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="8" class=" pl-3">
+			<v-col cols="12" lg="8" class="h100 pl-3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">캘린더 미리보기</span>
 					</v-card-title>
-					<v-card-actions class="px-5 d-block" >
-						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false"
-							:showTitle="false" />
+					<v-card-actions class="px-5 d-block" :style="{ height: 'calc(100% - 62px)' }">
+						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false" />
 					</v-card-actions>
 				</v-card>
 			</v-col>
@@ -96,7 +94,81 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
+			dataPathExample: {
+				"rowGrid": {
+					data: [
+						{
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-23",
+							"dtNm": "수요일",
+							"dt": "2025-07-21",
+							"dtNm": "월요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-22",
+							"dtNm": "화요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-24",
+							"dtNm": "목요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-25",
+							"dtNm": "금요일",
+							"hldyFg": "평일",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-26",
+							"dtNm": "토요일",
+							"hldyFg": "주말",
+							"hldyNm": ""
+						},
+						{
+							"dt": "2025-07-27",
+							"dtNm": "일요일",
+							"hldyFg": "휴일",
+							"hldyNm": "정기휴일"
+						}
+					],
+					column: [
+						{
+							header: '일자',
+							name: 'dt',
+							align: 'center',
+							// formatter({ value }) {
+							// 	return value.split(' ')[0];
+							// },
+						},
+						{
+							header: '요일',
+							name: 'dtNm',
+							align: 'center',
+							// formatter({ value }) {
+							// 	return value + '요일';
+							// },
+						},
+						{
+							header: '구분',
+							name: 'hldyFg',
+							align: 'center',
+							essential: true,
+						},
+						{ header: '휴일명', name: 'hldyNm', editor: 'text' },
+					],
+
+				}
+			},
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 		};
@@ -169,19 +241,16 @@ export default {
 			await this.gridInit();
 		},
 		async search() {
-			await this.getRowGridData();
+			// await this.getRowGridData();
 		},
 		async gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
-			this.setGridOption({
-				gridKey: this.gridName,
-				value: Object.assign(Utility.defaultGridOption(gridHeight), {
-					scrollX: false, header: {
-						height: 37,
-					},
-					rowHeight: 37,
-				}),
-			});
+			// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
+			// this.setGridOption({
+			// 	gridKey: this.gridName,
+			// 	value: Object.assign(Utility.defaultGridOption(gridHeight), {
+			// 		scrollX: false,
+			// 	}),
+			// });
 
 			// this.getRowGridData();
 		},
@@ -281,86 +350,86 @@ export default {
 
 			this.loadGrid = false;
 
-			let res = await this.postApiReturn({
-				apiKey: 'selectWorkCald',
-				resKey: 'workcaldData',
-				sendParam: {
-					blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
-					yymm: this.chkFromDt,
-					comId: this.comId,
-				},
-			});
+			// let res = await this.postApiReturn({
+			// 	apiKey: 'selectWorkCald',
+			// 	resKey: 'workcaldData',
+			// 	sendParam: {
+			// 		blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
+			// 		yymm: this.chkFromDt,
+			// 		comId: this.comId,
+			// 	},
+			// });
 
-			let res2 = await this.postApiReturn({
-				apiKey: 'selectWorkCaldDetl',
-				resKey: 'workcaldDetlData',
-				sendParam: {
-					blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
-					yymm: this.chkFromDt,
-					comId: this.comId,
-				},
-			});
+			// let res2 = await this.postApiReturn({
+			// 	apiKey: 'selectWorkCaldDetl',
+			// 	resKey: 'workcaldDetlData',
+			// 	sendParam: {
+			// 		blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
+			// 		yymm: this.chkFromDt,
+			// 		comId: this.comId,
+			// 	},
+			// });
 
-			for (var i = 0; i < res2.length; i++) {
-				if (
-					!(
-						res2[i].hldyNm == null ||
-						res2[i].hldyNm == '토요일' ||
-						res2[i].hldyNm == '일요일'
-					)
-				) {
-					for (var j = i + 1; j < res2.length; j++) {
-						if (res2[i].hldyNm == res2[j].hldyNm) {
-							res2[i].hldyNm = '';
-						}
-					}
-				}
-			}
+			// for (var i = 0; i < res2.length; i++) {
+			// 	if (
+			// 		!(
+			// 			res2[i].hldyNm == null ||
+			// 			res2[i].hldyNm == '토요일' ||
+			// 			res2[i].hldyNm == '일요일'
+			// 		)
+			// 	) {
+			// 		for (var j = i + 1; j < res2.length; j++) {
+			// 			if (res2[i].hldyNm == res2[j].hldyNm) {
+			// 				res2[i].hldyNm = '';
+			// 			}
+			// 		}
+			// 	}
+			// }
 
-			res = res.map(item => {
-				const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
-				const dtNm = dt.format('ddd'); // 요일
-				const newItem = {
-					...item,
-					dtNm: dtNm,
-					hldyNm: item.hldyNm ? item.hldyNm : '',
-					rowStat: null,
-				};
-				return newItem;
-			});
+			// res = res.map(item => {
+			// 	const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
+			// 	const dtNm = dt.format('ddd'); // 요일
+			// 	const newItem = {
+			// 		...item,
+			// 		dtNm: dtNm,
+			// 		hldyNm: item.hldyNm ? item.hldyNm : '',
+			// 		rowStat: null,
+			// 	};
+			// 	return newItem;
+			// });
 
-			this.loadGrid = true;
-			this.setPageData({ isFind: false });
+			// this.loadGrid = true;
+			// this.setPageData({ isFind: false });
 
-			this.setGridColumn({
-				gridKey: this.gridName,
-				value: myColumns,
-			});
+			// this.setGridColumn({
+			// 	gridKey: this.gridName,
+			// 	value: myColumns,
+			// });
 
-			this.setGridData({
-				gridKey: this.gridName,
-				value: res,
-			});
+			// this.setGridData({
+			// 	gridKey: this.gridName,
+			// 	value: res,
+			// });
 
-			this.setPageData({ planData: res2 });
+			// this.setPageData({ planData: res2 });
 
-			// 첫번째 row 선택상태
-			this.$nextTick(() => {
-				this.$refs[this.gridName + this.myPrgmId].focus({
-					//rowKey: 0,
-					rowKey:
-						this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
-							? 0
-							: this.pageData.rowGridSelectKey ==
-								this.$refs[this.gridName + this.myPrgmId].getData().length - 1
-								? this.pageData.rowGridSelectKey
-								: 0,
-					columnName: 'dt',
-					setScroll: true,
-				});
-				this.setPageData({ isFind: false });
-			});
+			// // 첫번째 row 선택상태
+			// this.$nextTick(() => {
+			// 	this.$refs[this.gridName + this.myPrgmId].focus({
+			// 		//rowKey: 0,
+			// 		rowKey:
+			// 			this.pageData.rowGridSelectKey == '' ||
+			// 				this.pageData.rowGridSelectKey == null
+			// 				? 0
+			// 				: this.pageData.rowGridSelectKey ==
+			// 					this.$refs[this.gridName + this.myPrgmId].getData().length - 1
+			// 					? this.pageData.rowGridSelectKey
+			// 					: 0,
+			// 		columnName: 'dt',
+			// 		setScroll: true,
+			// 	});
+			// 	this.setPageData({ isFind: false });
+			// });
 		},
 		async getRowData(data, gridName) {
 			this.setGridSelectData({
@@ -535,17 +604,4 @@ 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">
-		<CommonPageTitle/>
+	    <PageTitle text="공통코드" />
 		<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" size="large" />
+							<BtnSearch style="margin-top:20px" @click="search" />
 						</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,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
 			<v-card class="" >
@@ -15,10 +14,10 @@
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> -->
 							</div>
 						</v-col>
-						<v-col :cols="12" ref="contents" class="mt-5" style="min-height: calc(100% - 76px);">
-							<div ref="gridParent" class="px-50" style="min-height: 70vh;">
-								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-									 @getRowsData="getRowData" />
+						<v-col :cols="12" ref="contents" class="mt-5">
+							<div ref="gridParent" class="h100 px-50">
+								<component :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
+									ref="noticeMngGrid" @getRowsData="getRowData" :dataPath="dataPathMock" />
 							</div>
 						</v-col>
 					</v-row>
@@ -27,7 +26,7 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'" >
+		<div v-if="pageActionFlag == 'view'" class="h1001">
 			<v-card>
 				<v-row class="pa-5">
 					<v-col :cols="12" class="d-flex align-center justify-space-between ">
@@ -45,25 +44,25 @@
 							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12" class="mt-5">
-						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
+					<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>
-					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
+					<v-col :cols="12" style="min-height:calc(90vh - 218px);" class="pa-5">
 						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
 							:initialValue="viewActionData.content" theme="white"
-							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
+							:class="isDarkMode ? 'theme--white' : 'theme--black'" />
 					</v-col>
-					<v-col :cols="6" class="mt-5">
-						<v-card-title class="custom-title-7 pa-0">
-							파일목록
-						</v-card-title>
+					<v-col :cols="6">
+						<p class="custom-title-3 mb-2">파일목록</p>
 						<div v-for="fileData in viewActionData.fileData" 
 							:key="fileData.apndFileId" 
 							class="file-item">
 							<a @click.prevent="downloadFile(fileData)">
-								<div class="d-flex justify-start search-box-label">
+								<div class="d-flex justify-space-between search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
+									<span class="file-item-name">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@@ -73,24 +72,28 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'" >
+		<div v-if="pageActionFlag == 'write'" class="h1001">
 			<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="mt-4">
-							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+						<v-col :cols="12" class="custom-title-4-new mt-4">
+							<p class="custom-title-3 mb-2">제목</p>
 							<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(100vh - 450px);">
+						<v-col :cols="12" style="min-height: calc(90vh - 270px);">
 							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
 						</v-col>
 	
-						<v-col :cols="6" class="mt-5">
-							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+						<v-col :cols="12" class="mt-2">
+							<p class="custom-title-3 mb-2">
+								파일첨부
+							</p>
+						</v-col>
+						<v-col :cols="6">
 							<div class="" v-if="writeActionData.fileData">
 								<div 
 									v-for="(fileData, index) in writeActionData.fileData" 
@@ -126,23 +129,25 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'" >
+		<div v-if="pageActionFlag == 'reply'" class="h1001">
 			<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" 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
+					<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
 							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-5">
-						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+					<v-col :cols="6" class="mt-4">
+						<p class="custom-title-3 mb-2">
+							파일첨부
+						</p>
 						<div class="" v-if="replyActionData.fileData">
 							<div 
 								v-for="(fileData, index) in replyActionData.fileData" 
@@ -170,7 +175,7 @@
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'" >
+		<div v-if="pageActionFlag == 'update'" class="h1001">
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
@@ -178,16 +183,16 @@
 							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
-							<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>
+							<p class="custom-title-3 mb-2">제목</p>
+							<v-text-field v-model="updateActionData.title" class="v-input__custom" placeholder="" 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" class="mt-5">
-								<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+						<v-col :cols="6">
+								<p class="pa-0 mb-2 custom-title-4-new-1">파일첨부</p>
 								<div class="" v-if="updateActionData.fileData">
 									<div 
 										v-for="(fileData, index) in updateActionData.fileData"
@@ -261,8 +266,7 @@ export default {
 			myPrgmId: myPrgmId,
 			//comId: "SEMPIO",
 			//comId: this.userInfo.comId,
-			// comId: this.$store.state.userInfo.comId,
-
+			comId: this.$store.state.userInfo.comId,
 			bordNo: null,
 			pageActionFlag: 'list',
 			gridName: 'noticeMngGrid',
@@ -398,6 +402,7 @@ export default {
 			this.getGridData();
 		},
 		gridInit() {
+			this.loadGrid = false;
 			const gridHeight = this.$refs.contents.offsetHeight - 76;
 
 			const myOptions = {};
@@ -461,6 +466,13 @@ export default {
 				gridKey: this.gridName,
 				value: columnList,
 			});
+
+			// -----------------------TEST------------------
+			this.dataPathMock[this.gridName] = {
+				column: columnList,
+				data: dataPathDataExample,
+			}
+			// -----------------------END TEST--------------
 			this.getGridData();
 		},
 		async getGridData() {
@@ -469,13 +481,23 @@ export default {
 			};
 
 			this.loadGrid = false;
+			let res = null;
+			try {
+				res = await this.postApiReturn({
+					apiKey: 'selectPostList',
+					resKey: 'postData',
+					sendParam: params,
+				});
+			}
+			catch (err) { }
+			finally {
+				// -----Test mock data-------------
+				if (null === res) {
+					res = dataPathDataExample;
+				}
+				// -----End test
+			}
 
-			const res = await this.postApiReturn({
-				apiKey: 'selectPostList',
-				resKey: 'postData',
-				sendParam: params,
-			});
-			
 			this.setGridData({
 				gridKey: this.gridName,
 				value: res,
@@ -1046,19 +1068,4 @@ 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="3">
+						<v-col :cols="4">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="프로그램명"
@@ -37,7 +37,7 @@
 
 		<v-row ref="contents">
 			<!-- 프로그램 리스트 -->
-			<v-col :cols="5" >
+			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">프로그램 리스트</v-card-title>
@@ -50,21 +50,22 @@
 							/>
 						</div>
 					</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 style="min-height:calc(100% - 70px)">
+						<div ref="gridParent" class="px-5 h100">
+							<component
+								:ref="gridName"
+								:is="loadGrid ? 'Grid' : null"
+								:parentPrgmId="myPrgmId"
+								:gridName="gridName"
+								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
+							/>
+						</div>
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
-			<v-col :cols="7" >
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">프로그램 상세</v-card-title>
@@ -261,6 +262,8 @@ export default {
 			});
 
 			// this.getRowGridData();
+
+			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -293,8 +296,7 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-			this.loadGrid = true;
-			
+
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({
@@ -314,12 +316,6 @@ 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,
@@ -331,7 +327,6 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
-			
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {

pages/ems/base/AddInfoMngPage.vue

@@ -64,6 +64,7 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -136,10 +137,24 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			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: {
@@ -627,4 +642,43 @@ 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,6 +1,7 @@
 <template>
   <div class="l-layout">
-		<CommonPageTitle/>
+    <!-- <h1 class="h1-title">대시보드</h1> -->
+    <PageTitle text="대시보드" />
     <!-- <CheckBox
       :parentPrgmId="myPrgmId"
       label="사용여부"
@@ -599,7 +600,7 @@ export default {
       this.getEnrgUsage();
     },
     isDarkMode(newVal) {
-      // Update color of dark mode or light mode into each charts
+      // let chartOption = this.getGuageChartOption2(this.chart_01);
       let chartOption = getGaugeChartOption({
         title: this.chart_01,
         isDarkMode: this.isDarkMode,
@@ -609,6 +610,7 @@ 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,
@@ -618,24 +620,12 @@ 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);
 
-      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.setChart02Data("test");
 
+      this.setChart05Data("test");
     },
     // beforeDestroy() {
     // 	this.cancelAutoUpdate();
@@ -755,6 +745,7 @@ export default {
       if (this.$refs.gridParent != undefined) {
         // gridHeight = gridHeight*0.9
         gridHeight = this.$refs.gridParent.offsetHeight - 35;
+        // console.log("gridHeight : ", gridHeight);
       }
       const myOptions = {
         // scrollX: false,
@@ -968,6 +959,7 @@ export default {
           title: "Energy Usage",
           isDarkMode: this.isDarkMode,
         });
+        console.log("charto:", chartOption);
         chartOption["series"][0]["data"][0].value =
           res[0]["effcRt"] != null ? res[0]["effcRt"] : 0;
         this.$store.state.pageData[myPrgmId][this.chart_01] = chartOption;
@@ -1174,12 +1166,12 @@ export default {
       //   series: seriesData,
       // };
 
+      console.log("chart 5 data:", seriesData);
       await this.$nextTick(() => {});
       this.setChartOption({
         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) {
@@ -1279,7 +1271,6 @@ export default {
         },
         series: seriesData,
       };
-
       await this.$nextTick(() => {});
       this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
     },
@@ -1413,7 +1404,6 @@ export default {
         chartKey: "compareEqpmTotChart",
         value: chartOption,
       });
-      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption
     },
     getGuageChartOption(chartName) {
       const gaugeColors = [
@@ -1659,6 +1649,7 @@ export default {
       }[state];
     },
     chartClickEvent(argData, $event) {
+      // console.log('chartClickEvent', argData);
       let pageMapper = {
         dashBoard_enrgUsageGauge: {
           pageName: "ems-effc-EnrgUseTotSummPage",
@@ -1723,7 +1714,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"]["name"];
+        return item.eqpmId == event["data"]["groupId"];
       });
       var data = {
         cmCycle: "CYC_DAY",

pages/ems/base/EffcIdxMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -20,35 +19,36 @@
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }" :addAll="true" :labelCols="12"
 								:textCols="12" :customClass="'select-large'" :iconShow="true" />
 						</v-col>
-						<v-col :cols="2.5" class="pr-4">
+						<v-col :cols="2.5">
 							<InputText :parentPrgmId="myPrgmId" label="검침개소명" valueNm="readPlcNm" :labelCols="12"
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
 
-						<BtnSearch @click="search" size="large" class="mr-2" />
+						<BtnSearch @click="search" size="large" />
 
 					</v-row>
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" class="mt-3">
-			<v-col :cols="5" class="h100 pr-2">
+		<v-row ref="contents" class="mt-4">
+			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4 pb-6">
 						<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-4" style="height:calc(100% - 76px)">
+					<div class="px-4">
 						<div ref="gridParent" class="w100 h100">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 								:parentPrgmId="myPrgmId" @getRowsData="getRowData"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
+								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true"
+								:dataPath="dataPathExample" />
 						</div>
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100 pl-2">
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4 pb-1 pa-4">검침개소 상세
 					</v-card-title>
@@ -134,7 +134,7 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			tab: null,
 			isImgTabDisabled: false,
 			items: [
@@ -157,6 +157,47 @@ export default {
 			],
 			detailList: myDetail,
 			defaultUseFg: 1,
+			dataPathExample: {
+				"rowGrid": {
+					data: sampleData,
+					column: [
+						{
+							header: '',
+							name: '',
+							align: 'center',
+							width: 50,
+							formatter: (props) => {
+								return `<label class="custom-radio">
+											<span class="radio-mark"></span>
+										</label>`;
+							}
+						},
+						{
+							header: '검침개소명',
+							name: 'readPlcNm',
+							align: 'left',
+							minWidth: 400,
+						},
+						{
+							header: '개소 종류',
+							name: 'plcKind',
+							minWidth: 100,
+							align: 'center',
+
+						},
+						{
+							header: '사용 여부',
+							name: 'useFg',
+							minWidth: 100,
+							align: 'center',
+
+						},
+
+					],
+					option: myOptions,
+
+				}
+			}
 			// loadTree: false
 		};
 	},
@@ -271,18 +312,18 @@ export default {
 		},
 		async initData() {
 			let ercList = [];
-			const res = await this.postApiReturn({
-				apiKey: 'selectErcInfo',
-				resKey: 'ercInfoData',
-				sendParam: {
-					blocId: this.userInfo.blocId,
-				},
-			});
-			res.forEach(item => {
-				const it = { text: item.ercNm, value: item.ercId };
-				ercList.push(it);
-			});
-			this.setPageData({ ercNmList: ercList });
+			// const res = await this.postApiReturn({
+			// 	apiKey: 'selectErcInfo',
+			// 	resKey: 'ercInfoData',
+			// 	sendParam: {
+			// 		blocId: this.userInfo.blocId,
+			// 	},
+			// });
+			// res.forEach(item => {
+			// 	const it = { text: item.ercNm, value: item.ercId };
+			// 	ercList.push(it);
+			// });
+			// this.setPageData({ ercNmList: ercList });
 		},
 		gridInit() {
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
@@ -293,12 +334,10 @@ export default {
 					resizable: true,
 				},
 				treeColumnOptions: {
-					name: 'readPlcNm',
+					name: 'eccNm',       // Showing tree table
+					useIcon: false,      // Not using icon
+					indentWidth: 10,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -307,22 +346,12 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{
-					header: '',
-					name: '',
-					align: 'center',
-					formatter: (props) => {
-						return `<span class="custom-radio">
-									<span class="radio-mark"></span>
-								</span>`;
-					}
-				},
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{
 					header: '검침개소명',
 					name: 'readPlcNm',
 					align: 'left',
-					minWidth: 350,
+					minWidth: 400,
 				},
 				{
 					header: '검침개소 ID',
@@ -926,50 +955,62 @@ const defaultData = {
 };
 
 const sampleData = [
-	{
-		readPlcNm: '서울 본사',
-		plcKind: '본사',
-		useFg: '사용',
-		_children: [
-			{
-				readPlcNm: '서울 본사 - 1층',
-				plcKind: '층',
-				useFg: '사용',
-			},
-			{
-				readPlcNm: '서울 본사 - 2층',
-				plcKind: '층',
-				useFg: '미사용',
-			},
-		],
-	},
-	{
-		readPlcNm: '부산 지사',
-		plcKind: '지사',
-		useFg: '사용',
-		_children: [
-			{
-				readPlcNm: '부산 지사 - A동',
-				plcKind: '건물',
-				useFg: '사용',
-				_children: [
-					{
-						readPlcNm: '부산 지사 - A동 1층',
-						plcKind: '층',
-						useFg: '사용',
-					},
-				],
-			},
-		],
-	},
-	{
-		readPlcNm: '대전 창고',
-		plcKind: '창고',
-		useFg: '미사용',
-	},
+  {
+    readPlcNm: '서울 본사',
+    plcKind: '본사',
+    useFg: '사용',
+    _children: [
+      {
+        readPlcNm: '서울 본사 - 1층',
+        plcKind: '층',
+        useFg: '사용',
+      },
+      {
+        readPlcNm: '서울 본사 - 2층',
+        plcKind: '층',
+        useFg: '미사용',
+      },
+    ],
+  },
+  {
+    readPlcNm: '부산 지사',
+    plcKind: '지사',
+    useFg: '사용',
+    _children: [
+      {
+        readPlcNm: '부산 지사 - A동',
+        plcKind: '건물',
+        useFg: '사용',
+        _children: [
+          {
+            readPlcNm: '부산 지사 - A동 1층',
+            plcKind: '층',
+            useFg: '사용',
+          },
+        ],
+      },
+    ],
+  },
+  {
+    readPlcNm: '대전 창고',
+    plcKind: '창고',
+    useFg: '미사용',
+  },
 ];
 
 
+
+const myOptions = {
+	columnOptions: {
+		resizable: true,
+	},
+	treeColumnOptions: {
+		name: 'readPlcNm',       // Showing tree table
+		useIcon: false,      // Not using icon
+		indentWidth: 10,
+	},
+}
+
 const myDetail = [
 	{
 		type: 'InputText',

pages/ems/base/EnrgResourceCenterMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -84,7 +83,7 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row >
+		<v-row ref="contents" style="height: calc(100vh - 400px)">
 			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex justify-space-between align-end">
@@ -114,7 +113,7 @@
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>에너지원 상세</v-card-title>
-					<div class="px-5" style="min-height: auto;">
+					<div class="px-5" style="height:calc(100% - 70px)">
 						<v-tabs v-model="tab">
 							<v-tab
 								v-for="item in items"
@@ -126,21 +125,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>
@@ -997,3 +996,6 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -31,7 +30,7 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" class="mt-3">
-			<v-col :cols="5" class="pr-2">
+			<v-col :cols="5" class="h100 pr-2">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex align-center justify-space-between pa-5">
 						물리량 리스트
@@ -50,7 +49,7 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="pl-2">
+			<v-col :cols="7" class="h100 pl-2">
 				<v-card class="pb-5 px-4">
 					<v-card-title class="px-0">물리량 상세</v-card-title>
 					<v-row no-gutters>
@@ -114,7 +113,7 @@
 							<component :is="'TextArea'" :parentPrgmId="myPrgmId" ref="TextArea" :item="calcDescItem" />
 						</v-col>
 					</v-row>
-					<v-row no-gutters v-show="argContentShowFlag" align="end" >
+					<v-row no-gutters v-show="argContentShowFlag">
 						<v-col :cols="12" class="py-2">
 							<label for="">
 								<v-icon small
@@ -122,13 +121,13 @@
 								계산Argument
 							</label>
 						</v-col>
-						<v-col :cols="6" class="py-2 pr-4">
+						<v-col :cols="6" class="py-2">
 							<InputText :parentPrgmId="myPrgmId" label="ARG갯수" valueNm="argCnt" :labelCols="12"
-								:textCols="12" :iconShow="false" :required="requiredValueList[7]"
+								:textCols="12" :iconShow="true" :required="requiredValueList[7]"
 								:disabled="disabledValueList[7]" :readonly="readOnlyValueList[7]" />
 						</v-col>
-						<!-- <v-col :cols="4"> </v-col> -->
-						<v-col :cols="6" class="py-2" align="right">
+						<v-col :cols="4"> </v-col>
+						<v-col :cols="12" class="py-2" align="right">
 							<a-button type="primary" @click="btnAction('add')" class="v-btn-add-text mr-1" icon="plus">추가</a-button>
 							<a-button type="danger" @click="btnAction('remove')" ghost danger icon="delete">삭제</a-button>
 						</v-col>
@@ -225,6 +224,61 @@ 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,
 
@@ -899,8 +953,6 @@ export default {
 					height: 37,
 				},
 				rowHeight: 'auto',
-				scrollX: true,
-				scrollY: true,
 			};
 
 			this.setGridOption({
@@ -914,7 +966,7 @@ export default {
 					header: '물리량 ID',
 					name: 'pysclQtyId',
 					width: 100,
-					align: 'left',
+					align: 'center',
 				},
 				{ header: '설비그룹 ID', name: 'eqpmGrpId', hidden: true },
 				{ header: 'argCnt', name: 'argCnt', hidden: true },

pages/ems/base/EqpmKindPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle/>
+		<PageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -359,7 +359,7 @@ const myDetail = [
 		label: '설비종류 ID',
 		valueNm: 'eqpmKindId',
 		cols: 6,
-		class: 'py-2 pr-4 pt-1',
+		class: 'py-2 pr-4',
 		iconShow: true,
 		required: false,
 		readonly: true,
@@ -373,7 +373,7 @@ const myDetail = [
 		valueNm: 'eqpmKindNm',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-1',
+		class: 'py-2 pl-4',
 		iconShow: true,
 		required: true,
 		labelCols: 12,

pages/ems/base/EquipmentGroupMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
+		<PageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -461,7 +461,7 @@ const myDetail = [
 		valueNm: 'eqpmGrpId',
 		disabled: true,
 		cols: 6,
-		class: 'py-2 pr-4 pt-1',
+		class: 'py-2 pr-4',
 		required: false,
 		iconShow: true,
 		labelCols: 12,
@@ -474,23 +474,24 @@ const myDetail = [
 		valueNm: 'eqpmGrpNm',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-1',
+		class: 'py-2 pl-4',
 		required: true,
 		iconShow: true,
 		labelCols: 12,
 		textCols: 12,
 	},
-	
 	{
 		type: 'CheckBox',
 		label: '사용 여부',
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-4',
+		class: 'py-2 pr-4 pt-5',
 		value: { '1': true, '0': false },
 		required: true,
 		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'SelectBox',

pages/ems/base/EquipmentMasterMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -35,23 +34,23 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<v-col :cols="5" >
+			<v-col :cols="5" class="h100">
 				<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 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 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>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" >
+			<v-col :cols="7" class="h100">
 				<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)">
@@ -288,7 +287,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,7 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -42,7 +41,7 @@
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 								:parentPrgmId="myPrgmId" @getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
-						<div class="d-flex py-4 mt-4" >
+						<div class="d-flex py-4" >
 							<component :is="'Form'" :parentPrgmId="myPrgmId" :detailList="detailList"
 							@gridEditingFinish="gridEditingFinish" />
 						</div>
@@ -119,6 +118,109 @@ 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: {
@@ -524,7 +626,59 @@ 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',
@@ -1298,7 +1452,7 @@ const myDetail = [
 		class: 'pa-3',
 		// required: true,
 		openMode: 'ALL',
-		disabled: true,
+		disabled: false,
 		eqpmKindId: '',
 		eqpmGrpId: '',
 		closeBtnFg: true,

pages/ems/base/GdStndMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
-		<v-row ref="searchFilter" class="mt-2">
+		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>

pages/ems/base/PastRsltDataReadPage.vue

@@ -1,27 +1,63 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
+		<PageTitle text="측정 위치 데이터 조회" />
 
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<v-col :cols="3">
-							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
-								:textCols="12" customClass="select-large" />
+						<v-col :cols="2">
+							<component
+								:is="'SelectBlocMstr'"
+								ref="SelectBlocMstr"
+								:parentPrgmId="myPrgmId"
+								:textCols="12"
+								customClass="select-large"
+							/>
 						</v-col>
+						<!-- <v-col :cols="2">
+							<component
+								label="검침개소"
+								:is="'PastRsltDataReadPop'"
+								:parentPrgmId="myPrgmId"
+							/>
+						</v-col> -->
+						<!-- <v-col :cols="2">
+               <component 
+              :is="'SelectTagNmList'"
+              ref="SelectTagNmList"
+              :parentPrgmId="myPrgmId"
+              />
+            </v-col> -->
 						<v-col :cols="3">
-							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								customClass="select-large" />
+							<!-- <component
+								:is="'PastRsltDataReadTagPop'"
+								:parentPrgmId="myPrgmId"
+								:label="'TAG'"
+							/> -->
+							<component
+								:is="'EvtObjPop'"
+								:parentPrgmId="myPrgmId"
+								:item="evtObjPopItem"
+								customClass="select-large"
+							/>
 						</v-col>
-						<v-col :cols="3">
-							<!-- 대상일 -->
-							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12"
-								customClass="datepicker-large" />
+						<v-col :cols="4">
+							<component
+								:is="'Datepicker'"
+								:parentPrgmId="myPrgmId"
+								:label="'조회기간'"
+								:textCols="12"
+							/>
 						</v-col>
-						<v-col :cols="3" class="d-flex align-end justify-end text-right">
-							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
-								size="large" />
+						 <v-col :cols="3" class="d-flex align-end justify-end text-right">
+							 <BtnExcelDownload
+							 	class="mr-1"
+								:parentPrgmId="myPrgmId"
+								:gridName="gridName"
+								type="primary"
+								size="large"
+							/>
 							<BtnSearch @click="search" size="large" />
 						</v-col>
 					</v-row>
@@ -32,12 +68,12 @@
 			<v-col :cols="12" style="height: 100%" class="h100">
 				<v-card class="px-5 py-5 h100">
 					<div ref="gridParent" class="h100 px-5" style="height: 100%">
-						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
-							:parentPrgmId="myPrgmId" />
-					</div>
-					<div class="d-flex align-center justify-space-between">
-						<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
-							@loadData="changeGrid" />
+						<component
+							ref="myGrid"
+							:is="loadGrid ? 'Grid' : null"
+							:gridName="gridName"
+							:parentPrgmId="myPrgmId"
+						/>
 					</div>
 				</v-card>
 			</v-col>
@@ -61,7 +97,7 @@ import BtnExcelDownload from '~/components/common/button/BtnExcelDownload';
 import DateUtility from '~/plugins/dateUtility';
 // import Search from "~/components/common/search";
 import EvtObjPop from '~/components/common/modal/EvtObjPop';
-import pagination from '~/components/Pagination';
+import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 // const myPrgmId = "PRG0052";
@@ -94,7 +130,7 @@ export default {
 		PastRsltDataReadPop,
 		PastRsltDataReadTagPop,
 		EvtObjPop,
-		pagination,
+		PageTitle,
 	},
 	data() {
 		return {
@@ -110,16 +146,12 @@ export default {
 				valueNm2: 'tagNm',
 				iconShow: true,
 				disabled: false,
+				labelCols: 12,
 				textCols: 12,
 				class: 'py-2',
 				required: false,
 				formFg: false,
 			},
-			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
-			page: 1,
-			totalCount: 0,
 		};
 	},
 	computed: {
@@ -132,6 +164,9 @@ export default {
 		chkTagId() {
 			return this.pageData.tagList === undefined ? null : this.pageData.tagId;
 		},
+		// chkTagList() {
+		// 	return this.pageData.tagList;
+		// },
 		chkTagNm() {
 			return this.pageData.tagData.tagNm;
 		},
@@ -141,16 +176,18 @@ export default {
 	},
 	watch: {
 		chkIsFind(val) {
-			if (val) {
-				this.page = 1;
-				this.search();
-			}
+			if (val) this.search();
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
 				this.search();
 			}
 		},
+		// chkTagList() {
+		// 	if(this.initFlag){
+		// 		this.search();
+		// 	}
+		// },
 		chkTagNm() {
 			if (this.initFlag) {
 				this.search();
@@ -170,7 +207,7 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() { },
+	created() {},
 	async mounted() {
 		await this.setFromDt();
 		await this.init();
@@ -293,7 +330,6 @@ export default {
 			this.loadGrid = false;
 
 			let res = [];
-			let res2 = [];
 			let yearQuarterData = [];
 			yearQuarterData = this.yearQuarterMaker([
 				this.pageData.fromDt,
@@ -345,18 +381,8 @@ export default {
 					apiKey: 'selectTagRawDataByQuarter',
 					resKey: 'pastRsltReadData',
 					sendParam: sendParams,
-					limit: this.limit,
-					page: this.page,
-					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				});
 
-				res2 = await this.postApiReturn({
-					apiKey: 'selectTagRawDataByQuarterPageTotal',
-					resKey: 'pastRslPageTotal',
-					sendParam: sendParams
-				});
-				this.totalCount = res2[0].totalcount;
-
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -367,9 +393,6 @@ export default {
 					fromDt: this.pageData.fromDt,
 					toDt: this.pageData.toDt,
 					yearQuarterList: yearQuarterData['yearQuarterList'],
-					limit: this.limit,
-					page: this.page,
-					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				};
 				sendParams['tagId'] = this.pageData.tagId;
 				//
@@ -387,14 +410,6 @@ export default {
 					sendParam: sendParams,
 				});
 
-				res2 = await this.postApiReturn({
-					apiKey: 'selectTagRawDataByQuarterPageTotal',
-					resKey: 'pastRslPageTotal',
-					sendParam: sendParams
-				});
-
-				this.totalCount = res2[0].totalcount;
-
 				this.setGridData({
 					gridKey: this.gridName,
 					value: res,
@@ -472,12 +487,6 @@ export default {
 			finalResult['yearQuarterList'] = result;
 			return finalResult;
 		},
-		changeGrid: async function (pageNum, limit) {
-			this.page = pageNum;
-			this.limit = limit;
-
-			this.search();
-		},
 	},
 };
 

pages/ems/base/ReadObjectMngPage.vue

@@ -28,7 +28,7 @@
 								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="3">
+						<v-col  :cols="3">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="검침대상명"
@@ -59,16 +59,19 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</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 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"
+								:dataPath="dataPathMock"
+							/>
+						</div>
 					</div>
 				</v-card>
 			</v-col>
@@ -78,7 +81,7 @@
 						>검침대상 상세
 					</v-card-title>
 					<div class="px-5" style="height:calc(100% - 76px)">
-						<v-tabs v-model="tab">
+						<v-tabs v-model="tab" >
 							<v-tab
 								v-for="item in items"
 								:key="item.id"
@@ -185,8 +188,26 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			tab: null,
+			dataPathMock: {
+				"rowGrid": {
+				column: [
+					{ header: '검침 대상 ID', name: 'readObjId', align: 'left' },
+					{ header: '검침 대상 명', name: 'readObjNm', align: 'left' },
+					{ header: '검침 대상 유형', name: 'readObjKind', align: 'left' },
+					{ header: '그룹', name: 'grpCd', align: 'left' },
+					{ header: 'TJ 환산계수', name: 'tjCvrtCoef', align: 'right' },
+					{ header: 'TOE 환산계수', name: 'toeCvrtCoef', align: 'right' },
+					{ header: 'CO2 환산계수', name: 'co2CvrtCoef', align: 'right' },
+					{ header: '단위', name: 'unitCd', align: 'left' },
+					{ header: '사용 여부', name: 'useFg', align: 'center' },
+				],
+				data: dataPathDataExample,
+				defaultRow: dataPathDataExample,
+				option: {}
+				}
+			},
 			items: [
 				{
 					name: '검침 대상 정보',
@@ -703,8 +724,8 @@ const defaultData = {
 		},
 		buttonAuth: {
 			add: true,
-			remove: true,
 			save: true,
+			remove: true,
 			excel: false,
 		},
 	},
@@ -852,7 +873,40 @@ const myDetail = [
 		required: true,
 	},
 ];
+const dataPathDataExample = [
+	{
+	readObjId: 'OBJ001',
+	readObjNm: '서울 본사',
+	readObjKind: 'TYPE01',
+	grpCd: 'GRP01',
+	tjCvrtCoef: 1.25,
+	toeCvrtCoef: 0.85,
+	co2CvrtCoef: 2.1,
+	unitCd: 'kWh',
+	useFg: '1',
+	},
+	{
+	readObjId: 'OBJ002',
+	readObjNm: '부산 지사',
+	readObjKind: 'TYPE02',
+	grpCd: 'GRP02',
+	tjCvrtCoef: 1.10,
+	toeCvrtCoef: 0.90,
+	co2CvrtCoef: 1.8,
+	unitCd: 'MJ',
+	useFg: '0',
+	},
+	{
+	readObjId: 'OBJ003',
+	readObjNm: '대전 공장',
+	readObjKind: 'TYPE03',
+	grpCd: 'GRP01',
+	tjCvrtCoef: 1.30,
+	toeCvrtCoef: 0.95,
+	co2CvrtCoef: 2.3,
+	unitCd: 'GJ',
+	useFg: '1',
+	}
+];
+
 </script>
-<style lang="scss">
-@import '@/assets/scss/common.scss';
-</style>

pages/ems/base/ReadResultCloseMngPage.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="l-layout">
-    <CommonPageTitle />
+    <!-- <h2 class="title">
+			<v-icon small color="primary" class="mr-1">mdi-circle</v-icon>
+			계량 데이터 마감 관리
+		</h2> -->
+    <PageTitle text="계량 데이터 마감 관리" />
+
     <v-row ref="searchFilter">
       <!-- 조회조견 -->
       <v-col :cols="12">
@@ -70,8 +75,8 @@
     </v-row>
     <v-row ref="contents">
       <!-- 일일검침정보 목록-->
-      <v-col :cols="12">
-        <v-card class="pb-5 w100">
+      <v-col :cols="12" class="h100">
+        <v-card class="pb-5">
           <div class="d-flex align-center justify-space-between pa-5">
             <v-card-title class="custom-title-4 pa-0">일일검침정보</v-card-title>
             <div class="d-flex align-center">
@@ -86,18 +91,20 @@
                 type="primary"
                 :ripple="false"
                 @click="saveReadResultCloseMng('N')"
+                >일마감</a-button
               >
-                일마감
-              </a-button>
             </div>
           </div>
-          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
+          <div class="px-5" style="min-height: calc(100% - 76px)">
+            <div ref="gridParent" class="h100 w100">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
                 :parentPrgmId="myPrgmId"
                 :gridName="gridName"
+                :dataPath="dataPathMock"
               />
+            </div>
           </div>
         </v-card>
       </v-col>
@@ -116,6 +123,7 @@ import selectCodeList from "@/components/common/select/selectCodeList";
 import SelectMttList from "@/components/common/select/SelectMttList";
 import Datepicker from "~/components/common/Datepicker";
 import BtnExcelDownload from "~/components/common/button/BtnExcelDownload";
+import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 // const myPrgmId = "PRG0018";
@@ -143,12 +151,13 @@ export default {
     Datepicker,
     Search,
     Grid,
+    PageTitle,
   },
   data() {
     return {
       myPrgmId: myPrgmId,
       gridName: "rowGrid",
-      loadGrid: false,
+      loadGrid: true,
       dataPathMock: {
         rowGrid: {
           column: [
@@ -242,10 +251,6 @@ export default {
         columnOptions: {
           resizable: true,
         },
-        pageOptions: {
-					useClient: true,
-					perPage: 13,
-				},
       };
       this.setGridOption({
         gridKey: this.gridName,
@@ -255,6 +260,7 @@ export default {
         gridKey: this.gridName,
         value: myColumns,
       });
+      this.loadGrid = true;
     },
     async search() {
       await this.getRowGridData();
@@ -282,12 +288,8 @@ export default {
             mgnf: item.mgnf || 0,
           })),
         });
-        // console.log('--------------DEBUG-----res-------', res);
       }
       this.setPageData({ isFind: false });
-      this.$nextTick(() => {
-        this.loadGrid = true;
-      })
     },
     //전월 or 일 마감--------------------------------------------------------------------------------------------
     async saveReadResultCloseMng(mnthYn) {

pages/ems/base/TagMngPage.vue

@@ -1,43 +1,61 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<!-- 사업장 -->
-							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
-								:textCols="12" customClass="select-large" />
+							<component
+								:is="'SelectBlocMstr'"
+								ref="SelectBlocMstr"
+								:parentPrgmId="myPrgmId"
+							/>
 						</v-col>
 						<v-col :cols="3">
-							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'측정 Data 유형'"
-								dataKey="searchReadDataType" :sendParam="{ commGrpCd: 'EM_READ_DATA_TYPE', useFg: '1' }"
-								:addAll="true" :textCols="12" customClass="select-large" />
+							<component
+								:is="'selectCodeList'"
+								:parentPrgmId="myPrgmId"
+								:label="'측정 Data 유형'"
+								dataKey="searchReadDataType"
+								:sendParam="{ commGrpCd: 'EM_READ_DATA_TYPE', useFg: '1' }"
+								:addAll="true"
+							/>
 						</v-col>
 						<v-col :cols="3">
-							<component :is="'SelectReadObj'" :parentPrgmId="myPrgmId" :label="'측정대상'"
-								dataKey="searchReadObj" :sendParam="{ useFg: '1' }" :labelCols="12" :textCols="12"
-								:addAll="true" customClass="select-large" />
+							<component
+								:is="'SelectReadObj'"
+								:parentPrgmId="myPrgmId"
+								:label="'측정대상'"
+								dataKey="searchReadObj"
+								:sendParam="{ useFg: '1' }"
+								:addAll="true"
+							/>
+						</v-col>
+						<v-col :cols="3" class="text-right">
+							<BtnSearch @click="search" />
 						</v-col>
-
 					</v-row>
-					<v-row align="end" no-gutters>
+					<v-row align="center" no-gutters>
 						<v-col :cols="3">
-							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'" dataKey="useFg"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }" :addAll="true" :textCols="12"
-								customClass="select-large" />
+							<component
+								:is="'selectCodeList'"
+								:parentPrgmId="myPrgmId"
+								:label="'사용여부'"
+								dataKey="useFg"
+								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
+								:addAll="true"
+							/>
 						</v-col>
-						<v-col :cols="3">
-							<InputText :parentPrgmId="myPrgmId" label="TAG ID" valueNm="tagId" :labelCols="12"
-								:textCols="12" :searchOption="true" customClass="input-large" />
-						</v-col>
-						<v-col :cols="3">
-							<InputText :parentPrgmId="myPrgmId" label="TAG명" valueNm="tagNm" :labelCols="12"
-								:textCols="12" :searchOption="true" customClass="input-large" />
-						</v-col>
-						<v-col :cols="3" class="d-flex align-end justify-end text-right">
-							<BtnSearch @click="search" size="large" />
+						<v-col :cols="6">
+							<InputText
+								:parentPrgmId="myPrgmId"
+								label="TAG명"
+								valueNm="tagNm"
+								:labelCols="2"
+								:textCols="9"
+								:searchOption="true"
+							/>
 						</v-col>
 					</v-row>
 				</v-card>
@@ -48,33 +66,63 @@
 				<v-card class="pb-5">
 					<v-card-title class="d-flex justify-space-between align-end">
 						<span class="tit ft-size_20 ft-weight_600">TAG 정보</span>
-						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
-							:btnActionsFnc="btnActions" />
+						<Buttons
+							:parentPrgmId="myPrgmId"
+							:bindingData="gridName"
+							:detailList="detailList"
+							:btnActionsFnc="btnActions"
+						/>
 					</v-card-title>
 					<v-card-actions>
-						<div ref="gridParent" class="w100" style="height: calc(100vh - 400px)">
-							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
-								:parentPrgmId="myPrgmId" @getRowsData="getRowData"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
+						<div
+							ref="gridParent"
+							class="w100"
+							style="height: calc(100vh - 360px)"
+						>
+							<component
+								:ref="gridName"
+								:is="loadGrid ? 'Grid' : null"
+								:gridName="gridName"
+								:parentPrgmId="myPrgmId"
+								@getRowsData="getRowData"
+								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
+								:selectedRowDataWatchFlag="true"
+							/>
 						</div>
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="">
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>TAG 상세</v-card-title>
 					<div class="px-5" style="height:calc(100% - 70px)">
 						<v-tabs v-model="tab">
-							<v-tab v-for="item in items" :key="item.id" :disabled="item.disabledFlag">
+							<v-tab
+								v-for="item in items"
+								:key="item.id"
+								:disabled="item.disabledFlag"
+							>
 								{{ item.name }}
 							</v-tab>
 						</v-tabs>
-						<v-tabs-items v-model="tab" style="height: calc(100% - 65px);" class="py-6">
+						<v-tabs-items
+							v-model="tab"
+							style="height: calc(100% - 65px);"
+							class="py-6"
+						>
 							<v-tab-item v-for="(item, idx) in items" :key="item.id">
-								<component v-if="item.id == 'tagBaseInfoTab'" :is="'Form'" :parentPrgmId="myPrgmId"
-									:detailList="detailList" @gridEditingFinish="gridEditingFinish" />
-								<TagAddInfoTab v-if="item.id == 'tagAddInfoTab'" :parentPrgmId="myPrgmId"
-									:innerTabGridInfo="{ tab, idx }" />
+								<component
+									v-if="item.id == 'tagBaseInfoTab'"
+									:is="'Form'"
+									:parentPrgmId="myPrgmId"
+									:detailList="detailList"
+									@gridEditingFinish="gridEditingFinish"
+								/>
+								<TagAddInfoTab
+									v-if="item.id == 'tagAddInfoTab'"
+									:parentPrgmId="myPrgmId"
+									:innerTabGridInfo="{ tab, idx }"
+								/>
 							</v-tab-item>
 						</v-tabs-items>
 					</div>
@@ -86,7 +134,6 @@
 <script>
 import { mapState, mapMutations, mapActions } from 'vuex';
 import mixinGlobal from '@/mixin/global.js';
-import { resize } from '@/mixin/resize.js';
 import BtnSearch from '~/components/common/button/BtnSearch';
 import Buttons from '~/components/common/button/Buttons';
 import SelectBlocMstr from '@/components/common/select/SelectBlocMstr';
@@ -102,7 +149,7 @@ let myTitle;
 // const myPrgmId = "PRG0051";
 let myPrgmId;
 export default {
-	mixins: [mixinGlobal, resize],
+	mixins: [mixinGlobal],
 	async asyncData(context) {
 		const myState = context.store.state;
 		// context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
@@ -172,19 +219,15 @@ export default {
 		},
 		chkBlocId() {
 			this.setPageData({ isFind: true });
-			// this.search();
 		},
 		chkReadDataType() {
 			this.setPageData({ isFind: true });
-			// this.search();
 		},
 		chkReadObj() {
 			this.setPageData({ isFind: true });
-			// this.search();
 		},
 		chkUseFg() {
 			this.setPageData({ isFind: true });
-			// this.search();
 		},
 	},
 	async beforeCreate() {
@@ -254,16 +297,12 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 16;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
 
 			const myOptions = {
 				columnOptions: {
 					resizable: true,
 				},
-				scrollX: true,
-				header: {
-					height: 38,
-				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -277,21 +316,21 @@ export default {
 					header: 'TAG ID',
 					name: 'tagId',
 					width: 'auto',
-					minWidth: 340,
+					minWidth: 280,
 					align: 'left',
 				},
 				{
 					header: 'TAG 명',
 					name: 'tagNm',
 					width: 'auto',
-					minWidth: 220,
+					minWidth: 140,
 					align: 'left',
 				},
 				{
 					header: '측정 값 유형',
 					name: 'readDataTypeCd',
-					width: 90,
-					align: 'left',
+					width: 100,
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.readDataTypeCdList.filter(
@@ -307,7 +346,7 @@ export default {
 					header: '측정대상',
 					name: 'readObjId',
 					width: 100,
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.readObjList.filter(
@@ -324,7 +363,7 @@ export default {
 					header: '단위',
 					name: 'unitCd',
 					width: 80,
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.unitCdList.filter(
@@ -454,7 +493,6 @@ export default {
 						readObjId: this.pageData.searchReadObj,
 						useFg: this.pageData.useFg,
 						tagNmLike: this.pageData.tagNm,
-						tagIdLike: this.pageData.tagId,
 					},
 				});
 			} else {
@@ -713,8 +751,7 @@ export default {
 							});
 
 							this.$nextTick(() => {
-								// this.setPageData({ isFind: true });
-								this.search();
+								this.setPageData({ isFind: true });
 							});
 						}
 					} else {
@@ -781,7 +818,6 @@ function isValidAlrmVal(obj) {
 
 const defaultData = {
 	/* 검색옵션 */
-	tagId: '',
 	tagNm: '',
 	blocId: '',
 	blocMstrList: [],
@@ -871,39 +907,30 @@ const myDetail = [
 		label: 'TAG ID',
 		valueNm: 'tagId',
 		disabled: false,
-		iconShow: true,
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2',
 		required: false,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'InputText',
 		label: 'TAG 명',
 		valueNm: 'tagNm',
 		disabled: false,
-		iconShow: true,
 		cols: 6,
-		class: 'py-2 pl-4',
+		class: 'py-2',
 		required: false,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
 		label: '측정 값 유형',
 		valueNm: 'readDataTypeCd',
 		disabled: false,
-		iconShow: true,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
+		class: 'py-2',
 		list: 'readDataTypeCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
 		required: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
@@ -911,14 +938,11 @@ const myDetail = [
 		valueNm: 'readObjId',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-5',
+		class: 'py-2',
 		list: 'readObjList',
 		itemText: 'readObjNm',
 		itemValue: 'readObjId',
 		required: true,
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -926,11 +950,8 @@ const myDetail = [
 		valueNm: 'mgnf',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
+		class: 'py-2',
 		required: true,
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
@@ -938,13 +959,10 @@ const myDetail = [
 		valueNm: 'unitCd',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-5',
+		class: 'py-2',
 		list: 'unitCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -952,10 +970,7 @@ const myDetail = [
 		valueNm: 'rangMin',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
+		class: 'py-2',
 	},
 	{
 		type: 'InputText',
@@ -963,10 +978,7 @@ const myDetail = [
 		valueNm: 'rangMax',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-5',
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
+		class: 'py-2',
 	},
 	{
 		type: 'InputText',
@@ -974,10 +986,7 @@ const myDetail = [
 		valueNm: 'alrmHihi',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
+		class: 'py-2',
 	},
 	{
 		type: 'InputText',
@@ -985,10 +994,7 @@ const myDetail = [
 		valueNm: 'alrmHi',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-5',
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
+		class: 'py-2',
 	},
 	{
 		type: 'InputText',
@@ -996,10 +1002,7 @@ const myDetail = [
 		valueNm: 'alrmLo',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
+		class: 'py-2',
 	},
 	{
 		type: 'InputText',
@@ -1007,10 +1010,7 @@ const myDetail = [
 		valueNm: 'alrmLolo',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-5',
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
+		class: 'py-2',
 	},
 	{
 		type: 'CheckBox',
@@ -1018,11 +1018,8 @@ const myDetail = [
 		valueNm: 'totFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 pt-5',
+		class: 'py-2',
 		value: { '1': true, '0': false },
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'CheckBox',
@@ -1030,12 +1027,9 @@ const myDetail = [
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 pt-5',
+		class: 'py-2',
 		value: { '1': true, '0': false },
 		required: false,
-		iconShow: true,
-		labelCols: 12,
-		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
@@ -1062,4 +1056,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
+</script>

pages/ems/base/TagMngPage_Pagination.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle/>
+		<PageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -58,7 +58,7 @@
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
 						</div>
 					</v-card-actions>
-					<div class="d-flex align-center justify-space-between">
+					<!-- <div class="d-flex align-center justify-space-between">
 						<pagination
 							id="pagination"
 							:total-count="totalCount"
@@ -66,10 +66,10 @@
 							:limit="limit"
 							@loadData="changeGrid"
 						/>
-					</div>
+					</div> -->
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="">
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>TAG 상세</v-card-title>
 					<div class="px-5" style="height:calc(100% - 70px)">
@@ -107,6 +107,7 @@ import TagAddInfoTab from '@/components/pages/ems/TagInfo/TagAddInfoTab';
 import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
 import pagination from '~/components/Pagination';
+import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 // const myPrgmId = "PRG0051";
@@ -139,12 +140,13 @@ export default {
 		TagAddInfoTab,
 		Grid,
 		pagination,
+		PageTitle
 	},
 	data() {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: false,
+			loadGrid: true,
 			tab: null,
 			items: [
 				{ name: 'TAG 정보', id: 'tagBaseInfoTab', disabledFlag: false },
@@ -273,12 +275,16 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 16;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 180;
 
 			const myOptions = {
 				columnOptions: {
 					resizable: true,
 				},
+				pageOptions: {
+					useClient: true,
+					perPage: 10,
+				},
 				scrollX: true,
 				header: {
 					height: 38,
@@ -521,16 +527,16 @@ export default {
 							//rowKey: 0,
 							rowKey:
 								this.pageData.rowGridSelectKey == '' ||
-								this.pageData.rowGridSelectKey == null
+									this.pageData.rowGridSelectKey == null
 									? 0
 									: this.pageData.rowGridSelectKey ==
-									  this.$refs[this.gridName].getData().length - 1
-									? this.pageData.rowGridSelectKey
-									: 0,
+										this.$refs[this.gridName].getData().length - 1
+										? this.pageData.rowGridSelectKey
+										: 0,
 							columnName: 'tagId',
 							setScroll: true,
 						});
-					} catch (error) {}
+					} catch (error) { }
 					// this.$refs[this.gridName].focus({
 					//   rowKey: 0,
 					//   columnName: "tagId",
@@ -767,7 +773,7 @@ export default {
 		gridEditingFinish(data) {
 			this.$refs[this.gridName].editingFinish(data);
 		},
-		changeGrid: async function(pageNum, limit) {
+		changeGrid: async function (pageNum, limit) {
 			this.page = pageNum;
 			this.limit = limit;
 
@@ -811,9 +817,9 @@ function isValidAlrmVal(obj) {
 			if (Number(obj[keyList[i]]) >= Number(obj[keyList[j]])) {
 				alert(
 					nameList[j] +
-						'값은 ' +
-						nameList[i] +
-						'값보다 큰 숫자를 입력해야 합니다.',
+					'값은 ' +
+					nameList[i] +
+					'값보다 큰 숫자를 입력해야 합니다.',
 				);
 				return false;
 			}
@@ -1106,4 +1112,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
+</script>

pages/ems/effc/DataSetMngPage.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="l-layout">
-    <CommonPageTitle />
     <!-- Dataset 페이지 시작 -->
     <div v-if="pageActionFlag == 'list'" class="h100">
       <v-row ref="searchFilter">
@@ -35,23 +34,23 @@
         </v-col>
       </v-row>
       <v-row ref="contents">
-        <v-col :cols="5" >
+        <v-col :cols="5" class="h100">
           <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">Data Set 리스트</v-card-title>
               <Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
                 :btnActionsFnc="btnActions" />
             </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" />
-              <!-- <div ref="gridParent" class="w100 h100">
-              </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" />
+              </div>
             </div>
           </v-card>
         </v-col>
-        <v-col :cols="7" >
+        <v-col :cols="7" class="h100">
           <v-card class="pb-5">
             <v-card-title class="custom-title-4" style="min-height:76px;">Data Set 상세
             </v-card-title>

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

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

pages/ems/effc/EnrgMapPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -159,8 +158,8 @@ export default {
 	},
 	async created() { },
 	async mounted() {
-		// this.initTest();
-		// return;
+		this.initTest();
+		return;
 
 		this.init();
 		// document.querySelector('.icon_arrow').style.width = document.querySelector('.iconArrowCols').clientWidth-20 + "px";

pages/ems/effc/EnrgReptMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
+		<PageTitle text="효율성 지표 보고서" />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -98,6 +98,7 @@ import Chart from '~/components/common/Chart';
 import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
 import DateUtility from '~/plugins/dateUtility';
 import XLSX from 'xlsx';
+import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 let myPrgmId;
@@ -129,6 +130,7 @@ export default {
 		EqpmSelectPop,
 		DateUtility,
 		XLSX,
+		PageTitle,
 	},
 	data() {
 		return {

pages/ems/effc/EnrgUsePlanPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -10,20 +9,20 @@
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" customClass="select-large" />
+								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" />
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"
-								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" customClass="select-large"/>
+								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" />
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox3" :propsValue="selectValue03" :itemList="selectValueList03"
-								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" customClass="select-large" />
+								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" />
 						</v-col>
 
-						<BtnSearch size="large" @click="search" />
-						<!-- <v-col>
-						</v-col> -->
+						<BtnSearch @click="search" />
+						<v-col>
+						</v-col>
 						<component ref="EnrgUsePlanModiPop" :is="'EnrgUsePlanModiPop'" :label="'test'" :parentPrgmId="myPrgmId"
 							@gridEditingFinish="gridEditingFinish" />
 					</v-row>
@@ -31,15 +30,18 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<v-col :cols="12" >
-				<v-card class="pb-5">
+			<v-col :cols="12" style="height: 100%">
+				<v-card class="pb-5 h100">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<v-card-title class="pa-0 custom-title-4">설비별 에너지 계획 리스트</v-card-title>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</div>
-					<div ref="gridParent" class="px-5" style="min-height: 60vh;">
-						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-							:editorGrid="true" @getRowsData="getRowData" />
+					<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"
+								:editorGrid="true" @getRowsData="getRowData" :dataPath="dataPathMock" />
+
+						</div>
 					</div>
 				</v-card>
 			</v-col>
@@ -169,8 +171,8 @@ export default {
 	created() { },
 	async mounted() {
 		// -------
-		// this.initTest();
-		// return;
+		this.initTest();
+		return;
 		// ========End test===========
 		await this.init();
 		this.initedFlag = true;
@@ -418,25 +420,53 @@ export default {
 
 			class CustumButton {
 				constructor(props) {
+					// v-btn v-btn--is-elevated v-btn--has-bg theme--dark v-size--default
+					const el = document.createElement('button');
 					const { grid, rowKey, columnInfo } = props;
 
-					const gridData = grid.store.data.rawData;
-					const value = gridData[rowKey][columnInfo.name];
+					$(el).addClass('tui-grid-cell-content');
+					// $(el).css('text-align', 'center');
+					el.classList.add('v-btn');
+					// el.style.width = '80%';
+					// el.style.height = '80%';
+					// el.style.boxShadow = '0px 0px 0px 2px #cbced6';
+					// el.style.background = 'linear-gradient(to bottom, #242940 5%, #476e9e 100%)';
+					// el.style.backgroundColor = '#144985';
+					el.style.borderRadius = '7px';
+					el.style.border = '1px solid #4e6096';
+					// el.style.display = 'inline-block';
+					// el.style.cursor = 'pointer';
+					el.style.color = '#ffffff';
+					// el.style.fontFamily = 'Arial';
+					el.style.padding = '6% 3%';
 
+					// el.style.textDecoration = 'none';
+					// el.style.textShadow = '0px 1px 0px #283966';
+
+					el.innerText = columnInfo.renderer.options.value;
+					this.el = el;
 					this.disabled = columnInfo.renderer.options.disabled || false;
-					const elDiv = document.createElement('div');
-					elDiv.innerHTML = `<span>${value}</span>`;
-					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
-					const el2 = document.createElement('button');
-					$(el2).addClass('edit-btn blue--text');
-					el2.innerText = 'Edit';
-					elDiv.appendChild(el2);
-
-					this.el = elDiv;
 
 					if (!this.disabled) {
+						// hover 기능 구현
+						this.el.addEventListener('mouseover', function (event) {
+							// console.log('darkModeFg', _this.darkModeFg);
+							// console.log('event',event.fromElement);
+							// console.log('event',document.defaultView.getComputedStyle(el).getPropertyValue('background-color'));
+							// rgb(85, 130, 220) // light
+							// el.style.backgroundColor = '#26578F';	// rgb(20, 73, 133) // dark
+							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
+							// el.style.backgroundColor = btnColor['mouseOver'];
+						});
+						this.el.addEventListener('mouseout', function (event) {
+							// rgb(71, 119, 217) // light
+							// el.style.backgroundColor = '#144985'; // dark
+							// console.log('event',event.fromElement);
+							// let btnColor = _this.darkModeFg? {mouseOver: '#26578F', mouseOut: '#144985'} : {mouseOver: 'rgb(85, 130, 220)', mouseOut: 'rgb(71, 119, 217)'};
+							// el.style.backgroundColor = btnColor['mouseOut'];
+						});
 						// click 이벤트
-						el2.addEventListener('click', function (event) {
+						this.el.addEventListener('click', function (event) {
 							let gridData = grid.store.data.rawData;
 							let rowNum = gridData[rowKey].rowNum;
 							let selectedGridData = gridData.filter(item => {
@@ -507,25 +537,18 @@ export default {
 					minWidth: 200,
 					align: 'left',
 					// hidden: true,
-					// formatter: ({ value, row }) => {
-					// 	return `
-					// 	<span>${value}</span>
-					// 	<button class="edit-btn" data-row='${JSON.stringify(row)}'>Edit</button>
-					// `;
-					// }
-					renderer: {
-						type: CustumButton,
-						options: {
-							value: '계획수정',
-						},
-					},
+					formatter: ({ value, row }) => {
+						return `
+						<span>${value}</span>
+						<button class="edit-btn" data-row='${JSON.stringify(row)}'>Edit</button>
+					`;
+					}
 				},
 				{
 					header: '',
 					name: 'btnCol',
 					width: 70,
 					align: 'center',
-					hidden: true,
 					renderer: {
 						type: CustumButton,
 						options: {

pages/ems/effc/EnrgUseTotSummPage.vue

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

pages/ems/effc/EqpmIndMntrPage.vue

@@ -4,7 +4,7 @@
       <v-avatar size="12" :style="{ backgroundColor: 'currentColor' }"></v-avatar>
       에너지 사용량 실적
     </h1> -->
-    <CommonPageTitle />
+    <PageTitle text="에너지 사용량 실적" />
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -255,8 +255,9 @@ export default {
   },
   methods: {
     async init() {
-      await this.getSelectValueList();
-      await this.setQueryParams();
+      // await this.getSelectValueList();
+
+      // await this.setQueryParams();
       this.gridInit();
       await this.getGridData();
 
@@ -487,41 +488,131 @@ 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,
+      // 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,
         },
-      });
+        {
+          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,
+        },
+      ];
 
-      var newRes = [];
-      for (var i = 0; i < res.length; i++) {
-        newRes.push({
-          ...res[i],
-          no: i + 1,
-        });
-      }
+      // for (var i = 0; i < res.length; i++) {
+      //   newRes.push({
+      //     ...res[i],
+      //     no: i + 1,
+      //   });
+      // }
 
       this.setGridData({
         gridKey: this.gridName,
@@ -661,9 +752,141 @@ const defaultData = {
   },
   fromDt: Utility.setFormatDate(new Date(), "YYYYMM"), // 조회 시작일
   grid01: {
-    data: [],
-    column: [],
-    option: {},
+    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",
+            ],
+          },
+        ],
+      },
+    },
   },
 };
 

pages/ems/effc/TagTrndPage.vue

@@ -198,6 +198,7 @@ export default {
 	async asyncData(context) {
 		const myState = context.store.state;
 		myPrgmId = context.route.query.prgmId;
+    console.log("menudata:", myState.menuData[myPrgmId]);
     await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
 		myTitle = await myState.activeMenuInfo.menuNm;
 	},
@@ -521,6 +522,7 @@ export default {
 		async btnActions(action) {
 			switch (action) {
         case "add" /*  */:
+          console.log('aa:',this.tagList);
 					// if(this.pageData.totalSelectedTags.split('/*wq2a/').length>5){
 					if (this.tagList.length >= 5) {
             alert("TAG는 최대 5개까지 선택 가능합니다.");
@@ -800,6 +802,7 @@ export default {
 				// data SeriesData 추가
         chartDataDict[dataTagTitle]["seriesData"] = seriesData;
 				// data legend 추가
+        console.log("le dat:", legendData);
         chartDataDict[dataTagTitle]["legendList"] = legendData;
 				//
 				//rawData chart data 구성하기

plugins/eChart.js

@@ -52,4 +52,5 @@ use([
 	// ToolboxComponent, // 그래프 이미지 save
 ]);
 
+console.log('echart plugin', echarts)
 Vue.component('VChart', VChart);

plugins/gridUtility.js

@@ -253,9 +253,8 @@ export class NewCustomRenderer {
 		} else {
 			el.type = 'text';
 
-			$(el).addClass('tui-grid-cell-content w100');
+			$(el).addClass('tui-grid-cell-content');
 			$(el).css('text-align', 'center');
-			$(el).css('border', '0');
 		}
 		this.render(props);
 		if(!this.disabled){
@@ -315,8 +314,6 @@ export class NewCustomEditor {
 		this.rowKey = rowKey;
 		this.columnInfo = columnInfo;
 		this.grid = grid;
-		const divEl = document.createElement('div');
-		$(divEl).css('text-align', 'center');
 		const el = document.createElement('input');
 		if (
 			props.grid.store.data.rawData[props.rowKey].addInfoDataKind == 'FG'
@@ -366,20 +363,16 @@ export class NewCustomEditor {
 			}
 			$(el).addClass('tui-grid-content-text');
 		}
-
-		divEl.append(el);
 		
 		// console.log('props: %o', props);
 		// console.log('el: %o', el);
 		this.el = el;
-		this.divEl = divEl;
 
 		this.render(props);
-
 	}
 
 	getElement() {
-		return this.divEl;
+		return this.el;
 	}
 
 	getValue() {
@@ -396,9 +389,9 @@ export class NewCustomEditor {
 	}
 
 	mounted() {
-		// if (this.el.type == 'checkbox') {
-		// 	$(this.el.parentElement).css('text-align', 'center');
-		// }
+		if (this.el.type == 'checkbox') {
+			$(this.el.parentElement).css('text-align', 'center');
+		}
 		this.el.select();
 	}
 }

plugins/vuetify.js

@@ -10,7 +10,6 @@ import icoBulletPoint from '~/components/icons/icoBulletPoint';
 import icoChevronDown from '~/components/icons/icoChevronDown';
 import icoSearch from '~/components/icons/icoSearch';
 import icoSend from '~/components/icons/icoSend';
-import icoExpandAlt from '~/components/icons/icoExpandAlt';
 import '@mdi/font/css/materialdesignicons.css'; // Ensure you are using css-loader
 import 'material-design-icons-iconfont/dist/material-design-icons.css';
 import Vue from 'vue';
@@ -74,9 +73,6 @@ export default new Vuetify({
 			icoSend: {
 				component: icoSend,
 			},
-			icoExpandAlt: {
-				component: icoExpandAlt,
-			},
 		},
 	},
 });

store/index.js

@@ -197,8 +197,8 @@ export const mutations = {
 
 	// 페이지 그리드 데이터 set
 	setGridData: (state, payload) => {
-		// console.log('check:', state.pageData)
-		// console.log('payload:', payload)
+		console.log('check:', state.pageData)
+		console.log('payload:', payload)
 		// state.pageData['PRG0001']['dashBoard_grid_01'] = {
 		// 	...state.pageData['PRG0001']['dashBoard_grid_01'],
 		// 	data: payload.value,

store/modules/list.js

@@ -669,8 +669,7 @@ const INIT_URL_STATE = {
 	// prgmId : PRG0052 과거 검침 데이터 조회
 	selectTagRawDataByQuarter:
 		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarter',
-	selectTagRawDataByQuarterPageTotal:
-		'ems/base/PastRsltDataReadCtr/selectTagRawDataByQuarterPageTotal',
+
 	// prgmId : PRG4107 개인화 대시보드
 	selectIndvWidgetList: 'ems/base/DashboardHfemsCtr/selectIndvWidgetList',
 	selectEnergyUseReadHourAddup: