merge dev

assets/images/SwapRight.svg

@@ -1,3 +0,0 @@
-<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.4369 8.15117L10.1947 5.30742C10.1538 5.25551 10.1017 5.21353 10.0423 5.18464C9.98285 5.15575 9.91764 5.14071 9.85156 5.14062H8.96562C8.87402 5.14062 8.82344 5.2459 8.87949 5.31836L10.8523 7.82031H2.57812C2.51797 7.82031 2.46875 7.86953 2.46875 7.92969V8.75C2.46875 8.81016 2.51797 8.85938 2.57812 8.85938H12.0924C12.4588 8.85938 12.6625 8.43828 12.4369 8.15117Z" fill="black" fill-opacity="0.45"/>
-</svg>

assets/images/SwapRight_Dark.svg

@@ -1,3 +0,0 @@
-<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.4369 8.15117L10.1947 5.30742C10.1538 5.25551 10.1017 5.21353 10.0423 5.18464C9.98285 5.15575 9.91764 5.14071 9.85156 5.14062H8.96562C8.87402 5.14062 8.82344 5.2459 8.87949 5.31836L10.8523 7.82031H2.57812C2.51797 7.82031 2.46875 7.86953 2.46875 7.92969V8.75C2.46875 8.81016 2.51797 8.85938 2.57812 8.85938H12.0924C12.4588 8.85938 12.6625 8.43828 12.4369 8.15117Z" fill="white" fill-opacity="0.45"/>
-</svg>

assets/scss/common.scss

@@ -9,9 +9,6 @@
 @import "./common/card.scss";
 @import "./common/tabs.scss";
 @import "./common/numericInput.scss";
-@import "./common/pagination.scss";
-@import "./common/editor.scss";
-
 
 html,
 body {
@@ -269,7 +266,7 @@ a {
       }
 
       &>.v-treeview-node__root:hover:before {
-        opacity: 0 !important;
+        opacity: 1 !important;
       }
 
       .v-treeview-node__children {
@@ -283,17 +280,13 @@ a {
 
     .v-treeview-node--click[aria-expanded="true"] {
       &>.v-treeview-node__root:before {
-        opacity: 0 !important;
+        opacity: 1 !important;
       }
     }
 
     .v-treeview-node[aria-expanded="true"] {
-      &>.v-treeview-node__root>.v-treeview-node__content
+      &>.v-treeview-node__root>.v-treeview-node__content>.v-treeview-node__label>button>.v-icon.mdi-chevron-down {
-      >.v-treeview-node__label>button {
+        transform: rotate(-180deg);
-        >.anticon,
-        >.v-icon.mdi-chevron-down {
-          transform: rotate(-180deg);
-        }
       }
     }
 
@@ -305,17 +298,15 @@ a {
         // justify-content: center;
       }
 
-      & .anticon,
       & .v-icon.mdi-chevron-down {
         margin-left: auto;
-        animation-duration: 0.5s;
       }
     }
   }
 
   .v-treeview-node--active {
     &:before {
-      opacity: 0 !important;
+      opacity: 1 !important;
     }
   }
 
@@ -331,8 +322,7 @@ 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;
     }
 
@@ -444,11 +434,7 @@ a {
   .v-application.#{$theme}-mode {
     min-width: 1000px;
 
-    .icon-datepicker-color {
+    .head-logo{
-      color: map-deep-get($config, #{$theme}, "icon-datepicker-color");
-    }
-
-    .head-logo {
       gap: 8px;
     }
 
@@ -488,11 +474,7 @@ a {
 
     .header {
       background-color: map-deep-get($config, #{$theme}, "header-backgroud");
-      border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-header-border");
+      border-color: #D3D6EA;
-    }
-
-    .custom-chart{
-      border: 1px solid map-deep-get($config, #{$theme}, "v-chart-border");
     }
 
     .btn-header {
@@ -503,11 +485,9 @@ a {
 
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
-
       .menu-container {
-        height:calc(100vh - 60px);
+        max-height:calc(100vh - 60px);
         overflow-y: auto;
-        border-right: 1px solid map-deep-get($config, #{$theme}, "v-sidebar-border") ;
       }
     }
 
@@ -622,9 +602,45 @@ a {
       }
     }
 
+    // .v-banner {
+    //   &__wrapper {
+    //     border-bottom-color: map-deep-get($config,
+    //       #{$theme},
+    //       "v-banner-border-color"
+    //     ) !important;
+    //   }
+    // }
+
     .v-navigation-drawer__append {
       >p {
-        color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important;
+        @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;
+        }
       }
     }
 
@@ -674,115 +690,254 @@ a {
       }
 
       &>.v-treeview-node {
-        .v-treeview-node__root {
+        &>.v-treeview-node__root {
-          border-radius: 8px;
+          &:before {
-          &:hover {
+            background-color: map-deep-get($config,
-            background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" );
+              #{$theme},
+              "v-treeview-node-root-backgroundColor"
+            );
           }
-          .v-treeview-node__content {
+
+          &>.v-treeview-node__content {
             .v-treeview-node__label {
-              color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
+              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"
+              );
             }
           }
 
+          &: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"
+                );
+              }
+            }
+          }
         }
 
-        &[aria-expanded="true"]{
+        &>.v-treeview-node__children {
-
+          &>.v-treeview-node {
-          // Level 1
+            &>.v-treeview-node__root {
-          &>.v-treeview-node__root {
+              &:before {
-            background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg" );
+                background-color: map-deep-get($config,
-            border: 1px solid map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+                  #{$theme},
-            color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
+                  "v-treeview-node-subroot-backgroundColor"
-
+                );
-            &: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-border");
               }
 
-              .v-icon:first-child,
+              &>.v-treeview-node__content {
-              .v-icon:first-child::before {
+                .v-treeview-node__label {
-                color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+                  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"
+                  );
+                }
               }
             }
           }
+        }
 
-          &>.v-treeview-node__children {
+        &[aria-expanded="true"] {
-            // Level 2
+          & .v-treeview-node__root>.v-treeview-node__content {
-            .v-treeview-node__root {
+            .v-treeview-node__label {
-              color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color");
+              color: map-deep-get($config,
-              &:hover {
+                #{$theme},
-                background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-backgroundColor");
+                "v-treeview-node-root-label-active-color"
-              }
+              );
-            }
-            &>[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" );
-                      }
-                    }
-                  }
-
-                }
-              }
-
             }
 
+            .v-icon {
+              color: map-deep-get($config,
+                #{$theme},
+                "v-treeview-node-root-icon-active-color"
+              );
+            }
           }
         }
       }
@@ -795,24 +950,15 @@ a {
           "v-calendar-weekday-backgroundColor"
         );
         border-right: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
-        border-bottom: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
-        border-top: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         color: map-deep-get($config, #{$theme}, "v-calendar-weekday-color");
 
         &:nth-of-type(1) {
-          // color: map-deep-get($config,
+          color: map-deep-get($color, "week", "sun");
-          //   #{$theme},
-          //   "v-calendar-is-sun"
-          // );
-          border-left: 1px solid map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color");
         }
 
-        // &:nth-of-type(7) {
+        &:nth-of-type(7) {
-        //   color: map-deep-get($config,
+          color: map-deep-get($color, "week", "sat");
-        //     #{$theme},
+        }
-        //     "v-calendar-is-sat"
-        //   );
-        // }
       }
 
       >.vc-day {
@@ -821,33 +967,22 @@ a {
 
         .day-hldyNm,
         .day-label.is-holiday {
-          color: map-deep-get($config,
+          color: map-deep-get($color, "week", "sun");
-            #{$theme},
-            "v-calendar-is-sun"
-          );
         }
 
         &.weekday-1 {
 
           .day-label,
           .day-hldyNm {
-            color: map-deep-get($config,
+            color: map-deep-get($color, "week", "sun");
-              #{$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($config,
+            color: map-deep-get($color, "week", "sat");
-              #{$theme},
-              "v-calendar-is-sat"
-            );
           }
         }
 
@@ -871,7 +1006,7 @@ a {
           );
 
           .day-label {
-            color: map-deep-get($config, #{$theme}, "card-text-title-color");
+            color: map-deep-get($config, #{$theme}, "non-activate");
           }
         }
       }
@@ -954,7 +1089,6 @@ a {
         & th,
         & td {
           height: 48px;
-          color: map-deep-get($config, #{$theme}, "tui-datepicker-calendar-color");
         }
       }
 
@@ -1050,17 +1184,11 @@ a {
         }
 
         th.tui-sun {
-          color: map-deep-get($config,
+          color: map-deep-get($color, "week", "sun");
-            #{$theme},
-            "v-calendar-is-sun"
-          );
         }
 
         th.tui-sat {
-          color: map-deep-get($config,
+          color: map-deep-get($color, "week", "sat");
-            #{$theme},
-            "v-calendar-is-sat"
-          );
         }
       }
 
@@ -1076,17 +1204,11 @@ a {
         }
 
         td.tui-calendar-sun {
-          color: map-deep-get($config,
+          color: map-deep-get($color, "week", "sun");
-            #{$theme},
-            "v-calendar-is-sun"
-          );
         }
 
         td.tui-calendar-sat {
-          color: map-deep-get($config,
+          color: map-deep-get($color, "week", "sat");
-            #{$theme},
-            "v-calendar-is-sat"
-          );
         }
       }
     }
@@ -1128,47 +1250,26 @@ a {
     }
 
     .v-list {
-			background-color: map-deep-get($config,
+      background-color: map-deep-get($config,
-				#{$theme},
+        #{$theme},
-				"tui-datepicker-backgroundColor"
+        "tui-datepicker-backgroundColor"
-			);
+      );
-			border: 1px solid map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
+      border: 1px solid map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
-			border-radius: 4px;
+      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 {
@@ -1178,14 +1279,14 @@ a {
       }
     }
 
-    // .toastui-editor-contents {
+    .toastui-editor-contents {
-    //   * {
+      * {
-    //     color: map-deep-get($config,
+        color: map-deep-get($config,
-    //       #{$theme},
+          #{$theme},
-    //       "tui-editor-contents-color"
+          "tui-editor-contents-color"
-    //     ) !important;
+        ) !important;
-    //   }
+      }
-    // }
+    }
 
     .lnb-logo {
       color: map-deep-get($config, #{$theme}, "v-dialog-card-text-color");
@@ -1221,12 +1322,11 @@ a {
         color: #46c0ff;
       }
     }
-
     .v-btn {
       background-color: transparent !important;
       color: map-deep-get($config, #{$theme}, "btn-header-select-color") !important;
     }
-
+    
   }
 
   [hover-tooltip] {
@@ -1286,6 +1386,11 @@ a {
     }
   }
 
+
+
+
+
+
 }
 
 

assets/scss/common/button.scss

@@ -66,12 +66,6 @@
       }
     }
 
-    .custom-action-btn{
-      height: 24px;
-      width: 24px;
-      font-size: 12px;
-    }
-
     .v-btn {
       background-color: map-deep-get($config,
         #{$theme},
@@ -98,23 +92,24 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
-    .searchFilter {
+    .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");
@@ -126,8 +121,7 @@
         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{
-        &.ant-btn-background-ghost {
           color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         }
       }
@@ -137,12 +131,6 @@
         color:map-deep-get($config, #{$theme}, "ant-btn-default-color");
       }
 
-      &.ant-btn-popup-default {
-        background:map-deep-get($config, #{$theme}, "ant-btn-popup-bg");
-        color:map-deep-get($config, #{$theme}, "ant-btn-popup-color");
-        border: 1px solid map-deep-get($config, #{$theme}, "ant-btn-popup-border");
-      }
-
       &.ant-btn-danger {
         &.ant-btn-background-ghost {
           color:map-deep-get($config, #{$theme}, "ant-btn-danger-color");
@@ -154,7 +142,6 @@
       &.expand-btn {
         .v-icon {
           color: map-deep-get($config, #{$theme}, "basic-button-color");
-
           svg {
             fill: map-deep-get($config, #{$theme}, "basic-button-color");
           }
@@ -165,17 +152,15 @@
 }
 
 .v-application {
-  .ant-btn {
+  .ant-btn  {
     border-radius: 6px;
-
     &.ant-btn-lg {
       border-radius: 8px;
     }
-
     &.ant-btn-default {
-      border: none !important
+      border:none !important
     }
-
+    
   }
 }
 
@@ -186,16 +171,15 @@
     border: none;
     width: 16px;
     height: 16px;
-    background: none;
+    background:none;
   }
 }
-
+.ant-btn  {
-.ant-btn {
   &.expand-btn {
-    span {
+    .v-icon {
-      &.v-icon {
+      span {
         margin-right: 8px;
       }
     }
   }
-}
+}

assets/scss/common/editor.scss

@@ -1,474 +0,0 @@
-@charset "utf-8";
-.toastui-editor-dark .toastui-editor-defaultUI {
-  border-color: #424242;
-  color: #eee;
-}
-
-.toastui-editor-dark .toastui-editor-md-container,
-.toastui-editor-dark .toastui-editor-ww-container {
-  background-color: #212224;
-}
-
-.toastui-editor-dark .toastui-editor-defaultUI-toolbar {
-  background-color: #212224;
-  border-bottom-color: #303238;
-}
-
-.toastui-editor-dark .toastui-editor-toolbar-icons {
-  background-position-y: -49px;
-  border-color: #232428;
-}
-
-.toastui-editor-dark .toastui-editor-toolbar-icons:not(:disabled):hover {
-  background-color: #36383f;
-  border-color: #36383f;
-}
-
-.toastui-editor-dark .toastui-editor-toolbar-divider {
-  background-color: #303238;
-}
-
-.toastui-editor-dark .toastui-editor-tooltip {
-  background-color: #535662;
-}
-
-.toastui-editor-dark .toastui-editor-tooltip .arrow {
-  background-color: #535662;
-}
-
-.toastui-editor-dark .toastui-editor-defaultUI-toolbar .scroll-sync::before {
-  color: #8f939f;
-}
-
-.toastui-editor-dark .toastui-editor-defaultUI-toolbar .scroll-sync.active::before {
-  color: #67ccff;
-}
-
-.toastui-editor-dark .toastui-editor-defaultUI-toolbar .switch {
-  background-color: #2b4455;
-}
-
-.toastui-editor-dark .toastui-editor-defaultUI-toolbar input:checked + .switch {
-  background-color: #2b4455;
-}
-
-.toastui-editor-dark .toastui-editor-defaultUI-toolbar .switch::before {
-  background-color: #8f939f;
-}
-
-.toastui-editor-dark .toastui-editor-defaultUI-toolbar input:checked + .switch::before {
-  background-color: #67ccff;
-}
-
-.toastui-editor-dark .toastui-editor-main .toastui-editor-md-splitter {
-  background-color: #303238;
-}
-
-.toastui-editor-dark .toastui-editor-mode-switch {
-  border-top-color: #424242;
-  background-color: #212224;
-}
-
-.toastui-editor-dark .toastui-editor-mode-switch .tab-item {
-  border-color: #424242;
-  background-color: #212224;
-  color: #eee;
-}
-
-.toastui-editor-dark .toastui-editor-mode-switch .tab-item.active {
-  border-top-color: #424242;
-  background-color: #212224;
-  color: #1677FF;
-}
-
-.toastui-editor-dark .toastui-editor-popup,
-.toastui-editor-dark .toastui-editor-context-menu {
-  background-color: #121212;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
-  border-color: #494c56;
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-heading ul li:hover {
-  background-color: #36383f;
-}
-
-.toastui-editor-dark .toastui-editor-popup-body label {
-  color: #9a9da3;
-}
-
-.toastui-editor-dark .toastui-editor-popup-body input[type='text'] {
-  background-color: transparent;
-  color: #eee;
-  border-color: #303238;
-}
-
-.toastui-editor-dark .toastui-editor-popup-body input[type='text']:focus {
-  outline-color: #67ccff;
-}
-
-.toastui-editor-dark .toastui-editor-popup-body input[type='text'].disabled {
-  color: #969aa5;
-  border-color: #303238;
-  background-color: rgba(48, 50, 56, 0.4);
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-tabs .tab-item {
-  border-bottom-color: #292e37;
-  color: #eee;
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-tabs .tab-item:hover {
-  border-bottom-color: #3c424d;
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-tabs .tab-item.active {
-  color: #67ccff;
-  border-bottom-color: #67ccff;
-}
-
-.toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-name {
-  border-color: #303238;
-  color: #eee;
-}
-
-.toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-select-button {
-  border-color: #303238;
-  background-color: #232428;
-  color: #eee;
-}
-
-.toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-select-button:hover {
-  border-color: #494c56;
-}
-
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button {
-  color: #eee;
-  border-color: #303238;
-  background-color: #232428;
-}
-
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button:hover {
-  border-color: #494c56;
-}
-
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button {
-  color: #121212;
-  background-color: #67ccff;
-}
-
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button:hover {
-  color: #121212;
-  background-color: #32baff;
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell {
-  border-color: #303238;
-  background-color: #121212;
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell.header {
-  border-color: #303238;
-  background-color: #232428;
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-selection-layer {
-  border-color: rgba(103, 204, 255, 0.4);
-  background-color: rgba(103, 204, 255, 0.1);
-}
-
-.toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-description {
-  color: #eee
-}
-
-.toastui-editor-dark .toastui-editor-md-tab-container {
-  background-color: #232428;
-  border-bottom-color: #303238;
-}
-
-.toastui-editor-dark .toastui-editor-md-tab-container .tab-item {
-  border-color: #393b42;
-  background-color: #2d2f34;
-  color: #757a86;
-}
-
-.toastui-editor-dark .toastui-editor-md-tab-container .tab-item.active {
-  border-bottom-color: #121212;
-  background-color: #121212;
-  color: #eee;
-}
-
-
-.toastui-editor-dark .toastui-editor-context-menu .menu-group {
-  border-bottom-color: #303238;
-  color: #eee;
-}
-
-.toastui-editor-dark .toastui-editor-context-menu .menu-item span::before {
-  background-position-y: -126px;
-}
-
-.toastui-editor-dark .toastui-editor-context-menu li:not(.disabled):hover {
-  background-color: #36383f;
-}
-
-.toastui-editor-dark .toastui-editor-context-menu li.disabled {
-  color: #969aa5;
-}
-
-.toastui-editor-dark .toastui-editor-dropdown-toolbar {
-  border-color: #494c56;
-  background-color: #232428;
-}
-
-.toastui-editor-dark .ProseMirror,
-.toastui-editor-dark .toastui-editor-contents p,
-.toastui-editor-dark .toastui-editor-contents h1,
-.toastui-editor-dark .toastui-editor-contents h2,
-.toastui-editor-dark .toastui-editor-contents h3,
-.toastui-editor-dark .toastui-editor-contents h4,
-.toastui-editor-dark .toastui-editor-contents h5,
-.toastui-editor-dark .toastui-editor-contents h6 {
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-contents h1,
-.toastui-editor-dark .toastui-editor-contents h2 {
-  border-color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-contents del {
-  color: #777980;
-}
-
-.toastui-editor-dark .toastui-editor-contents blockquote {
-  border-color: #303135;
-}
-
-.toastui-editor-dark .toastui-editor-contents blockquote p,
-.toastui-editor-dark .toastui-editor-contents blockquote ul,
-.toastui-editor-dark .toastui-editor-contents blockquote ol {
-  color: #777980;
-}
-
-.toastui-editor-dark .toastui-editor-contents pre {
-  background-color: #232428;
-}
-
-.toastui-editor-dark .toastui-editor-contents pre code {
-  background-color: transparent;
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-contents code {
-  color: #c1798b;
-  background-color: #35262a;
-}
-
-.toastui-editor-dark .toastui-editor-contents div {
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-ww-code-block-language {
-  border-color: #303238;
-  background-color: #121212;
-}
-
-.toastui-editor-dark .toastui-editor-ww-code-block-language input {
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-contents .toastui-editor-ww-code-block:after {
-  background-color: #232428;
-  border: 1px solid #393b42;
-  color: #eee;
-  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjIuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IuugiOydtOyWtF8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiCgkgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMzAgMzAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMwIDMwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGwtcnVsZTpldmVub2RkO2NsaXAtcnVsZTpldmVub2RkO2ZpbGw6I2ZmZjt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPGc+CgkJCTxnPgoJCQkJPGc+CgkJCQkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTE1LjUsMTIuNWwyLDJMMTIsMjBoLTJ2LTJMMTUuNSwxMi41eiBNMTgsMTBsMiwybC0xLjUsMS41bC0yLTJMMTgsMTB6Ii8+CgkJCQk8L2c+CgkJCTwvZz4KCQk8L2c+Cgk8L2c+CjwvZz4KPC9zdmc+Cg==');
-}
-
-.toastui-editor-dark .toastui-editor-contents .toastui-editor-custom-block-editor {
-  background: #392d31;
-  color: #fff;
-  border-color: #327491;
-}
-
-.toastui-editor-dark .toastui-editor-custom-block.ProseMirror-selectednode .toastui-editor-custom-block-view {
-  color: #fff;
-  border-color: #327491;
-}
-
-.toastui-editor-dark .toastui-editor-custom-block-view button {
-  background-color: #232428;
-  border-color: #393b42;
-  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI1LjIuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IuugiOydtOyWtF8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiCgkgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMzAgMzAiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMwIDMwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+CjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+Cgkuc3Qwe2ZpbGwtcnVsZTpldmVub2RkO2NsaXAtcnVsZTpldmVub2RkO2ZpbGw6I2ZmZjt9Cjwvc3R5bGU+CjxnPgoJPGc+CgkJPGc+CgkJCTxnPgoJCQkJPGc+CgkJCQkJPHBhdGggY2xhc3M9InN0MCIgZD0iTTE1LjUsMTIuNWwyLDJMMTIsMjBoLTJ2LTJMMTUuNSwxMi41eiBNMTgsMTBsMiwybC0xLjUsMS41bC0yLTJMMTgsMTB6Ii8+CgkJCQk8L2c+CgkJCTwvZz4KCQk8L2c+Cgk8L2c+CjwvZz4KPC9zdmc+Cg==');
-}
-
-.toastui-editor-dark .toastui-editor-custom-block-view button:hover {
-  background-color: #232428;
-  border-color: #595c68;
-}
-
-.toastui-editor-dark .toastui-editor-custom-block-view .info {
-  color: #65acca;
-}
-
-.toastui-editor-dark .toastui-editor-contents table {
-  border-color: #303238;
-}
-
-.toastui-editor-dark .toastui-editor-contents table th,
-.toastui-editor-dark .toastui-editor-contents table td {
-  border-color: #303238;
-}
-
-.toastui-editor-dark .toastui-editor-contents table th {
-  background-color: #3a3c42;
-}
-
-.toastui-editor-dark .toastui-editor-contents table td,
-.toastui-editor-dark .toastui-editor-contents table td p {
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-contents td.toastui-editor-cell-selected {
-  background-color: rgba(103, 204, 255, 0.5);
-}
-
-.toastui-editor-dark .toastui-editor-contents th.toastui-editor-cell-selected {
-  background-color: rgba(103, 204, 255, 0.3);
-}
-
-.toastui-editor-dark table.ProseMirror-selectednode {
-  outline-color: #67ccff;
-}
-
-.toastui-editor-dark .html-block.ProseMirror-selectednode {
-  outline-color: #67ccff;
-}
-
-.toastui-editor-dark .toastui-editor-contents ul,
-.toastui-editor-dark .toastui-editor-contents menu,
-.toastui-editor-dark .toastui-editor-contents ol,
-.toastui-editor-dark .toastui-editor-contents dir {
-  color: #55575f;
-}
-
-.toastui-editor-dark .toastui-editor-contents ul > li::before {
-  background-color: #55575f;
-}
-
-.toastui-editor-dark .toastui-editor-contents hr {
-  border-color: #55575f;
-}
-
-.toastui-editor-dark .toastui-editor-contents a {
-  color: #4b96e6;
-}
-
-.toastui-editor-dark .toastui-editor-contents a:hover {
-  color: #1f70de;
-}
-
-.toastui-editor-dark .toastui-editor-contents .image-link:hover::before {
-  border-color: #393b42;
-  background-color: #232428;
-  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIgdmlld0JveD0iMCAwIDIwIDIwIj4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIj4KICAgICAgICA8ZyBzdHJva2U9IiNFRUUiIHN0cm9rZS13aWR0aD0iMS41Ij4KICAgICAgICAgICAgPGc+CiAgICAgICAgICAgICAgICA8Zz4KICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNNy42NjUgMTUuMDdsLTEuODE5LS4wMDJjLTEuNDg2IDAtMi42OTItMS4yMjgtMi42OTItMi43NDR2LS4xOTJjMC0xLjUxNSAxLjIwNi0yLjc0NCAyLjY5Mi0yLjc0NGgzLjg0NmMxLjQ4NyAwIDIuNjkyIDEuMjI5IDIuNjkyIDIuNzQ0di4xOTIiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDQ1IC0xNzQzKSB0cmFuc2xhdGUoMTA0MCAxNzM4KSB0cmFuc2xhdGUoNSA1KSBzY2FsZSgxIC0xKSByb3RhdGUoNDUgMzcuMjkzIDApIi8+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTEyLjMyNiA0LjkzNGwxLjgyMi4wMDJjMS40ODcgMCAyLjY5MyAxLjIyOCAyLjY5MyAyLjc0NHYuMTkyYzAgMS41MTUtMS4yMDYgMi43NDQtMi42OTMgMi43NDRoLTMuODQ1Yy0xLjQ4NyAwLTIuNjkyLTEuMjI5LTIuNjkyLTIuNzQ0VjcuNjgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDQ1IC0xNzQzKSB0cmFuc2xhdGUoMTA0MCAxNzM4KSB0cmFuc2xhdGUoNSA1KSBzY2FsZSgxIC0xKSByb3RhdGUoNDUgMzAuOTk2IDApIi8+CiAgICAgICAgICAgICAgICA8L2c+CiAgICAgICAgICAgIDwvZz4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPgo=');
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
-}
-
-.toastui-editor-dark .toastui-editor-contents .task-list-item::before {
-  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgc3Ryb2tlPSIjNTU1NzVGIj4KICAgICAgICAgICAgPGc+CiAgICAgICAgICAgICAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTAzMCAtMzE2KSB0cmFuc2xhdGUoNzg4IDE5MikgdHJhbnNsYXRlKDI0MiAxMjQpIj4KICAgICAgICAgICAgICAgICAgICA8cmVjdCB3aWR0aD0iMTciIGhlaWdodD0iMTciIHg9Ii41IiB5PSIuNSIgcng9IjIiLz4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+Cg==');
-  background-color: transparent;
-}
-
-.toastui-editor-dark .toastui-editor-contents .task-list-item.checked::before {
-  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij4KICAgIDxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgZmlsbD0iIzRCOTZFNiI+CiAgICAgICAgICAgIDxnPgogICAgICAgICAgICAgICAgPGc+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTE2IDBjMS4xMDUgMCAyIC44OTUgMiAydjE0YzAgMS4xMDUtLjg5NSAyLTIgMkgyYy0xLjEwNSAwLTItLjg5NS0yLTJWMkMwIC44OTUuODk1IDAgMiAwaDE0em0tMS43OTMgNS4yOTNjLS4zOS0uMzktMS4wMjQtLjM5LTEuNDE0IDBMNy41IDEwLjU4NSA1LjIwNyA4LjI5M2wtLjA5NC0uMDgzYy0uMzkyLS4zMDUtLjk2LS4yNzgtMS4zMi4wODMtLjM5LjM5LS4zOSAxLjAyNCAwIDEuNDE0bDMgMyAuMDk0LjA4M2MuMzkyLjMwNS45Ni4yNzggMS4zMi0uMDgzbDYtNiAuMDgzLS4wOTRjLjMwNS0uMzkyLjI3OC0uOTYtLjA4My0xLjMyeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEwNTAgLTI5NikgdHJhbnNsYXRlKDc4OCAxOTIpIHRyYW5zbGF0ZSgyNjIgMTA0KSIvPgogICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4K');
-}
-
-.toastui-editor-dark .toastui-editor-md-delimiter,
-.toastui-editor-dark .toastui-editor-md-code.toastui-editor-md-delimiter,
-.toastui-editor-dark .toastui-editor-md-thematic-break,
-.toastui-editor-dark .toastui-editor-md-link,
-.toastui-editor-dark .toastui-editor-md-table,
-.toastui-editor-dark .toastui-editor-md-block-quote {
-  color: #55575f;
-}
-
-.toastui-editor-dark .toastui-editor-md-meta,
-.toastui-editor-dark .toastui-editor-md-html {
-  color: #55575f;
-}
-
-.toastui-editor-dark .toastui-editor-md-link.toastui-editor-md-link-url.toastui-editor-md-marked-text {
-  color: #777980;
-}
-
-.toastui-editor-dark .toastui-editor-md-block-quote .toastui-editor-md-marked-text,
-.toastui-editor-dark .toastui-editor-md-list-item .toastui-editor-md-meta {
-  color: #b3b5bc;
-}
-
-.toastui-editor-dark .toastui-editor-md-link.toastui-editor-md-link-desc.toastui-editor-md-marked-text,
-.toastui-editor-dark .toastui-editor-md-list-item-style.toastui-editor-md-list-item-odd {
-  color: #4b96e6;
-}
-
-.toastui-editor-dark .toastui-editor-md-list-item-style.toastui-editor-md-list-item-even {
-  color: #ef6767;
-}
-
-.toastui-editor-dark .toastui-editor-md-table .toastui-editor-md-table-cell {
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-md-code.toastui-editor-md-marked-text {
-  color: #c1798b;
-}
-
-.toastui-editor-dark .toastui-editor-md-code {
-  background-color: #35262a;
-}
-
-.toastui-editor-dark .toastui-editor-md-code-block-line-background {
-  background-color: #232428;
-}
-
-.toastui-editor-dark .toastui-editor-md-code-block .toastui-editor-md-meta {
-  color: #aaa;
-}
-
-.toastui-editor-dark .toastui-editor-md-custom-block {
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-md-custom-block-line-background {
-  background-color: #392d31;
-}
-
-.toastui-editor-dark .toastui-editor-md-custom-block .toastui-editor-md-delimiter {
-  color: #327491;
-}
-
-.toastui-editor-dark .toastui-editor-md-custom-block .toastui-editor-md-meta {
-  color: #65acca;
-}
-
-.toastui-editor-dark .toastui-editor-contents .toastui-editor-md-preview-highlight::after {
-  background-color: rgba(255, 250, 193, 0.5);
-}
-
-.toastui-editor-dark .toastui-editor-contents th.toastui-editor-md-preview-highlight,
-.toastui-editor-dark .toastui-editor-contents td.toastui-editor-md-preview-highlight {
-  background-color: rgba(255, 250, 193, 0.5);
-}
-
-.toastui-editor-dark .toastui-editor-contents th.toastui-editor-md-preview-highlight {
-  color: #fff;
-}
-
-.toastui-editor-dark .toastui-editor-contents th.toastui-editor-md-preview-highlight,
-.toastui-editor-dark .toastui-editor-contents td.toastui-editor-md-preview-highlight {
-  background-color: rgba(255, 250, 193, 0.25);
-}
-
-.toastui-editor-dark .toastui-editor-contents .toastui-editor-md-preview-highlight::after {
-  background-color: rgba(255, 250, 193, 0.25);
-}

assets/scss/common/grid.scss

@@ -17,6 +17,18 @@
     border: 0 !important;
   }
 
+  // &-body-container {
+  //   width: 100% !important;
+  // }
+
+  // &-table {
+  //   width: 100% !important;
+  // }
+
+  // &-lside-area .tui-grid-body-area {
+  //   margin-right: -11px;
+  // }
+
   &-lside-area .tui-grid-scrollbar-left-bottom {
     display: none;
   }
@@ -56,12 +68,6 @@
     font-weight: 400;
   }
 
-  
-  th[data-column-name="_checked"] {
-    padding-left: 0;
-  }
-
-
 }
 
 .tui-grid-table{
@@ -69,13 +75,6 @@
   .tui-grid-cell-has-input .tui-grid-cell-content {
     padding: 8px;
   }
-
-  th[data-column-name="_checked"] {
-    &.tui-grid-cell-header  {
-      padding-left: 0;
-    }
-    
-  }
 }
 
 .treeGrid {
@@ -99,12 +98,6 @@
   @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;
@@ -116,15 +109,6 @@
       );
     }
     
-    .grid-toggle-section{
-      .tui-grid-rside-area{
-        .tui-grid-body-area {
-          height: auto !important;
-
-        }
-      }
-    }
-
     .tui-grid {
       &-table {
         border: 1px solid;
@@ -150,29 +134,46 @@
       }
 
       &-body-container{
-        border-right: 0;
+        border-right: 1px solid;
-        // position: relative;
+        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;
-            // table-layout: fixed;
-            // th, td {
-            //   &:last-child{
-            //     width: auto !important;
-            //   }
-            // }
-          }
-        }
       }
 
-      &-summary-area,
+      &-container,
-      &-container {
+      &-summary-area {
         font-family: Inter;
+        // color: #000000E0;
  
+        & ::-webkit-scrollbar {
+          width: $scrollbar-width !important;
+          height: $scrollbar-width !important;
+          -webkit-appearance: initial;
+          background-color: map-deep-get($config,
+            #{$theme},
+            "scrollbar-track"
+          ) !important;
+          border-radius: 3px !important;
+        }
+
+        & ::-webkit-scrollbar-track {
+          background-color: map-deep-get($config,
+            #{$theme},
+            "scrollbar-track"
+          ) !important;
+        }
+
+        & ::-webkit-scrollbar-thumb {
+          width: 50px !important;
+          height: 50px !important;
+          background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
+          border-radius: 3px;
+        }
+
         .tui-grid-cell {
+
           &.tui-grid-cell-summary {
             color: map-deep-get($config,
               #{$theme},
@@ -182,32 +183,6 @@
         }
       }
 
-      &-body-area {
-        overflow: auto;
-
-        &::-webkit-scrollbar {
-          width: $scrollbar-width !important;
-          height: $scrollbar-width !important;
-          -webkit-appearance: initial;
-          background-color: rgba(0, 0, 0, 0) !important;
-          border-radius: 3px !important;
-          // border-right: 1px solid;
-          // border-right-color: map-deep-get($config, #{$theme}, "tui-grid-cell-borderColor");
-        }
-
-        &::-webkit-scrollbar-track {
-          background-color: rgba(0, 0, 0, 0) !important;
-        }
-
-        &::-webkit-scrollbar-thumb {
-          height: 50px !important;
-          background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
-          border-radius: 3px;
-          // width: 50px !important;
-          // background-color: rgba(0, 0, 0, 0);
-        }
-      }
-
       &-rside-area {
         background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
       }
@@ -220,7 +195,6 @@
       &-scrollbar-right-top {
         background-color: rgba(0, 0, 0, 0);
         border: none;
-        display: none;
         // background-color: map-deep-get(
         //   $config,
         //   #{$theme},
@@ -246,14 +220,13 @@
       &-scrollbar-right-bottom {
         width: $scrollbar-width !important;
         height: $scrollbar-width !important;
-        border-color: map-deep-get($config, #{$theme}, "cardBackground");
-        background-color: map-deep-get($config, #{$theme}, "cardBackground");
-        box-sizing: border-box;
         // display: none !important;
+        border-color: map-deep-get($config, #{$theme}, "scrollbar-track");
+        background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
         // border: none !important;
         // bottom: -1px;
         // right: -2px;
-        // display: none;
+        box-sizing: border-box;
       }
 
       &-scrollbar-frozen-border,
@@ -263,9 +236,13 @@
         border-color: transparent !important;
       }
 
-      &-body-area,
+      // &-body-area {
+      //   overflow: auto !important;
+      // }
+
       &-container,
       &-layer-state,
+      &-body-area,
       &-summary-area,
       &-cell {
         background-color: map-deep-get($config,
@@ -277,36 +254,23 @@
           "tui-grid-border-vertical-color"
         );
 
-        // &-current-row{
+        &-current-row{
-        // }
+          td {
-        td.row-selected {
+            .custom-radio {
-          .custom-radio {
+              .radio-mark{
-            background-color: map-deep-get($config,
+                border-color: #1677ff;
-              #{$theme},
+                background-color: #fff;
-              "ant-btn-primary-color"
+                &::after {
-            );
+                  content: "";
-            .radio-mark{
+                  position: absolute;
-              border-color: map-deep-get($config,
+                  top: 50%;
-                #{$theme},
+                  left: 50%;
-                "arow-line-color"
+                  transform: translate(-50%, -50%);
-              );
+                  height: 11px;
-              background-color: map-deep-get($config,
+                  width: 11px;
-                #{$theme},
+                  border-radius: 50%;
-                "arow-line-btn-bg-color"
+                  background-color: #1677ff;
-              );
+                }
-              &::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"
-                );
               }
             }
           }
@@ -321,13 +285,13 @@
             #{$theme},
             "tui-grid-cell-borderColor"
           );
-          // .tui-grid-cell-content {
+          .tui-grid-cell-content {
-          //   border-right: 1px solid ;
+            border-right: 1px solid ;
-          //   border-right-color: map-deep-get($config,
+            border-right-color: map-deep-get($config,
-          //     #{$theme},
+              #{$theme},
-          //     "tui-grid-cell-borderColor"
+              "tui-grid-cell-borderColor"
-          //   );
+            );
-          // }
+          }
         }
       }
 
@@ -338,8 +302,8 @@
       &-header-area,
       &-cell-header {
         // font-family: inherit;
-        // font-style: Semi Bold;
         font-weight: 600;
+        font-style: Semi Bold;
         background-color: map-deep-get($config,
           #{$theme},
           "tui-grid-header-backgroundColor"
@@ -356,17 +320,8 @@
       }
 
       &-header-area {
-        // background-color: none;
+        background-color: none;
         border: none;
-        margin-right: 0 !important;
-        background-color: map-deep-get($config,
-          #{$theme},
-          "tui-grid-cell-backgroundColor"
-        );
-        // width: 100% !important;
-        // .tui-grid-table {
-        //   width: 100% !important;
-        // }
       }
 
       &-row-odd,
@@ -496,7 +451,6 @@
       }
 
       &-tree-button-expand {
-        z-index: 9999;
         .tui-grid-btn-tree {
           i {
             width: 16px;
@@ -515,7 +469,6 @@
       }
 
       &-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;
   }
@@ -50,7 +50,6 @@
   }
 }
 
-
 .v-input__custom {
   .v-input__slot {
 
@@ -150,11 +149,6 @@
 .v-input {
   margin-top: 0 !important;
   padding-top: 0 !important;
-  &.v-text-field--outlined {
-    fieldset {
-      top: -4px
-    }
-  }
 }
 
 .v-input__append-inner {
@@ -177,27 +171,25 @@
   align-items: center;
   cursor: pointer;
   position: relative;
-  padding-left: 0;
+  padding-left: 28px;
-  margin: 5px;
+  margin: 10px;
   font-size: 16px;
 }
-
 .custom-radio input[type="radio"] {
   position: absolute;
   opacity: 0;
   cursor: pointer;
 }
-
 /* Custom radio appearance */
 .radio-mark {
   position: absolute;
-  left: -8px;
+  left: 0;
   top: 50%;
   transform: translateY(-50%);
-  height: 14px;
+  height: 18px;
-  width: 14px;
+  width: 18px;
-  // background-color: white;
+  background-color: white;
-  border: 1px solid #ccc;
+  border: 2px solid #ccc;
   border-radius: 50%;
   transition: all 0.2s ease;
 }
@@ -230,43 +222,11 @@
   color: #424242 !important;
 }
 
-.ant-checkbox {
-  .ant-checkbox-inner {
-    border-radius: 4px
-  }
-}
-
-input[type="checkbox"] {
-  width: 16px;
-  height: 16px
-}
-
 @each $theme in dark, light {
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
 
-    .ant-checkbox-wrapper {
-      .ant-checkbox {
-        .ant-checkbox-inner {
-          background-color: map-deep-get($config, #{$theme}, "ant-checkbox-bg"); // background for unchecked checkbox
-          border-color: map-deep-get($config, #{$theme}, "ant-checkbox-border");
-        }
-      }
-
-      .ant-checkbox-checked {
-        .ant-checkbox-inner {
-          background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg"); // background for checked checkbox
-          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;
@@ -279,18 +239,17 @@ input[type="checkbox"] {
     }
 
     .v-textarea {
-      .v-input__slot {
+      .v-input__slot{
         border: map-deep-get($config,
-          #{$theme},
+            #{$theme},
-          "v-input-textarea-border"
+            "v-input-textarea-border"
-        );
+          );
-
         fieldset {
           background-color: map-deep-get($config,
             #{$theme},
             "v-input-textarea-bg"
           );
-
+          
         }
       }
     }
@@ -304,6 +263,9 @@ input[type="checkbox"] {
         "v-input-backgroundColor"
       );
 
+
+      
+
       &:not(.v-input--radio-group, .v-input--checkbox) {
         .v-input__slot {
           background-color: map-deep-get($config,
@@ -410,24 +372,6 @@ input[type="checkbox"] {
         }
       }
     }
-
-    .radio-mark {
-      background-color: map-deep-get($config,
-        #{$theme},
-        "ant-btn-primary-color"
-      );
-      border-color: map-deep-get($config,
-        #{$theme},
-        "v-input-textarea-border"
-      );
-    }
-
-    input[type="checkbox"] {
-      accent-color: map-deep-get($config,
-        #{$theme},
-        "ant-btn-primary-bg"
-      );
-    }
   }
 
   .v-radio {
@@ -452,12 +396,6 @@ input[type="checkbox"] {
 
   .v-input--checkbox {
     .v-icon {
-      transform: none;
-
-      &.mdi:before {
-        font-size: 20px;
-      }
-
       @if $theme ==dark {
         color: rgba(255, 255, 255, 0.6);
       }
@@ -468,9 +406,6 @@ input[type="checkbox"] {
     }
   }
 
-
-
-
   .v-textarea {
     textarea {
       padding: 10px;

assets/scss/common/pagination.scss

@@ -1,43 +0,0 @@
-@each $theme in dark, light {
-
-  // @include theme($theme);
-  .v-application.#{$theme}-mode {
-
-    .ant-pagination-item,
-    .ant-pagination-prev,
-    .ant-pagination-next {
-      // border: none !important;
-      // box-shadow: none !important;
-      background-color: map-deep-get($config, #{$theme}, "paging-background") !important;
-      color: map-deep-get($config, #{$theme}, "paging-text") !important;
-      border: none;
-
-      .ant-pagination-item-link {
-        border: none;
-        background-color: map-deep-get($config, #{$theme}, "paging-background") !important;
-      }
-    }
-
-    .ant-pagination-item-active {
-      border: 1px solid #1890ff !important;
-      color: #1890ff !important
-    }
-
-    .ant-pagination-options-size-changer {
-      .ant-select-selection {
-        border: 0.5px solid map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important;
-        background: map-deep-get($config, #{$theme}, "paging-background") !important;
-        color: map-deep-get($config, #{$theme}, "paging-text") !important;
-      }
-
-      .ant-select-arrow {
-        color: map-deep-get($config, #{$theme}, "paging-text") !important;
-      }
-
-      .ant-select-selection__rendered {
-        margin-right: 30px;
-      }
-    }
-
-  }
-}

assets/scss/datepicker.scss

@@ -14,22 +14,11 @@
       position: relative;
       border-radius: 6px;
       border: solid 1px;
-      height: 32px;
+      height: 40px;
-      color: map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important;
+      // border-color: #424242;
-      border-color: currentColor;
+      border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
-      // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
 
-      &:hover {
-				border-color: map-deep-get($config, #{$theme}, "v-input-fieldset-hover-color" ) !important;
-			}
-			&:has(.v-input--is-focused){
-				border-width: 2px;
-			}
 
-      &.datepicker-large {
-        height: 40px;
-      }
-    
       .v-input {
 
         // ----------------------
@@ -66,10 +55,6 @@
           }
         }
       }
-      
-      .v-icon {
-        color: map-deep-get($config, #{$theme}, "v-icon-chevron-down") !important;
-      }
     }
 
     .v-input__custom {

assets/scss/var.scss

@@ -32,8 +32,8 @@ $color: (
   "black": ("0": #000,
     "1": #111),
   "white": ("0": #fff),
-  "week": ("sun": #FF4D4F,
+  "week": ("sun": #fb5a83,
-    "sat": #597EF7)
+    "sat": #2d8cf6)
 );
 
 $config: (
@@ -96,25 +96,23 @@ $config: (
     v-input-disabled-backgroundColor:rgba(255, 255, 255, 0.08),
     v-input-disabled-color: rgba(255, 255, 255, 0.5),
     v-select-label-color: rgba(255, 255, 255, 0.85),
-    v-calendar-weekday-backgroundColor: #FFFFFF0A,
+    v-calendar-weekday-backgroundColor: #383f5d,
-    v-calendar-weekday-color: #FFFFFFD9,
+    v-calendar-weekday-color: #fff,
-    v-calendar-weekday-border-color: #FFFFFF0F,
+    v-calendar-weekday-border-color: rgba(255, 255, 255, 0.1),
-    v-calendar-day-color: #FFFFFFD9,
+    v-calendar-day-color: #fff,
-    v-calendar-day-in-not-month-color: #FFFFFF14,
+    v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
-    v-calendar-is-today-background-color: #0A224F,
+    v-calendar-is-today-background-color: #2d4571,
-    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: #FFFFFF0F,
+    tui-grid-border-vertical-color: #212224,
     tui-grid-cell-backgroundColor: #212224,
-    tui-grid-cell-color: #FFFFFFD9,
+    tui-grid-cell-color: #fff,
-    tui-grid-cell-insert-color: #2B2111,
+    tui-grid-cell-insert-color: #13636c,
     tui-grid-cell-selected-color: #0A224F,
     tui-grid-cell-modify-color: #13636c,
-    tui-grid-cell-removed-color: #2A1215,
+    tui-grid-cell-removed-color: #f6637b,
     tui-grid-cell-disabled-color: rgb(170, 170, 170),
     tui-grid-cell-hover-backgroundColor: #2d4571,
     v-tabs-items-border-color: #FFFFFF0F,
@@ -174,17 +172,6 @@ $config: (
     btn-header-select-bg: #1F1F1F,
     btn-header-select-color:#FFFFFFD9,
     subtitle-tab: #FFFFFFA6,
-    v-header-border: #424242,
-    v-chart-border: #424242,
-    v-sidebar-border: #303030,
-    ant-checkbox-bg: #212224,
-    ant-checkbox-border: #424242,
-    ant-btn-popup-bg: #212224,
-    ant-btn-popup-color: #FFFFFFD9,
-    ant-btn-popup-border: #424242,
-    paging-background: #212224,
-    paging-text: #FFFFFFD9,
-    icon-datepicker-color: #FFFFFF73,
   ),
   light: (w-g5: $--color-gray_555,
     g5-w: $--color-white,
@@ -220,6 +207,7 @@ $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,
@@ -246,14 +234,12 @@ $config: (
     v-input-disabled-backgroundColor: rgba(0, 0, 0, 0.04),
     v-input-disabled-color: rgba(0, 0, 0, 0.25),
     v-select-label-color: rgba(0, 0, 0, 0.88),
-    v-calendar-weekday-backgroundColor: #00000005,
+    v-calendar-weekday-backgroundColor: #e0e0e0,
-    v-calendar-weekday-color: #000000E0,
+    v-calendar-weekday-color: #111,
-    v-calendar-weekday-border-color: #0000000F,
+    v-calendar-weekday-border-color: #d4d4d4,
-    v-calendar-day-color: #000000E0,
+    v-calendar-day-color: #111,
-    v-calendar-day-in-not-month-color: #0000000A,
+    v-calendar-day-in-not-month-color: #f8f8f8,
-    v-calendar-is-today-background-color: #E6F4FF,
+    v-calendar-is-today-background-color: #e3eaf3,
-    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),
@@ -261,10 +247,10 @@ $config: (
     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: #FFFBE6,
+    tui-grid-cell-insert-color: #13636c,
     tui-grid-cell-selected-color: #E6F4FF,
     tui-grid-cell-modify-color: #e6f5f7,
-    tui-grid-cell-removed-color: #FFF1F0,
+    tui-grid-cell-removed-color: #fddde1,
     tui-grid-cell-hover-backgroundColor: #f5f5f5,
     v-tabs-items-border-color: #0000000F,
     v-tabs-backgroundColor: #ddd,
@@ -322,16 +308,5 @@ $config: (
     btn-header-select-color:#1F1F1F,
     btn-header-select-bg:#FFFFFF,
     subtitle-tab: #000000A6,
-    v-header-border: #D9D9D9,
-    v-chart-border: #D9D9D9,
-    v-sidebar-border: #F0F0F0,
-    ant-checkbox-bg: #FFFFFF,
-    ant-checkbox-border: #D9D9D9,
-    ant-btn-popup-bg: #FFFFFF,
-    ant-btn-popup-color: #000000E0,
-    ant-btn-popup-border: #D9D9D9,
-    paging-background: #FFFFFF,
-    paging-text: #000000E0,
-    icon-datepicker-color: #00000073,
   ),
 );

components/common/Calendar.vue

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

components/common/Chart.vue

@@ -61,8 +61,7 @@ export default {
 			isDarkMode: 'isDarkMode',
 			chartOption(state) {
 				var dark_Col = [
-					'#79B100',
+					'#01AE6A',
-					// '#01AE6A',
 					'#FFB046',
 					'#F6637B',
 					'#944FE9',
@@ -195,8 +194,7 @@ export default {
 				var lightCol_dashReadplcStatus = ['#3cc380', '#ffb13b', '#f98694'];
 
 				var light_Col = [
-					'#3BAD43',
+					'#3CC380',
-					// '#3CC380',
 					'#FFB13B',
 					'#F98694',
 					'#CF74E5',

components/common/CheckBox.vue

@@ -1,16 +1,27 @@
 <template>
   <v-row class="search-box" align="center" no-gutters>
-    <v-col v-if="label" :cols="labelCols" >
+    <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 : ''">
-      <a-checkbox v-model="chkValue" :disabled="disabledFlag" :readonly="readonly || false"
-        :required="required || false" @change="modifyValue">
-      </a-checkbox>
 
+      <v-checkbox
+				v-model="chkValue"
+				:disabled="disabledFlag"
+				:readonly="readonly || false"
+				:required="required || false"
+				:false-value="false"
+				:color="isDarkMode ? '#fff' : '#1890ff'"
+				@change="modifyValue"
+			></v-checkbox>
     </v-col>
   </v-row>
 </template>
@@ -57,10 +68,10 @@ export default {
       default: 7,
     },
     iconShow: {
-      type: Boolean,
+			type: Boolean,
-      require: false,
+			require: false,
-      default: true
+			default: true
-    },
+		},
   },
   data() {
     return {
@@ -92,8 +103,7 @@ export default {
   methods: {
     ...mapMutations({ setPageData: "setPageData" }),
     modifyValue(e) {
-      const isChecked = e.target.checked;
+      return this.setPageData({ [this.valueNm]: e });
-      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', customClass]"  >
+			<div class="datepicker-container" >
 				<v-text-field
 					id="startpicker"
 					ref="startpicker"
@@ -19,18 +19,15 @@
 					readonly
 					outlined
 				>
-					<!-- <template #append >
+					<template #append >
 						<v-icon size="20" v-show="!isRange">$icoCalendar</v-icon>
-					</template> -->
-					<template v-slot:append>
-						<a-icon v-show="!isRange" class="v-icon" type="calendar" style="width: 14px; height: 14px;" />
 					</template>
 					<template #append-outer>
 						<div ref="startpicker-container" id="startpicker-container"></div>
 					</template>
 				</v-text-field>
 				<div v-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
-					<img :src="arrowIcon">
+					<img :src="arrowIcon" alt="">
 				</div>
 				<v-text-field
 					v-show="isRange"
@@ -43,9 +40,7 @@
 					outlined
 				>
 					<template #append>
-						<div class="pr-1">
+						<v-icon size="20">$icoCalendar</v-icon>
-							<a-icon class="v-icon" type="calendar" style="width: 14px; height: 14px;" />
-						</div>
 					</template>
 					<template #append-outer>
 						<div ref="endpicker-container" id="endpicker-container"></div>
@@ -98,12 +93,7 @@ export default {
 			type:Boolean,
 			require:false,
 			default: true
-		},
+		}
-		customClass: {
-			type: String,
-			require: false,
-		},
-
 	},
 	data() {
 		return {
@@ -214,9 +204,9 @@ export default {
 		},
 		arrowIcon() {
 			if(this.isDarkMode){
-				return require('@/assets/images/SwapRight_Dark.svg');
+				return require('@/assets/images/arrow_datepicker_dm.png');
 			}
-			return require('@/assets/images/SwapRight.svg');
+			return require('@/assets/images/arrow_datepicker.png');
 		}
 	},
 	watch: {
@@ -431,7 +421,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-// @import "@/assets/scss/datepicker.scss";
+@import "@/assets/scss/datepicker.scss";
 
 ::v-deep {
 	.tui-timepicker-row {

components/common/DatepickerTimeSelectBox.vue

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

components/common/DatepickerTopView.vue

@@ -5,7 +5,10 @@
 				<!-- <v-icon x-small :color="required ? '#fb8200' : 'primary'" class="mr-1"
 					>mdi-record-circle</v-icon
 				> -->
-				<v-icon small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">
+				<v-icon
+					small
+					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+					>
 					$icoBulletPoint
 				</v-icon>
 				{{ label }}
@@ -13,11 +16,17 @@
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
 			<div class="datepicker-container">
-				<v-text-field id="startpicker" ref="startpicker" v-model="fromDtValue"
+				<v-text-field
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
+					id="startpicker"
-					outlined>
+					ref="startpicker"
-					<template v-slot:append>
+					v-model="fromDtValue"
-						<a-icon v-show="!isRange" class="v-icon" type="calendar" style="width: 14px; height: 14px;" />
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
+					:hide-details="true"
+					readonly
+					outlined
+				>
+					<template #append >
+						<v-icon size="20" v-show="!isRange">$icoCalendar</v-icon>
 					</template>
 					<template #append-outer>
 						<div ref="startpicker-container" id="startpicker-container"></div>
@@ -27,13 +36,18 @@
 				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">
 					<img :src="arrowIcon" alt="">
 				</div>
-				<v-text-field v-show="isRange" id="endpicker" ref="endpicker" v-model="toDtValue"
+				<v-text-field
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
+					v-show="isRange"
-					outlined>
+					id="endpicker"
+					ref="endpicker"
+					v-model="toDtValue"
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
+					:hide-details="true"
+					readonly
+					outlined
+				>
 					<template #append>
-						<div class="pr-1">
+						<v-icon size="20">$icoCalendar</v-icon>
-							<a-icon class="v-icon" type="calendar" style="width: 14px; height: 14px;" />
-						</div>
 					</template>
 					<template #append-outer>
 						<div ref="endpicker-container" id="endpicker-container"></div>
@@ -77,9 +91,9 @@ export default {
 			require: false,
 			default: false,
 		},
-		isRangeOption: {
+		isRangeOption:{
-			type: Boolean,
+			type:Boolean,
-			require: false,
+			require:false,
 			default: true
 		}
 	},
@@ -163,23 +177,21 @@ export default {
 				this.myOptions.viewFormat,
 			);
 		},
-		toDtChange() {
+		toDtChange(){
 			return {
-				isCheck: this.searchParam.isCheck,
+				isCheck:this.searchParam.isCheck ,
-				toDt: Utility.setFormatDate(
+				toDt : Utility.setFormatDate(
-					this.searchParam.toDt,
+				this.searchParam.toDt,
-					this.myOptions.viewFormat,
+				this.myOptions.viewFormat,
-				)
+			)};
-			};
 		},
-		fromDtChange() {
+		fromDtChange(){
 			return {
-				isCheck: this.searchParam.isCheck,
+				isCheck:this.searchParam.isCheck ,
-				fromDt: Utility.setFormatDate(
+				fromDt : Utility.setFormatDate(
 					this.searchParam.fromDt,
 					this.myOptions.viewFormat,
-				)
+			)};
-			};
 		},
 		defaultRange() {
 			return this.searchParam.defaultRange
@@ -193,10 +205,10 @@ export default {
 			);
 		},
 		arrowIcon() {
-			if (this.isDarkMode) {
+			if(this.isDarkMode){
-				return require('@/assets/images/SwapRight_Dark.svg');
+				return require('@/assets/images/arrow_datepicker_dm.png');
 			}
-			return require('@/assets/images/SwapRight.svg');
+			return require('@/assets/images/arrow_datepicker.png');
 		}
 	},
 	watch: {
@@ -230,24 +242,24 @@ export default {
 				this.endDatepickerInstance.setDate(new Date(newVal));
 			}
 		},
-		fromDtChange: {
+		fromDtChange:{
-			deep: true,
+			deep:true,
-			handler() {
+			handler(){
-				if (this.fromDtChange.isCheck) {
+				if(this.fromDtChange.isCheck){
 					this.fromDtChanged(this.fromDtChange.fromDt);
 					this.setPageData({
-						isCheck: false
+						isCheck : false
 					})
 				}
 			}
 		},
-		toDtChange: {
+		toDtChange:{
-			deep: true,
+			deep:true,
-			handler() {
+			handler(){
-				if (this.toDtChange.isCheck) {
+				if(this.toDtChange.isCheck){
 					this.toDtChanged(this.toDtChange.toDt);
 					this.setPageData({
-						isCheck: false
+						isCheck : false
 					})
 				}
 			}
@@ -358,7 +370,7 @@ export default {
 			if (
 				(myRange > rangeGap && compareDt.isAfter(defaultDt)) ||
 				defaultDt.format(this.myOptions.sendFormat) ===
-				compareDt.format(this.myOptions.sendFormat)
+					compareDt.format(this.myOptions.sendFormat)
 			) {
 				// if(this.cmCycleFlag){
 				this.setPageData({ isFind: true });
@@ -388,7 +400,7 @@ export default {
 			if (
 				(myRange > rangeGap && defaultDt.isAfter(compareDt)) ||
 				defaultDt.format(this.myOptions.sendFormat) ===
-				compareDt.format(this.myOptions.sendFormat)
+					compareDt.format(this.myOptions.sendFormat)
 			) {
 				this.setPageData({ isFind: true });
 			} else {
@@ -412,7 +424,6 @@ export default {
 		display: flex;
 		justify-content: space-around;
 		background-color: #edf4fc;
-
 		.tui-timepicker-column.tui-timepicker-colon {
 			color: #000 !important;
 		}

components/common/Grid.vue

@@ -4,12 +4,12 @@
 		:data="chkGridData"
 		:columns="chkGridColumns"
 		:options="chkGridOptions"
+		@focusChange="focusChangeEvt"
 		@click="startEditing"
 		@editingFinish="editingFinish"
 		@dblclick="dblClick"
 		@mouseover="mouseoverEvent"
 		@mouseout="mouseoutEvent"
-		@focusChange="focusChangeEvt"
 	/>
 </template>
 <script>
@@ -107,13 +107,16 @@ export default {
 		},
 		chkGridOptions() {
 			const options = {
+				// bodyHeight: 'fitToContent',
+				scrollX: false,
+				scrollY: false,
 				...this.gridData.option,
+				useIcon: false,
 			};
 			options.treeColumnOptions = {
 				useIcon: false,
 				...options.treeColumnOptions,
 			};
-
 			return options;
 		},
 		defaultRow() {
@@ -158,17 +161,17 @@ export default {
 			}, 500);
 		},
 	},
-	created() { },
+	created() {},
 	async mounted() {
-		// console.log(this.dataPath);
+		// console.log('--------------DEBUG----gridData: ', this.gridData);
 		if (this.gridName) {
 			this.gridInstance = this.$refs['tuigrid' + this.gridName];
 
 			this.scrollBody = document
 				.getElementsByClassName('tui-grid-rside-area')
-			[
+				[
-				document.getElementsByClassName('tui-grid-rside-area').length - 1
+					document.getElementsByClassName('tui-grid-rside-area').length - 1
-			].getElementsByClassName('tui-grid-body-area')[0];
+				].getElementsByClassName('tui-grid-body-area')[0];
 
 			this.scrollBody.addEventListener('scroll', e => {
 				this.gridScrollTop = e.target.scrollTop;
@@ -183,13 +186,13 @@ export default {
 		}),
 		// true : 현재 행 혹은 연결된 그리드가 수정중인 상태
 		checkGridState() {
-			const rowStatList = ['I', 'U', 'D'];
+			var rowStatList = ['I', 'U', 'D'];
-			const row = this.gridInstance.invoke('getFocusedCell');
+			var row = this.gridInstance.invoke('getFocusedCell');
 
 			if (row) {
-				const rowData = this.gridInstance.invoke('getRow', row.rowKey);
+				var rowData = this.gridInstance.invoke('getRow', row.rowKey);
 				if (rowData) {
-					const rowStat = rowData['rowStat'];
+					var rowStat = rowData['rowStat'];
 					if (rowStatList.includes(rowStat)) {
 						return true;
 					}
@@ -197,8 +200,8 @@ export default {
 			}
 
 			if (this.preventFocusChangeEventTargetGridList) {
-				for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
+				for (var gridInstance of this.preventFocusChangeEventTargetGridList) {
-					const dataArr = gridInstance.save();
+					var dataArr = gridInstance.save();
 
 					if (dataArr.length > 0) {
 						return true;
@@ -275,7 +278,7 @@ export default {
 			}
 			// console.log('focusChangeEvt2...')
 			// cell 선택시 row 선택 method
-			if (e.rowKey > -1) {
+			if (e.rowKey >= 0) {
 				this.$emit(
 					'getRowsData',
 					this.gridInstance.invoke('getRow', e.rowKey),
@@ -290,6 +293,7 @@ export default {
 		startEditing(e) {
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
+				// console.log('prevent startEditing')
 				return;
 			}
 
@@ -301,6 +305,7 @@ export default {
 			// console.log('startEditing2...')
 			if (this.editorGrid && e.rowKey >= 0) {
 				this.editorStartKey = e.rowKey;
+				// console.log("E::", this.gridInstance.invoke("getRow", e.rowKey));
 				this.gridInstance.invoke('startEditing', e.rowKey, e.columnName);
 				this.$emit(
 					'getRowsData',
@@ -344,14 +349,14 @@ export default {
 					'row-removed',
 				);
 			}
-
+			
 			await this.gridInstance.invoke(
 				e.rowEditingFg != undefined ? 'setValue' : this.editorGrid ? 'finishEditing' : 'setValue',
 				rowIdxKey,
 				columnName,
 				value,
 			);
-
+			
 
 			if (isBaseRow) {
 				const isSameData = await this.compareData(editingData);
@@ -606,67 +611,68 @@ export default {
 			list.map(item => this.gridInstance.invoke('check', item));
 		},
 		refreshLayout() {
-			setTimeout(() => {
+			this.gridInstance.invoke('refreshLayout');
-				this.gridInstance.invoke('refreshLayout');
-			}, 150);
-			// this.gridInstance.invoke('refreshLayout');
 		},
-		refreshGrid() {
+		refreshGrid(){
 			// console.log("refreshLayout",this.$refs['tuigrid' + this.gridName])
-			var store = this.$refs['tuigrid' + this.gridName].gridInstance.store;
+      var store = this.$refs['tuigrid' + this.gridName].gridInstance.store;
-			var containerEl = this.$refs['tuigrid' + this.gridName].$el;
+      var containerEl = this.$refs['tuigrid' + this.gridName].$el;
-			// var containerEl = document.querySelector('.tui-grid-container')
+      // var containerEl = document.querySelector('.tui-grid-container')
-			var parentEl = containerEl.parentElement;
+      var parentEl = containerEl.parentElement;
-
+      
-			// console.log("---------DEBUG---containerEl: ",containerEl);
+      
-			// console.log('---------DEBUG---parentEl: ', parentEl)
+      
-			// 	function refreshLayout(store, containerEl, parentEl) {
+      // console.log("containerEl : ",containerEl);
-			var dimension = store.dimension;
+      // console.log('parentEl : ', parentEl)
-			var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight;
+		// 	function refreshLayout(store, containerEl, parentEl) {
-			var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft;
+        var dimension = store.dimension;
-			var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left;
+        var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight;
-			this.setOffsetTop(store, top + scrollTop);
+        var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft;
-			// store.dimension.setOffsetTop = top + scrollTop;
+        var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left;
-			this.setOffsetLeft(store, left + scrollLeft);
+        this.setOffsetTop(store, top + scrollTop);
-			// store.dimension.headerHeight = left + scrollLeft;
+        // store.dimension.setOffsetTop = top + scrollTop;
-			this.setWidth(store, clientWidth, autoWidth);
+        this.setOffsetLeft(store, left + scrollLeft);
-			// store.dimension.autoWidth = autoWidth;
+        // store.dimension.headerHeight = left + scrollLeft;
-			// store.dimension.width = clientWidth;
+        this.setWidth(store, clientWidth, autoWidth);
-			// console.log("###",getComputedStyle(parentEl));
+        // store.dimension.autoWidth = autoWidth;
-			// console.log("fitToParentHeight : ",fitToParentHeight);
+        // store.dimension.width = clientWidth;
-			// console.log("parentEl : ",parentEl)
+        // console.log("###",getComputedStyle(parentEl));
-			// console.log("parentEl.clientHeight" , parentEl.clientHeight)
+          // console.log("fitToParentHeight : ",fitToParentHeight);
-			// console.log("clientHeight : ",clientHeight);
+          // console.log("parentEl : ",parentEl)
-			if (parentEl && parentEl.clientHeight !== clientHeight) {
+          // console.log("parentEl.clientHeight" , parentEl.clientHeight)
-				var _b = getComputedStyle(parentEl), paddingTop = _b.paddingTop, paddingBottom = _b.paddingBottom;
+          // console.log("clientHeight : ",clientHeight);
-				this.setHeight(store, parentEl.clientHeight - (parseFloat(paddingTop) + parseFloat(paddingBottom)));
+        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("---------DEBUG---setOffsetTop: ");
-			store.dimension.offsetTop = offsetTop;
-		},
-		setWidth(_a, width, autoWidth) {
-			// console.log("---------DEBUG---setWidth: ");
-			var dimension = _a.dimension;
-			dimension.autoWidth = autoWidth;
-			dimension.width = width;
-		},
-		setHeaderHeight(store, height) {
-			// console.log("---------DEBUG---setHeaderHeight: ");
-			store.dimension.headerHeight = height;
-		},
-		setOffsetLeft(store, offsetLeft) {
-			// console.log("---------DEBUG---setOffsetLeft: ");
-			store.dimension.offsetLeft = offsetLeft;
-		},
-		setHeight(_a, height) {
-			// console.log("---------DEBUG---setHeight: ");
-			var dimension = _a.dimension;
-			var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;
-			dimension.bodyHeight = height - headerHeight - summaryHeight - tableBorderWidth;
 		},
+    setOffsetTop(store, offsetTop) {
+      // console.log("setOffsetTop");
+      store.dimension.offsetTop = offsetTop;
+    },
+    setWidth(_a, width, autoWidth) {
+      // console.log("setWidth");
+      var dimension = _a.dimension;
+      dimension.autoWidth = autoWidth;
+      dimension.width = width;
+    },
+    setHeaderHeight(store, height) {
+      // console.log("setHeaderHeight")
+      store.dimension.headerHeight = height;
+    },
+    setOffsetLeft(store, offsetLeft) {
+      // console.log("setOffsetLeft")
+      store.dimension.offsetLeft = offsetLeft;
+    },
+		setHeight(_a,height){
+			return; // setting auto height
+			
+      // console.log("setHeight");
+      var dimension = _a.dimension;
+      var headerHeight = dimension.headerHeight, summaryHeight = dimension.summaryHeight, tableBorderWidth = dimension.tableBorderWidth;
+      dimension.bodyHeight = height - headerHeight - summaryHeight - tableBorderWidth;
+    },
 		sendSelectedRowData(eventRowKey) {
 			if (this.selectedRowDataWatchFlag) {
 				var rowKey =
@@ -693,13 +699,17 @@ 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/Pagination.vue

@@ -1,93 +0,0 @@
-
-<template>
-  <div class="custom-pagination">
-    <a-pagination
-      :current="pageNum"
-      :total="totalCount"
-      :page-size="itemsPerPage"
-      :show-size-changer="useLimit"
-      :page-size-options="itemsPerPageArray.map(String)"
-      @change="handlePageChange"
-      @showSizeChange="changePageLeng"
-    />
-  </div>
-</template>
-
-<script>
-export default {
-	props: {
-		useLimit: {
-			type: Boolean,
-			default: true,
-		},
-		totalCount: {
-			type: Number,
-			default: 0,
-		},
-		pageNum: {
-			type: Number,
-			default: 0,
-		},
-		limit: {
-			type: Number,
-			default: 0,
-		},
-		itemsPerPageArray: {
-			type: Array,
-			default: () => [20, 50, 100],
-		},
-	},
-	data() {
-		return {
-			moveToPage: '',
-		};
-	},
-	computed: {
-		page: function() {
-			return this.numberOfPages + '-' + this.lastPage;
-		},
-		lastPage: function() {
-			//grid data가 없을 경우 1 리턴
-			if (this.totalCount == 0) return 1;
-
-			let pageLength = Math.floor(this.totalCount / this.itemsPerPage);
-			if (this.totalCount % this.itemsPerPage > 0) {
-				pageLength++;
-			}
-			return pageLength;
-		},
-		itemsPerPage: function() {
-			return this.limit;
-		},
-		numberOfPages: function() {
-			return Number(this.pageNum);
-		},
-		plusPage: function() {
-			return Number(this.pageNum) + 1;
-		},
-		minusPage: function() {
-			return Number(this.pageNum) - 1;
-		},
-	},
-	watch: {
-		totalCount: function(newData) {
-			return (this.moveToPage = newData > 0 ? this.moveToPage : '');
-		},
-		moveToPage: function() {
-			return (this.moveToPage = this.moveToPage.replaceAll(/[^0-9]/g, ''));
-		},
-	},
-	methods: {	
-		handlePageChange(newPage) {
-		// Emit an event to the parent to load data for the selected page
-		this.$emit('loadData', newPage, this.itemsPerPage);
-		},
-		changePageLeng: function(current, newLimit) {
-			//부모 컴포넌트에서 loadData(데이터 조회) 구현
-			//this.$emit('loadData', this.pageNum, limit);
-			// limit 변경 시 1 페이지로 초기화
-			this.$emit('loadData', 1, newLimit);
-		},
-	},
-};
-</script>

components/common/PastRsltDatePicker.vue

@@ -2,34 +2,41 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols">
 			<label for="" class="search-box-label">
-				<v-icon small color="primary"
+				<v-icon x-small color="primary" class="mr-1">mdi-record-circle</v-icon>
-					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div :class="['datepicker-container', customClass]">
+			<div class="datepicker-container">
-				<v-text-field id="startpicker" ref="startpicker" v-model="fromDtValue"
+				<v-text-field
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
+					id="startpicker"
-					outlined>
+					ref="startpicker"
+					v-model="fromDtValue"
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
+					:hide-details="true"
+					readonly
+					outlined
+				>
 					<template #append>
-						<a-icon class="v-icon" v-show="!isRange" type="calendar" style="width: 14px; height: 14px;" />
+						<v-icon size="20">$icoCalendar</v-icon>
-						<!-- <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-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
+				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div>
-					<img :src="arrowIcon" alt="">
+				<v-text-field
-				</div>
+					v-show="isRange"
-				<v-text-field v-show="isRange" id="endpicker" ref="endpicker" v-model="toDtValue"
+					id="endpicker"
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
+					ref="endpicker"
-					outlined>
+					v-model="toDtValue"
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
+					:hide-details="true"
+					readonly
+					outlined
+				>
 					<template #append>
-						<div class="pr-1">
+						<v-icon size="20">$icoCalendar</v-icon>
-							<a-icon class="v-icon" type="calendar" style="width: 14px; height: 14px;" />
-						</div>
 					</template>
 					<template #append-outer>
 						<div ref="endpicker-container" id="endpicker-container"></div>
@@ -68,10 +75,6 @@ export default {
 			require: false,
 			default: 8,
 		},
-		customClass: {
-			type: String,
-			require: false,
-		},
 	},
 	data() {
 		return {
@@ -87,7 +90,6 @@ export default {
 			searchParam(state) {
 				return state.pageData[this.parentPrgmId];
 			},
-			isDarkMode: "isDarkMode",
 		}),
 		myCmCycle() {
 			return this.searchParam.cmCycle;
@@ -127,12 +129,6 @@ export default {
 				this.defaultRange === 'no limite'
 			);
 		},
-		arrowIcon() {
-			if (this.isDarkMode) {
-				return require('@/assets/images/SwapRight_Dark.svg');
-			}
-			return require('@/assets/images/SwapRight.svg');
-		}
 	},
 	watch: {
 		myCmCycle() {
@@ -270,7 +266,7 @@ export default {
 			if (
 				(myRange > rangeGap && compareDt.isAfter(defaultDt)) ||
 				defaultDt.format(this.myOptions.sendFormat) ===
-				compareDt.format(this.myOptions.sendFormat)
+					compareDt.format(this.myOptions.sendFormat)
 			) {
 				// if(this.cmCycleFlag){
 				this.setPageData({ isFind: true });
@@ -300,7 +296,7 @@ export default {
 			if (
 				(myRange > rangeGap && defaultDt.isAfter(compareDt)) ||
 				defaultDt.format(this.myOptions.sendFormat) ===
-				compareDt.format(this.myOptions.sendFormat)
+					compareDt.format(this.myOptions.sendFormat)
 			) {
 				this.setPageData({ isFind: true });
 			} else {
@@ -324,7 +320,6 @@ export default {
 		display: flex;
 		justify-content: space-around;
 		background-color: #edf4fc;
-
 		.tui-timepicker-column.tui-timepicker-colon {
 			color: #000 !important;
 		}

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.mode)
-			// console.log(this.$vuetify.theme.isDark)
+			console.log(this.$vuetify.theme.isDark)
 		},
 	},
 };

components/common/button/ActionButtons.vue

@@ -1,10 +1,21 @@
 <template>
-	<div class="d-flex justify-center align-center" 
+	<div class="d-flex flex-column justify-center align-center">
-		:class="directionBtn === 'vertically'?'flex-row':'flex-column'" 
+		<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')">
-		style="gap: 12px">
+			<v-icon>mdi-chevron-right</v-icon>
-		<a-button   @click="directionBtn === 'vertically' ? btnActionsFnc('removeRightToLeft') : btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="directionBtn === 'vertically'? icons.remove :icons.add " class="custom-action-btn">
+		</v-btn> -->
+		<a-button @click="btnActionsFnc('addLeftToRight')" type="primary" ghost icon="right" >
 		</a-button>
-		<a-button @click="directionBtn === 'vertically' ? btnActionsFnc('removeRightToLeft') :btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="directionBtn === 'vertically'? icons.add :icons.remove" class="custom-action-btn">
+
+		<!--<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" @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost icon="left">
 		</a-button>
 	</div>
 </template>
@@ -27,18 +38,8 @@ 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: "default", // small, default, large
+			default: "default", // small, middle, large
 		}
 	},
 	data() {

components/common/button/BtnSearch.vue

@@ -10,7 +10,7 @@ export default {
 		size: {
 			type: String,
 			require: false,
-			default: "default", // small, default, large
+			default: "middle", // small, middle, large
 		}
 	},
 	methods: {

components/common/chartoptions/GaugeChart.js

@@ -2,13 +2,15 @@
 export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) {
     const colorRanges = isDarkMode
         ? [
-            [60 / 160, '#49AA19'], // Dark Green
+            [0.375, '#49AA19'], // Dark Green
-            [100 / 160, '#D89614'], // Dark Orange
+            // [0.5, '#B8860B'],   // Dark Yellow
+            [0.625, '#D89614'], // Dark Orange
             [1, '#D32029'],     // Dark Red
         ]
         : [
-            [60 / 160, '#52C41A'], // Light Green
+            [0.375, '#52C41A'], // Light Green
-            [100 / 160, '#FAAD14'], // Light Orange
+            // [0.5, '#FFD700'],   // Light Yellow
+            [0.625, '#FAAD14'], // Light Orange
             [1, '#F5222D'],     // Light Red
         ];
     // Old color range
@@ -54,7 +56,6 @@ export default function getGaugeChartOption({ title, min = 0, max = 160, unit =
                 endAngle: -45,
                 min: min,
                 max: max,
-                splitNumber: 8,
                 // progress: {
                 //   show: true,
                 //   width: 15,

components/common/chartoptions/LineChart.js

@@ -15,8 +15,7 @@ export default function getLineChartOption({
     const styledSeries = seriesData.map((item, index) => {
         const color = item.color || defaultColors[index % defaultColors.length];
         return {
-            ...item,    
+            ...item,
-            showSymbol: true,       // Show symbol at each data point
             itemStyle: {
                 color,
             },
@@ -28,19 +27,17 @@ export default function getLineChartOption({
             left: '3%',
             right: '5%',
             top: '25%',
-            bottom: '0%',
             containLabel: true,
         },
+
         legend: {
             // data: legendData,
             icon: 'circle',
-            itemWidth: 15, // Width of the legend icon
-            itemHeight: 15, 
             top: '0%',
             right: '5%',
             orient: 'horizontal',
             textStyle: {
-                color: isDarkMode ? 'white' : '#676A7B',
+                color: isDarkMode ? '#676A7B' : '#676A7B',
             },
         },
         xAxis: {
@@ -72,7 +69,6 @@ export default function getLineChartOption({
             },
             splitLine: {
                 lineStyle: {
-                    type: 'dashed', // Options: 'solid', 'dashed', 'dotted'
                     color: isDarkMode ? '#444444' : '#EEEEEE',
                 },
             },

components/common/chartoptions/SankeyChart.js

@@ -1,46 +0,0 @@
-// Sankey chart options
-export function getSankeyChartOption({ isDarkMode = false, data = [], links = [] }) {
-  const chartOption = {
-    backgroundColor: '#FFFFFF',
-    series: [
-      {
-        data,
-        links,
-
-        layoutIterations: 0,
-        type: 'sankey',
-        left: 25.0,
-        top: 20.0,
-        right: 120,
-        bottom: 50.0,
-        nodeGap: 10,
-        nodeAlign: 'left',
-        lineStyle: {
-          color: 'source',
-          curveness: 0.5,
-        },
-        // nodeWidth:10,
-        // triggerEvent: true,
-        itemStyle: {
-          //color: '#1f77b4',
-          //borderColor: '#1f77b4'
-        },
-        label: {
-          color: isDarkMode
-            ? '#FFFFFFD9'
-            : '#000000E0',
-          // fontFamily: 'Arial',
-          fontSize: 14,
-        },
-      },
-    ],
-    tooltip: {
-      trigger: 'item',
-    },
-  };
-
-  return chartOption;
-}
-
-export default getSankeyChartOption;
-

components/common/form/CheckBox.vue

@@ -12,26 +12,15 @@
 			</label>
 		</v-col>
 		<v-col :cols="item.label ? 7 : ''" >
-			<!-- <v-checkbox
+			<v-checkbox
 				v-model="chkValue"
 				:disabled="disabledFlag"
 				:readonly="item.readonly || false"
 				:required="item.required || false"
 				:false-value="false"
-				:color="isDarkMode ? '#1668DC' : '#1890ff'"
+				:color="isDarkMode ? '#fff' : '#1890ff'"
-				@change="modifyValue"			
+				@change="modifyValue"
-  				class="small-checkbox"
+			></v-checkbox>
-			></v-checkbox> -->
-			<a-checkbox
-        		v-model="chkValue"
-				:disabled="disabledFlag"
-				:readonly="item.readonly || false"
-				:required="item.required || false"
-				:false-value="false"
-				:color="isDarkMode ? '#1668DC' : '#1890ff'"
-				@change="modifyValue"	
-			>
-			</a-checkbox>
 		</v-col>
 	</v-row>
 </template>
@@ -152,7 +141,7 @@ export default {
 		modifyValue(e) {
 			const dt = {
 				columnName: this.item.valueNm,
-				value: e.target.checked,
+				value: e,
 			};
 			this.$emit('gridEditingFinish', dt);
 		},

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,9 +17,7 @@
 				: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

@@ -3,13 +3,12 @@
 		<v-col v-if="item.label" :cols="item.labelCols !== undefined ? item.labelCols : item.cols == 12 ? 2 : 4">
 			<label for="" class="search-box-label">
 				<v-icon
-					v-if="item.iconShow"
+					x-small
-					small
+					:color="item.required ? '#fb8200' : 'primary'"
-					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
+					class="mr-1"
-					>$icoBulletPoint</v-icon
+					>mdi-record-circle</v-icon
 				>
 				{{ item.label }}
-				<span v-if="item.essential">*</span>
 			</label>
 			<!-- <label for="" class="search-box-label ft-size_14 ft-clr_g-c">
         {{ item.label }}
@@ -40,12 +39,13 @@
 			</template>
 		</v-col>
 
-		<v-dialog v-model="dialog" scrollable width="504px">
+		<v-dialog v-model="dialog" scrollable width="540px">
 			<v-card style="height: 100%">
-				<v-card-title class="px-4">
+				<v-card-title>
-					<span class="custom-title-4" style="padding-left: 1px;">비밀번호 {{ isPassword }}</span>
+					<span class="custom-title-4">비밀번호 {{ isPassword }}</span>
 				</v-card-title>
-				<v-card-text class="pb-4 px-3">
+				<v-divider></v-divider>
+				<v-card-text>
 					<v-col>
 						<label for="" class="search-box-label">
 							{{ isPassword }}할 비밀번호를 입력하세요
@@ -73,11 +73,12 @@
 						></v-text-field>
 					</v-col>
 				</v-card-text>
-				<v-card-actions class="pb-4">
+				<v-divider></v-divider>
+				<v-card-actions>
 					<v-spacer></v-spacer>
 					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
-					<div class="d-flex" style="gap: 8px">
+					<div>
-						 <a-button @click="close()" class="ant-btn-popup-default">닫기</a-button>
+						 <a-button @click="close()" class="btn-default">삭제</a-button>
 						 <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
 							 확인
 						 </a-button>

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.isMulti', this.searchParam.isMulti);
-				// console.log(
+				console.log(
-				// 	'this.searchParam.snarInfoList',
+					'this.searchParam.snarInfoList',
-				// 	this.searchParam.snarInfoList,
+					this.searchParam.snarInfoList,
-				// );
+				);
-				// console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
+				console.log('this.searchParam.snarInfo', this.searchParam.snarInfo);
 				if (Array.isArray(snarData)) {
 					if (snarData.length > 0) {
 						for (const item of snarData) {

components/common/modal/DrSnarExecPop.vue

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

components/common/modal/EgrpPysclQtyPop.vue

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

components/common/modal/ElecPowChrgPop.vue

@@ -17,24 +17,20 @@
 				{{ item.label }}
 			</label>
 		</v-col>
-		<v-col :cols="label ? item.textCols : ''" class="py-0">
+		<v-col :cols="label ? item.textCols : ''">
 			<!-- <v-col :cols="label ? 9 : ''"> -->
 			<!-- :value="textfield" -->
 			<v-text-field
 				readonly
 				v-model="selectValue"
+				append-icon="mdi-magnify"
 				class="v-input__custom"
 				@click="dialog = !dialog"
 				outlined
 				:hide-details="true"
 				:disabled="item.disabled || false"
 				:required="item.required || false"
-			>
+			></v-text-field>
-			<template v-slot:append>
-				<!-- Custom SVG icon -->
-				<v-icon>$icoSearch</v-icon>
-			</template>
-			</v-text-field>
 		</v-col>
 
 		<!-- <v-row justify="center"> -->
@@ -62,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 : ''" class="pr-3" >
+						<v-col :cols="label ? 3 : ''">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="parentPrgmId"
@@ -70,66 +66,41 @@
 								dataKey="searchElecContKind"
 								:sendParam="{ commGrpCd: 'EM_CONT', useFg: '1' }"
 								:addAll="true"
-								:customClass="'select-large'"
 							/>
 						</v-col>
-						<v-col :cols="label ? 3 : ''" class="pr-3" >
+						<v-col :cols="label ? 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 : ''" class="pr-3" >
+						<v-col :cols="label ? 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">
-							<div style="height: 25px"></div>
+							<v-btn
-							<!-- <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>
@@ -339,11 +310,7 @@ export default {
 		},
 		// 공정/설비 트리 그리드 세팅
 		gridInit() {
-			const myOptions = {
+			const myOptions = {};
-				header: {
-					height: 38,
-				},
-			};
 			this.setModalGridOption({
 				modalKey: this.myModalKey,
 				gridKey: this.gridName,
@@ -639,11 +606,11 @@ const myColumns = [
 	{ header: '전력계약 ID', name: 'eleclContId', hidden: true},
 	{ header: '전력계약 명', name: 'eleclContNm', hidden: true},
 	{ header: '전력계약구분CD', name: 'elecContKind', hidden: true},
-	{ header: '전력계약구분', name: 'elecContKindNm', align: 'left'},
+	{ header: '전력계약구분', name: 'elecContKindNm', align: 'center'},
 	{ header: '전압구분CD', name: 'voltKind', hidden: true },
-	{ header: '전압구분', name: 'voltKindNm', align: 'left' },
+	{ header: '전압구분', name: 'voltKindNm', align: 'center' },
 	{ header: '옵션CD', name: 'optKind', hidden: true },
-	{ header: '옵션', name: 'optKindNm', align: 'left' },
+	{ header: '옵션', name: 'optKindNm', align: 'center' },
 	{
 		header: '기본요금(원/kW)',
 		name: 'baseChrg',
@@ -653,7 +620,7 @@ const myColumns = [
 		},
 	},
 	{ header: '시간대CD', name: 'peakKind', hidden: true },
-	{ header: '시간대', name: 'peakKindNm', align: 'left' },
+	{ header: '시간대', name: 'peakKindNm', align: 'center' },
 	{
 		header: '여름철(6~8월)',
 		name: 'unitPrcSum',

components/common/modal/EnrgEffcEqpmDetailPop.vue

@@ -119,7 +119,8 @@
 						/>
 					</div> -->
 
-				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
+				<v-card-actions>
+					<v-spacer></v-spacer>
 					<a-button color="primary" type="primary" @click="closePop()">확인</a-button>
 				</v-card-actions>
 			</v-card>
@@ -274,12 +275,7 @@ export default {
 			// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
 
 			const myOptions = {
-				rowHeaders: [
+				rowHeaders: ['rowNum'],
-					{
-						type: 'rowNum',
-						align: 'right',
-					},
-				],
 				columnOptions: {
 					resizable: true,
 					minWidth: 100
@@ -323,19 +319,19 @@ export default {
 					header: '주의',
 					width: 100,
 					name: 'careStndVal',
-					align: 'right'
+					align: 'center'
 				},
 				{
 					header: '경고',
 					width: 100,
 					name: 'warnStndVal',
-					align: 'right'
+					align: 'center'
 				},
 				{
 					header: '가이드값',
 					width: 100,
 					name: 'totVal',
-					align: 'right'
+					align: 'center'
 				},
 				{
 					header: '알람내용',

components/common/modal/EnrgUsePlanModiPop.vue

@@ -37,7 +37,6 @@
 								:itemList="selectValueList01"
 								:label="'대상월'"
 								@update:propsValue="selectValue01 = $event"
-								customClass="select-large"
 							/>
 						</v-col>
 						<v-col :cols="5.5" class="mr-2">
@@ -50,10 +49,9 @@
 								:itemList="selectValueList02"
 								:label="'전년대비절감율'"
 								@update:propsValue="selectValue02 = $event"
-								customClass="select-large"
 							/>
 						</v-col>
-						<a-button class="ant-btn-popup-default" color="primary" dark @click="search()" icon="check-circle" size="large">
+						<a-button color="primary" dark @click="search()" icon="clock-circle" >
 							<!-- <template #icon>
 								<ClockCircleOutlined />
 							</template> -->
@@ -67,10 +65,13 @@
 				
 				<!-- <div id="chartParent" ref="chartParent" style="height: 100px"> -->
 				<div :style="'height: calc(50vh)'">
+					<div class="d-flex align-center justify-space-between pa-4" style="height: 10%">
+						<v-card-title class="pa-0 custom-title-4">사용량 계획</v-card-title>
+					</div>
 					<!-- <div id="chartParent" ref="chartParent" :style="'height: 80%'"> -->
-					<div id="chartParent" ref="chartParent" style="height: 100%" class="px-6">
+					<div id="chartParent" ref="chartParent" style="height: 70%">
 						<component
-							class="w100 h100 py-7 custom-chart"
+							class="w100 h100"
 							:is="loadChart ? 'Chart' : null"
 							:parentPrgmId="parentPrgmId"
 							:modalId="modalId"
@@ -129,8 +130,9 @@
 						/>
 					</div> -->
 				
+				<v-divider></v-divider>
 				<v-card-actions class="pa-5 d-flex align-center justify-end">
-					<a-button color="primary" class="mr-2 ant-btn-popup-default" dark @click="closePop()">취소</a-button>					
+					<a-button color="primary" type="default" class="mr-2" dark @click="closePop()">취소</a-button>					
 					<a-button color="primary" type="primary" dark @click="setUpdate()">확정</a-button>
 				</v-card-actions>
 			</v-card>
@@ -531,7 +533,7 @@ export default {
 			seriesData = data.map(item => ({
 				name: item.gubun == '2PLAN' ? '계획' : '전년실적',
 				type: item.gubun == '2PLAN' ? 'line' : 'bar',
-				data: targetMonthList.map(obj => item[obj] || null),
+				data: targetMonthList.map(obj => item[obj] || null)
 				// data: targetMonthList.map(obj => item[obj] || 0)
 			}));
 			this.nowSeriesData = seriesData;
@@ -556,6 +558,7 @@ export default {
 				series: seriesData,
 				tooltip: tooltipData
 			};
+			// console.log('option', option);
 			await this.$nextTick(() => {
 				
 			});
@@ -598,6 +601,7 @@ export default {
 			sData2 = nowSeriesData.filter(item => {
 				return item.name == '계획';
 			})[0]['data'];
+			// console.log('sData1', sData);			
 			if(targetMonth.includes('qty')){
 				targetMonth = parseInt(targetMonth.slice(-2));
 			}
@@ -606,11 +610,13 @@ export default {
 					sData2[i] = sData[i] * targetRatio;
 				}
 			}
+			// console.log('sData2', sData2);
 			seriesData = nowSeriesData.map(item => ({
 				...item,
 				data: item.name == '계획' ? sData2 : item.data
 			}));
 			
+			// console.log('seriesData', seriesData);
 			await this.$nextTick(() => {
 				
 			});
@@ -637,4 +643,4 @@ let modifyEnrgUsePlanModalDataKey =
 	modifyEnrgUsePlanChart: Utility.defaultChartOption(true)
 };
 // 전력량 요금(원/kWh)
-</script>
+</script>

components/common/modal/EqpmCalcPop.vue

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

components/common/modal/EqpmSelectPop.vue

@@ -1,6 +1,6 @@
 <template>
 	<v-row class="search-box" align="center" no-gutters>
-		<v-col v-if="label" :cols="labelCols" class="mr-2">
+		<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>
@@ -8,64 +8,62 @@
 			</label>
 		</v-col>
 		<v-col :cols="textCols">
-			<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
+			<v-text-field readonly append-icon="" :class="['v-input__custom', customClass]"
 				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
-				:disabled="disabled || false"
+				:disabled="disabled || false"><template v-slot:append>
-				: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" content-class="custom-dialog" 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 style="height: 100%">
 				<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="px-5 pt-2">
+				<div class="pa-2 pt-0">
-					<!-- <v-card class="searchFilter">
+					<v-card class="searchFilter">
-					</v-card> -->
+						<v-row align="end">
-					<v-row align="end">
+							<v-col :cols="3.5">
-						<v-col :cols="3.5">
+								<!-- 설비그룹 -->
-							<!-- 설비그룹 -->
+								<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
-							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
+									:label="'설비그룹'" :disabled="eqpmGrpDisabled"
-								:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
+									@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
-								:labelCols="12" :textCols="12" :iconShow="true" />
+									:iconShow="true" />
-						</v-col>
+							</v-col>
-						<v-col>
+							<v-col :cols="3.5">
-							<!-- FAB -->
+								<!-- FAB -->
-							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
+								<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
-								:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
+									:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
-								@update:propsValue="selectValue02 = $event" :textCols="12" :iconShow="true" />
+									:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
-						</v-col>
+									:iconShow="true" />
-						<v-col >
+							</v-col>
-							<v-row>
+							<v-col :cols="3.5">
-								<v-col :cols="12" class="py-0">
+								<v-row>
-									<label for="" class="search-box-label">
+									<v-col :cols="12" class="py-0">
-										<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
+										<label for="" class="search-box-label">
-										설비명
+											<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
-									</label>
+											설비명
-								</v-col>
+										</label>
-								<v-col :cols="12" class="pt-0">
+									</v-col>
-									<v-text-field append-icon="" class="v-input__custom" outlined :hide-details="true"
+									<v-col :cols="12" class="pt-0">
-										v-model="searchWord" @keyup.enter="search"><template v-slot:append>
+										<v-text-field append-icon="" class="v-input__custom" outlined
-											<!-- Custom SVG icon -->
+											:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
-											<v-icon>$icoSearch</v-icon>
+												v-slot:append>
+												<!-- Custom SVG icon -->
+												<v-icon>$icoSearch</v-icon>
 
-										</template></v-text-field>
+											</template></v-text-field>
-								</v-col>
+									</v-col>
 
-							</v-row>
+								</v-row>
-						</v-col>
+							</v-col>
-						<v-col :cols="2" class="last-col mr-2">
+							<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
-							<a-button icon="search" :ripple="false" type="primary" @click="search()"
-								class="search-button">조회</a-button>
-						</v-col>
 
-					</v-row>
+
+						</v-row>
+					</v-card>
 
 					<!-- <v-row align="center" no-gutters style="margin-top: 14px;">
 						<v-col :cols="1">
@@ -79,20 +77,14 @@
 								: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 class="pa-5" style="height:calc(100% - 30px)">
+					<div ref="modalGridParent" class="w100 h100">
-					<div ref="modalGridParent" class="h100 w100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
 							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
 							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
 					</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 :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
@@ -125,11 +117,6 @@ export default {
 			require: false,
 			default: '전력 계약 정보',
 		},
-		placeholder: {
-			type: String,
-			require: false,
-			default: '',
-		},
 		valueNm: {
 			type: String,
 			require: false,
@@ -264,7 +251,7 @@ export default {
 		},
 		chkDialog() {
 			if (this.isMulti) {
-				this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox', width: 72 }];
+				this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [{ type: 'checkbox' }];
 			} else {
 				this.$store.state.pageData[this.parentPrgmId][this.modalDataKey][this.myModalKey][this.gridName].option.rowHeaders = [];
 			}
@@ -404,8 +391,8 @@ export default {
 				rowHeight: 'auto',
 			};
 			if (this.isMulti) {
-				myOptions['rowHeaders'] = [{ type: 'checkbox' }];
+				// myOptions['rowHeaders'] = [{ type: 'checkbox' }];
-				myOptions['rowHeight'] = 'auto';
+				// myOptions['rowHeight'] = 'auto';
 			}
 
 
@@ -431,15 +418,18 @@ export default {
 				{
 					header: 'FAB',
 					name: 'fabNm',
+					align: 'center'
 				},
 				{
 					header: '설비ID',
-					name: 'eqpmId'
+					name: 'eqpmId',
+					align: 'center',
 					// hidden:true
 				},
 				{
 					header: '설비명',
-					name: 'eqpmNm'
+					name: 'eqpmNm',
+					align: 'center'
 				},
 				{
 					header: 'eccId',
@@ -528,6 +518,7 @@ export default {
 					this.getChecked();
 				}
 			});
+
 		},
 		setUpdate() {
 			if (this.isMulti) {
@@ -578,16 +569,3 @@ var eqpmSelectPop = {
 }
 
 </script>
-<style lang="scss" scoped>
-::v-deep {
-	.last-col {
-		flex-basis: content;
-	}
-
-	.v-dialog {
-		overflow-y: hidden;
-	}
-
-}
-
-</style>

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 Row Keys:', selectedRowKeys);
-					// console.log('Selected Rows:', selectedRows);
+					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

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

components/common/modal/FtnPlcMultiPop3.vue

@@ -294,10 +294,10 @@ export default {
 			if (this.searchParam.energyCd < 0) {
 				roiIdVal = null;
 			} else {
-				// console.log(
+				console.log(
-				// 	'this.searchParam.energyList[this.searchParam.energyCd]',
+					'this.searchParam.energyList[this.searchParam.energyCd]',
-				// 	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(
+			console.log(
-			// 	'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
+				'localStorage.getItem(this.parentPrgmId + "ModalEccNm") : ',
-			// 	localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
+				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
-			// 		? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
+					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')
-			// 		: '',
+					: '',
-			// );
+			);
 			this.textFieldData =
 				localStorage.getItem(this.parentPrgmId + 'ModalEccNm') != null
 					? localStorage.getItem(this.parentPrgmId + 'ModalEccNm')

components/common/modal/PlanPop.vue

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

components/common/modal/ReadPlcDisableFuncPop.vue

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

components/common/modal/ReadPlcPop.vue

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box" align="center" no-gutters>
+	<v-row class="search-box" align="center">
 		<!-- <v-col v-if="label" cols="2"> -->
 		<v-col v-if="item.label" :cols="item.labelCols" class="py-0">
 			<label for="" class="search-box-label">
@@ -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: 20,
+						width: 50,
 						formatter: (props) => {
 							return `<label class="custom-radio">
 										<span class="radio-mark"></span>
@@ -278,10 +278,10 @@ export default {
 					{
 						header: '검침개소명',
 						name: 'readPlcNm',
-						width: 500,
+						width: 300,
 						align: 'left',
 					},
-					{ header: '검침개소', name: 'name', align: 'left', width: 200 },
+					{ header: '검침개소', name: 'name', align: 'center' },
 				],
 			});
 		},
@@ -307,9 +307,6 @@ 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.setSelectValueList01();
-    await this.setSelectValueList02();
+    // await this.setSelectValueList02();
-    await this.setSelectValueList03();
+    // 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 = [
+      let res = [
-      //   {
+        {
-      //     eqpmGrpNm: "냉각 시스템",
+          eqpmGrpNm: "냉각 시스템",
-      //     eqpmGrpId: "GRP001",
+          eqpmGrpId: "GRP001",
-      //     eqpmId: "EQ001",
+          eqpmId: "EQ001",
-      //     eqpmNm: "냉각기 A",
+          eqpmNm: "냉각기 A",
-      //     tagId: "TAG001-001",
+          tagId: "TAG001-001",
-      //     tagNm: "냉각 온도 센서",
+          tagNm: "냉각 온도 센서",
-      //     rowStat: "I",
+          rowStat: "I",
-      //   },
+        },
-      //   {
+        {
-      //     eqpmGrpNm: "전력 시스템",
+          eqpmGrpNm: "전력 시스템",
-      //     eqpmGrpId: "GRP002",
+          eqpmGrpId: "GRP002",
-      //     eqpmId: "EQ002",
+          eqpmId: "EQ002",
-      //     eqpmNm: "변압기 B",
+          eqpmNm: "변압기 B",
-      //     tagId: "TAG002-002",
+          tagId: "TAG002-002",
-      //     tagNm: "전류 센서",
+          tagNm: "전류 센서",
-      //     rowStat: "U",
+          rowStat: "U",
-      //   },
+        },
-      //   {
+        {
-      //     eqpmGrpNm: "공기압 시스템",
+          eqpmGrpNm: "공기압 시스템",
-      //     eqpmGrpId: "GRP003",
+          eqpmGrpId: "GRP003",
-      //     eqpmId: "EQ003",
+          eqpmId: "EQ003",
-      //     eqpmNm: "압축기 C",
+          eqpmNm: "압축기 C",
-      //     tagId: "TAG003-003",
+          tagId: "TAG003-003",
-      //     tagNm: "압력 센서",
+          tagNm: "압력 센서",
-      //     rowStat: "D",
+          rowStat: "D",
-      //   },
+        },
-      // ];
+      ];
-      let res = await this.postApiReturn({
+      //   res = await this.postApiReturn({
-          apiKey: "selectTagAndEqpmList",
+      //     apiKey: "selectTagAndEqpmList",
-          resKey: "tagTrndDatas",
+      //     resKey: "tagTrndDatas",
-          sendParam: searchParam,
+      //     sendParam: searchParam,
-      });
+      //   });
       let newRes = [];
       if (this.searchParam["tagList"].length > 0) {
         newRes = res.filter((item) => {

components/common/select/SelectAddGrp.vue

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

components/common/select/SelectBlocMstr.vue

@@ -9,9 +9,7 @@
 		<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,14 +14,12 @@
 		<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"
+				:readonly="readonly"><template v-slot:append>
-				: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,24 +24,9 @@
 				:disabled="disabled"
 				:readonly="readonly"
 				append-icon=""
-				:menu-props="{ top: false, offsetY: true }"
+				><template v-slot:append>
-				>
-				<template v-slot:append>
 					<v-icon>$icoChevronDown</v-icon>
-				</template>
+				</template></v-select>
-
-				<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>
@@ -140,4 +125,4 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style></style>

components/common/select/SelectBoxTime.vue

@@ -22,11 +22,11 @@
         outlined
         :menu-props="{ auto: true, offsetY: true }"
         :hide-details="true"
-        :class="['v-select__custom', customClass]"
+        :class="'v-select__custom select-large'"
         :disabled="disabled"
         :readonly="readonly"
         @click="setDatepickerHide"
-        style="min-width: 170px;"
+        style="width: 170px; border-radius: 6px !important"
       >
         <template v-slot:append>
           <a-icon
@@ -106,10 +106,6 @@ 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/SelectReadObj.vue

@@ -21,7 +21,6 @@
 				outlined
 				append-icon=""
 				:class="['v-select__custom', customClass]"
-				:menu-props="{ top: false, offsetY: true }"
 			><template v-slot:append>
 				<v-icon>$icoChevronDown</v-icon>
 				</template></v-select>

components/common/select/selectCodeList.vue

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

components/form/CustomInput.vue

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

components/pages/ems/DataSetInfo/DataSetTagRelTab.vue

@@ -1,10 +1,7 @@
 <template>
   <div>
-    <div class="d-flex justify-space-between align-center pb-5" >
+    <div class="d-flex justify-space-between align-center" style="min-height: 80px;">
-      <!-- <span class="txt custom-title-4">Data Set TAG 연결 정보</span> -->
+      <span class="txt custom-title-4-new">Data Set TAG 연결 정보</span>
-      <v-card-title class="pa-0">
-        Data Set TAG 연결 정보
-      </v-card-title>
       <Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailDataSetTagList"
         :btnActionsFnc="btnActions" />
     </div>
@@ -17,20 +14,22 @@
         @gridEditingFinish="gridEditingFinish" />
     </div>
 
-    <div ref="formParent" class="h100">
+    <div ref="formParent" style="min-height: 100px;" class="w100 h100">
-      <v-row align="end" ref="contents" class="">
+      <v-row ref="contents" class="w100">
-        <v-col>
+        <v-col :cols="6">
           <component :is="'Datepicker'" :parentPrgmId="parentPrgmId" :label="'검색기간'" :labelCols="12" :textCols="12" />
         </v-col>
-        <v-col >
+        <v-col :cols="4">
           <component :is="'selectCodeList'" :parentPrgmId="parentPrgmId" :label="'주기'" dataKey="mdlDataTerm"
             :sendParam="{ commGrpCd: 'MDL_DATA_TERM', useFg: '1' }" :addAll="false" :labelCols="12" :textCols="12" :iconShow="true" />
         </v-col>
-      </v-row>
+        <v-col class="text-right align-self-end">
-      <v-row align="center" no-gutters class="searchFilter mt-2">
+          <a-button @click="jamoviProcClickEvent('view1')" type="primary" :ripple="false" class="mr-1">데이터 분석</a-button>
-        <v-col class="d-flex justify-end">
-          <a-button @click="jamoviProcClickEvent('view1')" type="primary" :ripple="false" class="mb-1">데이터 분석</a-button>
         </v-col>
+        <!-- <v-card class="searchFilter w100">
+          <v-row align="center" no-gutters>
+          </v-row>
+        </v-card> -->
       </v-row>
     </div>
   </div>
@@ -39,7 +38,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustomCheckbox } from '~/plugins/gridUtility';
+import { CustumChecbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
@@ -157,7 +156,7 @@ export default {
         {
           header: '모델 Data 구분',
           name: 'mdlDataTypeCd',
-          align: 'left',
+          align: 'center',
           width: 120,
           formatter({ value }) {
             var retVal = '';
@@ -174,7 +173,7 @@ export default {
         {
           header: '사용여부',
           name: 'useFg',
-          align: 'left',
+          align: 'center',
           width: 100,
           formatter({ value }) {
             value = value === true ? '1' : '0';
@@ -190,7 +189,7 @@ export default {
           //   }
           // }
         },
-        { header: '비고', name: 'rmrk', align: 'left' },
+        { header: '비고', name: 'rmrk', align: 'center' },
       ];
 
       this.setGridColumn({
@@ -214,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,
@@ -297,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

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

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -4,14 +4,14 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt custom-subtitle-tab">공정 입출력 정보</span>
+			<span class="txt custom-title-4-new">공정 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="height: calc(90vh - 700px);">
+		<div ref="gridParent" style="height: calc(100vh - 760px);">
 			<component
 				:ref="gridName"
 				:is="loadGrid ? 'Grid' : null"
@@ -19,9 +19,10 @@
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
+				:dataPath="dataPathMock"
 			/>
 		</div>
-		<div style="height: 25vh;" class="mt-5">
+		<div>
 			<component
 				:is="'Form'"
 				:bindingData="gridName"
@@ -59,11 +60,24 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowEccIaoGrid',
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
 			detailList: myDetail,
+			dataPathMock: {
+				"rowEccIaoGrid": {
+				column: [
+					{ header: '검침 대상 ID', name: 'readObjId', align: 'left' },
+					{ header: '검침 대상 명', name: 'readObjNm', align: 'left' },
+					{ header: '검침 대상 유형', name: 'readObjKind', align: 'left' },
+					{ header: '그룹', name: 'grpCd', align: 'left' },
+				],
+				data: dataPathDataExample,
+				defaultRow: dataPathDataExample,
+				option: {}
+				}
+			},
 		};
 	},
 	computed: {
@@ -98,19 +112,17 @@ export default {
 	watch: {
 		selectedObjId(val) {
 			if (val === 'TAG') {
-				this.detailList[1].class = 'd-none';
+				this.detailList[2].class = 'py-2 d-none';
-				this.detailList[2].class = 'd-block pl-4';
+				this.detailList[3].class = 'py-2 d-none';
-				this.detailList[3].class = 'd-block';
+				this.detailList[4].class = 'py-2';
+				this.detailList[5].class = 'py-2';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[3].class = 'd-block';
+				this.detailList[5].class = 'py-2 d-none';
-				this.detailList[2].class = 'd-none';
+				this.detailList[4].class = 'py-2 d-none';
-				this.detailList[1].class = 'd-block pl-4';
+				this.detailList[3].class = 'py-2';
+				this.detailList[2].class = 'py-2';
 			}
-			this.detailList[4].class = 'pl-4 mt-2';
-			
-			console.log(val)
-			console.log(this.detailList)
 		},
 	},
 	created() {},
@@ -190,7 +202,6 @@ export default {
 				{ header: '대상 명', name: 'objNm', width: 300, align: 'left' },
 				{
 					header: '에너지원 명',
-					width: 150,
 					name: 'ercId',
 					align: 'left',
 					formatter({ value }) {
@@ -207,9 +218,8 @@ export default {
 				},
 				{
 					header: '대상 유형',
-					width: 150,
 					name: 'objKind',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						var retVal = '';
 
@@ -225,8 +235,7 @@ export default {
 				{
 					header: '투입 생산 유형',
 					name: 'inProdKind',
-					width: 150,
+					align: 'center',
-					align: 'left',
 					formatter({ value }) {
 						var retVal = '';
 
@@ -242,8 +251,7 @@ export default {
 				{
 					header: '계산 여부',
 					name: 'calcFg',
-					width: 150,
+					align: 'center',
-					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -253,7 +261,7 @@ export default {
 						// return value === true ? "사용" : "사용안함";
 					},
 				},
-				{ header: '분배율(1~100)', name: 'distRt', align: 'right', width: 150 },
+				{ header: '분배율(1~100)', name: 'distRt', align: 'right' },
 				{ header: '사업장', name: 'blocId', align: 'center', hidden: true },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
 				{ header: '등록 일자', name: 'regDttm', hidden: true },
@@ -380,7 +388,7 @@ const myDetail = [
 		label: '대상 유형',
 		disabled: false,
 		cols: 6,
-		class: 'pr-4',
+		class: 'py-2 pr-4',
 		list: 'emMapDivList',
 		valueNm: 'objKind',
 		itemText: 'commCdNm',
@@ -397,7 +405,7 @@ const myDetail = [
 		valueNm: 'objId',
 		disabled: false,
 		cols: 6,
-		class: 'pl-4 py-2',
+		class: 'pt-2 pb-0 mb-0 pl-4',
 		required: true,
 		bindNm: 'objNm',
 		labelCols: 12,
@@ -406,6 +414,24 @@ const myDetail = [
 		noText: true,
 		iconShow: true,
 	},
+	{
+		// 공백 처리
+		type: 'Label',
+		cols: 6,
+		class: 'py-2 pr-4',
+		disabled: false,
+	},
+	{
+		type: 'InputText',
+		valueNm: 'objNm',
+		readonly: true,
+		disabled: true,
+		cols: 6,
+		class: 'pl-4',
+		labelCols: 12,
+		textCols: 12,
+		iconShow: true,
+	},
 	{
 		type: 'EvtObjPop',
 		labelContent: '대상 항목',
@@ -416,23 +442,16 @@ const myDetail = [
 		disabled: true,
 		required: true,
 		cols: 6,
-		class: 'd-none pr-4 py-2',
+		class: 'd-none pr-4',
 		disableContent: true,
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
 	},
-	{
-		// 공백 처리
-		type: 'Label',
-		cols: 6,
-		class: 'py-2 pr-4',
-		disabled: false,
-	},
 	{
 		type: 'InputText',
 		cols: 6,
-		class: 'pt-0 pl-4 mt-2 py-2',
+		class: 'd-none pt-0 pl-4',
 		valueNm: 'objNm',
 		readonly: true,
 		disabled: true,
@@ -445,7 +464,7 @@ const myDetail = [
 		label: '에너지원',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		list: 'ercNmList',
 		valueNm: 'ercId',
 		itemText: 'text',
@@ -460,7 +479,7 @@ const myDetail = [
 		label: '투입생산유형',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		list: 'cmInoutList',
 		valueNm: 'inProdKind',
 		itemText: 'commCdNm',
@@ -473,7 +492,7 @@ const myDetail = [
 	{
 		type: 'CheckBox',
 		cols: 6,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		label: '계산 여부',
 		valueNm: 'calcFg',
 		disabled: false,
@@ -490,18 +509,19 @@ const myDetail = [
 		valueNm: 'distRt',
 		readonly: false,
 		cols: 6,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		required: true,
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
 	},
 ];
+const dataPathDataExample = [
+	{
+		readObjId: 'OBJ001',
+		readObjNm: '서울 본사',
+		readObjKind: 'TYPE01',
+		grpCd: 'GRP01',
+	},
+]
 </script>
-<style lang="scss" scoped>
-	::v-deep{
-		.tui-grid-layer-state{
-			top: 40px !important;
-		}
-	}
-</style>

components/pages/ems/EffcIdxInfo/EffcIdxAddInfoTab.vue

@@ -69,6 +69,55 @@ 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,
@@ -339,10 +388,10 @@ export default {
 				},
 				// bodyHeight: gridHeight,
 				// minBodyHeight: gridHeight,
-				header: {
+				// header: {
-					height: 37,
+				// 	height: 28,
-				},
+				// },
-				rowHeight: 37,
+				// rowHeight: 29,
 				// minRowHeight: 29,
 				// selectionUnit: 'row',
 				// editingEvent: 'click',
@@ -387,6 +436,7 @@ export default {
 					header: '물리량ID',
 					name: 'pysclQtyId',
 					width: 200,
+					align: 'center',
 					hidden: true,
 				},
 				{ header: '물리량', name: 'pysclQtyCd', hidden: true, minWidth: 200 },
@@ -395,7 +445,7 @@ export default {
 				{ header: '가이드지표', name: 'gdIdxId', hidden: true },
 				{ header: '가이드지표명', name: 'gdIdxNm', hidden: true },
 				{ header: '집계방법', name: 'totMeth', hidden: true },
-				{ header: '집계방법', name: 'totMethNm',},
+				{ header: '집계방법', name: 'totMethNm', align: 'center' },
 			];
 
 			if (this.selectValue01 == 'PYSCL') {

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -1,16 +1,17 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center mb-5" >
+		<div
-			<v-card-title class="txt custom-title-4 pa-0">
+			class="d-flex justify-space-between align-center"
-				설비 추가 정보
+			style="height: 80px;"
-			</v-card-title>
+		>
+			<span class="txt custom-title-4-new">설비 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" class="w100" style="height: calc(100vh - 520px);">
+		<div ref="gridParent" style="height: calc(100vh - 520px);">
 			<Grid
 				:ref="gridName"
 				:is="loadGrid ? 'Grid' : null"
@@ -57,9 +58,9 @@ export default {
 			dataPathMock: {
         'rowDetailGrid' : {
           column: [
-            { header: '추가 정보', name: 'id', headerAlign: 'left', align: 'left', },
+            { header: '추가 정보', name: 'id', headerAlign: 'left' },
-            { header: 'Data 구분', name: 'lable', headerAlign: 'left', align: 'left' },
+            { header: 'Data 구분', name: 'lable', headerAlign: 'left' },
-            { header: '추가 정보 값', name: 'type', headerAlign: 'left', align: 'right' },
+            { header: '추가 정보 값', name: 'type', headerAlign: 'left' },
             // { header: '비고', name: 'note', headerAlign: 'left' }
           ],
           data: dataPathDataExample,
@@ -122,10 +123,10 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 38,
+					height: 28,
 				},
-				// rowHeight: 39,
+				rowHeight: 29,
-				// minRowHeight: 29,
+				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -265,12 +266,11 @@ export default {
 						}
 						return retVal;
 					},
-					minWidth: 230,
 				},
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(
@@ -281,7 +281,6 @@ export default {
 						}
 						return retVal;
 					},
-					minWidth: 330,
 				},
 				{
 					header: '숫자 값',
@@ -300,7 +299,7 @@ export default {
 				{
 					header: '추가 정보 값',
 					name: 'addInfoVal',
-					align: 'left',
+					align: 'center',
 					renderer: {
 						type: CustomRenderer,
 					},
@@ -312,7 +311,6 @@ export default {
 						// console.log('test :', test);
 						return data.row.addInfoDataKind;
 					},
-					minWidth: 330,
 				},
 				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
 				//},
@@ -419,4 +417,3 @@ const dataPathDataExample = getPathDataExample({
 	type: '사용', note: '-'
 });
 </script>
-<style lang="scss" scoped> </style>

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,10 +1,7 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center mb-5" >
+		<div class="d-flex justify-space-between align-center" style="height: 80px;">
-			<!-- <span class="txt custom-subtitle-tab">설비 상수 정보</span> -->
+			<span class="txt custom-title-4-new">설비 상수 정보</span>
-			<v-card-title class="txt custom-title-4 pa-0">
-				설비 상수 정보
-			</v-card-title>
 			<Buttons :parentPrgmId="parentPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="min-height: calc(100vh - 800px);">
@@ -99,20 +96,20 @@ export default {
 	watch: {
 		selectedEqpmKindId(val) {
 			if (val) {
-				this.detailList[1].eqpmKindId = val;
+				this.detailList[2].eqpmKindId = val;
 			}
 		},
 		selectedEqpmGrpId(val) {
 			// if(!val){
-			// 	this.detailList[1].eqpmGrpId = '';
+			// 	this.detailList[2].eqpmGrpId = '';
 			// }else{
-			// 	this.detailList[1].eqpmGrpId = val;
+			// 	this.detailList[2].eqpmGrpId = val;
 			// }
 			// if(val){
-			// 	this.detailList[1].eqpmGrpId = val;
+			// 	this.detailList[2].eqpmGrpId = val;
 			// }
 			// else if(val == null || val == ''){
-			// 	this.detailList[1].eqpmGrpId = '';
+			// 	this.detailList[2].eqpmGrpId = '';
 			// }
 		},
 	},
@@ -163,11 +160,11 @@ export default {
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{ header: '설비 번호', name: 'eqpmId', hidden: true },
 				// { header: '대상항목', name: 'objId', align: 'center', hidden: true},
-				{ header: '물리량 ID', name: 'pysclQtyId', align: 'left', minWidth: 230, },
+				{ header: '물리량 ID', name: 'pysclQtyId', align: 'left' },
-				{ header: '물리량 명', name: 'pysclQtyNm', align: 'left', minWidth: 230, },
+				{ header: '물리량 명', name: 'pysclQtyNm', align: 'left' },
-				{ header: '물리량값', name: 'pysclQtyVal', align: 'left', minWidth: 230, },
+				{ header: '물리량값', name: 'pysclQtyVal', align: 'left' },
 				// { header: '대상항목', name: 'objNm', align: 'left'},
-				{ header: '대상항목', name: 'objId', align: 'left', minWidth: 230, },
+				{ header: '대상항목', name: 'objId', align: 'left' },
 				{
 					header: '에너지원 명',
 					name: 'ercId',
@@ -241,10 +238,10 @@ export default {
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
-				this.detailList[1].disabled = false;
+				this.detailList[2].disabled = false;
 				this.detailList[3].disabled = false;
 			} else {
-				this.detailList[1].disabled = true;
+				this.detailList[2].disabled = true;
 				this.detailList[3].disabled = true;
 			}
 
@@ -260,12 +257,12 @@ export default {
 			switch (action) {
 				case 'add':
 					this.$refs[this.gridName].addRow();
-					this.detailList[1].disabled = false;
+					this.detailList[2].disabled = false;
 					this.detailList[3].disabled = false;
 					break;
 
 				case 'remove':
-					this.detailList[1].disabled = true;
+					this.detailList[2].disabled = true;
 					this.detailList[3].disabled = true;
 					this.$refs[this.gridName].removeRow();
 					break;
@@ -294,8 +291,8 @@ export default {
 
 						dataArr.map(item => {
 							for (var key of Object.keys(item)) {
-								// console.log('key : ', key);
+								console.log('key : ', key);
-								// console.log('item[key] : ', item[key]);
+								console.log('item[key] : ', item[key]);
 								if (!item[key] && requiredKeyList.includes(key)) {
 									validCheck = false;
 								}
@@ -361,6 +358,7 @@ const myEqpmConstDetail = [
 	{
 		type: 'SelectBox',
 		label: '대상 유형',
+		disabled: true,
 		cols: 6,
 		class: 'py-3 pr-4',
 		list: 'emMapDivList2',
@@ -373,7 +371,6 @@ const myEqpmConstDetail = [
 		textCols: 12,
 		iconShow: true,
 	},
-	// ==================
 	{
 		type: 'EgrpPysclQtyPop',
 		labelContent: '물리량',
@@ -385,11 +382,11 @@ const myEqpmConstDetail = [
 			pysclQtyNm: 'pysclQtyNm',
 		},
 		valueNm: 'objId',
-		disabled: true,
+		disabled: false,
 		required: true,
 		openMode: 'CONST',
 		cols: 6,
-		class: 'pt-3 pb-1 pl-4',
+		class: 'py-3 pl-4',
 		eqpmGrpDisableFlag: true,
 		// eqpmGrpId:'',
 		labelCols: 12,
@@ -409,14 +406,13 @@ const myEqpmConstDetail = [
 		disabled: true,
 		readonly: true,
 		cols: 6,
-		class: 'pb-3 pt-0 pl-4',
+		class: 'py-3 pt-1 pl-4',
 		align: 'right',
 		// class: 'py-2 d-none',
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
 	},
-	// ------------
 	{
 		type: 'InputText',
 		label: '물리량 값',
@@ -444,11 +440,3 @@ const dataPathDataExample = getPathDataExample({
 	field2: '2222',
 });
 </script>
-
-<style lang="scss" scoped>
-	::v-deep {
-		.tui-grid-layer-state {
-			top: 40px !important;
-		}
-	}
-</style>

components/pages/ems/EqpmInfo/EqpmIaoTab.vue

@@ -1,27 +1,27 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center mb-5" >
+		<div
-			<!-- <span class="txt custom-subtitle-tab">설비 입출력 정보</span> -->
+			class="d-flex justify-space-between align-center"
-			<v-card-title class="txt custom-title-4 pa-0">
+			style="height: 80px;"
-				설비 입출력 정보
+		>
-			</v-card-title>
+			<span class="txt custom-title-4-new">설비 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 700px);">
+		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
+			<!-- :is="loadGrid ? 'Grid' : null" -->
 			<Grid
 				:ref="gridName"
-				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
 			/>
 		</div>
-		<div style="height: 60vh;" class="mt-5">
+		<div style="min-height: calc(100vh - 900px);" class="mt-4">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -65,6 +65,22 @@ export default {
 
 			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: {
@@ -111,24 +127,18 @@ export default {
 	},
 	watch: {
 		selectedObjId(val) {
+			console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				// this.detailList[1].class = 'py-3 pl-4 pb-0';
+				this.detailList[2].class = 'py-2 d-none';
-				this.detailList[1].class = 'py-3 d-none';
+				this.detailList[3].class = 'py-2 d-none';
-				this.detailList[2].class = 'py-3 d-none';
+				this.detailList[4].class = 'py-2';
-				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
+				this.detailList[5].class = 'py-2';
-
-				this.detailList[4].class = 'py-3 pl-4';
-				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[1].class = 'py-3 pl-4';
+				this.detailList[5].class = 'py-2 d-none';
-				this.detailList[2].class = 'py-3';
+				this.detailList[4].class = 'py-2 d-none';
-				this.detailList[3].class = 'py-3 pl-4 pt-0';
+				this.detailList[3].class = 'py-2';
-
+				this.detailList[2].class = 'py-2';
-				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) {
@@ -161,7 +171,7 @@ export default {
 		},
 	},
 	mounted() {
-		this.init();
+		// this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -229,12 +239,11 @@ export default {
 
 						return retVal;
 					},
-					minWidth: 150,
 				},
 				{
 					header: '대상 유형',
 					name: 'objKind',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						var retVal = '';
 
@@ -246,10 +255,9 @@ export default {
 
 						return retVal;
 					},
-					minWidth: 150,
 				},
 				{ header: '물리량', name: 'pysclQtyId', align: 'left', hidden: true },
-				{ header: '물리량', name: 'pysclQtyNm', align: 'left', minWidth: 150, },
+				{ header: '물리량', name: 'pysclQtyNm', align: 'left' },
 				{
 					header: '물리량값',
 					name: 'pysclQtyVal',
@@ -266,7 +274,7 @@ export default {
 				{
 					header: '계산여부',
 					name: 'calcFg',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -274,7 +282,6 @@ export default {
 						);
 						return newValue[0].commCdNm;
 					},
-					minWidth: 100,
 				},
 				{ header: '분배율', name: 'distRt', align: 'right' },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
@@ -289,18 +296,20 @@ export default {
 				value: myColumns,
 			});
 
-			this.loadGrid = true;
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
 				this.detailList[0].disabled = false;
-				this.detailList[1].disabled = false;
+				this.detailList[2].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[1].disabled = true;
+				this.detailList[2].disabled = true;
 				this.detailList[3].disabled = true;
 				this.detailList[4].disabled = true;
 				this.detailList[5].disabled = true;
@@ -318,7 +327,7 @@ export default {
 				case 'add':
 					this.$refs[this.gridName].addRow();
 					this.detailList[0].disabled = false;
-					this.detailList[1].disabled = false;
+					this.detailList[2].disabled = false;
 					this.detailList[3].disabled = false;
 					this.detailList[4].disabled = false;
 					this.detailList[5].disabled = false;
@@ -327,7 +336,7 @@ export default {
 				case 'remove':
 					this.$refs[this.gridName].removeRow();
 					this.detailList[0].disabled = true;
-					this.detailList[1].disabled = true;
+					this.detailList[2].disabled = true;
 					this.detailList[3].disabled = true;
 					this.detailList[4].disabled = true;
 					this.detailList[5].disabled = true;
@@ -347,7 +356,7 @@ export default {
 					}
 
 					if (dataArr.length > 0) {
-						// console.log('dataArr : ', dataArr);
+						console.log('dataArr : ', dataArr);
 
 						var requiredKeyList = this.detailList
 							.filter(item => {
@@ -408,7 +417,6 @@ export default {
 	},
 };
 
-
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -448,10 +456,10 @@ const myEqpmIaoDetail = [
 		type: 'ReadPlcPop',
 		label: '대상 항목',
 		valueNm: 'objId',
-		cols: 6,
-		class: 'py-3 pl-4 pb-0',
-		required: true,
 		disabled: true,
+		cols: 6,
+		class: 'py-3 pl-4',
+		required: true,
 		bindNm: 'objNm',
 		textCols: 12,
 		labelCols: 12,
@@ -472,39 +480,30 @@ const myEqpmIaoDetail = [
 		readonly: true,
 		disabled: true,
 		cols: 6,
-		class: 'py-3 pl-4 pt-0',
+		class: 'py-3 pl-4 pt-1',
 		textCols: 12,
 		labelCols: 12,
 		iconShow: true
 	},
-// ============
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목',
+		labelContent: '대상 항목 111',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
 		disabled: true,
 		required: true,
 		cols: 6,
-		class: 'py-3 pl-4 d-none',
+		class: 'py-3 d-none',
 		disableContent: true,
 		textCols: 12,
 		labelCols: 12,
 		iconShow: true
 	},
-	{
-		type: 'Label',
-		cols: 6,
-		class: 'py-3 d-none',
-		disabled: true,
-		textCols: 12,
-		labelCols: 12,
-	},
 	{
 		type: 'InputText',
-		cols: 6,
+		cols: 5,
-		class: 'py-3 pl-4 d-none',
+		class: 'py-3 d-none',
 		valueNm: 'objNm',
 		readonly: true,
 		disabled: true,
@@ -512,7 +511,6 @@ const myEqpmIaoDetail = [
 		labelCols: 12,
 		iconShow: true
 	},
-	// --------------------------------------------
 	{
 		type: 'SelectBox',
 		label: '에너지원',
@@ -617,11 +615,13 @@ const myEqpmIaoDetail = [
 		iconShow: true
 	},
 ];
+
+import { getPathDataExample } from '@/const/const'
+const dataPathDataExample = getPathDataExample({
+	id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV',
+	lable: 'INCHEON 고온 냉동기 101호기 - 호로1',
+	type: '사용', note: '-',
+	field1: '1111',
+	field2: '2222',
+});
 </script>
-<style lang="scss" scoped >
-::v-deep {
-	.tui-grid-layer-state {
-		top: 40px !important;
-	}
-}
-</style>

components/pages/ems/ErcChrgInfo/ErcChrgInfoTab.vue

@@ -20,12 +20,6 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<!-- Create the line between date picker and form -->
-		<v-row class="mt-6 mb-7" no-gutters>
-			<v-col>
-				<div style="height: 1px; background-color: #0000000F;"></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">
@@ -43,7 +37,7 @@
 				<div
 					ref="gridParent"
 					class="w100"
-					style="height: calc((100vh - 500px) / 2);"
+					style="height: calc((100vh - 600px) / 2);"
 				>
 					<Grid
 						:ref="gridName"
@@ -57,7 +51,7 @@
 				</div>
 			</v-col>
 		</v-row>
-		<v-row class="search-box mt-2" align="center" no-gutters style="height: 44px;">
+		<v-row class="search-box" align="center" no-gutters style="height: 44px;">
 			<v-col :cols="4">
 				<label for="" class="search-box-label">
 					<!-- <v-icon x-small color="primary" class="mr-1"
@@ -77,7 +71,7 @@
 				<div
 					ref="chartParent"
 					class="h100 w100"
-					style="height: calc((100vh - 500px) / 2);"
+					style="height: calc((100vh - 600px) / 2  - 30px);"
 				>
 					<component
 						class="w100 h100"

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -1,8 +1,8 @@
 <template>
 	<div>
 		<div
-			class="d-flex justify-space-between mb-3 pr-4"
+			class="d-flex justify-space-between align-center"
-			style="height: 45px;"
+			style="height: 80px;"
 		>
 			<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
 			<Buttons
@@ -102,7 +102,7 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 31;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
 
 			const myOptions = {
 				columnOptions: {
@@ -113,8 +113,8 @@ export default {
 				header: {
 					height: 28,
 				},
-				rowHeight: 36,
+				rowHeight: 29,
-				minRowHeight: 36,
+				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -143,6 +143,7 @@ export default {
 			class CustomRenderer {
 				constructor(props) {
 					//const { min, max } = props.columnInfo.renderer.options;
+					//console.log('props: %o', props);
 
 					const el = document.createElement('input');
 					if (
@@ -214,12 +215,15 @@ export default {
 						}
 						$(el).addClass('tui-grid-content-text');
 					}
+					// console.log('props: %o', props);
+					// console.log('el: %o', el);
 					this.el = el;
 
 					this.render(props);
 				}
 
 				change(ev) {
+					//console.log('props: %o', ev);
 					if (ev.target.checked) {
 						ev.target.value = 1;
 					} else {
@@ -241,6 +245,7 @@ export default {
 					} else {
 						this.el.value = String(props.value);
 					}
+					//console.log('props: %o', props);
 				}
 
 				mounted() {
@@ -270,7 +275,7 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(
@@ -318,6 +323,8 @@ export default {
 				},
 				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
 				// formatter({ value, row , column}) {
+				//   console.log("addInfoVal row : ", row);
+				//   console.log("addInfoVal state : ", column);
 				//   if(row.addInfoDataKind === "NUM"){
 				//     column.align = "right";
 				//   }else{
@@ -440,15 +447,3 @@ export default {
 	},
 };
 </script>
-<style lang="scss" scoped >
-::v-deep {
-	.tui-grid-layer-state {
-		top: 40px !important;
-	}
-	
-	.tui-grid-cell-content-editor {
-		height: 36px !important;
-	}
-
-}
-</style>

components/pages/ems/ReadPlcInfo/ReadPlcAddInfoTab.vue

@@ -200,6 +200,7 @@ 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" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
+			<Grid :ref="gridName" :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: 37,
+					height: 28,
 				},
-				rowHeight: 37,
+				// rowHeight: 29,
 				// minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
@@ -124,12 +124,13 @@ export default {
 			const myColumns = [
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{ header: '검침개소 번호', name: 'readPlcId', hidden: true },
-				{ header: '대상 검침개소 번호', name: 'objReadPlcId'},
+				{ header: '대상 검침개소 번호', name: 'objReadPlcId', align: 'center' },
 				{ 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,23 +6,12 @@
 				:btnActionsFnc="btnActions" />
 		</div>
 		<div ref="gridParent" style="height: calc((100vh - 520px) /2);">
-			<Grid
+			<Grid :ref="gridName" :gridName="gridName" :parentPrgmId="parentPrgmId" @getRowsData="getRowData"
-				:ref="gridName"
+				:innerTabGridInfo="innerTabGridInfo"  />
-				:is="loadGrid ? 'Grid' : null"
-				:gridName="gridName"
-				:parentPrgmId="parentPrgmId"
-				@getRowsData="getRowData"
-				:innerTabGridInfo="innerTabGridInfo"
-			/>
 		</div>
-		<div ref="formParent" style="height: calc((100vh - 400px) /2);">
+		<div class="mt-3" ref="formParent" style="height: calc((100vh - 400px) /2);">
-			<component
+			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName"
-				:is="'Form'"
+				:detailList="detailReadPlcTagList" @gridEditingFinish="gridEditingFinish" />
-				:parentPrgmId="parentPrgmId"
-				:bindingData="gridName"
-				:detailList="detailReadPlcTagList"
-				@gridEditingFinish="gridEditingFinish"
-			/>
 		</div>
 	</div>
 </template>
@@ -30,7 +19,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustomCheckbox } from '~/plugins/gridUtility';
+import { CustumChecbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
@@ -110,9 +99,9 @@ export default {
 				// bodyHeight: gridHeight,
 				// minBodyHeight: gridHeight,
 				header: {
-					height: 37,
+					height: 28,
 				},
-				rowHeight: 37,
+				rowHeight: 29,
 				minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
@@ -153,6 +142,7 @@ export default {
 				{
 					header: '에너지원',
 					name: 'ercId',
+					align: 'center',
 					width: 100,
 					formatter({ value }) {
 						let retVal = '';
@@ -181,9 +171,10 @@ export default {
 				{
 					header: '대표 TAG 여부',
 					name: 'reprTagFg',
+					align: 'center',
 					width: 100,
 					// renderer: {
-					//   type: CustomCheckbox,
+					//   type: CustumChecbox,
 					//   options: {
 					//     onlyone: true,
 					//     // disabled: true
@@ -196,6 +187,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
+					align: 'center',
 					width: 100,
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
@@ -211,7 +203,7 @@ export default {
 					//   }
 					// }
 				},
-				{ header: '비고', name: 'rmrk', width: 100 },
+				{ header: '비고', name: 'rmrk', align: 'left', width: 100 },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
 				{ header: '등록 일자', name: 'regDttm', hidden: true },
 				{ header: '수정 사용자', name: 'procUserNo', hidden: true },
@@ -332,7 +324,7 @@ const myReadPlcTagDetail = [
 		valueNm2: 'tagNm',
 		disabled: true,
 		cols: 6,
-		class: 'pr-4 pb-2 py-2 mt-2',
+		class: 'pr-4 pb-2 py-3',
 		required: true,
 		labelCols: 12,
 		textCols: 12,
@@ -345,7 +337,7 @@ const myReadPlcTagDetail = [
 		valueNm: 'ercId',
 		disabled: false,
 		cols: 6,
-		class: 'pl-4 pb-2 py-3 mt-2',
+		class: 'pl-4 py-3',
 		list: 'ercNmList',
 		itemText: 'text',
 		itemValue: 'value',
@@ -360,7 +352,7 @@ const myReadPlcTagDetail = [
 		readonly: true,
 		cols: 6,
 		textCols: 12,
-		class: 'pt-1 py-3 pr-4 mt-2',
+		class: 'pt-1 py-3 pr-4',
 		required: true,
 	},
 	{
@@ -372,7 +364,7 @@ const myReadPlcTagDetail = [
 		valueNm: 'distRt',
 		disabled: false,
 		cols: 6,
-		class: 'py-3 pr-4 mt-2',
+		class: 'py-3 pr-4',
 		inputType: 'number',
 		min: 1,
 		max: 100,
@@ -387,7 +379,7 @@ const myReadPlcTagDetail = [
 		valueNm: 'reprTagFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-3 pl-4 mt-2',
+		class: 'py-3 pl-4',
 		value: { '1': true, '0': false },
 		required: true,
 		labelCols: 12,
@@ -401,7 +393,7 @@ const myReadPlcTagDetail = [
 		valueNm: 'useFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-3 pr-4 mt-2',
+		class: 'py-3 pr-4',
 		value: { '1': true, '0': false },
 		required: true,
 		labelCols: 12,
@@ -414,7 +406,7 @@ const myReadPlcTagDetail = [
 		valueNm: 'rmrk',
 		disabled: false,
 		cols: 6,
-		class: 'py-3 pl-4 mt-2',
+		class: 'py-3 pl-4',
 		inputType: 'string',
 		labelCols: 12,
 		textCols: 12,

components/pages/ems/TagInfo/TagAddInfoTab.vue

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

layouts/default.vue

@@ -9,6 +9,7 @@
               <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>
@@ -39,16 +40,16 @@
             <v-menu offset-y>
               <template v-slot:activator="{ on, attrs }">
                 <a-button
-                  :ripple="false"
+                    :ripple="false"
-                  tile
+                    tile
-                  class="btn-header"
+                    class="btn-header"
-                  v-bind="attrs"
+                    v-bind="attrs"
-                  v-on="on"
+                    v-on="on"
-                  style="width: 100px"
+                    style="width: 100px"
-                >
+                  >
-                  <span class="body-2">즐겨찾기</span>
+                    <span class="body-2">즐겨찾기</span>
-                  <v-icon size="20">mdi-chevron-down</v-icon>
+                    <v-icon size="20">mdi-chevron-down</v-icon>
-                </a-button>
+                  </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> -->
@@ -61,10 +62,10 @@
                 </v-list-item>
               </v-list>
             </v-menu>
-            <a-button id="removeBm" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
+            <a-button id="refresh" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
               <span class="material-icons" style="font-size: 17px">star</span>
             </a-button>
-            <a-button id="addBm" class="btn-header" :style="{
+            <a-button id="refresh" 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>
@@ -87,12 +88,32 @@
         </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>
+                <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">
@@ -109,16 +130,14 @@
                         :class="miniVariant === false ? 'mr-2' : ''" size="9">
                         $depth3rdBulletDark
                       </v-icon>
-                      <span v-if="item.url">
+                      <span v-if="item.url">{{ item.menuNm }}
-                        {{ 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-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 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>
@@ -373,6 +392,7 @@ export default {
       deep: true,
       handler(value) {
         if (value) {
+          console.log(value)
           const prgmId = value.prgmId;
           let thisPrgmId = this.$route.query.prgmId;
           var tmp = 0;
@@ -786,7 +806,7 @@ export default {
       // 	console.log('if isLoading stmt3');
       // 	return;
       // }
-      // alert("move to", url);
+      alert("move to", url);
       this.$router.push({
         path: url + "?prgmId=" + prgmId,
       });

nuxt.config.js

@@ -57,7 +57,7 @@ module.exports = {
 	],
 
 	// Modules: https://go.nuxtjs.dev/config-modules
-	modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources' ],
+	modules: ['@nuxtjs/axios', '@nuxtjs/dayjs', '@nuxtjs/style-resources','@nuxtjs/google-fonts'],
 	styleResources: {
 		scss: ['./assets/scss/*.scss'],
 	},

pages/comm/auth/MenuMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<v-row ref="searchFilter">
-		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -35,7 +34,7 @@
 					<div class="h100 px-4" style="height:calc(100% - 70px)">
 						<div ref="treeGridParent" class="w100 h100">
 							<component :ref="gridName + myPrgmId" :is="loadTree ? 'Grid' : null" :gridName="gridName"
-								:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
+								:parentPrgmId="myPrgmId" @getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
 					</div>
 				</v-card>
@@ -92,9 +91,21 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'treeGrid',
-			loadTree: false,
+			loadTree: true,
 			detailList: myDetail,
 			addRowFg: false,
+			dataPathExample: {
+				"treeGrid": {
+					data: sampleData,
+					column: [
+						{ header: '메뉴명', name: 'menuNm' },
+						{ header: 'prgmId ', name: 'prgmId', hidden: true },
+						{ header: 'sysDivCd ', name: 'sysDivCd', hidden: true },
+					],
+					option: myOptions,
+
+				}
+			}
 		};
 	},
 	computed: {
@@ -151,17 +162,10 @@ export default {
 		gridInit() {
 			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 30;
 			const myOptionsTree = {
-				columnOptions: {
-					resizable: true,
-				},
 				treeColumnOptions: {
 					name: 'menuNm',
 				},
 				scrollX: false,
-				header: {
-					height: 37,
-				},
-				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -174,17 +178,6 @@ export default {
 			this.setGridColumn({
 				gridKey: this.gridName,
 				value: [
-					{
-						header: '',
-						name: '',
-						align: 'center',
-						width: 20,
-						formatter: (props) => {
-							return `<label class="custom-radio">
-										<span class="radio-mark"></span>
-									</label>`;
-						}
-					},
 					{ header: '메뉴명', name: 'menuNm' },
 					{ header: 'prgmId ', name: 'prgmId', hidden: true },
 					{ header: 'sysDivCd ', name: 'sysDivCd', hidden: true },

pages/comm/auth/MenuRoleMngPage.vue

@@ -5,12 +5,22 @@
 				<v-card class="searchFilter">
 					<v-row algin="end" no-gutters>
 						<v-col :cols="3">
-							<InputText :parentPrgmId="myPrgmId" label="역할ID" valueNm="roleId" :searchOption="true"
+							<InputText
-								customClass="input-large" />
+								: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"
+							<InputText
-								customClass="input-large" />
+								:parentPrgmId="myPrgmId"
+								label="역할명"
+								valueNm="roleNm"
+								:searchOption="true"
+								customClass="input-large"
+							/>
 						</v-col>
 						<v-col class="text-right d-flex justify-end align-end mr-3">
 							<BtnSearch size="large" />
@@ -20,72 +30,102 @@
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents">
+		<v-row ref="contents" >
-			<v-col cols="12" lg="3">
+			<v-col cols="12" lg="2" >
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
-					<div ref="gridParent" class="px-5" style="height: 60vh;">
+					<div class="px-5" style="height:calc(100% - 100px)">
-						<component :is="loadGrid ? 'Grid' : null" :ref="gridName + myPrgmId" :gridName="gridName"
+						<div
-							:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
+							ref="gridParent"
+							class="w100 h100"
+						>
+							<component
+								:is="loadGrid ? 'Grid' : null"
+								:ref="gridName + myPrgmId"
+								:gridName="gridName"
+								:parentPrgmId="myPrgmId"
+								@getRowsData="getRowData"
+							/>
+						</div>
 					</div>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="9" class="pl-0">
+			<v-col cols="12" lg="10" >
 				<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-row
-						<v-col class="h100" style="max-width: 400px;">
+						align="center"
-							<v-card-title class="pl-0 pb-3">
+						no-gutters
-								<span class="custom-title-4">[미배정]메뉴리스트</span>
+						:style="{ height: 'calc(100% - 62px)' }"
-							</v-card-title>
+						class="px-5"
-							<!-- <span class="body-1 font-weight-bold d-flex align-center"
+					>
-								:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span> -->
+						<v-col :cols="4" class="h100">
-							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
+							<span
-								<!-- <div
+								class="body-1 font-weight-bold d-flex align-center"
+								:style="{ minHeight: '36px' }"
+								>[미배정]메뉴리스트</span
+							>
+							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
+								<div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
-							</div> -->
+									<component
-								<component :is="loadTreeGrid ? 'Grid' : null" :ref="gridName2 + myPrgmId"
+										:is="loadTreeGrid ? 'Grid' : null"
-									:gridName="gridName2" :parentPrgmId="myPrgmId" @getRowsData="getUnAsgnRowData" />
+										:ref="gridName2 + myPrgmId"
+										:gridName="gridName2"
+										:parentPrgmId="myPrgmId"
+										@getRowsData="getUnAsgnRowData"
+									/>
+								</div>
 							</div>
 						</v-col>
-						<!-- <v-col :cols="1.5">
+						<v-col :cols="1">
-							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
+							<ActionButtons
-								:btnActionsFnc="dualGridBtnActions" />
+								:parentPrgmId="myPrgmId"
-						</v-col> -->
+								:leftGridName="gridName2"
-						<div class="pr-2 arrow-button">
+								:rightGridName="gridName3"
-							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
+								:btnActionsFnc="dualGridBtnActions"
-								:btnActionsFnc="dualGridBtnActions"/>
+							/>
-						</div>
+						</v-col>
 						<v-col :cols="7" class="h100">
-							<v-row justify="space-between" align="center" no-gutters class="px-5 pl-0">
+							<v-row
+								justify="space-between"
+								align="center"
+								no-gutters
+								class="px-5"
+							>
 								<v-col :cols="11">
-									<v-card-title class="pl-0 pb-3">
+									<span class="body-1 font-weight-bold"
-										<span class="custom-title-4">[배정]메뉴별권한 리스트</span>
+										>[배정]메뉴별권한 리스트</span
-									</v-card-title>
+									>
-									<!-- <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"
+									<Buttons
-										:btnActionsFnc="btnActions" />
+										:parentPrgmId="myPrgmId"
+										:bindingData="gridName3"
+										:btnActionsFnc="btnActions"
+									/>
 								</v-col>
 							</v-row>
-							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
+							<div class="px-0 mt-2" style="height:calc(100% - 64px)">
-								<!-- <div
+								<div
 									ref="treeGridParent2"
 									class="w100 h100"
 								>
-							</div> -->
+									<component
-								<component :is="loadTreeGrid2 ? 'Grid' : null" :ref="gridName3 + myPrgmId"
+										:is="loadTreeGrid2 ? 'Grid' : null"
-									:gridName="gridName3" :parentPrgmId="myPrgmId" :editorGrid="true"
+										:ref="gridName3 + myPrgmId"
-									@getRowsData="getAsgnRowData" />
+										:gridName="gridName3"
+										:parentPrgmId="myPrgmId"
+										:editorGrid="true"
+										@getRowsData="getAsgnRowData"
+									/>
+								</div>
 							</div>
 						</v-col>
 					</v-row>
@@ -251,8 +291,8 @@ export default {
 		async gridInit() {
 			//---------------------gridOption 설정 시작----------------------------
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
-			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 50;
+			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 30;
-			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 50;
+			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 30;
 			// const gridHeight = this.$refs.contents.offsetHeight - 30;
 
 			const myOptions = {
@@ -281,10 +321,8 @@ export default {
 				treeColumnOptions: {
 					name: 'menuNm',
 				},
-				rowHeight: 37,
+				scrollX: false,
-				minRowHeight: 37,
+				// scrollY: false,
-				scrollX: true,
-				scrollY: true,
 			};
 
 			this.setGridOption({
@@ -309,14 +347,11 @@ export default {
 			//---------------------gridOption 설정 끝----------------------------
 
 			//---------------------gridName3의 체크박스 설정 시작----------------------------
-			class CustomCheckbox {
+			class CustumChecbox {
 				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;
 
@@ -350,12 +385,12 @@ export default {
 			const _this = this;
 
 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70, width: 120 },
+				{ header: '역할ID', name: 'roleId', align: 'center', minWidth: 70 },
-				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left', width: 120 },
+				{ header: '역할명', name: 'roleNm', minWidth: 70 },
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'left',
+					align: 'center',
 					minWidth: 84,
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
@@ -368,17 +403,19 @@ export default {
 
 			const myTreeColumns = [
 				{
+					header: '',
+					name: '',
 					align: 'center',
 					width: 30,
-					minWidth: 60,
 					formatter: (props) => {
-						return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
+						return `<label class="custom-radio">
+									<span class="radio-mark"></span>
+								</label>`;
 					}
 				},
 				{
 					header: '메뉴명',
 					name: 'menuNm',
-					maxWidth: 120,
 					validation: {
 						dataType: 'string',
 						validatorFn: (value, row) => {
@@ -389,11 +426,14 @@ export default {
 			];
 			const myTreeColumns2 = [
 				{
+					header: '',
+					name: '',
 					align: 'center',
 					width: 30,
-					minWidth: 60,
 					formatter: (props) => {
-						return `<span class="custom-radio"><span class="radio-mark"></span></span>`;
+						return `<label class="custom-radio">
+									<span class="radio-mark"></span>
+								</label>`;
 					}
 				},
 				{ header: '역할ID', name: 'roleId', hidden: true },
@@ -404,7 +444,7 @@ export default {
 					name: 'useFg',
 					align: 'center',
 					renderer: {
-						type: CustomCheckbox,
+						type: CustumChecbox,
 					},
 				},
 				{
@@ -412,7 +452,7 @@ export default {
 					name: 'authCd1',
 					align: 'center',
 					renderer: {
-						type: CustomCheckbox,
+						type: CustumChecbox,
 					},
 				},
 				{
@@ -420,7 +460,7 @@ export default {
 					name: 'authCd2',
 					align: 'center',
 					renderer: {
-						type: CustomCheckbox,
+						type: CustumChecbox,
 					},
 				},
 				{
@@ -428,7 +468,7 @@ export default {
 					name: 'authCd3',
 					align: 'center',
 					renderer: {
-						type: CustomCheckbox,
+						type: CustumChecbox,
 					},
 				},
 				{
@@ -436,7 +476,7 @@ export default {
 					name: 'authCd4',
 					align: 'center',
 					renderer: {
-						type: CustomCheckbox,
+						type: CustumChecbox,
 					},
 				},
 				{
@@ -444,7 +484,7 @@ export default {
 					name: 'authCd5',
 					align: 'center',
 					renderer: {
-						type: CustomCheckbox,
+						type: CustumChecbox,
 					},
 				},
 				{
@@ -452,7 +492,7 @@ export default {
 					name: 'authCd6',
 					align: 'center',
 					renderer: {
-						type: CustomCheckbox,
+						type: CustumChecbox,
 					},
 				},
 			];
@@ -520,12 +560,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.$refs[this.gridName + this.myPrgmId].getData().length - 1
-									? this.pageData.rowGridSelectKey
+								? this.pageData.rowGridSelectKey
-									: 0,
+								: 0,
 						columnName: 'roleId',
 						setScroll: true,
 					});
@@ -533,7 +573,6 @@ export default {
 			});
 		},
 		async getRowData(data) {
-
 			await this.setPageData({
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: {
@@ -580,8 +619,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-								? '00'
+							? '00'
-								: 'ROOT',
+							: 'ROOT',
 				};
 				return newItem;
 			});
@@ -620,8 +659,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-								? '00'
+							? '00'
-								: 'ROOT',
+							: 'ROOT',
 				};
 				return newItem;
 			});
@@ -811,23 +850,4 @@ function numberFormatter({ value }) {
 		return value;
 	}
 }
-
 </script>
-
-
-<style lang="scss" scoped>
-::v-deep {
-	.arrow-button button {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 24px;
-		height: 24px;
-	}
-
-	.arrow-button svg {
-		width: 14px;
-		height: 14px;
-	}
-}
-</style>

pages/comm/auth/RoleMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -206,12 +205,12 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'left' },
+				{ header: '역할ID', name: 'roleId', align: 'center' },
 				{ header: '역할명', name: 'roleNm' },
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -432,7 +431,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		value: { '1': true, '0': false },
 		required: true,
 	},
@@ -445,7 +444,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 	},
 	// {
 	//   type: "InputText",
@@ -464,7 +463,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -476,7 +475,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -488,7 +487,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -500,7 +499,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		placeholder: '시스템 자동입력',
 	},
 ];

pages/comm/auth/UserRoleMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -13,8 +12,8 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
-								:labelCols="12"
+								labelCols="12" 
-								:textCols="12"
+								textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -82,6 +81,7 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
+								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -90,7 +90,7 @@
 			<!-- 사용자 정보 -->
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5 h100">
-					<v-card-title class="custom-title-4 pb-0">사용자 정보</v-card-title>
+					<v-card-title class="custom-title-4">사용자 정보</v-card-title>
 					<div class="px-5" :style="{ height: 'calc(100% - 62.5px)' }">
 						<v-tabs v-model="tab">
 							<v-tab
@@ -128,13 +128,13 @@
 
 									<!-- 역할수정 -->
 									<template v-else-if="item.id == 'AsgnRoleByUser'">
-										<v-col :cols="12" class="overflow-y-scroll grid-toggle-section">
+										<v-col :cols="3" class="h100">
 											<v-card-title
-												class="pa-0 custom-subtitle-tab"
+												class="pa-0 custom-title-4"
 												style="min-height:36px;"
 												>역할리스트</v-card-title
 											>
-											<div class="py-5">
+											<div style="height:calc(100% - 36px)" class="py-5">
 												<component
 													class="w100"
 													:is="loadGridTab2 ? 'Grid' : null"
@@ -146,18 +146,17 @@
 												/>
 											</div>
 										</v-col>
-										<v-col :cols="12" class="d-flex justify-center">
+										<v-col :cols="1" class="d-flex justify-center">
 											<ActionButtons
 												:parentPrgmId="myPrgmId"
 												:leftGridName="gridName2"
 												:rightGridName="gridName3"
 												:btnActionsFnc="dualGridBtnActions"
-												directionBtn="vertically"
 											/>
 										</v-col>
-										<v-col :cols="12" class="h100">
+										<v-col :cols="8" class="h100">
 											<div class="d-flex align-center justify-space-between">
-												<v-card-title class="pa-0 custom-subtitle-tab">
+												<v-card-title class="pa-0 custom-title-4">
 													사용자 역할</v-card-title
 												>
 												<div>
@@ -310,10 +309,12 @@ export default {
 	},
 	methods: {
 		async init() {
-			await this.gridInit();
+			 this.gridInit();
 		},
+
 		// 사용자 리스트 그리드 세팅
 		gridInit() {
+
 			const gridHeight = this.$refs.gridParent.offsetHeight - 90;
 
 			const myOptions = {
@@ -896,7 +897,6 @@ const defaultData = {
 };
 
 const myColumns = [
-	
 	{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
 	{ header: '사용자명', name: 'userNm' },
 	{ header: '사용자ID', name: 'userLoginId' },
@@ -912,18 +912,7 @@ const myColumns = [
 ];
 
 const unAsgnRoleByUserColumns = [
-	{
+	{ header: '역할ID', name: 'roleId', align: 'center' },
-		header: '',
-		name: '',
-		align: 'center',
-		width: 50,
-		formatter: (props) => {
-			return `<label class="custom-radio">
-						<span class="radio-mark"></span>
-					</label>`;
-		}
-	},	
-	{ header: '역할ID', name: 'roleId', align: 'left' },
 	{ header: '역할명', name: 'roleNm' },
 	{ header: '적용시작일', name: 'aplyStartDt', hidden: true },
 	{ header: '적용종료일', name: 'aplyEndDt', hidden: true },
@@ -932,7 +921,6 @@ const unAsgnRoleByUserColumns = [
 ];
 
 const asgnRoleByUserColumns = [
-	
 	{ header: '역할ID', name: 'roleId', align: 'center' },
 	{ header: '역할명', name: 'roleNm' },
 	{
@@ -946,19 +934,7 @@ const asgnRoleByUserColumns = [
 	{ header: 'comId', name: 'comId', hidden: true },
 ];
 
-const asgnMenuByUserColumns = [
+const asgnMenuByUserColumns = [{ header: '메뉴명', name: 'menuNm' }];
-	{
-		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 [
@@ -971,7 +947,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			required: false,
 			placeholder: '시스템 자동입력',
@@ -983,7 +959,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pl-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			required: true,
 		},
@@ -996,7 +972,8 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4 mt-2',
+			class: 'py-2 pr-4',
+			iconShow: true,
 			required: true,
 		},
 		{
@@ -1006,7 +983,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pl-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			required: true,
 		},
@@ -1017,7 +994,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			list: blocCdList.map(item => ({
 				text: item.blocNm,
@@ -1032,7 +1009,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pl-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 		},
 		{
@@ -1043,7 +1020,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1055,7 +1032,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pl-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1067,7 +1044,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1079,7 +1056,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pl-4 mt-2',
+			class: 'py-2 pr-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1097,4 +1074,67 @@ function sha512(str) {
 		.update(str)
 		.digest('hex');
 }
-</script>
+
+
+
+const dataMockExample = [
+  {
+    userNo: 1,
+    userNm: '홍길동',
+    userLoginId: 'hong123',
+    userPswd: 'password123',
+    blocId: 'B001',
+    email: 'hong@example.com',
+    regUserNo: 100,
+    regDttm: '2025-07-01 10:00:00',
+    procUserNo: 101,
+    procDttm: '2025-07-15 14:30:00',
+    comId: 'C001',
+    deptId: 'D001'
+  },
+  {
+    userNo: 2,
+    userNm: '김영희',
+    userLoginId: 'kimyh',
+    userPswd: 'securePass456',
+    blocId: 'B002',
+    email: 'kim@example.com',
+    regUserNo: 102,
+    regDttm: '2025-07-02 11:20:00',
+    procUserNo: 103,
+    procDttm: '2025-07-16 09:45:00',
+    comId: 'C002',
+    deptId: 'D002'
+  },
+  {
+    userNo: 3,
+    userNm: '관리자',
+    userLoginId: 'user',
+    userPswd: 'securePass456',
+    blocId: 'B002',
+    email: 'kim@example.com',
+    regUserNo: 102,
+    regDttm: '2025-07-02 11:20:00',
+    procUserNo: 103,
+    procDttm: '2025-07-16 09:45:00',
+    comId: 'C002',
+    deptId: 'D002'
+  },
+  {
+    userNo: 4,
+    userNm: '사용자',
+    userLoginId: 'admin',
+    userPswd: 'securePass456',
+    blocId: 'B002',
+    email: 'kim@example.com',
+    regUserNo: 102,
+    regDttm: '2025-07-02 11:20:00',
+    procUserNo: 103,
+    procDttm: '2025-07-16 09:45:00',
+    comId: 'C002',
+    deptId: 'D002'
+  }
+];
+
+
+</script>

pages/comm/base/BatchLogMngPage.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -12,6 +11,7 @@
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
+								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -21,6 +21,7 @@
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
+								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -32,6 +33,7 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
+								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -40,13 +42,13 @@
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
-								customClass="datepicker-large"
+								:customClass="'input-large'"
 							/>
 						</v-col>
-						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
+						<v-col :cols="2" class="text-right d-flex align-end justify-end ga-1" style="gap: 4px">
-							<BtnSearch />
+							<BtnSearch size="large" />
 							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
-						</div>
+						</v-col>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -139,7 +141,7 @@ export default {
 			myPrgmId: myPrgmId,
 			loadGrid: false,
 			gridName: 'rowGrid',
-			// rowGridOrigin: [],
+			rowGridOrigin: [],
 			detailList: myDetail,
 		};
 	},
@@ -219,14 +221,14 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: 'No.', name: 'batchLogSeq', align: 'right', width: 100 },
+				{ header: 'No.', name: 'batchLogSeq', align: 'center', width: 100 },
-				{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
+				{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
 				{ header: '배치명', name: 'batchNm', align: 'left', width: 150 },
-				{ header: '실행 일자', name: 'execDt', align: 'right', width: 80 },
+				{ header: '실행 일자', name: 'execDt', align: 'center', width: 80 },
 				{
 					header: '실행 결과',
 					name: 'execRsltCd',
-					align: 'left',
+					align: 'center',
 					width: 80,
 					formatter({ value }) {
 						let retVal = '';
@@ -243,7 +245,7 @@ export default {
 				{
 					header: '배치 시작 일시',
 					name: 'batchStrtDttm',
-					align: 'left',
+					align: 'center',
 					width: 160,
 				},
 				{
@@ -295,7 +297,7 @@ export default {
 
 			// 엑셀 다운로드용 데이터 재정렬
 			this.xlsDataBind(res);
-			// this.rowGridOrigin = Utility.copyObj(newRes);
+			this.rowGridOrigin = Utility.copyObj(newRes);
 			this.setGridData({
 				gridKey: this.gridName,
 				value: newRes,
@@ -430,4 +432,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
+</script>

pages/comm/base/BatchMngPage.vue

@@ -1,8 +1,7 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
-		<common-page-title />
+		<v-row ref="searchFilter">
-		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -15,26 +14,36 @@
 								:customClass="'input-large'" />
 						</v-col>
 						<v-col :cols="2.5">
-							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'배치 실행 구분'"
+							<component
+								:is="'selectCodeList'"
+								:parentPrgmId="myPrgmId"
+								:label="'배치 실행 구분'"
 								:dataKey="'searchBatchExecTp'"
-								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }" :addAll="true"
+								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
-								:customClass="'select-large'" />
+								:addAll="true"
+								:customClass="'select-large'"
+							/>
 						</v-col>
-						<v-col :cols="2.5" class="pr-4">
+						<v-col :cols="2.5">
-							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
+							<component
-								:dataKey="'searchUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
+								:is="'selectCodeList'"
-								:customClass="'select-large'" />
+								:parentPrgmId="myPrgmId"
+								:label="'사용여부'"
+								:dataKey="'searchUseFg'"
+								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
+								:customClass="'select-large'"
+							/>
 						</v-col>
-						<BtnSearch size="large" class="mr-2" />
+						<BtnSearch size="large" />
 
 					</v-row>
 				</v-card>
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents" class="mt-4 h100">
+		<v-row ref="contents" class="mt-4">
 			<!-- 배치 리스트 -->
-			<v-col :cols="6" class="pr-2">
+			<v-col :cols="6" class="h100 pr-2">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<!-- <v-card-title>
@@ -46,16 +55,16 @@
 							:btnActionsFnc="btnActions" />
 					</div>
 					<div class="px-4">
-						<div ref="gridParent" class="h100 w100" style="height:calc(100% - 70px)">
+						<div ref="gridParent" class="h100 w100">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
-								:gridName="gridName" @getRowsData="getRowData" />
+								:gridName="gridName" @getRowsData="getRowData" :dataPath="dataPathExample" />
 						</div>
 						<!-- </v-card-actions> -->
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 배치 상세 -->
-			<v-col :cols="6" class="pl-3">
+			<v-col :cols="6" class="h100 pl-3">
 				<v-card class="pd-y-20 h100">
 					<v-card-title class="d-flex justify-space-between align-end pa-4">
 						<span class="tit ft-size_20 ft-weight_600">배치 상세</span>
@@ -68,23 +77,21 @@
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-dialog ref="popModal" v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8" scrollable>
+			<v-dialog ref="popModal" v-model="dialog" width="700" overlay-color="#000" overlay-opacity="0.8" scrollable>
 				<v-card style="height: 100%">
 					<v-card-title class="v-card__title d-flex align-center justify-space-between">
 						<span class="custom-title-4">DB 프로시져 파라메터 설정</span>
-						<a-button icon="close" type="text" @click="dialog = false"></a-button>
+						<div>
-
+							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
+								:btnActionsFnc="btnActionsParam" />
+						</div>
 					</v-card-title>
 					<div class="pa-5">
-						<v-row align="end" no-gutters>
+						<v-row align="center" no-gutters>
-							<v-col cols="12" class="d-flex justify-end">
+							<v-col cols="12" class="text-right"> </v-col>
-
-								<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
-									:btnActionsFnc="btnActionsParam" />
-
-							</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);">
@@ -94,9 +101,11 @@
 							</div>
 						</div>
 					</v-card-text>
-					<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
+					<v-divider></v-divider>
-						<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
+					<v-card-actions>
-						<a-button :ripple="false" type="primary" @click="setParamChangeData()">확인</a-button>
+						<v-spacer></v-spacer>
+						<v-btn color="primary" dark @click="setParamChangeData()">확인</v-btn>
+						<v-btn color="primary" dark @click="dialog = false">닫기</v-btn>
 					</v-card-actions>
 				</v-card>
 			</v-dialog>
@@ -146,16 +155,76 @@ export default {
 	data() {
 		return {
 			myPrgmId: myPrgmId,
-			loadGrid: false,
+			loadGrid: true,
 			gridName: 'rowGrid',
+			dataPathExample: {
+				"rowGrid": {
+					data: [
+						{
+							"batchId": "BATCH001",
+							"batchNm": "일일 데이터 백업",
+							"batchExecTp": "자동 실행",
+							"batchDupExecFg": "N",
+							"useFg": "사용"
+						},
+						{
+							"batchId": "BATCH002",
+							"batchNm": "월간 리포트 생성",
+							"batchExecTp": "수동 실행",
+							"batchDupExecFg": "Y",
+							"useFg": "사용"
+						},
+						{
+							"batchId": "BATCH003",
+							"batchNm": "로그 정리 작업",
+							"batchExecTp": "자동 실행",
+							"batchDupExecFg": "N",
+							"useFg": "미사용"
+						},
+						{
+							"batchId": "BATCH004",
+							"batchNm": "사용자 통계 수집",
+							"batchExecTp": "예약 실행",
+							"batchDupExecFg": "Y",
+							"useFg": "사용"
+						},
+						{
+							"batchId": "BATCH005",
+							"batchNm": "서버 상태 점검",
+							"batchExecTp": "수동 실행",
+							"batchDupExecFg": "N",
+							"useFg": "미사용"
+						}
+					]
 
+					,
+					column: [
+						{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
+						{ header: '배치명', name: 'batchNm', minWidth: 200 },
+						{
+							header: '배치 실행 구분',
+							name: 'batchExecTp',
+							align: 'left',
+							minWidth: 190,
+						},
+						{ header: '배치 중복 여부', name: 'batchDupExecFg', hidden: true },
+						{
+							header: '사용여부',
+							name: 'useFg',
+							align: 'center',
+							width: 145,
+						},
+					],
+
+				}
+			},
 			// rowGridOrigin: [],
 			detailList: myDetail,
 
 			// 파라메터 셋팅용 변수
 			dialog: false,
 			gridNameParam: 'paramGrid',
-			paramLoadGrid: false,
+			paramLoadGrid: true,
 			selectedGridNameParamRow: null,
 		};
 	},
@@ -223,7 +292,7 @@ export default {
 		}),
 		init() {
 			// this.layoutInit();
-			this.gridInit();
+			// this.gridInit();
 			this.gridParamInit();
 		},
 		// layoutInit() {
@@ -240,10 +309,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				header: {
-					height: 37,
-				},
-				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -253,7 +318,7 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
+				{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
 				{ header: '배치명', name: 'batchNm', minWidth: 200 },
 				{
 					header: '배치 실행 구분',
@@ -275,6 +340,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
+					align: 'center',
 					width: 145,
 					formatter({ value }) {
 						let retVal = '';
@@ -318,7 +384,7 @@ export default {
 		},
 		async search() {
 			// console.log("search");
-			await this.getRowGridData();
+			// await this.getRowGridData();
 			await this.setPageData({
 				isFind: false,
 			});
@@ -547,7 +613,7 @@ export default {
 			}
 		},
 		gridParamInit() {
-
+			
 			const gridHeight = this.$refs.gridParent.offsetHeight - 36;
 			const myOptions = {
 				columnOptions: {
@@ -558,35 +624,32 @@ export default {
 				selectionUnit: 'row',
 				editingEvent: 'click',
 				scrollX: false,
-				header: {
-					height: 37,
-				},
-				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridNameParam,
 				value: myOptions,
 			});
-			setTimeout(() => { });
+			// setTimeout(() => { });
 
-			let modeList = [];
+			// let modeList = [];
-			const modeIn = { text: 'IN', value: 'IN' };
+			// const modeIn = { text: 'IN', value: 'IN' };
-			const modeOut = { text: 'OUT', value: 'OUT' };
+			// const modeOut = { text: 'OUT', value: 'OUT' };
-			modeList.push(modeIn);
+			// modeList.push(modeIn);
-			modeList.push(modeOut);
+			// modeList.push(modeOut);
-			let typeList = [];
+			// let typeList = [];
-			const typeInt = { text: 'INT', value: 'int' };
+			// const typeInt = { text: 'INT', value: 'int' };
-			const typeStr = { text: 'STRING', value: 'str' };
+			// const typeStr = { text: 'STRING', value: 'str' };
-			const typeFunc = { text: 'FUNCTION', value: 'function' };
+			// const typeFunc = { text: 'FUNCTION', value: 'function' };
-			typeList.push(typeInt);
+			// typeList.push(typeInt);
-			typeList.push(typeStr);
+			// typeList.push(typeStr);
-			typeList.push(typeFunc);
+			// typeList.push(typeFunc);
 
 			const myColumns = [
 				{ header: 'ID', name: 'id', editor: 'text' },
 				{
 					header: 'MODE',
 					name: 'mode',
+					align: 'center',
 					formatter({ value }) {
 						return value == ('OUT' || 'out') ? 'OUT' : 'IN';
 					},
@@ -601,27 +664,27 @@ export default {
 					header: 'Type',
 					name: 'type',
 					align: 'center',
-					formatter({ value }) {
+					// formatter({ value }) {
-						let retVal = '';
+					// 	let retVal = '';
-						switch (value) {
+					// 	switch (value) {
-							case 'int':
+					// 		case 'int':
-								retVal = 'INT';
+					// 			retVal = 'INT';
-								break;
+					// 			break;
-							case 'str':
+					// 		case 'str':
-								retVal = 'STRING';
+					// 			retVal = 'STRING';
-								break;
+					// 			break;
-							case 'function':
+					// 		case 'function':
-								retVal = 'FUNCTION';
+					// 			retVal = 'FUNCTION';
-								break;
+					// 			break;
-						}
+					// 	}
-						return retVal;
+					// 	return retVal;
-					},
+					// },
-					editor: {
+					// editor: {
-						type: 'select',
+					// 	type: 'select',
-						options: {
+					// 	options: {
-							listItems: typeList,
+					// 		listItems: typeList,
-						},
+					// 	},
-					},
+					// },
 				},
 				{ header: '값', name: 'val', editor: 'text' },
 				{ header: 'rowStat', name: 'rowStat', hidden: true },
@@ -636,53 +699,90 @@ export default {
 		},
 		getRowParamData() {
 			this.paramLoadGrid = false;
-			let res = [];
+			// let res = [];
 
 			// /* this.pageData.paramStrData 처리 */
 			// // console.log("this.pageData.paramStrData : ", JSON.parse(this.pageData.paramStrData));
-			let rowData = {};
+			// let rowData = {};
-			if (
+			// if (
-				this.pageData.paramStrData.startsWith('{') &&
+			// 	this.pageData.paramStrData.startsWith('{') &&
-				this.pageData.paramStrData.endsWith('}')
+			// 	this.pageData.paramStrData.endsWith('}')
-			) {
+			// ) {
-				rowData = JSON.parse(this.pageData.paramStrData);
+			// 	rowData = JSON.parse(this.pageData.paramStrData);
-			}
+			// }
-			var keys = Object.keys(rowData); //키를 가져옵니다. 이때, keys 는 반복가능한 객체가 됩니다.
+			// var keys = Object.keys(rowData); //키를 가져옵니다. 이때, keys 는 반복가능한 객체가 됩니다.
-			for (var i = 0; i < keys.length; i++) {
+			// for (var i = 0; i < keys.length; i++) {
-				var key = keys[i];
+			// 	var key = keys[i];
-				res.push(rowData[key]);
+			// 	res.push(rowData[key]);
-			}
+			// }
 
-			const newRes = res.map(item => {
+			// const newRes = res.map(item => {
-				const newObj = {
+			// 	const newObj = {
-					...item,
+			// 		...item,
-					rowStat: null,
+			// 		rowStat: null,
-					id: item.id || '',
+			// 		id: item.id || '',
-					mode: item.mode || 'in',
+			// 		mode: item.mode || 'in',
-					type: item.type || 'str',
+			// 		type: item.type || 'str',
-					val: item.val || '',
+			// 		val: item.val || '',
-				};
+			// 	};
-				return newObj;
+			// 	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(() => {
+			// this.$nextTick(() => {
-				if (newRes.length > 0) {
+			// 	if (newRes.length > 0) {
-					try {
+			// 		try {
-						this.$refs[this.gridNameParam].focus({
+			// 			this.$refs[this.gridNameParam].focus({
-							//rowKey: 0,
+			// 				//rowKey: 0,
-							rowKey: 0,
+			// 				rowKey: 0,
-							setScroll: true,
+			// 				setScroll: true,
-						});
+			// 			});
-					} catch (error) {
+			// 		} catch (error) {
-						console.log('error[nextTick grid] : ', error);
+			// 			console.log('error[nextTick grid] : ', error);
-					}
+			// 		}
-				}
+			// 	}
-			});
+			// });
 			this.paramLoadGrid = true;
 		},
 		xlsDataBind(res) {
@@ -711,21 +811,22 @@ export default {
 		},
 		inputClick(event, item, valueNm) {
 			if (valueNm == 'refVal1') {
-				const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
+				this.dialog = true;
-					'getFocusedCell',
+				// const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
-				).rowKey;
+				// 	'getFocusedCell',
-				const selectRowData = this.$refs[this.gridName].gridInstance.invoke(
+				// ).rowKey;
-					'getRow',
+				// const selectRowData = this.$refs[this.gridName].gridInstance.invoke(
-					rowIdxKey,
+				// 	'getRow',
-				);
+				// 	rowIdxKey,
+				// );
 
-				if (selectRowData.batchExecTp == 'DP') {
+				// if (selectRowData.batchExecTp == 'DP') {
-					// 여기에 팝업 레이어 띠우기 기능 추가
+				// 	// 여기에 팝업 레이어 띠우기 기능 추가
-					this.pageData.paramStrData = event.target.value;
+				// 	this.pageData.paramStrData = event.target.value;
-					this.pageData.paramChangeDataTarget = event.target;
+				// 	this.pageData.paramChangeDataTarget = event.target;
-					this.getRowParamData();
+				// 	this.getRowParamData();
-					this.dialog = true;
+				// 	this.dialog = true;
-				}
+				// }
 			}
 		},
 		setParamChangeData() {

pages/comm/base/CalendarMngPage.vue

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

pages/comm/base/CommCdMngPage.vue

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

pages/comm/base/NoticeMngPage.vue

@@ -3,22 +3,22 @@
 		<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" @click="listPageButtonGroupClickEvent('write')" :ripple="false"
+								<a-button type="primary" size="large" @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" 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"
+								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-									:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
+									 @getRowsData="getRowData" />
 							</div>
 						</v-col>
 					</v-row>
@@ -27,45 +27,43 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'">
+		<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"
+							<a-button @click="viewPageButtonGroupClickEvent('list')" type="primary" :ripple="false" class="mr-1"
-								class="mr-1" icon="unordered-list">목록</a-button>
+								icon="unordered-list">목록</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false"
+							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false" class="mr-1"
-								class="mr-1" icon="send-outlined">
+								icon="send-outlined">
 								<v-icon small :class="['mr-2']">$icoSend</v-icon>
 								답글
 							</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false"
+							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false" class="mr-1"
-								class="mr-1" icon="edit">수정</a-button>
+								icon="edit">수정</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost
+							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
-								icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12" class="mt-5 pb-4">
+					<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: 50vh;" class="pa-0 custom-view">
+					<v-col :cols="12" style="min-height: 30vh;" class="pa-0">
-						<v-card class="pa-3" style="overflow-y:auto;">
+						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
-							<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
+							:initialValue="viewActionData.content" theme="white"
-								:initialValue="viewActionData.content" theme="white"
+							:class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
-								:class="[isDarkMode ? 'theme--white' : 'theme--black']" />
-						</v-card>
 					</v-col>
 					<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" style="background-color: unset;">
+						<div v-for="fileData in viewActionData.fileData" 
+							:key="fileData.apndFileId" 
+							class="file-item">
 							<a @click.prevent="downloadFile(fileData)">
 								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' +
+									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
-										fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@@ -75,12 +73,12 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'">
+		<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="mt-4">
 							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
@@ -88,34 +86,39 @@
 							</v-text-field>
 						</v-col>
 						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
-							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg"
+							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
-							:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 						</v-col>
-
+	
 						<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"
+									<a-icon type="delete" class="v-icon pointer" @click="writeActionData.fileData.splice(index, 1)" />
-										@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
+							<v-file-input 
-								hide-input class="d-none" prepend-icon="mdi-tray-arrow-up"></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"
+							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false" class="mr-2">취소</a-button>
-								class="mr-2">취소</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false" type="primary">등록</a-button>
-							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false"
-								type="primary">등록</a-button>
 						</v-col>
 					</v-row>
 				</div>
@@ -123,7 +126,7 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'">
+		<div v-if="pageActionFlag == 'reply'" >
 			<v-card class="pa-5">
 				<v-row align="center" class="mt-0">
 					<v-col :cols="12" class="">
@@ -131,97 +134,82 @@
 					</v-col>
 					<v-col :cols="12" class="mt-4">
 						<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
-						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined hide-details>
+						<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" 
+						<editor ref="tuiReplyEditor" height="100%" initialEditType="wysiwyg" />
-						:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 					</v-col>
 					<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"
+								<a-icon type="delete" class="v-icon pointer" @click="replyActionData.fileData.splice(index, 1)" />
-									@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"
+						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData" hide-details="true" class="d-none">
-							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"
+						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false" type="primary">등록</a-button>
-							type="primary">등록</a-button>
 					</v-col>
 				</v-row>
 			</v-card>
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'">
+		<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">
 							<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
+							<v-text-field v-model="updateActionData.title" class="v-input__custom" hide-details outlined>
-								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"
+								:initialValue="updateActionData.content" />
-								:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 						</v-col>
 						<v-col :cols="6" class="mt-5">
-							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+								<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
-							<div class="" v-if="updateActionData.fileData">
+								<div class="" v-if="updateActionData.fileData">
-								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
+									<div 
-									class="file-item d-flex justify-space-between">
+										v-for="(fileData, index) in updateActionData.fileData"
-									<div class="file-item-detail">
+										:key="fileData.apndFileId" 
-										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
+										class="file-item d-flex justify-space-between">
-										<span href="#" class="file-item-name">{{ fileData.name }}</span>
+										<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-icon type="delete" class="v-icon pointer"
-										@click="updateActionData.fileData.splice(index, 1)" />
 								</div>
-							</div>
+								<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()" >
-							<div class="" v-if="updateActionData.currentFileList">
+									업로드
-								<div v-for="(fileData, index) in updateActionData.currentFileList"
+								</a-button>
-									:key="fileData.apndFileId" class="file-item d-flex justify-space-between">
+								<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
-									<div class="file-item-detail">
+									hide-details="true" class="d-none">
-										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
+								</v-file-input>
-										<span @click.prevent="downloadFile(fileData)" href="#"
-											class="file-item-name pointer">{{ fileData.apndFileNm + '.' +
-												fileData.apndFileExt }}</span>
-									</div>
-									<a-icon type="delete" class="v-icon pointer"
-										@click="addFileToDeleteFileList(fileData)" />
-								</div>
-							</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('cancel')" >취소</a-button>
-							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary">등록</a-button>
+							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary" >등록</a-button>
 						</v-col>
 					</v-row>
 				</div>
@@ -307,6 +295,8 @@ export default {
 				postGrpOrd: null,
 				postOrgNo: null,
 			},
+			dataPathMock: {},
+
 		};
 	},
 	computed: {
@@ -351,7 +341,7 @@ export default {
 			chkOpenTabList: 'chkOpenTabList',
 			getDomain: 'modules/list/getDomain',
 		}),
-		onTest() {
+		onTest(){
 			console.log(this.writeActionData.fileData);
 		},
 		async init() {
@@ -410,11 +400,7 @@ export default {
 		gridInit() {
 			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),
@@ -435,7 +421,7 @@ export default {
 					align: 'center',
 					hidden: true,
 				},
-				{ header: '번호', name: 'postNo', width: 150, align: 'right' },
+				{ header: '번호', name: 'postNo', width: 150, align: 'center' },
 				{
 					header: '원글번호',
 					name: 'postOrgNo',
@@ -465,9 +451,9 @@ export default {
 					hidden: true,
 				},
 				{ header: '제목', name: 'title', align: 'left' },
-				{ header: '작성자', name: 'regUserNo', width: 250, align: 'right' },
+				{ header: '작성자', name: 'regUserNo', width: 250, align: 'center' },
 				{ header: '작성일', name: 'regDttm', width: 250, align: 'center' },
-				{ header: '조회수', name: 'viewCnt', width: 150, align: 'right' },
+				{ header: '조회수', name: 'viewCnt', width: 150, align: 'center' },
 				// {header: "파일아이디", name:"apndFileUuid", width:150, align:"center"}, // 수정필요
 			];
 
@@ -489,7 +475,7 @@ export default {
 				resKey: 'postData',
 				sendParam: params,
 			});
-
+			
 			this.setGridData({
 				gridKey: this.gridName,
 				value: res,
@@ -1034,6 +1020,15 @@ 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>
@@ -1047,46 +1042,23 @@ const defaultData = {
 	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: 0;
+		height: 100%;
-
 		@each $theme in dark, light {
 			@include theme($theme);
-			border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");
+			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-light .toastui-editor-mode-switch .tab-item {
-		color: #000000E0
-	}
-
-	.v-icon.anticon-delete svg {
-		width: 14px;
-		height: 14px;
-	}
 }
 </style>

pages/comm/base/PrgmMngPage.vue

@@ -1,21 +1,33 @@
 <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="'사용여부'"
+							<component
-								:dataKey="'selectUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
+								:is="'selectCodeList'"
-								:addAll="true" customClass="select-large" />
+								:parentPrgmId="myPrgmId"
+								:label="'사용여부'"
+								:dataKey="'selectUseFg'"
+								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
+								:addAll="true"
+								customClass="select-large"
+							/>
 						</v-col>
-						<v-col :cols="3">
+						<v-col :cols="4">
-							<InputText :parentPrgmId="myPrgmId" label="프로그램명" valueNm="prgmNm" :searchOption="true"
+							<InputText
-								:labelCols="12" :textCols="12" customClass="input-large" />
+								:parentPrgmId="myPrgmId"
+								label="프로그램명"
+								valueNm="prgmNm"
+								:searchOption="true"
+								:labelCols="12"
+								:textCols="12"
+								customClass="input-large"
+							/>
 						</v-col>
-						<v-col :cols="6" class="text-right">
+						<v-col :cols="5" class="text-right">
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@@ -25,32 +37,47 @@
 
 		<v-row ref="contents">
 			<!-- 프로그램 리스트 -->
-			<v-col :cols="5">
+			<v-col :cols="5" >
-				<v-card class="pa-5">
+				<v-card class="pb-5">
-					<div class="d-flex align-center justify-space-between">
+					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">프로그램 리스트</v-card-title>
 						<div>
-							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
+							<Buttons
-								:btnActionsFnc="btnActions" />
+								:parentPrgmId="myPrgmId"
+								:bindingData="gridName"
+								:detailList="detailList"
+								:btnActionsFnc="btnActions"
+							/>
 						</div>
 					</div>
-					<div ref="gridParent" class="pt-5" style="height: 60vh">
+					<div style="min-height: 60vh">
-						<!-- <div ref="gridParent" class="px-5 h100">
+						<div ref="gridParent" class="px-5 h100">
-						</div> -->
+							<component
-						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
+								:ref="gridName"
-							:gridName="gridName" @getRowsData="getRowData" />
+								:is="loadGrid ? 'Grid' : null"
+								:parentPrgmId="myPrgmId"
+								:gridName="gridName"
+								@getRowsData="getRowData"
+								:dataPath="dataPathMock"
+							/>
+						</div>
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
-			<v-col :cols="7">
+			<v-col :cols="7" >
 				<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"
+						<component
-							:detailList="detailList" @gridEditingFinish="gridEditingFinish" />
+							:is="'Form'"
+							:parentPrgmId="myPrgmId"
+							:bindingData="gridName"
+							:detailList="detailList"
+							@gridEditingFinish="gridEditingFinish"
+						/>
 						<!-- <div class="w100">
 						</div> -->
 					</div>
@@ -103,6 +130,23 @@ export default {
 			gridName: 'rowGrid',
 			// rowGridOrigin: [],
 			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: {
+						scrollY: false,
+						scrollX: false,
+					}
+        }
+      },
 		};
 	},
 	computed: {
@@ -174,17 +218,17 @@ export default {
 			const gridHeight = this.$refs.gridParent.offsetHeight - 36;
 
 			const myOptions = {
-				scrollY: true,
+				scrollX: false,
 			};
 			// console.log("this.pageData", this.pageData)
 			const _this = this;
 			const myColumns = [
-				{ header: '프로그램ID', name: 'prgmId', align: 'left' },
+				{ header: '프로그램ID', name: 'prgmId', align: 'center' },
-				{ header: '프로그램명', name: 'prgmNm', align: 'left' },
+				{ header: '프로그램명', name: 'prgmNm' },
 				{
 					header: '타입',
 					name: 'prgmTpCd',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						return value ? (value === '1' ? '프로그램' : '팝업') : null;
 					},
@@ -192,7 +236,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.selectUseFgList.filter(
@@ -218,6 +262,8 @@ export default {
 			});
 
 			// this.getRowGridData();
+
+			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -250,7 +296,6 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-			this.loadGrid = true;
 
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
@@ -259,23 +304,18 @@ 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.$refs[this.gridName].getData().length - 1
-									? this.pageData.rowGridSelectKey
+								? this.pageData.rowGridSelectKey
-									: 0,
+								: 0,
 						setScroll: true,
 					});
 				}
 			});
 		},
 		async getRowData(data, gridName) {
-			// 	gridKey: gridName,
-			// 	gridSelect: true,
-			// 	rowGridSelectKey: data.rowKey,
-			// 	rowGridSelectData: data,
-			// });
 			this.setGridSelectData({
 				gridKey: gridName,
 				gridSelect: true,
@@ -287,7 +327,6 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
-
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {
@@ -443,7 +482,7 @@ const myDetail = [
 		valueNm: 'prgmTpCd',
 		essential: true,
 		cols: 6,
-		class: 'py-2 pt-5',
+		class: 'py-2',
 		list: [
 			{ text: '프로그램', value: '1' },
 			{ text: '팝업', value: '2' },
@@ -458,11 +497,10 @@ const myDetail = [
 		essential: true,
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pt-13',
+		class: 'py-2',
 		value: { '1': true, '0': false },
 		required: true,
 		textCols: 12,
-		labelCols:12,
 		iconShow: true
 	},
 	{
@@ -471,7 +509,7 @@ const myDetail = [
 		valueNm: 'url',
 		disabled: false,
 		cols: 12,
-		class: 'py-2 pt-4',
+		class: 'py-2',
 		required: true,
 		textCols: 12,
 		iconShow: true
@@ -482,7 +520,7 @@ const myDetail = [
 		valueNm: 'regUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2 pt-5',
+		class: 'py-2',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -493,7 +531,7 @@ const myDetail = [
 		valueNm: 'regDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2 pt-5',
+		class: 'py-2',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -504,7 +542,7 @@ const myDetail = [
 		valueNm: 'procUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2 pt-5',
+		class: 'py-2',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -515,10 +553,19 @@ const myDetail = [
 		valueNm: 'procDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2 pt-5',
+		class: 'py-2',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
 	},
 ];
+
+
+import { getPathDataExample } from '@/const/const'
+const dataPathDataExample = getPathDataExample({
+  field1: 'PRG0001',
+  field2: '대시보드',
+  field3: '프로그램', 
+	field4: '사용'
+});
 </script>

pages/comm/base/ReadObjectMngPage.vue

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

pages/ems/base/AddInfoMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -13,6 +12,7 @@
 								dataKey="searchAddGrp"
 								:sendParam="{ useFg: '1' }"
 								:addAll="true"
+								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -22,6 +22,7 @@
 								label="추가 정보명"
 								valueNm="addInfoNm"
 								:searchOption="true"
+								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -288,7 +289,7 @@ export default {
 					header: 'Data 형식',
 					name: 'addInfoDataKind',
 					minWidth: 85,
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.addInfoDataKindList.filter(
@@ -305,7 +306,7 @@ export default {
 					header: '사용여부',
 					name: 'useFg',
 					minWidth: 85,
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						value = value === true ? '1' : '0';
@@ -545,7 +546,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		required: true,
 	},
 	{
@@ -557,7 +558,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		list: 'addInfoDataKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -572,7 +573,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4 mt-2 d-flex align-items-center',
+		class: 'py-2 pr-4',
 		value: { '1': true, '0': false },
 		required: true,
 	},
@@ -585,7 +586,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -597,7 +598,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -609,7 +610,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -621,7 +622,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		placeholder: '시스템 자동입력',
 	},
 ];

pages/ems/base/DashboardPage.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="l-layout">
-		<CommonPageTitle/>
+    <!-- <h1 class="h1-title">대시보드</h1> -->
+    <PageTitle text="대시보드" />
     <!-- <CheckBox
       :parentPrgmId="myPrgmId"
       label="사용여부"
@@ -599,7 +600,7 @@ export default {
       this.getEnrgUsage();
     },
     isDarkMode(newVal) {
-      // Update color of dark mode or light mode into each charts
+      // let chartOption = this.getGuageChartOption2(this.chart_01);
       let chartOption = getGaugeChartOption({
         title: this.chart_01,
         isDarkMode: this.isDarkMode,
@@ -609,6 +610,7 @@ export default {
       ]?.series?.[0]?.data?.[0]?.value;
       this.$store.state.pageData[myPrgmId][this.chart_01] = chartOption;
 
+      // let chartOption3 = this.getGuageChartOption2(this.chart_03);
       let chartOption3 = getGaugeChartOption({
         title: this.chart_03,
         isDarkMode: this.isDarkMode,
@@ -618,24 +620,12 @@ export default {
       ]?.series?.[0]?.data?.[0]?.value;
       this.$store.state.pageData[myPrgmId][this.chart_03] = chartOption3;
 
+      let mockres = this.$store.state.pageData[myPrgmId][this.chart_04];
+      this.setChart04Data(mockres);
 
-      let chart04Dat = this.$store.state.pageData[myPrgmId]['chart04Data'];
+      this.setChart02Data("test");
-      this.setChart04Data(chart04Dat);
-
-      let chartOption2 = getLineChartOption({
-            xAxisData: this.$store.state.pageData[myPrgmId][this.chart_02].xAxisData,
-            seriesData: this.$store.state.pageData[myPrgmId][this.chart_02].seriesData,
-            isDarkMode: this.isDarkMode,
-          });
-      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption2
-
-      let chartOption5 = getLineChartOption({
-            xAxisData: this.$store.state.pageData[myPrgmId][this.chart_05].xAxisData,
-            seriesData: this.$store.state.pageData[myPrgmId][this.chart_05].seriesData,
-            isDarkMode: this.isDarkMode,
-          });
-      this.$store.state.pageData[myPrgmId][this.chart_05] = chartOption5
 
+      this.setChart05Data("test");
     },
     // beforeDestroy() {
     // 	this.cancelAutoUpdate();
@@ -803,7 +793,7 @@ export default {
           header: "NO",
           name: "rowNum",
           width: 70,
-          align: "right",
+          align: "center",
           // hidden: true,
         },
         {
@@ -840,7 +830,7 @@ export default {
         { header: "주의", name: "careStndVal", align: "right", width: 40 },
         { header: "경고", name: "warnStndVal", align: "right", width: 40 },
         { header: "가이드", name: "totVal", align: "right", width: 40 },
-        { header: "알람 내용", name: "alrmMsg", align: "left", resizable: false },
+        { header: "알람 내용", name: "alrmMsg", align: "left" },
         { header: "설비종류", name: "eqpmKindId", align: "left", hidden: true },
         { header: "설비종류", name: "eqpmKindNm", align: "left", hidden: true },
       ];
@@ -1179,7 +1169,6 @@ export default {
         chartKey: "compareEqpmTGdChart",
         value: chartOption,
       });
-      this.$store.state.pageData[myPrgmId][this.chart_05] = chartOption
     },
     async setChart04Data(data) {
       if (this.$store.state.pageData[this.myPrgmId].todayNgTopTen != undefined) {
@@ -1196,8 +1185,7 @@ export default {
             show: false,
           },
           left: "22%",
-          bottom: "23",
+          radius: ["50%", "80%"], // Bigger inner and outer radius
-          radius: ["67%", "97%"], // Bigger inner and outer radius
           center: ["60%", "50%"], // Shift chart slightly right to make room for legend
           itemStyle: {
             borderColor: "#fff", // Color of the gap
@@ -1273,17 +1261,13 @@ export default {
           top: "middle",
           type: "scroll",
           orient: "vertical",
-          left: "20",
+          left: "left",
-          icon: 'rect',     
-          itemWidth: 15, // Width of the legend icon
-          itemHeight: 15, 
           textStyle: {
             color: this.isDarkMode ? "#fff" : "#333333",
           },
         },
         series: seriesData,
       };
-
       await this.$nextTick(() => {});
       this.setChartOption({ chartKey: "todayNgTopTen", value: chartOption });
     },
@@ -1417,7 +1401,6 @@ export default {
         chartKey: "compareEqpmTotChart",
         value: chartOption,
       });
-      this.$store.state.pageData[myPrgmId][this.chart_02] = chartOption
     },
     getGuageChartOption(chartName) {
       const gaugeColors = [
@@ -1727,7 +1710,7 @@ export default {
       let chartData = this.pageData.chart04Data;
       // let chartData = this.$store.state.pageData[myPrgmId][this.chart_04]['series'][0]['data']
       let selectedChartData = chartData.filter((item) => {
-        return item.eqpmId == event["data"]["name"];
+        return item.eqpmId == event["data"]["groupId"];
       });
       var data = {
         cmCycle: "CYC_DAY",

pages/ems/base/EffcIdxMngPage.vue

@@ -18,7 +18,7 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" class="pt-2">
-			<v-col :cols="5"  class="pr-2">
+			<v-col :cols="5" style="height:100%" 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" class="pl-2">
+			<v-col :cols="7" style="height:100%" 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" >
+					<div class="px-4" style="height:calc(100% - 76px)">
 						<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';
+import CheckBox from '~/components/common/checkbox/CheckBox';
 import EqpmCalcPop from '~/components/common/modal/EqpmCalcPop';
 import TextArea from '@/components/common/form/TextArea';
 
@@ -214,6 +214,64 @@ 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: [],
@@ -861,6 +919,7 @@ export default {
 				{
 					header: '효율지표 ID',
 					name: 'effcIdxId',
+					align: 'center',
 					// hidden:true
 				},
 				{

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -13,6 +12,7 @@
 								dataKey="searchLocKind"
 								:sendParam="{ commGrpCd: 'EM_LOC_KIND', useFg: '1' }"
 								:addAll="true"
+								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -24,11 +24,12 @@
 								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'"
@@ -45,6 +46,7 @@
 								dataKey="useFg"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:addAll="true"
+								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -56,22 +58,11 @@
 								:labelCols="12"
 								:textCols="12"
 								:searchOption="true"
+								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
-						<v-col class="text-right">
+						<BtnSearch @click="search" size="large" />
-							<BtnSearch @click="search" />
-						</v-col>
-					</v-row>
-					<v-row align="center" no-gutters>
-						<div style="display: none">
-								<component
-									:is="'SelectBlocMstr'"
-									ref="SelectBlocMstr"
-									:parentPrgmId="myPrgmId"
-									customClass="select-large"
-								/>
-							</div>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -88,24 +79,25 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div class="px-5" style="height:calc(100% - 76px)">
+					<div class="px-5" style="min-height:calc(100% - 76px)">
-						<div ref="gridParent" class="w100 h100">
+						<div ref="gridParent" class="w100 h100 pb-2">
 							<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>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" style="min-height:75vh;">
+			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
-					<v-card-title class="custom-title-4 pb-0" style="min-height:65px;"
+					<v-card-title class="custom-title-4" style="min-height:76px;"
 						>공정 상세
 					</v-card-title>
 					<div class="px-5" style="height:calc(100% - 76px)">
@@ -204,13 +196,15 @@ 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: {
@@ -326,11 +320,23 @@ 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',
 		}),
@@ -345,7 +351,41 @@ 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;
 
@@ -364,17 +404,6 @@ 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: '공정 명',
@@ -477,7 +506,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					width: gridWidth * 0.18,
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -569,6 +598,16 @@ 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({
@@ -584,6 +623,9 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: Object.assign({}, data),
 			});
+			//fake radio need recheck  
+			// this.$refs[this.gridName]?.repaint?.();
+
 		},
 		async setEccAddInfo(data) {
 			this.setPageData({
@@ -901,7 +943,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 px-4',
+		class: 'py-2 pl-4',
 		required: true,
 		iconShow: true
 	},
@@ -927,7 +969,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'pb-0 mb-0 pr-4 mt-2',
+		class: 'pb-0 mb-0 pr-4',
 		disableContent: true,
 	},
 	{
@@ -938,7 +980,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 mb-0 pb-0 px-4 mt-2',
+		class: 'py-2 mb-0 pb-0 pl-4',
 		list: 'locKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -950,13 +992,13 @@ const myDetail = [
 		valueNm: 'upEccNm',
 		readonly: true,
 		cols: 6,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 	},
 	{
 		// 공백 처리
 		type: 'Label',
 		cols: 6,
-		class: 'py-2 px-4 mt-2',
+		class: 'py-2 pl-4',
 		disabled: false,
 		labelCols: 12,
 		textCols: 12,
@@ -970,7 +1012,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		list: 'eccKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -985,7 +1027,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 px-4 mt-2',
+		class: 'py-2 pl-4',
 		inputType: 'number',
 		iconShow: true
 		// onkeydown : "if(this.value > 100) this.value = 100;if(this.value < 0) this.value = 0;if(this.value == '') this.value = 0;"
@@ -998,7 +1040,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		list: 'blocIdList',
 		itemText: 'blocNm',
 		itemValue: 'blocId',
@@ -1012,7 +1054,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 px-4 mt-2',
+		class: 'py-2 pl-4',
 		value: { '1': true, '0': false },
 		iconShow: true,
 		required: true,
@@ -1023,9 +1065,147 @@ const myDetail = [
 		valueNm: 'eccFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		iconShow: true,
 		value: { '1': true, '0': false },
 	},
 ];
-</script>
+
+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>

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -25,7 +25,7 @@
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
 
-						<BtnSearch @click="search" size="large" class="mr-2" />
+						<BtnSearch @click="search" size="large" />
 
 					</v-row>
 				</v-card>
@@ -43,7 +43,8 @@
 						<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>
@@ -63,7 +64,7 @@
 						<v-tabs-items v-model="tab" style="height: calc(100% - 65px);" class="pt-6 py-2">
 							<v-tab-item v-for="(item, idx) in items" :key="item.id">
 								<component v-if="item.id == 'readPlcBaseInfoTab'" :is="'Form'" :parentPrgmId="myPrgmId"
-									:detailList="f" :bindingData="gridName"
+									:detailList="detailList" :bindingData="gridName"
 									@gridEditingFinish="gridEditingFinish" />
 								<ReadPlcAddInfoTab v-if="item.id == 'readPlcAddInfoTab'" :parentPrgmId="myPrgmId"
 									:innerTabGridInfo="{ tab, idx }" />
@@ -307,22 +308,12 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{
-					header: '',
-					name: '',
-					align: 'center',
-					formatter: (props) => {
-						return `<span class="custom-radio">
-									<span class="radio-mark"></span>
-								</span>`;
-					}
-				},
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{
 					header: '검침개소명',
 					name: 'readPlcNm',
 					align: 'left',
-					minWidth: 350,
+					minWidth: 400,
 				},
 				{
 					header: '검침개소 ID',
@@ -342,6 +333,7 @@ export default {
 					header: '개소 종류',
 					name: 'plcKind',
 					minWidth: 100,
+					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.plcKindList.filter(
@@ -391,6 +383,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					minWidth: 100,
+					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -477,12 +470,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.$refs[this.gridName].getData().length - 1
-									? this.pageData.rowGridSelectKey
+								? this.pageData.rowGridSelectKey
-									: 0,
+								: 0,
 						columnName: 'readPlcNm',
 						setScroll: true,
 					});
@@ -500,7 +493,7 @@ export default {
 				if (this.tab == 2) {
 					this.tab = 0;
 				}
-				this.isImgTabDisabled = true;
+				this.isImgTabDisabled = false;
 			} else {
 				this.isImgTabDisabled = false;
 			}
@@ -924,47 +917,47 @@ const defaultData = {
 };
 
 const sampleData = [
-	{
+  {
-		readPlcNm: '서울 본사',
+    readPlcNm: '서울 본사',
-		plcKind: '본사',
+    plcKind: '본사',
-		useFg: '사용',
+    useFg: '사용',
-		_children: [
+    _children: [
-			{
+      {
-				readPlcNm: '서울 본사 - 1층',
+        readPlcNm: '서울 본사 - 1층',
-				plcKind: '층',
+        plcKind: '층',
-				useFg: '사용',
+        useFg: '사용',
-			},
+      },
-			{
+      {
-				readPlcNm: '서울 본사 - 2층',
+        readPlcNm: '서울 본사 - 2층',
-				plcKind: '층',
+        plcKind: '층',
-				useFg: '미사용',
+        useFg: '미사용',
-			},
+      },
-		],
+    ],
-	},
+  },
-	{
+  {
-		readPlcNm: '부산 지사',
+    readPlcNm: '부산 지사',
-		plcKind: '지사',
+    plcKind: '지사',
-		useFg: '사용',
+    useFg: '사용',
-		_children: [
+    _children: [
-			{
+      {
-				readPlcNm: '부산 지사 - A동',
+        readPlcNm: '부산 지사 - A동',
-				plcKind: '건물',
+        plcKind: '건물',
-				useFg: '사용',
+        useFg: '사용',
-				_children: [
+        _children: [
-					{
+          {
-						readPlcNm: '부산 지사 - A동 1층',
+            readPlcNm: '부산 지사 - A동 1층',
-						plcKind: '층',
+            plcKind: '층',
-						useFg: '사용',
+            useFg: '사용',
-					},
+          },
-				],
+        ],
-			},
+      },
-		],
+    ],
-	},
+  },
-	{
+  {
-		readPlcNm: '대전 창고',
+    readPlcNm: '대전 창고',
-		plcKind: '창고',
+    plcKind: '창고',
-		useFg: '미사용',
+    useFg: '미사용',
-	},
+  },
 ];
 
 

pages/ems/base/EnrgResourceCenterMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div class="l-layout">
-		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -84,7 +83,7 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row >
+		<v-row ref="contents" style="height: calc(100vh - 400px)">
 			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex justify-space-between align-end">
@@ -114,7 +113,7 @@
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>에너지원 상세</v-card-title>
-					<div class="px-5" style="min-height: auto;">
+					<div class="px-5" style="height:calc(100% - 70px)">
 						<v-tabs v-model="tab">
 							<v-tab
 								v-for="item in items"
@@ -126,21 +125,21 @@
 						</v-tabs>
 						<v-tabs-items
 							v-model="tab"
+							style="height: calc(100% - 65px);"
 							class="py-6"
-							style="min-height: auto;"
 						>
-							<v-tab-item v-for="(item, idx) in items" :key="item.id">				
+							<v-tab-item v-for="(item, idx) in items" :key="item.id">
 								<component
-										v-if="item.id == 'ercInfoTab'"
+									v-if="item.id == 'ercInfoTab'"
-										:is="'Form'"
+									:is="'Form'"
-										:parentPrgmId="myPrgmId"
+									:parentPrgmId="myPrgmId"
-										:detailList="detailList"
+									:detailList="detailList"
-										@gridEditingFinish="gridEditingFinish"
+									@gridEditingFinish="gridEditingFinish"
 								/>
 								<ErcChrgInfoTab
-										v-if="item.id == 'ercChrgInfoTab'"
+									v-if="item.id == 'ercChrgInfoTab'"
-										:parentPrgmId="myPrgmId"
+									:parentPrgmId="myPrgmId"
-										:innerTabGridInfo="{ tab, idx }"
+									:innerTabGridInfo="{ tab, idx }"
 								/>
 							</v-tab-item>
 						</v-tabs-items>
@@ -835,7 +834,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pr-4',
+		class: 'py-2 pr-4',
 		required: false,
 		placeholder: '시스템 자동입력',
 	},
@@ -848,7 +847,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pl-4',
+		class: 'py-2 pl-4',
 		required: true,
 	},
 	{
@@ -860,7 +859,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		list: 'ercKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -875,7 +874,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		list: 'readObjList',
 		itemText: 'readObjNm',
 		itemValue: 'readObjId',
@@ -890,7 +889,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		list: 'chrgKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -905,7 +904,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pl-4 mt-2',
+		class: 'py-2 pl-4',
 	},
 	{
 		type: 'InputText',
@@ -916,7 +915,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pr-4 mt-2',
+		class: 'py-2 pr-4',
 
 	},
 	{
@@ -928,7 +927,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		list: 'blocMstrList',
 		itemText: 'blocNm',
 		itemValue: 'blocId',
@@ -944,7 +943,7 @@ const myDetail = [
 		textCols: 12,
 		iconShow: true,
 		// class: 'py-2',
-		class: 'pb-0 mb-0 pr-4 mt-2',
+		class: 'pb-0 mb-0 pr-4',
 		disableContent: true,
 	},
 	{
@@ -956,7 +955,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'pb-0 mb-0 pl-4 mt-2',
+		class: 'py-2 pl-4',
 	},
 	{
 		type: 'InputText',
@@ -981,7 +980,7 @@ const myDetail = [
 		disabled: false,
 		cols: 6,
 		iconShow: true,
-		class: 'py-3 pr-4 mt-2',
+		class: 'py-2 pr-4',
 		value: { '1': true, '0': false },
 	},
 	{
@@ -991,7 +990,7 @@ const myDetail = [
 		disabled: false,
 		cols: 6,
 		iconShow: true,
-		class: 'py-3 pl-4 mt-2',
+		class: 'py-2 pl-4',
 		value: { '1': true, '0': false },
 		required: true,
 	},

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

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

pages/ems/base/EqpmKindPage.vue

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

pages/ems/base/EquipmentGroupMngPage.vue

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

pages/ems/base/EquipmentMasterMngPage.vue

@@ -53,7 +53,7 @@
 			</v-col>
 			<v-col :cols="7" >
 				<v-card class="pb-5">
-					<v-card-title class="custom-title-4 pb-1" >설비 상세</v-card-title>
+					<v-card-title class="custom-title-4" style="min-height:76px;">설비 상세</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">
@@ -365,7 +365,7 @@ export default {
 					header: '사업장',
 					name: 'blocId',
 					width: 100,
-					align: 'left',
+					align: 'center',
 					hidden: true,
 					formatter({ value }) {
 						let retVal = '';
@@ -382,7 +382,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					width: 100,
-					align: 'left',
+					align: 'center',
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
 							item => item.commCd == value,
@@ -969,7 +969,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-3 pr-4 pb-2',
+		class: 'py-3 pr-4',
 	},
 	{
 		type: 'CheckBox',

pages/ems/base/GdIdxMngPage.vue

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

pages/ems/base/GdStndMngPage.vue

@@ -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: auto;">
+				<v-card style="height: 60%">
 					<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 pb-4">
+					<div class="d-flex align-end justify-space-between px-4 py-2">
 						<v-row :cols="12" class="align-end">
 							<!-- 가이드 및 설비그룹 라인 시작 -->
 							<v-col :cols="3" class="pa-2">
@@ -116,9 +116,9 @@
 
 				</v-card>
 
-				<v-row class="mt-3" >
+				<v-row style="height: 40%" class="mt-3">
-					<v-col :cols="6"  class="pr-2">
+					<v-col :cols="6" style="height: 100%" class="pr-2">
-						<v-card >
+						<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>
 								<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
@@ -132,8 +132,8 @@
 							</div>
 						</v-card>
 					</v-col>
-					<v-col :cols="6" class="pl-2">
+					<v-col :cols="6" style="height: 100%" class="pl-2">
-						<v-card >
+						<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>
 							</div>

pages/ems/base/PastRsltDataReadPage.vue

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

pages/ems/base/ReadObjectMngPage.vue

@@ -1,6 +1,5 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
-		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -50,7 +49,7 @@
 			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
-						<v-card-title class="pa-0 custom-title-4"
+						<v-card-title class="pa-0 custom-title-4-new"
 							>검침 대상 정보</v-card-title
 						>
 						<Buttons
@@ -75,7 +74,7 @@
 			</v-col>
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
-					<v-card-title class="custom-title-4-new pb-0" style="min-height:65px;"
+					<v-card-title class="custom-title-4-new" style="min-height:76px;"
 						>검침대상 상세
 					</v-card-title>
 					<div class="px-5" style="height:calc(100% - 76px)">
@@ -315,7 +314,7 @@ export default {
 					header: '검침 대상 ID',
 					name: 'readObjId',
 					width: 130,
-					align: 'left',
+					align: 'center',
 				},
 				{
 					header: '검침 대상 명',
@@ -385,7 +384,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'left',
+					align: 'center',
 					width: 100,
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
@@ -406,8 +405,6 @@ export default {
 				value: myColumns,
 			});
 
-			this.loadGrid = true;
-
 			this.search();
 		},
 		async getRowGridData() {
@@ -436,8 +433,9 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
-
+			console.log('-------DEBUG-----newRes: ', newRes);
 			this.$nextTick(() => {
+				this.loadGrid = true;
 				if (newRes.length > 0) {
 					try {
 						this.$refs[this.gridName].focus({
@@ -742,7 +740,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-2 mt-2',
+		class: 'py-2 pr-2',
 		required: false,
 		placeholder: '시스템 자동입력',
 	},
@@ -754,7 +752,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 mt-2',
+		class: 'py-2',
 		required: true,
 		iconShow: true,
 	},
@@ -766,7 +764,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2 mt-2',
+		class: 'py-2 pr-2',
 		list: 'readObjKindDetailList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -781,7 +779,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 mt-2',
+		class: 'py-2',
 		list: 'readObjGrpList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -796,7 +794,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2 mt-2',
+		class: 'py-2 pr-2',
 		iconShow: true,
 		inputType: 'number',
 	},
@@ -808,7 +806,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 mt-2',
+		class: 'py-2',
 		iconShow: true,
 		inputType: 'number',
 	},
@@ -820,7 +818,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2 mt-2',
+		class: 'py-2 pr-2',
 		iconShow: true,
 		inputType: 'number',
 	},
@@ -832,7 +830,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 mt-2',
+		class: 'py-2',
 		list: 'unitCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -847,24 +845,13 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2 mt-2',
+		class: 'py-2 pr-2',
 		value: { '1': true, '0': false },
 		iconShow: true,
 		required: true,
 	},
 ];
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 @import '@/assets/scss/common.scss';
-::v-deep {
+</style>
-	.tui-grid-layer-state {
-		top: 40px !important;
-	}
-
-	.tui-grid-layer-selection,
-	.tui-grid-cell-content-editor{
-		height: 36px !important;
-	}
-	
-}
-</style>

pages/ems/base/ReadResultCloseMngPage.vue

@@ -43,7 +43,6 @@
                 :is="'Datepicker'"
                 :parentPrgmId="myPrgmId"
                 :label="'조회기간'"
-                customClass="datepicker-large"
               />
             </v-col>
             <div class="d-flex">
@@ -92,7 +91,7 @@
               </a-button>
             </div>
           </div>
-          <div ref="gridParent" class="px-5 w100" style="height: 55vh;">
+          <div ref="gridParent" class="px-5 w100" style="min-height: 60vh">
               <component
                 :is="loadGrid ? 'Grid' : null"
                 :ref="gridName"
@@ -243,10 +242,6 @@ export default {
         columnOptions: {
           resizable: true,
         },
-        pageOptions: {
-					useClient: true,
-					perPage: 13,
-				},
       };
       this.setGridOption({
         gridKey: this.gridName,
@@ -283,6 +278,7 @@ export default {
             mgnf: item.mgnf || 0,
           })),
         });
+        // console.log('--------------DEBUG-----res-------', res);
       }
       this.setPageData({ isFind: false });
       this.$nextTick(() => {

pages/ems/base/TagMngPage.vue

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

pages/ems/base/TagMngPage_Pagination.vue

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