fix bug 18 33 34

conflic
fixbug-scrren-12
2025-08-05 15:00:22 +07:00 · 2025-08-04 16:41:29 +07:00 · 2025-08-04 16:37:00 +07:00 · 2025-08-04 16:35:12 +07:00 · 2025-08-04 18:06:52 +09:00 · 2025-08-04 15:03:03 +07:00
11 changed files with 520 additions and 572 deletions
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@ -266,7 +266,7 @@ a {
      }

      &>.v-treeview-node__root:hover:before {
-        opacity: 1 !important;
+        opacity: 0 !important;
      }

      .v-treeview-node__children {
@ -280,13 +280,17 @@ a {

    .v-treeview-node--click[aria-expanded="true"] {
      &>.v-treeview-node__root:before {
-        opacity: 1 !important;
+        opacity: 0 !important;
      }
    }

    .v-treeview-node[aria-expanded="true"] {
-      &>.v-treeview-node__root>.v-treeview-node__content>.v-treeview-node__label>button>.v-icon.mdi-chevron-down {
-        transform: rotate(-180deg);
+      &>.v-treeview-node__root>.v-treeview-node__content
+      >.v-treeview-node__label>button {
+        >.anticon,
+        >.v-icon.mdi-chevron-down {
+          transform: rotate(-180deg);
+        }
      }
    }

@ -298,15 +302,17 @@ a {
        // justify-content: center;
      }

+      & .anticon,
      & .v-icon.mdi-chevron-down {
        margin-left: auto;
+        animation-duration: 0.5s;
      }
    }
  }

  .v-treeview-node--active {
    &:before {
-      opacity: 1 !important;
+      opacity: 0 !important;
    }
  }

@ -322,7 +328,8 @@ a {
    .v-treeview-node__content span:not(.v-icon),
    .v-treeview-node__root>button,
    .v-treeview-node__level,
-    .v-treeview-node__content .v-icon.mdi-chevron-down {
+    .v-treeview-node__content .v-icon.mdi-chevron-down,
+    .v-treeview-node__content .anticon {
      display: none;
    }

@ -615,36 +622,36 @@ a {

    .v-navigation-drawer__append {
      >p {
-        @if $theme ==dark {
-          color: rgba(255, 255, 255, 0.6);
-        }
+        color: map-deep-get($config, #{$theme}, "v-banner-border-color" ) !important;
+        // @if $theme ==dark {
+        //   color: rgba(255, 255, 255, 0.6);
+        // }

-        @else {
-          color: #999;
-        }
+        // @else {
+        //   color: #999;
+        // }
      }
    }

-    .v-footer {
-      @if $theme ==light {
-        background-color: #dfdfe5;
-        color: #767d83;
-      }
-    }
+    // .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;
-        }
-      }
-    }
+    // .bd {
+    //   @if $theme ==dark {
+    //     &-r-1 {
+    //       border-right: 1px #373f45 solid;
+    //     }
+    //   }
+    //   @else {
+    //     &-r-1 {
+    //       border-right: 1px #efefef solid;
+    //     }
+    //   }
+    // }

    .border-bottom-1 {
      border-bottom: 1px solid map-deep-get($config, #{$theme}, "border-color");
@ -692,183 +699,224 @@ a {
      }

      &>.v-treeview-node {
-
-        .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"
-          );
+        .v-treeview-node__root {
          border-radius: 8px;
-
-          &: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__root {
-          &:before {
-            background-color: map-deep-get($config,
-              #{$theme},
-              "v-treeview-node-root-backgroundColor"
-            );
-          }
-
-          &>.v-treeview-node__content {
-            .v-treeview-node__label {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-label-color"
-              );
-            }
-
-            .v-icon {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-icon-color"
-              );
-            }
-          }
-
          &:hover {
-            &>.v-treeview-node__content {
-              .v-treeview-node__label {
-                color: map-deep-get($config,
-                  #{$theme},
-                  "v-treeview-node-root-label-active-color"
-                );
-              }
-
-              .v-icon {
-                color: map-deep-get($config,
-                  #{$theme},
-                  "v-treeview-node-root-icon-active-color"
-                );
-              }
-            }
+            background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" );
          }
-        }
-
-        &>.v-treeview-node__children {
-          &>.v-treeview-node {
-
-            &>.v-treeview-node__root {
-              &:before {
-                background-color: map-deep-get($config,
-                  #{$theme},
-                  "v-treeview-node-subroot-backgroundColor"
-                );
-              }
-
-              &>.v-treeview-node__content {
-                .v-treeview-node__label {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-node-label-color"
-                  );
-                }
-
-                .v-icon {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-icon-color"
-                  );
-                }
-              }
-
-              &:not(.v-treeview-node--active):hover {
-                &:before {
-                  background-color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-leaf-active-backgroundColor"
-                  );
-                }
-
-                &>.v-treeview-node__content {
-                  .v-treeview-node__label {
-                    color: map-deep-get($config,
-                      #{$theme},
-                      "v-treeview-leaf-active-color"
-                    );
-                  }
-
-                  .v-icon {
-                    color: map-deep-get($config,
-                      #{$theme},
-                      "v-treeview-leaf-active-color"
-                    );
-                  }
-                }
-              }
-            }
-
-            &>.v-treeview-node__children {
-              background-color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-leaf-subchildren-backgroundColor"
-              );
-            }
-
-            &[aria-expanded="true"] {
-              & .v-treeview-node__root>.v-treeview-node__content {
-                .v-treeview-node__label {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-node-label-children-color"
-                  );
-                }
-
-                .v-icon {
-                  color: map-deep-get($config,
-                    #{$theme},
-                    "v-treeview-icon-active-color"
-                  );
-                }
-              }
-            }
-          }
-        }
-
-        &[aria-expanded="true"] {
-          & .v-treeview-node__root>.v-treeview-node__content {
+          .v-treeview-node__content {
            .v-treeview-node__label {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-label-active-color"
-              );
-            }
-
-            .v-icon {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-icon-active-color"
-              );
+              color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
            }
          }
+
        }
+
+        &[aria-expanded="true"]{
+
+          // Level 1
+          &>.v-treeview-node__root {
+            background-color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-bg" );
+            border: 1px solid map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+            color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
+
+            &:before {
+              background-color: map-deep-get($config, #{$theme}, "v-treeview-node-subroot-backgroundColor");
+            }
+
+            .v-treeview-node__content {
+              .v-treeview-node__label {
+                color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
+              }
+
+              .v-icon:first-child,
+              .v-icon:first-child::before {
+                color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+              }
+            }
+          }
+
+          &>.v-treeview-node__children {
+            // Level 2
+            .v-treeview-node__root {
+              color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color");
+              &:hover {
+                background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-backgroundColor");
+              }
+            }
+            &>[aria-expanded="true"] >.v-treeview-node__root,
+            .v-treeview-node__root.v-treeview-node--active {
+              background-color: map-deep-get($config, #{$theme}, "v-calendar-day-in-not-month-color" );
+              .v-treeview-node__content {
+                .v-treeview-node__label {
+                  color: map-deep-get($config, #{$theme}, "card-title-color");
+                }
+
+                .v-icon,
+                .v-icon::before,
+                .anticon {
+                  color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+                }
+              }
+            }
+            
+            // Level 3
+            .v-treeview-node__children {
+              .v-treeview-node {
+                >.v-treeview-node__root {
+                  .v-treeview-node__content {
+                    .v-treeview-node__label {
+                      color: map-deep-get($config, #{$theme}, "card-default-color");
+                    }
+                  }
+
+                  *:hover,
+                  :hover {
+                    border-width: 0;
+                  }
+
+                  &:hover {
+                    border: 1px solid  map-deep-get($config, #{$theme}, "v-input-textarea-border");
+                    border-radius: 8px;
+                    background-color: rgba(0, 0, 0, 0);
+                    .v-treeview-node__content {
+                      .v-treeview-node__label {
+                        color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
+                      }
+                    }
+
+                  }
+
+                  &.v-treeview-node--active {
+                    // color: map-deep-get($config, #{$theme}, "card-title-color");
+                    background-color: rgba(0, 0, 0, 0);
+                    .v-treeview-node__content {
+                      .v-treeview-node__label {
+                        color: map-deep-get($config, #{$theme}, "tui-grid-title-color");
+                      }
+      
+                      .v-icon,
+                      .v-icon::before,
+                      .anticon {
+                        color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
+                      }
+                    }
+                  }
+
+                }
+              }
+
+            }
+
+          }
+
+
+        }
+
+        // &>.v-treeview-node__root {
+        //   &:before {
+        //     background-color: map-deep-get($config, #{$theme}, "v-treeview-node-root-backgroundColor" );
+        //   }
+
+        //   &>.v-treeview-node__content {
+        //     .v-treeview-node__label {
+        //       color: map-deep-get($config, #{$theme}, "v-treeview-node-root-label-color");
+        //     }
+        //   }
+
+        //   &:hover {
+        //     &>.v-treeview-node__content {
+        //       .v-treeview-node__label {
+        //         color: map-deep-get($config,
+        //           #{$theme},
+        //           "v-treeview-node-root-label-active-color"
+        //         );
+        //       }
+
+        //       .v-icon {
+        //         color: map-deep-get($config,
+        //           #{$theme},
+        //           "v-treeview-node-root-icon-active-color"
+        //         );
+        //       }
+        //     }
+        //   }
+        // }
+
+        // &>.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"
+        //       // );
+        //     }
+
+        //     // &[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"
+        //     //       );
+        //     //     }
+        //     //   }
+        //     // }
+        //   }
+        // }
+
      }
    }

--- a/components/common/button/ActionButtons.vue
+++ b/components/common/button/ActionButtons.vue
@ -1,9 +1,6 @@
 <template>
-	<div class="d-flex flex-row justify-center align-center" style="gap: 12px">
-		<!--<v-btn icon tile :ripple="false" @click="btnActionsFnc('addLeftToRight')">
-			<v-icon>mdi-chevron-right</v-icon>
-		</v-btn> -->
-		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost icon="up" >
+	<div class="d-flex flex-column justify-center align-center" style="gap: 12px">
+		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
 		</a-button>

 		<!--<v-btn
--- a/components/common/modal/EqpmSelectPop.vue
+++ b/components/common/modal/EqpmSelectPop.vue
@ -16,54 +16,52 @@

 				</template></v-text-field>
 		</v-col>
-		<v-dialog ref="popModal" v-model="dialog" width="800" overlay-color="#000" overlay-opacity="0.8" scrollable>
-			<v-card style="height: 100%">
+		<v-dialog ref="popModal" v-model="dialog" width="800" scrollable>
+			<v-card style="height: 90vh;">
 				<v-card-title class="px-5 py-4 d-flex align-center justify-space-between">
 					<span class="custom-title-4">설비 선택</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
 				<div class="pa-2 pt-0">
-					<v-card class="searchFilter">
-						<v-row align="end">
-							<v-col :cols="3.5">
-								<!-- 설비그룹 -->
-								<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
-									:label="'설비그룹'" :disabled="eqpmGrpDisabled"
-									@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
-									:iconShow="true" />
-							</v-col>
-							<v-col :cols="3.5">
-								<!-- FAB -->
-								<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
-									:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
-									:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
-									:iconShow="true" />
-							</v-col>
-							<v-col :cols="3.5">
-								<v-row>
-									<v-col :cols="12" class="py-0">
-										<label for="" class="search-box-label">
-											<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
-											설비명
-										</label>
-									</v-col>
-									<v-col :cols="12" class="pt-0">
-										<v-text-field append-icon="" class="v-input__custom" outlined
-											:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
-												v-slot:append>
-												<!-- Custom SVG icon -->
-												<v-icon>$icoSearch</v-icon>
+					<!-- <v-card class="searchFilter">
+					</v-card> -->
+					<v-row align="end" class="searchFilter">
+						<v-col :cols="3.5">
+							<!-- 설비그룹 -->
+							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
+								:label="'설비그룹'" :disabled="eqpmGrpDisabled"
+								@update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
+								:iconShow="true" />
+						</v-col>
+						<v-col :cols="3.5">
+							<!-- FAB -->
+							<component :is="'SelectBoxMulti'" :propsValue="selectValue02"
+								:itemList="selectValueList02" :label="'FAB'" :labelCols="12" :multiple="true"
+								:disabled="fabDisabled" @update:propsValue="selectValue02 = $event" :textCols="12"
+								:iconShow="true" />
+						</v-col>
+						<v-col :cols="3.5">
+							<v-row>
+								<v-col :cols="12" class="py-0">
+									<label for="" class="search-box-label">
+										<v-icon small :class="['mr-1', 'icon-blue']">$icoBulletPoint</v-icon>
+										설비명
+									</label>
+								</v-col>
+								<v-col :cols="12" class="pt-0">
+									<v-text-field append-icon="" class="v-input__custom" outlined
+										:hide-details="true" v-model="searchWord" @keyup.enter="search"><template
+											v-slot:append>
+											<!-- Custom SVG icon -->
+											<v-icon>$icoSearch</v-icon>

-											</template></v-text-field>
-									</v-col>
+										</template></v-text-field>
+								</v-col>

-								</v-row>
-							</v-col>
-							<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
-
-
-						</v-row>
-					</v-card>
+							</v-row>
+						</v-col>
+						<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
+					</v-row>

 					<!-- <v-row align="center" no-gutters style="margin-top: 14px;">
 						<v-col :cols="1">
@ -77,14 +75,20 @@
 								:hide-details="true" v-model="searchWord" @keyup.enter="search"></v-text-field>
 						</v-col>
 					</v-row> -->
+					<!-- <v-row>
+						<v-col :col="12">
+						</v-col>
+					</v-row> -->
 				</div>
-				<div class="px-5" style="height:429px;">
-					<div ref="modalGridParent" class="w100 h100">
+
+				<v-card-text class="px-2 w100">
+					<div ref="modalGridParent" style="height: 450px;" class="h100 w100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
 							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
 							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
 					</div>
-				</div>
+				</v-card-text>
+
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
 					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="mr-2">닫기</a-button>
 					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
--- a/layouts/default.vue
+++ b/layouts/default.vue
@ -9,7 +9,6 @@
              <div class="lnb-logo">
                <img v-if="isDarkMode" src="@/assets/images/logo_dm.png" />
                <img v-else src="@/assets/images/logo_lm.png" />
-                <!-- <img v-else src="@/assets/images/logo_lm.png" /> -->
              </div>
              <!--            <div class="lnb-logo">FEMS</div>-->
            </router-link>
@ -40,16 +39,16 @@
            <v-menu offset-y>
              <template v-slot:activator="{ on, attrs }">
                <a-button
-                    :ripple="false"
-                    tile
-                    class="btn-header"
-                    v-bind="attrs"
-                    v-on="on"
-                    style="width: 100px"
-                  >
-                    <span class="body-2">즐겨찾기</span>
-                    <v-icon size="20">mdi-chevron-down</v-icon>
-                  </a-button>
+                  :ripple="false"
+                  tile
+                  class="btn-header"
+                  v-bind="attrs"
+                  v-on="on"
+                  style="width: 100px"
+                >
+                  <span class="body-2">즐겨찾기</span>
+                  <v-icon size="20">mdi-chevron-down</v-icon>
+                </a-button>
                <!-- <a-button style="width: 100px; height: 36px" class="btn-header">
                  <span class="body-2">즐겨찾기</span>
                  <v-icon size="20">mdi-chevron-down</v-icon></a-button> -->
@ -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,
      });
--- a/pages/comm/auth/MenuRoleMngPage.vue
+++ b/pages/comm/auth/MenuRoleMngPage.vue
@ -5,22 +5,12 @@
 				<v-card class="searchFilter">
 					<v-row algin="end" no-gutters>
 						<v-col :cols="3">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="역할ID"
-								valueNm="roleId"
-								:searchOption="true"
-								customClass="input-large"
-							/>
+							<InputText :parentPrgmId="myPrgmId" label="역할ID" valueNm="roleId" :searchOption="true"
+								customClass="input-large" />
 						</v-col>
 						<v-col :cols="3">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="역할명"
-								valueNm="roleNm"
-								:searchOption="true"
-								customClass="input-large"
-							/>
+							<InputText :parentPrgmId="myPrgmId" label="역할명" valueNm="roleNm" :searchOption="true"
+								customClass="input-large" />
 						</v-col>
 						<v-col class="text-right d-flex justify-end align-end mr-3">
 							<BtnSearch size="large" />
@ -30,81 +20,55 @@
 			</v-col>
 		</v-row>

-		<v-row ref="contents" >
-			<v-col cols="12" lg="2" >
+		<v-row ref="contents">
+			<v-col cols="12" lg="3">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 리스트</span>
 					</v-card-title>
 					<div ref="gridParent" class="px-5" style="height: 60vh;">
-						<component
-							:is="loadGrid ? 'Grid' : null"
-							:ref="gridName + myPrgmId"
-							:gridName="gridName"
-							:parentPrgmId="myPrgmId"
-							@getRowsData="getRowData"
-						/>
+						<component :is="loadGrid ? 'Grid' : null" :ref="gridName + myPrgmId" :gridName="gridName"
+							:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
 					</div>
 				</v-card>
 			</v-col>
-			<v-col cols="12" lg="10" >
+			<v-col cols="12" lg="9">
 				<v-card>
 					<v-card-title>
 						<span class="custom-title-4">역할 메뉴별 권한</span>
 					</v-card-title>
-					<v-row
-						align="center"
-						no-gutters
-						:style="{ height: 'calc(100% - 62px)' }"
-						class="px-5"
-					>
-						<v-col :cols="4" class="h100">
-							<span
-								class="body-1 font-weight-bold d-flex align-center"
-								:style="{ minHeight: '36px' }"
-								>[미배정]메뉴리스트</span
-							>
+					<v-row align="center" no-gutters :style="{ height: 'calc(100% - 62px)' }" class="px-5">
+						<v-col class="h100" style="max-width: 400px;">
+							<span class="body-1 font-weight-bold d-flex align-center"
+								:style="{ minHeight: '36px' }">[미배정]메뉴리스트</span>
 							<div ref="treeGridParent" class="px-0 mt-2" style="height: 60vh;">
 								<!-- <div
 									ref="treeGridParent"
 									class="w100 h100"
 								>
 							</div> -->
-								<component
-									:is="loadTreeGrid ? 'Grid' : null"
-									:ref="gridName2 + myPrgmId"
-									:gridName="gridName2"
-									:parentPrgmId="myPrgmId"
-									@getRowsData="getUnAsgnRowData"
-								/>
+								<component :is="loadTreeGrid ? 'Grid' : null" :ref="gridName2 + myPrgmId"
+									:gridName="gridName2" :parentPrgmId="myPrgmId" @getRowsData="getUnAsgnRowData" />
 							</div>
 						</v-col>
-						<v-col :cols="1">
-							<ActionButtons
-								:parentPrgmId="myPrgmId"
-								:leftGridName="gridName2"
-								:rightGridName="gridName3"
-								:btnActionsFnc="dualGridBtnActions"
-							/>
-						</v-col>
+						<!-- <v-col :cols="1.5">
+							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
+								:btnActionsFnc="dualGridBtnActions" />
+						</v-col> -->
+						<div class="px-2">
+							<ActionButtons :parentPrgmId="myPrgmId" :leftGridName="gridName2" :rightGridName="gridName3"
+								:btnActionsFnc="dualGridBtnActions" />
+						</div>
 						<v-col :cols="7" class="h100">
-							<v-row
-								justify="space-between"
-								align="center"
-								no-gutters
-								class="px-5"
-							>
+							<v-row justify="space-between" align="center" no-gutters class="px-5">
 								<v-col :cols="11">
-									<span class="body-1 font-weight-bold"
-										>[배정]메뉴별권한 리스트</span
-									>
+									<span class="body-1 font-weight-bold d-flex align-center"
+										:style="{ minHeight: '36px' }">[배정]메뉴별권한 리스트</span>
+									<!-- <span class="body-1 font-weight-bold">[배정]메뉴별권한 리스트</span> -->
 								</v-col>
 								<v-col :cols="1" class="text-right">
-									<Buttons
-										:parentPrgmId="myPrgmId"
-										:bindingData="gridName3"
-										:btnActionsFnc="btnActions"
-									/>
+									<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName3"
+										:btnActionsFnc="btnActions" />
 								</v-col>
 							</v-row>
 							<div ref="treeGridParent2" class="px-0 mt-2" style="height: 60vh;">
@ -113,14 +77,9 @@
 									class="w100 h100"
 								>
 							</div> -->
-								<component
-									:is="loadTreeGrid2 ? 'Grid' : null"
-									:ref="gridName3 + myPrgmId"
-									:gridName="gridName3"
-									:parentPrgmId="myPrgmId"
-									:editorGrid="true"
-									@getRowsData="getAsgnRowData"
-								/>
+								<component :is="loadTreeGrid2 ? 'Grid' : null" :ref="gridName3 + myPrgmId"
+									:gridName="gridName3" :parentPrgmId="myPrgmId" :editorGrid="true"
+									@getRowsData="getAsgnRowData" />
 							</div>
 						</v-col>
 					</v-row>
@ -286,8 +245,8 @@ export default {
 		async gridInit() {
 			//---------------------gridOption 설정 시작----------------------------
 			const gridHeight = this.$refs.gridParent.offsetHeight - 30;
-			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 30;
-			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 30;
+			const treeGridHeight = this.$refs.treeGridParent.offsetHeight - 50;
+			const treeGridHeight2 = this.$refs.treeGridParent2.offsetHeight - 50;
 			// const gridHeight = this.$refs.contents.offsetHeight - 30;

 			const myOptions = {
@ -316,8 +275,10 @@ export default {
 				treeColumnOptions: {
 					name: 'menuNm',
 				},
-				scrollX: false,
-				// scrollY: false,
+				rowHeight: 37,
+				minRowHeight: 37,
+				scrollX: true,
+				scrollY: true,
 			};

 			this.setGridOption({
@ -347,6 +308,9 @@ export default {
 					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;

@ -380,12 +344,12 @@ export default {
 			const _this = this;

 			const myColumns = [
-				{ header: '역할ID', name: 'roleId', align: 'center', minWidth: 70 },
-				{ header: '역할명', name: 'roleNm', minWidth: 70 },
+				{ header: '역할ID', name: 'roleId', align: 'left', minWidth: 70,width:120 },
+				{ header: '역할명', name: 'roleNm', minWidth: 70, align: 'left',width:120 },
 				{
 					header: '사용여부',
 					name: 'useFg',
-					align: 'center',
+					align: 'left',
 					minWidth: 84,
 					formatter({ value }) {
 						const newValue = _this.pageData.useFgList.filter(
@ -408,6 +372,7 @@ export default {
 				{
 					header: '메뉴명',
 					name: 'menuNm',
+					maxWidth: 120,
 					validation: {
 						dataType: 'string',
 						validatorFn: (value, row) => {
@ -549,12 +514,12 @@ export default {
 						//rowKey: 0,
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName + this.myPrgmId].getData().length - 1
-								? this.pageData.rowGridSelectKey
-								: 0,
+									this.$refs[this.gridName + this.myPrgmId].getData().length - 1
+									? this.pageData.rowGridSelectKey
+									: 0,
 						columnName: 'roleId',
 						setScroll: true,
 					});
@ -609,8 +574,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-							? '00'
-							: 'ROOT',
+								? '00'
+								: 'ROOT',
 				};
 				return newItem;
 			});
@ -649,8 +614,8 @@ export default {
 						item.upMenuId && item.upMenuId != '0'
 							? item.upMenuId
 							: item.upMenuId == '0'
-							? '00'
-							: 'ROOT',
+								? '00'
+								: 'ROOT',
 				};
 				return newItem;
 			});
--- a/pages/comm/base/NoticeMngPage.vue
+++ b/pages/comm/base/NoticeMngPage.vue
@ -3,22 +3,22 @@
 		<CommonPageTitle />
 		<!-- 리스트 페이지 시작 -->
 		<div v-if="pageActionFlag == 'list'" class="h1001">
-			<v-card class="" >
+			<v-card class="">
 				<div class="pa-5">
-					<v-row align="center" no-gutters >
+					<v-row align="center" no-gutters>
 						<v-col :cols="12" class="d-flex align-center justify-space-between">
 							<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
 							<div class="d-flex align-center">
 								<!-- <v-btn @click="listPageButtonGroupClickEvent('view')" :ripple="false" class="mr-1">상세보기</v-btn> -->
-								<a-button type="primary" 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="px-50" style="min-height: 70vh;">
-								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName" :parentPrgmId="myPrgmId"
-									 @getRowsData="getRowData" />
+								<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
+									:parentPrgmId="myPrgmId" @getRowsData="getRowData" />
 							</div>
 						</v-col>
 					</v-row>
@ -27,22 +27,23 @@
 		</div>
 		<!-- 리스트 페이지 끝 -->
 		<!-- 상세보기 페이지 시작 -->
-		<div v-if="pageActionFlag == 'view'" >
+		<div v-if="pageActionFlag == 'view'">
 			<v-card>
 				<v-row class="pa-5">
 					<v-col :cols="12" class="d-flex align-center justify-space-between ">
-						<v-card-title class="pa-0 custom-title-4">공지사항</v-card-title>
+						<v-card-title class="pa-0 custom-title-4">공지사항 보기</v-card-title>
 						<div class="d-flex align-center">
-							<a-button @click="viewPageButtonGroupClickEvent('list')" type="primary" :ripple="false" class="mr-1"
-								icon="unordered-list">목록</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false" class="mr-1"
-								icon="send-outlined">
+							<a-button @click="viewPageButtonGroupClickEvent('list')" type="primary" :ripple="false"
+								class="mr-1" icon="unordered-list">목록</a-button>
+							<a-button @click="viewPageButtonGroupClickEvent('reply')" type="primary" :ripple="false"
+								class="mr-1" icon="send-outlined">
 								<v-icon small :class="['mr-2']">$icoSend</v-icon>
 								답글
 							</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false" class="mr-1"
-								icon="edit">수정</a-button>
-							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost icon="delete">삭제</a-button>
+							<a-button @click="viewPageButtonGroupClickEvent('update')" type="primary" :ripple="false"
+								class="mr-1" icon="edit">수정</a-button>
+							<a-button @click="viewPageButtonGroupClickEvent('delete')" type="danger" ghost
+								icon="delete">삭제</a-button>
 						</div>
 					</v-col>
 					<v-col :cols="12" class="mt-5">
@ -57,13 +58,12 @@
 						<v-card-title class="custom-title-7 pa-0">
 							파일목록
 						</v-card-title>
-						<div v-for="fileData in viewActionData.fileData" 
-							:key="fileData.apndFileId" 
-							class="file-item">
+						<div v-for="fileData in viewActionData.fileData" :key="fileData.apndFileId" class="file-item">
 							<a @click.prevent="downloadFile(fileData)">
 								<div class="d-flex justify-start search-box-label">
 									<v-icon>mdi-paperclip</v-icon>
-									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' + fileData.apndFileExt }}</span>
+									<span class="file-item-name ml-2">{{ fileData.apndFileNm + '.' +
+										fileData.apndFileExt }}</span>
 								</div>
 							</a>
 						</div>
@ -73,12 +73,12 @@
 		</div>
 		<!-- 상세보기 페이지 끝 -->
 		<!-- 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'write'" >
+		<div v-if="pageActionFlag == 'write'">
 			<v-card>
 				<div class="pa-5">
 					<v-row class="pa-50">
 						<v-col :cols="12" class="">
-							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
+							<v-card-title class="custom-title-4 pa-0">공지사항 작성</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
 							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
@ -88,37 +88,31 @@
 						<v-col :cols="12" style="min-height: calc(100vh - 450px);">
 							<editor ref="tuiEditor" height="100%" initialEditType="wysiwyg" />
 						</v-col>
-	
+
 						<v-col :cols="6" class="mt-5">
 							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 							<div class="" v-if="writeActionData.fileData">
-								<div 
-									v-for="(fileData, index) in writeActionData.fileData" 
-									:key="fileData.apndFileId" 
+								<div v-for="(fileData, index) in writeActionData.fileData" :key="fileData.apndFileId"
 									class="file-item d-flex justify-space-between">
 									<div class="file-item-detail">
 										<v-icon>mdi-paperclip</v-icon>
 										<span href="#" class="file-item-name">{{ fileData.name }}</span>
 									</div>
-									<a-icon type="delete" class="v-icon pointer" @click="writeActionData.fileData.splice(index, 1)" />
+									<a-icon type="delete" class="v-icon pointer"
+										@click="writeActionData.업로드fileData.splice(index, 1)" />
 								</div>
 							</div>
-							<a-button class="mt-2" icon="upload" @click="$refs.writeInputFile.$refs.input.click()" >
+							<a-button class="mt-2" icon="upload" @click="$refs.writeInputFile.$refs.input.click()">
 								업로드
 							</a-button>
-							<v-file-input 
-								ref="writeInputFile" 
-								v-model="writeActionData.fileData" 
-								multiple
-								outlined 
-								hide-input
-								class="d-none"
-								prepend-icon="mdi-tray-arrow-up"
-							></v-file-input>
+							<v-file-input ref="writeInputFile" v-model="writeActionData.fileData" multiple outlined
+								hide-input class="d-none" prepend-icon="mdi-tray-arrow-up"></v-file-input>
 						</v-col>
 						<v-col :cols="12" class="text-right">
-							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false" class="mr-2">취소</a-button>
-							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false" type="primary">등록</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('cancel')" :ripple="false"
+								class="mr-2">취소</a-button>
+							<a-button @click="writePageButtonGroupClickEvent('write')" :ripple="false"
+								type="primary">등록</a-button>
 						</v-col>
 					</v-row>
 				</div>
@ -126,7 +120,7 @@
 		</div>
 		<!-- 작성 페이지 끝 -->
 		<!-- 답글 작성 페이지 시작 -->
-		<div v-if="pageActionFlag == 'reply'" >
+		<div v-if="pageActionFlag == 'reply'">
 			<v-card class="pa-5">
 				<v-row align="center" class="mt-0">
 					<v-col :cols="12" class="">
@ -134,8 +128,7 @@
 					</v-col>
 					<v-col :cols="12" class="mt-4">
 						<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
-						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined
-							hide-details>
+						<v-text-field v-model="replyActionData.title" class="v-input__custom" outlined hide-details>
 						</v-text-field>
 					</v-col>
 					<v-col :cols="12" style="height: calc(100vh - 270px);" class="mt-2">
@ -144,72 +137,73 @@
 					<v-col :cols="6" class="mt-5">
 						<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
 						<div class="" v-if="replyActionData.fileData">
-							<div 
-								v-for="(fileData, index) in replyActionData.fileData" 
-								:key="fileData.apndFileId" 
+							<div v-for="(fileData, index) in replyActionData.fileData" :key="fileData.apndFileId"
 								class="file-item d-flex justify-space-between">
 								<div class="file-item-detail">
 									<v-icon>mdi-paperclip</v-icon>
 									<span href="#" class="file-item-name">{{ fileData.name }}</span>
 								</div>
-								<a-icon type="delete" class="v-icon pointer" @click="replyActionData.fileData.splice(index, 1)" />
+								<a-icon type="delete" class="v-icon pointer"
+									@click="replyActionData.fileData.splice(index, 1)" />
 							</div>
 						</div>
-						<a-button class="mt-3" icon="upload" @click="$refs.replyInputFile.$refs.input.click()" >
+						<a-button class="mt-3" icon="upload" @click="$refs.replyInputFile.$refs.input.click()">
 							업로드
 						</a-button>
-						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData" hide-details="true" class="d-none">
+						<v-file-input ref="replyInputFile" multiple show-size v-model="replyActionData.fileData"
+							hide-details="true" class="d-none">
 						</v-file-input>
 					</v-col>
 					<v-col :cols="12" class="text-right">
 						<a-button @click="replyPageButtonGroupClickEvent('cancel')" :ripple="false">취소</a-button>
-						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false" type="primary">등록</a-button>
+						<a-button @click="replyPageButtonGroupClickEvent('reply')" :ripple="false"
+							type="primary">등록</a-button>
 					</v-col>
 				</v-row>
 			</v-card>
 		</div>
 		<!-- 답글 작성 페이지 끝 -->
 		<!-- 수정 페이지 시작 -->
-		<div v-if="pageActionFlag == 'update'" >
+		<div v-if="pageActionFlag == 'update'">
 			<v-card>
 				<div class="pa-5">
 					<v-row align="center" no-gutters>
 						<v-col :cols="12">
-							<v-card-title class="custom-title-4 pa-0">공지사항</v-card-title>
+							<v-card-title class="custom-title-4 pa-0">공지사항 수정</v-card-title>
 						</v-col>
 						<v-col :cols="12" class="mt-4">
 							<v-card-title class="custom-title-7 pa-0">제목</v-card-title>
-							<v-text-field v-model="updateActionData.title" class="v-input__custom" hide-details 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" />
 						</v-col>
 						<v-col :cols="6" class="mt-5">
-								<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
-								<div class="" v-if="updateActionData.fileData">
-									<div 
-										v-for="(fileData, index) in updateActionData.fileData"
-										:key="fileData.apndFileId" 
-										class="file-item d-flex justify-space-between">
-										<div class="file-item-detail">
-											<v-icon>mdi-paperclip</v-icon>
-											<span href="#" class="file-item-name">{{ fileData.name }}</span>
-										</div>
-										<a-icon type="delete" class="v-icon pointer" @click="updateActionData.fileData.splice(index, 1)" />
+							<v-card-title class="custom-title-7 pa-0">파일첨부</v-card-title>
+							<div class="" v-if="updateActionData.fileData">
+								<div v-for="(fileData, index) in updateActionData.fileData" :key="fileData.apndFileId"
+									class="file-item d-flex justify-space-between">
+									<div class="file-item-detail">
+										<v-icon>mdi-paperclip</v-icon>
+										<span href="#" class="file-item-name">{{ fileData.name }}</span>
 									</div>
+									<a-icon type="delete" class="v-icon pointer"
+										@click="updateActionData.fileData.splice(index, 1)" />
 								</div>
-								<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()" >
-									업로드
-								</a-button>
-								<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
-									hide-details="true" class="d-none">
-								</v-file-input>
+							</div>
+							<a-button class="mt-2" icon="upload" @click="$refs.updateInputFile.$refs.input.click()">
+								업로드
+							</a-button>
+							<v-file-input ref="updateInputFile" multiple show-size v-model="updateActionData.fileData"
+								hide-details="true" class="d-none">
+							</v-file-input>
 						</v-col>
 						<v-col :cols="12" class="text-right">
-							<a-button @click="updatePageButtonGroupClickEvent('cancel')" >취소</a-button>
-							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary" >등록</a-button>
+							<a-button @click="updatePageButtonGroupClickEvent('cancel')">취소</a-button>
+							<a-button @click="updatePageButtonGroupClickEvent('update')" type="primary">등록</a-button>
 						</v-col>
 					</v-row>
 				</div>
@ -295,8 +289,6 @@ export default {
 				postGrpOrd: null,
 				postOrgNo: null,
 			},
-			dataPathMock: {},
-
 		};
 	},
 	computed: {
@ -341,7 +333,7 @@ export default {
 			chkOpenTabList: 'chkOpenTabList',
 			getDomain: 'modules/list/getDomain',
 		}),
-		onTest(){
+		onTest() {
 			console.log(this.writeActionData.fileData);
 		},
 		async init() {
@ -400,7 +392,11 @@ export default {
 		gridInit() {
 			const gridHeight = this.$refs.contents.offsetHeight - 76;

-			const myOptions = {};
+			const myOptions = {
+				header: {
+					height: 38,
+				},
+			};
 			this.setGridOption({
 				gridKey: this.gridName,
 				value: Object.assign(Utility.defaultGridOption(gridHeight), myOptions),
@ -421,7 +417,7 @@ export default {
 					align: 'center',
 					hidden: true,
 				},
-				{ header: '번호', name: 'postNo', width: 150, align: 'center' },
+				{ header: '번호', name: 'postNo', width: 150, align: 'right' },
 				{
 					header: '원글번호',
 					name: 'postOrgNo',
@ -451,9 +447,9 @@ export default {
 					hidden: true,
 				},
 				{ header: '제목', name: 'title', align: 'left' },
-				{ header: '작성자', name: 'regUserNo', width: 250, align: 'center' },
+				{ header: '작성자', name: 'regUserNo', width: 250, align: 'right' },
 				{ header: '작성일', name: 'regDttm', width: 250, align: 'center' },
-				{ header: '조회수', name: 'viewCnt', width: 150, align: 'center' },
+				{ header: '조회수', name: 'viewCnt', width: 150, align: 'right' },
 				// {header: "파일아이디", name:"apndFileUuid", width:150, align:"center"}, // 수정필요
 			];

@ -475,7 +471,7 @@ export default {
 				resKey: 'postData',
 				sendParam: params,
 			});
-			
+
 			this.setGridData({
 				gridKey: this.gridName,
 				value: res,
@ -1020,15 +1016,6 @@ const defaultData = {
 	},
 };

-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-	postNo: '18',
-	title: '오픈공지',
-	regUserNo: '1',
-	regDttm: '2023-01-09 09:39:41',
-	viewCnt: '1'
-}, 10);
-
 </script>

 <style lang="scss" scoped>
@ -1042,23 +1029,41 @@ const dataPathDataExample = getPathDataExample({
 	margin: 2px 0;
 	padding: 4px;
 	background-color: #0000000A;
-	.file-item-name{
+
+	.file-item-name {
 		color: #1677FF;
 	}
 }
+
 ::v-deep {
 	.v-input__slot {
 		padding-left: 8px;
 		padding-right: 8px;
 	}
+
 	.custom-view {
 		border: 1px solid;
 		border-radius: 6px;
 		height: 100%;
+
 		@each $theme in dark, light {
 			@include theme($theme);
-			border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");;
+			border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");
+			;
 		}
 	}
+
+	.toastui-editor-mode-switch {
+		font-family: Inter !important;
+		font-size: 1.0rem !important;
+	}
+
+	.toastui-editor-mode-switch .tab-item.active {
+		color: #1677FF
+	}
+
+	.toastui-editor-mode-switch .tab-item {
+		color: #000000E0
+	}
 }
 </style>
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@ -7,28 +7,15 @@
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
 						<v-col :cols="3">
-							<component
-								:is="'selectCodeList'"
-								:parentPrgmId="myPrgmId"
-								:label="'사용여부'"
-								:dataKey="'selectUseFg'"
-								:sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
-								:addAll="true"
-								customClass="select-large"
-							/>
+							<component :is="'selectCodeList'" :parentPrgmId="myPrgmId" :label="'사용여부'"
+								:dataKey="'selectUseFg'" :sendParam="{ commGrpCd: 'CO_USEFG', useFg: '1' }"
+								:addAll="true" customClass="select-large" />
 						</v-col>
 						<v-col :cols="3">
-							<InputText
-								:parentPrgmId="myPrgmId"
-								label="프로그램명"
-								valueNm="prgmNm"
-								:searchOption="true"
-								:labelCols="12"
-								:textCols="12"
-								customClass="input-large"
-							/>
+							<InputText :parentPrgmId="myPrgmId" label="프로그램명" valueNm="prgmNm" :searchOption="true"
+								:labelCols="12" :textCols="12" customClass="input-large" />
 						</v-col>
-						<v-col :cols="5" class="text-right">
+						<v-col :cols="6" class="text-right">
 							<BtnSearch size="large" />
 						</v-col>
 					</v-row>
@ -38,46 +25,32 @@

 		<v-row ref="contents">
 			<!-- 프로그램 리스트 -->
-			<v-col :cols="5" >
+			<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">프로그램 리스트</v-card-title>
 						<div>
-							<Buttons
-								:parentPrgmId="myPrgmId"
-								:bindingData="gridName"
-								:detailList="detailList"
-								:btnActionsFnc="btnActions"
-							/>
+							<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :detailList="detailList"
+								:btnActionsFnc="btnActions" />
 						</div>
 					</div>
 					<div ref="gridParent" style="height: 60vh">
 						<!-- <div ref="gridParent" class="px-5 h100">
 						</div> -->
-						<component
-							:ref="gridName"
-							:is="loadGrid ? 'Grid' : null"
-							:parentPrgmId="myPrgmId"
-							:gridName="gridName"
-							@getRowsData="getRowData"
-						/>
+						<component :ref="gridName" :is="loadGrid ? 'Grid' : null" :parentPrgmId="myPrgmId"
+							:gridName="gridName" @getRowsData="getRowData" />
 					</div>
 				</v-card>
 			</v-col>
 			<!-- 프로그램 상세 -->
-			<v-col :cols="7" >
+			<v-col :cols="7">
 				<v-card class="pb-5">
 					<div class="d-flex align-center justify-space-between pa-5">
 						<v-card-title class="pa-0">프로그램 상세</v-card-title>
 					</div>
 					<div class="px-5" style="min-height:calc(100% - 76px)">
-						<component
-							:is="'Form'"
-							:parentPrgmId="myPrgmId"
-							:bindingData="gridName"
-							:detailList="detailList"
-							@gridEditingFinish="gridEditingFinish"
-						/>
+						<component :is="'Form'" :parentPrgmId="myPrgmId" :bindingData="gridName"
+							:detailList="detailList" @gridEditingFinish="gridEditingFinish" />
 						<!-- <div class="w100">
 						</div> -->
 					</div>
@ -132,21 +105,19 @@ export default {
 			detailList: myDetail,

 			dataPathMock: {
-        'rowGrid': {
-          column: [
-            { header: '프로그램ID', name: 'field1', align: 'left' },
-            { header: '프로그램덤', name: 'field2', align: 'left' },
-            { header: '타임', name: 'field3', align: 'left' },
-            { header: '사용여부', name: 'field4', align: 'left' }
-          ],
-          data: dataPathDataExample,
-          defaultRow: dataPathDataExample,
-          option: {
+				'rowGrid': {
+					column: [
+						{ header: '프로그램ID', name: 'field1', align: 'left' },
+						{ header: '프로그램덤', name: 'field2', align: 'left' },
+						{ header: '타임', name: 'field3', align: 'left' },
+						{ header: '사용여부', name: 'field4', align: 'left' }
+					],
+					option: {
 						scrollY: false,
 						scrollX: false,
 					}
-        }
-      },
+				}
+			},
 		};
 	},
 	computed: {
@ -295,7 +266,7 @@ export default {
 				value: newRes,
 			});
 			this.loadGrid = true;
-			
+
 			this.$nextTick(() => {
 				if (newRes.length > 0) {
 					this.$refs[this.gridName].focus({
@ -303,12 +274,12 @@ export default {
 						//rowKey: this.chkRowGridSelectKey || 0,
 						rowKey:
 							this.pageData.rowGridSelectKey == '' ||
-							this.pageData.rowGridSelectKey == null
+								this.pageData.rowGridSelectKey == null
 								? 0
 								: this.pageData.rowGridSelectKey ==
-								  this.$refs[this.gridName].getData().length - 1
-								? this.pageData.rowGridSelectKey
-								: 0,
+									this.$refs[this.gridName].getData().length - 1
+									? this.pageData.rowGridSelectKey
+									: 0,
 						setScroll: true,
 					});
 				}
@ -331,7 +302,7 @@ export default {
 				rowGridSelectKey: data.rowKey,
 				rowGridSelectData: data,
 			});
-			
+
 		},
 		compareData(type, newDt) {
 			if (this.selectedCommCdData[type] == newDt) {
@ -487,7 +458,7 @@ const myDetail = [
 		valueNm: 'prgmTpCd',
 		essential: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		list: [
 			{ text: '프로그램', value: '1' },
 			{ text: '팝업', value: '2' },
@ -502,10 +473,11 @@ const myDetail = [
 		essential: true,
 		disabled: false,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-13',
 		value: { '1': true, '0': false },
 		required: true,
 		textCols: 12,
+		labelCols:12,
 		iconShow: true
 	},
 	{
@ -514,7 +486,7 @@ const myDetail = [
 		valueNm: 'url',
 		disabled: false,
 		cols: 12,
-		class: 'py-2',
+		class: 'py-2 pt-4',
 		required: true,
 		textCols: 12,
 		iconShow: true
@ -525,7 +497,7 @@ const myDetail = [
 		valueNm: 'regUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@ -536,7 +508,7 @@ const myDetail = [
 		valueNm: 'regDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@ -547,7 +519,7 @@ const myDetail = [
 		valueNm: 'procUserNo',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
@ -558,19 +530,10 @@ const myDetail = [
 		valueNm: 'procDttm',
 		disabled: true,
 		cols: 6,
-		class: 'py-2',
+		class: 'py-2 pt-5',
 		placeholder: '시스템 자동입력',
 		textCols: 12,
 		iconShow: true
 	},
 ];
-
-
-import { getPathDataExample } from '@/const/const'
-const dataPathDataExample = getPathDataExample({
-  field1: 'PRG0001',
-  field2: '대시보드',
-  field3: '프로그램', 
-	field4: '사용'
-});
 </script>
--- a/pages/ems/base/EqpmKindPage.vue
+++ b/pages/ems/base/EqpmKindPage.vue
@ -167,7 +167,7 @@ export default {
 					header: '설비종류ID',
 					name: 'eqpmKindId',
 					width: gridWidth * 0.5,
-					align: 'center',
+					align: 'left',
 				},
 				{
 					header: '설비종류명',
--- a/pages/ems/base/EquipmentMasterMngPage.vue
+++ b/pages/ems/base/EquipmentMasterMngPage.vue
@ -53,7 +53,7 @@
 			</v-col>
 			<v-col :cols="7" >
 				<v-card class="pb-5">
-					<v-card-title class="custom-title-4" 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">
--- a/pages/ems/effc/EnrgMapPage.vue
+++ b/pages/ems/effc/EnrgMapPage.vue
@ -5,14 +5,14 @@
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="end" no-gutters>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<!-- 차트목록 -->
 							<component :is="'SelectBox'" ref="SelectBox" :propsValue="selectValue01" :itemList="selectValueList01"
 								:label="'차트'" @update:propsValue="selectValue01 = $event" :textCols="12" customClass="select-large"  />
 						</v-col>
-						<v-col :cols="4">
+						<v-col :cols="3">
 							<!-- 대상일 -->
-							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" />
+							<component :is="'Datepicker'" :parentPrgmId="myPrgmId" :label="'대상일'" :labelCols="3" customClass="datepicker-large" />
 						</v-col>
 						<v-col :cols="4" class="text-right">
 							<BtnSearch @click="search" size="large" />
--- a/pages/ems/effc/EnrgReptMngPage.vue
+++ b/pages/ems/effc/EnrgReptMngPage.vue
@ -99,6 +99,8 @@ import EqpmSelectPop from '~/components/common/modal/EqpmSelectPop';
 import DateUtility from '~/plugins/dateUtility';
 import XLSX from 'xlsx';

+import getLineChartOption from "~/components/common/chartoptions/LineChart";
+
 let myTitle;
 let myPrgmId;

@ -764,22 +766,14 @@ export default {
 				];
 			}

-			var chartOption = {
-				legend: {
-					top: 'top',
-				},
-				grid: {
-					top: '10%',
-					bottom: '20%',
-				},
-				yAxis: {},
-				xAxis: {
-					data: xAxisData,
-				},
-				series: seriesData,
-				tooltip: {},
+			const chartOption = getLineChartOption({
+        xAxisData: xAxisData,
+        seriesData: seriesData,
 				dataZoom: dataZoom,
-			};
+        // legendData: legendData,
+        // isDarkMode: this.isDarkMode,
+      });
+
 			this.setChartOption({ chartKey: this.chartName01, value: chartOption });
 			// this.setChartYAxisData({ chartKey: this.chartName01, value: yAxisData });
 			// this.setChartXAxisData({ chartKey: this.chartName01, value: xAxisData });
@ -864,22 +858,13 @@ export default {
 				];
 			}

-			var chartOption = {
-				legend: {
-					top: 'top',
-				},
-				grid: {
-					top: '10%',
-					bottom: '20%',
-				},
-				yAxis: {},
-				xAxis: {
-					data: xAxisData,
-				},
-				series: seriesData,
-				tooltip: {},
+			const chartOption = getLineChartOption({
+        xAxisData: xAxisData,
+        seriesData: seriesData,
 				dataZoom: dataZoom,
-			};
+        // legendData: legendData,
+        // isDarkMode: this.isDarkMode,
+      });

 			this.setChartOption({ chartKey: this.chartName02, value: chartOption });
 			// this.setChartDataZoom({chartKey : this.chartName02,value: dataZoom});
Author	SHA1	Message	Date
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK	8cadade514	fix bug 18 33 34	2025-08-05 15:00:22 +07:00
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK	2253ddef0a	conflic	2025-08-04 16:41:29 +07:00
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK	41095098e2	fixbug-scrren-12	2025-08-04 16:37:00 +07:00
Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK	28fe49d39f	fixbug-scrren-12	2025-08-04 16:35:12 +07:00
dev	f180f22324	Merge pull request 'fix bug screen 8, 10, menu' (#32 ) from dev-dungtv44-0804 into dev Reviewed-on: #32	2025-08-04 18:06:52 +09:00
Tran Van Dung/(Tran Van Dung)/현장대리인/SK	a7968774c3	Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0804	2025-08-04 15:03:03 +07:00
dev	195c48ff25	Merge pull request 'Update s1 s29 - Remove mock data s5 s11' (#31 ) from dev-nghiantt-s1s29 into dev Reviewed-on: #31	2025-08-04 17:02:41 +09:00
Tran Van Dung/(Tran Van Dung)/현장대리인/SK	7bca077859	fix bug screen 8, 10, menu	2025-08-04 15:00:22 +07:00