resolve comment

Reviewed-on: #37

assets/scss/common.scss

@@ -12,8 +12,7 @@
 
 html,
 body {
-  overflow: auto;
-
+  // overflow: auto;
 }
 
 a {
@@ -119,7 +118,7 @@ a {
 .v-main,
 .v-main__wrap,
 .container {
-  height: 100%;
+  // height: 100%;
 }
 
 .v-main__wrap>.container {
@@ -144,7 +143,9 @@ a {
   }
 
   & .router-tab__container {
-    min-height: calc(100% - 72px);
+    overflow-y: auto;
+    height: calc(100vh - 105px);
+    max-height: calc(100vh - 105px);
     padding: 20px;
   }
 
@@ -265,7 +266,7 @@ a {
       }
 
       &>.v-treeview-node__root:hover:before {
-        opacity: 1 !important;
+        opacity: 0 !important;
       }
 
       .v-treeview-node__children {
@@ -279,13 +280,17 @@ a {
 
     .v-treeview-node--click[aria-expanded="true"] {
       &>.v-treeview-node__root:before {
-        opacity: 1 !important;
+        opacity: 0 !important;
       }
     }
 
     .v-treeview-node[aria-expanded="true"] {
-      &>.v-treeview-node__root>.v-treeview-node__content>.v-treeview-node__label>button>.v-icon.mdi-chevron-down {
-        transform: rotate(-180deg);
+      &>.v-treeview-node__root>.v-treeview-node__content
+      >.v-treeview-node__label>button {
+        >.anticon,
+        >.v-icon.mdi-chevron-down {
+          transform: rotate(-180deg);
+        }
       }
     }
 
@@ -297,15 +302,17 @@ a {
         // justify-content: center;
       }
 
+      & .anticon,
       & .v-icon.mdi-chevron-down {
         margin-left: auto;
+        animation-duration: 0.5s;
       }
     }
   }
 
   .v-treeview-node--active {
     &:before {
-      opacity: 1 !important;
+      opacity: 0 !important;
     }
   }
 
@@ -321,7 +328,8 @@ a {
     .v-treeview-node__content span:not(.v-icon),
     .v-treeview-node__root>button,
     .v-treeview-node__level,
-    .v-treeview-node__content .v-icon.mdi-chevron-down {
+    .v-treeview-node__content .v-icon.mdi-chevron-down,
+    .v-treeview-node__content .anticon {
       display: none;
     }
 
@@ -433,7 +441,7 @@ a {
   .v-application.#{$theme}-mode {
     min-width: 1000px;
 
-    .head-logo{
+    .head-logo {
       gap: 8px;
     }
 
@@ -473,7 +481,7 @@ a {
 
     .header {
       background-color: map-deep-get($config, #{$theme}, "header-backgroud");
-      border-color: #D3D6EA;
+      border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-header-border");
     }
 
     .btn-header {
@@ -484,6 +492,12 @@ a {
 
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
+
+      .menu-container {
+        height:calc(100vh - 60px);
+        overflow-y: auto;
+        border-right: 1px solid map-deep-get($config, #{$theme}, "v-sidebar-border") ;
+      }
     }
 
     .v-icon {
@@ -529,8 +543,6 @@ a {
       }
     }
 
-
-
     .router-tab {
       .router-tab__header {
         background-color: map-deep-get($config, #{$theme}, "router-header");
@@ -599,45 +611,9 @@ a {
       }
     }
 
-    // .v-banner {
-    //   &__wrapper {
-    //     border-bottom-color: map-deep-get($config,
-    //       #{$theme},
-    //       "v-banner-border-color"
-    //     ) !important;
-    //   }
-    // }
-
     .v-navigation-drawer__append {
       >p {
-        @if $theme ==dark {
-          color: rgba(255, 255, 255, 0.6);
-        }
-
-        @else {
-          color: #999;
-        }
-      }
-    }
-
-    .v-footer {
-      @if $theme ==light {
-        background-color: #dfdfe5;
-        color: #767d83;
-      }
-    }
-
-    .bd {
-      @if $theme ==dark {
-        &-r-1 {
-          border-right: 1px #373f45 solid;
-        }
-      }
-
-      @else {
-        &-r-1 {
-          border-right: 1px #efefef solid;
-        }
+        color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important;
       }
     }
 
@@ -687,255 +663,116 @@ a {
       }
 
       &>.v-treeview-node {
-        &>.v-treeview-node__root {
-          &:before {
-            background-color: map-deep-get($config,
-              #{$theme},
-              "v-treeview-node-root-backgroundColor"
-            );
-          }
-
-          &>.v-treeview-node__content {
-            .v-treeview-node__label {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-label-color"
-              );
-            }
-
-            .v-icon {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-icon-color"
-              );
-            }
-          }
-
+        .v-treeview-node__root {
+          border-radius: 8px;
           &:hover {
-            &>.v-treeview-node__content {
-              .v-treeview-node__label {
-                color: map-deep-get($config,
-                  #{$theme},
-                  "v-treeview-node-root-label-active-color"
-                );
-              }
-
-              .v-icon {
-                color: map-deep-get($config,
-                  #{$theme},
-                  "v-treeview-node-root-icon-active-color"
-                );
-              }
-            }
+            background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" );
           }
-        }
-
-        &>.v-treeview-node__children {
-          &>.v-treeview-node {
-            &>.v-treeview-node__root {
-              &:before {
-                background-color: map-deep-get($config,
-                  #{$theme},
-                  "v-treeview-node-subroot-backgroundColor"
-                );
-              }
-
-              &>.v-treeview-node__content {
-                .v-treeview-node__label {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-node-label-color"
-                  );
-                }
-
-                .v-icon {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-icon-color"
-                  );
-                }
-              }
-
-              &:not(.v-treeview-node--active):hover {
-                &:before {
-                  background-color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-leaf-active-backgroundColor"
-                  );
-                }
-
-                &>.v-treeview-node__content {
-                  .v-treeview-node__label {
-                    color: map-deep-get($config,
-                      #{$theme},
-                      "v-treeview-leaf-active-color"
-                    );
-                  }
-
-                  .v-icon {
-                    color: map-deep-get($config,
-                      #{$theme},
-                      "v-treeview-leaf-active-color"
-                    );
-                  }
-                }
-              }
-            }
-
-            &>.v-treeview-node__children {
-              background-color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-leaf-subchildren-backgroundColor"
-              );
-            }
-
-            &>.v-treeview-node--active {
-              &:before {
-                background-color: map-deep-get($config,
-                  #{$theme},
-                  "v-treeview-node-subroot-backgroundColor"
-                );
-              }
-
-              &>.v-treeview-node__content {
-                .v-treeview-node__label {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-node-label-active-color"
-                  );
-                }
-
-                .v-icon {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-icon-active-color"
-                  );
-                }
-              }
-            }
-
-            &>.v-treeview-node__children {
-              & .v-treeview-node {
-                &>.v-treeview-node__root {
-                  &:before {
-                    background-color: map-deep-get($config,
-                      #{$theme},
-                      "v-treeview-node-subroot-backgroundColor"
-                    );
-                  }
-
-                  &>.v-treeview-node__content {
-                    .v-treeview-node__label {
-                      color: map-deep-get($config,
-                        #{$theme},
-                        "v-treeview-node-label-color"
-                      );
-                    }
-
-                    .v-icon {
-                      color: map-deep-get($config,
-                        #{$theme},
-                        "v-treeview-icon-color"
-                      );
-                    }
-                  }
-
-                  &:not(.v-treeview-node--active):hover {
-                    &:before {
-                      background-color: map-deep-get($config,
-                        #{$theme},
-                        "v-treeview-leaf-active-backgroundColor"
-                      );
-                    }
-
-                    &>.v-treeview-node__content {
-                      .v-treeview-node__label {
-                        color: map-deep-get($config,
-                          #{$theme},
-                          "v-treeview-leaf-active-color"
-                        );
-                      }
-
-                      .v-icon {
-                        color: map-deep-get($config,
-                          #{$theme},
-                          "v-treeview-leaf-active-color"
-                        );
-                      }
-                    }
-                  }
-                }
-
-                &>.v-treeview-node--active {
-                  background-color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-node-label-active-bg"
-                  );
-                  border: 1px solid map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-node-label-active-border"
-                  );
-                  border-radius: 8px;
-
-                  &:before {
-                    opacity: 0 !important;
-                  }
-
-                  &>.v-treeview-node__content {
-                    .v-treeview-node__label {
-                      color: map-deep-get($config,
-                        #{$theme},
-                        "v-treeview-node-label-active-color"
-                      );
-                    }
-
-                    .v-icon {
-                      color: map-deep-get($config,
-                        #{$theme},
-                        "v-treeview-node-label-active-color"
-                      );
-                    }
-                  }
-                }
-              }
-            }
-
-            &[aria-expanded="true"] {
-              & .v-treeview-node__root>.v-treeview-node__content {
-                .v-treeview-node__label {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-node-label-children-color"
-                  );
-                }
-
-                .v-icon {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-icon-active-color"
-                  );
-                }
-              }
-            }
-          }
-        }
-
-        &[aria-expanded="true"] {
-          & .v-treeview-node__root>.v-treeview-node__content {
+          .v-treeview-node__content {
             .v-treeview-node__label {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-label-active-color"
-              );
+              color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
+            }
+          }
+
+        }
+
+        &[aria-expanded="true"]{
+
+          // Level 1
+          &>.v-treeview-node__root {
+            background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg" );
+            border: 1px solid map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+            color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
+
+            &:before {
+              background-color: map-deep-get($config, #{$theme}, "v-treeview-node-subroot-backgroundColor");
             }
 
-            .v-icon {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-icon-active-color"
-              );
+            .v-treeview-node__content {
+              .v-treeview-node__label {
+                color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
+              }
+
+              .v-icon:first-child,
+              .v-icon:first-child::before {
+                color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+              }
             }
           }
+
+          &>.v-treeview-node__children {
+            // Level 2
+            .v-treeview-node__root {
+              color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color");
+              &:hover {
+                background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-backgroundColor");
+              }
+            }
+            &>[aria-expanded="true"] >.v-treeview-node__root,
+            .v-treeview-node__root.v-treeview-node--active {
+              background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color" );
+              .v-treeview-node__content {
+                .v-treeview-node__label {
+                  color: map-deep-get($config, #{$theme}, "card-title-color");
+                }
+
+                .v-icon,
+                .v-icon::before,
+                .anticon {
+                  color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+                }
+              }
+            }
+            
+            // Level 3
+            .v-treeview-node__children {
+              .v-treeview-node {
+                >.v-treeview-node__root {
+                  .v-treeview-node__content {
+                    .v-treeview-node__label {
+                      color: map-deep-get($config, #{$theme}, "card-default-color");
+                    }
+                  }
+
+                  *:hover,
+                  :hover {
+                    border-width: 0;
+                  }
+
+                  &:hover {
+                    border: 1px solid  map-deep-get($config, #{$theme}, "v-input-textarea-border");
+                    border-radius: 8px;
+                    background-color: rgba(0, 0, 0, 0);
+                    .v-treeview-node__content {
+                      .v-treeview-node__label {
+                        color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
+                      }
+                    }
+
+                  }
+
+                  &.v-treeview-node--active {
+                    // color: map-deep-get($config, #{$theme}, "card-title-color");
+                    background-color: rgba(0, 0, 0, 0);
+                    .v-treeview-node__content {
+                      .v-treeview-node__label {
+                        color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
+                      }
+      
+                      .v-icon,
+                      .v-icon::before,
+                      .anticon {
+                        color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+                      }
+                    }
+                  }
+
+                }
+              }
+
+            }
+
+          }
         }
       }
     }
@@ -947,15 +784,24 @@ a {
           "v-calendar-weekday-backgroundColor"
         );
         border-right: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
+        border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
+        border-top: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         color: map-deep-get($config, #{$theme}, "v-calendar-weekday-color");
 
         &:nth-of-type(1) {
-          color: map-deep-get($color, "week", "sun");
+          // color: map-deep-get($config,
+          //   #{$theme},
+          //   "v-calendar-is-sun"
+          // );
+          border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         }
 
-        &:nth-of-type(7) {
-          color: map-deep-get($color, "week", "sat");
-        }
+        // &:nth-of-type(7) {
+        //   color: map-deep-get($config,
+        //     #{$theme},
+        //     "v-calendar-is-sat"
+        //   );
+        // }
       }
 
       >.vc-day {
@@ -964,22 +810,33 @@ a {
 
         .day-hldyNm,
         .day-label.is-holiday {
-          color: map-deep-get($color, "week", "sun");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sun"
+          );
         }
 
         &.weekday-1 {
 
           .day-label,
           .day-hldyNm {
-            color: map-deep-get($color, "week", "sun");
+            color: map-deep-get($config,
+              #{$theme},
+              "v-calendar-is-sun"
+            );
           }
+
+          border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         }
 
         &.weekday-7 {
 
           .day-label,
           .day-hldyNm {
-            color: map-deep-get($color, "week", "sat");
+            color: map-deep-get($config,
+              #{$theme},
+              "v-calendar-is-sat"
+            );
           }
         }
 
@@ -1181,11 +1038,17 @@ a {
         }
 
         th.tui-sun {
-          color: map-deep-get($color, "week", "sun");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sun"
+          );
         }
 
         th.tui-sat {
-          color: map-deep-get($color, "week", "sat");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sat"
+          );
         }
       }
 
@@ -1201,11 +1064,17 @@ a {
         }
 
         td.tui-calendar-sun {
-          color: map-deep-get($color, "week", "sun");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sun"
+          );
         }
 
         td.tui-calendar-sat {
-          color: map-deep-get($color, "week", "sat");
+          color: map-deep-get($config,
+            #{$theme},
+            "v-calendar-is-sat"
+          );
         }
       }
     }
@@ -1247,26 +1116,47 @@ a {
     }
 
     .v-list {
-      background-color: map-deep-get($config,
-        #{$theme},
-        "tui-datepicker-backgroundColor"
-      );
-      border: 1px solid map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
-      border-radius: 4px;
+			background-color: map-deep-get($config,
+				#{$theme},
+				"tui-datepicker-backgroundColor"
+			);
+			border: 1px solid map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
+			border-radius: 4px;
+			padding: 4px;
+	
+			&-item--active {
+				border-radius: 4px;
+				&:before {
+					opacity: 0;
+				}
+	
+				.v-list-item__title {
+					color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color");
+				}
+			}
+	
+			&.v-select-list{
+				>.v-list-item {
+					margin-bottom: 4px;
+					.anticon {
+						&.anticon-check {
+							display: none;
+						}
+					}
+					&[aria-selected="true"] {
+						border-radius: 8px;
+						background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg");
+						.anticon {
+							&.anticon-check {
+								display: block;
+								color: map-deep-get($config, #{$theme}, "v-icon-blue");
+							}
+						}
+					}
+				}
+			}
 
-      &-item--active {
-        &:before {
-          opacity: 0;
-        }
-
-        .v-list-item__title {
-          color: map-deep-get($config,
-            #{$theme},
-            "tui-datepicker-calendar-color"
-          );
-        }
-      }
-    }
+		}
 
     .theme--white {
       .toastui-editor-contents {
@@ -1319,11 +1209,12 @@ a {
         color: #46c0ff;
       }
     }
+
     .v-btn {
       background-color: transparent !important;
       color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
     }
-    
+
   }
 
   [hover-tooltip] {
@@ -1383,11 +1274,6 @@ a {
     }
   }
 
-
-
-
-
-
 }
 
 

assets/scss/common/button.scss

@@ -92,21 +92,23 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
-    .search-button {
-      color: map-deep-get($config, #{$theme}, "search-btn-color");
+    .searchFilter {
+      .search-button {
+        height: 40px;
+        color: map-deep-get($config, #{$theme}, "search-btn-color");
+      }
     }
 
     .v-dialog {
       .ant-btn-icon-only {
-        color: map-deep-get(
-          $config,
+        color: map-deep-get($config,
           #{$theme},
           "icon-color"
         );
       }
     }
 
-    .ant-btn  {
+    .ant-btn {
 
       &.ant-btn-outlined {
         color:map-deep-get($config, #{$theme}, "ant-btn-default-color");
@@ -118,6 +120,10 @@
         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 {
@@ -136,6 +142,7 @@
       &.expand-btn {
         .v-icon {
           color: map-deep-get($config, #{$theme}, "basic-button-color");
+
           svg {
             fill: map-deep-get($config, #{$theme}, "basic-button-color");
           }
@@ -146,15 +153,17 @@
 }
 
 .v-application {
-  .ant-btn  {
+  .ant-btn {
     border-radius: 6px;
+
     &.ant-btn-lg {
       border-radius: 8px;
     }
+
     &.ant-btn-default {
-      border:none !important
+      border: none !important
     }
-    
+
   }
 }
 
@@ -165,15 +174,16 @@
     border: none;
     width: 16px;
     height: 16px;
-    background:none;
+    background: none;
   }
 }
-.ant-btn  {
+
+.ant-btn {
   &.expand-btn {
-    .v-icon {
-      span {
+    span {
+      &.v-icon {
         margin-right: 8px;
       }
     }
   }
-}
+}

assets/scss/common/grid.scss

@@ -98,6 +98,32 @@
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
+    .tui-grid-content-area{
+      .tui-grid-header-area{
+        height: auto !important;
+      }
+    }
+
+    .grid-title {
+      font-weight: 600;
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0;
+      color: map-deep-get($config,
+        #{$theme},
+        "tui-grid-title-color"
+      );
+    }
+    
+    .grid-toggle-section{
+      .tui-grid-rside-area{
+        .tui-grid-body-area {
+          height: auto !important;
+
+        }
+      }
+    }
+
     .tui-grid {
       &-table {
         border: 1px solid;
@@ -123,12 +149,18 @@
       }
 
       &-body-container{
-        border-right: 1px solid;
-        border-right-color: map-deep-get($config,
-          #{$theme},
-          "tui-grid-cell-borderColor"
-        );
+        border-right: 0;
+        // border-right-color: map-deep-get($config,
+        //   #{$theme},
+        //   "tui-grid-cell-borderColor"
+        // );
         width: auto !important;
+        .tui-grid-table-container{
+          width: 100% !important;
+          .tui-grid-table {
+            width: 100% !important;
+          }
+        }
       }
 
       &-container,
@@ -137,27 +169,26 @@
         // color: #000000E0;
  
         & ::-webkit-scrollbar {
-          width: $scrollbar-width !important;
+          width: 0 !important;
           height: $scrollbar-width !important;
           -webkit-appearance: initial;
-          background-color: map-deep-get($config,
-            #{$theme},
-            "scrollbar-track"
-          ) !important;
+          background-color: rgba(0, 0, 0, 0) !important;
           border-radius: 3px !important;
         }
 
         & ::-webkit-scrollbar-track {
-          background-color: map-deep-get($config,
-            #{$theme},
-            "scrollbar-track"
-          ) !important;
+          // background-color: map-deep-get($config,
+          //   #{$theme},
+          //   "tui-grid-cell-borderColor"
+          // ) !important;
+          background-color: rgba(0, 0, 0, 0) !important;
         }
 
         & ::-webkit-scrollbar-thumb {
-          width: 50px !important;
+          // 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;
         }
 
@@ -184,6 +215,7 @@
       &-scrollbar-right-top {
         background-color: rgba(0, 0, 0, 0);
         border: none;
+        display: none;
         // background-color: map-deep-get(
         //   $config,
         //   #{$theme},
@@ -210,12 +242,13 @@
         width: $scrollbar-width !important;
         height: $scrollbar-width !important;
         // display: none !important;
-        border-color: map-deep-get($config, #{$theme}, "scrollbar-track");
-        background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
+        border-color: map-deep-get($config, #{$theme}, "cardBackground");
+        background-color: map-deep-get($config, #{$theme}, "cardBackground");
         // border: none !important;
         // bottom: -1px;
         // right: -2px;
         box-sizing: border-box;
+        // display: none;
       }
 
       &-scrollbar-frozen-border,
@@ -225,13 +258,9 @@
         border-color: transparent !important;
       }
 
-      // &-body-area {
-      //   overflow: auto !important;
-      // }
-
+      &-body-area,
       &-container,
       &-layer-state,
-      &-body-area,
       &-summary-area,
       &-cell {
         background-color: map-deep-get($config,
@@ -243,23 +272,36 @@
           "tui-grid-border-vertical-color"
         );
 
-        &-current-row{
-          td {
-            .custom-radio {
-              .radio-mark{
-                border-color: #1677ff;
-                background-color: #fff;
-                &::after {
-                  content: "";
-                  position: absolute;
-                  top: 50%;
-                  left: 50%;
-                  transform: translate(-50%, -50%);
-                  height: 11px;
-                  width: 11px;
-                  border-radius: 50%;
-                  background-color: #1677ff;
-                }
+        // &-current-row{
+        // }
+        td.row-selected {
+          .custom-radio {
+            background-color: map-deep-get($config,
+              #{$theme},
+              "ant-btn-primary-color"
+            );
+            .radio-mark{
+              border-color: map-deep-get($config,
+                #{$theme},
+                "arow-line-color"
+              );
+              background-color: map-deep-get($config,
+                #{$theme},
+                "arow-line-btn-bg-color"
+              );
+              &::after {
+                content: "";
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%, -50%);
+                height: 8px;
+                width: 8px;
+                border-radius: 50%;
+                background-color: map-deep-get($config,
+                  #{$theme},
+                  "arow-line-color"
+                );
               }
             }
           }
@@ -274,13 +316,13 @@
             #{$theme},
             "tui-grid-cell-borderColor"
           );
-          .tui-grid-cell-content {
-            border-right: 1px solid ;
-            border-right-color: map-deep-get($config,
-              #{$theme},
-              "tui-grid-cell-borderColor"
-            );
-          }
+          // .tui-grid-cell-content {
+          //   border-right: 1px solid ;
+          //   border-right-color: map-deep-get($config,
+          //     #{$theme},
+          //     "tui-grid-cell-borderColor"
+          //   );
+          // }
         }
       }
 
@@ -291,8 +333,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"
@@ -309,8 +351,17 @@
       }
 
       &-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"
+        );
+        width: 100% !important;
+        .tui-grid-table {
+          width: 100% !important;
+        }
       }
 
       &-row-odd,
@@ -440,6 +491,7 @@
       }
 
       &-tree-button-expand {
+        z-index: 9999;
         .tui-grid-btn-tree {
           i {
             width: 16px;
@@ -458,6 +510,7 @@
       }
 
       &-tree-button-collapse {
+        z-index: 9999;
         .tui-grid-btn-tree {
           i {
             width: 16px;

assets/scss/common/input.scss

@@ -1,6 +1,6 @@
 .v-select__custom {
   padding: 0.125rem;
-  
+
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;
   }
@@ -171,25 +171,27 @@
   align-items: center;
   cursor: pointer;
   position: relative;
-  padding-left: 28px;
-  margin: 10px;
+  padding-left: 0;
+  margin: 5px;
   font-size: 16px;
 }
+
 .custom-radio input[type="radio"] {
   position: absolute;
   opacity: 0;
   cursor: pointer;
 }
+
 /* Custom radio appearance */
 .radio-mark {
   position: absolute;
-  left: 0;
+  left: -8px;
   top: 50%;
   transform: translateY(-50%);
-  height: 18px;
-  width: 18px;
-  background-color: white;
-  border: 2px solid #ccc;
+  height: 14px;
+  width: 14px;
+  // background-color: white;
+  border: 1px solid #ccc;
   border-radius: 50%;
   transition: all 0.2s ease;
 }
@@ -222,11 +224,31 @@
   color: #424242 !important;
 }
 
+.ant-checkbox {
+  .ant-checkbox-inner {
+    border-radius: 4px
+  }
+}
+
+
 @each $theme in dark, light {
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
 
+    .ant-checkbox-wrapper {
+      .ant-checkbox-checked {
+        .ant-checkbox-inner {
+          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-checkbox-inner::after {
+            border-color: map-deep-get($config, #{$theme}, "ant-btn-primary-color");
+          }
+        }
+      }
+    }
+
     .v-input-popup__custom {
       .v-input__slot {
         padding-left: 12px;
@@ -239,17 +261,18 @@
     }
 
     .v-textarea {
-      .v-input__slot{
+      .v-input__slot {
         border: map-deep-get($config,
-            #{$theme},
-            "v-input-textarea-border"
-          );
+          #{$theme},
+          "v-input-textarea-border"
+        );
+
         fieldset {
           background-color: map-deep-get($config,
             #{$theme},
             "v-input-textarea-bg"
           );
-          
+
         }
       }
     }
@@ -263,9 +286,6 @@
         "v-input-backgroundColor"
       );
 
-
-      
-
       &:not(.v-input--radio-group, .v-input--checkbox) {
         .v-input__slot {
           background-color: map-deep-get($config,
@@ -372,6 +392,17 @@
         }
       }
     }
+
+    .radio-mark {
+      background-color: map-deep-get($config,
+        #{$theme},
+        "ant-btn-primary-color"
+      );
+      border-color: map-deep-get($config,
+        #{$theme},
+        "v-input-textarea-border"
+      );
+    }
   }
 
   .v-radio {
@@ -396,6 +427,12 @@
 
   .v-input--checkbox {
     .v-icon {
+      transform: none;
+
+      &.mdi:before {
+        font-size: 16px;
+      }
+
       @if $theme ==dark {
         color: rgba(255, 255, 255, 0.6);
       }
@@ -406,6 +443,9 @@
     }
   }
 
+
+
+
   .v-textarea {
     textarea {
       padding: 10px;

assets/scss/common/text.scss

@@ -63,6 +63,12 @@
   line-height: 1.25 !important;
 }
 
+.custom-title-7 {
+  font-size: 0.875rem !important;
+  font-weight: 400 !important;
+  line-height: 22px !important;
+}
+
 .custom-title-8 {
   font-size: 0.75rem !important;
   font-weight: 700 !important;
@@ -76,15 +82,15 @@
 
 .custom-text-2 {
   opacity: 0.6;
-  font-family: SpoqaHanSansNeo;
   font-size: 14px;
-  font-weight: normal;
-  font-stretch: normal;
-  font-style: normal;
   line-height: 2.17;
-  letter-spacing: normal;
-  text-align: right;
-  color: #fff;
+  // font-weight: normal;
+  // font-stretch: normal;
+  // font-style: normal;
+  // letter-spacing: normal;
+  // text-align: right;
+  // color: #fff;
+  // font-family: SpoqaHanSansNeo;
 }
 
 .text-color--white-0 {
@@ -113,6 +119,14 @@
       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,11 +14,14 @@
       position: relative;
       border-radius: 6px;
       border: solid 1px;
-      height: 40px;
+      height: 32px;
       // border-color: #424242;
       border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
-
+      &.datepicker-large {
+        height: 40px;
+      }
+    
       .v-input {
 
         // ----------------------

assets/scss/var.scss

@@ -32,8 +32,8 @@ $color: (
   "black": ("0": #000,
     "1": #111),
   "white": ("0": #fff),
-  "week": ("sun": #fb5a83,
-    "sat": #2d8cf6)
+  "week": ("sun": #FF4D4F,
+    "sat": #597EF7)
 );
 
 $config: (
@@ -96,18 +96,21 @@ $config: (
     v-input-disabled-backgroundColor:rgba(255, 255, 255, 0.08),
     v-input-disabled-color: rgba(255, 255, 255, 0.5),
     v-select-label-color: rgba(255, 255, 255, 0.85),
-    v-calendar-weekday-backgroundColor: #383f5d,
-    v-calendar-weekday-color: #fff,
-    v-calendar-weekday-border-color: rgba(255, 255, 255, 0.1),
-    v-calendar-day-color: #fff,
-    v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
-    v-calendar-is-today-background-color: #2d4571,
+    v-calendar-weekday-backgroundColor: #FFFFFF0A,
+    v-calendar-weekday-color: #FFFFFFD9,
+    v-calendar-weekday-border-color: #FFFFFF0F,
+    v-calendar-day-color: #FFFFFFD9,
+    v-calendar-day-in-not-month-color: #FFFFFF14,
+    v-calendar-is-today-background-color: #0A224F,
+    v-calendar-is-sat: #263EA0,
+    v-calendar-is-sun:#A61D24,
+    tui-grid-title-color: #FFFFFFD9,
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
-    tui-grid-border-vertical-color: #212224,
+    tui-grid-border-vertical-color: #FFFFFF0F,
     tui-grid-cell-backgroundColor: #212224,
-    tui-grid-cell-color: #fff,
+    tui-grid-cell-color: #FFFFFFA6,
     tui-grid-cell-insert-color: #13636c,
     tui-grid-cell-selected-color: #0A224F,
     tui-grid-cell-modify-color: #13636c,
@@ -170,6 +173,9 @@ $config: (
     ant-btn-default-border-outlined:#424242,
     btn-header-select-bg: #1F1F1F,
     btn-header-select-color:#FFFFFFD9,
+    subtitle-tab: #FFFFFFA6,
+    v-header-border: #424242,
+    v-sidebar-border: #303030,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -205,7 +211,6 @@ $config: (
     router-tab-item-hover-color: #1677ff,
     router-tab-slot-end-button-backgroundColor: #3f4d7d,
     v-btn-backgroundColor: #1677ff,
-    // v-btn-backgroundColor: #fff,
     v-box: #FFFFFF,
     v-banner-border-color: #ddd,
     v-treeview-node-root-backgroundColor: #FFFFFF,
@@ -232,22 +237,25 @@ $config: (
     v-input-disabled-backgroundColor: rgba(0, 0, 0, 0.04),
     v-input-disabled-color: rgba(0, 0, 0, 0.25),
     v-select-label-color: rgba(0, 0, 0, 0.88),
-    v-calendar-weekday-backgroundColor: #e0e0e0,
-    v-calendar-weekday-color: #111,
-    v-calendar-weekday-border-color: #d4d4d4,
-    v-calendar-day-color: #111,
-    v-calendar-day-in-not-month-color: #f8f8f8,
-    v-calendar-is-today-background-color: #e3eaf3,
+    v-calendar-weekday-backgroundColor: #00000005,
+    v-calendar-weekday-color: #000000E0,
+    v-calendar-weekday-border-color: #0000000F,
+    v-calendar-day-color: #000000E0,
+    v-calendar-day-in-not-month-color: #0000000A,
+    v-calendar-is-today-background-color: #E6F4FF,
+    v-calendar-is-sat: #597EF7,
+    v-calendar-is-sun:#FF4D4F,
+    tui-grid-title-color: #000000E0,
     tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
     tui-grid-header-color: rgba(0, 0, 0, 0.88),
     tui-grid-border-horziontal-color: #e0e0e0,
     tui-grid-border-vertical-color: rgba(0, 0, 0, 0.06), //#d4d4d4,
     tui-grid-cell-backgroundColor: #fff,
     tui-grid-cell-color: #000000E0,
-    tui-grid-cell-insert-color: #13636c,
+    tui-grid-cell-insert-color: #FFFBE6,
     tui-grid-cell-selected-color: #E6F4FF,
     tui-grid-cell-modify-color: #e6f5f7,
-    tui-grid-cell-removed-color: #fddde1,
+    tui-grid-cell-removed-color: #FFF1F0,
     tui-grid-cell-hover-backgroundColor: #f5f5f5,
     v-tabs-items-border-color: #0000000F,
     v-tabs-backgroundColor: #ddd,
@@ -304,5 +312,8 @@ $config: (
     ant-btn-default-border-outlined:#D9D9D9,
     btn-header-select-color:#1F1F1F,
     btn-header-select-bg:#FFFFFF,
+    subtitle-tab: #000000A6,
+    v-header-border: #D9D9D9,
+    v-sidebar-border: #F0F0F0,
   ),
 );

components/common/Calendar.vue

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

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

@@ -2,26 +2,17 @@
   <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-checkbox
-				v-model="chkValue"
-				:disabled="disabledFlag"
-				:readonly="readonly || false"
-				:required="required || false"
-				:false-value="false"
-				:color="isDarkMode ? '#fff' : '#1890ff'"
-				@change="modifyValue"
-			></v-checkbox>
+
+      <a-checkbox v-model="chkValue" :disabled="disabledFlag" :readonly="readonly || false"
+        :required="required || false" @change="modifyValue">
+      </a-checkbox>
+
     </v-col>
   </v-row>
 </template>
@@ -68,10 +59,10 @@ export default {
       default: 7,
     },
     iconShow: {
-			type: Boolean,
-			require: false,
-			default: true
-		},
+      type: Boolean,
+      require: false,
+      default: true
+    },
   },
   data() {
     return {
@@ -103,7 +94,8 @@ export default {
   methods: {
     ...mapMutations({ setPageData: "setPageData" }),
     modifyValue(e) {
-      return this.setPageData({ [this.valueNm]: e });
+      const isChecked = e.target.checked;
+      return this.setPageData({ [this.valueNm]: isChecked });
     },
   },
 };

components/common/Datepicker.vue

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

components/common/DatepickerTimeSelectBox.vue

@@ -52,6 +52,7 @@
             selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
           "
           @update:propsValue="selectTimeValue1 = $event"
+          customClass="select-large"
         />
         <!-- <div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div> -->
 
@@ -99,6 +100,7 @@
             selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
           "
           @update:propsValue="selectTimeValue2 = $event"
+          customClass="select-large"
         />
       </div>
     </v-col>

components/common/Grid.vue

@@ -4,12 +4,13 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
-		@focusChange="focusChangeEvt"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
+		@mousedown="onMousedown"
+		@focusChange="focusChangeEvt"
 	/>
 </template>
 <script>
@@ -107,16 +108,13 @@ export default {
 		},
 		chkGridOptions() {
 			const options = {
-				// bodyHeight: 'fitToContent',
-				scrollX: false,
-				scrollY: false,
 				...this.gridData.option,
-				useIcon: false,
 			};
 			options.treeColumnOptions = {
 				useIcon: false,
 				...options.treeColumnOptions,
 			};
+
 			return options;
 		},
 		defaultRow() {
@@ -163,7 +161,7 @@ export default {
 	},
 	created() {},
 	async mounted() {
-		console.log('--------------DEBUG----gridData: ', this.gridData);
+		// console.log(this.dataPath);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
@@ -186,13 +184,13 @@ export default {
 		}),
 		// true : 현재 행 혹은 연결된 그리드가 수정중인 상태
 		checkGridState() {
-			var rowStatList = ['I', 'U', 'D'];
-			var row = this.gridInstance.invoke('getFocusedCell');
+			const rowStatList = ['I', 'U', 'D'];
+			const row = this.gridInstance.invoke('getFocusedCell');
 
 			if (row) {
-				var rowData = this.gridInstance.invoke('getRow', row.rowKey);
+				const rowData = this.gridInstance.invoke('getRow', row.rowKey);
 				if (rowData) {
-					var rowStat = rowData['rowStat'];
+					const rowStat = rowData['rowStat'];
 					if (rowStatList.includes(rowStat)) {
 						return true;
 					}
@@ -200,8 +198,8 @@ export default {
 			}
 
 			if (this.preventFocusChangeEventTargetGridList) {
-				for (var gridInstance of this.preventFocusChangeEventTargetGridList) {
-					var dataArr = gridInstance.save();
+				for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
+					const dataArr = gridInstance.save();
 
 					if (dataArr.length > 0) {
 						return true;
@@ -270,7 +268,15 @@ export default {
 				}
 			});
 		},
+		onMousedown(evt) {
+			this.handleSelectedRow(evt);
+		},
 		focusChangeEvt(e) {
+			if(e.rowKey === 0) {
+				this.handleSelectedRow(e);	
+			}
+		},
+		handleSelectedRow(e) {
 			// console.log('focusChangeEvt1...')
 			if (this.preventFocusChangeEvent(e)) {
 				// console.log('prevent focusChangeEvt')
@@ -278,7 +284,7 @@ export default {
 			}
 			// console.log('focusChangeEvt2...')
 			// cell 선택시 row 선택 method
-			if (e.rowKey >= 0) {
+			if (e.rowKey > -1) {
 				this.$emit(
 					'getRowsData',
 					this.gridInstance.invoke('getRow', e.rowKey),
@@ -611,6 +617,7 @@ export default {
 			list.map(item => this.gridInstance.invoke('check', item));
 		},
 		refreshLayout() {
+			// console.log("---------DEBUG---refreshLayout: ");
 			this.gridInstance.invoke('refreshLayout');
 		},
 		refreshGrid(){
@@ -619,54 +626,52 @@ export default {
       var containerEl = this.$refs['tuigrid' + this.gridName].$el;
       // var containerEl = document.querySelector('.tui-grid-container')
       var parentEl = containerEl.parentElement;
-      
-      
-      
-      // console.log("containerEl : ",containerEl);
-      // console.log('parentEl : ', parentEl)
-		// 	function refreshLayout(store, containerEl, parentEl) {
-        var dimension = store.dimension;
-        var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight;
-        var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft;
-        var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left;
-        this.setOffsetTop(store, top + scrollTop);
-        // store.dimension.setOffsetTop = top + scrollTop;
-        this.setOffsetLeft(store, left + scrollLeft);
-        // store.dimension.headerHeight = left + scrollLeft;
-        this.setWidth(store, clientWidth, autoWidth);
-        // store.dimension.autoWidth = autoWidth;
-        // store.dimension.width = clientWidth;
-        // console.log("###",getComputedStyle(parentEl));
-          // console.log("fitToParentHeight : ",fitToParentHeight);
-          // console.log("parentEl : ",parentEl)
-          // console.log("parentEl.clientHeight" , parentEl.clientHeight)
-          // console.log("clientHeight : ",clientHeight);
-        if (parentEl && parentEl.clientHeight !== clientHeight) {
-            var _b = getComputedStyle(parentEl), paddingTop = _b.paddingTop, paddingBottom = _b.paddingBottom;
-            this.setHeight(store, parentEl.clientHeight - (parseFloat(paddingTop) + parseFloat(paddingBottom)));
-        }
+
+			// console.log("---------DEBUG---containerEl: ",containerEl);
+      // console.log('---------DEBUG---parentEl: ', parentEl)
+			// 	function refreshLayout(store, containerEl, parentEl) {
+			var dimension = store.dimension;
+			var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight;
+			var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft;
+			var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left;
+			this.setOffsetTop(store, top + scrollTop);
+			// store.dimension.setOffsetTop = top + scrollTop;
+			this.setOffsetLeft(store, left + scrollLeft);
+			// store.dimension.headerHeight = left + scrollLeft;
+			this.setWidth(store, clientWidth, autoWidth);
+			// store.dimension.autoWidth = autoWidth;
+			// store.dimension.width = clientWidth;
+			// console.log("###",getComputedStyle(parentEl));
+			// console.log("fitToParentHeight : ",fitToParentHeight);
+			// console.log("parentEl : ",parentEl)
+			// console.log("parentEl.clientHeight" , parentEl.clientHeight)
+			// console.log("clientHeight : ",clientHeight);
+			if (parentEl && parentEl.clientHeight !== clientHeight) {
+					var _b = getComputedStyle(parentEl), paddingTop = _b.paddingTop, paddingBottom = _b.paddingBottom;
+					this.setHeight(store, parentEl.clientHeight - (parseFloat(paddingTop) + parseFloat(paddingBottom)));
+			}
     // }
 		},
     setOffsetTop(store, offsetTop) {
-      // console.log("setOffsetTop");
+			// console.log("---------DEBUG---setOffsetTop: ");
       store.dimension.offsetTop = offsetTop;
     },
     setWidth(_a, width, autoWidth) {
-      // console.log("setWidth");
+			// console.log("---------DEBUG---setWidth: ");
       var dimension = _a.dimension;
       dimension.autoWidth = autoWidth;
       dimension.width = width;
     },
     setHeaderHeight(store, height) {
-      // console.log("setHeaderHeight")
+			// console.log("---------DEBUG---setHeaderHeight: ");
       store.dimension.headerHeight = height;
     },
     setOffsetLeft(store, offsetLeft) {
-      // console.log("setOffsetLeft")
+			// console.log("---------DEBUG---setOffsetLeft: ");
       store.dimension.offsetLeft = offsetLeft;
     },
 		setHeight(_a,height){
-      // console.log("setHeight");
+			// console.log("---------DEBUG---setHeight: ");
       var dimension = _a.dimension;
       var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;
       dimension.bodyHeight = height - headerHeight - summaryHeight - tableBorderWidth;
@@ -697,17 +702,13 @@ export default {
 		// resetData() {
 		//   // console.log("resetData = ", this.tuigridProps.data);
 		//   this.$refs.tuigrid.invoke("resetData", this.tuigridProps.data);
-		// }
+		// },
 	},
 };
 </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,12 +2,14 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon>
+				<v-icon small color="primary" 
+				:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+				>$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div class="datepicker-container">
+			<div :class="['datepicker-container', customClass]"  >
 				<v-text-field
 					id="startpicker"
 					ref="startpicker"
@@ -17,14 +19,16 @@
 					readonly
 					outlined
 				>
-					<template #append>
-						<v-icon size="20">$icoCalendar</v-icon>
+					<template #append >
+						<v-icon size="20" v-show="!isRange">$icoCalendar</v-icon>
 					</template>
 					<template #append-outer>
 						<div ref="startpicker-container" id="startpicker-container"></div>
 					</template>
 				</v-text-field>
-				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div>
+				<div v-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
+					<img :src="arrowIcon" alt="">
+				</div>
 				<v-text-field
 					v-show="isRange"
 					id="endpicker"
@@ -75,6 +79,10 @@ export default {
 			require: false,
 			default: 8,
 		},
+		customClass: {
+			type: String,
+			require: false,
+		},
 	},
 	data() {
 		return {
@@ -129,6 +137,12 @@ export default {
 				this.defaultRange === 'no limite'
 			);
 		},
+		arrowIcon() {
+			if(this.isDarkMode){
+				return require('@/assets/images/arrow_datepicker_dm.png');
+			}
+			return require('@/assets/images/arrow_datepicker.png');
+		}
 	},
 	watch: {
 		myCmCycle() {

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

@@ -1,23 +1,10 @@
 <template>
-	<div class="d-flex flex-column justify-center align-center">
-		<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')">
-			<v-icon>mdi-chevron-right</v-icon>
-		</v-btn> -->
-		<a-button type="default" @click="btnActionsFnc('addLeftToRight')">
-			<RightOutlines/>
+	<div class="d-flex justify-center align-center" 
+		:class="directionBtn === 'vertically'?'flex-row':'flex-column'" 
+		style="gap: 12px">
+		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
 		</a-button>
-
-		<!--<v-btn
-			icon
-			tile
-			:ripple="false"
-			class="mt-2"
-			@click="btnActionsFnc('removeRightToLeft')"
-		>
-			<v-icon>mdi-chevron-left</v-icon>
-		</v-btn> -->
-		<a-button class="mt-2" type="default" @click="btnActionsFnc('removeRightToLeft')">
-			<LeftOutlines/>
+		<a-button   @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add">
 		</a-button>
 	</div>
 </template>
@@ -40,8 +27,18 @@ export default {
 			type: Function,
 			required: true,
 		},
+		directionBtn: {
+			type: String,
+			default: "horizontally" //horizontally, vertically.
+		}
+	},
+	computed: {
+		icons() {
+			return this.directionBtn === "vertically"
+				? { remove: "up", add: "down" }
+				: { remove: "left", add: "right" };
+			},
 	},
-	computed: {},
 	data() {
 		return {};
 	},

components/common/button/BtnExcelDownload.vue

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

components/common/chartoptions/GaugeChart.js

@@ -1,5 +1,5 @@
 // Gauge chart options
-export default function getGaugeChartOption({ title, value, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) {
+export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) {
     const colorRanges = isDarkMode
         ? [
             [0.375, '#49AA19'], // Dark Green

components/common/chartoptions/LineChart.js

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

components/common/form/InputNumber.vue

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

components/common/form/SelectBox.vue

@@ -17,7 +17,9 @@
 				:item-text="typeof item.list != 'string' ? 'text' : item.itemText"
 				:item-value="typeof item.list != 'string' ? 'value' : item.itemValue" outlined :hide-details="true"
 				class="v-select__custom" :disabled="item.disabled || false" :readonly="item.readonly || false"
-				:required="item.required || false" @change="modifyValue($event, item.valueNm)" append-icon="">
+				:required="item.required || false" @change="modifyValue($event, item.valueNm)" append-icon="" 
+				:menu-props="{ top: false, offsetY: true }"
+			>
 
 				<template v-slot:append>
 					<!-- Custom SVG icon -->

components/common/modal/ChangeUserPswdPopPage.vue

@@ -44,8 +44,7 @@
 				<v-card-title>
 					<span class="custom-title-4">비밀번호 {{ isPassword }}</span>
 				</v-card-title>
-				<v-divider></v-divider>
-				<v-card-text>
+				<v-card-text class="pb-4">
 					<v-col>
 						<label for="" class="search-box-label">
 							{{ isPassword }}할 비밀번호를 입력하세요
@@ -73,11 +72,10 @@
 						></v-text-field>
 					</v-col>
 				</v-card-text>
-				<v-divider></v-divider>
-				<v-card-actions>
+				<v-card-actions class="pb-4">
 					<v-spacer></v-spacer>
 					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
-					<div>
+					<div class="pr-3">
 						 <a-button @click="close()" class="btn-default">삭제</a-button>
 						 <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
 							 확인

components/common/modal/DrSimulSlctPop.vue

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

components/common/modal/DrSnarExecPop.vue

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

components/common/modal/EgrpPysclQtyPop.vue

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

components/common/modal/ElecPowChrgPop.vue

@@ -58,7 +58,7 @@
 				<div class="pa-5">
 					<!-- <v-text-field label="위치정보 선택"></v-text-field> -->
 					<v-row align="center" no-gutters>
-						<v-col :cols="label ? 3 : ''">
+						<v-col :cols="label ? 3 : ''" class="pr-3" >
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="parentPrgmId"
@@ -66,41 +66,66 @@
 								dataKey="searchElecContKind"
 								:sendParam="{ commGrpCd: 'EM_CONT', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
-						<v-col :cols="label ? 3 : ''">
+						<v-col :cols="label ? 3 : ''" class="pr-3" >
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="parentPrgmId"
 								:label="'전압구분'"
 								dataKey="searchVoltKind"
 								:sendParam="{ commGrpCd: 'EM_VOLT_KIND', useFg: '1' }"
+								:customClass="'select-large'"
 								:addAll="true"
 							/>
 						</v-col>
-						<v-col :cols="label ? 3 : ''">
+						<v-col :cols="label ? 3 : ''" class="pr-3" >
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="parentPrgmId"
 								:label="'전압구분'"
 								dataKey="searchOptKind"
 								:sendParam="{ commGrpCd: 'EM_VOLT_OPT', useFg: '1' }"
+								:customClass="'select-large'"
 								:addAll="true"
 							/>
 						</v-col>
 						<v-col cols="3" class="text-right">
-							<v-btn
+							<div style="height: 25px"></div>
+							<!-- <v-btn
 								v-if="!searchParam.isMulti"
 								:ripple="false"
 								@click="search()"
 								>검색</v-btn
+							> -->
+							<a-button
+								v-if="!searchParam.isMulti"
+								type="primary"
+								class="mr-1"
+								icon="search"
+								:ripple="false"
+								@click="search"
+								style="height: 40px"
 							>
-							<v-btn
+								검색
+							</a-button>
+							<!-- <v-btn
 								v-if="!searchParam.isMulti"
 								:ripple="false"
 								@click="initVal()"
 								>초기화</v-btn
+							> -->
+							<a-button
+								v-if="!searchParam.isMulti"
+								type="primary"
+								class="mr-1"
+								:ripple="false"
+								@click="initVal"
+								style="height: 40px"
 							>
+								초기화
+							</a-button>
 						</v-col>
 					</v-row>
 				</div>
@@ -310,7 +335,11 @@ export default {
 		},
 		// 공정/설비 트리 그리드 세팅
 		gridInit() {
-			const myOptions = {};
+			const myOptions = {
+				header: {
+					height: 38,
+				},
+			};
 			this.setModalGridOption({
 				modalKey: this.myModalKey,
 				gridKey: this.gridName,
@@ -606,11 +635,11 @@ const myColumns = [
 	{ header: '전력계약 ID', name: 'eleclContId', hidden: true},
 	{ header: '전력계약 명', name: 'eleclContNm', hidden: true},
 	{ header: '전력계약구분CD', name: 'elecContKind', hidden: true},
-	{ header: '전력계약구분', name: 'elecContKindNm', align: 'center'},
+	{ header: '전력계약구분', name: 'elecContKindNm', align: 'left'},
 	{ header: '전압구분CD', name: 'voltKind', hidden: true },
-	{ header: '전압구분', name: 'voltKindNm', align: 'center' },
+	{ header: '전압구분', name: 'voltKindNm', align: 'left' },
 	{ header: '옵션CD', name: 'optKind', hidden: true },
-	{ header: '옵션', name: 'optKindNm', align: 'center' },
+	{ header: '옵션', name: 'optKindNm', align: 'left' },
 	{
 		header: '기본요금(원/kW)',
 		name: 'baseChrg',
@@ -620,7 +649,7 @@ const myColumns = [
 		},
 	},
 	{ header: '시간대CD', name: 'peakKind', hidden: true },
-	{ header: '시간대', name: 'peakKindNm', align: 'center' },
+	{ header: '시간대', name: 'peakKindNm', align: 'left' },
 	{
 		header: '여름철(6~8월)',
 		name: 'unitPrcSum',

components/common/modal/EnrgUsePlanModiPop.vue

@@ -318,7 +318,7 @@ export default {
 		// }
 	},
 	mounted(){
-		this.initTest(); return;
+		// this.initTest(); return;
 	},
 	methods: {
 		...mapMutations({
@@ -478,10 +478,6 @@ 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', required ? 'icon-orange' : 'icon-blue']"
+					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
 					>$icoBulletPoint</v-icon
 				>
 				{{ option.labelContent }}

components/common/modal/EqpmSelectPop.vue

@@ -1,6 +1,6 @@
 <template>
 	<v-row class="search-box" align="center" no-gutters>
-		<v-col v-if="label" :cols="labelCols">
+		<v-col v-if="label" :cols="labelCols" class="mr-2">
 			<label for="" class="search-box-label">
 				<v-icon v-if="iconShow" small
 					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
@@ -8,62 +8,70 @@
 			</label>
 		</v-col>
 		<v-col :cols="textCols">
-			<v-text-field readonly append-icon="" :class="['v-input__custom', customClass]"
-				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
-				:disabled="disabled || false"><template v-slot:append>
+			<v-text-field
+				readonly
+				v-model="selectValue"
+				append-icon="mdi-magnify"
+				:class="['v-input__custom', customClass]"
+				@click="dialogOpenCloseEvent(dialog)"
+				outlined
+				:hide-details="true"
+				:required="required || false"
+				:disabled="disabled || false"
+				:placeholder="placeholder"
+			>
+				<template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
-
-				</template></v-text-field>
+				</template>
+			</v-text-field>
 		</v-col>
-		<v-dialog ref="popModal" v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8" scrollable>
-			<v-card style="height: 100%">
+		<v-dialog ref="popModal" v-model="dialog" width="800" scrollable>
+			<v-card style="height: 90vh;">
 				<v-card-title class="px-5 py-4 d-flex align-center justify-space-between">
 					<span class="custom-title-4">설비 선택</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
 				<div class="pa-2 pt-0">
-					<v-card class="searchFilter">
-						<v-row align="end">
-							<v-col :cols="3.5">
-								<!-- 설비그룹 -->
-								<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
-									:label="'설비그룹'" :disabled="eqpmGrpDisabled"
-									@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
-									:iconShow="true" />
-							</v-col>
-							<v-col :cols="3.5">
-								<!-- FAB -->
-								<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
-									:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
-									:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
-									:iconShow="true" />
-							</v-col>
-							<v-col :cols="3.5">
-								<v-row>
-									<v-col :cols="12" class="py-0">
-										<label for="" class="search-box-label">
-											<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
-											설비명
-										</label>
-									</v-col>
-									<v-col :cols="12" class="pt-0">
-										<v-text-field append-icon="" class="v-input__custom" outlined
-											:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
-												v-slot:append>
-												<!-- Custom SVG icon -->
-												<v-icon>$icoSearch</v-icon>
+					<!-- <v-card class="searchFilter">
+					</v-card> -->
+					<v-row align="end" class="searchFilter">
+						<v-col :cols="3.5">
+							<!-- 설비그룹 -->
+							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
+								:label="'설비그룹'" :disabled="eqpmGrpDisabled"
+								@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
+								:iconShow="true" />
+						</v-col>
+						<v-col :cols="3.5">
+							<!-- FAB -->
+							<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
+								:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
+								:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
+								:iconShow="true" />
+						</v-col>
+						<v-col :cols="3.5">
+							<v-row>
+								<v-col :cols="12" class="py-0">
+									<label for="" class="search-box-label">
+										<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
+										설비명
+									</label>
+								</v-col>
+								<v-col :cols="12" class="pt-0">
+									<v-text-field append-icon="" class="v-input__custom" outlined
+										:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
+											v-slot:append>
+											<!-- Custom SVG icon -->
+											<v-icon>$icoSearch</v-icon>
 
-											</template></v-text-field>
-									</v-col>
+										</template></v-text-field>
+								</v-col>
 
-								</v-row>
-							</v-col>
-							<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
-
-
-						</v-row>
-					</v-card>
+							</v-row>
+						</v-col>
+						<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
+					</v-row>
 
 					<!-- <v-row align="center" no-gutters style="margin-top: 14px;">
 						<v-col :cols="1">
@@ -77,14 +85,20 @@
 								:hide-details="true" v-model="searchWord" @keyup.enter="search"></v-text-field>
 						</v-col>
 					</v-row> -->
+					<!-- <v-row>
+						<v-col :col="12">
+						</v-col>
+					</v-row> -->
 				</div>
-				<div class="px-5" style="height:429px;">
-					<div ref="modalGridParent" class="w100 h100">
+
+				<v-card-text class="px-2 w100">
+					<div ref="modalGridParent" style="height: 450px;" class="h100 w100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
 							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
 							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
 					</div>
-				</div>
+				</v-card-text>
+
 				<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 :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
@@ -117,6 +131,11 @@ export default {
 			require: false,
 			default: '전력 계약 정보',
 		},
+		placeholder: {
+			type: String,
+			require: false,
+			default: '',
+		},
 		valueNm: {
 			type: String,
 			require: false,

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" align="center">
+	<v-row class="search-box no-gutters" align="center">
 		<v-col :cols="option.labelCols" class="py-0">
 			<label for="" class="search-box-label">
 				<v-icon v-if="item.iconShow" small
@@ -8,13 +8,11 @@
 			</label>
 		</v-col>
 		<v-col :cols="option.textCols" class="py-0">
-			<v-text-field readonly append-icon="" class="v-input__custom" outlined :hide-details="true"
-				v-model="searchWord" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)"
+			<v-text-field readonly append-icon="" :class="['v-select__custom', customClass]" outlined :hide-details="true"
+				v-model="selectValue" @keyup.enter="typeEnterKey" @click="dialogOpenCloseEvent(dialog)" 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>
 
@@ -43,8 +41,6 @@
 								class="search-button">조회</a-button>
 						</v-row>
 					</v-col>
-
-
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
 				<div :style="'height: 600px'" class="px-5">

components/common/modal/FixedValueModiPop.vue

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

components/common/modal/FtnPlcFormPop.vue

@@ -22,37 +22,29 @@
 				outlined
 				:hide-details="true"
 			>
+			<!-- Custom SVG icon -->
 			<template v-slot:append>
-					<!-- Custom SVG icon -->
-					<v-icon>$icoSearch</v-icon>
+				<v-icon>$icoSearch</v-icon>
 			</template>
 		</v-text-field>
 		</v-col>
 
 		<v-dialog v-model="dialog" scrollable width="700px">
 			<v-card style="height: 100%">
-				<v-card-title class="pa-5 d-flex align-center justify-space-between">
+				<v-card-title class="px-6 py-4 d-flex align-center justify-space-between">
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
-					<v-btn
-						icon
-						tile
-						:ripple="false"
-						@click="dialogOpenCloseEvent(dialog)"
-					>
-						<v-icon>mdi-close</v-icon>
-					</v-btn>
+					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
-						<v-col :cols="3">
+						<v-col :cols="12">
 							<label for="" class="search-box-label">
-								<v-icon x-small color="primary" class="mr-1"
-									>mdi-record-circle</v-icon
-								>
+								<!-- <v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon> -->
+								<v-icon small :class="['mr-1 icon-blue']">$icoBulletPoint</v-icon>
 								검색
 							</label>
 						</v-col>
-						<v-col :cols="5">
+						<v-col :cols="9">
 							<v-text-field
 								append-icon="mdi-magnify"
 								class="v-input__custom"
@@ -63,21 +55,19 @@
 							></v-text-field>
 						</v-col>
 						<v-spacer></v-spacer>
-						<v-col cols="4" class="text-right">
-							<v-btn :ripple="false" @click="search()">
+						<v-col :cols="3" class="text-right">
+							<a-button type="primary" @click="search()" icon="search">
 								조회
-							</v-btn>
-							<v-btn :ripple="false" @click="initSearch()">
+							</a-button>
+							<a-button @click="initSearch()">
 								초기화
-							</v-btn>
+							</a-button>
 						</v-col>
 					</v-row>
 				</div>
-				<v-divider></v-divider>
-				<!-- <div :style="'height: calc(65vh)'"> -->
-					<div :style="'height: 429px;'">
-					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
-					<div ref="modalGridParent" class="h100 w100 py-3">
+			<!-- <v-divider></v-divider> -->
+				<div style="height: 429px;" class="py-3 px-5">
+					<div ref="modalGridParent" class="h100 w100">
 						<component
 							:is="loadGrid && dialog ? 'Grid' : null"
 							:gridName="grid_01"
@@ -88,11 +78,9 @@
 						/>
 					</div>
 				</div>
-				<v-card-actions class="pa-5 d-flex align-center justify-center">
-					<v-btn :ripple="false" @click="setUpdate($event)">확인</v-btn>
-					<v-btn :ripple="false" @click="dialogOpenCloseEvent(dialog)"
-						>닫기</v-btn
-					>
+				<v-card-actions class="pa-5 d-flex align-center justify-end">
+					<a-button class="mr-2" @click="dialogOpenCloseEvent(dialog)">닫기</a-button>
+					<a-button type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -292,52 +280,41 @@ export default {
 				modalKey: this.myModalKey,
 				gridKey: this.grid_01,
 				modalDataKey: this.modalDataKey,
-				value: [{ header: '위치정보', name: 'eccNm' }],
+				value: [
+					{
+						align: 'center',
+						width: 30,
+						minWidth: 60,
+						formatter: (props) => {
+							return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
+						}
+					},
+					{ header: '위치정보', name: 'eccNm' }
+				],
 			});
 		},
 		async getGridData() {
-			// this.loadGrid = false;
+			this.loadGrid = false;
 
-			// const res = await this.postApiReturn({
-			// 	apiKey: 'selectEccBaseInfo',
-			// 	resKey: 'eccBaseInfoData',
-			// 	sendParam: {
-			// 		blocId: this.myBindingData.blocId,
-			// 		eqpmYn: '0',
-			// 		search: this.searchWord,
-			// 	},
-			// });
+			const res = await this.postApiReturn({
+				apiKey: 'selectEccBaseInfo',
+				resKey: 'eccBaseInfoData',
+				sendParam: {
+					blocId: this.myBindingData.blocId,
+					eqpmYn: '0',
+					search: this.searchWord,
+				},
+			});
 
-			// const setTreeData = await this.setTree({
-			// 	gridKey: this.gridNameTree,
-			// 	treeKey: 'ECC_ID',
-			// 	value: res.map(item => ({
-			// 		...item,
-			// 		eccNm: item.eccNm,
-			// 	})),
-			// });
-			
-			//mockdata eccNm
-
-			
-			let res = [
-				{ ECC_ID: 'ECC001', eccNm: '서울 본사', iconShow: false, align: 'center' },
-				{ ECC_ID: 'ECC002', eccNm: '부산 지사', useIcon: false, align: 'center' },
-				{ ECC_ID: 'ECC003', eccNm: '대구 센터', useIcon: false, align: 'center' },
-				{ ECC_ID: 'ECC004', eccNm: '광주 사무소' , useIcon: false, align: 'center'},
-				{ ECC_ID: 'ECC005', eccNm: '인천 물류창고' , useIcon: false, align: 'center'},
-			];
-
-			
-			const setTreeData = {
-				ROOT: res.map(item => ({
+			const setTreeData = await this.setTree({
+				gridKey: this.gridNameTree,
+				treeKey: 'ECC_ID',
+				value: res.map(item => ({
 					...item,
 					eccNm: item.eccNm,
-				}))
-			};
+				})),
+			});
 
-			console.log(res);
-			
 			this.setModalGridData({
 				modalKey: this.myModalKey,
 				gridKey: this.grid_01,
@@ -395,7 +372,31 @@ var FtnPlcFormPop = {
 </script>
 
 <style lang="scss" scoped>
+// @each $theme in dark, light {
+// 	@include theme($theme);
+// 	.v-application.#{$theme}-mode {
+// 		.v-input--is-readonly {
+// 			border-color: map-deep-get($config,
+// 				#{$theme},
+// 				"v-input-readonly-border-color"
+// 			);
+// 			::v-deep {
+// 				&:not(.v-input--radio-group, .v-input--checkbox) {
+// 					.v-input__slot {
+// 						background-color: map-deep-get($config,
+// 							#{$theme},
+// 							"v-input-backgroundColor"
+// 						) !important;
+// 					}
+// 				}
+// 			}
+
+// 		}
+// 	}
+// }
+
 ::v-deep {
+
 	.v-dialog {
 		overflow-y: hidden !important;
 	}
@@ -418,26 +419,4 @@ var FtnPlcFormPop = {
 	}
 }
 
-@each $theme in dark, light {
-	.v-application.#{$theme}-mode {
-		.v-dialog {
-			.v-card {
-				&__title {
-					color: map-deep-get($color, 'white', '0');
-					@if $theme == dark {
-						background-color: #2d3355;
-						.v-btn {
-							background-color: #2d3355;
-						}
-					} @else {
-						background-color: #3f4d7d;
-						.v-btn {
-							background-color: #3f4d7d;
-						}
-					}
-				}
-			}
-		}
-	}
-}
 </style>

components/common/modal/FtnPlcMultiPop3.vue

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

components/common/modal/OnlnBaseEccPop.vue

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

components/common/modal/PlanPop.vue

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

components/common/modal/ReadPlcDisableFuncPop.vue

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

components/common/modal/ReadPlcPop.vue

@@ -67,7 +67,7 @@
 								Expand All
 							</a-button></v-col>
 					</v-row>
-
+					
 					<!-- <v-btn color="primary" dark @click="btnTreeExpand()">{{
             treeExpand
           }}</v-btn> -->
@@ -268,7 +268,7 @@ export default {
 						header: '',
 						name: '',
 						align: 'center',
-						width: 50,
+						width: 20,
 						formatter: (props) => {
 							return `<label class="custom-radio">
 										<span class="radio-mark"></span>
@@ -278,10 +278,10 @@ export default {
 					{
 						header: '검침개소명',
 						name: 'readPlcNm',
-						width: 300,
+						width: 500,
 						align: 'left',
 					},
-					{ header: '검침개소', name: 'name', align: 'center' },
+					{ header: '검침개소', name: 'name', align: 'left', width: 200 },
 				],
 			});
 		},
@@ -307,6 +307,9 @@ export default {
 
 			// console.log("treeData", res)
 			let myOptionsTree = {
+				columnOptions: {
+					resizable: true,
+				},
 				treeColumnOptions: {
 					name: 'readPlcNm',
 				},

components/common/modal/TagTrndTagPop.vue

@@ -273,9 +273,9 @@ export default {
     });
   },
   async created() {
-    // await this.setSelectValueList01();
-    // await this.setSelectValueList02();
-    // await this.setSelectValueList03();
+    await this.setSelectValueList01();
+    await this.setSelectValueList02();
+    await this.setSelectValueList03();
     this.init();
     // if(this.searchParam.isMulti == true){
     //   this.setPageData({
@@ -487,40 +487,40 @@ export default {
         eqpmId: this.selectValue03,
         searchWord: this.searchWord,
       };
-      let res = [
-        {
-          eqpmGrpNm: "냉각 시스템",
-          eqpmGrpId: "GRP001",
-          eqpmId: "EQ001",
-          eqpmNm: "냉각기 A",
-          tagId: "TAG001-001",
-          tagNm: "냉각 온도 센서",
-          rowStat: "I",
-        },
-        {
-          eqpmGrpNm: "전력 시스템",
-          eqpmGrpId: "GRP002",
-          eqpmId: "EQ002",
-          eqpmNm: "변압기 B",
-          tagId: "TAG002-002",
-          tagNm: "전류 센서",
-          rowStat: "U",
-        },
-        {
-          eqpmGrpNm: "공기압 시스템",
-          eqpmGrpId: "GRP003",
-          eqpmId: "EQ003",
-          eqpmNm: "압축기 C",
-          tagId: "TAG003-003",
-          tagNm: "압력 센서",
-          rowStat: "D",
-        },
-      ];
-      //   res = await this.postApiReturn({
-      //     apiKey: "selectTagAndEqpmList",
-      //     resKey: "tagTrndDatas",
-      //     sendParam: searchParam,
-      //   });
+      // let res = [
+      //   {
+      //     eqpmGrpNm: "냉각 시스템",
+      //     eqpmGrpId: "GRP001",
+      //     eqpmId: "EQ001",
+      //     eqpmNm: "냉각기 A",
+      //     tagId: "TAG001-001",
+      //     tagNm: "냉각 온도 센서",
+      //     rowStat: "I",
+      //   },
+      //   {
+      //     eqpmGrpNm: "전력 시스템",
+      //     eqpmGrpId: "GRP002",
+      //     eqpmId: "EQ002",
+      //     eqpmNm: "변압기 B",
+      //     tagId: "TAG002-002",
+      //     tagNm: "전류 센서",
+      //     rowStat: "U",
+      //   },
+      //   {
+      //     eqpmGrpNm: "공기압 시스템",
+      //     eqpmGrpId: "GRP003",
+      //     eqpmId: "EQ003",
+      //     eqpmNm: "압축기 C",
+      //     tagId: "TAG003-003",
+      //     tagNm: "압력 센서",
+      //     rowStat: "D",
+      //   },
+      // ];
+      let res = await this.postApiReturn({
+          apiKey: "selectTagAndEqpmList",
+          resKey: "tagTrndDatas",
+          sendParam: searchParam,
+      });
       let newRes = [];
       if (this.searchParam["tagList"].length > 0) {
         newRes = res.filter((item) => {

components/common/select/SelectBlocMstr.vue

@@ -2,19 +2,16 @@
 	<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
-				:hide-details="true" :class="['v-select__custom', customClass]">
+				:hide-details="true" :class="['v-select__custom', customClass]"
+				:menu-props="{ top: false, offsetY: true }"
+			>
 				<template v-slot:append><v-icon>$icoChevronDown</v-icon></template>
 			</v-select>
 		</v-col>

components/common/select/SelectBox.vue

@@ -14,12 +14,14 @@
 		<v-col :cols="label ? textCols : ''">
 			<v-select v-model="innerValue" :items="itemList" item-text="text" item-value="value" solo outlined
 				:hide-details="true" append-icon="" :class="['v-select__custom', customClass]" :disabled="disabled"
-				:readonly="readonly"><template v-slot:append>
+				:readonly="readonly"
+				:menu-props="{ top: false, offsetY: true }"	
+			>
+				<template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoChevronDown</v-icon>
-
-
-				</template></v-select>
+				</template>
+			</v-select>
 			<!-- @change="updateBlocCode($event)" -->
 		</v-col>
 	</v-row>

components/common/select/SelectBoxMulti.vue

@@ -24,9 +24,24 @@
 				:disabled="disabled"
 				:readonly="readonly"
 				append-icon=""
-				><template v-slot:append>
+				:menu-props="{ top: false, offsetY: true }"
+				>
+				<template v-slot:append>
 					<v-icon>$icoChevronDown</v-icon>
-				</template></v-select>
+				</template>
+
+				<template v-slot:item="{item, attrs, on, props}">
+					<v-list-item v-bind="attrs" v-on="on" >
+						<v-list-item-content>
+							<v-list-item-title class="d-flex justify-space-between">
+								{{item.text}}
+								<a-icon type="check" ></a-icon>
+							</v-list-item-title>
+						</v-list-item-content>
+					</v-list-item>
+				</template>
+
+			</v-select>
 		</v-col>
 	</v-row>
 </template>
@@ -125,4 +140,4 @@ export default {
 };
 </script>
 
-<style></style>
+<style scoped lang="scss"></style>

components/common/select/SelectBoxTime.vue

@@ -22,11 +22,11 @@
         outlined
         :menu-props="{ auto: true, offsetY: true }"
         :hide-details="true"
-        :class="'v-select__custom select-large'"
+        :class="['v-select__custom', customClass]"
         :disabled="disabled"
         :readonly="readonly"
         @click="setDatepickerHide"
-        style="width: 170px; border-radius: 6px !important"
+        style="min-width: 170px;"
       >
         <template v-slot:append>
           <a-icon
@@ -106,6 +106,10 @@ export default {
       require: false,
       default: 1,
     },
+    customClass: {
+      type: String,
+      require: false,
+    },
   },
   emits: ["update:propsValue"],
   data() {

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,6 +85,11 @@ export default {
       type: String,
       require: false,
     },
+    required: {
+      type: Boolean,
+      require: false,
+      default: false
+    },
   },
   data() {
     return {

components/common/select/selectCodeList.vue

@@ -11,9 +11,13 @@
 		<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]"
+				:menu-props="{ top: false, offsetY: true }"
+			>
+				<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/pages/comm/CommCdTab.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="pb-5 h100">
 		<div class="d-flex align-center justify-space-between">
-			<span class="text-h6">공통그룹코드</span>
+			<span class="grid-title">공통그룹코드</span>
 			<div>
 				<Buttons
 					:parentPrgmId="parentPrgmId"
@@ -126,7 +126,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
 							item => item.commCd == value,

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <div class="d-flex justify-space-between align-center" style="min-height: 80px;">
-      <span class="txt custom-title-4-new">Data Set TAG 연결 정보</span>
+      <span class="txt custom-subtitle-tab">Data Set TAG 연결 정보</span>
       <Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"
         :btnActionsFnc="btnActions" />
     </div>
-    <div ref="gridParent">
+    <div ref="gridParent" style="min-height: 30vh;">
       <Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
         @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
     </div>
@@ -38,7 +38,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustumChecbox } from '~/plugins/gridUtility';
+import { CustomCheckbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
@@ -66,7 +66,7 @@ export default {
   },
   data() {
     return {
-      loadGrid: true,
+      loadGrid: false,
       gridName: 'rowDataSetTagRelGrid',
       detailDataSetTagList: myDataSetTagDetail,
       dataPathMock: {
@@ -128,8 +128,6 @@ export default {
       const gridHeight = this.$refs['gridParent'].offsetHeight - 36;
 
       const myOptions = {
-        // bodyHeight: gridHeight,
-        // minBodyHeight: gridHeight,
         header: {
           height: 28,
         },
@@ -137,14 +135,9 @@ 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),
       });
 
@@ -204,16 +197,11 @@ export default {
         value: myColumns,
       });
 
-      this.loadGrid = true;
+      this.$nextTick(() => {
+        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,
@@ -225,7 +213,7 @@ export default {
       let dataArr = [];
       switch (action) {
         case 'add':
-          console.log('add this.pageData : '); // , this.pageData);
+          // console.log('add this.pageData : '); // , this.pageData);
           const defaultRow = {
             dataSetId: this.pageData.dataSetId,
             dataSetNm: this.pageData.dataSetNm,
@@ -308,7 +296,7 @@ export default {
         comId: this.selectedComId,
         dataSetId: this.selectedDataSetId,
       };
-      console.log('data : ', data);
+      // console.log('data : ', data);
       this.$emit('jamoviClickEvent', 'view1', data);
     },
   },

components/pages/ems/EccInfo/EccAddInfoTab.vue

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

components/pages/ems/EccInfo/EccIaoTab.vue

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

components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue

@@ -69,55 +69,6 @@ export default {
 		return {
 			loadGrid: false,
 			gridName: 'effcInfoGrid',
-			// 	"effcInfoGrid": {
-			// 		data:
-			// 			[
-			// 				{
-			// 					"eqpmKindId": "펌프",
-			// 					"eqpmGrpId": "냉각수 시스템",
-			// 					"totMethNm": "평균값"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "모터",
-			// 					"eqpmGrpId": "공기압 시스템",
-			// 					"totMethNm": "최대값"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "밸브",
-			// 					"eqpmGrpId": "스팀 공급",
-			// 					"totMethNm": "합계"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "센서",
-			// 					"eqpmGrpId": "온도 제어",
-			// 					"totMethNm": "최소값"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "컴프레서",
-			// 					"eqpmGrpId": "에어 시스템",
-			// 					"totMethNm": "중앙값"
-			// 				}
-			// 			]
-
-			// 		,
-			// 		column: [
-
-			// 			{
-			// 				header: '대상설비종류',
-			// 				name: 'eqpmKindId',
-
-			// 			},
-			// 			{
-			// 				header: '대상설비그룹',
-			// 				name: 'eqpmGrpId',
-			// 			},
-
-			// 			{ header: '집계방법', name: 'totMethNm', align: 'center' },
-
-			// 		]
-
-			// 	}
-			// },
 			itemList: [],
 			tagTpList: [],
 			// detailList: myDetail,
@@ -388,10 +339,10 @@ export default {
 				},
 				// bodyHeight: gridHeight,
 				// minBodyHeight: gridHeight,
-				// header: {
-				// 	height: 28,
-				// },
-				// rowHeight: 29,
+				header: {
+					height: 37,
+				},
+				rowHeight: 37,
 				// minRowHeight: 29,
 				// selectionUnit: 'row',
 				// editingEvent: 'click',
@@ -436,7 +387,6 @@ export default {
 					header: '물리량ID',
 					name: 'pysclQtyId',
 					width: 200,
-					align: 'center',
 					hidden: true,
 				},
 				{ header: '물리량', name: 'pysclQtyCd', hidden: true, minWidth: 200 },
@@ -445,7 +395,7 @@ export default {
 				{ header: '가이드지표', name: 'gdIdxId', hidden: true },
 				{ header: '가이드지표명', name: 'gdIdxNm', hidden: true },
 				{ header: '집계방법', name: 'totMeth', hidden: true },
-				{ header: '집계방법', name: 'totMethNm', align: 'center' },
+				{ header: '집계방법', name: 'totMethNm',},
 			];
 
 			if (this.selectValue01 == 'PYSCL') {

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

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

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,12 +1,12 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center" style="height: 80px;">
-			<span class="txt custom-title-4-new">설비 상수 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 상수 정보</span>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
 			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" :dataPath="dataPathMock" />
+				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
 		</div>
 		<div style="min-height: calc(100vh - 900px);" class="mt-4">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailList"
@@ -41,7 +41,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmConstGrid',
 			detailList: myEqpmConstDetail,
 
@@ -96,20 +96,20 @@ export default {
 	watch: {
 		selectedEqpmKindId(val) {
 			if (val) {
-				this.detailList[2].eqpmKindId = val;
+				this.detailList[1].eqpmKindId = val;
 			}
 		},
 		selectedEqpmGrpId(val) {
 			// if(!val){
-			// 	this.detailList[2].eqpmGrpId = '';
+			// 	this.detailList[1].eqpmGrpId = '';
 			// }else{
-			// 	this.detailList[2].eqpmGrpId = val;
+			// 	this.detailList[1].eqpmGrpId = val;
 			// }
 			// if(val){
-			// 	this.detailList[2].eqpmGrpId = val;
+			// 	this.detailList[1].eqpmGrpId = val;
 			// }
 			// else if(val == null || val == ''){
-			// 	this.detailList[2].eqpmGrpId = '';
+			// 	this.detailList[1].eqpmGrpId = '';
 			// }
 		},
 	},
@@ -232,14 +232,16 @@ export default {
 				value: myColumns,
 			});
 
-			this.loadGrid = true;
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
-				this.detailList[2].disabled = false;
+				this.detailList[1].disabled = false;
 				this.detailList[3].disabled = false;
 			} else {
-				this.detailList[2].disabled = true;
+				this.detailList[1].disabled = true;
 				this.detailList[3].disabled = true;
 			}
 
@@ -255,12 +257,12 @@ export default {
 			switch (action) {
 				case 'add':
 					this.$refs[this.gridName].addRow();
-					this.detailList[2].disabled = false;
+					this.detailList[1].disabled = false;
 					this.detailList[3].disabled = false;
 					break;
 
 				case 'remove':
-					this.detailList[2].disabled = true;
+					this.detailList[1].disabled = true;
 					this.detailList[3].disabled = true;
 					this.$refs[this.gridName].removeRow();
 					break;
@@ -289,8 +291,8 @@ export default {
 
 						dataArr.map(item => {
 							for (var key of Object.keys(item)) {
-								console.log('key : ', key);
-								console.log('item[key] : ', item[key]);
+								// console.log('key : ', key);
+								// console.log('item[key] : ', item[key]);
 								if (!item[key] && requiredKeyList.includes(key)) {
 									validCheck = false;
 								}
@@ -356,7 +358,6 @@ const myEqpmConstDetail = [
 	{
 		type: 'SelectBox',
 		label: '대상 유형',
-		disabled: true,
 		cols: 6,
 		class: 'py-3 pr-4',
 		list: 'emMapDivList2',
@@ -369,6 +370,7 @@ const myEqpmConstDetail = [
 		textCols: 12,
 		iconShow: true,
 	},
+	// ==================
 	{
 		type: 'EgrpPysclQtyPop',
 		labelContent: '물리량',
@@ -380,7 +382,7 @@ const myEqpmConstDetail = [
 			pysclQtyNm: 'pysclQtyNm',
 		},
 		valueNm: 'objId',
-		disabled: false,
+		disabled: true,
 		required: true,
 		openMode: 'CONST',
 		cols: 6,
@@ -411,6 +413,7 @@ const myEqpmConstDetail = [
 		textCols: 12,
 		iconShow: true,
 	},
+	// ------------
 	{
 		type: 'InputText',
 		label: '물리량 값',

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -1,25 +1,21 @@
 <template>
 	<div>
-		<div
-			class="d-flex justify-space-between align-center"
-			style="height: 80px;"
-		>
-			<span class="txt custom-title-4-new">설비 입출력 정보</span>
+		<div class="d-flex justify-space-between align-center my-5" >
+			<span class="txt custom-subtitle-tab">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
-			<!-- :is="loadGrid ? 'Grid' : null" -->
+		<div ref="gridParent" style="height: calc(100vh - 800px);">
 			<Grid
 				:ref="gridName"
+				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 		<div style="min-height: calc(100vh - 900px);" class="mt-4">
@@ -60,28 +56,12 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmIaoGrid',
 			detailList: myEqpmIaoDetail,
 
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
-			dataPathMock: {
-        'rowEqpmIaoGrid' : {
-          column: [
-            { header: '대상항목', name: 'id', headerAlign: 'left' },
-            { header: '에너지원 명', name: 'lable', headerAlign: 'left' },
-            { header: '대상 유형', name: 'type', headerAlign: 'left' },
-            { header: '물리량', name: 'note', headerAlign: 'left' },
-            { header: '계산여부', name: 'field1', headerAlign: 'left' },
-            { header: '분배율', name: 'field2', headerAlign: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {}
-        }
-      },
-
 		};
 	},
 	computed: {
@@ -128,18 +108,24 @@ export default {
 	},
 	watch: {
 		selectedObjId(val) {
-			console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-2';
-				this.detailList[5].class = 'py-2';
+				// this.detailList[1].class = 'py-3 pl-4 pb-0';
+				this.detailList[1].class = 'py-3 d-none';
+				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 pl-4';
+				this.detailList[6].class = 'py-3 pl-4 pt-0';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[5].class = 'py-2 d-none';
-				this.detailList[4].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-2';
-				this.detailList[2].class = 'py-2';
+				this.detailList[1].class = 'py-3 pl-4';
+				this.detailList[2].class = 'py-3';
+				this.detailList[3].class = 'py-3 pl-4 pt-0';
+
+				this.detailList[4].class = 'py-3 d-none';
+				this.detailList[5].class = 'py-3 d-none';
+				this.detailList[6].class = 'py-3 d-none';
 			}
 		},
 		selectedCalcFg(val) {
@@ -172,7 +158,7 @@ export default {
 		},
 	},
 	mounted() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -302,13 +288,13 @@ export default {
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
 				this.detailList[0].disabled = false;
-				this.detailList[2].disabled = false;
+				this.detailList[1].disabled = false;
 				this.detailList[3].disabled = false;
 				this.detailList[4].disabled = false;
 				this.detailList[5].disabled = false;
 			} else {
 				this.detailList[0].disabled = true;
-				this.detailList[2].disabled = true;
+				this.detailList[1].disabled = true;
 				this.detailList[3].disabled = true;
 				this.detailList[4].disabled = true;
 				this.detailList[5].disabled = true;
@@ -326,7 +312,7 @@ export default {
 				case 'add':
 					this.$refs[this.gridName].addRow();
 					this.detailList[0].disabled = false;
-					this.detailList[2].disabled = false;
+					this.detailList[1].disabled = false;
 					this.detailList[3].disabled = false;
 					this.detailList[4].disabled = false;
 					this.detailList[5].disabled = false;
@@ -335,7 +321,7 @@ export default {
 				case 'remove':
 					this.$refs[this.gridName].removeRow();
 					this.detailList[0].disabled = true;
-					this.detailList[2].disabled = true;
+					this.detailList[1].disabled = true;
 					this.detailList[3].disabled = true;
 					this.detailList[4].disabled = true;
 					this.detailList[5].disabled = true;
@@ -355,7 +341,7 @@ export default {
 					}
 
 					if (dataArr.length > 0) {
-						console.log('dataArr : ', dataArr);
+						// console.log('dataArr : ', dataArr);
 
 						var requiredKeyList = this.detailList
 							.filter(item => {
@@ -416,6 +402,7 @@ export default {
 	},
 };
 
+
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -455,10 +442,10 @@ const myEqpmIaoDetail = [
 		type: 'ReadPlcPop',
 		label: '대상 항목',
 		valueNm: 'objId',
-		disabled: true,
 		cols: 6,
-		class: 'py-3 pl-4',
+		class: 'py-3 pl-4 pb-0',
 		required: true,
+		disabled: true,
 		bindNm: 'objNm',
 		textCols: 12,
 		labelCols: 12,
@@ -479,30 +466,39 @@ const myEqpmIaoDetail = [
 		readonly: true,
 		disabled: true,
 		cols: 6,
-		class: 'py-3 pl-4 pt-1',
+		class: 'py-3 pl-4 pt-0',
 		textCols: 12,
 		labelCols: 12,
 		iconShow: true
 	},
+// ============
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목 111',
+		labelContent: '대상 항목',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
 		disabled: true,
 		required: true,
 		cols: 6,
-		class: 'py-3 d-none',
+		class: 'py-3 pl-4 d-none',
 		disableContent: true,
 		textCols: 12,
 		labelCols: 12,
 		iconShow: true
 	},
 	{
-		type: 'InputText',
-		cols: 5,
+		type: 'Label',
+		cols: 6,
 		class: 'py-3 d-none',
+		disabled: true,
+		textCols: 12,
+		labelCols: 12,
+	},
+	{
+		type: 'InputText',
+		cols: 6,
+		class: 'py-3 pl-4 d-none',
 		valueNm: 'objNm',
 		readonly: true,
 		disabled: true,
@@ -510,6 +506,7 @@ const myEqpmIaoDetail = [
 		labelCols: 12,
 		iconShow: true
 	},
+	// --------------------------------------------
 	{
 		type: 'SelectBox',
 		label: '에너지원',
@@ -614,13 +611,4 @@ const myEqpmIaoDetail = [
 		iconShow: true
 	},
 ];
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
-	lable: 'INCHEON 고온 냉동기 101호기 - 호로1',
-	type: '사용', note: '-',
-	field1: '1111',
-	field2: '2222',
-});
 </script>

components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue

@@ -20,6 +20,12 @@
 				</v-card>
 			</v-col>
 		</v-row>
+		<!-- Create the line between date picker and form -->
+		<v-row class="my-5" no-gutters>
+			<v-col>
+				<div style="height: 1px; background-color: #ccc;"></div>
+			</v-col>
+		</v-row>
 		<v-row class="search-box" align="center" no-gutters style="height: 44px;">
 			<v-col :cols="4">
 				<label for="" class="search-box-label">
@@ -271,63 +277,6 @@ export default {
 				value: myColumns,
 			});
 
-			const res = [
-  {
-    "comId": "COM001",
-    "ercId": "ERC001",
-    "objMm": "202507",
-    "objYm": "2025-07",
-    "unitPrce": 120.5,
-    "peakPow": 450,
-    "baseChrg": 30000,
-    "notiChrg": 32500,
-    "rmrk": "Standard summer rate",
-    "blocId": "BLOC001",
-    "regUserNo": "USER001",
-    "regDttm": "2025-07-01T09:00:00",
-    "procUserNo": "USER002",
-    "procDttm": "2025-07-15T14:30:00"
-  },
-  {
-    "comId": "COM002",
-    "ercId": "ERC002",
-    "objMm": "202507",
-    "objYm": "2025-07",
-    "unitPrce": 98.75,
-    "peakPow": 300,
-    "baseChrg": 25000,
-    "notiChrg": 27000,
-    "rmrk": "Reduced rate for solar",
-    "blocId": "BLOC002",
-    "regUserNo": "USER003",
-    "regDttm": "2025-07-02T10:15:00",
-    "procUserNo": "USER004",
-    "procDttm": "2025-07-16T11:45:00"
-  },
-  {
-    "comId": "COM003",
-    "ercId": "ERC003",
-    "objMm": "202507",
-    "objYm": "2025-07",
-    "unitPrce": 110.0,
-    "peakPow": 400,
-    "baseChrg": 28000,
-    "notiChrg": 29500,
-    "rmrk": "Geothermal adjustment",
-    "blocId": "BLOC003",
-    "regUserNo": "USER005",
-    "regDttm": "2025-07-03T08:45:00",
-    "procUserNo": "USER006",
-    "procDttm": "2025-07-17T13:20:00"
-  }
-]
-
-	this.setGridData({
-				gridKey: this.gridName,
-				value: res,
-			});
-
-
 			this.loadGrid = true;
 		},
 		async btnActions(action) {

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -4,7 +4,7 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt">검침 대상 추가 정보</span>
+			<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -20,8 +20,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:selectedRowDataWatchFlag="true"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -55,23 +53,10 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			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: {
@@ -276,7 +261,7 @@ export default {
 				{ header: '검침 대상 ID', name: 'readObjId', hidden: true },
 				{
 					header: '추가 정보',
-					name: 'addInfoId', 
+					name: 'addInfoId',
 					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
@@ -461,25 +446,4 @@ 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

@@ -200,7 +200,6 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(

components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue

@@ -7,7 +7,7 @@
 		</div>
 
 		<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
-			<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
+			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"  />
 		</div>
 		<div ref="formParent" style="height: calc((100vh - 400px) /2);">
@@ -101,9 +101,9 @@ export default {
 				// bodyHeight: gridHeight,
 				// minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 37,
 				},
-				// rowHeight: 29,
+				rowHeight: 37,
 				// minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
@@ -124,13 +124,12 @@ export default {
 			const myColumns = [
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
-				{ header: '대상 검침개소 번호', name: 'objReadPlcId', align: 'center' },
+				{ header: '대상 검침개소 번호', name: 'objReadPlcId'},
 				{ header: '대상 검침개소명', name: 'objReadPlcNm', align: 'left' },
 				{ header: '분배율(1~100)', name: 'distRt', align: 'right' },
 				{
 					header: '가감유형',
 					name: 'ddctKind',
-					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = ddctKindList.filter(item => item.value == value);

components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue

@@ -6,12 +6,23 @@
 				:btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
-			<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
-				:innerTabGridInfo="innerTabGridInfo"  />
+			<Grid
+				:ref="gridName"
+				:is="loadGrid ? 'Grid' : null"
+				:gridName="gridName"
+				:parentPrgmId="parentPrgmId"
+				@getRowsData="getRowData"
+				:innerTabGridInfo="innerTabGridInfo"
+			/>
 		</div>
-		<div class="mt-3" ref="formParent" style="height: calc((100vh - 400px) /2);">
-			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
-				:detailList="detailReadPlcTagList" @gridEditingFinish="gridEditingFinish" />
+		<div ref="formParent" style="height: calc((100vh - 400px) /2);">
+			<component
+				:is="'Form'"
+				:parentPrgmId="parentPrgmId"
+				:bindingData="gridName"
+				:detailList="detailReadPlcTagList"
+				@gridEditingFinish="gridEditingFinish"
+			/>
 		</div>
 	</div>
 </template>
@@ -19,7 +30,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustumChecbox } from '~/plugins/gridUtility';
+import { CustomCheckbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
@@ -99,9 +110,9 @@ export default {
 				// bodyHeight: gridHeight,
 				// minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 37,
 				},
-				rowHeight: 29,
+				rowHeight: 37,
 				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
@@ -142,7 +153,6 @@ export default {
 				{
 					header: '에너지원',
 					name: 'ercId',
-					align: 'center',
 					width: 100,
 					formatter({ value }) {
 						let retVal = '';
@@ -171,10 +181,9 @@ export default {
 				{
 					header: '대표 TAG 여부',
 					name: 'reprTagFg',
-					align: 'center',
 					width: 100,
 					// renderer: {
-					//   type: CustumChecbox,
+					//   type: CustomCheckbox,
 					//   options: {
 					//     onlyone: true,
 					//     // disabled: true
@@ -187,7 +196,6 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
 					width: 100,
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
@@ -203,7 +211,7 @@ export default {
 					//   }
 					// }
 				},
-				{ header: '비고', name: 'rmrk', align: 'left', width: 100 },
+				{ header: '비고', name: 'rmrk', width: 100 },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
 				{ header: '등록 일자', name: 'regDttm', hidden: true },
 				{ header: '수정 사용자', name: 'procUserNo', hidden: true },

components/pages/ems/TagInfo/TagAddInfoTab.vue

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

layouts/default.vue

@@ -9,7 +9,6 @@
               <div class="lnb-logo">
                 <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
                 <img v-else src="@/assets/images/logo_lm.png" />
-                <!-- <img v-else src="@/assets/images/logo_lm.png" /> -->
               </div>
               <!--            <div class="lnb-logo">FEMS</div>-->
             </router-link>
@@ -40,16 +39,16 @@
             <v-menu offset-y>
               <template v-slot:activator="{ on, attrs }">
                 <a-button
-                    :ripple="false"
-                    tile
-                    class="btn-header"
-                    v-bind="attrs"
-                    v-on="on"
-                    style="width: 100px"
-                  >
-                    <span class="body-2">즐겨찾기</span>
-                    <v-icon size="20">mdi-chevron-down</v-icon>
-                  </a-button>
+                  :ripple="false"
+                  tile
+                  class="btn-header"
+                  v-bind="attrs"
+                  v-on="on"
+                  style="width: 100px"
+                >
+                  <span class="body-2">즐겨찾기</span>
+                  <v-icon size="20">mdi-chevron-down</v-icon>
+                </a-button>
                 <!-- <a-button style="width: 100px; height: 36px" class="btn-header">
                   <span class="body-2">즐겨찾기</span>
                   <v-icon size="20">mdi-chevron-down</v-icon></a-button> -->
@@ -62,10 +61,10 @@
                 </v-list-item>
               </v-list>
             </v-menu>
-            <a-button id="refresh" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
+            <a-button id="removeBm" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
               <span class="material-icons" style="font-size: 17px">star</span>
             </a-button>
-            <a-button id="refresh" class="btn-header" :style="{
+            <a-button id="addBm" class="btn-header" :style="{
                     display: 'flex',
                     alignItems: 'center'}" @click="addBookMark" v-if="bookmarkBtn == 0">
               <span class="material-icons" style="font-size: 17px">star_border</span>
@@ -88,39 +87,12 @@
         </v-row>
       </div>
       <v-main>
-
         <v-container fluid>
           <v-row class="flex-nowrap">
             <div class="menu-container">
               <v-navigation-drawer ref="navigationdrawer" :value="drawer" :mini-variant="miniVariant" :clipped="clipped"
                 :absolute="false" mini-variant-width="60">
 
-                <div class="d-flex align-center justify-space-between py-4 px-3" v-if="false">
-                  <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>
-                  <ThemeSwitch style="margin-right: 20px" />
-                  <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" v-if="false" />
-
                 <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">
@@ -137,25 +109,19 @@
                         :class="miniVariant === false ? 'mr-2' : ''" size="9">
                         $depth3rdBulletDark
                       </v-icon>
-                      <span v-if="item.url">{{ item.menuNm }}
+                      <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 && item.childeVo.length > 0 && !item.url">
+                      <!-- <v-icon v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url">
                         mdi-chevron-down
-                      </v-icon>
+                      </v-icon> -->
+                      <a-icon type="down" v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url" />
                     </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>
 
@@ -322,19 +288,6 @@
           </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>
@@ -833,7 +786,7 @@ export default {
       // 	console.log('if isLoading stmt3');
       // 	return;
       // }
-      alert("move to", url);
+      // alert("move to", url);
       this.$router.push({
         path: url + "?prgmId=" + prgmId,
       });

layouts/default_bak.vue

@@ -1,809 +0,0 @@
-<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

@@ -1,928 +0,0 @@
-<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}px)`;
+				this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight + 20}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
@@ -57,7 +57,7 @@ module.exports = {
 	],
 
 	// Modules: https://go.nuxtjs.dev/config-modules
-	modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources','@nuxtjs/google-fonts'],
+	modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources' ],
 	styleResources: {
 		scss: ['./assets/scss/*.scss'],
 	},

pages/comm/auth/MenuMngPage.vue

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

@@ -5,25 +5,14 @@
 				<v-card class="searchFilter">
 					<v-row algin="end" no-gutters>
 						<v-col :cols="3">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="역할ID"
-								valueNm="roleId"
-								:searchOption="true"
-								customClass="input-large"
-							/>
+							<InputText :parentPrgmId="myPrgmId" label="역할ID" valueNm="roleId" :searchOption="true"
+								customClass="input-large" />
 						</v-col>
 						<v-col :cols="3">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="역할명"
-								valueNm="roleNm"
-								:searchOption="true"
-								customClass="input-large"
-							/>
+							<InputText :parentPrgmId="myPrgmId" label="역할명" valueNm="roleNm" :searchOption="true"
+								customClass="input-large" />
 						</v-col>
-						<v-col :cols="6" class="text-right">
-							<!-- <v-btn @click="test = !test">WWW</v-btn> -->
+						<v-col class="text-right d-flex justify-end align-end mr-3">
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@@ -31,102 +20,66 @@
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents" style="height: 100vh;">
-			<v-col cols="12" lg="2" class="h100">
+		<v-row ref="contents">
+			<v-col cols="12" lg="3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
-					<div class="px-5" style="height:calc(100% - 100px)">
-						<div
-							ref="gridParent"
-							class="w100 h100"
-						>
-							<component
-								:is="loadGrid ? 'Grid' : null"
-								:ref="gridName + myPrgmId"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
-							/>
-						</div>
+					<div ref="gridParent" class="px-5" style="height: 60vh;">
+						<component :is="loadGrid ? 'Grid' : null" :ref="gridName + myPrgmId" :gridName="gridName"
+							:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
 					</div>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="10" class="h100">
+			<v-col cols="12" lg="9">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 메뉴별 권한</span>
 					</v-card-title>
-					<v-row
-						align="center"
-						no-gutters
-						:style="{ height: 'calc(100% - 62px)' }"
-						class="px-5"
-					>
-						<v-col :cols="4" class="h100">
-							<span
-								class="body-1 font-weight-bold d-flex align-center"
-								:style="{ minHeight: '36px' }"
-								>[미배정]메뉴리스트</span
-							>
-							<div class="px-5" style="height:calc(100% - 64px)">
-								<div
+					<v-row align="center" no-gutters :style="{ height: 'calc(100% - 62px)' }" class="px-5">
+						<v-col class="h100" style="max-width: 400px;">
+							<span class="body-1 font-weight-bold d-flex align-center"
+								:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span>
+							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
+								<!-- <div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
-									<component
-										:is="loadTreeGrid ? 'Grid' : null"
-										:ref="gridName2 + myPrgmId"
-										:gridName="gridName2"
-										:parentPrgmId="myPrgmId"
-										@getRowsData="getUnAsgnRowData"
-									/>
-								</div>
+							</div> -->
+								<component :is="loadTreeGrid ? 'Grid' : null" :ref="gridName2 + myPrgmId"
+									:gridName="gridName2" :parentPrgmId="myPrgmId" @getRowsData="getUnAsgnRowData" />
 							</div>
 						</v-col>
-						<v-col :cols="1">
-							<ActionButtons
-								:parentPrgmId="myPrgmId"
-								:leftGridName="gridName2"
-								:rightGridName="gridName3"
-								:btnActionsFnc="dualGridBtnActions"
-							/>
-						</v-col>
+						<!-- <v-col :cols="1.5">
+							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
+								:btnActionsFnc="dualGridBtnActions" />
+						</v-col> -->
+						<div class="px-2">
+							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
+								:btnActionsFnc="dualGridBtnActions" />
+						</div>
 						<v-col :cols="7" class="h100">
-							<v-row
-								justify="space-between"
-								align="center"
-								no-gutters
-								class="px-5"
-							>
+							<v-row justify="space-between" align="center" no-gutters class="px-5">
 								<v-col :cols="11">
-									<span class="body-1 font-weight-bold"
-										>[배정]메뉴별권한 리스트</span
-									>
+									<span class="body-1 font-weight-bold d-flex align-center"
+										:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span>
+									<!-- <span class="body-1 font-weight-bold">[배정]메뉴별권한 리스트</span> -->
 								</v-col>
 								<v-col :cols="1" class="text-right">
-									<Buttons
-										:parentPrgmId="myPrgmId"
-										:bindingData="gridName3"
-										:btnActionsFnc="btnActions"
-									/>
+									<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName3"
+										:btnActionsFnc="btnActions" />
 								</v-col>
 							</v-row>
-							<div class="px-5" style="height:calc(100% - 64px)">
-								<div
+							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
+								<!-- <div
 									ref="treeGridParent2"
 									class="w100 h100"
 								>
-									<component
-										:is="loadTreeGrid2 ? 'Grid' : null"
-										:ref="gridName3 + myPrgmId"
-										:gridName="gridName3"
-										:parentPrgmId="myPrgmId"
-										:editorGrid="true"
-										@getRowsData="getAsgnRowData"
-									/>
-								</div>
+							</div> -->
+								<component :is="loadTreeGrid2 ? 'Grid' : null" :ref="gridName3 + myPrgmId"
+									:gridName="gridName3" :parentPrgmId="myPrgmId" :editorGrid="true"
+									@getRowsData="getAsgnRowData" />
 							</div>
 						</v-col>
 					</v-row>
@@ -292,8 +245,8 @@ export default {
 		async gridInit() {
 			//---------------------gridOption 설정 시작----------------------------
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
-			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 30;
-			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 30;
+			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 50;
+			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 50;
 			// const gridHeight = this.$refs.contents.offsetHeight - 30;
 
 			const myOptions = {
@@ -322,8 +275,10 @@ export default {
 				treeColumnOptions: {
 					name: 'menuNm',
 				},
-				scrollX: false,
-				// scrollY: false,
+				rowHeight: 37,
+				minRowHeight: 37,
+				scrollX: true,
+				scrollY: true,
 			};
 
 			this.setGridOption({
@@ -348,11 +303,14 @@ export default {
 			//---------------------gridOption 설정 끝----------------------------
 
 			//---------------------gridName3의 체크박스 설정 시작----------------------------
-			class CustumChecbox {
+			class CustomCheckbox {
 				constructor(props) {
 					const el = document.createElement('input');
 					const { grid, rowKey, columnInfo } = props;
 					el.type = 'checkbox';
+					$(el).css('width', '16px');
+					$(el).css('height', '16px');
+					$(el).css('accent-color', '#1677FF');
 					el.value = props.value;
 					this.el = el;
 
@@ -386,12 +344,12 @@ export default {
 			const _this = this;
 
 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'center', minWidth: 70 },
-				{ header: '역할명', name: 'roleNm', minWidth: 70 },
+				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 },
+				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 },
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					minWidth: 84,
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
@@ -403,9 +361,18 @@ export default {
 			];
 
 			const myTreeColumns = [
+				{
+					align: 'center',
+					width: 30,
+					minWidth: 60,
+					formatter: (props) => {
+						return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
+					}
+				},
 				{
 					header: '메뉴명',
 					name: 'menuNm',
+					maxWidth: 120,
 					validation: {
 						dataType: 'string',
 						validatorFn: (value, row) => {
@@ -415,6 +382,14 @@ export default {
 				},
 			];
 			const myTreeColumns2 = [
+				{
+					align: 'center',
+					width: 30,
+					minWidth: 60,
+					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' },
@@ -423,7 +398,7 @@ export default {
 					name: 'useFg',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -431,7 +406,7 @@ export default {
 					name: 'authCd1',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -439,7 +414,7 @@ export default {
 					name: 'authCd2',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -447,7 +422,7 @@ export default {
 					name: 'authCd3',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -455,7 +430,7 @@ export default {
 					name: 'authCd4',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -463,7 +438,7 @@ export default {
 					name: 'authCd5',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@@ -471,7 +446,7 @@ export default {
 					name: 'authCd6',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 			];
@@ -539,12 +514,12 @@ export default {
 						//rowKey: 0,
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName + this.myPrgmId].getData().length - 1
-								? this.pageData.rowGridSelectKey
-								: 0,
+									this.$refs[this.gridName + this.myPrgmId].getData().length - 1
+									? this.pageData.rowGridSelectKey
+									: 0,
 						columnName: 'roleId',
 						setScroll: true,
 					});
@@ -552,6 +527,7 @@ export default {
 			});
 		},
 		async getRowData(data) {
+
 			await this.setPageData({
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: {
@@ -598,8 +574,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-							? '00'
-							: 'ROOT',
+								? '00'
+								: 'ROOT',
 				};
 				return newItem;
 			});
@@ -638,8 +614,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-							? '00'
-							: 'ROOT',
+								? '00'
+								: 'ROOT',
 				};
 				return newItem;
 			});

pages/comm/auth/RoleMngPage.vue

@@ -67,7 +67,6 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -132,22 +131,8 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			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: {
@@ -518,43 +503,4 @@ const myDetail = [
 		placeholder: '시스템 자동입력',
 	},
 ];
-
-const dataMockExample = [
-  {
-    addGrpId: 'GRP001',
-    addInfoId: 'INFO001',
-    addInfoNm: '온도 센서',
-    addInfoDataKind: 'DATA01',
-    useFg: true,
-  },
-  {
-    addGrpId: 'GRP002',
-    addInfoId: 'INFO002',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA02',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP003',
-    addInfoId: 'INFO003',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA03',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP004',
-    addInfoId: 'INFO004',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA04',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP005',
-    addInfoId: 'INFO005',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA05',
-    useFg: false,
-  },
-];
-
 </script>

pages/comm/auth/UserRoleMngPage.vue

@@ -12,6 +12,8 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
+								labelCols="12"
+								textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -79,7 +81,6 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -126,13 +127,13 @@
 
 									<!-- 역할수정 -->
 									<template v-else-if="item.id == 'AsgnRoleByUser'">
-										<v-col :cols="3" class="h100">
+										<v-col :cols="12" class="overflow-y-scroll grid-toggle-section">
 											<v-card-title
-												class="pa-0 custom-title-4"
+												class="pa-0 custom-subtitle-tab"
 												style="min-height:36px;"
 												>역할리스트</v-card-title
 											>
-											<div style="height:calc(100% - 36px)" class="py-5">
+											<div class="py-5">
 												<component
 													class="w100"
 													:is="loadGridTab2 ? 'Grid' : null"
@@ -144,17 +145,18 @@
 												/>
 											</div>
 										</v-col>
-										<v-col :cols="1" class="d-flex justify-center">
+										<v-col :cols="12" class="d-flex justify-center">
 											<ActionButtons
 												:parentPrgmId="myPrgmId"
 												:leftGridName="gridName2"
 												:rightGridName="gridName3"
 												:btnActionsFnc="dualGridBtnActions"
+												directionBtn="vertically"
 											/>
 										</v-col>
-										<v-col :cols="8" class="h100">
+										<v-col :cols="12" class="h100">
 											<div class="d-flex align-center justify-space-between">
-												<v-card-title class="pa-0 custom-title-4">
+												<v-card-title class="pa-0 custom-subtitle-tab">
 													사용자 역할</v-card-title
 												>
 												<div>
@@ -307,40 +309,10 @@ export default {
 	},
 	methods: {
 		async init() {
-			 this.gridInit();
+			await this.gridInit();
 		},
-
-		gridInitTest() {
-			const rowGrid = {
-				column: [
-				{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
-				{ header: '사용자명', name: 'userNm' },
-				{ header: '사용자ID', name: 'userLoginId' },
-				{ header: '사용자비밀번호', name: 'userPswd', hidden: true },
-				{ header: '사업장', name: 'blocId', hidden: true },
-				{ header: 'email', name: 'email', hidden: true },
-				{ header: '등록자NO', name: 'regUserNo', hidden: true },
-				{ header: '등록일시', name: 'regDttm', hidden: true },
-				{ header: '수정자NO', name: 'procUserNo', hidden: true },
-				{ header: '수정일시', name: 'procDttm', hidden: true },
-				{ header: 'comId', name: 'comId', hidden: true },
-				{ header: 'deptId', name: 'deptId', hidden: true },
-				],
-				data: dataMockExample,
-				defaultRow: dataMockExample,
-				option: [],
-			}
-			this.dataPathMock = {rowGrid};
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
-
 		// 사용자 리스트 그리드 세팅
 		gridInit() {
-
-			// this.gridInitTest(); return
-
 			const gridHeight = this.$refs.gridParent.offsetHeight - 90;
 
 			const myOptions = {
@@ -923,6 +895,7 @@ const defaultData = {
 };
 
 const myColumns = [
+	
 	{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
 	{ header: '사용자명', name: 'userNm' },
 	{ header: '사용자ID', name: 'userLoginId' },
@@ -938,6 +911,17 @@ const myColumns = [
 ];
 
 const unAsgnRoleByUserColumns = [
+	{
+		header: '',
+		name: '',
+		align: 'center',
+		width: 50,
+		formatter: (props) => {
+			return `<label class="custom-radio">
+						<span class="radio-mark"></span>
+					</label>`;
+		}
+	},	
 	{ header: '역할ID', name: 'roleId', align: 'center' },
 	{ header: '역할명', name: 'roleNm' },
 	{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
@@ -947,6 +931,7 @@ const unAsgnRoleByUserColumns = [
 ];
 
 const asgnRoleByUserColumns = [
+	
 	{ header: '역할ID', name: 'roleId', align: 'center' },
 	{ header: '역할명', name: 'roleNm' },
 	{
@@ -960,7 +945,19 @@ const asgnRoleByUserColumns = [
 	{ header: 'comId', name: 'comId', hidden: true },
 ];
 
-const asgnMenuByUserColumns = [{ header: '메뉴명', name: 'menuNm' }];
+const asgnMenuByUserColumns = [
+	{
+		header: '',
+		name: '',
+		align: 'center',
+		width: 50,
+		formatter: (props) => {
+			return `<label class="custom-radio">
+						<span class="radio-mark"></span>
+					</label>`;
+		}
+	},	
+	{ header: '메뉴명', name: 'menuNm' }];
 
 const myDetail = blocCdList => {
 	return [
@@ -985,7 +982,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			required: true,
 		},
@@ -1009,7 +1006,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			required: true,
 		},
@@ -1035,7 +1032,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 		},
 		{
@@ -1058,7 +1055,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1082,7 +1079,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1100,67 +1097,4 @@ function sha512(str) {
 		.update(str)
 		.digest('hex');
 }
-
-
-
-const dataMockExample = [
-  {
-    userNo: 1,
-    userNm: '홍길동',
-    userLoginId: 'hong123',
-    userPswd: 'password123',
-    blocId: 'B001',
-    email: 'hong@example.com',
-    regUserNo: 100,
-    regDttm: '2025-07-01 10:00:00',
-    procUserNo: 101,
-    procDttm: '2025-07-15 14:30:00',
-    comId: 'C001',
-    deptId: 'D001'
-  },
-  {
-    userNo: 2,
-    userNm: '김영희',
-    userLoginId: 'kimyh',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  },
-  {
-    userNo: 3,
-    userNm: '관리자',
-    userLoginId: 'user',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  },
-  {
-    userNo: 4,
-    userNm: '사용자',
-    userLoginId: 'admin',
-    userPswd: 'securePass456',
-    blocId: 'B002',
-    email: 'kim@example.com',
-    regUserNo: 102,
-    regDttm: '2025-07-02 11:20:00',
-    procUserNo: 103,
-    procDttm: '2025-07-16 09:45:00',
-    comId: 'C002',
-    deptId: 'D002'
-  }
-];
-
-
-</script>
+</script>

pages/comm/base/BatchLogMngPage.vue

@@ -11,7 +11,6 @@
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
-								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -21,7 +20,6 @@
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
-								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -33,7 +31,6 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -42,13 +39,13 @@
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
-								:customClass="'input-large'"
+								customClass="datepicker-large"
 							/>
 						</v-col>
-						<v-col :cols="2" class="text-right d-flex align-end justify-end ga-1" style="gap: 4px">
-							<BtnSearch size="large" />
+						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
+							<BtnSearch />
 							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
-						</v-col>
+						</div>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -63,11 +60,10 @@
 						<div ref="gridParent" class="px-5 h100">
 							<component
 								:ref="gridName"
-								:is=" 'Grid' "
+								:is="loadGrid ? 'Grid' : null"
 								:parentPrgmId="myPrgmId"
 								:gridName="gridName"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -140,56 +136,10 @@ export default {
 	data() {
 		return {
 			myPrgmId: myPrgmId,
-			loadGrid: true,
+			loadGrid: false,
 			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: {
@@ -248,14 +198,6 @@ export default {
 		init() {
 			// this.layoutInit();
 			this.gridInit();
-			
-			// _this.pageData = {
-			// execRsltCdList: [
-			// 	{ commCd: '1', commCdNm: '성공' },
-			// 	{ commCd: '2', commCdNm: '실패' },
-			// ],
-			// };
-
 		},
 		// layoutInit() {
 		//   const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
@@ -368,13 +310,10 @@ export default {
 				}
 			});
 		},
-		// async getRowData(data) {
-		async getRowData() {
-			console.log("something")
+		async getRowData(data) {
 			this.setPageData({
-				// rowGridSelectKey: data.rowKey,
-				rowGridSelectKey: 1,
-				rowGridSelectData: fakeRowData,
+				rowGridSelectKey: data.rowKey,
+				rowGridSelectData: data,
 			});
 		},
 		compareData(type, newDt) {
@@ -481,86 +420,13 @@ 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 transparent',
+		class: 'py-2',
 	},
 ];
-</script>
+</script>

pages/comm/base/BatchMngPage.vue

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

pages/comm/base/CalendarMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -10,7 +11,7 @@
 						</v-col>
 						<v-col cols="3">
 							<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
-							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
+							<DatePicker :parentPrgmId="myPrgmId" customClass="datepicker-large" :label="'조회연월'" />
 						</v-col>
 						<v-col cols="6" class="text-right">
 							<BtnSearch @click="search()" size="large" />
@@ -20,28 +21,29 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" id="CalendarMngContent" class="mt-4">
-			<v-col cols="12" lg="4" class="h100 pr-2">
+			<v-col cols="12" lg="4" class=" pr-2">
 				<v-card class="w100">
 					<v-card-title class="d-flex justify-space-between align-center">
 						<span class="custom-title-4">캘린더 리스트</span>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</v-card-title>
-					<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 72.56px)' }">
+					<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 10px)' }">
 						<div ref="gridParent" class="w100 h100">
 							<component class="w100" :ref="gridName + myPrgmId" :is="loadGrid ? 'Grid' : null"
 								:gridName="gridName" :parentPrgmId="myPrgmId" :editorGrid="true"
-								@getRowsData="getRowData" :dataPath="dataPathExample" />
+								@getRowsData="getRowData" />
 						</div>
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="8" class="h100 pl-3">
+			<v-col cols="12" lg="8" class=" pl-3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">캘린더 미리보기</span>
 					</v-card-title>
-					<v-card-actions class="px-5 d-block" :style="{ height: 'calc(100% - 62px)' }">
-						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false" />
+					<v-card-actions class="px-5 d-block" >
+						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false"
+							:showTitle="false" />
 					</v-card-actions>
 				</v-card>
 			</v-col>
@@ -94,81 +96,7 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
-			dataPathExample: {
-				"rowGrid": {
-					data: [
-						{
-							"hldyFg": "평일",
-							"hldyNm": ""
-						},
-						{
-							"dt": "2025-07-23",
-							"dtNm": "수요일",
-							"dt": "2025-07-21",
-							"dtNm": "월요일",
-							"hldyFg": "평일",
-							"hldyNm": ""
-						},
-						{
-							"dt": "2025-07-22",
-							"dtNm": "화요일",
-							"hldyFg": "평일",
-							"hldyNm": ""
-						},
-						{
-							"dt": "2025-07-24",
-							"dtNm": "목요일",
-							"hldyFg": "평일",
-							"hldyNm": ""
-						},
-						{
-							"dt": "2025-07-25",
-							"dtNm": "금요일",
-							"hldyFg": "평일",
-							"hldyNm": ""
-						},
-						{
-							"dt": "2025-07-26",
-							"dtNm": "토요일",
-							"hldyFg": "주말",
-							"hldyNm": ""
-						},
-						{
-							"dt": "2025-07-27",
-							"dtNm": "일요일",
-							"hldyFg": "휴일",
-							"hldyNm": "정기휴일"
-						}
-					],
-					column: [
-						{
-							header: '일자',
-							name: 'dt',
-							align: 'center',
-							// formatter({ value }) {
-							// 	return value.split(' ')[0];
-							// },
-						},
-						{
-							header: '요일',
-							name: 'dtNm',
-							align: 'center',
-							// formatter({ value }) {
-							// 	return value + '요일';
-							// },
-						},
-						{
-							header: '구분',
-							name: 'hldyFg',
-							align: 'center',
-							essential: true,
-						},
-						{ header: '휴일명', name: 'hldyNm', editor: 'text' },
-					],
-
-				}
-			},
+			loadGrid: false,
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 		};
@@ -241,16 +169,19 @@ export default {
 			await this.gridInit();
 		},
 		async search() {
-			// await this.getRowGridData();
+			await this.getRowGridData();
 		},
 		async gridInit() {
-			// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
-			// this.setGridOption({
-			// 	gridKey: this.gridName,
-			// 	value: Object.assign(Utility.defaultGridOption(gridHeight), {
-			// 		scrollX: false,
-			// 	}),
-			// });
+			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
+			this.setGridOption({
+				gridKey: this.gridName,
+				value: Object.assign(Utility.defaultGridOption(gridHeight), {
+					scrollX: false, header: {
+						height: 37,
+					},
+					rowHeight: 37,
+				}),
+			});
 
 			// this.getRowGridData();
 		},
@@ -350,86 +281,86 @@ export default {
 
 			this.loadGrid = false;
 
-			// let res = await this.postApiReturn({
-			// 	apiKey: 'selectWorkCald',
-			// 	resKey: 'workcaldData',
-			// 	sendParam: {
-			// 		blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
-			// 		yymm: this.chkFromDt,
-			// 		comId: this.comId,
-			// 	},
-			// });
+			let res = await this.postApiReturn({
+				apiKey: 'selectWorkCald',
+				resKey: 'workcaldData',
+				sendParam: {
+					blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
+					yymm: this.chkFromDt,
+					comId: this.comId,
+				},
+			});
 
-			// let res2 = await this.postApiReturn({
-			// 	apiKey: 'selectWorkCaldDetl',
-			// 	resKey: 'workcaldDetlData',
-			// 	sendParam: {
-			// 		blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
-			// 		yymm: this.chkFromDt,
-			// 		comId: this.comId,
-			// 	},
-			// });
+			let res2 = await this.postApiReturn({
+				apiKey: 'selectWorkCaldDetl',
+				resKey: 'workcaldDetlData',
+				sendParam: {
+					blocId: this.pageData.blocMstrList[this.chkBlocCd].blocId,
+					yymm: this.chkFromDt,
+					comId: this.comId,
+				},
+			});
 
-			// for (var i = 0; i < res2.length; i++) {
-			// 	if (
-			// 		!(
-			// 			res2[i].hldyNm == null ||
-			// 			res2[i].hldyNm == '토요일' ||
-			// 			res2[i].hldyNm == '일요일'
-			// 		)
-			// 	) {
-			// 		for (var j = i + 1; j < res2.length; j++) {
-			// 			if (res2[i].hldyNm == res2[j].hldyNm) {
-			// 				res2[i].hldyNm = '';
-			// 			}
-			// 		}
-			// 	}
-			// }
+			for (var i = 0; i < res2.length; i++) {
+				if (
+					!(
+						res2[i].hldyNm == null ||
+						res2[i].hldyNm == '토요일' ||
+						res2[i].hldyNm == '일요일'
+					)
+				) {
+					for (var j = i + 1; j < res2.length; j++) {
+						if (res2[i].hldyNm == res2[j].hldyNm) {
+							res2[i].hldyNm = '';
+						}
+					}
+				}
+			}
 
-			// res = res.map(item => {
-			// 	const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
-			// 	const dtNm = dt.format('ddd'); // 요일
-			// 	const newItem = {
-			// 		...item,
-			// 		dtNm: dtNm,
-			// 		hldyNm: item.hldyNm ? item.hldyNm : '',
-			// 		rowStat: null,
-			// 	};
-			// 	return newItem;
-			// });
+			res = res.map(item => {
+				const dt = this.$dayjs(item.dt.split(' ')[0]); // YYYY-MM-DD
+				const dtNm = dt.format('ddd'); // 요일
+				const newItem = {
+					...item,
+					dtNm: dtNm,
+					hldyNm: item.hldyNm ? item.hldyNm : '',
+					rowStat: null,
+				};
+				return newItem;
+			});
 
-			// this.loadGrid = true;
-			// this.setPageData({ isFind: false });
+			this.loadGrid = true;
+			this.setPageData({ isFind: false });
 
-			// this.setGridColumn({
-			// 	gridKey: this.gridName,
-			// 	value: myColumns,
-			// });
+			this.setGridColumn({
+				gridKey: this.gridName,
+				value: myColumns,
+			});
 
-			// this.setGridData({
-			// 	gridKey: this.gridName,
-			// 	value: res,
-			// });
+			this.setGridData({
+				gridKey: this.gridName,
+				value: res,
+			});
 
-			// this.setPageData({ planData: res2 });
+			this.setPageData({ planData: res2 });
 
-			// // 첫번째 row 선택상태
-			// this.$nextTick(() => {
-			// 	this.$refs[this.gridName + this.myPrgmId].focus({
-			// 		//rowKey: 0,
-			// 		rowKey:
-			// 			this.pageData.rowGridSelectKey == '' ||
-			// 				this.pageData.rowGridSelectKey == null
-			// 				? 0
-			// 				: this.pageData.rowGridSelectKey ==
-			// 					this.$refs[this.gridName + this.myPrgmId].getData().length - 1
-			// 					? this.pageData.rowGridSelectKey
-			// 					: 0,
-			// 		columnName: 'dt',
-			// 		setScroll: true,
-			// 	});
-			// 	this.setPageData({ isFind: false });
-			// });
+			// 첫번째 row 선택상태
+			this.$nextTick(() => {
+				this.$refs[this.gridName + this.myPrgmId].focus({
+					//rowKey: 0,
+					rowKey:
+						this.pageData.rowGridSelectKey == '' ||
+							this.pageData.rowGridSelectKey == null
+							? 0
+							: this.pageData.rowGridSelectKey ==
+								this.$refs[this.gridName + this.myPrgmId].getData().length - 1
+								? this.pageData.rowGridSelectKey
+								: 0,
+					columnName: 'dt',
+					setScroll: true,
+				});
+				this.setPageData({ isFind: false });
+			});
 		},
 		async getRowData(data, gridName) {
 			this.setGridSelectData({
@@ -604,4 +535,17 @@ select.selectbox {
 	border-width: 0px;
 	// box-sizing: border-box;
 }
+
+::v-deep {
+	.custom-vc-calender {
+		.vc-header {
+			display: none;
+		}
+
+		.vc-weeks {
+			padding: 0;
+		}
+
+	}
+}
 </style>

pages/comm/base/CommCdMngPage.vue

@@ -1,33 +1,65 @@
 <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="4">
+						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
 								:label="'시스템구분'"
 								dataKey="sysDivCd"
+								:labelCols="12"
+                 				:textCols="12"
 								:sendParam="{ commGrpCd: 'CO_SYSDIV', useFg: '1' }"
 								:addAll="true"
+								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
 								:label="'사용여부'"
+								:labelCols="12"
+                 				:textCols="12"
 								:dataKey="'useFg'"
+								customClass="select-large"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 							/>
 						</v-col>
-						<v-col :cols="4" class="text-right">
-							<BtnSearch @click="search" />
+						<v-col :cols="3">
+							<InputText
+								:parentPrgmId="myPrgmId"
+								label="그룹코드"
+								valueNm="commGrpCd"
+								:searchOption="true"
+								:labelCols="12"
+								:textCols="12"
+								customClass="input-large"
+
+							/>
+						</v-col>
+						<v-col :cols="3">
+							<InputText
+								:parentPrgmId="myPrgmId"
+								label="그룹코드명"
+								valueNm="commGrpCdNm"
+								:searchOption="true"
+								:labelCols="12"
+								:textCols="12"
+								customClass="input-large"
+
+							/>
+						</v-col>
+						
+						<v-col :cols="12" class="text-right">
+							<BtnSearch style="margin-top:20px" @click="search" size="large" />
 						</v-col>
 					</v-row>
-					<v-row align="center" no-gutters>
+					<!-- <v-row align="center" no-gutters>
 						<v-col :cols="4">
 							<InputText
 								:parentPrgmId="myPrgmId"
@@ -48,7 +80,7 @@
 								:textCols="8"
 							/>
 						</v-col>
-					</v-row>
+					</v-row> -->
 				</v-card>
 			</v-col>
 		</v-row>
@@ -85,7 +117,7 @@
 				<v-card class="pb-5">
 					<v-card-title>공통그룹코드 상세</v-card-title>
 					<div class="px-5" style="height:calc(100% - 70px)">
-						<v-tabs v-model="tab" :hide-slider="true">
+						<v-tabs v-model="tab" >
 							<v-tab
 								v-for="item in items"
 								:key="item.id"
@@ -132,6 +164,7 @@ import Form from '~/components/common/form/Form';
 import CommCdTab from '@/components/pages/comm/CommCdTab';
 import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
+import PageTitle from "~/components/common/PageTitle";
 
 let myTitle;
 let myPrgmId;
@@ -158,6 +191,7 @@ export default {
 		Form,
 		CommCdTab,
 		Grid,
+		PageTitle
 	},
 	data() {
 		return {
@@ -229,6 +263,9 @@ export default {
 
 			const myOptions = {
 				scrollX: false,
+				header: {
+					height: 38,
+				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -241,7 +278,7 @@ export default {
 				{
 					header: '시스템구분',
 					name: 'sysDivCd',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let commCdNm = '';
 						if (sysCdList.length > 0) {
@@ -278,7 +315,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
 							item => item.commCd == value,
@@ -326,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({
@@ -554,7 +591,10 @@ const myDetail = [
 		valueNm: 'commGrpCd',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		labelCols: 12,
+		textCols: 12,
+		iconShow: true,
+		class: 'py-2 pr-2',
 		required: true,
 	},
 	{
@@ -563,7 +603,10 @@ const myDetail = [
 		valueNm: 'commGrpNm',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		labelCols: 12,
+		textCols: 12,
+		iconShow: true,
+		class: 'py-2 pl-2',
 		required: true,
 	},
 	{
@@ -572,7 +615,10 @@ const myDetail = [
 		valueNm: 'sysDivCd',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		labelCols: 12,
+		textCols: 12,
+		iconShow: true,
+		class: 'py-2 pr-2 mt-3',
 		list: 'sysDivCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -584,7 +630,10 @@ const myDetail = [
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		labelCols: 12,
+		textCols: 12,
+		iconShow: true,
+		class: 'py-2 pl-2 mt-10',
 		value: { '1': true, '0': false },
 		required: true,
 	},
@@ -594,7 +643,10 @@ const myDetail = [
 		valueNm: 'rmrk',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		labelCols: 12,
+		textCols: 12,
+		iconShow: true,
+		class: 'py-2 pr-2 mt-3',
 	},
 ];
 </script>

pages/comm/base/NoticeMngPage.vue

@@ -1,23 +1,24 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
-			<v-card class="" >
+			<v-card class="">
 				<div class="pa-5">
-					<v-row align="center" no-gutters >
+					<v-row align="center" no-gutters>
 						<v-col :cols="12" class="d-flex align-center justify-space-between">
 							<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
 							<div class="d-flex align-center">
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('view')" :ripple="false" class="mr-1">상세보기</v-btn> -->
-								<a-button type="primary" size="large" @click="listPageButtonGroupClickEvent('write')" :ripple="false"
+								<a-button type="primary" @click="listPageButtonGroupClickEvent('write')" :ripple="false"
 									icon="edit" class="mr-1">작성</a-button>
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> -->
 							</div>
 						</v-col>
-						<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" />
+						<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" />
 							</div>
 						</v-col>
 					</v-row>
@@ -26,43 +27,43 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'" class="h1001">
+		<div v-if="pageActionFlag == 'view'">
 			<v-card>
 				<v-row class="pa-5">
 					<v-col :cols="12" class="d-flex align-center justify-space-between ">
-						<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
+						<v-card-title class="pa-0 custom-title-4">공지사항 보기</v-card-title>
 						<div class="d-flex align-center">
-							<a-button @click="viewPageButtonGroupClickEvent('list')" type="primary" :ripple="false" class="mr-1"
-								icon="unordered-list">목록</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false" class="mr-1"
-								icon="send-outlined">
+							<a-button @click="viewPageButtonGroupClickEvent('list')" type="primary" :ripple="false"
+								class="mr-1" icon="unordered-list">목록</a-button>
+							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false"
+								class="mr-1" icon="send-outlined">
 								<v-icon small :class="['mr-2']">$icoSend</v-icon>
 								답글
 							</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false" class="mr-1"
-								icon="edit">수정</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
+							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false"
+								class="mr-1" icon="edit">수정</a-button>
+							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost
+								icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12">
-						<p class="custom-title-3 mb-2"> 제목 </p>
-						<v-text-field v-model="viewActionData.title" class="v-input__custom" hide-details :readonly="true">
-						</v-text-field>
+					<v-col :cols="12" class="mt-5">
+						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
 					</v-col>
-					<v-col :cols="12" style="min-height:calc(90vh - 218px);" class="pa-5">
+					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
 						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
 							:initialValue="viewActionData.content" theme="white"
-							:class="isDarkMode ? 'theme--white' : 'theme--black'" />
+							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
 					</v-col>
-					<v-col :cols="6">
-						<p class="custom-title-3 mb-2">파일목록</p>
-						<div v-for="fileData in viewActionData.fileData" 
-							:key="fileData.apndFileId" 
-							class="file-item">
+					<v-col :cols="6" class="mt-5">
+						<v-card-title class="custom-title-7 pa-0">
+							파일목록
+						</v-card-title>
+						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item">
 							<a @click.prevent="downloadFile(fileData)">
-								<div class="d-flex justify-space-between search-box-label">
+								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
+									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' +
+										fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@@ -72,56 +73,46 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'" class="h1001">
+		<div v-if="pageActionFlag == 'write'">
 			<v-card>
 				<div class="pa-5">
 					<v-row class="pa-50">
 						<v-col :cols="12" class="">
-							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
+							<v-card-title class="custom-title-4 pa-0">공지사항 작성</v-card-title>
 						</v-col>
-						<v-col :cols="12" class="custom-title-4-new mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
+						<v-col :cols="12" class="mt-4">
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
 							<v-text-field v-model="writeActionData.title" class="v-input__custom" hide-details outlined>
 							</v-text-field>
 						</v-col>
-						<v-col :cols="12" style="min-height: calc(90vh - 270px);">
+						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
 							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
 						</v-col>
-	
-						<v-col :cols="12" class="mt-2">
-							<p class="custom-title-3 mb-2">
-								파일첨부
-							</p>
-						</v-col>
-						<v-col :cols="6">
+
+						<v-col :cols="6" class="mt-5">
+							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 							<div class="" v-if="writeActionData.fileData">
-								<div 
-									v-for="(fileData, index) in writeActionData.fileData" 
-									:key="fileData.apndFileId" 
+								<div v-for="(fileData, index) in writeActionData.fileData" :key="fileData.apndFileId"
 									class="file-item d-flex justify-space-between">
 									<div class="file-item-detail">
 										<v-icon>mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
 									</div>
-									<a-icon type="delete" class="v-icon pointer" @click="writeActionData.fileData.splice(index, 1)" />
+									<a-icon type="delete" class="v-icon pointer"
+										@click="writeActionData.업로드fileData.splice(index, 1)" />
 								</div>
 							</div>
-							<a-button class="mt-2" icon="upload" @click="$refs.writeInputFile.$refs.input.click()" >
+							<a-button class="mt-2" icon="upload" @click="$refs.writeInputFile.$refs.input.click()">
 								업로드
 							</a-button>
-							<v-file-input 
-								ref="writeInputFile" 
-								v-model="writeActionData.fileData" 
-								multiple
-								outlined 
-								hide-input
-								class="d-none"
-								prepend-icon="mdi-tray-arrow-up"
-							></v-file-input>
+							<v-file-input ref="writeInputFile" v-model="writeActionData.fileData" multiple outlined
+								hide-input class="d-none" prepend-icon="mdi-tray-arrow-up"></v-file-input>
 						</v-col>
 						<v-col :cols="12" class="text-right">
-							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false" class="mr-2">취소</a-button>
-							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false" type="primary">등록</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false"
+								class="mr-2">취소</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false"
+								type="primary">등록</a-button>
 						</v-col>
 					</v-row>
 				</div>
@@ -129,92 +120,90 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'" class="h1001">
+		<div v-if="pageActionFlag == 'reply'">
 			<v-card class="pa-5">
 				<v-row align="center" class="mt-0">
 					<v-col :cols="12" class="">
 						<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 					</v-col>
-					<v-col :cols="12">
-						<p class="custom-title-3 mb-2">제목</p>
-						<v-text-field v-model="replyActionData.title" class="v-input__custom" placeholder="제목" outlined
-							hide-details>
+					<v-col :cols="12" class="mt-4">
+						<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined hide-details>
 						</v-text-field>
 					</v-col>
 					<v-col :cols="12" style="height: calc(100vh - 270px);" class="mt-2">
 						<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg" />
 					</v-col>
-					<v-col :cols="6" class="mt-4">
-						<p class="custom-title-3 mb-2">
-							파일첨부
-						</p>
+					<v-col :cols="6" class="mt-5">
+						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 						<div class="" v-if="replyActionData.fileData">
-							<div 
-								v-for="(fileData, index) in replyActionData.fileData" 
-								:key="fileData.apndFileId" 
+							<div v-for="(fileData, index) in replyActionData.fileData" :key="fileData.apndFileId"
 								class="file-item d-flex justify-space-between">
 								<div class="file-item-detail">
 									<v-icon>mdi-paperclip</v-icon>
 									<span href="#" class="file-item-name">{{ fileData.name }}</span>
 								</div>
-								<a-icon type="delete" class="v-icon pointer" @click="replyActionData.fileData.splice(index, 1)" />
+								<a-icon type="delete" class="v-icon pointer"
+									@click="replyActionData.fileData.splice(index, 1)" />
 							</div>
 						</div>
-						<a-button class="mt-3" icon="upload" @click="$refs.replyInputFile.$refs.input.click()" >
+						<a-button class="mt-3" icon="upload" @click="$refs.replyInputFile.$refs.input.click()">
 							업로드
 						</a-button>
-						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData" hide-details="true" class="d-none">
+						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData"
+							hide-details="true" class="d-none">
 						</v-file-input>
 					</v-col>
 					<v-col :cols="12" class="text-right">
 						<a-button @click="replyPageButtonGroupClickEvent('cancel')" :ripple="false">취소</a-button>
-						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false" type="primary">등록</a-button>
+						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false"
+							type="primary">등록</a-button>
 					</v-col>
 				</v-row>
 			</v-card>
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'" class="h1001">
+		<div v-if="pageActionFlag == 'update'">
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
 						<v-col :cols="12">
-							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
+							<v-card-title class="custom-title-4 pa-0">공지사항 수정</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
-							<v-text-field v-model="updateActionData.title" class="v-input__custom" placeholder="" hide-details outlined>
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
+							<v-text-field v-model="updateActionData.title" class="v-input__custom" hide-details
+								outlined>
 							</v-text-field>
 						</v-col>
-						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4" >
+						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4">
 							<editor ref="tuiUpdateEditor" height="100%" initialEditType="wysiwyg"
 								:initialValue="updateActionData.content" />
 						</v-col>
-						<v-col :cols="6">
-								<p class="pa-0 mb-2 custom-title-4-new-1">파일첨부</p>
-								<div class="" v-if="updateActionData.fileData">
-									<div 
-										v-for="(fileData, index) in updateActionData.fileData"
-										:key="fileData.apndFileId" 
-										class="file-item d-flex justify-space-between">
-										<div class="file-item-detail">
-											<v-icon>mdi-paperclip</v-icon>
-											<span href="#" class="file-item-name">{{ fileData.name }}</span>
-										</div>
-										<a-icon type="delete" class="v-icon pointer" @click="updateActionData.fileData.splice(index, 1)" />
+						<v-col :cols="6" class="mt-5">
+							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+							<div class="" v-if="updateActionData.fileData">
+								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
+									class="file-item d-flex justify-space-between">
+									<div class="file-item-detail">
+										<v-icon>mdi-paperclip</v-icon>
+										<span href="#" class="file-item-name">{{ fileData.name }}</span>
 									</div>
+									<a-icon type="delete" class="v-icon pointer"
+										@click="updateActionData.fileData.splice(index, 1)" />
 								</div>
-								<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()" >
-									업로드
-								</a-button>
-								<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
-									hide-details="true" class="d-none">
-								</v-file-input>
+							</div>
+							<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
+								업로드
+							</a-button>
+							<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
+								hide-details="true" class="d-none">
+							</v-file-input>
 						</v-col>
 						<v-col :cols="12" class="text-right">
-							<a-button @click="updatePageButtonGroupClickEvent('cancel')" >취소</a-button>
-							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary" >등록</a-button>
+							<a-button @click="updatePageButtonGroupClickEvent('cancel')">취소</a-button>
+							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary">등록</a-button>
 						</v-col>
 					</v-row>
 				</div>
@@ -266,7 +255,8 @@ 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',
@@ -299,8 +289,6 @@ export default {
 				postGrpOrd: null,
 				postOrgNo: null,
 			},
-			dataPathMock: {},
-
 		};
 	},
 	computed: {
@@ -345,7 +333,7 @@ export default {
 			chkOpenTabList: 'chkOpenTabList',
 			getDomain: 'modules/list/getDomain',
 		}),
-		onTest(){
+		onTest() {
 			console.log(this.writeActionData.fileData);
 		},
 		async init() {
@@ -402,10 +390,13 @@ export default {
 			this.getGridData();
 		},
 		gridInit() {
-			this.loadGrid = false;
 			const gridHeight = this.$refs.contents.offsetHeight - 76;
 
-			const myOptions = {};
+			const myOptions = {
+				header: {
+					height: 38,
+				},
+			};
 			this.setGridOption({
 				gridKey: this.gridName,
 				value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
@@ -426,7 +417,7 @@ export default {
 					align: 'center',
 					hidden: true,
 				},
-				{ header: '번호', name: 'postNo', width: 150, align: 'center' },
+				{ header: '번호', name: 'postNo', width: 150, align: 'right' },
 				{
 					header: '원글번호',
 					name: 'postOrgNo',
@@ -456,9 +447,9 @@ export default {
 					hidden: true,
 				},
 				{ header: '제목', name: 'title', align: 'left' },
-				{ header: '작성자', name: 'regUserNo', width: 250, align: 'center' },
+				{ header: '작성자', name: 'regUserNo', width: 250, align: 'right' },
 				{ header: '작성일', name: 'regDttm', width: 250, align: 'center' },
-				{ header: '조회수', name: 'viewCnt', width: 150, align: 'center' },
+				{ header: '조회수', name: 'viewCnt', width: 150, align: 'right' },
 				// {header: "파일아이디", name:"apndFileUuid", width:150, align:"center"}, // 수정필요
 			];
 
@@ -466,13 +457,6 @@ export default {
 				gridKey: this.gridName,
 				value: columnList,
 			});
-
-			// -----------------------TEST------------------
-			this.dataPathMock[this.gridName] = {
-				column: columnList,
-				data: dataPathDataExample,
-			}
-			// -----------------------END TEST--------------
 			this.getGridData();
 		},
 		async getGridData() {
@@ -481,22 +465,12 @@ 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,
@@ -1042,15 +1016,6 @@ const defaultData = {
 	},
 };
 
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	postNo: '18',
-	title: '오픈공지',
-	regUserNo: '1',
-	regDttm: '2023-01-09 09:39:41',
-	viewCnt: '1'
-}, 10);
-
 </script>
 
 <style lang="scss" scoped>
@@ -1064,8 +1029,41 @@ const dataPathDataExample = getPathDataExample({
 	margin: 2px 0;
 	padding: 4px;
 	background-color: #0000000A;
-	.file-item-name{
+
+	.file-item-name {
 		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");
+			;
+		}
+	}
+
+	.toastui-editor-mode-switch {
+		font-family: Inter !important;
+		font-size: 1.0rem !important;
+	}
+
+	.toastui-editor-mode-switch .tab-item.active {
+		color: #1677FF
+	}
+
+	.toastui-editor-mode-switch .tab-item {
+		color: #000000E0
+	}
+}
 </style>

pages/comm/base/PrgmMngPage.vue

@@ -1,33 +1,21 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<!-- 조회조견 -->
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
 						<v-col :cols="3">
-							<component
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'사용여부'"
-								:dataKey="'selectUseFg'"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:addAll="true"
-								customClass="select-large"
-							/>
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
+								:dataKey="'selectUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
+								:addAll="true" customClass="select-large" />
 						</v-col>
-						<v-col :cols="4">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="프로그램명"
-								valueNm="prgmNm"
-								:searchOption="true"
-								:labelCols="12"
-								:textCols="12"
-								customClass="input-large"
-							/>
+						<v-col :cols="3">
+							<InputText :parentPrgmId="myPrgmId" label="프로그램명" valueNm="prgmNm" :searchOption="true"
+								:labelCols="12" :textCols="12" customClass="input-large" />
 						</v-col>
-						<v-col :cols="5" class="text-right">
+						<v-col :cols="6" class="text-right">
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@@ -37,47 +25,32 @@
 
 		<v-row ref="contents">
 			<!-- 프로그램 리스트 -->
-			<v-col :cols="5" class="h100">
-				<v-card class="pb-5">
-					<div class="d-flex align-center justify-space-between pa-5">
+			<v-col :cols="5">
+				<v-card class="pa-5">
+					<div class="d-flex align-center justify-space-between">
 						<v-card-title class="pa-0">프로그램 리스트</v-card-title>
 						<div>
-							<Buttons
-								:parentPrgmId="myPrgmId"
-								:bindingData="gridName"
-								:detailList="detailList"
-								:btnActionsFnc="btnActions"
-							/>
+							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
+								:btnActionsFnc="btnActions" />
 						</div>
 					</div>
-					<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 ref="gridParent" class="pt-5" style="height: 60vh">
+						<!-- <div ref="gridParent" class="px-5 h100">
+						</div> -->
+						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
+							:gridName="gridName" @getRowsData="getRowData" />
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
-			<v-col :cols="7" class="h100">
+			<v-col :cols="7">
 				<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>
 					</div>
 					<div class="px-5" style="min-height:calc(100% - 76px)">
-						<component
-							:is="'Form'"
-							:parentPrgmId="myPrgmId"
-							:bindingData="gridName"
-							:detailList="detailList"
-							@gridEditingFinish="gridEditingFinish"
-						/>
+						<component :is="'Form'" :parentPrgmId="myPrgmId" :bindingData="gridName"
+							:detailList="detailList" @gridEditingFinish="gridEditingFinish" />
 						<!-- <div class="w100">
 						</div> -->
 					</div>
@@ -132,21 +105,19 @@ export default {
 			detailList: myDetail,
 
 			dataPathMock: {
-        'rowGrid': {
-          column: [
-            { header: '프로그램ID', name: 'field1', align: 'left' },
-            { header: '프로그램덤', name: 'field2', align: 'left' },
-            { header: '타임', name: 'field3', align: 'left' },
-            { header: '사용여부', name: 'field4', align: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {
+				'rowGrid': {
+					column: [
+						{ header: '프로그램ID', name: 'field1', align: 'left' },
+						{ header: '프로그램덤', name: 'field2', align: 'left' },
+						{ header: '타임', name: 'field3', align: 'left' },
+						{ header: '사용여부', name: 'field4', align: 'left' }
+					],
+					option: {
 						scrollY: false,
 						scrollX: false,
 					}
-        }
-      },
+				}
+			},
 		};
 	},
 	computed: {
@@ -262,8 +233,6 @@ export default {
 			});
 
 			// this.getRowGridData();
-
-			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -296,6 +265,7 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
+			this.loadGrid = true;
 
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
@@ -304,18 +274,23 @@ export default {
 						//rowKey: this.chkRowGridSelectKey || 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,
 						setScroll: true,
 					});
 				}
 			});
 		},
 		async getRowData(data, gridName) {
+			// 	gridKey: gridName,
+			// 	gridSelect: true,
+			// 	rowGridSelectKey: data.rowKey,
+			// 	rowGridSelectData: data,
+			// });
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,
@@ -327,6 +302,7 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
+
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {
@@ -482,7 +458,7 @@ const myDetail = [
 		valueNm: 'prgmTpCd',
 		essential: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		list: [
 			{ text: '프로그램', value: '1' },
 			{ text: '팝업', value: '2' },
@@ -497,10 +473,11 @@ const myDetail = [
 		essential: true,
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-13',
 		value: { '1': true, '0': false },
 		required: true,
 		textCols: 12,
+		labelCols:12,
 		iconShow: true
 	},
 	{
@@ -509,7 +486,7 @@ const myDetail = [
 		valueNm: 'url',
 		disabled: false,
 		cols: 12,
-		class: 'py-2',
+		class: 'py-2 pt-4',
 		required: true,
 		textCols: 12,
 		iconShow: true
@@ -520,7 +497,7 @@ const myDetail = [
 		valueNm: 'regUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -531,7 +508,7 @@ const myDetail = [
 		valueNm: 'regDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -542,7 +519,7 @@ const myDetail = [
 		valueNm: 'procUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -553,19 +530,10 @@ const myDetail = [
 		valueNm: 'procDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
 	},
 ];
-
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-  field1: 'PRG0001',
-  field2: '대시보드',
-  field3: '프로그램', 
-	field4: '사용'
-});
 </script>

pages/ems/base/AddInfoMngPage.vue

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

pages/ems/base/EffcIdxMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -18,7 +18,7 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" class="pt-2">
-			<v-col :cols="5" style="height:100%" class="pr-2">
+			<v-col :cols="5"  class="pr-2">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<v-card-title class="pa-0 custom-title-4">효율지표 리스트</v-card-title>
@@ -33,11 +33,11 @@
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" style="height:100%" class="pl-2">
+			<v-col :cols="7" class="pl-2">
 				<v-card class="pb-5">
 					<v-card-title class="custom-title-4 pa-4 pb-2">효율지표 상세
 					</v-card-title>
-					<div class="px-4" style="height:calc(100% - 76px)">
+					<div class="px-4" >
 						<v-tabs v-model="tab">
 							<v-tab v-for="item in items" :key="item.id" :disabled="(item.id == 'EffcIdxAddInfoTab'
 								? isInfoTabDisabled
@@ -162,7 +162,7 @@ import EffcIdxAddInfoTab from '@/components/pages/ems/EffcIdxInfo/EffcIdxAddInfo
 import Grid from '~/components/common/Grid';
 import Utility from '~/plugins/utility';
 import SelectBox from '@/components/common/select/SelectBox';
-import CheckBox from '~/components/common/checkbox/CheckBox';
+import CheckBox from '~/components/common/CheckBox';
 import EqpmCalcPop from '~/components/common/modal/EqpmCalcPop';
 import TextArea from '@/components/common/form/TextArea';
 
@@ -214,64 +214,6 @@ export default {
 				},
 			],
 			loadGrid: false,
-			// 	"effcIdxGrid": {
-			// 		data: [
-			// 			{
-			// 				"effcIdxId": "E001",
-			// 				"effcIdxNm": "에너지 소비 효율",
-			// 				"effcKind": "환경"
-			// 			},
-			// 			{
-			// 				"effcIdxId": "E002",
-			// 				"effcIdxNm": "작업 시간 대비 생산량",
-			// 				"effcKind": "생산성"
-			// 			},
-			// 			{
-			// 				"effcIdxId": "E003",
-			// 				"effcIdxNm": "장비 가동률",
-			// 				"effcKind": "운영"
-			// 			},
-			// 			{
-			// 				"effcIdxId": "E004",
-			// 				"effcIdxNm": "불량률",
-			// 				"effcKind": "품질"
-			// 			},
-			// 			{
-			// 				"effcIdxId": "E005",
-			// 				"effcIdxNm": "재고 회전율",
-			// 				"effcKind": "물류"
-			// 			}
-			// 		]
-			// 		,
-			// 		column: [
-			// 			{
-			// 				header: '효율지표 ID',
-			// 				name: 'effcIdxId',
-			// 				align: 'center',
-			// 				// hidden:true
-			// 			},
-			// 			{
-			// 				header: '효율지표명',
-			// 				name: 'effcIdxNm',
-			// 				align: 'left',
-			// 				minWidth: 150,
-			// 				// hidden:true
-			// 			},
-
-			// 			{
-			// 				header: '효율지표종류',
-			// 				name: 'effcKind',
-			// 				align: 'left',
-			// 				// hidden: true,
-			// 			},
-			// 			// { header: '등록 사용자', name: 'regUserNo', hidden: true },
-			// 			// { header: '등록 일자', name: 'regDttm', hidden: true },
-			// 			// { header: '수정 사용자', name: 'procUserNo', hidden: true },
-			// 			// { header: '수정 일자', name: 'procDttm', hidden: true },
-			// 		],
-
-			// 	}
-			// },
 			initFlag: false,
 			selectValueList01: [],
 			selectValueList02: [],
@@ -919,7 +861,6 @@ export default {
 				{
 					header: '효율지표 ID',
 					name: 'effcIdxId',
-					align: 'center',
 					// hidden:true
 				},
 				{

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -3,7 +3,7 @@
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
-					<v-row align="end" no-gutters>
+					<v-row align="center" no-gutters>
 						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
@@ -12,8 +12,6 @@
 								dataKey="searchLocKind"
 								:sendParam="{ commGrpCd: 'EM_LOC_KIND', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
-								customClass="select-large"
 							/>
 						</v-col>
 						<v-col :cols="2.5">
@@ -24,12 +22,10 @@
 								dataKey="searchEccKind"
 								:sendParam="{ commGrpCd: 'EM_ECC_KIND', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
-								customClass="select-large"
 							/>
 						</v-col>
+						<!-- 사업장 -->
 						<!-- <v-col :cols="3">
-							사업장
 							<div style="visibility:hidden">
 								<component
 									:is="'SelectBlocMstr'"
@@ -46,8 +42,6 @@
 								dataKey="useFg"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
-								customClass="select-large"
 							/>
 						</v-col>
 						<v-col :cols="2.5">
@@ -55,14 +49,17 @@
 								:parentPrgmId="myPrgmId"
 								label="공정명"
 								valueNm="eccNm"
-								:labelCols="12"
-								:textCols="12"
+								:labelCols="2"
+								:textCols="9"
 								:searchOption="true"
-								:iconShow="true"
-								customClass="input-large"
 							/>
 						</v-col>
-						<BtnSearch @click="search" size="large" />
+						<v-col class="text-right">
+							<BtnSearch @click="search" />
+						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
+						
 					</v-row>
 				</v-card>
 			</v-col>
@@ -79,17 +76,16 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div class="px-5" style="min-height:calc(100% - 76px)">
-						<div ref="gridParent" class="w100 h100 pb-2">
+					<div class="px-5" style="height:calc(100% - 76px)">
+						<div ref="gridParent" class="w100 h100">
 							<component
 								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null" 
+								:is="loadGrid ? 'Grid' : null"
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -196,15 +192,13 @@ export default {
 			gridName: 'rowGrid',
 			loadGrid: false,
 			tab: null,
-			selectedRowKey: null,
-			// rowSelectionStatus: {},
-			dataPathMock : { },
 			items: [
 				{ name: '공정 정보', id: 'eccBaseInfoTab', disabledFlag: false },
 				{ name: '공정 추가 정보', id: 'eccAddInfoTab', disabledFlag: false },
 				{ name: '공정 연결 정보', id: 'eccIaoTab', disabledFlag: false },
 			],
 			detailList: myDetail,
+			loadGrid: false,
 		};
 	},
 	computed: {
@@ -320,23 +314,11 @@ export default {
 	},
 	mounted() {
 		this.init();
-		this.$nextTick(() => {
-		// const checkbox = document.getElementById('headerCheckbox');
-		// if (checkbox) {
-		// 	checkbox.addEventListener('change', this.handleHeaderCheckboxChange);
-		// }
-		});
 	},
 	beforeDestroy() {
 		this.chkOpenTabList({ key: 'destroy', prgmId: myPrgmId });
 	},
 	methods: {
-		handleHeaderCheckboxChange(event) {
-			const checked = event.target.checked;
-			this.dataPathMock.rowGrid.data.forEach(row => {
-			row.selected = checked;
-		});},
-
 		...mapMutations({
 			setPageData: 'setPageData',
 		}),
@@ -351,41 +333,7 @@ export default {
 				blocId: this.userInfo.blocId,
 			});
 		},
-		gridInitTest() {
-			const rowGrid = {
-				column: [
-					{
-						header: '',
-						name: '',
-						align: 'center',
-						width: 50,
-						formatter: (props) => {
-							return `<label class="custom-radio">
-										<span class="radio-mark"></span>
-									</label>`;
-						}
-					},
-					{ header: '공정 정보', name: 'eccNm', align: 'left' },
-					{ header: '현재 상태', name: 'status', align: 'center' },
-					{ header: '공정 유형', name: 'eccKind', align: 'left' },
-					{ header: '사용 여부', name: 'useFg', align: 'center' },
-				],
-				data: dataMockExample,
-				defaultRow: dataMockExample,
-				option: {
-					...gridOptions,
-				},
-			}
-			this.dataPathMock = {rowGrid};
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
 		gridInit() {
-			//  Test
-			this.gridInitTest(); return;
-			// End test
-
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
 			const gridWidth = this.$refs.gridParent.offsetWidth;
 
@@ -404,6 +352,17 @@ export default {
 
 			const _this = this;
 			const myColumns = [
+				{
+					header: '',
+					name: '',
+					align: 'center',
+					width: 50,
+					formatter: (props) => {
+						return `<label class="custom-radio">
+									<span class="radio-mark"></span>
+								</label>`;
+					}
+				},
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{
 					header: '공정 명',
@@ -598,16 +557,6 @@ export default {
 			});
 		},
 		async getRowData(data) {
-			
-			//Progess and fake radio 
-			// const rowKey = data.rowKey;
-			// this.selectedRowKey = rowKey;
-			// Object.keys(this.rowSelectionStatus).forEach(key => {
-			// this.$set(this.rowSelectionStatus, key, false);
-			// });
-			// this.$set(this.rowSelectionStatus, rowKey, true);
-
-
 			this.setEccAddInfo(data);
 			this.setEccIao(data);
 			this.setGridSelectData({
@@ -623,9 +572,6 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: Object.assign({}, data),
 			});
-			//fake radio need recheck  
-			// this.$refs[this.gridName]?.repaint?.();
-
 		},
 		async setEccAddInfo(data) {
 			this.setPageData({
@@ -1070,142 +1016,4 @@ const myDetail = [
 		value: { '1': true, '0': false },
 	},
 ];
-
-const dataMockExample = [
-  {
-    eccId: 'ECC000001',
-    eccNm: 'EGP_HVAC_LT_CH001',
-    status: '운영중',
-    eccKind: '공정',
-    useFg: '1',
-    _children: [
-      {
-        eccId: 'ECC000002',
-        eccNm: 'B01',
-        status: '대기',
-        eccKind: '공정',
-        useFg: '1',
-        _children: [
-          {
-            eccId: 'ECC000005',
-            eccNm: 'B01-1',
-            status: '운영중',
-            eccKind: '공정',
-            useFg: '1',
-			_children: [
-				{
-					eccId: 'ECC000009',
-					eccNm: 'B01-1-1',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-				{
-					eccId: 'ECC0000010',
-					eccNm: 'B01-1-2',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-				{
-					eccId: 'ECC0000011',
-					eccNm: 'B01-1-3',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-			]
-          },
-          {
-            eccId: 'ECC000006',
-            eccNm: 'B01-2',
-            status: '점검중',
-            eccKind: '공정',
-            useFg: '0',
-			_children: [
-				{
-					eccId: 'ECC0000013',
-					eccNm: 'B01-2-1',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-				{
-					eccId: 'ECC0000014',
-					eccNm: 'B01-1-2',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-				{
-					eccId: 'ECC0000015',
-					eccNm: 'B01-1-3',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-			]
-          },
-          {
-            eccId: 'ECC000007',
-            eccNm: 'B01-3',
-            status: '운영중',
-            eccKind: '공정',
-            useFg: '1',
-			_children: [
-				{
-					eccId: 'ECC000009',
-					eccNm: 'B01-3-1',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-				{
-					eccId: 'ECC0000010',
-					eccNm: 'B01-3-2',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-				{
-					eccId: 'ECC0000011',
-					eccNm: 'B01-3-3',
-					status: '운영중',
-					eccKind: '공정',
-					useFg: '1'
-				},
-			]
-          },
-        ],
-      },
-      {
-        eccId: 'ECC000003',
-        eccNm: 'B02',
-        status: '운영중',
-        eccKind: '공정',
-        useFg: '1',
-      },
-      {
-        eccId: 'ECC000004',
-        eccNm: 'B03',
-        status: '점검중',
-        eccKind: '공정',
-        useFg: '0',
-      },
-    ],
-  },
-];
-
-const gridOptions = {
- 	treeColumnOptions: {
-		name: 'eccNm',	 // Showing tree table
-		useIcon: false, // Not using icon
-		indentWidth: 10,// spacing when showing children
-	},
-	header: {
-		height: 40,
-	},
-	rowHeight: 35,
-	showCheckbox: false,
-};
-</script>
+</script>

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -25,7 +25,7 @@
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
 
-						<BtnSearch @click="search" size="large" />
+						<BtnSearch @click="search" size="large" class="mr-2" />
 
 					</v-row>
 				</v-card>
@@ -43,8 +43,7 @@
 						<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" />
 						</div>
 					</div>
 				</v-card>
@@ -308,12 +307,22 @@ 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: 400,
+					minWidth: 350,
 				},
 				{
 					header: '검침개소 ID',
@@ -333,7 +342,6 @@ export default {
 					header: '개소 종류',
 					name: 'plcKind',
 					minWidth: 100,
-					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.plcKindList.filter(
@@ -383,7 +391,6 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					minWidth: 100,
-					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -470,12 +477,12 @@ export default {
 					this.$refs[this.gridName].focus({
 						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: 'readPlcNm',
 						setScroll: true,
 					});
@@ -493,7 +500,7 @@ export default {
 				if (this.tab == 2) {
 					this.tab = 0;
 				}
-				this.isImgTabDisabled = false;
+				this.isImgTabDisabled = true;
 			} else {
 				this.isImgTabDisabled = false;
 			}
@@ -917,47 +924,47 @@ 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: '미사용',
+	},
 ];
 
 

pages/ems/base/EnrgResourceCenterMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -12,6 +13,7 @@
 								:textCols="12"
 								:labelCols="12"
 								:parentPrgmId="myPrgmId"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -22,6 +24,7 @@
 								dataKey="searchErcKind"
 								:sendParam="{ commGrpCd: 'EM_ERCKIND', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -34,13 +37,9 @@
 								:addAll="true"
 								:textCols="12"
 								:labelCols="12"
+								:customClass="'select-large'"
 							/>
 						</v-col>
-						<v-col :cols="3" class="text-right">
-							<BtnSearch @click="search" />
-						</v-col>
-					</v-row>
-					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
@@ -49,8 +48,11 @@
 								dataKey="searchChrgKind"
 								:sendParam="{ commGrpCd: 'EM_ENGCHAGKIND', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<component
 								:is="'selectCodeList'"
@@ -59,6 +61,7 @@
 								dataKey="useFg"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:addAll="true"
+								:customClass="'select-large'"
 							/>
 						</v-col>
 						<v-col :cols="3">
@@ -69,13 +72,19 @@
 								:textCols="12"
 								:labelCols="12"
 								:searchOption="true"
+								:customClass="'input-large'"
 							/>
 						</v-col>
+						<v-col :cols="3">
+						</v-col>
+						<v-col :cols="3" class="text-right">
+							<BtnSearch :size="'default'" @click="search" />
+						</v-col>
 					</v-row>
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" style="height: calc(100vh - 400px)">
+		<v-row >
 			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex justify-space-between align-end">
@@ -105,7 +114,7 @@
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>에너지원 상세</v-card-title>
-					<div class="px-5" style="height:calc(100% - 70px)">
+					<div class="px-5" style="min-height: auto;">
 						<v-tabs v-model="tab">
 							<v-tab
 								v-for="item in items"
@@ -117,21 +126,21 @@
 						</v-tabs>
 						<v-tabs-items
 							v-model="tab"
-							style="height: calc(100% - 65px);"
 							class="py-6"
+							style="min-height: auto;"
 						>
-							<v-tab-item v-for="(item, idx) in items" :key="item.id">
+							<v-tab-item v-for="(item, idx) in items" :key="item.id">				
 								<component
-									v-if="item.id == 'ercInfoTab'"
-									:is="'Form'"
-									:parentPrgmId="myPrgmId"
-									:detailList="detailList"
-									@gridEditingFinish="gridEditingFinish"
+										v-if="item.id == 'ercInfoTab'"
+										:is="'Form'"
+										:parentPrgmId="myPrgmId"
+										:detailList="detailList"
+										@gridEditingFinish="gridEditingFinish"
 								/>
 								<ErcChrgInfoTab
-									v-if="item.id == 'ercChrgInfoTab'"
-									:parentPrgmId="myPrgmId"
-									:innerTabGridInfo="{ tab, idx }"
+										v-if="item.id == 'ercChrgInfoTab'"
+										:parentPrgmId="myPrgmId"
+										:innerTabGridInfo="{ tab, idx }"
 								/>
 							</v-tab-item>
 						</v-tabs-items>
@@ -323,6 +332,9 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 38,
+				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -332,12 +344,12 @@ export default {
 			const _this = this;
 			const myColumns = [
 				{ header: '회사 ID', name: 'comId', hidden: true },
-				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'center' },
+				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'left' },
 				{ header: '에너지원명', name: 'ercNm', align: 'left' },
 				{
 					header: '에너지원 유형',
 					name: 'ercKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.ercKindList.filter(
@@ -450,7 +462,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					width: 95,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -479,74 +491,24 @@ export default {
 			this.loadGrid = true;
 		},
 		async getRowGridData() {
-			let res = [
-  {
-    "comId": "COM001",
-    "ercId": "ERC001",
-    "ercNm": "LNG 가스",
-    "ercKind": "GAS",
-    "readObjId": "READ001",
-    "readPlcId": "PLC001",
-    "chrgKind": "FIXED",
-    "unitPrce": 120.5,
-    "prceFg": "1",
-    "peakPow": 500,
-    "elecContId": "EC001",
-    "elecContNm": "계약A",
-    "blocId": "BLOC001",
-    "useFg": true
-  },
-  {
-    "comId": "COM002",
-    "ercId": "ERC002",
-    "ercNm": "태양광",
-    "ercKind": "ELEC",
-    "readObjId": "READ002",
-    "readPlcId": "PLC002",
-    "chrgKind": "VARIABLE",
-    "unitPrce": 95.0,
-    "prceFg": "0",
-    "peakPow": 300,
-    "elecContId": "EC002",
-    "elecContNm": "계약B",
-    "blocId": "BLOC002",
-    "useFg": false
-  },
-  {
-    "comId": "COM003",
-    "ercId": "ERC003",
-    "ercNm": "지열",
-    "ercKind": "HEAT",
-    "readObjId": "READ003",
-    "readPlcId": "PLC003",
-    "chrgKind": "FIXED",
-    "unitPrce": 110.0,
-    "prceFg": "1",
-    "peakPow": 450,
-    "elecContId": "EC003",
-    "elecContNm": "계약C",
-    "blocId": "BLOC003",
-    "useFg": true
-  }
-]
-;
+			let res = [];
 
-			// if (this.pageData.blocMstrList.length > 0) {
-			// 	res = await this.postApiReturn({
-			// 		apiKey: 'selectErcInfo',
-			// 		resKey: 'ercInfoData',
-			// 		sendParam: {
-			// 			blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
-			// 			ercKind: this.pageData.searchErcKind,
-			// 			readObjId: this.pageData.searchReadObj,
-			// 			chrgKind: this.pageData.searchChrgKind,
-			// 			useFg: this.pageData.useFg,
-			// 			ercNmLike: this.pageData.ercNm,
-			// 		},
-			// 	});
-			// } else {
-			// 	this.setPageData({ isFind: false });
-			// }
+			if (this.pageData.blocMstrList.length > 0) {
+				res = await this.postApiReturn({
+					apiKey: 'selectErcInfo',
+					resKey: 'ercInfoData',
+					sendParam: {
+						blocId: this.pageData.blocMstrList[this.pageData.blocId].blocId,
+						ercKind: this.pageData.searchErcKind,
+						readObjId: this.pageData.searchReadObj,
+						chrgKind: this.pageData.searchChrgKind,
+						useFg: this.pageData.useFg,
+						ercNmLike: this.pageData.ercNm,
+					},
+				});
+			} else {
+				this.setPageData({ isFind: false });
+			}
 			const newRes = res.map(item => {
 				const newObj = {
 					...item,
@@ -798,133 +760,8 @@ const defaultData = {
 	/* data 세팅 */
 	// 로컬 gridName 값과 동일한 이름으로 세팅
 	rowGrid: {
-		data: [
-  {
-    "comId": "COM001",
-    "ercId": "ERC001",
-    "ercNm": "LNG 가스",
-    "ercKind": "GAS",
-    "readObjId": "READ001",
-    "readPlcId": "PLC001",
-    "chrgKind": "FIXED",
-    "unitPrce": 120.5,
-    "prceFg": "1",
-    "peakPow": 500,
-    "elecContId": "EC001",
-    "elecContNm": "계약A",
-    "blocId": "BLOC001",
-    "useFg": true
-  },
-  {
-    "comId": "COM002",
-    "ercId": "ERC002",
-    "ercNm": "태양광",
-    "ercKind": "ELEC",
-    "readObjId": "READ002",
-    "readPlcId": "PLC002",
-    "chrgKind": "VARIABLE",
-    "unitPrce": 95.0,
-    "prceFg": "0",
-    "peakPow": 300,
-    "elecContId": "EC002",
-    "elecContNm": "계약B",
-    "blocId": "BLOC002",
-    "useFg": false
-  },
-  {
-    "comId": "COM003",
-    "ercId": "ERC003",
-    "ercNm": "지열",
-    "ercKind": "HEAT",
-    "readObjId": "READ003",
-    "readPlcId": "PLC003",
-    "chrgKind": "FIXED",
-    "unitPrce": 110.0,
-    "prceFg": "1",
-    "peakPow": 450,
-    "elecContId": "EC003",
-    "elecContNm": "계약C",
-    "blocId": "BLOC003",
-    "useFg": true
-  }
-],
-		column: [
-			{ header: '회사 ID', name: 'comId', hidden: true },
-				{ header: '에너지원ID', name: 'ercId', width: 120, align: 'center' },
-				{ header: '에너지원명', name: 'ercNm', align: 'left' },
-				{
-					header: '에너지원 유형',
-					name: 'ercKind',
-					align: 'center',
-				},
-				{
-					header: '검침대상',
-					name: 'readObjId',
-					align: 'left',
-				},
-				{
-					header: '검침 개소 ID',
-					name: 'readPlcId',
-					width: 80,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '고지 유형',
-					name: 'chrgKind',
-					width: 80,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '기본단가',
-					name: 'unitPrce',
-					width: 100,
-					align: 'right',
-					hidden: true,
-				},
-				{
-					header: '단가 사용여부',
-					name: 'prceFg',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '피크 전력',
-					name: 'peakPow',
-					width: 100,
-					align: 'right',
-					hidden: true,
-				},
-				{
-					header: '전력 계약',
-					name: 'elecContId',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '전력 계약',
-					name: 'elecContNm',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '사업장',
-					name: 'blocId',
-					width: 100,
-					align: 'center',
-					hidden: true,
-				},
-				{
-					header: '사용 여부',
-					name: 'useFg',
-					width: 95,
-					align: 'center',
-				}
-		], // myColumns,
+		data: [],
+		column: [], // myColumns,
 		option: {}, // myOptions
 		defaultRow: {
 			comId: '',

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

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

pages/ems/base/EqpmKindPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<PageTitle/>
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -167,7 +167,7 @@ export default {
 					header: '설비종류ID',
 					name: 'eqpmKindId',
 					width: gridWidth * 0.5,
-					align: 'center',
+					align: 'left',
 				},
 				{
 					header: '설비종류명',
@@ -359,7 +359,7 @@ const myDetail = [
 		label: '설비종류 ID',
 		valueNm: 'eqpmKindId',
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 pt-1',
 		iconShow: true,
 		required: false,
 		readonly: true,
@@ -373,7 +373,7 @@ const myDetail = [
 		valueNm: 'eqpmKindNm',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 pt-1',
 		iconShow: true,
 		required: true,
 		labelCols: 12,

pages/ems/base/EquipmentGroupMngPage.vue

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

pages/ems/base/EquipmentMasterMngPage.vue

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

pages/ems/base/GdIdxMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -9,7 +9,7 @@
 							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01"
 								:itemList="selectValueList01" :label="'설비종류'" :iconShow="true"
 								@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
-								:customClass="'select-large'"  />
+								:customClass="'select-large'" />
 						</v-col>
 						<v-col :cols="3">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02"
@@ -19,10 +19,11 @@
 						</v-col>
 						<v-col :cols="3">
 							<InputText :parentPrgmId="myPrgmId" label="가이드명" :textCols="12" valueNm="gdIdxNm"
-								:searchOption="true" :iconShow="true" :labelCols="12" :customClass="'input-large'"/>
+								:searchOption="true" :iconShow="true" :labelCols="12" :customClass="'input-large'" />
 						</v-col>
 						<v-col :cols="3" class="text-right">
-							<a-button icon="search" type="primary" @click="search()" class="search-button" size="large">조회</a-button>
+							<a-button icon="search" type="primary" @click="search()" class="search-button"
+								size="large">조회</a-button>
 						</v-col>
 					</v-row>
 				</v-card>
@@ -38,13 +39,13 @@
 							:btnActionsFnc="btnActions" />
 					</div>
 					<div class="h100 px-4" style="height:calc(100% - 70px)">
-						<div ref="gridParent" style="height: 30%">
+						<div ref="gridParent" style="height: 26%">
 							<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 mt-4">
 							<component :is="'Form'" :parentPrgmId="myPrgmId" :detailList="detailList"
-							@gridEditingFinish="gridEditingFinish" />
+								@gridEditingFinish="gridEditingFinish" />
 						</div>
 					</div>
 
@@ -119,109 +120,6 @@ export default {
 			selectValueList01: [],
 			selectValue02: null,
 			selectValueList02: [],
-			// pyscPopupValueChkList: 'pyscPopupValueChkList',
-			// pyscListChk: {
-			// 	pysclQtyId1 : null,
-			// 	pysclQtyId2 : null,
-			// 	pysclQtyId3 : null,
-			// 	pysclQtyId4 : null
-			// }
-			// dataPathExample: {
-			// 	"rowGrid": {
-			// 		data: [
-
-			// 			{
-			// 				gdIdxId: 'GD001',
-			// 				gdIdxNm: '온도 가이드',
-			// 				eqpmGrpId: 'EQ001',
-			// 				upTotMeth: 'AVG',
-			// 				careStndVal: 50,
-			// 				warnStndVal: 70,
-			// 				alrmMsg: '온도가 기준치를 초과했습니다.',
-			// 			},
-			// 			{
-			// 				gdIdxId: 'GD002',
-			// 				gdIdxNm: '습도 가이드',
-			// 				eqpmGrpId: 'EQ002',
-			// 				upTotMeth: 'MAX',
-			// 				careStndVal: 30,
-			// 				warnStndVal: 60,
-			// 				alrmMsg: '습도가 기준치를 초과했습니다.',
-			// 			},
-			// 			{
-			// 				gdIdxId: 'GD003',
-			// 				gdIdxNm: '압력 가이드',
-			// 				eqpmGrpId: 'EQ003',
-			// 				upTotMeth: 'SUM',
-			// 				careStndVal: 100,
-			// 				warnStndVal: 150,
-			// 				alrmMsg: '압력이 기준치를 초과했습니다.',
-			// 			}
-
-			// 		],
-			// 		column: [
-			// 			{
-			// 				header: '가이드',
-			// 				name: 'gdIdxId',
-			// 				width: 100,
-			// 				align: 'center',
-			// 			},
-			// 			{
-			// 				header: '가이드명',
-			// 				name: 'gdIdxNm',
-			// 				width: 210,
-			// 				align: 'left',
-			// 			},
-			// 			{
-			// 				header: '설비그룹ID',
-			// 				name: 'eqpmGrpId',
-			// 				width: 100,
-			// 				align: 'center',
-			// 				// formatter({ value }) {
-			// 				// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.eqpmGrpList.filter(item => item.value == value);
-			// 				// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].text;
-			// 				// 	}
-			// 				// 	return retVal;
-			// 				// },
-			// 			},
-			// 			{
-			// 				header: '상위집계방법',
-			// 				name: 'upTotMeth',
-			// 				width: 100,
-			// 				align: 'center',
-			// 				// formatter({ value }) {
-			// 				// 	let retVal = '';
-			// 				// 	const newValue = _this.pageData.upTotMethList.filter(item => item.commCd == value);
-			// 				// 	if (newValue.length > 0) {
-			// 				// 		retVal = newValue[0].commCdNm;
-			// 				// 	}
-			// 				// 	return retVal;
-			// 				// },
-			// 			},
-			// 			{
-			// 				header: '주의기준',
-			// 				name: 'careStndVal',
-			// 				width: 100,
-			// 				align: 'right',
-			// 			},
-			// 			{
-			// 				header: '경고기준',
-			// 				name: 'warnStndVal',
-			// 				width: 100,
-			// 				align: 'right',
-			// 			},
-			// 			{
-			// 				header: '알람메세지',
-			// 				name: 'alrmMsg',
-			// 				minWidth: 860,
-			// 				align: 'left',
-			// 			}
-			// 		]
-
-			// 	}
-			// }
 		};
 	},
 	computed: {
@@ -429,14 +327,12 @@ export default {
 					header: 'COM ID',
 					name: 'comId',
 					width: 100,
-					aling: 'center',
 					hidden: true,
 				},
 				{
 					header: '가이드',
 					name: 'gdIdxId',
 					width: 100,
-					align: 'center',
 				},
 				{
 					header: '가이드명',
@@ -448,7 +344,6 @@ export default {
 					header: '설비그룹ID',
 					name: 'eqpmGrpId',
 					width: 100,
-					align: 'center',
 					// hidden: true,
 					formatter({ value }) {
 						let retVal = '';
@@ -465,7 +360,6 @@ export default {
 					header: '상위집계방법',
 					name: 'upTotMeth',
 					width: 100,
-					align: 'center',
 					// hidden: true,
 					formatter({ value }) {
 						let retVal = '';
@@ -627,58 +521,6 @@ 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',
@@ -1277,14 +1119,7 @@ const myDetail = [
 		required: true,
 		iconShow: true
 	},
-	// {
-	// 	// 공백 처리
-	// 	type: 'Label',
-	// 	cols: 3,
-	// 	class: 'py-2',
-	// 	// label: "* '주의기준값' 또는 '경고기준값' 중 하나는 필수로 입력해 주세요.",
-	// 	disabled: false,
-	// },
+	
 	// {
 	// 	type: 'CheckBox',
 	// 	label: '설비기준적용',
@@ -1350,7 +1185,8 @@ const myDetail = [
 		// required: true,
 		labelCols: 12,
 		textCols: 12,
-		iconShow: true
+		iconShow: true,
+		inputType: 'number',
 	},
 	// {
 	// 	// 공백 처리
@@ -1398,7 +1234,15 @@ const myDetail = [
 	{
 		// 공백 처리
 		type: 'Label',
-		cols: 9,
+		cols: 3,
+		class: 'py-2',
+		// label: "* '주의기준값' 또는 '경고기준값' 중 하나는 필수로 입력해 주세요.",
+		disabled: false,
+	},
+	{
+		// 공백 처리
+		type: 'Label',
+		cols: 6,
 		class: 'py-3',
 		// label: "* '주의기준값' 또는 '경고기준값' 중 하나는 필수로 입력해 주세요.",
 		disabled: false,
@@ -1453,7 +1297,7 @@ const myDetail = [
 		class: 'pa-3',
 		// required: true,
 		openMode: 'ALL',
-		disabled: false,
+		disabled: true,
 		eqpmKindId: '',
 		eqpmGrpId: '',
 		closeBtnFg: true,
@@ -1597,9 +1441,3 @@ const myDetail = [
 	},
 ];
 </script>
-<style lang="scss" scoped>
-.searchFilter {
-	border-radius: 6px;
-	box-shadow: none;
-}
-</style>

pages/ems/base/GdStndMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -33,11 +33,11 @@
 		<v-row ref="contents" class="mt-3">
 			<v-col :cols="12" style="height: 100%">
 				<!-- <v-card class="py-5"> -->
-				<v-card style="height: 60%">
+				<v-card style="height: auto;">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<v-card-title class="pa-0 custom-title-4">가이드 정보</v-card-title>
 					</div>
-					<div class="d-flex align-end justify-space-between px-4 py-2">
+					<div class="d-flex align-end justify-space-between px-4 py-2 pb-4">
 						<v-row :cols="12" class="align-end">
 							<!-- 가이드 및 설비그룹 라인 시작 -->
 							<v-col :cols="3" class="pa-2">
@@ -116,9 +116,9 @@
 
 				</v-card>
 
-				<v-row style="height: 40%" class="mt-3">
-					<v-col :cols="6" style="height: 100%" class="pr-2">
-						<v-card class="pb-5">
+				<v-row class="mt-3" >
+					<v-col :cols="6"  class="pr-2">
+						<v-card >
 							<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" />
@@ -132,8 +132,8 @@
 							</div>
 						</v-card>
 					</v-col>
-					<v-col :cols="6" style="height: 100%" class="pl-2">
-						<v-card class="pb-5">
+					<v-col :cols="6" class="pl-2">
+						<v-card >
 							<div class="d-flex align-center justify-space-between pa-4">
 								<v-card-title class="pa-0 custom-title-4">설비가이드 기준 정보</v-card-title>
 							</div>

pages/ems/base/PastRsltDataReadPage.vue

@@ -1,63 +1,27 @@
 <template>
 	<div class="l-layout">
-		<PageTitle text="측정 위치 데이터 조회" />
+		<CommonPageTitle />
 
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<v-col :cols="2">
-							<component
-								:is="'SelectBlocMstr'"
-								ref="SelectBlocMstr"
-								:parentPrgmId="myPrgmId"
-								:textCols="12"
-								customClass="select-large"
-							/>
-						</v-col>
-						<!-- <v-col :cols="2">
-							<component
-								label="검침개소"
-								:is="'PastRsltDataReadPop'"
-								:parentPrgmId="myPrgmId"
-							/>
-						</v-col> -->
-						<!-- <v-col :cols="2">
-               <component 
-              :is="'SelectTagNmList'"
-              ref="SelectTagNmList"
-              :parentPrgmId="myPrgmId"
-              />
-            </v-col> -->
 						<v-col :cols="3">
-							<!-- <component
-								:is="'PastRsltDataReadTagPop'"
-								:parentPrgmId="myPrgmId"
-								:label="'TAG'"
-							/> -->
-							<component
-								:is="'EvtObjPop'"
-								:parentPrgmId="myPrgmId"
-								:item="evtObjPopItem"
-								customClass="select-large"
-							/>
+							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
+								:textCols="12" customClass="select-large" />
 						</v-col>
-						<v-col :cols="4">
-							<component
-								:is="'Datepicker'"
-								:parentPrgmId="myPrgmId"
-								:label="'조회기간'"
-								:textCols="12"
-							/>
+						<v-col :cols="3">
+							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
+								customClass="select-large" />
 						</v-col>
-						 <v-col :cols="3" class="d-flex align-end justify-end text-right">
-							 <BtnExcelDownload
-							 	class="mr-1"
-								:parentPrgmId="myPrgmId"
-								:gridName="gridName"
-								type="primary"
-								size="large"
-							/>
+						<v-col :cols="3">
+							<!-- 대상일 -->
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12"
+								customClass="datepicker-large" />
+						</v-col>
+						<v-col :cols="3" class="d-flex align-end justify-end text-right">
+							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
+								size="large" />
 							<BtnSearch @click="search" size="large" />
 						</v-col>
 					</v-row>
@@ -68,12 +32,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"
-						/>
+						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
+							:parentPrgmId="myPrgmId" />
+					</div>
+					<div class="d-flex align-center justify-space-between">
+						<pagination id="pagination" :total-count="totalCount" :page-num="page" :limit="limit"
+							@loadData="changeGrid" />
 					</div>
 				</v-card>
 			</v-col>
@@ -97,7 +61,7 @@ import BtnExcelDownload from '~/components/common/button/BtnExcelDownload';
 import DateUtility from '~/plugins/dateUtility';
 // import Search from "~/components/common/search";
 import EvtObjPop from '~/components/common/modal/EvtObjPop';
-import PageTitle from "~/components/common/PageTitle";
+import pagination from '~/components/Pagination';
 
 let myTitle;
 // const myPrgmId = "PRG0052";
@@ -130,7 +94,7 @@ export default {
 		PastRsltDataReadPop,
 		PastRsltDataReadTagPop,
 		EvtObjPop,
-		PageTitle,
+		pagination,
 	},
 	data() {
 		return {
@@ -146,12 +110,16 @@ export default {
 				valueNm2: 'tagNm',
 				iconShow: true,
 				disabled: false,
-				labelCols: 12,
 				textCols: 12,
 				class: 'py-2',
 				required: false,
 				formFg: false,
 			},
+			itemsPerPage: 10,
+			itemsPerPageArray: [10, 20, 30],
+			limit: 20,
+			page: 1,
+			totalCount: 0,
 		};
 	},
 	computed: {
@@ -164,9 +132,6 @@ export default {
 		chkTagId() {
 			return this.pageData.tagList === undefined ? null : this.pageData.tagId;
 		},
-		// chkTagList() {
-		// 	return this.pageData.tagList;
-		// },
 		chkTagNm() {
 			return this.pageData.tagData.tagNm;
 		},
@@ -176,18 +141,16 @@ export default {
 	},
 	watch: {
 		chkIsFind(val) {
-			if (val) this.search();
+			if (val) {
+				this.page = 1;
+				this.search();
+			}
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
 				this.search();
 			}
 		},
-		// chkTagList() {
-		// 	if(this.initFlag){
-		// 		this.search();
-		// 	}
-		// },
 		chkTagNm() {
 			if (this.initFlag) {
 				this.search();
@@ -207,7 +170,7 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() {},
+	created() { },
 	async mounted() {
 		await this.setFromDt();
 		await this.init();
@@ -330,6 +293,7 @@ export default {
 			this.loadGrid = false;
 
 			let res = [];
+			let res2 = [];
 			let yearQuarterData = [];
 			yearQuarterData = this.yearQuarterMaker([
 				this.pageData.fromDt,
@@ -381,8 +345,18 @@ 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,
@@ -393,6 +367,9 @@ export default {
 					fromDt: this.pageData.fromDt,
 					toDt: this.pageData.toDt,
 					yearQuarterList: yearQuarterData['yearQuarterList'],
+					limit: this.limit,
+					page: this.page,
+					offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 				};
 				sendParams['tagId'] = this.pageData.tagId;
 				//
@@ -410,6 +387,14 @@ 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,
@@ -487,6 +472,12 @@ 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,19 +59,16 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div class="h100 px-5" style="height:calc(100% - 70px)">
-						<div ref="gridParent" class="w100 h100">
-							<component
-								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null"
-								:gridName="gridName"
-								:parentPrgmId="myPrgmId"
-								@getRowsData="getRowData"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
-							/>
-						</div>
+					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
+						<component
+							:ref="gridName"
+							:is="loadGrid ? 'Grid' : null"
+							:gridName="gridName"
+							:parentPrgmId="myPrgmId"
+							@getRowsData="getRowData"
+							@sendSelectedRowStatInfo="getSelectedRowStatInfo"
+							:selectedRowDataWatchFlag="true"
+						/>
 					</div>
 				</v-card>
 			</v-col>
@@ -81,7 +78,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"
@@ -188,26 +185,8 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			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: '검침 대상 정보',
@@ -724,8 +703,8 @@ const defaultData = {
 		},
 		buttonAuth: {
 			add: true,
-			save: true,
 			remove: true,
+			save: true,
 			excel: false,
 		},
 	},
@@ -873,40 +852,7 @@ 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,11 +1,6 @@
 <template>
   <div class="l-layout">
-    <!-- <h2 class="title">
-			<v-icon small color="primary" class="mr-1">mdi-circle</v-icon>
-			계량 데이터 마감 관리
-		</h2> -->
-    <PageTitle text="계량 데이터 마감 관리" />
-
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <!-- 조회조견 -->
       <v-col :cols="12">
@@ -48,6 +43,7 @@
                 :is="'Datepicker'"
                 :parentPrgmId="myPrgmId"
                 :label="'조회기간'"
+                customClass="datepicker-large"
               />
             </v-col>
             <div class="d-flex">
@@ -75,8 +71,8 @@
     </v-row>
     <v-row ref="contents">
       <!-- 일일검침정보 목록-->
-      <v-col :cols="12" class="h100">
-        <v-card class="pb-5">
+      <v-col :cols="12">
+        <v-card class="pb-5 w100">
           <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">
@@ -91,20 +87,18 @@
                 type="primary"
                 :ripple="false"
                 @click="saveReadResultCloseMng('N')"
-                >일마감</a-button
               >
+                일마감
+              </a-button>
             </div>
           </div>
-          <div class="px-5" style="min-height: calc(100% - 76px)">
-            <div ref="gridParent" class="h100 w100">
+          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
                 :parentPrgmId="myPrgmId"
                 :gridName="gridName"
-                :dataPath="dataPathMock"
               />
-            </div>
           </div>
         </v-card>
       </v-col>
@@ -123,7 +117,6 @@ 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";
@@ -151,13 +144,12 @@ export default {
     Datepicker,
     Search,
     Grid,
-    PageTitle,
   },
   data() {
     return {
       myPrgmId: myPrgmId,
       gridName: "rowGrid",
-      loadGrid: true,
+      loadGrid: false,
       dataPathMock: {
         rowGrid: {
           column: [
@@ -251,6 +243,10 @@ export default {
         columnOptions: {
           resizable: true,
         },
+        pageOptions: {
+					useClient: true,
+					perPage: 13,
+				},
       };
       this.setGridOption({
         gridKey: this.gridName,
@@ -260,7 +256,6 @@ export default {
         gridKey: this.gridName,
         value: myColumns,
       });
-      this.loadGrid = true;
     },
     async search() {
       await this.getRowGridData();
@@ -290,6 +285,9 @@ export default {
         });
       }
       this.setPageData({ isFind: false });
+      this.$nextTick(() => {
+        this.loadGrid = true;
+      })
     },
     //전월 or 일 마감--------------------------------------------------------------------------------------------
     async saveReadResultCloseMng(mnthYn) {

pages/ems/base/TagMngPage.vue

@@ -1,61 +1,43 @@
 <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"
-							/>
+							<component :is="'SelectBlocMstr'" ref="SelectBlocMstr" :parentPrgmId="myPrgmId"
+								:textCols="12" customClass="select-large" />
 						</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"
-							/>
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'측정 Data 유형'"
+								dataKey="searchReadDataType" :sendParam="{ commGrpCd: 'EM_READ_DATA_TYPE', useFg: '1' }"
+								:addAll="true" :textCols="12" customClass="select-large" />
 						</v-col>
 						<v-col :cols="3">
-							<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" />
+							<component :is="'SelectReadObj'" :parentPrgmId="myPrgmId" :label="'측정대상'"
+								dataKey="searchReadObj" :sendParam="{ useFg: '1' }" :labelCols="12" :textCols="12"
+								:addAll="true" customClass="select-large" />
 						</v-col>
+
 					</v-row>
-					<v-row align="center" no-gutters>
+					<v-row align="end" no-gutters>
 						<v-col :cols="3">
-							<component
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'사용여부'"
-								dataKey="useFg"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:addAll="true"
-							/>
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'" dataKey="useFg"
+								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }" :addAll="true" :textCols="12"
+								customClass="select-large" />
 						</v-col>
-						<v-col :cols="6">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="TAG명"
-								valueNm="tagNm"
-								:labelCols="2"
-								:textCols="9"
-								:searchOption="true"
-							/>
+						<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>
 					</v-row>
 				</v-card>
@@ -66,63 +48,33 @@
 				<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 - 360px)"
-						>
-							<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 - 400px)">
+							<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="h100">
+			<v-col :cols="7" class="">
 				<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>
@@ -134,6 +86,7 @@
 <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';
@@ -149,7 +102,7 @@ let myTitle;
 // const myPrgmId = "PRG0051";
 let myPrgmId;
 export default {
-	mixins: [mixinGlobal],
+	mixins: [mixinGlobal, resize],
 	async asyncData(context) {
 		const myState = context.store.state;
 		// context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
@@ -219,15 +172,19 @@ 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() {
@@ -297,12 +254,16 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 16;
 
 			const myOptions = {
 				columnOptions: {
 					resizable: true,
 				},
+				scrollX: true,
+				header: {
+					height: 38,
+				},
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -316,21 +277,21 @@ export default {
 					header: 'TAG ID',
 					name: 'tagId',
 					width: 'auto',
-					minWidth: 280,
+					minWidth: 340,
 					align: 'left',
 				},
 				{
 					header: 'TAG 명',
 					name: 'tagNm',
 					width: 'auto',
-					minWidth: 140,
+					minWidth: 220,
 					align: 'left',
 				},
 				{
 					header: '측정 값 유형',
 					name: 'readDataTypeCd',
-					width: 100,
-					align: 'center',
+					width: 90,
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.readDataTypeCdList.filter(
@@ -346,7 +307,7 @@ export default {
 					header: '측정대상',
 					name: 'readObjId',
 					width: 100,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.readObjList.filter(
@@ -363,7 +324,7 @@ export default {
 					header: '단위',
 					name: 'unitCd',
 					width: 80,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.unitCdList.filter(
@@ -493,6 +454,7 @@ export default {
 						readObjId: this.pageData.searchReadObj,
 						useFg: this.pageData.useFg,
 						tagNmLike: this.pageData.tagNm,
+						tagIdLike: this.pageData.tagId,
 					},
 				});
 			} else {
@@ -751,7 +713,8 @@ export default {
 							});
 
 							this.$nextTick(() => {
-								this.setPageData({ isFind: true });
+								// this.setPageData({ isFind: true });
+								this.search();
 							});
 						}
 					} else {
@@ -818,6 +781,7 @@ function isValidAlrmVal(obj) {
 
 const defaultData = {
 	/* 검색옵션 */
+	tagId: '',
 	tagNm: '',
 	blocId: '',
 	blocMstrList: [],
@@ -907,30 +871,39 @@ const myDetail = [
 		label: 'TAG ID',
 		valueNm: 'tagId',
 		disabled: false,
+		iconShow: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pr-4',
 		required: false,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
 		label: 'TAG 명',
 		valueNm: 'tagNm',
 		disabled: false,
+		iconShow: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pl-4',
 		required: false,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
 		label: '측정 값 유형',
 		valueNm: 'readDataTypeCd',
 		disabled: false,
+		iconShow: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pr-4 pt-5',
 		list: 'readDataTypeCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
 		required: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
@@ -938,11 +911,14 @@ const myDetail = [
 		valueNm: 'readObjId',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pl-4 pt-5',
 		list: 'readObjList',
 		itemText: 'readObjNm',
 		itemValue: 'readObjId',
 		required: true,
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -950,8 +926,11 @@ const myDetail = [
 		valueNm: 'mgnf',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pr-4 pt-5',
 		required: true,
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
@@ -959,10 +938,13 @@ const myDetail = [
 		valueNm: 'unitCd',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pl-4 pt-5',
 		list: 'unitCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -970,7 +952,10 @@ const myDetail = [
 		valueNm: 'rangMin',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pr-4 pt-5',
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -978,7 +963,10 @@ const myDetail = [
 		valueNm: 'rangMax',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pl-4 pt-5',
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -986,7 +974,10 @@ const myDetail = [
 		valueNm: 'alrmHihi',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pr-4 pt-5',
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -994,7 +985,10 @@ const myDetail = [
 		valueNm: 'alrmHi',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pl-4 pt-5',
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -1002,7 +996,10 @@ const myDetail = [
 		valueNm: 'alrmLo',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pr-4 pt-5',
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'InputText',
@@ -1010,7 +1007,10 @@ const myDetail = [
 		valueNm: 'alrmLolo',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pl-4 pt-5',
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'CheckBox',
@@ -1018,8 +1018,11 @@ const myDetail = [
 		valueNm: 'totFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pr-4 pt-5',
 		value: { '1': true, '0': false },
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'CheckBox',
@@ -1027,9 +1030,12 @@ const myDetail = [
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pl-4 pt-5',
 		value: { '1': true, '0': false },
 		required: false,
+		iconShow: true,
+		labelCols: 12,
+		textCols: 12,
 	},
 	{
 		type: 'SelectBox',
@@ -1056,4 +1062,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
+</script>

pages/ems/base/TagMngPage_Pagination.vue

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

pages/ems/effc/DataSetMngPage.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="l-layout">
+    <CommonPageTitle />
     <!-- Dataset 페이지 시작 -->
     <div v-if="pageActionFlag == 'list'" class="h100">
       <v-row ref="searchFilter">
@@ -26,7 +27,7 @@
               </v-col>
               <v-col class="text-right d-flex align-end align-self-end justify-end">
                 <a-button @click="jamoviClickEvent('view')" type="primary" :ripple="false" class="mr-1"
-                  depressed size="large">Jamovi</a-button>
+                  depressed size="large">JAMOVI</a-button>
                 <BtnSearch @click="search" size="large" />
               </v-col>
             </v-row>
@@ -34,23 +35,23 @@
         </v-col>
       </v-row>
       <v-row ref="contents">
-        <v-col :cols="5" class="h100">
+        <v-col :cols="5" >
           <v-card class="pb-5">
             <div class="d-flex align-center justify-space-between pa-5">
               <v-card-title class="pa-0 custom-title-4">Data Set 리스트</v-card-title>
               <Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
                 :btnActionsFnc="btnActions" />
             </div>
-            <div class="px-5" style="min-height:calc(100% - 76px)">
-              <div ref="gridParent" class="w100 h100">
-                <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-                  @getRowsData="getRowData" @sendSelectedRowStatInfo="getSelectedRowStatInfo"
-                  :selectedRowDataWatchFlag="true" />
-              </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>
           </v-card>
         </v-col>
-        <v-col :cols="7" class="h100">
+        <v-col :cols="7" >
           <v-card class="pb-5">
             <v-card-title class="custom-title-4" style="min-height:76px;">Data Set 상세
             </v-card-title>
@@ -282,7 +283,7 @@ export default {
         {
           header: '모델링 DataSet ID',
           name: 'dataSetId',
-          align: 'center',
+          align: 'left',
           width: 180,
         },
         {

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="center" no-gutters>
@@ -48,7 +49,7 @@
 						<v-col :cols="3">
 							<!-- 대상일 -->
 							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="12"
-								:textCols="12" :customClass="'input-large'" />
+								:textCols="12" :customClass="'datepicker-large'" />
 						</v-col>
 						<v-col :cols="3" class="text-right">
 							<!-- 조회버튼 -->
@@ -555,7 +556,7 @@ export default {
 				header: {
 					height: 37,
 				},
-				rowHeight: 'auto',
+				rowHeight: 37,
 
 
 				// pageOptions: {

pages/ems/effc/EnrgEffcTotSummPage.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="l-layout">
+    <CommonPageTitle />
     <v-row ref="searchFilter">
       <v-col :cols="12">
         <v-card class="searchFilter">
@@ -25,7 +26,7 @@
               <component
                 :is="'Datepicker'"
                 :parentPrgmId="myPrgmId"
-                :customClass="'select-large'"
+                :customClass="'datepicker-large'"
                 :label="'대상일'"
                 :labelCols="3"
               />
@@ -99,7 +100,6 @@ export default {
   async asyncData(context) {
     const myState = context.store.state;
     myPrgmId = context.route.query.prgmId;
-    console.log("active menu:", myState.menuData);
     await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
     myTitle = await myState.activeMenuInfo.menuNm;
   },
@@ -195,68 +195,51 @@ export default {
       });
     },
     async getEqpmKind() {
-      // let res = await this.postApiReturn({
-      //   apiKey: "selectEqpmKindCodeList",
-      //   resKey: "eqpmKindCodeLists",
-      //   sendParam: {},
-      // });
+			let res = await this.postApiReturn({
+				apiKey: 'selectEqpmKindCodeList',
+				resKey: 'eqpmKindCodeLists',
+				sendParam: {},
+			});
 
-      let res = [
-        {
-          eqpmKindId: "냉동기저온",
-          eqpmKindNm: "냉동기저온",
-        },
-        {
-          eqpmKindId: "냉동기고온",
-          eqpmKindNm: "냉동기고온",
-        },
-      ];
-
-      if (res.length > 0) {
-        this.selectValueList01 = await res.map((item) => {
-          return {
-            // text: item.eqpmKindNm,
-            label: item.eqpmKindNm,
-            value: item.eqpmKindId,
-          };
-        });
-        this.selectValue01 = this.selectValueList01[0].value;
-      } else {
-        this.selectValueList01 = [];
-        this.selectValue01 = null;
-      }
-      this.setPageData({
-        eqpmKindList: this.selectValueList01,
-        eqpmKindId: this.selectValue01,
-      });
-    },
+			if (res.length > 0) {
+				this.selectValueList01 = await res.map(item => {
+					return {
+						text: item.eqpmKindNm,
+						value: item.eqpmKindId,
+					};
+				});
+				this.selectValue01 = this.selectValueList01[0].value;
+			} else {
+				this.selectValueList01 = [];
+				this.selectValue01 = null;
+			}
+			this.setPageData({
+				eqpmKindList: this.selectValueList01,
+				eqpmKindId: this.selectValue01,
+			});
+		},
     gridInit() {},
     getRowGridData() {},
     async getData() {
-      //   let res = await this.postApiReturn({
-      //     apiKey: "selectEnrgEffcTotSumm",
-      //     resKey: "totSummData",
-      //     sendParam: {
-      //       fromDt: this.pageData.fromDt,
-      //       eqpmKindId: this.selectValue01,
-      //     },
-      //   });
-      let res = ["aaa", "bbb"];
-      await this.getChartData(res);
+			let res = await this.postApiReturn({
+				apiKey: 'selectEnrgEffcTotSumm',
+				resKey: 'totSummData',
+				sendParam: {
+					fromDt: this.pageData.fromDt,
+					eqpmKindId: this.selectValue01,
+				},
+			});
 
-      //   this.selectData = res.filter((item, i) => {
-      //     return (
-      //       res.findIndex((item2, j) => {
-      //         return item.eqpmGrpId === item2.eqpmGrpId;
-      //       }) === i
-      //     );
-      //   });
+			await this.getChartData(res);
 
-      this.selectData = [
-        { eqpmGrpId: "G001", eqpmGrpNm: "Group A", otherProp: "..." },
-        { eqpmGrpId: "G002", eqpmGrpNm: "Group B", otherProp: "..." },
-      ];
-    },
+			this.selectData = res.filter((item, i) => {
+				return (
+					res.findIndex((item2, j) => {
+						return item.eqpmGrpId === item2.eqpmGrpId;
+					}) === i
+				);
+			});
+		},
     barClick(event, chartName) {
       var data = {};
       if (chartName == "card") {
@@ -291,52 +274,40 @@ export default {
       });
     },
     async getChartData(data) {
-      var chartDataObj = {};
-      this.objList = {};
-      // let res = await this.postApiReturn({
-      //   apiKey : 'selectEnrgEffcTotSumm',
-      //   resKey : 'totSummData',
-      //   sendParam:{
-      //     fromDt  : this.pageData.fromDt,
-      //     eqpmKindId : this.pageData.eqpmKindId,
-      //   }
-      // });
+			var chartDataObj = {};
+			this.objList = {};
+			// let res = await this.postApiReturn({
+			//   apiKey : 'selectEnrgEffcTotSumm',
+			//   resKey : 'totSummData',
+			//   sendParam:{
+			//     fromDt  : this.pageData.fromDt,
+			//     eqpmKindId : this.pageData.eqpmKindId,
+			//   }
+			// });
 
-      //   data.map((item) => {
-      //     if (chartDataObj[item.eqpmGrpId] != null) {
-      //       chartDataObj[item.eqpmGrpId].push(item);
-      //     } else {
-      //       chartDataObj[item.eqpmGrpId] = [item];
-      //     }
-      //   });
+			data.map(item => {
+				if (chartDataObj[item.eqpmGrpId] != null) {
+					chartDataObj[item.eqpmGrpId].push(item);
+				} else {
+					chartDataObj[item.eqpmGrpId] = [item];
+				}
+			});
 
-      chartDataObj = {
-        group1: [
-          { fabNm: "Fab A", okCnt: 120, ngCnt: 30 },
-          { fabNm: "Fab B", okCnt: 150, ngCnt: 20 },
-          { fabNm: "Fab C", okCnt: 100, ngCnt: 50 },
-        ],
-        group2: [
-          { fabNm: "Fab D", okCnt: 180, ngCnt: 10 },
-          { fabNm: "Fab E", okCnt: 160, ngCnt: 25 },
-          { fabNm: "Fab F", okCnt: 140, ngCnt: 35 },
-        ],
-      };
+			// chartDataObj.keys()[0]
+			var i = 0;
+			for (var x of Object.keys(chartDataObj)) {
+				this.loadChartList.push(false);
+				i++;
+				this.objList['chart_0' + i] = chartDataObj[x];
+				this.chartNameList.push('chart_0' + i);
+				this.setPageData({
+					[this.chartNameList[i - 1]]: Utility.defaultChartOption(true),
+				});
 
-      // chartDataObj.keys()[0]
-      var i = 0;
-      for (var x of Object.keys(chartDataObj)) {
-        this.loadChartList.push(false);
-        i++;
-        this.objList["chart_0" + i] = chartDataObj[x];
-        this.chartNameList.push("chart_0" + i);
-        this.setPageData({
-          [this.chartNameList[i - 1]]: Utility.defaultChartOption(true),
-        });
-        this.setChartData(chartDataObj[x], i);
-      }
-      // this.setChartData(chartDataObj[Object.keys(chartDataObj)[0]]);
-    },
+				this.setChartData(chartDataObj[x], i);
+			}
+			// this.setChartData(chartDataObj[Object.keys(chartDataObj)[0]]);
+		},
     async setChartData(data, number) {
       this.loadChartList[number - 1] = false;
       let xAxisData = [];
@@ -348,8 +319,7 @@ export default {
         },
       };
 
-      console.log("data : ", data);
-      data.map((item) => {
+        data.map((item) => {
         xAxisData.push(item.fabNm);
       });
 
@@ -403,8 +373,6 @@ export default {
         ];
       }
 
-      // console.log("xAxisData : ", xAxisData);
-      console.log("seriesData : ", seriesData);
       var chartOption = {
         legend: {
           top: xAxisData.length > 7 ? "top" : "bottom",

pages/ems/effc/EnrgMapPage.vue

@@ -1,17 +1,18 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<!-- 차트목록 -->
 							<component :is="'SelectBox'" ref="SelectBox" :propsValue="selectValue01" :itemList="selectValueList01"
 								:label="'차트'" @update:propsValue="selectValue01 = $event" :textCols="12" customClass="select-large"  />
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<!-- 대상일 -->
-							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" />
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" customClass="datepicker-large" />
 						</v-col>
 						<v-col :cols="4" class="text-right">
 							<BtnSearch @click="search" size="large" />
@@ -158,8 +159,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";
@@ -244,7 +245,6 @@ export default {
 
 			
 			this.setChartOption({ chartKey: this.chartName, value: chartOption });
-			// console.log("----DEBUG chart-options-------", { chartOption });
 			this.$nextTick(() => {
 				this.loadChart = true;
 			});

pages/ems/effc/EnrgReptMngPage.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<PageTitle text="효율성 지표 보고서" />
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -21,22 +21,21 @@
 								:itemList="selectValueList03" :label="'FAB'" :multiple="fabMultiple"
 								@update:propsValue="selectValue03 = $event" :labelCols="12" :textCols="12" customClass="select-large" />
 						</v-col>
-
-					</v-row>
-					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<!-- 효율지표 -->
 							<component ref="effcIdxSelect" :is="'SelectBoxMulti'" :propsValue="selectValue04"
 								:itemList="selectValueList04" :label="'효율지표'" :multiple="effcIdxMultiple"
 								@update:propsValue="selectValue04 = $event" :labelCols="12" :textCols="12" customClass="select-large" />
 						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
 						<v-col :cols="3">
 							<!-- 대상일 -->
-							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3"  />
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" customClass="datepicker-large"  />
 						</v-col>
-						<v-col :cols="6" class="text-right d-flex align-end justify-end align-self-end">
+						<v-col :cols="6.5" class="text-right d-flex align-end justify-end align-self-end">
 							<!-- 조회버튼 -->
-							<a-button type="primary" class="d-inline-flex-1 mr-1" size="large" @click="createExcel()">엑셀</a-button>
+							<a-button icon="file-excel" class="d-inline-flex-1 mr-1" size="large" @click="createExcel()">엑셀</a-button>
 							<BtnSearch @click="search" size="large"  />
 						</v-col>
 					</v-row>
@@ -62,15 +61,23 @@
 							<v-col :cols="3">
 								<v-card-title class="pa-0">설비별 효율지표 Trend</v-card-title>
 							</v-col>
-							<!-- <v-col :cols="5"></v-col> -->
 							<v-col :cols="4" class="d-flex justify-space-end" >
-								<component class="text-right mr-2" ref="EqpmSelectPop" :is="'EqpmSelectPop'" :label="''" :labelCols="1"
-									:textCols="12" :valueNm="'eqpmId'" :parentPrgmId="myPrgmId" :eqpmGrpDisabled="true"
-									:fabDisabled="true"  :isMulti="true" />
+									<component
+										class="text-right mr-2"
+										ref="EqpmSelectPop"
+										label=""
+										placeholder="설비..."
+										is="EqpmSelectPop"
+										valueNm="eqpmId"
+										:textCols="12"
+										:parentPrgmId="myPrgmId"
+										:eqpmGrpDisabled="true"
+										:fabDisabled="true"
+										:iconShow="false"
+										:isMulti="true"
+									/>
 								<a-button @click="getEqpmData()" type="primary" >조회</a-button>
 							</v-col>
-							<!-- <v-col :cols="1">
-							</v-col> -->
 						</v-row>
 					</div>
 					<div ref="chartParent" style="height: 100%">
@@ -98,7 +105,8 @@ 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";
+
+import getLineChartOption from "~/components/common/chartoptions/LineChart";
 
 let myTitle;
 let myPrgmId;
@@ -130,7 +138,6 @@ export default {
 		EqpmSelectPop,
 		DateUtility,
 		XLSX,
-		PageTitle,
 	},
 	data() {
 		return {
@@ -266,9 +273,6 @@ export default {
 	},
 	created() { },
 	async mounted() {
-		// console.log('----DEBUG---');
-		// await this.initTest();
-		// End Debug Test---
 		await this.init();
 		this.initedFlag = true;
 	},
@@ -289,7 +293,7 @@ export default {
 		}),
 		async initTest() {
 			// debug test
-			console.log('----DEBUG init pages----');
+			// console.log('----DEBUG init pages----');
 			const seriesName1 = ['B01. 냉동기전력량', ' B01.COP'];
 			const seriesName2 = [
 				'UT_HT_CH101:냉동기전혁당', 'UT_HT_CH102:냉동기전력량', 'UT_HT_CH201:냉동기전력당',
@@ -319,6 +323,7 @@ export default {
 				legend: {
 					icon: 'circle',
 					top: 'top',
+					size: '8'
 				},
 				grid: {
 					top: '10%',
@@ -769,22 +774,14 @@ export default {
 				];
 			}
 
-			var chartOption = {
-				legend: {
-					top: 'top',
-				},
-				grid: {
-					top: '10%',
-					bottom: '20%',
-				},
-				yAxis: {},
-				xAxis: {
-					data: xAxisData,
-				},
-				series: seriesData,
-				tooltip: {},
+			const chartOption = getLineChartOption({
+        xAxisData: xAxisData,
+        seriesData: seriesData,
 				dataZoom: dataZoom,
-			};
+        // legendData: legendData,
+        // isDarkMode: this.isDarkMode,
+      });
+
 			this.setChartOption({ chartKey: this.chartName01, value: chartOption });
 			// this.setChartYAxisData({ chartKey: this.chartName01, value: yAxisData });
 			// this.setChartXAxisData({ chartKey: this.chartName01, value: xAxisData });
@@ -869,22 +866,13 @@ export default {
 				];
 			}
 
-			var chartOption = {
-				legend: {
-					top: 'top',
-				},
-				grid: {
-					top: '10%',
-					bottom: '20%',
-				},
-				yAxis: {},
-				xAxis: {
-					data: xAxisData,
-				},
-				series: seriesData,
-				tooltip: {},
+			const chartOption = getLineChartOption({
+        xAxisData: xAxisData,
+        seriesData: seriesData,
 				dataZoom: dataZoom,
-			};
+        // legendData: legendData,
+        // isDarkMode: this.isDarkMode,
+      });
 
 			this.setChartOption({ chartKey: this.chartName02, value: chartOption });
 			// this.setChartDataZoom({chartKey : this.chartName02,value: dataZoom});

pages/ems/effc/EnrgUsePlanPage.vue

@@ -1,53 +1,49 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
 						<v-col :cols="2.5">
-							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연도'" />
+							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연도'" customClass="datepicker-large"/>
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" />
+								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="true" customClass="select-large" />
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"
-								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" />
+								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="true" customClass="select-large"/>
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox3" :propsValue="selectValue03" :itemList="selectValueList03"
-								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" />
+								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="true" customClass="select-large" />
 						</v-col>
 
-						<BtnSearch @click="search" />
-						<v-col>
-						</v-col>
-						<component ref="EnrgUsePlanModiPop" :is="'EnrgUsePlanModiPop'" :label="'test'" :parentPrgmId="myPrgmId"
-							@gridEditingFinish="gridEditingFinish" />
+						<BtnSearch size="large" @click="search" />
+						<!-- <v-col>
+						</v-col> -->
 					</v-row>
+					<component ref="EnrgUsePlanModiPop" :is="'EnrgUsePlanModiPop'" :label="'test'" :parentPrgmId="myPrgmId"
+						@gridEditingFinish="gridEditingFinish" />
 				</v-card>
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<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-col :cols="12" >
+				<v-card class="pb-5">
+					<div class="d-flex align-center justify-space-between py-4 px-4">
 						<v-card-title class="pa-0 custom-title-4">설비별 에너지 계획 리스트</v-card-title>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</div>
-					<div class="h100 px-5" style="height:calc(100% - 70px)">
-						<div ref="gridParent" class="w100 h100">
-							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-								:editorGrid="true" @getRowsData="getRowData" :dataPath="dataPathMock" />
-
-						</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>
 				</v-card>
 			</v-col>
 		</v-row>
-
-
 	</div>
 </template>
 <script>
@@ -108,9 +104,6 @@ export default {
 			fromDt: new Date().getFullYear(),
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			dataPathMock: {
-				// "grid01": {}
-			},
 			// gridName: 'rowGrid',
 		};
 	},
@@ -168,12 +161,8 @@ export default {
 			defaultData: defaultData,
 		});
 	},
-	created() { },
+	created() {},
 	async mounted() {
-		// -------
-		this.initTest();
-		return;
-		// ========End test===========
 		await this.init();
 		this.initedFlag = true;
 	},
@@ -186,122 +175,6 @@ export default {
 			getBlocMstrList: 'modules/search/getBlocMstrList',
 			getAddInfoList: 'modules/search/getAddInfoList',
 		}),
-		...mapMutations({
-			setPageData: 'setPageData',
-		}),
-		initTest() {
-			let _this = this;
-			// _this.setPageData({ popupDialogFg: true });
-			
-			class MockCustumButton {
-				constructor(props) {
-					const { grid, rowKey, columnInfo } = props;
-					const value = columnInfo.renderer.options.value;
-					
-					const elDiv = document.createElement('div');
-					elDiv.innerHTML = `<span>${value}</span>`;
-					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
-					const el = document.createElement('button');
-					$(el).addClass('edit-btn blue--text');
-					el.innerText = 'Edit';
-
-					el.addEventListener('click', function (event) {
-						// console.log("------DEBUG----_this:", _this);
-						// _this.setPageData({ eqpmNm: selectedGridData[0]?.eqpmNm });
-						_this.setPageData({ popupDialogFg: true });
-					});
-
-					elDiv.appendChild(el);
-					this.elDiv = elDiv;
-				}
-
-				getElement() {
-					return this.elDiv;
-				}
-			}
-			const mockData = {
-				column: [
-					{ header: 'No', name: 'rowNum', align: 'center', width: 40 },
-					{ header: 'FAB', name: 'fab', align: 'left', width: 80 },
-					{ header: '설비 그룹', name: 'eqpmGrpNm', align: 'left', minWidth: 150 },
-					// {
-					// 	header: '설비명', name: 'eqpmNm', align: 'left', minWidth: 150,
-					// 	formatter: ({ value, row }) => {
-					// 		return `
-					// 				<div class="d-flex justify-space-between">
-					// 					<span>${value}</span>
-					// 					<button class="edit-btn blue--text" data-row='${JSON.stringify(row)}'>Edit</button
-					// 				</div>
-					// 			`;
-					// 	}
-					// },
-					{
-						header: '설비명',
-						name: 'eqpmNm',
-						width: 70,
-						align: 'left',
-						minWidth: 150,
-						renderer: {
-							type: MockCustumButton,
-							options: {
-								value: '계획수정',
-							},
-						},
-					},
-					{
-						header: '구분', name: 'gubun', align: 'left', width: 80,
-						formatter({ value }) {
-							let retVal = '';
-							if (value == '1RSLT') {
-								retVal = '전년실적';
-							} else if (value == '2PLAN') {
-								retVal = '계획';
-							} else {
-								retVal = value;
-							}
-							return retVal;
-						},
-					},
-
-					{ header: '1월', name: 'jan', align: 'right', width: 80 },
-					{ header: '2월', name: 'feb', align: 'right', width: 80 },
-					{ header: '3월', name: 'mar', align: 'right', width: 80 },
-					{ header: '4월', name: 'apr', align: 'right', width: 80 },
-					{ header: '5월', name: 'may', align: 'right', width: 80 },
-					{ header: '6월', name: 'jun', align: 'right', width: 80 },
-					{ header: '7월', name: 'jul', align: 'right', width: 80 },
-					{ header: '8월', name: 'aug', align: 'right', width: 80 },
-					{ header: '9월', name: 'sep', align: 'right', width: 80 },
-					{ header: '10월', name: 'oct', align: 'right', width: 80 },
-					{ header: '11월', name: 'nov', align: 'right', width: 80 },
-					{ header: '12월', name: 'dec', align: 'right', width: 80 }
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {
-					columnOptions: {
-						resizable: true,
-					},
-					header: {
-						height: 65,
-						complexColumns: [
-							{
-								header: '2025 년',
-								name: 'yyyyCol',
-								childNames: [
-									'jan', 'feb', 'mar', 'apr', 'may', 'jun',
-									'jul', 'aug', 'sep', 'oct', 'nov', 'dec'
-								],
-							},
-						],
-					}
-				}
-			};
-			this.dataPathMock[this.gridName] = mockData;
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
 		async init() {
 			await this.getFab();
 			await this.getEqpmKind();
@@ -418,55 +291,27 @@ export default {
 				},
 			};
 
-			class CustumButton {
+			class CustomButton {
 				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;
 
-					$(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%';
+					const gridData = grid.store.data.rawData;
+					const value = gridData[rowKey][columnInfo.name];
 
-					// 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 = '편집하다';
+					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 이벤트
-						this.el.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,7 +352,7 @@ export default {
 					header: 'NO',
 					name: 'rowNum',
 					width: 40,
-					align: 'center',
+					align: 'right',
 					// hidden: true,
 				},
 				{
@@ -537,20 +382,27 @@ 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>
-					`;
-					}
+					// formatter: ({ value, row }) => {
+					// 	return `
+					// 	<span>${value}</span>
+					// 	<button class="edit-btn" data-row='${JSON.stringify(row)}'>Edit</button>
+					// `;
+					// }
+					renderer: {
+						type: CustomButton,
+						options: {
+							value: '계획수정',
+						},
+					},
 				},
 				{
 					header: '',
 					name: 'btnCol',
 					width: 70,
 					align: 'center',
+					hidden: true,
 					renderer: {
-						type: CustumButton,
+						type: CustomButton,
 						options: {
 							value: '계획수정',
 						},
@@ -623,7 +475,7 @@ export default {
 			let selectedGridData = gridData.filter(item => {
 				return item.rowNum == data.rowNum;
 			});
-			await this.$nextTick(() => { });
+			await this.$nextTick(() => {});
 			this.setPageData({
 				rowGrid2SelectData: selectedGridData,
 			});
@@ -822,8 +674,8 @@ export default {
 										dataArr[i][qty] == ''
 											? null
 											: parseInt(dataArr[i][qty]) == 0
-												? 0
-												: dataArr[i][qty];
+											? 0
+											: dataArr[i][qty];
 									dataList.push(temp);
 								}
 							}
@@ -965,110 +817,18 @@ const defaultData = {
 		},
 	},
 };
-
-const dataPathDataExample = [
-	{
-		rowNum: 1,
-		fab: 'B01',
-		eqpmGrpNm: '방송기술운',
-		eqpmNm: 'U/T_LT_CH101',
-		gubun: '전력량',
-		jan: 110000,
-		feb: 112000,
-		mar: 115000,
-		apr: 117000,
-		may: 120000,
-		jun: 118000,
-		jul: 119000,
-		aug: 121000,
-		sep: 122000,
-		oct: 123000,
-		nov: 124000,
-		dec: 125000
-	},
-	{
-		rowNum: 2,
-		fab: 'B02',
-		eqpmGrpNm: '방송기술운',
-		eqpmNm: 'U/T_LT_CH102',
-		gubun: '전력량',
-		jan: 81000,
-		feb: 82000,
-		mar: 83000,
-		apr: 84000,
-		may: 85000,
-		jun: 86000,
-		jul: 87000,
-		aug: 88000,
-		sep: 89000,
-		oct: 90000,
-		nov: 91000,
-		dec: 92000
-	},
-	{
-		rowNum: 3, fab: 'C01', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH124', gubun: '수도량',
-		jan: 106178, feb: 104740, mar: 92283, apr: 116081, may: 98945, jun: 126579,
-		jul: 90690, aug: 124243, sep: 97524, oct: 84072, nov: 88160, dec: 118183
-	},
-	{
-		rowNum: 4, fab: 'B01', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH103', gubun: '가스량',
-		jan: 80442, feb: 102867, mar: 114939, apr: 106335, may: 81743, jun: 83711,
-		jul: 86114, aug: 97432, sep: 84146, oct: 84775, nov: 117921, dec: 119417
-	},
-	{
-		rowNum: 5, fab: 'B01', eqpmGrpNm: '설비운영팀', eqpmNm: 'U/T_LT_CH156', gubun: '전력량',
-		jan: 90341, feb: 94072, mar: 122754, apr: 85471, may: 90813, jun: 116831,
-		jul: 90856, aug: 109437, sep: 94029, oct: 96075, nov: 127067, dec: 102503
-	},
-	{
-		rowNum: 6, fab: 'B03', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH183', gubun: '가스량',
-		jan: 104163, feb: 107012, mar: 104631, apr: 83055, may: 106311, jun: 117306,
-		jul: 86434, aug: 117087, sep: 118414, oct: 91499, nov: 93829, dec: 94192
-	},
-	{
-		rowNum: 7, fab: 'C01', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH158', gubun: '가스량',
-		jan: 84821, feb: 128234, mar: 116883, apr: 116718, may: 114738, jun: 88297,
-		jul: 93840, aug: 84700, sep: 98360, oct: 87021, nov: 113098, dec: 94734
-	},
-	{
-		rowNum: 8, fab: 'B02', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH179', gubun: '가스량',
-		jan: 128714, feb: 88797, mar: 124808, apr: 109283, may: 113141, jun: 82873,
-		jul: 114993, aug: 129108, sep: 100885, oct: 125730, nov: 92127, dec: 122286
-	},
-	{
-		rowNum: 9, fab: 'C01', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH191', gubun: '전력량',
-		jan: 107258, feb: 108424, mar: 113604, apr: 116648, may: 124149, jun: 129978,
-		jul: 112215, aug: 129602, sep: 93551, oct: 111272, nov: 89736, dec: 128423
-	},
-	{
-		rowNum: 10, fab: 'B02', eqpmGrpNm: '방송기술운', eqpmNm: 'U/T_LT_CH104', gubun: '전력량',
-		jan: 82089, feb: 102793, mar: 96784, apr: 85238, may: 86153, jun: 123849,
-		jul: 115095, aug: 129484, sep: 102109, oct: 80976, nov: 119841, dec: 106309
-	},
-	{
-		rowNum: 11, fab: 'C02', eqpmGrpNm: '전력관리부', eqpmNm: 'U/T_LT_CH139', gubun: '전력량',
-		jan: 128592, feb: 95647, mar: 85982, apr: 126824, may: 87928, jun: 128967,
-		jul: 94637, aug: 107530, sep: 122533, oct: 97546, nov: 112110, dec: 126250
-	},
-	{
-		rowNum: 12, fab: 'C01', eqpmGrpNm: '설비운영팀', eqpmNm: 'U/T_LT_CH109', gubun: '전력량',
-		jan: 106530, feb: 91716, mar: 111104, apr: 102663, may: 108912, jun: 91464,
-		jul: 121245, aug: 90785, sep: 120586, oct: 105718, nov: 96191, dec: 111513
-	}
-];
-
 </script>
 <style lang="scss" scoped>
+// @import '@/assets/scss/common.scss';
 @import '@/assets/scss/var.scss';
-
 @each $theme in dark, light {
 	.v-application.#{$theme}-mode {
 		.tui-grid {
-
 			&-row-odd,
 			&-row-even {
-				&:hover>.colrowspan {
-					background-color: map-deep-get($config,
+				&:hover > .colrowspan {
+					background-color: map-deep-get(
+						$config,
 						#{$theme},
 						'tui-grid-cell-backgroundColor'
 					) !important;
@@ -1078,10 +838,10 @@ const dataPathDataExample = [
 					}
 				}
 			}
-
 			&-cell {
 				&.row-selected.colrowspan {
-					background-color: map-deep-get($config,
+					background-color: map-deep-get(
+						$config,
 						#{$theme},
 						'tui-grid-cell-backgroundColor'
 					) !important;