Merge pull request 'update code s32 s17' (#61) from dev-luannv24-s32-s17fixbug into dev

Reviewed-on: #61

assets/images/SwapRight.svg

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

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

assets/scss/common/button.scss

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

assets/scss/common/editor.scss

@@ -0,0 +1,474 @@
+@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,18 +17,6 @@
     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;
   }
@@ -68,6 +56,12 @@
     font-weight: 400;
   }
 
+  
+  th[data-column-name="_checked"] {
+    padding-left: 0;
+  }
+
+
 }
 
 .tui-grid-table{
@@ -75,6 +69,13 @@
   .tui-grid-cell-has-input .tui-grid-cell-content {
     padding: 8px;
   }
+
+  th[data-column-name="_checked"] {
+    &.tui-grid-cell-header  {
+      padding-left: 0;
+    }
+    
+  }
 }
 
 .treeGrid {
@@ -98,6 +99,12 @@
   @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;
@@ -109,6 +116,15 @@
       );
     }
     
+    .grid-toggle-section{
+      .tui-grid-rside-area{
+        .tui-grid-body-area {
+          height: auto !important;
+
+        }
+      }
+    }
+
     .tui-grid {
       &-table {
         border: 1px solid;
@@ -134,46 +150,29 @@
       }
 
       &-body-container{
-        border-right: 1px solid;
+        border-right: 0;
-        border-right-color: map-deep-get($config,
+        // position: relative;
-          #{$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;
+            //   }
+            // }
+          }
+        }
       }
 
-      &-container,
+      &-summary-area,
-      &-summary-area {
+      &-container {
         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},
@@ -183,6 +182,32 @@
         }
       }
 
+      &-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");
       }
@@ -195,6 +220,7 @@
       &-scrollbar-right-top {
         background-color: rgba(0, 0, 0, 0);
         border: none;
+        display: none;
         // background-color: map-deep-get(
         //   $config,
         //   #{$theme},
@@ -220,13 +246,14 @@
       &-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;
-        box-sizing: border-box;
+        // display: none;
       }
 
       &-scrollbar-frozen-border,
@@ -236,13 +263,9 @@
         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,
@@ -254,23 +277,36 @@
           "tui-grid-border-vertical-color"
         );
 
-        &-current-row{
+        // &-current-row{
-          td {
+        // }
-            .custom-radio {
+        td.row-selected {
-              .radio-mark{
+          .custom-radio {
-                border-color: #1677ff;
+            background-color: map-deep-get($config,
-                background-color: #fff;
+              #{$theme},
-                &::after {
+              "ant-btn-primary-color"
-                  content: "";
+            );
-                  position: absolute;
+            .radio-mark{
-                  top: 50%;
+              border-color: map-deep-get($config,
-                  left: 50%;
+                #{$theme},
-                  transform: translate(-50%, -50%);
+                "arow-line-color"
-                  height: 11px;
+              );
-                  width: 11px;
+              background-color: map-deep-get($config,
-                  border-radius: 50%;
+                #{$theme},
-                  background-color: #1677ff;
+                "arow-line-btn-bg-color"
-                }
+              );
+              &::after {
+                content: "";
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                transform: translate(-50%, -50%);
+                height: 8px;
+                width: 8px;
+                border-radius: 50%;
+                background-color: map-deep-get($config,
+                  #{$theme},
+                  "arow-line-color"
+                );
               }
             }
           }
@@ -285,13 +321,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"
-            );
+          //   );
-          }
+          // }
         }
       }
 
@@ -302,8 +338,8 @@
       &-header-area,
       &-cell-header {
         // font-family: inherit;
+        // font-style: Semi Bold;
         font-weight: 600;
-        font-style: Semi Bold;
         background-color: map-deep-get($config,
           #{$theme},
           "tui-grid-header-backgroundColor"
@@ -320,8 +356,17 @@
       }
 
       &-header-area {
-        background-color: none;
+        // background-color: none;
         border: none;
+        margin-right: 0 !important;
+        background-color: map-deep-get($config,
+          #{$theme},
+          "tui-grid-cell-backgroundColor"
+        );
+        // width: 100% !important;
+        // .tui-grid-table {
+        //   width: 100% !important;
+        // }
       }
 
       &-row-odd,
@@ -451,6 +496,7 @@
       }
 
       &-tree-button-expand {
+        z-index: 9999;
         .tui-grid-btn-tree {
           i {
             width: 16px;
@@ -469,6 +515,7 @@
       }
 
       &-tree-button-collapse {
+        z-index: 9999;
         .tui-grid-btn-tree {
           i {
             width: 16px;

assets/scss/common/input.scss

@@ -1,6 +1,6 @@
 .v-select__custom {
   padding: 0.125rem;
-  
+
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;
   }
@@ -50,6 +50,7 @@
   }
 }
 
+
 .v-input__custom {
   .v-input__slot {
 
@@ -149,6 +150,11 @@
 .v-input {
   margin-top: 0 !important;
   padding-top: 0 !important;
+  &.v-text-field--outlined {
+    fieldset {
+      top: -4px
+    }
+  }
 }
 
 .v-input__append-inner {
@@ -171,25 +177,27 @@
   align-items: center;
   cursor: pointer;
   position: relative;
-  padding-left: 28px;
+  padding-left: 0;
-  margin: 10px;
+  margin: 5px;
   font-size: 16px;
 }
+
 .custom-radio input[type="radio"] {
   position: absolute;
   opacity: 0;
   cursor: pointer;
 }
+
 /* Custom radio appearance */
 .radio-mark {
   position: absolute;
-  left: 0;
+  left: -8px;
   top: 50%;
   transform: translateY(-50%);
-  height: 18px;
+  height: 14px;
-  width: 18px;
+  width: 14px;
-  background-color: white;
+  // background-color: white;
-  border: 2px solid #ccc;
+  border: 1px solid #ccc;
   border-radius: 50%;
   transition: all 0.2s ease;
 }
@@ -222,11 +230,43 @@
   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;
@@ -239,17 +279,18 @@
     }
 
     .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"
           );
-          
+
         }
       }
     }
@@ -263,9 +304,6 @@
         "v-input-backgroundColor"
       );
 
-
-      
-
       &:not(.v-input--radio-group, .v-input--checkbox) {
         .v-input__slot {
           background-color: map-deep-get($config,
@@ -372,6 +410,24 @@
         }
       }
     }
+
+    .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 {
@@ -396,6 +452,12 @@
 
   .v-input--checkbox {
     .v-icon {
+      transform: none;
+
+      &.mdi:before {
+        font-size: 20px;
+      }
+
       @if $theme ==dark {
         color: rgba(255, 255, 255, 0.6);
       }
@@ -406,6 +468,9 @@
     }
   }
 
+
+
+
   .v-textarea {
     textarea {
       padding: 10px;

assets/scss/common/pagination.scss

@@ -0,0 +1,43 @@
+@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/common/text.scss

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

assets/scss/datepicker.scss

@@ -14,11 +14,22 @@
       position: relative;
       border-radius: 6px;
       border: solid 1px;
-      height: 40px;
+      height: 32px;
-      // border-color: #424242;
+      color: map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important;
-      border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
+      border-color: currentColor;
+      // 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 {
 
         // ----------------------
@@ -55,6 +66,10 @@
           }
         }
       }
+      
+      .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": #fb5a83,
+  "week": ("sun": #FF4D4F,
-    "sat": #2d8cf6)
+    "sat": #597EF7)
 );
 
 $config: (
@@ -96,23 +96,25 @@ $config: (
     v-input-disabled-backgroundColor:rgba(255, 255, 255, 0.08),
     v-input-disabled-color: rgba(255, 255, 255, 0.5),
     v-select-label-color: rgba(255, 255, 255, 0.85),
-    v-calendar-weekday-backgroundColor: #383f5d,
+    v-calendar-weekday-backgroundColor: #FFFFFF0A,
-    v-calendar-weekday-color: #fff,
+    v-calendar-weekday-color: #FFFFFFD9,
-    v-calendar-weekday-border-color: rgba(255, 255, 255, 0.1),
+    v-calendar-weekday-border-color: #FFFFFF0F,
-    v-calendar-day-color: #fff,
+    v-calendar-day-color: #FFFFFFD9,
-    v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
+    v-calendar-day-in-not-month-color: #FFFFFF14,
-    v-calendar-is-today-background-color: #2d4571,
+    v-calendar-is-today-background-color: #0A224F,
+    v-calendar-is-sat: #263EA0,
+    v-calendar-is-sun:#A61D24,
     tui-grid-title-color: #FFFFFFD9,
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
-    tui-grid-border-vertical-color: #212224,
+    tui-grid-border-vertical-color: #FFFFFF0F,
     tui-grid-cell-backgroundColor: #212224,
-    tui-grid-cell-color: #fff,
+    tui-grid-cell-color: #FFFFFFD9,
-    tui-grid-cell-insert-color: #13636c,
+    tui-grid-cell-insert-color: #2B2111,
     tui-grid-cell-selected-color: #0A224F,
     tui-grid-cell-modify-color: #13636c,
-    tui-grid-cell-removed-color: #f6637b,
+    tui-grid-cell-removed-color: #2A1215,
     tui-grid-cell-disabled-color: rgb(170, 170, 170),
     tui-grid-cell-hover-backgroundColor: #2d4571,
     v-tabs-items-border-color: #FFFFFF0F,
@@ -172,6 +174,17 @@ $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,
@@ -207,7 +220,6 @@ $config: (
     router-tab-item-hover-color: #1677ff,
     router-tab-slot-end-button-backgroundColor: #3f4d7d,
     v-btn-backgroundColor: #1677ff,
-    // v-btn-backgroundColor: #fff,
     v-box: #FFFFFF,
     v-banner-border-color: #ddd,
     v-treeview-node-root-backgroundColor: #FFFFFF,
@@ -234,12 +246,14 @@ $config: (
     v-input-disabled-backgroundColor: rgba(0, 0, 0, 0.04),
     v-input-disabled-color: rgba(0, 0, 0, 0.25),
     v-select-label-color: rgba(0, 0, 0, 0.88),
-    v-calendar-weekday-backgroundColor: #e0e0e0,
+    v-calendar-weekday-backgroundColor: #00000005,
-    v-calendar-weekday-color: #111,
+    v-calendar-weekday-color: #000000E0,
-    v-calendar-weekday-border-color: #d4d4d4,
+    v-calendar-weekday-border-color: #0000000F,
-    v-calendar-day-color: #111,
+    v-calendar-day-color: #000000E0,
-    v-calendar-day-in-not-month-color: #f8f8f8,
+    v-calendar-day-in-not-month-color: #0000000A,
-    v-calendar-is-today-background-color: #e3eaf3,
+    v-calendar-is-today-background-color: #E6F4FF,
+    v-calendar-is-sat: #597EF7,
+    v-calendar-is-sun:#FF4D4F,
     tui-grid-title-color: #000000E0,
     tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
     tui-grid-header-color: rgba(0, 0, 0, 0.88),
@@ -247,10 +261,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: #13636c,
+    tui-grid-cell-insert-color: #FFFBE6,
     tui-grid-cell-selected-color: #E6F4FF,
     tui-grid-cell-modify-color: #e6f5f7,
-    tui-grid-cell-removed-color: #fddde1,
+    tui-grid-cell-removed-color: #FFF1F0,
     tui-grid-cell-hover-backgroundColor: #f5f5f5,
     v-tabs-items-border-color: #0000000F,
     v-tabs-backgroundColor: #ddd,
@@ -308,5 +322,16 @@ $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,45 +3,28 @@
 		<div class="custom-vc-calender-title text-center" v-if="headerVisible">
 			<span>{{ selectedYear }}년 {{ selectedMonth }}월</span>
 		</div>
-		<vc-calendar
+		<vc-calendar locale="ko-KR" ref="myCalendar" :attributes="calendarAttributes" class="custom-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
+					<span :class="['day-label', { 'is-holiday': hldyValues(day.day) }]"
-						:class="['day-label', { 'is-holiday': hldyValues(day.day) }]"
+						@click="addPlan(day.year, day.month, day.day)">{{ day.day }}</span>
-						@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
+						<p v-for="attr in attributes" :key="attr.key" :class="attr.customData.planColor"
-							v-for="attr in attributes"
+							@click="updatePlan(attr.customData.planSeq)">
-							:key="attr.key"
-							:class="attr.customData.planColor"
-							@click="updatePlan(attr.customData.planSeq)"
-						>
 							{{ attr.customData.planTitle }}
 						</p>
 					</div>
 				</div>
 			</template>
 		</vc-calendar>
-		<component
+		<component ref="planPop" :is="'PlanPop'" v-show="false" :detailList="detailList" :label="planLabel"
-			ref="planPop"
+			:parentPrgmId="parentPrgmId" />
-			:is="'PlanPop'"
-			v-show="false"
-			:detailList="detailList"
-			:label="planLabel"
-			:parentPrgmId="parentPrgmId"
-		/>
 	</div>
 </template>
 <script>
@@ -63,6 +46,10 @@ export default {
 			type: Boolean,
 			default: true,
 		},
+		showTitle: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	computed: {
 		...mapState({
@@ -122,7 +109,7 @@ export default {
 							planColor:
 								// item.endDt < Utility.setFormatDate(new Date(), 'YYYY-MM-DD')
 								// 	? 'grey': 
-									item.planColor,
+								item.planColor,
 						},
 						dates: new Date(yy, mm, dd),
 					});
@@ -166,15 +153,14 @@ export default {
 			this.$refs['planPop'].strtDt = '';
 			this.$refs['planPop'].endDt = '';
 			this.$refs['planPop'].addPlanData = {
-				year : year,
+				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) {
@@ -188,7 +174,7 @@ export default {
 			this.$refs['planPop'].dialog = true;
 		},
 	},
-	mounted() {},
+	mounted() { },
 };
 const myDetail = [];
 </script>
@@ -196,36 +182,44 @@ const myDetail = [];
 <style lang="scss" scoped>
 @import '@/assets/scss/var.scss';
 @import '@/assets/scss/mixin.scss';
+
 ::-webkit-scrollbar {
 	width: 0px;
 }
+
 ::-webkit-scrollbar-track {
 	display: none;
 }
+
 .custom-vc-calender {
 	&-title {
 		margin-bottom: 20px;
 	}
 }
+
 ::v-deep {
 	.custom-calendar.vc-container {
 		width: 100%;
 		background-color: transparent;
 		border: 0;
 	}
+
 	.vc-header,
 	.vc-arrows-container {
 		display: none;
 	}
+
 	.vc-weeks {
 		display: flex;
 		flex-wrap: wrap;
 		align-items: center;
 		padding: 0;
-		> div {
+
+		>div {
 			flex: 1 0 calc(100% / 7);
 		}
 	}
+
 	.vc-weekday {
 		display: flex;
 		align-items: center;
@@ -233,6 +227,7 @@ const myDetail = [];
 		height: 36px;
 		padding: 0;
 	}
+
 	.vc-day {
 		height: 10.889vh;
 		min-height: auto;
@@ -241,6 +236,7 @@ const myDetail = [];
 			font-size: 1rem;
 			line-height: 1.235;
 		}
+
 		.day-hldyNm {
 			overflow: hidden;
 			text-overflow: ellipsis;
@@ -251,25 +247,27 @@ const myDetail = [];
 			font-size: 10pt;
 		}
 
-		> div {
+		>div {
 			position: relative;
 			height: 100%;
 			padding: 10px;
 			border-radius: 0 !important;
 		}
 	}
+
 	.vc-day.is-not-in-month {
 		* {
 			opacity: 1 !important;
 		}
 	}
-	.plusButton:hover > span:first-child {
+
+	.plusButton:hover>span:first-child {
 		font-weight: bolder;
 		cursor: pointer;
 	}
+
 	.red {
-		//background-color: rgba(229,62,62,var(--bg-opacity));
+		background-color: #FF4D4F !important;
-		background-color: #e53e3e !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -277,9 +275,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.blue {
-		//background-color: rgba(66,153,225,var(--bg-opacity));
+		background-color: #597EF7 !important;
-		background-color: #4299e1 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -287,9 +285,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.puple {
-		//background-color: rgba(102,126,234,var(--bg-opacity));
+		background-color: #9254DE !important;
-		background-color: #667eea !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -297,9 +295,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.green {
-		//background-color: rgba(56,178,172,var(--bg-opacity));
+		background-color: #73D13D !important;
-		background-color: #38b2ac !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -308,9 +306,9 @@ const myDetail = [];
 		margin-bottom: 0.25rem;
 		width: 90%;
 	}
+
 	.orange {
-		//background-color: rgba(237,137,54,var(--bg-opacity));
+		background-color: #FFA940 !important;
-		background-color: #ed8936 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -318,9 +316,9 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.pink {
-		//background-color: rgba(237,100,166,var(--bg-opacity));
+		background-color: #F759AB !important;
-		background-color: #ed64a6 !important;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;
@@ -328,8 +326,8 @@ const myDetail = [];
 		text-align: left;
 		margin-bottom: 0.25rem;
 	}
+
 	.grey {
-		background-color: #6d6d6d;
 		color: #fff;
 		border-radius: 0.125rem;
 		font-size: 0.75rem;

components/common/Chart.vue

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

components/common/CheckBox.vue

@@ -1,27 +1,16 @@
 <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-icon v-if="iconShow" small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</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>
@@ -68,10 +57,10 @@ export default {
       default: 7,
     },
     iconShow: {
-			type: Boolean,
+      type: Boolean,
-			require: false,
+      require: false,
-			default: true
+      default: true
-		},
+    },
   },
   data() {
     return {
@@ -103,7 +92,8 @@ export default {
   methods: {
     ...mapMutations({ setPageData: "setPageData" }),
     modifyValue(e) {
-      return this.setPageData({ [this.valueNm]: e });
+      const isChecked = e.target.checked;
+      return this.setPageData({ [this.valueNm]: isChecked });
     },
   },
 };

components/common/Datepicker.vue

@@ -9,7 +9,7 @@
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div class="datepicker-container" >
+			<div :class="['datepicker-container', customClass]"  >
 				<v-text-field
 					id="startpicker"
 					ref="startpicker"
@@ -19,15 +19,18 @@
 					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" alt="">
+					<img :src="arrowIcon">
 				</div>
 				<v-text-field
 					v-show="isRange"
@@ -40,7 +43,9 @@
 					outlined
 				>
 					<template #append>
-						<v-icon size="20">$icoCalendar</v-icon>
+						<div class="pr-1">
+							<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>
@@ -93,7 +98,12 @@ export default {
 			type:Boolean,
 			require:false,
 			default: true
-		}
+		},
+		customClass: {
+			type: String,
+			require: false,
+		},
+
 	},
 	data() {
 		return {
@@ -204,9 +214,9 @@ export default {
 		},
 		arrowIcon() {
 			if(this.isDarkMode){
-				return require('@/assets/images/arrow_datepicker_dm.png');
+				return require('@/assets/images/SwapRight_Dark.svg');
 			}
-			return require('@/assets/images/arrow_datepicker.png');
+			return require('@/assets/images/SwapRight.svg');
 		}
 	},
 	watch: {
@@ -421,7 +431,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,6 +52,7 @@
             selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
           "
           @update:propsValue="selectTimeValue1 = $event"
+          customClass="select-large"
         />
         <!-- <div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">~</div> -->
 
@@ -99,6 +100,7 @@
             selectBoxTimeItemList.minInterval ? selectBoxTimeItemList.minInterval : 1
           "
           @update:propsValue="selectTimeValue2 = $event"
+          customClass="select-large"
         />
       </div>
     </v-col>

components/common/DatepickerTopView.vue

@@ -5,10 +5,7 @@
 				<!-- <v-icon x-small :color="required ? '#fb8200' : 'primary'" class="mr-1"
 					>mdi-record-circle</v-icon
 				> -->
-				<v-icon
+				<v-icon small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">
-					small
-					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
-					>
 					$icoBulletPoint
 				</v-icon>
 				{{ label }}
@@ -16,17 +13,11 @@
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
 			<div class="datepicker-container">
-				<v-text-field
+				<v-text-field id="startpicker" ref="startpicker" v-model="fromDtValue"
-					id="startpicker"
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
-					ref="startpicker"
+					outlined>
-					v-model="fromDtValue"
+					<template v-slot:append>
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
+						<a-icon v-show="!isRange" class="v-icon" type="calendar" style="width: 14px; height: 14px;" />
-					: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>
@@ -36,18 +27,13 @@
 				<div v-show="isRange" class="mx-3" :style="{ lineHeight: 0 }">
 					<img :src="arrowIcon" alt="">
 				</div>
-				<v-text-field
+				<v-text-field v-show="isRange" id="endpicker" ref="endpicker" v-model="toDtValue"
-					v-show="isRange"
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
-					id="endpicker"
+					outlined>
-					ref="endpicker"
-					v-model="toDtValue"
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
-					:hide-details="true"
-					readonly
-					outlined
-				>
 					<template #append>
-						<v-icon size="20">$icoCalendar</v-icon>
+						<div class="pr-1">
+							<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>
@@ -91,9 +77,9 @@ export default {
 			require: false,
 			default: false,
 		},
-		isRangeOption:{
+		isRangeOption: {
-			type:Boolean,
+			type: Boolean,
-			require:false,
+			require: false,
 			default: true
 		}
 	},
@@ -177,21 +163,23 @@ 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
@@ -205,10 +193,10 @@ export default {
 			);
 		},
 		arrowIcon() {
-			if(this.isDarkMode){
+			if (this.isDarkMode) {
-				return require('@/assets/images/arrow_datepicker_dm.png');
+				return require('@/assets/images/SwapRight_Dark.svg');
 			}
-			return require('@/assets/images/arrow_datepicker.png');
+			return require('@/assets/images/SwapRight.svg');
 		}
 	},
 	watch: {
@@ -242,24 +230,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
 					})
 				}
 			}
@@ -370,7 +358,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 });
@@ -400,7 +388,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 {
@@ -424,6 +412,7 @@ 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,16 +107,13 @@ export default {
 		},
 		chkGridOptions() {
 			const options = {
-				// bodyHeight: 'fitToContent',
-				scrollX: false,
-				scrollY: false,
 				...this.gridData.option,
-				useIcon: false,
 			};
 			options.treeColumnOptions = {
 				useIcon: false,
 				...options.treeColumnOptions,
 			};
+
 			return options;
 		},
 		defaultRow() {
@@ -161,17 +158,17 @@ export default {
 			}, 500);
 		},
 	},
-	created() {},
+	created() { },
 	async mounted() {
-		// console.log('--------------DEBUG----gridData: ', this.gridData);
+		// console.log(this.dataPath);
 		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;
@@ -186,13 +183,13 @@ export default {
 		}),
 		// true : 현재 행 혹은 연결된 그리드가 수정중인 상태
 		checkGridState() {
-			var rowStatList = ['I', 'U', 'D'];
+			const rowStatList = ['I', 'U', 'D'];
-			var row = this.gridInstance.invoke('getFocusedCell');
+			const row = this.gridInstance.invoke('getFocusedCell');
 
 			if (row) {
-				var rowData = this.gridInstance.invoke('getRow', row.rowKey);
+				const rowData = this.gridInstance.invoke('getRow', row.rowKey);
 				if (rowData) {
-					var rowStat = rowData['rowStat'];
+					const rowStat = rowData['rowStat'];
 					if (rowStatList.includes(rowStat)) {
 						return true;
 					}
@@ -200,8 +197,8 @@ export default {
 			}
 
 			if (this.preventFocusChangeEventTargetGridList) {
-				for (var gridInstance of this.preventFocusChangeEventTargetGridList) {
+				for (let gridInstance of this.preventFocusChangeEventTargetGridList) {
-					var dataArr = gridInstance.save();
+					const dataArr = gridInstance.save();
 
 					if (dataArr.length > 0) {
 						return true;
@@ -278,7 +275,7 @@ export default {
 			}
 			// console.log('focusChangeEvt2...')
 			// cell 선택시 row 선택 method
-			if (e.rowKey >= 0) {
+			if (e.rowKey > -1) {
 				this.$emit(
 					'getRowsData',
 					this.gridInstance.invoke('getRow', e.rowKey),
@@ -293,7 +290,6 @@ export default {
 		startEditing(e) {
 			// console.log('startEditing1...')
 			if (this.preventFocusChangeEvent(e)) {
-				// console.log('prevent startEditing')
 				return;
 			}
 
@@ -305,7 +301,6 @@ 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',
@@ -349,14 +344,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);
@@ -611,68 +606,67 @@ export default {
 			list.map(item => this.gridInstance.invoke('check', item));
 		},
 		refreshLayout() {
-			this.gridInstance.invoke('refreshLayout');
+			setTimeout(() => {
+				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)
-      // console.log("containerEl : ",containerEl);
+			// 	function refreshLayout(store, containerEl, parentEl) {
-      // console.log('parentEl : ', parentEl)
+			var dimension = store.dimension;
-		// 	function refreshLayout(store, containerEl, parentEl) {
+			var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight;
-        var dimension = store.dimension;
+			var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft;
-        var autoWidth = dimension.autoWidth, fitToParentHeight = dimension.fitToParentHeight;
+			var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left;
-        var clientHeight = containerEl.clientHeight, clientWidth = containerEl.clientWidth, scrollTop = containerEl.scrollTop, scrollLeft = containerEl.scrollLeft;
+			this.setOffsetTop(store, top + scrollTop);
-        var _a = containerEl.getBoundingClientRect(), top = _a.top, left = _a.left;
+			// store.dimension.setOffsetTop = top + scrollTop;
-        this.setOffsetTop(store, top + scrollTop);
+			this.setOffsetLeft(store, left + scrollLeft);
-        // store.dimension.setOffsetTop = top + scrollTop;
+			// store.dimension.headerHeight = left + scrollLeft;
-        this.setOffsetLeft(store, left + scrollLeft);
+			this.setWidth(store, clientWidth, autoWidth);
-        // store.dimension.headerHeight = left + scrollLeft;
+			// store.dimension.autoWidth = autoWidth;
-        this.setWidth(store, clientWidth, autoWidth);
+			// store.dimension.width = clientWidth;
-        // store.dimension.autoWidth = autoWidth;
+			// console.log("###",getComputedStyle(parentEl));
-        // store.dimension.width = clientWidth;
+			// console.log("fitToParentHeight : ",fitToParentHeight);
-        // console.log("###",getComputedStyle(parentEl));
+			// console.log("parentEl : ",parentEl)
-          // console.log("fitToParentHeight : ",fitToParentHeight);
+			// console.log("parentEl.clientHeight" , parentEl.clientHeight)
-          // console.log("parentEl : ",parentEl)
+			// console.log("clientHeight : ",clientHeight);
-          // console.log("parentEl.clientHeight" , parentEl.clientHeight)
+			if (parentEl && parentEl.clientHeight !== clientHeight) {
-          // console.log("clientHeight : ",clientHeight);
+				var _b = getComputedStyle(parentEl), paddingTop = _b.paddingTop, paddingBottom = _b.paddingBottom;
-        if (parentEl && parentEl.clientHeight !== clientHeight) {
+				this.setHeight(store, parentEl.clientHeight - (parseFloat(paddingTop) + parseFloat(paddingBottom)));
-            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 =
@@ -699,17 +693,13 @@ export default {
 		// resetData() {
 		//   // console.log("resetData = ", this.tuigridProps.data);
 		//   this.$refs.tuigrid.invoke("resetData", this.tuigridProps.data);
-		// }
+		// },
 	},
 };
 </script>
+
 <style scoped lang="scss">
 ::v-deep .tui-grid-container {
-	
-	// .tui-grid-body-area {
-	// 	overflow: hidden !important;
-	// }
-
 	.tui-grid-content-area {
 		.tui-grid-cell-content {
 			input[type='number'] {

components/common/Pagination.vue

@@ -0,0 +1,93 @@
+
+<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,25 +2,19 @@
 	<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 small color="primary"
-				:class="['mr-1', required ? 'icon-orange' : 'icon-blue']"
+					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
-				>$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="label ? textCols : ''">
-			<div class="datepicker-container">
+			<div :class="['datepicker-container', customClass]">
-				<v-text-field
+				<v-text-field id="startpicker" ref="startpicker" v-model="fromDtValue"
-					id="startpicker"
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
-					ref="startpicker"
+					outlined>
-					v-model="fromDtValue"
+					<template #append>
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
+						<a-icon class="v-icon" v-show="!isRange" type="calendar" style="width: 14px; height: 14px;" />
-					:hide-details="true"
+						<!-- <v-icon size="20" v-show="!isRange">$icoCalendar</v-icon> -->
-					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>
@@ -29,18 +23,13 @@
 				<div v-if="isRange" class="mx-3" :style="{ lineHeight: 0 }">
 					<img :src="arrowIcon" alt="">
 				</div>
-				<v-text-field
+				<v-text-field v-show="isRange" id="endpicker" ref="endpicker" v-model="toDtValue"
-					v-show="isRange"
+					:class="isRange ? 'v-input__custom half' : 'v-input__custom'" :hide-details="true" readonly
-					id="endpicker"
+					outlined>
-					ref="endpicker"
-					v-model="toDtValue"
-					:class="isRange ? 'v-input__custom half' : 'v-input__custom'"
-					:hide-details="true"
-					readonly
-					outlined
-				>
 					<template #append>
-						<v-icon size="20">$icoCalendar</v-icon>
+						<div class="pr-1">
+							<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>
@@ -79,6 +68,10 @@ export default {
 			require: false,
 			default: 8,
 		},
+		customClass: {
+			type: String,
+			require: false,
+		},
 	},
 	data() {
 		return {
@@ -94,6 +87,7 @@ export default {
 			searchParam(state) {
 				return state.pageData[this.parentPrgmId];
 			},
+			isDarkMode: "isDarkMode",
 		}),
 		myCmCycle() {
 			return this.searchParam.cmCycle;
@@ -134,10 +128,10 @@ export default {
 			);
 		},
 		arrowIcon() {
-			if(this.isDarkMode){
+			if (this.isDarkMode) {
-				return require('@/assets/images/arrow_datepicker_dm.png');
+				return require('@/assets/images/SwapRight_Dark.svg');
 			}
-			return require('@/assets/images/arrow_datepicker.png');
+			return require('@/assets/images/SwapRight.svg');
 		}
 	},
 	watch: {
@@ -276,7 +270,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 });
@@ -306,7 +300,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 {
@@ -330,6 +324,7 @@ 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,21 +1,10 @@
 <template>
-	<div class="d-flex flex-column justify-center align-center">
+	<div class="d-flex justify-center align-center" 
-		<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')">
+		:class="directionBtn === 'vertically'?'flex-row':'flex-column'" 
-			<v-icon>mdi-chevron-right</v-icon>
+		style="gap: 12px">
-		</v-btn> -->
+		<a-button   @click="directionBtn === 'vertically' ? btnActionsFnc('removeRightToLeft') : btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="directionBtn === 'vertically'? icons.remove :icons.add " class="custom-action-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>
@@ -38,8 +27,18 @@ export default {
 			type: Function,
 			required: true,
 		},
+		directionBtn: {
+			type: String,
+			default: "horizontally" //horizontally, vertically.
+		}
+	},
+	computed: {
+		icons() {
+			return this.directionBtn === "vertically"
+				? { remove: "up", add: "down" }
+				: { remove: "left", add: "right" };
+			},
 	},
-	computed: {},
 	data() {
 		return {};
 	},

components/common/button/BtnExcelDownload.vue

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

components/common/button/BtnSearch.vue

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

components/common/chartoptions/GaugeChart.js

@@ -2,15 +2,13 @@
 export default function getGaugeChartOption({ title, min = 0, max = 160, unit = '%', isDarkMode = false, backgroundRadius = 97 }) {
     const colorRanges = isDarkMode
         ? [
-            [0.375, '#49AA19'], // Dark Green
+            [60 / 160, '#49AA19'], // Dark Green
-            // [0.5, '#B8860B'],   // Dark Yellow
+            [100 / 160, '#D89614'], // Dark Orange
-            [0.625, '#D89614'], // Dark Orange
             [1, '#D32029'],     // Dark Red
         ]
         : [
-            [0.375, '#52C41A'], // Light Green
+            [60 / 160, '#52C41A'], // Light Green
-            // [0.5, '#FFD700'],   // Light Yellow
+            [100 / 160, '#FAAD14'], // Light Orange
-            [0.625, '#FAAD14'], // Light Orange
             [1, '#F5222D'],     // Light Red
         ];
     // Old color range
@@ -56,6 +54,7 @@ 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,7 +15,8 @@ export default function getLineChartOption({
     const styledSeries = seriesData.map((item, index) => {
         const color = item.color || defaultColors[index % defaultColors.length];
         return {
-            ...item,
+            ...item,    
+            showSymbol: true,       // Show symbol at each data point
             itemStyle: {
                 color,
             },
@@ -27,17 +28,19 @@ 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 ? '#676A7B' : '#676A7B',
+                color: isDarkMode ? 'white' : '#676A7B',
             },
         },
         xAxis: {
@@ -69,6 +72,7 @@ export default function getLineChartOption({
             },
             splitLine: {
                 lineStyle: {
+                    type: 'dashed', // Options: 'solid', 'dashed', 'dotted'
                     color: isDarkMode ? '#444444' : '#EEEEEE',
                 },
             },

components/common/chartoptions/SankeyChart.js

@@ -0,0 +1,46 @@
+// 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,15 +12,26 @@
 			</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 ? '#fff' : '#1890ff'"
+				:color="isDarkMode ? '#1668DC' : '#1890ff'"
-				@change="modifyValue"
+				@change="modifyValue"			
-			></v-checkbox>
+  				class="small-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>
@@ -141,7 +152,7 @@ export default {
 		modifyValue(e) {
 			const dt = {
 				columnName: this.item.valueNm,
-				value: e,
+				value: e.target.checked,
 			};
 			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,7 +17,9 @@
 				:item-text="typeof item.list != 'string' ? 'text' : item.itemText"
 				:item-value="typeof item.list != 'string' ? 'value' : item.itemValue" outlined :hide-details="true"
 				class="v-select__custom" :disabled="item.disabled || false" :readonly="item.readonly || false"
-				:required="item.required || false" @change="modifyValue($event, item.valueNm)" append-icon="">
+				:required="item.required || false" @change="modifyValue($event, item.valueNm)" append-icon="" 
+				:menu-props="{ top: false, offsetY: true }"
+			>
 
 				<template v-slot:append>
 					<!-- Custom SVG icon -->

components/common/modal/ChangeUserPswdPopPage.vue

@@ -3,12 +3,13 @@
 		<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
-					x-small
+					v-if="item.iconShow"
-					:color="item.required ? '#fb8200' : 'primary'"
+					small
-					class="mr-1"
+					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
-					>mdi-record-circle</v-icon
+					>$icoBulletPoint</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 }}
@@ -39,13 +40,12 @@
 			</template>
 		</v-col>
 
-		<v-dialog v-model="dialog" scrollable width="540px">
+		<v-dialog v-model="dialog" scrollable width="504px">
 			<v-card style="height: 100%">
-				<v-card-title>
+				<v-card-title class="px-4">
-					<span class="custom-title-4">비밀번호 {{ isPassword }}</span>
+					<span class="custom-title-4" style="padding-left: 1px;">비밀번호 {{ isPassword }}</span>
 				</v-card-title>
-				<v-divider></v-divider>
+				<v-card-text class="pb-4 px-3">
-				<v-card-text>
 					<v-col>
 						<label for="" class="search-box-label">
 							{{ isPassword }}할 비밀번호를 입력하세요
@@ -73,12 +73,11 @@
 						></v-text-field>
 					</v-col>
 				</v-card-text>
-				<v-divider></v-divider>
+				<v-card-actions class="pb-4">
-				<v-card-actions>
 					<v-spacer></v-spacer>
 					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
-					<div>
+					<div class="d-flex" style="gap: 8px">
-						 <a-button @click="close()" class="btn-default">삭제</a-button>
+						 <a-button @click="close()" class="ant-btn-popup-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,6 +22,7 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
+
 				<div class="px-6 py-4 pt-0">
 					<v-row align="center">
 						<v-col :cols="5">
@@ -46,11 +47,10 @@
 										v-model="searchWord" @keyup.enter="search"><template v-slot:append>
 											<!-- Custom SVG icon -->
 											<v-icon>$icoSearch</v-icon>
-
 										</template></v-text-field>
 								</v-col>
 								<v-spacer></v-spacer>
-								<v-col cols="3" class="text-right">
+								<v-col :cols="3" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
 										class="search-button">조회</a-button>
 									<!-- <v-btn :ripple="false" @click="initSearch()">
@@ -59,24 +59,32 @@
 								</v-col>
 							</v-row>
 						</v-col>
+						<v-col :cols="12">
+							<div style="height: 50vh;">
+								<div ref="modalGridParent" class="h100 py-4">
+									<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
+										:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
+										@getRowsData="getRowData" @dblClick="setUpdate($event)" />
+								</div>
+							</div>
+						</v-col>
 					</v-row>
-
 				</div>
 
-				<div :style="'height: calc(50vh)'">
+				<!-- <div style="height: 50vh;">
 					<div ref="modalGridParent" class="h100 px-6 py-4">
 						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="grid_01"
 							:dataPath="searchParam.pyscModalData.egrpPysclQtyPop" :parentPrgmId="parentPrgmId"
 							@getRowsData="getRowData" @dblClick="setUpdate($event)" />
 					</div>
-				</div>
+				</div> -->
+
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					
+
-					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
+					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
-						class="mr-2">닫기</a-button>
+					<a-button v-if="item.closeBtnFg || false" :ripple="false" type="danger" ghost danger
-					<a-button v-if="item.closeBtnFg || false" :ripple="false"  type="danger" ghost danger
 						@click="deleteBtnAction($event)" class="mr-2">삭제</a-button>
-					<a-button :ripple="false" type="primary" @click="setUpdate($event)" >확인</a-button>
+					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
@@ -148,23 +156,7 @@ export default {
 		return {
 			dialog: false,
 
-			loadGrid: true,
+			loadGrid: false,
-			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',
@@ -329,13 +321,6 @@ export default {
 				this.selectValueList01 = [];
 				this.selectValue01 = null;
 			}
-
-			// this.selectValueList01 = [
-			// 	{ label: '냉동기고온', value: '냉동기고온' },
-			// 	{ label: '냉동기저온', value: '냉동기저온' },
-			// 	{ label: '공조기', value: '공조기' },
-			// 	{ label: '보일러', value: '보일러' }
-			// ];
 		},
 		search() {
 			this.getGridData();
@@ -357,7 +342,7 @@ export default {
 				modalDataKey: this.modalDataKey,
 				value: Object.assign(
 					// Utility.defaultGridOption(this.$refs.modalGridParent.offsetHeight - 60, myOptions),
-					// Utility.defaultGridOption(100, myOptions),
+					Utility.defaultGridOption(400, myOptions),
 					myOptions,
 				),
 			});
@@ -415,6 +400,15 @@ export default {
 				}
 			}
 
+			// res = [
+			// 	{
+			// 	'pysclQtyId' : 'PYSCL00001',
+			// 	'pysclQtyCd' : 'AMP_1A',
+			// 	'pysclQtyNm' : '회로1 전류A',
+			// 	'pysclQtyTpNm' : 'TAG'
+
+			// 	}
+			// ]
 			this.setModalGridData({
 				modalKey: this.myModalKey,
 				gridKey: this.grid_01,
@@ -469,10 +463,10 @@ export default {
 			this.dialog = flag;
 		},
 		async dialogOpenCloseEvent(val) {
-			// await this.setSelectValueList01();
+			await this.setSelectValueList01();
-			// if (!this.myBindingData) {
+			if (!this.myBindingData) {
-			// 	return alert('그리드를 먼저 선택해주세요.');
+				return alert('그리드를 먼저 선택해주세요.');
-			// }
+			}
 			this.dialog = !val;
 		},
 		deleteBtnAction(v) {

components/common/modal/ElecPowChrgPop.vue

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

components/common/modal/EnrgEffcEqpmDetailPop.vue

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

components/common/modal/EnrgUsePlanModiPop.vue

@@ -37,6 +37,7 @@
 								:itemList="selectValueList01"
 								:label="'대상월'"
 								@update:propsValue="selectValue01 = $event"
+								customClass="select-large"
 							/>
 						</v-col>
 						<v-col :cols="5.5" class="mr-2">
@@ -49,9 +50,10 @@
 								:itemList="selectValueList02"
 								:label="'전년대비절감율'"
 								@update:propsValue="selectValue02 = $event"
+								customClass="select-large"
 							/>
 						</v-col>
-						<a-button color="primary" dark @click="search()" icon="clock-circle" >
+						<a-button class="ant-btn-popup-default" color="primary" dark @click="search()" icon="check-circle" size="large">
 							<!-- <template #icon>
 								<ClockCircleOutlined />
 							</template> -->
@@ -65,13 +67,10 @@
 				
 				<!-- <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: 70%">
+					<div id="chartParent" ref="chartParent" style="height: 100%" class="px-6">
 						<component
-							class="w100 h100"
+							class="w100 h100 py-7 custom-chart"
 							:is="loadChart ? 'Chart' : null"
 							:parentPrgmId="parentPrgmId"
 							:modalId="modalId"
@@ -130,9 +129,8 @@
 						/>
 					</div> -->
 				
-				<v-divider></v-divider>
 				<v-card-actions class="pa-5 d-flex align-center justify-end">
-					<a-button color="primary" type="default" class="mr-2" dark @click="closePop()">취소</a-button>					
+					<a-button color="primary" class="mr-2 ant-btn-popup-default" dark @click="closePop()">취소</a-button>					
 					<a-button color="primary" type="primary" dark @click="setUpdate()">확정</a-button>
 				</v-card-actions>
 			</v-card>
@@ -533,7 +531,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;
@@ -558,7 +556,6 @@ export default {
 				series: seriesData,
 				tooltip: tooltipData
 			};
-			// console.log('option', option);
 			await this.$nextTick(() => {
 				
 			});
@@ -601,7 +598,6 @@ export default {
 			sData2 = nowSeriesData.filter(item => {
 				return item.name == '계획';
 			})[0]['data'];
-			// console.log('sData1', sData);			
 			if(targetMonth.includes('qty')){
 				targetMonth = parseInt(targetMonth.slice(-2));
 			}
@@ -610,13 +606,11 @@ 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(() => {
 				
 			});
@@ -643,4 +637,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', required ? 'icon-orange' : 'icon-blue']"
+					:class="['mr-1', item.required ? 'icon-orange' : 'icon-blue']"
 					>$icoBulletPoint</v-icon
 				>
 				{{ option.labelContent }}

components/common/modal/EqpmSelectPop.vue

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

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box no-gutters" align="center">
+	<v-row class="search-box" align="center">
 		<v-col :cols="option.labelCols" class="py-0">
 			<label for="" class="search-box-label">
 				<v-icon v-if="item.iconShow" small

components/common/modal/FixedValueModiPop.vue

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

components/common/modal/FtnPlcFormPop.vue

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

components/common/modal/FtnPlcMultiPop3.vue

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

components/common/modal/ReadPlcDisableFuncPop.vue

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

components/common/modal/ReadPlcPop.vue

@@ -1,5 +1,5 @@
 <template>
-	<v-row class="search-box" align="center">
+	<v-row class="search-box" align="center" no-gutters>
 		<!-- <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: 50,
+						width: 20,
 						formatter: (props) => {
 							return `<label class="custom-radio">
 										<span class="radio-mark"></span>
@@ -278,10 +278,10 @@ export default {
 					{
 						header: '검침개소명',
 						name: 'readPlcNm',
-						width: 300,
+						width: 500,
 						align: 'left',
 					},
-					{ header: '검침개소', name: 'name', align: 'center' },
+					{ header: '검침개소', name: 'name', align: 'left', width: 200 },
 				],
 			});
 		},
@@ -307,6 +307,9 @@ export default {
 
 			// console.log("treeData", res)
 			let myOptionsTree = {
+				columnOptions: {
+					resizable: true,
+				},
 				treeColumnOptions: {
 					name: 'readPlcNm',
 				},

components/common/modal/TagTrndTagPop.vue

@@ -273,9 +273,9 @@ export default {
     });
   },
   async created() {
-    // await this.setSelectValueList01();
+    await this.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",
-        },
+      //   },
-      ];
+      // ];
-      //   res = await this.postApiReturn({
+      let 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,6 +81,10 @@ export default {
 			type: String,
 			require: false,
 		},
+		required: {
+			type: Boolean,
+			default: false
+		},
 	},
 	data() {
 		return {};

components/common/select/SelectBlocMstr.vue

@@ -9,7 +9,9 @@
 		<v-col :cols="label ? textCols : ''">
 			<v-select v-model="selectValue" :items="searchParam[parentPrgmId].blocMstrList" 
 				item-text="blocNm" item-value="idx" append-icon="" outlined
-				:hide-details="true" :class="['v-select__custom', customClass]">
+				:hide-details="true" :class="['v-select__custom', customClass]"
+				:menu-props="{ top: false, offsetY: true }"
+			>
 				<template v-slot:append><v-icon>$icoChevronDown</v-icon></template>
 			</v-select>
 		</v-col>

components/common/select/SelectBox.vue

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

components/common/select/SelectBoxMulti.vue

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

components/common/select/SelectBoxTime.vue

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

components/common/select/SelectDsEnrg.vue

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

components/common/select/SelectReadObj.vue

@@ -21,6 +21,7 @@
 				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,7 +11,9 @@
 		<v-col :cols="label ? textCols : ''">
 			<v-select v-model="selectValue" :items="searchParam[parentPrgmId][dataKey + 'List']" item-text="commCdNm"
 				item-value="commCd" outlined :hide-details="true" append-icon=""
-				:class="['v-select__custom', customClass]">
+				: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,7 +1,10 @@
 <template>
   <div>
-    <div class="d-flex justify-space-between align-center" style="min-height: 80px;">
+    <div class="d-flex justify-space-between align-center pb-5" >
-      <span class="txt custom-title-4-new">Data Set TAG 연결 정보</span>
+      <!-- <span class="txt custom-title-4">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>
@@ -14,22 +17,20 @@
         @gridEditingFinish="gridEditingFinish" />
     </div>
 
-    <div ref="formParent" style="min-height: 100px;" class="w100 h100">
+    <div ref="formParent" class="h100">
-      <v-row ref="contents" class="w100">
+      <v-row align="end" ref="contents" class="">
-        <v-col :cols="6">
+        <v-col>
           <component :is="'Datepicker'" :parentPrgmId="parentPrgmId" :label="'검색기간'" :labelCols="12" :textCols="12" />
         </v-col>
-        <v-col :cols="4">
+        <v-col >
           <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-col class="text-right align-self-end">
+      </v-row>
-          <a-button @click="jamoviProcClickEvent('view1')" type="primary" :ripple="false" class="mr-1">데이터 분석</a-button>
+      <v-row align="center" no-gutters class="searchFilter mt-2">
+        <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>
@@ -38,7 +39,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustumChecbox } from '~/plugins/gridUtility';
+import { CustomCheckbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
@@ -156,7 +157,7 @@ export default {
         {
           header: '모델 Data 구분',
           name: 'mdlDataTypeCd',
-          align: 'center',
+          align: 'left',
           width: 120,
           formatter({ value }) {
             var retVal = '';
@@ -173,7 +174,7 @@ export default {
         {
           header: '사용여부',
           name: 'useFg',
-          align: 'center',
+          align: 'left',
           width: 100,
           formatter({ value }) {
             value = value === true ? '1' : '0';
@@ -189,7 +190,7 @@ export default {
           //   }
           // }
         },
-        { header: '비고', name: 'rmrk', align: 'center' },
+        { header: '비고', name: 'rmrk', align: 'left' },
       ];
 
       this.setGridColumn({
@@ -213,7 +214,7 @@ export default {
       let dataArr = [];
       switch (action) {
         case 'add':
-          console.log('add this.pageData : '); // , this.pageData);
+          // console.log('add this.pageData : '); // , this.pageData);
           const defaultRow = {
             dataSetId: this.pageData.dataSetId,
             dataSetNm: this.pageData.dataSetNm,
@@ -296,7 +297,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-title-4-new">공정 추가 정보</span>
+			<span class="txt custom-subtitle-tab">공정 추가 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
@@ -20,7 +20,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -54,22 +53,10 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
-			dataPathMock: {
-				"rowDetailGrid": {
-				column: [
-					{ header: '추가 정보', name: 'readObjId', align: 'left' },
-					{ header: 'Data 구분', name: 'readObjNm', align: 'left' },
-					{ header: '추가 정보 값', name: 'readObjKind', align: 'left' },
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {}
-				}
-			},
 		};
 	},
 	computed: {
@@ -444,22 +431,4 @@ export default {
 		},
 	},
 };
-
-const dataPathDataExample = [
-	{
-	readObjId: 'OBJ001',
-	readObjNm: '서울 본사',
-	readObjKind: 'TYPE01',
-	},
-	{
-	readObjId: 'OBJ002',
-	readObjNm: '부산 지사',
-	readObjKind: 'TYPE02',
-	},
-	{
-	readObjId: 'OBJ003',
-	readObjNm: '대전 공장',
-	readObjKind: 'TYPE03',
-	}
-]
 </script>

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -4,14 +4,14 @@
 			class="d-flex justify-space-between align-center"
 			style="height: 80px;"
 		>
-			<span class="txt custom-title-4-new">공정 입출력 정보</span>
+			<span class="txt custom-subtitle-tab">공정 입출력 정보</span>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="height: calc(100vh - 760px);">
+		<div ref="gridParent" style="height: calc(90vh - 700px);">
 			<component
 				:ref="gridName"
 				:is="loadGrid ? 'Grid' : null"
@@ -19,10 +19,9 @@
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
-		<div>
+		<div style="height: 25vh;" class="mt-5">
 			<component
 				:is="'Form'"
 				:bindingData="gridName"
@@ -60,24 +59,11 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEccIaoGrid',
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
 			detailList: myDetail,
-			dataPathMock: {
-				"rowEccIaoGrid": {
-				column: [
-					{ header: '검침 대상 ID', name: 'readObjId', align: 'left' },
-					{ header: '검침 대상 명', name: 'readObjNm', align: 'left' },
-					{ header: '검침 대상 유형', name: 'readObjKind', align: 'left' },
-					{ header: '그룹', name: 'grpCd', align: 'left' },
-				],
-				data: dataPathDataExample,
-				defaultRow: dataPathDataExample,
-				option: {}
-				}
-			},
 		};
 	},
 	computed: {
@@ -112,17 +98,19 @@ export default {
 	watch: {
 		selectedObjId(val) {
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-2 d-none';
+				this.detailList[1].class = 'd-none';
-				this.detailList[3].class = 'py-2 d-none';
+				this.detailList[2].class = 'd-block pl-4';
-				this.detailList[4].class = 'py-2';
+				this.detailList[3].class = 'd-block';
-				this.detailList[5].class = 'py-2';
 			} else {
 				// }else if(val==="READ_PLC"){
-				this.detailList[5].class = 'py-2 d-none';
+				this.detailList[3].class = 'd-block';
-				this.detailList[4].class = 'py-2 d-none';
+				this.detailList[2].class = 'd-none';
-				this.detailList[3].class = 'py-2';
+				this.detailList[1].class = 'd-block pl-4';
-				this.detailList[2].class = 'py-2';
 			}
+			this.detailList[4].class = 'pl-4 mt-2';
+			
+			console.log(val)
+			console.log(this.detailList)
 		},
 	},
 	created() {},
@@ -202,6 +190,7 @@ export default {
 				{ header: '대상 명', name: 'objNm', width: 300, align: 'left' },
 				{
 					header: '에너지원 명',
+					width: 150,
 					name: 'ercId',
 					align: 'left',
 					formatter({ value }) {
@@ -218,8 +207,9 @@ export default {
 				},
 				{
 					header: '대상 유형',
+					width: 150,
 					name: 'objKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						var retVal = '';
 
@@ -235,7 +225,8 @@ export default {
 				{
 					header: '투입 생산 유형',
 					name: 'inProdKind',
-					align: 'center',
+					width: 150,
+					align: 'left',
 					formatter({ value }) {
 						var retVal = '';
 
@@ -251,7 +242,8 @@ export default {
 				{
 					header: '계산 여부',
 					name: 'calcFg',
-					align: 'center',
+					width: 150,
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -261,7 +253,7 @@ export default {
 						// return value === true ? "사용" : "사용안함";
 					},
 				},
-				{ header: '분배율(1~100)', name: 'distRt', align: 'right' },
+				{ header: '분배율(1~100)', name: 'distRt', align: 'right', width: 150 },
 				{ header: '사업장', name: 'blocId', align: 'center', hidden: true },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
 				{ header: '등록 일자', name: 'regDttm', hidden: true },
@@ -388,7 +380,7 @@ const myDetail = [
 		label: '대상 유형',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'pr-4 py-2',
 		list: 'emMapDivList',
 		valueNm: 'objKind',
 		itemText: 'commCdNm',
@@ -403,9 +395,9 @@ const myDetail = [
 		type: 'ReadPlcPop',
 		label: '대상 항목',
 		valueNm: 'objId',
-		disabled: false,
+		disabled: true,
 		cols: 6,
-		class: 'pt-2 pb-0 mb-0 pl-4',
+		class: 'pl-4 py-2',
 		required: true,
 		bindNm: 'objNm',
 		labelCols: 12,
@@ -414,24 +406,6 @@ 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: '대상 항목',
@@ -442,16 +416,23 @@ const myDetail = [
 		disabled: true,
 		required: true,
 		cols: 6,
-		class: 'd-none pr-4',
+		class: 'd-none pr-4 py-2',
 		disableContent: true,
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
 	},
+	{
+		// 공백 처리
+		type: 'Label',
+		cols: 6,
+		class: 'py-2 pr-4',
+		disabled: false,
+	},
 	{
 		type: 'InputText',
 		cols: 6,
-		class: 'd-none pt-0 pl-4',
+		class: 'pt-0 pl-4 mt-2 py-2',
 		valueNm: 'objNm',
 		readonly: true,
 		disabled: true,
@@ -464,7 +445,7 @@ const myDetail = [
 		label: '에너지원',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		list: 'ercNmList',
 		valueNm: 'ercId',
 		itemText: 'text',
@@ -479,7 +460,7 @@ const myDetail = [
 		label: '투입생산유형',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		list: 'cmInoutList',
 		valueNm: 'inProdKind',
 		itemText: 'commCdNm',
@@ -492,7 +473,7 @@ const myDetail = [
 	{
 		type: 'CheckBox',
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		label: '계산 여부',
 		valueNm: 'calcFg',
 		disabled: false,
@@ -501,7 +482,6 @@ const myDetail = [
 		disabledFg: 'objKind',
 		labelCols: 12,
 		textCols: 12,
-		iconShow: true,
 	},
 	{
 		type: 'InputText',
@@ -509,19 +489,18 @@ const myDetail = [
 		valueNm: 'distRt',
 		readonly: false,
 		cols: 6,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		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,55 +69,6 @@ export default {
 		return {
 			loadGrid: false,
 			gridName: 'effcInfoGrid',
-			// 	"effcInfoGrid": {
-			// 		data:
-			// 			[
-			// 				{
-			// 					"eqpmKindId": "펌프",
-			// 					"eqpmGrpId": "냉각수 시스템",
-			// 					"totMethNm": "평균값"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "모터",
-			// 					"eqpmGrpId": "공기압 시스템",
-			// 					"totMethNm": "최대값"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "밸브",
-			// 					"eqpmGrpId": "스팀 공급",
-			// 					"totMethNm": "합계"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "센서",
-			// 					"eqpmGrpId": "온도 제어",
-			// 					"totMethNm": "최소값"
-			// 				},
-			// 				{
-			// 					"eqpmKindId": "컴프레서",
-			// 					"eqpmGrpId": "에어 시스템",
-			// 					"totMethNm": "중앙값"
-			// 				}
-			// 			]
-
-			// 		,
-			// 		column: [
-
-			// 			{
-			// 				header: '대상설비종류',
-			// 				name: 'eqpmKindId',
-
-			// 			},
-			// 			{
-			// 				header: '대상설비그룹',
-			// 				name: 'eqpmGrpId',
-			// 			},
-
-			// 			{ header: '집계방법', name: 'totMethNm', align: 'center' },
-
-			// 		]
-
-			// 	}
-			// },
 			itemList: [],
 			tagTpList: [],
 			// detailList: myDetail,
@@ -388,10 +339,10 @@ export default {
 				},
 				// bodyHeight: gridHeight,
 				// minBodyHeight: gridHeight,
-				// header: {
+				header: {
-				// 	height: 28,
+					height: 37,
-				// },
+				},
-				// rowHeight: 29,
+				rowHeight: 37,
 				// minRowHeight: 29,
 				// selectionUnit: 'row',
 				// editingEvent: 'click',
@@ -436,7 +387,6 @@ export default {
 					header: '물리량ID',
 					name: 'pysclQtyId',
 					width: 200,
-					align: 'center',
 					hidden: true,
 				},
 				{ header: '물리량', name: 'pysclQtyCd', hidden: true, minWidth: 200 },
@@ -445,7 +395,7 @@ export default {
 				{ header: '가이드지표', name: 'gdIdxId', hidden: true },
 				{ header: '가이드지표명', name: 'gdIdxNm', hidden: true },
 				{ header: '집계방법', name: 'totMeth', hidden: true },
-				{ header: '집계방법', name: 'totMethNm', align: 'center' },
+				{ header: '집계방법', name: 'totMethNm',},
 			];
 
 			if (this.selectValue01 == 'PYSCL') {

components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue

@@ -1,17 +1,16 @@
 <template>
 	<div>
-		<div
+		<div class="d-flex justify-space-between align-center mb-5" >
-			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 - 520px);">
+		<div ref="gridParent" class="w100" style="height: calc(100vh - 520px);">
 			<Grid
 				:ref="gridName"
 				:is="loadGrid ? 'Grid' : null"
@@ -20,7 +19,6 @@
 				:editorGrid="true"
 				:innerTabGridInfo="innerTabGridInfo"
 				@getRowsData="getRowData"
-				:dataPath="dataPathMock"
 			/>
 		</div>
 	</div>
@@ -52,16 +50,16 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowDetailGrid',
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 			dataPathMock: {
         'rowDetailGrid' : {
           column: [
-            { header: '추가 정보', name: 'id', headerAlign: 'left' },
+            { header: '추가 정보', name: 'id', headerAlign: 'left', align: 'left', },
-            { header: 'Data 구분', name: 'lable', headerAlign: 'left' },
+            { header: 'Data 구분', name: 'lable', headerAlign: 'left', align: 'left' },
-            { header: '추가 정보 값', name: 'type', headerAlign: 'left' },
+            { header: '추가 정보 값', name: 'type', headerAlign: 'left', align: 'right' },
             // { header: '비고', name: 'note', headerAlign: 'left' }
           ],
           data: dataPathDataExample,
@@ -124,10 +122,10 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 38,
 				},
-				rowHeight: 29,
+				// rowHeight: 39,
-				minRowHeight: 29,
+				// minRowHeight: 29,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -267,11 +265,12 @@ export default {
 						}
 						return retVal;
 					},
+					minWidth: 230,
 				},
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(
@@ -282,6 +281,7 @@ export default {
 						}
 						return retVal;
 					},
+					minWidth: 330,
 				},
 				{
 					header: '숫자 값',
@@ -300,7 +300,7 @@ export default {
 				{
 					header: '추가 정보 값',
 					name: 'addInfoVal',
-					align: 'center',
+					align: 'left',
 					renderer: {
 						type: CustomRenderer,
 					},
@@ -312,6 +312,7 @@ export default {
 						// console.log('test :', test);
 						return data.row.addInfoDataKind;
 					},
+					minWidth: 330,
 				},
 				//{ header: "추가 정보 값", name: "addInfoVal", align: "center" , editor: "text",
 				//},
@@ -343,7 +344,9 @@ export default {
 				value: myColumns,
 			});
 
-			this.loadGrid = true;
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
 		},
 		async btnActions(action) {
 			let dataArr = [];
@@ -416,3 +419,4 @@ const dataPathDataExample = getPathDataExample({
 	type: '사용', note: '-'
 });
 </script>
+<style lang="scss" scoped> </style>

components/pages/ems/EqpmInfo/EqpmConstTab.vue

@@ -1,12 +1,15 @@
 <template>
 	<div>
-		<div class="d-flex justify-space-between align-center" style="height: 80px;">
+		<div class="d-flex justify-space-between align-center mb-5" >
-			<span class="txt custom-title-4-new">설비 상수 정보</span>
+			<!-- <span class="txt custom-subtitle-tab">설비 상수 정보</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);">
 			<Grid :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="parentPrgmId"
-				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" :dataPath="dataPathMock" />
+				@getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
 		</div>
 		<div style="min-height: calc(100vh - 900px);" class="mt-4">
 			<component :is="'Form'" :parentPrgmId="parentPrgmId" :bindingData="gridName" :detailList="detailList"
@@ -41,7 +44,7 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmConstGrid',
 			detailList: myEqpmConstDetail,
 
@@ -96,20 +99,20 @@ export default {
 	watch: {
 		selectedEqpmKindId(val) {
 			if (val) {
-				this.detailList[2].eqpmKindId = val;
+				this.detailList[1].eqpmKindId = val;
 			}
 		},
 		selectedEqpmGrpId(val) {
 			// if(!val){
-			// 	this.detailList[2].eqpmGrpId = '';
+			// 	this.detailList[1].eqpmGrpId = '';
 			// }else{
-			// 	this.detailList[2].eqpmGrpId = val;
+			// 	this.detailList[1].eqpmGrpId = val;
 			// }
 			// if(val){
-			// 	this.detailList[2].eqpmGrpId = val;
+			// 	this.detailList[1].eqpmGrpId = val;
 			// }
 			// else if(val == null || val == ''){
-			// 	this.detailList[2].eqpmGrpId = '';
+			// 	this.detailList[1].eqpmGrpId = '';
 			// }
 		},
 	},
@@ -160,11 +163,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' },
+				{ header: '물리량 ID', name: 'pysclQtyId', align: 'left', minWidth: 230, },
-				{ header: '물리량 명', name: 'pysclQtyNm', align: 'left' },
+				{ header: '물리량 명', name: 'pysclQtyNm', align: 'left', minWidth: 230, },
-				{ header: '물리량값', name: 'pysclQtyVal', align: 'left' },
+				{ header: '물리량값', name: 'pysclQtyVal', align: 'left', minWidth: 230, },
 				// { header: '대상항목', name: 'objNm', align: 'left'},
-				{ header: '대상항목', name: 'objId', align: 'left' },
+				{ header: '대상항목', name: 'objId', align: 'left', minWidth: 230, },
 				{
 					header: '에너지원 명',
 					name: 'ercId',
@@ -232,14 +235,16 @@ export default {
 				value: myColumns,
 			});
 
-			this.loadGrid = true;
+			this.$nextTick(() => {
+				this.loadGrid = true;
+			});
 		},
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
-				this.detailList[2].disabled = false;
+				this.detailList[1].disabled = false;
 				this.detailList[3].disabled = false;
 			} else {
-				this.detailList[2].disabled = true;
+				this.detailList[1].disabled = true;
 				this.detailList[3].disabled = true;
 			}
 
@@ -255,12 +260,12 @@ export default {
 			switch (action) {
 				case 'add':
 					this.$refs[this.gridName].addRow();
-					this.detailList[2].disabled = false;
+					this.detailList[1].disabled = false;
 					this.detailList[3].disabled = false;
 					break;
 
 				case 'remove':
-					this.detailList[2].disabled = true;
+					this.detailList[1].disabled = true;
 					this.detailList[3].disabled = true;
 					this.$refs[this.gridName].removeRow();
 					break;
@@ -289,8 +294,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;
 								}
@@ -356,7 +361,6 @@ const myEqpmConstDetail = [
 	{
 		type: 'SelectBox',
 		label: '대상 유형',
-		disabled: true,
 		cols: 6,
 		class: 'py-3 pr-4',
 		list: 'emMapDivList2',
@@ -369,6 +373,7 @@ const myEqpmConstDetail = [
 		textCols: 12,
 		iconShow: true,
 	},
+	// ==================
 	{
 		type: 'EgrpPysclQtyPop',
 		labelContent: '물리량',
@@ -380,11 +385,11 @@ const myEqpmConstDetail = [
 			pysclQtyNm: 'pysclQtyNm',
 		},
 		valueNm: 'objId',
-		disabled: false,
+		disabled: true,
 		required: true,
 		openMode: 'CONST',
 		cols: 6,
-		class: 'py-3 pl-4',
+		class: 'pt-3 pb-1 pl-4',
 		eqpmGrpDisableFlag: true,
 		// eqpmGrpId:'',
 		labelCols: 12,
@@ -404,13 +409,14 @@ const myEqpmConstDetail = [
 		disabled: true,
 		readonly: true,
 		cols: 6,
-		class: 'py-3 pt-1 pl-4',
+		class: 'pb-3 pt-0 pl-4',
 		align: 'right',
 		// class: 'py-2 d-none',
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
 	},
+	// ------------
 	{
 		type: 'InputText',
 		label: '물리량 값',
@@ -438,3 +444,11 @@ 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,28 +1,27 @@
 <template>
 	<div>
-		<div
+		<div class="d-flex justify-space-between align-center mb-5" >
-			class="d-flex justify-space-between align-center"
+			<!-- <span class="txt custom-subtitle-tab">설비 입출력 정보</span> -->
-			style="height: 80px;"
+			<v-card-title class="txt custom-title-4 pa-0">
-		>
+				설비 입출력 정보
-			<span class="txt custom-title-4-new">설비 입출력 정보</span>
+			</v-card-title>
 			<Buttons
 				:parentPrgmId="parentPrgmId"
 				:bindingData="gridName"
 				:btnActionsFnc="btnActions"
 			/>
 		</div>
-		<div ref="gridParent" style="min-height: calc(100vh - 800px);" >
+		<div ref="gridParent" style="height: calc(100vh - 700px);">
-			<!-- :is="loadGrid ? 'Grid' : null" -->
 			<Grid
 				:ref="gridName"
+				:is="loadGrid ? 'Grid' : null"
 				:gridName="gridName"
 				:parentPrgmId="parentPrgmId"
 				@getRowsData="getRowData"
 				:innerTabGridInfo="innerTabGridInfo"
-				:dataPath="dataPathMock"
 			/>
 		</div>
-		<div style="min-height: calc(100vh - 900px);" class="mt-4">
+		<div style="height: 60vh;" class="mt-5">
 			<component
 				:is="'Form'"
 				:parentPrgmId="parentPrgmId"
@@ -60,28 +59,12 @@ export default {
 	},
 	data() {
 		return {
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowEqpmIaoGrid',
 			detailList: myEqpmIaoDetail,
 
 			inputList_emMapDiv: [],
 			inputList_cmInOut: [],
-			dataPathMock: {
-        'rowEqpmIaoGrid' : {
-          column: [
-            { header: '대상항목', name: 'id', headerAlign: 'left' },
-            { header: '에너지원 명', name: 'lable', headerAlign: 'left' },
-            { header: '대상 유형', name: 'type', headerAlign: 'left' },
-            { header: '물리량', name: 'note', headerAlign: 'left' },
-            { header: '계산여부', name: 'field1', headerAlign: 'left' },
-            { header: '분배율', name: 'field2', headerAlign: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {}
-        }
-      },
-
 		};
 	},
 	computed: {
@@ -128,18 +111,24 @@ export default {
 	},
 	watch: {
 		selectedObjId(val) {
-			console.log('selectedObjId : ', val);
 			if (val === 'TAG') {
-				this.detailList[2].class = 'py-2 d-none';
+				// this.detailList[1].class = 'py-3 pl-4 pb-0';
-				this.detailList[3].class = 'py-2 d-none';
+				this.detailList[1].class = 'py-3 d-none';
-				this.detailList[4].class = 'py-2';
+				this.detailList[2].class = 'py-3 d-none';
-				this.detailList[5].class = 'py-2';
+				this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
+
+				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[5].class = 'py-2 d-none';
+				this.detailList[1].class = 'py-3 pl-4';
-				this.detailList[4].class = 'py-2 d-none';
+				this.detailList[2].class = 'py-3';
-				this.detailList[3].class = 'py-2';
+				this.detailList[3].class = 'py-3 pl-4 pt-0';
-				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) {
@@ -172,7 +161,7 @@ export default {
 		},
 	},
 	mounted() {
-		// this.init();
+		this.init();
 	},
 	methods: {
 		...mapMutations({
@@ -240,11 +229,12 @@ export default {
 
 						return retVal;
 					},
+					minWidth: 150,
 				},
 				{
 					header: '대상 유형',
 					name: 'objKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						var retVal = '';
 
@@ -256,9 +246,10 @@ export default {
 
 						return retVal;
 					},
+					minWidth: 150,
 				},
 				{ header: '물리량', name: 'pysclQtyId', align: 'left', hidden: true },
-				{ header: '물리량', name: 'pysclQtyNm', align: 'left' },
+				{ header: '물리량', name: 'pysclQtyNm', align: 'left', minWidth: 150, },
 				{
 					header: '물리량값',
 					name: 'pysclQtyVal',
@@ -275,7 +266,7 @@ export default {
 				{
 					header: '계산여부',
 					name: 'calcFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -283,6 +274,7 @@ export default {
 						);
 						return newValue[0].commCdNm;
 					},
+					minWidth: 100,
 				},
 				{ header: '분배율', name: 'distRt', align: 'right' },
 				{ header: '등록 사용자', name: 'regUserNo', hidden: true },
@@ -302,13 +294,13 @@ export default {
 		async getRowData(data, gridName) {
 			if (data.rowStat === 'I') {
 				this.detailList[0].disabled = false;
-				this.detailList[2].disabled = false;
+				this.detailList[1].disabled = false;
 				this.detailList[3].disabled = false;
 				this.detailList[4].disabled = false;
 				this.detailList[5].disabled = false;
 			} else {
 				this.detailList[0].disabled = true;
-				this.detailList[2].disabled = true;
+				this.detailList[1].disabled = true;
 				this.detailList[3].disabled = true;
 				this.detailList[4].disabled = true;
 				this.detailList[5].disabled = true;
@@ -326,7 +318,7 @@ export default {
 				case 'add':
 					this.$refs[this.gridName].addRow();
 					this.detailList[0].disabled = false;
-					this.detailList[2].disabled = false;
+					this.detailList[1].disabled = false;
 					this.detailList[3].disabled = false;
 					this.detailList[4].disabled = false;
 					this.detailList[5].disabled = false;
@@ -335,7 +327,7 @@ export default {
 				case 'remove':
 					this.$refs[this.gridName].removeRow();
 					this.detailList[0].disabled = true;
-					this.detailList[2].disabled = true;
+					this.detailList[1].disabled = true;
 					this.detailList[3].disabled = true;
 					this.detailList[4].disabled = true;
 					this.detailList[5].disabled = true;
@@ -355,7 +347,7 @@ export default {
 					}
 
 					if (dataArr.length > 0) {
-						console.log('dataArr : ', dataArr);
+						// console.log('dataArr : ', dataArr);
 
 						var requiredKeyList = this.detailList
 							.filter(item => {
@@ -416,6 +408,7 @@ export default {
 	},
 };
 
+
 function checkDuplicate(data, targetKey) {
 	var duplicateFlag = false;
 	var set = new Set();
@@ -455,10 +448,10 @@ const myEqpmIaoDetail = [
 		type: 'ReadPlcPop',
 		label: '대상 항목',
 		valueNm: 'objId',
-		disabled: true,
 		cols: 6,
-		class: 'py-3 pl-4',
+		class: 'py-3 pl-4 pb-0',
 		required: true,
+		disabled: true,
 		bindNm: 'objNm',
 		textCols: 12,
 		labelCols: 12,
@@ -479,30 +472,39 @@ const myEqpmIaoDetail = [
 		readonly: true,
 		disabled: true,
 		cols: 6,
-		class: 'py-3 pl-4 pt-1',
+		class: 'py-3 pl-4 pt-0',
 		textCols: 12,
 		labelCols: 12,
 		iconShow: true
 	},
+// ============
 	{
 		type: 'EvtObjPop',
-		labelContent: '대상 항목 111',
+		labelContent: '대상 항목',
 		valueNm: 'objId',
 		valueNm2: 'objNm',
 		bindNm: 'objNm',
 		disabled: true,
 		required: true,
 		cols: 6,
-		class: 'py-3 d-none',
+		class: 'py-3 pl-4 d-none',
 		disableContent: true,
 		textCols: 12,
 		labelCols: 12,
 		iconShow: true
 	},
 	{
-		type: 'InputText',
+		type: 'Label',
-		cols: 5,
+		cols: 6,
 		class: 'py-3 d-none',
+		disabled: true,
+		textCols: 12,
+		labelCols: 12,
+	},
+	{
+		type: 'InputText',
+		cols: 6,
+		class: 'py-3 pl-4 d-none',
 		valueNm: 'objNm',
 		readonly: true,
 		disabled: true,
@@ -510,6 +512,7 @@ const myEqpmIaoDetail = [
 		labelCols: 12,
 		iconShow: true
 	},
+	// --------------------------------------------
 	{
 		type: 'SelectBox',
 		label: '에너지원',
@@ -614,13 +617,11 @@ 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,6 +20,12 @@
 				</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">
@@ -37,7 +43,7 @@
 				<div
 					ref="gridParent"
 					class="w100"
-					style="height: calc((100vh - 600px) / 2);"
+					style="height: calc((100vh - 500px) / 2);"
 				>
 					<Grid
 						:ref="gridName"
@@ -51,7 +57,7 @@
 				</div>
 			</v-col>
 		</v-row>
-		<v-row class="search-box" align="center" no-gutters style="height: 44px;">
+		<v-row class="search-box mt-2" 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"
@@ -71,7 +77,7 @@
 				<div
 					ref="chartParent"
 					class="h100 w100"
-					style="height: calc((100vh - 600px) / 2  - 30px);"
+					style="height: calc((100vh - 500px) / 2);"
 				>
 					<component
 						class="w100 h100"

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -1,8 +1,8 @@
 <template>
 	<div>
 		<div
-			class="d-flex justify-space-between align-center"
+			class="d-flex justify-space-between mb-3 pr-4"
-			style="height: 80px;"
+			style="height: 45px;"
 		>
 			<span class="txt custom-subtitle-tab">검침 대상 추가 정보</span>
 			<Buttons
@@ -102,7 +102,7 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 31;
 
 			const myOptions = {
 				columnOptions: {
@@ -113,8 +113,8 @@ export default {
 				header: {
 					height: 28,
 				},
-				rowHeight: 29,
+				rowHeight: 36,
-				minRowHeight: 29,
+				minRowHeight: 36,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -143,7 +143,6 @@ export default {
 			class CustomRenderer {
 				constructor(props) {
 					//const { min, max } = props.columnInfo.renderer.options;
-					//console.log('props: %o', props);
 
 					const el = document.createElement('input');
 					if (
@@ -215,15 +214,12 @@ 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 {
@@ -245,7 +241,6 @@ export default {
 					} else {
 						this.el.value = String(props.value);
 					}
-					//console.log('props: %o', props);
 				}
 
 				mounted() {
@@ -275,7 +270,7 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(
@@ -323,8 +318,6 @@ 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{
@@ -447,3 +440,15 @@ 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,7 +200,6 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(

components/pages/ems/ReadPlcInfo/ReadPlcImgInfoTab.vue

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

components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue

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

components/pages/ems/TagInfo/TagAddInfoTab.vue

@@ -107,8 +107,7 @@ export default {
 				header: {
 					height: 38,
 				},
-				rowHeight: 22,
+
-				minRowHeight: 22,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -269,7 +268,7 @@ export default {
 				{
 					header: 'Data 구분',
 					name: 'addInfoDataKind',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = addInfoDataKindList.filter(

layouts/default.vue

@@ -9,7 +9,6 @@
               <div class="lnb-logo">
                 <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
                 <img v-else src="@/assets/images/logo_lm.png" />
-                <!-- <img v-else src="@/assets/images/logo_lm.png" /> -->
               </div>
               <!--            <div class="lnb-logo">FEMS</div>-->
             </router-link>
@@ -40,16 +39,16 @@
             <v-menu offset-y>
               <template v-slot:activator="{ on, attrs }">
                 <a-button
-                    :ripple="false"
+                  :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> -->
@@ -62,10 +61,10 @@
                 </v-list-item>
               </v-list>
             </v-menu>
-            <a-button id="refresh" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
+            <a-button id="removeBm" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
               <span class="material-icons" style="font-size: 17px">star</span>
             </a-button>
-            <a-button id="refresh" class="btn-header" :style="{
+            <a-button id="addBm" class="btn-header" :style="{
                     display: 'flex',
                     alignItems: 'center'}" @click="addBookMark" v-if="bookmarkBtn == 0">
               <span class="material-icons" style="font-size: 17px">star_border</span>
@@ -88,32 +87,12 @@
         </v-row>
       </div>
       <v-main>
-
         <v-container fluid>
           <v-row class="flex-nowrap">
             <div class="menu-container">
               <v-navigation-drawer ref="navigationdrawer" :value="drawer" :mini-variant="miniVariant" :clipped="clipped"
                 :absolute="false" mini-variant-width="60">
 
-                <div class="d-flex align-center justify-space-between py-4 px-3" v-if="false">
-                  <router-link class="home" :to="myHome.root">
-                    <div class="lnb-logo">
-                      <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
-                      <img v-else src="@/assets/images/logo_lm.png" />
-                    </div>
-                    <!--            <div class="lnb-logo">FEMS</div>-->
-                    
-                  </router-link>
-                  <ThemeSwitch style="margin-right: 20px" />
-                  <v-app-bar-nav-icon ref="appbarnavicon" id="appbarnavicon" @click.stop="miniVariant = !miniVariant"
-                    @click="updateTreeview" :style="{
-                      backgroundColor: 'transparent',
-                      color: isDarkMode ? '#fff' : '#111',
-                    }" />
-                  <!-- <router-view :key="$route.fullPath"/> -->
-                </div>
-                <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">
@@ -130,14 +109,16 @@
                         :class="miniVariant === false ? 'mr-2' : ''" size="9">
                         $depth3rdBulletDark
                       </v-icon>
-                      <span v-if="item.url">{{ item.menuNm }}
+                      <span v-if="item.url">
+                        {{ item.menuNm }}
                         <!-- <span v-if="item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star</span>
                         <span v-else-if="!item.bookmark" class="material-icons" style="font-size: 17px; vertical-align: middle;" @click="addBookMark(item.menuId, item.url, item.bookmark)">star_border</span> -->
                       </span>
                       <span v-else-if="!item.url">{{ item.menuNm }}</span>
-                      <v-icon v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url">
+                      <!-- <v-icon v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url">
                         mdi-chevron-down
-                      </v-icon>
+                      </v-icon> -->
+                      <a-icon type="down" v-if="item.lvl >= 1 && item.childeVo && item.childeVo.length > 0 && !item.url" />
                     </button>
                   </template>
                 </v-treeview>
@@ -805,7 +786,7 @@ export default {
       // 	console.log('if isLoading stmt3');
       // 	return;
       // }
-      alert("move to", url);
+      // alert("move to", url);
       this.$router.push({
         path: url + "?prgmId=" + prgmId,
       });

mixin/global.js

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

nuxt.config.js

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

pages/comm/auth/MenuMngPage.vue

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

pages/comm/auth/MenuRoleMngPage.vue

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

pages/comm/auth/UserRoleMngPage.vue

@@ -1,6 +1,7 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -12,6 +13,8 @@
 								:parentPrgmId="myPrgmId"
 								:sendParam="{ comId }"
 								customClass="select-large"
+								:labelCols="12"
+								:textCols="12"
 							/>
 							<!-- <component
                 :is="'selectCodeList'"
@@ -79,7 +82,6 @@
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -88,7 +90,7 @@
 			<!-- 사용자 정보 -->
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5 h100">
-					<v-card-title class="custom-title-4">사용자 정보</v-card-title>
+					<v-card-title class="custom-title-4 pb-0">사용자 정보</v-card-title>
 					<div class="px-5" :style="{ height: 'calc(100% - 62.5px)' }">
 						<v-tabs v-model="tab">
 							<v-tab
@@ -126,13 +128,13 @@
 
 									<!-- 역할수정 -->
 									<template v-else-if="item.id == 'AsgnRoleByUser'">
-										<v-col :cols="3" class="h100">
+										<v-col :cols="12" class="overflow-y-scroll grid-toggle-section">
 											<v-card-title
-												class="pa-0 custom-title-4"
+												class="pa-0 custom-subtitle-tab"
 												style="min-height:36px;"
 												>역할리스트</v-card-title
 											>
-											<div style="height:calc(100% - 36px)" class="py-5">
+											<div class="py-5">
 												<component
 													class="w100"
 													:is="loadGridTab2 ? 'Grid' : null"
@@ -144,17 +146,18 @@
 												/>
 											</div>
 										</v-col>
-										<v-col :cols="1" class="d-flex justify-center">
+										<v-col :cols="12" class="d-flex justify-center">
 											<ActionButtons
 												:parentPrgmId="myPrgmId"
 												:leftGridName="gridName2"
 												:rightGridName="gridName3"
 												:btnActionsFnc="dualGridBtnActions"
+												directionBtn="vertically"
 											/>
 										</v-col>
-										<v-col :cols="8" class="h100">
+										<v-col :cols="12" class="h100">
 											<div class="d-flex align-center justify-space-between">
-												<v-card-title class="pa-0 custom-title-4">
+												<v-card-title class="pa-0 custom-subtitle-tab">
 													사용자 역할</v-card-title
 												>
 												<div>
@@ -307,40 +310,10 @@ export default {
 	},
 	methods: {
 		async init() {
-			 this.gridInit();
+			await this.gridInit();
 		},
-
-		gridInitTest() {
-			const rowGrid = {
-				column: [
-				{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
-				{ header: '사용자명', name: 'userNm' },
-				{ header: '사용자ID', name: 'userLoginId' },
-				{ header: '사용자비밀번호', name: 'userPswd', hidden: true },
-				{ header: '사업장', name: 'blocId', hidden: true },
-				{ header: 'email', name: 'email', hidden: true },
-				{ header: '등록자NO', name: 'regUserNo', hidden: true },
-				{ header: '등록일시', name: 'regDttm', hidden: true },
-				{ header: '수정자NO', name: 'procUserNo', hidden: true },
-				{ header: '수정일시', name: 'procDttm', hidden: true },
-				{ header: 'comId', name: 'comId', hidden: true },
-				{ header: 'deptId', name: 'deptId', hidden: true },
-				],
-				data: dataMockExample,
-				defaultRow: dataMockExample,
-				option: [],
-			}
-			this.dataPathMock = {rowGrid};
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
-
 		// 사용자 리스트 그리드 세팅
 		gridInit() {
-
-			// this.gridInitTest(); return
-
 			const gridHeight = this.$refs.gridParent.offsetHeight - 90;
 
 			const myOptions = {
@@ -923,6 +896,7 @@ const defaultData = {
 };
 
 const myColumns = [
+	
 	{ header: '사용자No', name: 'userNo', align: 'center', hidden: true },
 	{ header: '사용자명', name: 'userNm' },
 	{ header: '사용자ID', name: 'userLoginId' },
@@ -938,7 +912,18 @@ 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 },
@@ -947,6 +932,7 @@ const unAsgnRoleByUserColumns = [
 ];
 
 const asgnRoleByUserColumns = [
+	
 	{ header: '역할ID', name: 'roleId', align: 'center' },
 	{ header: '역할명', name: 'roleNm' },
 	{
@@ -960,7 +946,8 @@ const asgnRoleByUserColumns = [
 	{ header: 'comId', name: 'comId', hidden: true },
 ];
 
-const asgnMenuByUserColumns = [{ header: '메뉴명', name: 'menuNm' }];
+const asgnMenuByUserColumns = [
+	{ header: '메뉴명', name: 'menuNm' }];
 
 const myDetail = blocCdList => {
 	return [
@@ -973,7 +960,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pr-4 mt-2',
 			iconShow: true,
 			required: false,
 			placeholder: '시스템 자동입력',
@@ -985,7 +972,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4 mt-2',
 			iconShow: true,
 			required: true,
 		},
@@ -998,8 +985,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pr-4 mt-2',
-			iconShow: true,
 			required: true,
 		},
 		{
@@ -1009,7 +995,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4 mt-2',
 			iconShow: true,
 			required: true,
 		},
@@ -1020,7 +1006,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pr-4 mt-2',
 			iconShow: true,
 			list: blocCdList.map(item => ({
 				text: item.blocNm,
@@ -1035,7 +1021,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4 mt-2',
 			iconShow: true,
 		},
 		{
@@ -1046,7 +1032,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pr-4 mt-2',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1058,7 +1044,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4 mt-2',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1070,7 +1056,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pr-4 mt-2',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1082,7 +1068,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4 mt-2',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@@ -1100,67 +1086,4 @@ 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,27 +1,30 @@
 <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-row align="end" no-gutters>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치ID"
 								valueNm="batchId"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="배치명"
 								valueNm="batchNm"
 								:searchOption="true"
+								customClass="input-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@@ -29,20 +32,21 @@
 								:dataKey="'execRsltCd'"
 								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_RSLT', useFg: '1' }"
 								:addAll="true"
+								customClass="select-large"
 							/>
 						</v-col>
-						<v-col :cols="2">
+						<v-col :cols="2.5">
 							<component
 								:is="'Datepicker'"
 								:parentPrgmId="myPrgmId"
 								:label="'조회기간'"
+								customClass="datepicker-large"
 							/>
 						</v-col>
-						<v-spacer></v-spacer>
+						<div class="text-right d-flex align-end justify-end pl-9" style="gap: 8px">
-						<v-col :cols="4" class="text-right">
 							<BtnSearch />
-							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" />
+							<BtnExcelDownload :parentPrgmId="myPrgmId" :gridName="gridName" size="large" />
-						</v-col>
+						</div>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -215,14 +219,14 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: 'No.', name: 'batchLogSeq', align: 'center', width: 100 },
+				{ header: 'No.', name: 'batchLogSeq', align: 'right', width: 100 },
-				{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
+				{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
 				{ header: '배치명', name: 'batchNm', align: 'left', width: 150 },
-				{ header: '실행 일자', name: 'execDt', align: 'center', width: 80 },
+				{ header: '실행 일자', name: 'execDt', align: 'right', width: 80 },
 				{
 					header: '실행 결과',
 					name: 'execRsltCd',
-					align: 'center',
+					align: 'left',
 					width: 80,
 					formatter({ value }) {
 						let retVal = '';
@@ -239,7 +243,7 @@ export default {
 				{
 					header: '배치 시작 일시',
 					name: 'batchStrtDttm',
-					align: 'center',
+					align: 'left',
 					width: 160,
 				},
 				{
@@ -426,7 +430,4 @@ const myDetail = [
 		class: 'py-2',
 	},
 ];
-</script>
+</script>
-<style lang="scss">
-@import '@/assets/scss/common.scss';
-</style>

pages/comm/base/BatchMngPage.vue

@@ -1,7 +1,8 @@
 <template>
 	<div class="l-layout">
 		<!-- 조회조견 -->
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -14,36 +15,26 @@
 								:customClass="'input-large'" />
 						</v-col>
 						<v-col :cols="2.5">
-							<component
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'배치 실행 구분'"
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'배치 실행 구분'"
 								:dataKey="'searchBatchExecTp'"
-								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }"
+								:sendParam="{ commGrpCd: 'CO_BATCH_EXEC_TP', useFg: '1' }" :addAll="true"
-								:addAll="true"
+								:customClass="'select-large'" />
-								:customClass="'select-large'"
-							/>
 						</v-col>
-						<v-col :cols="2.5">
+						<v-col :cols="2.5" class="pr-4">
-							<component
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
-								:is="'selectCodeList'"
+								:dataKey="'searchUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:parentPrgmId="myPrgmId"
+								:customClass="'select-large'" />
-								:label="'사용여부'"
-								:dataKey="'searchUseFg'"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:customClass="'select-large'"
-							/>
 						</v-col>
-						<BtnSearch size="large" />
+						<BtnSearch size="large" class="mr-2" />
 
 					</v-row>
 				</v-card>
 			</v-col>
 		</v-row>
 
-		<v-row ref="contents" class="mt-4">
+		<v-row ref="contents" class="mt-4 h100">
 			<!-- 배치 리스트 -->
-			<v-col :cols="6" class="h100 pr-2">
+			<v-col :cols="6" class="pr-2">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-4">
 						<!-- <v-card-title>
@@ -55,16 +46,16 @@
 							:btnActionsFnc="btnActions" />
 					</div>
 					<div class="px-4">
-						<div ref="gridParent" class="h100 w100">
+						<div ref="gridParent" class="h100 w100" style="height:calc(100% - 70px)">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
-								:gridName="gridName" @getRowsData="getRowData" :dataPath="dataPathExample" />
+								:gridName="gridName" @getRowsData="getRowData" />
 						</div>
 						<!-- </v-card-actions> -->
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 배치 상세 -->
-			<v-col :cols="6" class="h100 pl-3">
+			<v-col :cols="6" class="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>
@@ -77,21 +68,23 @@
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-dialog ref="popModal" v-model="dialog" width="700" overlay-color="#000" overlay-opacity="0.8" scrollable>
+			<v-dialog ref="popModal" v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8" scrollable>
 				<v-card style="height: 100%">
 					<v-card-title class="v-card__title d-flex align-center justify-space-between">
 						<span class="custom-title-4">DB 프로시져 파라메터 설정</span>
-						<div>
+						<a-button icon="close" type="text" @click="dialog = false"></a-button>
-							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridNameParam"
+
-								:btnActionsFnc="btnActionsParam" />
-						</div>
 					</v-card-title>
 					<div class="pa-5">
-						<v-row align="center" no-gutters>
+						<v-row align="end" no-gutters>
-							<v-col cols="12" class="text-right"> </v-col>
+							<v-col cols="12" class="d-flex justify-end">
+
+								<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);">
@@ -101,11 +94,9 @@
 							</div>
 						</div>
 					</v-card-text>
-					<v-divider></v-divider>
+					<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<v-card-actions>
+						<a-button :ripple="false" @click="dialog = false" class="mr-2">닫기</a-button>
-						<v-spacer></v-spacer>
+						<a-button :ripple="false" type="primary" @click="setParamChangeData()">확인</a-button>
-						<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>
@@ -155,76 +146,16 @@ export default {
 	data() {
 		return {
 			myPrgmId: myPrgmId,
-			loadGrid: true,
+			loadGrid: false,
 			gridName: 'rowGrid',
-			dataPathExample: {
-				"rowGrid": {
-					data: [
-						{
-							"batchId": "BATCH001",
-							"batchNm": "일일 데이터 백업",
-							"batchExecTp": "자동 실행",
-							"batchDupExecFg": "N",
-							"useFg": "사용"
-						},
-						{
-							"batchId": "BATCH002",
-							"batchNm": "월간 리포트 생성",
-							"batchExecTp": "수동 실행",
-							"batchDupExecFg": "Y",
-							"useFg": "사용"
-						},
-						{
-							"batchId": "BATCH003",
-							"batchNm": "로그 정리 작업",
-							"batchExecTp": "자동 실행",
-							"batchDupExecFg": "N",
-							"useFg": "미사용"
-						},
-						{
-							"batchId": "BATCH004",
-							"batchNm": "사용자 통계 수집",
-							"batchExecTp": "예약 실행",
-							"batchDupExecFg": "Y",
-							"useFg": "사용"
-						},
-						{
-							"batchId": "BATCH005",
-							"batchNm": "서버 상태 점검",
-							"batchExecTp": "수동 실행",
-							"batchDupExecFg": "N",
-							"useFg": "미사용"
-						}
-					]
 
-					,
-					column: [
-						{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
-						{ header: '배치명', name: 'batchNm', minWidth: 200 },
-						{
-							header: '배치 실행 구분',
-							name: 'batchExecTp',
-							align: 'left',
-							minWidth: 190,
-						},
-						{ header: '배치 중복 여부', name: 'batchDupExecFg', hidden: true },
-						{
-							header: '사용여부',
-							name: 'useFg',
-							align: 'center',
-							width: 145,
-						},
-					],
-
-				}
-			},
 			// rowGridOrigin: [],
 			detailList: myDetail,
 
 			// 파라메터 셋팅용 변수
 			dialog: false,
 			gridNameParam: 'paramGrid',
-			paramLoadGrid: true,
+			paramLoadGrid: false,
 			selectedGridNameParamRow: null,
 		};
 	},
@@ -292,7 +223,7 @@ export default {
 		}),
 		init() {
 			// this.layoutInit();
-			// this.gridInit();
+			this.gridInit();
 			this.gridParamInit();
 		},
 		// layoutInit() {
@@ -309,6 +240,10 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
+				header: {
+					height: 37,
+				},
+				rowHeight: 37,
 			};
 			this.setGridOption({
 				gridKey: this.gridName,
@@ -318,7 +253,7 @@ export default {
 
 			const _this = this;
 			const myColumns = [
-				{ header: '배치ID', name: 'batchId', align: 'center', width: 100 },
+				{ header: '배치ID', name: 'batchId', align: 'right', width: 100 },
 				{ header: '배치명', name: 'batchNm', minWidth: 200 },
 				{
 					header: '배치 실행 구분',
@@ -340,7 +275,6 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
 					width: 145,
 					formatter({ value }) {
 						let retVal = '';
@@ -384,7 +318,7 @@ export default {
 		},
 		async search() {
 			// console.log("search");
-			// await this.getRowGridData();
+			await this.getRowGridData();
 			await this.setPageData({
 				isFind: false,
 			});
@@ -613,7 +547,7 @@ export default {
 			}
 		},
 		gridParamInit() {
-			
+
 			const gridHeight = this.$refs.gridParent.offsetHeight - 36;
 			const myOptions = {
 				columnOptions: {
@@ -624,32 +558,35 @@ 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';
 					},
@@ -664,27 +601,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 },
@@ -699,90 +636,53 @@ 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) {
@@ -811,22 +711,21 @@ export default {
 		},
 		inputClick(event, item, valueNm) {
 			if (valueNm == 'refVal1') {
-				this.dialog = true;
+				const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
-				// const rowIdxKey = this.$refs[this.gridName].gridInstance.invoke(
+					'getFocusedCell',
-				// 	'getFocusedCell',
+				).rowKey;
-				// ).rowKey;
+				const selectRowData = this.$refs[this.gridName].gridInstance.invoke(
-				// const selectRowData = this.$refs[this.gridName].gridInstance.invoke(
+					'getRow',
-				// 	'getRow',
+					rowIdxKey,
-				// 	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,6 +1,7 @@
 <template>
 	<div class="l-layout">
-		<v-row ref="searchFilter">
+		<common-page-title />
+		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
@@ -10,7 +11,7 @@
 						</v-col>
 						<v-col cols="3">
 							<!-- <component :is="'SelectDateSolo'" :parentPrgmId="myPrgmId" /> -->
-							<DatePicker :parentPrgmId="myPrgmId" :label="'조회연월'" />
+							<DatePicker :parentPrgmId="myPrgmId" customClass="datepicker-large" :label="'조회연월'" />
 						</v-col>
 						<v-col cols="6" class="text-right">
 							<BtnSearch @click="search()" size="large" />
@@ -20,28 +21,29 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents" id="CalendarMngContent" class="mt-4">
-			<v-col cols="12" lg="4" class="h100 pr-2">
+			<v-col cols="12" lg="4" class=" pr-2">
 				<v-card class="w100">
 					<v-card-title class="d-flex justify-space-between align-center">
 						<span class="custom-title-4">캘린더 리스트</span>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</v-card-title>
-					<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 72.56px)' }">
+					<v-card-actions class="pt-0 px-5 pb-5" :style="{ height: 'calc(100% - 10px)' }">
 						<div ref="gridParent" class="w100 h100">
 							<component class="w100" :ref="gridName + myPrgmId" :is="loadGrid ? 'Grid' : null"
 								:gridName="gridName" :parentPrgmId="myPrgmId" :editorGrid="true"
-								@getRowsData="getRowData" :dataPath="dataPathExample" />
+								@getRowsData="getRowData" />
 						</div>
 					</v-card-actions>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="8" class="h100 pl-3">
+			<v-col cols="12" lg="8" class=" pl-3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">캘린더 미리보기</span>
 					</v-card-title>
-					<v-card-actions class="px-5 d-block" :style="{ height: 'calc(100% - 62px)' }">
+					<v-card-actions class="px-5 d-block" >
-						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false" />
+						<Calendar :parentPrgmId="myPrgmId" :gridName="gridName" :headerVisible="false"
+							:showTitle="false" />
 					</v-card-actions>
 				</v-card>
 			</v-col>
@@ -94,81 +96,7 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
-			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',
 		};
@@ -241,16 +169,19 @@ export default {
 			await this.gridInit();
 		},
 		async search() {
-			// await this.getRowGridData();
+			await this.getRowGridData();
 		},
 		async gridInit() {
-			// const gridHeight = this.$refs.gridParent.offsetHeight - 30;
+			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,
+					scrollX: false, header: {
-			// 	}),
+						height: 37,
-			// });
+					},
+					rowHeight: 37,
+				}),
+			});
 
 			// this.getRowGridData();
 		},
@@ -319,7 +250,6 @@ export default {
 				{
 					header: '요일',
 					name: 'dtNm',
-					align: 'center',
 					formatter({ value }) {
 						return value + '요일';
 					},
@@ -327,7 +257,6 @@ export default {
 				{
 					header: '구분',
 					name: 'hldyFg',
-					align: 'center',
 					essential: true,
 					formatter({ value }) {
 						return value == 1 ? '휴일' : '평일';
@@ -350,86 +279,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({
@@ -604,4 +533,17 @@ select.selectbox {
 	border-width: 0px;
 	// box-sizing: border-box;
 }
+
+::v-deep {
+	.custom-vc-calender {
+		.vc-header {
+			display: none;
+		}
+
+		.vc-weeks {
+			padding: 0;
+		}
+
+	}
+}
 </style>

pages/comm/base/CommCdMngPage.vue

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

pages/comm/base/NoticeMngPage.vue

@@ -1,26 +1,24 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
-			<v-card class="" >
+			<v-card class="">
 				<div class="pa-5">
-					<v-row align="center" no-gutters >
+					<v-row align="center" no-gutters>
 						<v-col :cols="12" class="d-flex align-center justify-space-between">
 							<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
 							<div class="d-flex align-center">
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('view')" :ripple="false" class="mr-1">상세보기</v-btn> -->
-								<a-button type="primary" size="large" @click="listPageButtonGroupClickEvent('write')" :ripple="false"
+								<a-button type="primary" @click="listPageButtonGroupClickEvent('write')" :ripple="false"
 									icon="edit" class="mr-1">작성</a-button>
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('delete')" :ripple="false">삭제</v-btn> -->
 							</div>
 						</v-col>
 						<v-col :cols="12" ref="contents" class="mt-5" style="min-height: calc(100% - 76px);">
-							<div ref="gridParent" class="h100 px-50">
+							<div ref="gridParent" class="px-50" style="min-height: 70vh;">
-								<!-- <component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
+								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
-									 @getRowsData="getRowData" /> -->
+									:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
-								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-                  @getRowsData="getRowData" :selectedRowDataWatchFlag="true" />
 							</div>
 						</v-col>
 					</v-row>
@@ -29,43 +27,45 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'" class="h1001">
+		<div v-if="pageActionFlag == 'view'">
 			<v-card>
 				<v-row class="pa-5">
 					<v-col :cols="12" class="d-flex align-center justify-space-between ">
-						<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
+						<v-card-title class="pa-0 custom-title-4">공지사항 보기</v-card-title>
 						<div class="d-flex align-center">
-							<a-button @click="viewPageButtonGroupClickEvent('list')" type="primary" :ripple="false" class="mr-1"
+							<a-button @click="viewPageButtonGroupClickEvent('list')" type="primary" :ripple="false"
-								icon="unordered-list">목록</a-button>
+								class="mr-1" icon="unordered-list">목록</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false" class="mr-1"
+							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false"
-								icon="send-outlined">
+								class="mr-1" icon="send-outlined">
 								<v-icon small :class="['mr-2']">$icoSend</v-icon>
 								답글
 							</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false" class="mr-1"
+							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false"
-								icon="edit">수정</a-button>
+								class="mr-1" icon="edit">수정</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
+							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost
+								icon="delete">삭제</a-button>
 						</div>
 					</v-col>
-					<v-col :cols="12">
+					<v-col :cols="12" class="mt-5 pb-4">
-						<p class="custom-title-3 mb-2"> 제목 </p>
+						<v-card-title class="custom-title-6 pa-0">{{ viewActionData.title }}</v-card-title>
-						<v-text-field v-model="viewActionData.title" class="v-input__custom" hide-details :readonly="true">
-						</v-text-field>
 					</v-col>
-					<v-col :cols="12" style="min-height:calc(90vh - 218px);" class="pa-5">
+					<v-col :cols="12" style="min-height: 50vh;" class="pa-0 custom-view">
-						<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
+						<v-card class="pa-3" style="overflow-y:auto;">
-							:initialValue="viewActionData.content" theme="white"
+							<viewer v-if="viewActionData.viewerFlag" ref="tuiViewer" height="inherit"
-							:class="isDarkMode ? 'theme--white' : 'theme--black'" />
+								:initialValue="viewActionData.content" theme="white"
+								:class="[isDarkMode ? 'theme--white' : 'theme--black']" />
+						</v-card>
 					</v-col>
-					<v-col :cols="6">
+					<v-col :cols="6" class="mt-5">
-						<p class="custom-title-3 mb-2">파일목록</p>
+						<v-card-title class="custom-title-7 pa-0">
-						<div v-for="fileData in viewActionData.fileData" 
+							파일목록
-							:key="fileData.apndFileId" 
+						</v-card-title>
-							class="file-item">
+						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item" style="background-color: unset;">
 							<a @click.prevent="downloadFile(fileData)">
-								<div class="d-flex justify-space-between search-box-label">
+								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
+									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' +
+										fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@@ -75,56 +75,47 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'" class="h1001">
+		<div v-if="pageActionFlag == 'write'">
 			<v-card>
 				<div class="pa-5">
 					<v-row class="pa-50">
 						<v-col :cols="12" class="">
-							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
+							<v-card-title class="custom-title-4 pa-0">공지사항 작성</v-card-title>
 						</v-col>
-						<v-col :cols="12" class="custom-title-4-new mt-4">
+						<v-col :cols="12" class="mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
 							<v-text-field v-model="writeActionData.title" class="v-input__custom" hide-details outlined>
 							</v-text-field>
 						</v-col>
-						<v-col :cols="12" style="min-height: calc(90vh - 270px);">
+						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
-							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
+							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg"
+							:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 						</v-col>
-	
+
-						<v-col :cols="12" class="mt-2">
+						<v-col :cols="6" class="mt-5">
-							<p class="custom-title-3 mb-2">
+							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
-								파일첨부
-							</p>
-						</v-col>
-						<v-col :cols="6">
 							<div class="" v-if="writeActionData.fileData">
-								<div 
+								<div v-for="(fileData, index) in writeActionData.fileData" :key="fileData.apndFileId"
-									v-for="(fileData, index) in writeActionData.fileData" 
-									:key="fileData.apndFileId" 
 									class="file-item d-flex justify-space-between">
 									<div class="file-item-detail">
 										<v-icon>mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
 									</div>
-									<a-icon type="delete" class="v-icon pointer" @click="writeActionData.fileData.splice(index, 1)" />
+									<a-icon type="delete" class="v-icon pointer"
+										@click="writeActionData.업로드fileData.splice(index, 1)" />
 								</div>
 							</div>
-							<a-button class="mt-2" icon="upload" @click="$refs.writeInputFile.$refs.input.click()" >
+							<a-button class="mt-2" icon="upload" @click="$refs.writeInputFile.$refs.input.click()">
 								업로드
 							</a-button>
-							<v-file-input 
+							<v-file-input ref="writeInputFile" v-model="writeActionData.fileData" multiple outlined
-								ref="writeInputFile" 
+								hide-input class="d-none" prepend-icon="mdi-tray-arrow-up"></v-file-input>
-								v-model="writeActionData.fileData" 
-								multiple
-								outlined 
-								hide-input
-								class="d-none"
-								prepend-icon="mdi-tray-arrow-up"
-							></v-file-input>
 						</v-col>
 						<v-col :cols="12" class="text-right">
-							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false" class="mr-2">취소</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false"
-							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false" type="primary">등록</a-button>
+								class="mr-2">취소</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false"
+								type="primary">등록</a-button>
 						</v-col>
 					</v-row>
 				</div>
@@ -132,92 +123,105 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'" class="h1001">
+		<div v-if="pageActionFlag == 'reply'">
 			<v-card class="pa-5">
 				<v-row align="center" class="mt-0">
 					<v-col :cols="12" class="">
 						<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
 					</v-col>
-					<v-col :cols="12">
+					<v-col :cols="12" class="mt-4">
-						<p class="custom-title-3 mb-2">제목</p>
+						<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
-						<v-text-field v-model="replyActionData.title" class="v-input__custom" placeholder="제목" outlined
+						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined hide-details>
-							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-4">
+					<v-col :cols="6" class="mt-5">
-						<p class="custom-title-3 mb-2">
+						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
-							파일첨부
-						</p>
 						<div class="" v-if="replyActionData.fileData">
-							<div 
+							<div v-for="(fileData, index) in replyActionData.fileData" :key="fileData.apndFileId"
-								v-for="(fileData, index) in replyActionData.fileData" 
-								:key="fileData.apndFileId" 
 								class="file-item d-flex justify-space-between">
 								<div class="file-item-detail">
 									<v-icon>mdi-paperclip</v-icon>
 									<span href="#" class="file-item-name">{{ fileData.name }}</span>
 								</div>
-								<a-icon type="delete" class="v-icon pointer" @click="replyActionData.fileData.splice(index, 1)" />
+								<a-icon type="delete" class="v-icon pointer"
+									@click="replyActionData.fileData.splice(index, 1)" />
 							</div>
 						</div>
-						<a-button class="mt-3" icon="upload" @click="$refs.replyInputFile.$refs.input.click()" >
+						<a-button class="mt-3" icon="upload" @click="$refs.replyInputFile.$refs.input.click()">
 							업로드
 						</a-button>
-						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData" hide-details="true" class="d-none">
+						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData"
+							hide-details="true" class="d-none">
 						</v-file-input>
 					</v-col>
 					<v-col :cols="12" class="text-right">
 						<a-button @click="replyPageButtonGroupClickEvent('cancel')" :ripple="false">취소</a-button>
-						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false" type="primary">등록</a-button>
+						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false"
+							type="primary">등록</a-button>
 					</v-col>
 				</v-row>
 			</v-card>
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'" class="h1001">
+		<div v-if="pageActionFlag == 'update'">
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
 						<v-col :cols="12">
-							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
+							<v-card-title class="custom-title-4 pa-0">공지사항 수정</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
-							<p class="custom-title-3 mb-2">제목</p>
+							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
-							<v-text-field v-model="updateActionData.title" class="v-input__custom" placeholder="" hide-details outlined>
+							<v-text-field v-model="updateActionData.title" class="v-input__custom" hide-details
+								outlined>
 							</v-text-field>
 						</v-col>
-						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4" >
+						<v-col :cols="12" style="height: calc(90vh - 270px);" class="mt-4">
 							<editor ref="tuiUpdateEditor" height="100%" initialEditType="wysiwyg"
-								:initialValue="updateActionData.content" />
+								:initialValue="updateActionData.content"
+								:class="[isDarkMode ? 'toastui-editor-dark' : 'toastui-editor-light']"/>
 						</v-col>
-						<v-col :cols="6">
+						<v-col :cols="6" class="mt-5">
-								<p class="pa-0 mb-2 custom-title-4-new-1">파일첨부</p>
+							<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 
+								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
-										v-for="(fileData, index) in updateActionData.fileData"
+									class="file-item d-flex justify-space-between">
-										:key="fileData.apndFileId" 
+									<div class="file-item-detail">
-										class="file-item d-flex justify-space-between">
+										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
-										<div class="file-item-detail">
+										<span href="#" class="file-item-name">{{ fileData.name }}</span>
-											<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>
-								<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()" >
+							</div>
-									업로드
+							<div class="" v-if="updateActionData.currentFileList">
-								</a-button>
+								<div v-for="(fileData, index) in updateActionData.currentFileList"
-								<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
+									:key="fileData.apndFileId" class="file-item d-flex justify-space-between">
-									hide-details="true" class="d-none">
+									<div class="file-item-detail">
-								</v-file-input>
+										<v-icon style="font-size: 18px;">mdi-paperclip</v-icon>
+										<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>
@@ -303,8 +307,6 @@ export default {
 				postGrpOrd: null,
 				postOrgNo: null,
 			},
-			dataPathMock: {},
-
 		};
 	},
 	computed: {
@@ -349,7 +351,7 @@ export default {
 			chkOpenTabList: 'chkOpenTabList',
 			getDomain: 'modules/list/getDomain',
 		}),
-		onTest(){
+		onTest() {
 			console.log(this.writeActionData.fileData);
 		},
 		async init() {
@@ -406,10 +408,13 @@ export default {
 			this.getGridData();
 		},
 		gridInit() {
-			this.loadGrid = false;
 			const gridHeight = this.$refs.contents.offsetHeight - 76;
 
-			const myOptions = {};
+			const myOptions = {
+				header: {
+					height: 38,
+				},
+			};
 			this.setGridOption({
 				gridKey: this.gridName,
 				value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
@@ -430,7 +435,7 @@ export default {
 					align: 'center',
 					hidden: true,
 				},
-				{ header: '번호', name: 'postNo', width: 150, align: 'center' },
+				{ header: '번호', name: 'postNo', width: 150, align: 'right' },
 				{
 					header: '원글번호',
 					name: 'postOrgNo',
@@ -460,9 +465,9 @@ export default {
 					hidden: true,
 				},
 				{ header: '제목', name: 'title', align: 'left' },
-				{ header: '작성자', name: 'regUserNo', width: 250, align: 'center' },
+				{ header: '작성자', name: 'regUserNo', width: 250, align: 'right' },
 				{ header: '작성일', name: 'regDttm', width: 250, align: 'center' },
-				{ header: '조회수', name: 'viewCnt', width: 150, align: 'center' },
+				{ header: '조회수', name: 'viewCnt', width: 150, align: 'right' },
 				// {header: "파일아이디", name:"apndFileUuid", width:150, align:"center"}, // 수정필요
 			];
 
@@ -470,13 +475,6 @@ export default {
 				gridKey: this.gridName,
 				value: columnList,
 			});
-
-			// // -----------------------TEST------------------
-			// this.dataPathMock[this.gridName] = {
-			// 	column: columnList,
-			// 	data: dataPathDataExample,
-			// }
-			// // -----------------------END TEST--------------
 			this.getGridData();
 		},
 		async getGridData() {
@@ -492,25 +490,14 @@ export default {
 				sendParam: params,
 			});
 
-			// console.log('----------DEBUG--------res: ', res);
-			const newRes = res.map(item => {
-        const newObj = {
-          ...item,
-          rowStat: null,
-          dataSetId: item.dataSetId,
-          dataSetNm: item.dataSetNm,
-          useFg: item.useFg === '1' ? true : false, // 화면 개발 편의를 위해 boolean 타입으로 교체, 저장시 "1", "0" 으로 바꿔 보내야 함
-        };
-        return newObj;
-      });
-
 			this.setGridData({
 				gridKey: this.gridName,
-				value: newRes,
+				value: res,
+			});
+			this.$nextTick(() => {
+				this.loadGrid = true;
 			});
-
 			this.setPageData({ isFind: false });
-			this.loadGrid = true;
 		},
 		getRowData(data) {
 			this.selectedRowKey = data.rowKey;
@@ -1047,15 +1034,6 @@ const defaultData = {
 	},
 };
 
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	postNo: '18',
-	title: '오픈공지',
-	regUserNo: '1',
-	regDttm: '2023-01-09 09:39:41',
-	viewCnt: '1'
-}, 10);
-
 </script>
 
 <style lang="scss" scoped>
@@ -1069,8 +1047,46 @@ const dataPathDataExample = getPathDataExample({
 	margin: 2px 0;
 	padding: 4px;
 	background-color: #0000000A;
-	.file-item-name{
+
+	.file-item-name {
 		color: #1677FF;
 	}
 }
+
+::v-deep {
+	.v-input__slot {
+		padding-left: 8px;
+		padding-right: 8px;
+	}
+
+	.custom-view {
+		border: 1px solid;
+		border-radius: 6px;
+		height: 0;
+
+		@each $theme in dark, light {
+			@include theme($theme);
+			border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");
+			;
+		}
+	}
+
+	.toastui-editor-mode-switch {
+		font-family: Inter !important;
+		font-size: 1.0rem !important;
+	}
+
+	.toastui-editor-mode-switch .tab-item.active {
+		color: #1677FF
+	}
+
+	.toastui-editor-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,33 +1,21 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle />
 		<!-- 조회조견 -->
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
 						<v-col :cols="3">
-							<component
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
-								:is="'selectCodeList'"
+								:dataKey="'selectUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:parentPrgmId="myPrgmId"
+								:addAll="true" customClass="select-large" />
-								:label="'사용여부'"
-								:dataKey="'selectUseFg'"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:addAll="true"
-								customClass="select-large"
-							/>
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
-							<InputText
+							<InputText :parentPrgmId="myPrgmId" label="프로그램명" valueNm="prgmNm" :searchOption="true"
-								:parentPrgmId="myPrgmId"
+								:labelCols="12" :textCols="12" customClass="input-large" />
-								label="프로그램명"
-								valueNm="prgmNm"
-								:searchOption="true"
-								:labelCols="12"
-								:textCols="12"
-								customClass="input-large"
-							/>
 						</v-col>
-						<v-col :cols="5" class="text-right">
+						<v-col :cols="6" class="text-right">
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@@ -37,47 +25,32 @@
 
 		<v-row ref="contents">
 			<!-- 프로그램 리스트 -->
-			<v-col :cols="5" >
+			<v-col :cols="5">
-				<v-card class="pb-5">
+				<v-card class="pa-5">
-					<div class="d-flex align-center justify-space-between pa-5">
+					<div class="d-flex align-center justify-space-between">
 						<v-card-title class="pa-0">프로그램 리스트</v-card-title>
 						<div>
-							<Buttons
+							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
-								:parentPrgmId="myPrgmId"
+								:btnActionsFnc="btnActions" />
-								:bindingData="gridName"
-								:detailList="detailList"
-								:btnActionsFnc="btnActions"
-							/>
 						</div>
 					</div>
-					<div style="min-height: 60vh">
+					<div ref="gridParent" class="pt-5" style="height: 60vh">
-						<div ref="gridParent" class="px-5 h100">
+						<!-- <div ref="gridParent" class="px-5 h100">
-							<component
+						</div> -->
-								:ref="gridName"
+						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
-								:is="loadGrid ? 'Grid' : null"
+							:gridName="gridName" @getRowsData="getRowData" />
-								: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
+						<component :is="'Form'" :parentPrgmId="myPrgmId" :bindingData="gridName"
-							:is="'Form'"
+							:detailList="detailList" @gridEditingFinish="gridEditingFinish" />
-							:parentPrgmId="myPrgmId"
-							:bindingData="gridName"
-							:detailList="detailList"
-							@gridEditingFinish="gridEditingFinish"
-						/>
 						<!-- <div class="w100">
 						</div> -->
 					</div>
@@ -130,23 +103,6 @@ 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: {
@@ -218,17 +174,17 @@ export default {
 			const gridHeight = this.$refs.gridParent.offsetHeight - 36;
 
 			const myOptions = {
-				scrollX: false,
+				scrollY: true,
 			};
 			// console.log("this.pageData", this.pageData)
 			const _this = this;
 			const myColumns = [
-				{ header: '프로그램ID', name: 'prgmId', align: 'center' },
+				{ header: '프로그램ID', name: 'prgmId', align: 'left' },
-				{ header: '프로그램명', name: 'prgmNm' },
+				{ header: '프로그램명', name: 'prgmNm', align: 'left' },
 				{
 					header: '타입',
 					name: 'prgmTpCd',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						return value ? (value === '1' ? '프로그램' : '팝업') : null;
 					},
@@ -236,7 +192,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.selectUseFgList.filter(
@@ -262,8 +218,6 @@ export default {
 			});
 
 			// this.getRowGridData();
-
-			this.loadGrid = true;
 		},
 		async search() {
 			await this.getRowGridData();
@@ -296,6 +250,7 @@ export default {
 				gridKey: this.gridName,
 				value: newRes,
 			});
+			this.loadGrid = true;
 
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
@@ -304,18 +259,23 @@ export default {
 						//rowKey: this.chkRowGridSelectKey || 0,
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName].getData().length - 1
+									this.$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,
@@ -327,6 +287,7 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
+
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {
@@ -482,7 +443,7 @@ const myDetail = [
 		valueNm: 'prgmTpCd',
 		essential: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		list: [
 			{ text: '프로그램', value: '1' },
 			{ text: '팝업', value: '2' },
@@ -497,10 +458,11 @@ const myDetail = [
 		essential: true,
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-13',
 		value: { '1': true, '0': false },
 		required: true,
 		textCols: 12,
+		labelCols:12,
 		iconShow: true
 	},
 	{
@@ -509,7 +471,7 @@ const myDetail = [
 		valueNm: 'url',
 		disabled: false,
 		cols: 12,
-		class: 'py-2',
+		class: 'py-2 pt-4',
 		required: true,
 		textCols: 12,
 		iconShow: true
@@ -520,7 +482,7 @@ const myDetail = [
 		valueNm: 'regUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -531,7 +493,7 @@ const myDetail = [
 		valueNm: 'regDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -542,7 +504,7 @@ const myDetail = [
 		valueNm: 'procUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@@ -553,19 +515,10 @@ const myDetail = [
 		valueNm: 'procDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
 	},
 ];
-
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-  field1: 'PRG0001',
-  field2: '대시보드',
-  field3: '프로그램', 
-	field4: '사용'
-});
 </script>

pages/comm/base/ReadObjectMngPage.vue

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

pages/ems/base/AddInfoMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -12,7 +13,6 @@
 								dataKey="searchAddGrp"
 								:sendParam="{ useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -22,7 +22,6 @@
 								label="추가 정보명"
 								valueNm="addInfoNm"
 								:searchOption="true"
-								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
@@ -64,7 +63,6 @@
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
@@ -137,24 +135,10 @@ export default {
 		return {
 			myPrgmId: myPrgmId,
 			gridName: 'rowGrid',
-			loadGrid: true,
+			loadGrid: false,
 			tab: null,
 			detailList: myDetail,
 			initedFlag: false,
-			dataPathMock : {
-				'rowGrid': {
-					column: [
-						{ header: '추가 정보 그룹', name: 'addGrpId', align: 'left' },
-						{ header: '추가 정보 ID', name: 'addInfoId', align: 'left' },
-						{ header: '추가 정보 명', name: 'addInfoNm', align: 'left' },
-						{ header: 'Data 형식', name: 'addInfoDataKind', align: 'center' },
-						{ header: '사용여부', name: 'useFg', align: 'center' },
-					],
-					data: dataMockExample,
-					defaultRow: dataMockExample,
-					option: {},
-				},
-			},
 		};
 	},
 	computed: {
@@ -304,7 +288,7 @@ export default {
 					header: 'Data 형식',
 					name: 'addInfoDataKind',
 					minWidth: 85,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.addInfoDataKindList.filter(
@@ -321,7 +305,7 @@ export default {
 					header: '사용여부',
 					name: 'useFg',
 					minWidth: 85,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						let retVal = '';
 						value = value === true ? '1' : '0';
@@ -351,8 +335,7 @@ export default {
 			this.search();
 		},
 		async search() {
-			//process
+			this.loadGrid = false;
-			this.loadGrid = true;
 			await this.getRowGridData();
 			await this.setPageData({
 				isFind: false,
@@ -562,7 +545,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		required: true,
 	},
 	{
@@ -574,7 +557,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		list: 'addInfoDataKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -589,7 +572,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2 d-flex align-items-center',
 		value: { '1': true, '0': false },
 		required: true,
 	},
@@ -602,7 +585,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -614,7 +597,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -626,7 +609,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 	{
@@ -638,47 +621,11 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		placeholder: '시스템 자동입력',
 	},
 ];
-
-const dataMockExample = [
-  {
-    addGrpId: 'GRP001',
-    addInfoId: 'INFO001',
-    addInfoNm: '온도 센서',
-    addInfoDataKind: 'DATA01',
-    useFg: true,
-  },
-  {
-    addGrpId: 'GRP002',
-    addInfoId: 'INFO002',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA02',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP003',
-    addInfoId: 'INFO003',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA03',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP004',
-    addInfoId: 'INFO004',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA04',
-    useFg: false,
-  },
-  {
-    addGrpId: 'GRP005',
-    addInfoId: 'INFO005',
-    addInfoNm: '압력 센서',
-    addInfoDataKind: 'DATA05',
-    useFg: false,
-  },
-];
-
 </script>
+<style lang="scss">
+@import '@/assets/scss/common.scss';
+</style>

pages/ems/base/DashboardPage.vue

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

pages/ems/base/EffcIdxMngPage.vue

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

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -12,7 +13,6 @@
 								dataKey="searchLocKind"
 								:sendParam="{ commGrpCd: 'EM_LOC_KIND', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -24,12 +24,11 @@
 								dataKey="searchEccKind"
 								:sendParam="{ commGrpCd: 'EM_ECC_KIND', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
+						<!-- 사업장 -->
 						<!-- <v-col :cols="3">
-							사업장
 							<div style="visibility:hidden">
 								<component
 									:is="'SelectBlocMstr'"
@@ -46,7 +45,6 @@
 								dataKey="useFg"
 								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
 								:addAll="true"
-								:iconShow="true"
 								customClass="select-large"
 							/>
 						</v-col>
@@ -58,11 +56,22 @@
 								:labelCols="12"
 								:textCols="12"
 								:searchOption="true"
-								:iconShow="true"
 								customClass="input-large"
 							/>
 						</v-col>
-						<BtnSearch @click="search" size="large" />
+						<v-col class="text-right">
+							<BtnSearch @click="search" />
+						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
+						<div style="display: none">
+								<component
+									:is="'SelectBlocMstr'"
+									ref="SelectBlocMstr"
+									:parentPrgmId="myPrgmId"
+									customClass="select-large"
+								/>
+							</div>
 					</v-row>
 				</v-card>
 			</v-col>
@@ -79,25 +88,24 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div class="px-5" style="min-height:calc(100% - 76px)">
+					<div class="px-5" style="height:calc(100% - 76px)">
-						<div ref="gridParent" class="w100 h100 pb-2">
+						<div ref="gridParent" class="w100 h100">
 							<component
 								:ref="gridName"
-								:is="loadGrid ? 'Grid' : null" 
+								:is="loadGrid ? 'Grid' : null"
 								:gridName="gridName"
 								:parentPrgmId="myPrgmId"
 								@getRowsData="getRowData"
 								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
 								:selectedRowDataWatchFlag="true"
-								:dataPath="dataPathMock"
 							/>
 						</div>
 					</div>
 				</v-card>
 			</v-col>
-			<v-col :cols="7" class="h100">
+			<v-col :cols="7" style="min-height:75vh;">
 				<v-card class="pb-5">
-					<v-card-title class="custom-title-4" style="min-height:76px;"
+					<v-card-title class="custom-title-4 pb-0" style="min-height:65px;"
 						>공정 상세
 					</v-card-title>
 					<div class="px-5" style="height:calc(100% - 76px)">
@@ -196,15 +204,13 @@ export default {
 			gridName: 'rowGrid',
 			loadGrid: false,
 			tab: null,
-			selectedRowKey: null,
-			// rowSelectionStatus: {},
-			dataPathMock : { },
 			items: [
 				{ name: '공정 정보', id: 'eccBaseInfoTab', disabledFlag: false },
 				{ name: '공정 추가 정보', id: 'eccAddInfoTab', disabledFlag: false },
 				{ name: '공정 연결 정보', id: 'eccIaoTab', disabledFlag: false },
 			],
 			detailList: myDetail,
+			loadGrid: false,
 		};
 	},
 	computed: {
@@ -320,23 +326,11 @@ export default {
 	},
 	mounted() {
 		this.init();
-		this.$nextTick(() => {
-		// const checkbox = document.getElementById('headerCheckbox');
-		// if (checkbox) {
-		// 	checkbox.addEventListener('change', this.handleHeaderCheckboxChange);
-		// }
-		});
 	},
 	beforeDestroy() {
 		this.chkOpenTabList({ key: 'destroy', prgmId: myPrgmId });
 	},
 	methods: {
-		handleHeaderCheckboxChange(event) {
-			const checked = event.target.checked;
-			this.dataPathMock.rowGrid.data.forEach(row => {
-			row.selected = checked;
-		});},
-
 		...mapMutations({
 			setPageData: 'setPageData',
 		}),
@@ -351,41 +345,7 @@ export default {
 				blocId: this.userInfo.blocId,
 			});
 		},
-		gridInitTest() {
-			const rowGrid = {
-				column: [
-					{
-						header: '',
-						name: '',
-						align: 'center',
-						width: 50,
-						formatter: (props) => {
-							return `<label class="custom-radio">
-										<span class="radio-mark"></span>
-									</label>`;
-						}
-					},
-					{ header: '공정 정보', name: 'eccNm', align: 'left' },
-					{ header: '현재 상태', name: 'status', align: 'center' },
-					{ header: '공정 유형', name: 'eccKind', align: 'left' },
-					{ header: '사용 여부', name: 'useFg', align: 'center' },
-				],
-				data: dataMockExample,
-				defaultRow: dataMockExample,
-				option: {
-					...gridOptions,
-				},
-			}
-			this.dataPathMock = {rowGrid};
-			this.$nextTick(() => {
-				this.loadGrid = true;
-			});
-		},
 		gridInit() {
-			//  Test
-			this.gridInitTest(); return;
-			// End test
-
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
 			const gridWidth = this.$refs.gridParent.offsetWidth;
 
@@ -404,6 +364,17 @@ export default {
 
 			const _this = this;
 			const myColumns = [
+				{
+					header: '',
+					name: '',
+					align: 'center',
+					width: 50,
+					formatter: (props) => {
+						return `<label class="custom-radio">
+									<span class="radio-mark"></span>
+								</label>`;
+					}
+				},
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{
 					header: '공정 명',
@@ -506,7 +477,7 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					width: gridWidth * 0.18,
-					align: 'center',
+					align: 'left',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -598,16 +569,6 @@ export default {
 			});
 		},
 		async getRowData(data) {
-			
-			//Progess and fake radio 
-			// const rowKey = data.rowKey;
-			// this.selectedRowKey = rowKey;
-			// Object.keys(this.rowSelectionStatus).forEach(key => {
-			// this.$set(this.rowSelectionStatus, key, false);
-			// });
-			// this.$set(this.rowSelectionStatus, rowKey, true);
-
-
 			this.setEccAddInfo(data);
 			this.setEccIao(data);
 			this.setGridSelectData({
@@ -623,9 +584,6 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: Object.assign({}, data),
 			});
-			//fake radio need recheck  
-			// this.$refs[this.gridName]?.repaint?.();
-
 		},
 		async setEccAddInfo(data) {
 			this.setPageData({
@@ -943,7 +901,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pl-4',
+		class: 'py-2 px-4',
 		required: true,
 		iconShow: true
 	},
@@ -969,7 +927,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'pb-0 mb-0 pr-4',
+		class: 'pb-0 mb-0 pr-4 mt-2',
 		disableContent: true,
 	},
 	{
@@ -980,7 +938,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 mb-0 pb-0 pl-4',
+		class: 'py-2 mb-0 pb-0 px-4 mt-2',
 		list: 'locKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -992,13 +950,13 @@ const myDetail = [
 		valueNm: 'upEccNm',
 		readonly: true,
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 	},
 	{
 		// 공백 처리
 		type: 'Label',
 		cols: 6,
-		class: 'py-2 pl-4',
+		class: 'py-2 px-4 mt-2',
 		disabled: false,
 		labelCols: 12,
 		textCols: 12,
@@ -1012,7 +970,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		list: 'eccKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -1027,7 +985,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pl-4',
+		class: 'py-2 px-4 mt-2',
 		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;"
@@ -1040,7 +998,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		list: 'blocIdList',
 		itemText: 'blocNm',
 		itemValue: 'blocId',
@@ -1054,7 +1012,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pl-4',
+		class: 'py-2 px-4 mt-2',
 		value: { '1': true, '0': false },
 		iconShow: true,
 		required: true,
@@ -1065,147 +1023,9 @@ const myDetail = [
 		valueNm: 'eccFg',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 mt-2',
 		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

@@ -1,6 +1,6 @@
 <template>
 	<div class="l-layout">
-		<common-page-title />
+		<CommonPageTitle />
 		<v-row ref="searchFilter" class="mt-2">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -25,7 +25,7 @@
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
 
-						<BtnSearch @click="search" size="large" />
+						<BtnSearch @click="search" size="large" class="mr-2" />
 
 					</v-row>
 				</v-card>
@@ -43,8 +43,7 @@
 						<div ref="gridParent" class="w100 h100">
 							<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 								:parentPrgmId="myPrgmId" @getRowsData="getRowData"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true"
+								@sendSelectedRowStatInfo="getSelectedRowStatInfo" :selectedRowDataWatchFlag="true" />
-								 />
 						</div>
 					</div>
 				</v-card>
@@ -64,7 +63,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="detailList" :bindingData="gridName"
+									:detailList="f" :bindingData="gridName"
 									@gridEditingFinish="gridEditingFinish" />
 								<ReadPlcAddInfoTab v-if="item.id == 'readPlcAddInfoTab'" :parentPrgmId="myPrgmId"
 									:innerTabGridInfo="{ tab, idx }" />
@@ -308,12 +307,22 @@ export default {
 
 			const _this = this;
 			const myColumns = [
+				{
+					header: '',
+					name: '',
+					align: 'center',
+					formatter: (props) => {
+						return `<span class="custom-radio">
+									<span class="radio-mark"></span>
+								</span>`;
+					}
+				},
 				{ header: '회사 ID', name: 'comId', hidden: true },
 				{
 					header: '검침개소명',
 					name: 'readPlcNm',
 					align: 'left',
-					minWidth: 400,
+					minWidth: 350,
 				},
 				{
 					header: '검침개소 ID',
@@ -333,7 +342,6 @@ export default {
 					header: '개소 종류',
 					name: 'plcKind',
 					minWidth: 100,
-					align: 'center',
 					formatter({ value }) {
 						let retVal = '';
 						const newValue = _this.pageData.plcKindList.filter(
@@ -383,7 +391,6 @@ export default {
 					header: '사용 여부',
 					name: 'useFg',
 					minWidth: 100,
-					align: 'center',
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
 						const newValue = _this.pageData.useFgList.filter(
@@ -470,12 +477,12 @@ export default {
 					this.$refs[this.gridName].focus({
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName].getData().length - 1
+									this.$refs[this.gridName].getData().length - 1
-								? this.pageData.rowGridSelectKey
+									? this.pageData.rowGridSelectKey
-								: 0,
+									: 0,
 						columnName: 'readPlcNm',
 						setScroll: true,
 					});
@@ -493,7 +500,7 @@ export default {
 				if (this.tab == 2) {
 					this.tab = 0;
 				}
-				this.isImgTabDisabled = false;
+				this.isImgTabDisabled = true;
 			} else {
 				this.isImgTabDisabled = false;
 			}
@@ -917,47 +924,47 @@ const defaultData = {
 };
 
 const sampleData = [
-  {
+	{
-    readPlcNm: '서울 본사',
+		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,5 +1,6 @@
 <template>
 	<div class="l-layout">
+		<CommonPageTitle/>
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -83,7 +84,7 @@
 				</v-card>
 			</v-col>
 		</v-row>
-		<v-row ref="contents" style="height: calc(100vh - 400px)">
+		<v-row >
 			<v-col :cols="5" class="h100">
 				<v-card class="pb-5">
 					<v-card-title class="d-flex justify-space-between align-end">
@@ -113,7 +114,7 @@
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
 					<v-card-title>에너지원 상세</v-card-title>
-					<div class="px-5" style="height:calc(100% - 70px)">
+					<div class="px-5" style="min-height: auto;">
 						<v-tabs v-model="tab">
 							<v-tab
 								v-for="item in items"
@@ -125,21 +126,21 @@
 						</v-tabs>
 						<v-tabs-items
 							v-model="tab"
-							style="height: calc(100% - 65px);"
 							class="py-6"
+							style="min-height: auto;"
 						>
-							<v-tab-item v-for="(item, idx) in items" :key="item.id">
+							<v-tab-item v-for="(item, idx) in items" :key="item.id">				
 								<component
-									v-if="item.id == 'ercInfoTab'"
+										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>
@@ -834,7 +835,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-3 pr-4',
 		required: false,
 		placeholder: '시스템 자동입력',
 	},
@@ -847,7 +848,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-3 pl-4',
 		required: true,
 	},
 	{
@@ -859,7 +860,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-3 pr-4 mt-2',
 		list: 'ercKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -874,7 +875,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-3 pl-4 mt-2',
 		list: 'readObjList',
 		itemText: 'readObjNm',
 		itemValue: 'readObjId',
@@ -889,7 +890,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-3 pr-4 mt-2',
 		list: 'chrgKindList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -904,7 +905,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-3 pl-4 mt-2',
 	},
 	{
 		type: 'InputText',
@@ -915,7 +916,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-3 pr-4 mt-2',
 
 	},
 	{
@@ -927,7 +928,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-3 pl-4 mt-2',
 		list: 'blocMstrList',
 		itemText: 'blocNm',
 		itemValue: 'blocId',
@@ -943,7 +944,7 @@ const myDetail = [
 		textCols: 12,
 		iconShow: true,
 		// class: 'py-2',
-		class: 'pb-0 mb-0 pr-4',
+		class: 'pb-0 mb-0 pr-4 mt-2',
 		disableContent: true,
 	},
 	{
@@ -955,7 +956,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'pb-0 mb-0 pl-4 mt-2',
 	},
 	{
 		type: 'InputText',
@@ -980,7 +981,7 @@ const myDetail = [
 		disabled: false,
 		cols: 6,
 		iconShow: true,
-		class: 'py-2 pr-4',
+		class: 'py-3 pr-4 mt-2',
 		value: { '1': true, '0': false },
 	},
 	{
@@ -990,7 +991,7 @@ const myDetail = [
 		disabled: false,
 		cols: 6,
 		iconShow: true,
-		class: 'py-2 pl-4',
+		class: 'py-3 pl-4 mt-2',
 		value: { '1': true, '0': false },
 		required: true,
 	},

pages/ems/base/EqpmGrpPysclQtyMngPage.vue

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

pages/ems/base/EqpmKindPage.vue

@@ -167,7 +167,7 @@ export default {
 					header: '설비종류ID',
 					name: 'eqpmKindId',
 					width: gridWidth * 0.5,
-					align: 'center',
+					align: 'left',
 				},
 				{
 					header: '설비종류명',
@@ -359,7 +359,7 @@ const myDetail = [
 		label: '설비종류 ID',
 		valueNm: 'eqpmKindId',
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 pt-1',
 		iconShow: true,
 		required: false,
 		readonly: true,
@@ -373,7 +373,7 @@ const myDetail = [
 		valueNm: 'eqpmKindNm',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 pt-1',
 		iconShow: true,
 		required: true,
 		labelCols: 12,

pages/ems/base/EquipmentGroupMngPage.vue

@@ -461,7 +461,7 @@ const myDetail = [
 		valueNm: 'eqpmGrpId',
 		disabled: true,
 		cols: 6,
-		class: 'py-2 pr-4',
+		class: 'py-2 pr-4 pt-1',
 		required: false,
 		iconShow: true,
 		labelCols: 12,
@@ -474,7 +474,7 @@ const myDetail = [
 		valueNm: 'eqpmGrpNm',
 		disabled: false,
 		cols: 6,
-		class: 'py-2 pl-4',
+		class: 'py-2 pl-4 pt-1',
 		required: true,
 		iconShow: true,
 		labelCols: 12,

pages/ems/base/EquipmentMasterMngPage.vue

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

pages/ems/base/GdIdxMngPage.vue

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

pages/ems/base/GdStndMngPage.vue

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

pages/ems/base/PastRsltDataReadPage.vue

@@ -12,11 +12,12 @@
 						</v-col>
 						<v-col :cols="3">
 							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								customClass="select-large" />
+								class="no-gutters" customClass="select-large" />
 						</v-col>
 						<v-col :cols="3">
 							<!-- 대상일 -->
-							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12" />
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'조회기간'" :textCols="12"
+								customClass="datepicker-large" />
 						</v-col>
 						<v-col :cols="3" class="d-flex align-end justify-end text-right">
 							<BtnExcelDownload class="mr-1" :parentPrgmId="myPrgmId" :gridName="gridName" type="primary"
@@ -28,17 +29,17 @@
 			</v-col>
 		</v-row>
 		<v-row ref="contents">
-			<v-col :cols="12" style="height: 100%" class="h100">
+			<v-col :cols="12" class="h100">
 				<v-card class="px-5 py-5 h100">
-					<div ref="gridParent" class="h100 px-5" style="height: 100%">
+					<div ref="gridParent" class="h100 px-5">
 						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 							:parentPrgmId="myPrgmId" />
 					</div>
-					<div class="d-flex align-center justify-space-between">
+				</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-card>
 			</v-col>
 		</v-row>
 	</div>
@@ -60,7 +61,7 @@ import BtnExcelDownload from '~/components/common/button/BtnExcelDownload';
 import DateUtility from '~/plugins/dateUtility';
 // import Search from "~/components/common/search";
 import EvtObjPop from '~/components/common/modal/EvtObjPop';
-import pagination from '~/components/Pagination';
+import pagination from '~/components/common/Pagination';
 
 let myTitle;
 // const myPrgmId = "PRG0052";
@@ -211,7 +212,7 @@ export default {
 		},
 		layoutInit() {
 			const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
-			this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight}px)`;
+			this.$refs.contents.style.height = `calc(100% - 90px - ${searchFilterHeight}px) `;
 		},
 		async setFromDt() {
 			this.pageData.fromDt = Utility.setBeforetDate(
@@ -219,7 +220,6 @@ export default {
 				this.pageData.toDt,
 				'YYYYMMDD',
 			);
-			// this.pageData.toDt = Utility.setAftertDate(this.pageData, this.pageData.fromDt, "YYYYMMDD");
 		},
 		gridInit() {
 			this.loadGrid = false;
@@ -391,6 +391,7 @@ export default {
 					resKey: 'pastRslPageTotal',
 					sendParam: sendParams
 				});
+
 				this.totalCount = res2[0].totalcount;
 
 				this.setGridData({

pages/ems/base/ReadObjectMngPage.vue

@@ -1,5 +1,6 @@
 <template>
 	<div ref="mainDiv" class="l-layout">
+		<CommonPageTitle />
 		<v-row ref="searchFilter">
 			<v-col :cols="12">
 				<v-card class="searchFilter">
@@ -49,7 +50,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-new"
+						<v-card-title class="pa-0 custom-title-4"
 							>검침 대상 정보</v-card-title
 						>
 						<Buttons
@@ -59,24 +60,22 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div class="h100 px-5" style="height:calc(100% - 70px)">
+					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
-						<div ref="gridParent" class="w100 h100">
+						<component
-							<component
+							:ref="gridName"
-								:ref="gridName"
+							:is="loadGrid ? 'Grid' : null"
-								:is="loadGrid ? 'Grid' : null"
+							:gridName="gridName"
-								:gridName="gridName"
+							:parentPrgmId="myPrgmId"
-								:parentPrgmId="myPrgmId"
+							@getRowsData="getRowData"
-								@getRowsData="getRowData"
+							@sendSelectedRowStatInfo="getSelectedRowStatInfo"
-								@sendSelectedRowStatInfo="getSelectedRowStatInfo"
+							:selectedRowDataWatchFlag="true"
-								:selectedRowDataWatchFlag="true"
+						/>
-							/>
-						</div>
 					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">
 				<v-card class="pb-5">
-					<v-card-title class="custom-title-4-new" style="min-height:76px;"
+					<v-card-title class="custom-title-4-new pb-0" style="min-height:65px;"
 						>검침대상 상세
 					</v-card-title>
 					<div class="px-5" style="height:calc(100% - 76px)">
@@ -316,7 +315,7 @@ export default {
 					header: '검침 대상 ID',
 					name: 'readObjId',
 					width: 130,
-					align: 'center',
+					align: 'left',
 				},
 				{
 					header: '검침 대상 명',
@@ -386,7 +385,7 @@ export default {
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					width: 100,
 					formatter({ value }) {
 						value = value === true ? '1' : '0';
@@ -743,7 +742,7 @@ const myDetail = [
 		labelCols: 12,
 		textCols: 12,
 		iconShow: true,
-		class: 'py-2 pr-2',
+		class: 'py-2 pr-2 mt-2',
 		required: false,
 		placeholder: '시스템 자동입력',
 	},
@@ -755,7 +754,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2',
+		class: 'py-2 mt-2',
 		required: true,
 		iconShow: true,
 	},
@@ -767,7 +766,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2',
+		class: 'py-2 pr-2 mt-2',
 		list: 'readObjKindDetailList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -782,7 +781,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2',
+		class: 'py-2 mt-2',
 		list: 'readObjGrpList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -797,7 +796,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2',
+		class: 'py-2 pr-2 mt-2',
 		iconShow: true,
 		inputType: 'number',
 	},
@@ -809,7 +808,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2',
+		class: 'py-2 mt-2',
 		iconShow: true,
 		inputType: 'number',
 	},
@@ -821,7 +820,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2',
+		class: 'py-2 pr-2 mt-2',
 		iconShow: true,
 		inputType: 'number',
 	},
@@ -833,7 +832,7 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2',
+		class: 'py-2 mt-2',
 		list: 'unitCdList',
 		itemText: 'commCdNm',
 		itemValue: 'commCd',
@@ -848,13 +847,24 @@ const myDetail = [
 		cols: 6,
 		labelCols: 12,
 		textCols: 12,
-		class: 'py-2 pr-2',
+		class: 'py-2 pr-2 mt-2',
 		value: { '1': true, '0': false },
 		iconShow: true,
 		required: true,
 	},
 ];
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 @import '@/assets/scss/common.scss';
-</style>
+::v-deep {
+	.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

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