fixbug

Merge pull request 'fix bug screen 8, 10, menu' (#32 ) from dev-dungtv44-0804 into dev
Reviewed-on: #32
2025-08-04 18:53:30 +09:00 · 2025-08-04 18:06:52 +09:00 · 2025-08-04 15:03:03 +07:00 · 2025-08-04 17:02:41 +09:00 · 2025-08-04 15:00:22 +07:00
18 changed files with 404 additions and 383 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,15 +280,19 @@ 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
+      >.v-treeview-node__label>button {
+        >.anticon,
+        >.v-icon.mdi-chevron-down {
          transform: rotate(-180deg);
        }
      }
+    }

    .v-treeview-node__label {
      &>button {
@ -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"
-            );
+          &:hover {
+            background-color: map-deep-get($config, #{$theme}, "v-calendar-weekday-border-color" );
          }
-
-          &>.v-treeview-node__content {
+          .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"
-              );
+              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-root-backgroundColor"
-            );
+              background-color: map-deep-get($config, #{$theme}, "v-treeview-node-subroot-backgroundColor");
            }

-          &>.v-treeview-node__content {
+            .v-treeview-node__content {
              .v-treeview-node__label {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-label-color"
-              );
+                color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border");
              }

-            .v-icon {
-              color: map-deep-get($config,
-                #{$theme},
-                "v-treeview-node-root-icon-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 {
-            &>.v-treeview-node__content {
+                    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},
-                  "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");
                      }
                    }

-        &>.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--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},
-                    "v-treeview-node-label-color"
-                  );
+                        color: map-deep-get($config, #{$theme}, "tui-grid-title-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-icon,
+                      .v-icon::before,
+                      .anticon {
+                        color: map-deep-get($config, #{$theme}, "v-treeview-node-label-active-border" );
                      }
                    }
                  }

-            &>.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__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__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/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@ -98,6 +98,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;
@ -308,13 +314,13 @@
            #{$theme},
            "tui-grid-cell-borderColor"
          );
-          .tui-grid-cell-content {
-            border-right: 1px solid ;
-            border-right-color: map-deep-get($config,
-              #{$theme},
-              "tui-grid-cell-borderColor"
-            );
-          }
+          // .tui-grid-cell-content {
+          //   border-right: 1px solid ;
+          //   border-right-color: map-deep-get($config,
+          //     #{$theme},
+          //     "tui-grid-cell-borderColor"
+          //   );
+          // }
        }
      }

--- a/components/common/button/ActionButtons.vue
+++ b/components/common/button/ActionButtons.vue
@ -1,21 +1,8 @@
 <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" >
+		<a-button @click="btnActionsFnc('removeRightToLeft')" type="primary" ghost :icon="icons.remove" >
 		</a-button>
-
-		<!--<v-btn
-			icon
-			tile
-			:ripple="false"
-			class="mt-2"
-			@click="btnActionsFnc('removeRightToLeft')"
-		>
-			<v-icon>mdi-chevron-left</v-icon>
-		</v-btn> -->
-		<a-button   @click="btnActionsFnc('addLeftToRight')" type="primary" ghost icon="down">
+		<a-button   @click="btnActionsFnc('addLeftToRight')" type="primary" ghost :icon="icons.add">
 		</a-button>
 	</div>
 </template>
@ -38,8 +25,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 {};
 	},
--- a/components/common/button/BtnExcelDownload.vue
+++ b/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() {
--- a/components/common/modal/ChangeUserPswdPopPage.vue
+++ b/components/common/modal/ChangeUserPswdPopPage.vue
@ -44,8 +44,7 @@
 				<v-card-title>
 					<span class="custom-title-4">비밀번호 {{ isPassword }}</span>
 				</v-card-title>
-				<v-divider></v-divider>
-				<v-card-text>
+				<v-card-text class="pb-4">
 					<v-col>
 						<label for="" class="search-box-label">
 							{{ isPassword }}할 비밀번호를 입력하세요
@ -73,11 +72,10 @@
 						></v-text-field>
 					</v-col>
 				</v-card-text>
-				<v-divider></v-divider>
-				<v-card-actions>
+				<v-card-actions class="pb-4">
 					<v-spacer></v-spacer>
 					<!-- <v-btn color="primary" dark @click="setUpdate()">확인</v-btn> -->
-					<div>
+					<div class="pr-3">
 						 <a-button @click="close()" class="btn-default">삭제</a-button>
 						 <a-button type="primary" @click="setUpdate()" class="v-btn-add-text">
 							 확인
--- a/components/common/modal/EqpmSelectPop.vue
+++ b/components/common/modal/EqpmSelectPop.vue
@ -16,15 +16,16 @@

 				</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-card class="searchFilter">
+					</v-card> -->
+					<v-row align="end" class="searchFilter">
 						<v-col :cols="3.5">
 							<!-- 설비그룹 -->
 							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
@ -60,10 +61,7 @@
 							</v-row>
 						</v-col>
 						<a-button icon="search" type="primary" @click="search()" class="search-button">조회</a-button>
-
-
 					</v-row>
-					</v-card>

 					<!-- <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/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
+++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue
@ -38,7 +38,7 @@
 import { mapState, mapMutations, mapActions } from 'vuex';
 import Buttons from '~/components/common/button/Buttons';
 import Grid from '~/components/common/Grid';
-import { CustumChecbox } from '~/plugins/gridUtility';
+import { CustomCheckbox } from '~/plugins/gridUtility';
 import { CustomNumberEditor } from '~/plugins/gridUtility';
 import Form from '~/components/common/form/Form';
 import mixinGlobal from '@/mixin/global.js';
--- a/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue
+++ b/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue
@ -30,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';
@ -185,7 +185,7 @@ export default {
 					align: 'center',
 					width: 100,
 					// renderer: {
-					//   type: CustumChecbox,
+					//   type: CustomCheckbox,
 					//   options: {
 					//     onlyone: true,
 					//     // disabled: true
--- 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>
@ -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
@ -342,7 +342,7 @@ export default {
 			//---------------------gridOption 설정 끝----------------------------

 			//---------------------gridName3의 체크박스 설정 시작----------------------------
-			class CustumChecbox {
+			class CustomCheckbox {
 				constructor(props) {
 					const el = document.createElement('input');
 					const { grid, rowKey, columnInfo } = props;
@ -433,7 +433,7 @@ export default {
 					name: 'useFg',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@ -441,7 +441,7 @@ export default {
 					name: 'authCd1',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@ -449,7 +449,7 @@ export default {
 					name: 'authCd2',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@ -457,7 +457,7 @@ export default {
 					name: 'authCd3',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@ -465,7 +465,7 @@ export default {
 					name: 'authCd4',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@ -473,7 +473,7 @@ export default {
 					name: 'authCd5',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 				{
@ -481,7 +481,7 @@ export default {
 					name: 'authCd6',
 					align: 'center',
 					renderer: {
-						type: CustumChecbox,
+						type: CustomCheckbox,
 					},
 				},
 			];
--- a/pages/comm/auth/UserRoleMngPage.vue
+++ b/pages/comm/auth/UserRoleMngPage.vue
@ -151,6 +151,7 @@
 												:leftGridName="gridName2"
 												:rightGridName="gridName3"
 												:btnActionsFnc="dualGridBtnActions"
+												directionBtn="vertically"
 											/>
 										</v-col>
 										<v-col :cols="12" class="h100">
@ -981,7 +982,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			required: true,
 		},
@ -1005,7 +1006,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			required: true,
 		},
@ -1031,7 +1032,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 		},
 		{
@ -1054,7 +1055,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
@ -1078,7 +1079,7 @@ const myDetail = blocCdList => {
 			cols: 6,
 			labelCols: 12,
 			textCols: 12,
-			class: 'py-2 pr-4',
+			class: 'py-2 pl-4',
 			iconShow: true,
 			placeholder: '시스템 자동입력',
 		},
--- a/pages/comm/base/NoticeMngPage.vue
+++ b/pages/comm/base/NoticeMngPage.vue
@ -10,7 +10,7 @@
 							<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>
--- a/pages/ems/base/EnrgCostCenterMngPage.vue
+++ b/pages/ems/base/EnrgCostCenterMngPage.vue
@ -4,7 +4,7 @@
 			<v-col :cols="12">
 				<v-card class="searchFilter">
 					<v-row align="center" no-gutters>
-						<v-col :cols="3">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@ -14,7 +14,7 @@
 								:addAll="true"
 							/>
 						</v-col>
-						<v-col :cols="3">
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@ -24,8 +24,8 @@
 								:addAll="true"
 							/>
 						</v-col>
-						<v-col :cols="3">
 						<!-- 사업장 -->
+						<!-- <v-col :cols="3">
 							<div style="visibility:hidden">
 								<component
 									:is="'SelectBlocMstr'"
@ -33,13 +33,8 @@
 									:parentPrgmId="myPrgmId"
 								/>
 							</div>
-						</v-col>
-						<v-col :cols="3" class="text-right">
-							<BtnSearch @click="search" />
-						</v-col>
-					</v-row>
-					<v-row align="center" no-gutters>
-						<v-col :cols="3">
+						</v-col> -->
+						<v-col :cols="2.5">
 							<component
 								:is="'selectCodeList'"
 								:parentPrgmId="myPrgmId"
@ -49,7 +44,7 @@
 								:addAll="true"
 							/>
 						</v-col>
-						<v-col :cols="6">
+						<v-col :cols="2.5">
 							<InputText
 								:parentPrgmId="myPrgmId"
 								label="공정명"
@ -59,6 +54,12 @@
 								:searchOption="true"
 							/>
 						</v-col>
+						<v-col class="text-right">
+							<BtnSearch @click="search" />
+						</v-col>
+					</v-row>
+					<v-row align="center" no-gutters>
+						
 					</v-row>
 				</v-card>
 			</v-col>
--- 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});
--- a/pages/ems/effc/EnrgUsePlanPage.vue
+++ b/pages/ems/effc/EnrgUsePlanPage.vue
@ -10,15 +10,15 @@
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox1" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="false" customClass="select-large" />
+								:label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="true" customClass="select-large" />
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox2" :propsValue="selectValue02" :itemList="selectValueList02"
-								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="false" customClass="select-large"/>
+								:label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="true" customClass="select-large"/>
 						</v-col>
 						<v-col :cols="2.5">
 							<component :is="'SelectBox'" ref="SelectBox3" :propsValue="selectValue03" :itemList="selectValueList03"
-								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="false" customClass="select-large" />
+								:label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="true" customClass="select-large" />
 						</v-col>

 						<BtnSearch size="large" @click="search" />
@ -33,7 +33,7 @@
 		<v-row ref="contents">
 			<v-col :cols="12" >
 				<v-card class="pb-5">
-					<div class="d-flex align-center justify-space-between pa-4">
+					<div class="d-flex align-center justify-space-between py-4 px-4">
 						<v-card-title class="pa-0 custom-title-4">설비별 에너지 계획 리스트</v-card-title>
 						<Buttons :parentPrgmId="myPrgmId" :bindingData="gridName" :btnActionsFnc="btnActions" />
 					</div>
@ -291,7 +291,7 @@ export default {
 				},
 			};

-			class CustumButton {
+			class CustomButton {
 				constructor(props) {
 					const { grid, rowKey, columnInfo } = props;

@ -304,7 +304,7 @@ export default {
 					$(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between');
 					const el2 = document.createElement('button');
 					$(el2).addClass('edit-btn blue--text');
-					el2.innerText = 'Edit';
+					el2.innerText = '편집하다';
 					elDiv.appendChild(el2);

 					this.el = elDiv;
@ -352,7 +352,7 @@ export default {
 					header: 'NO',
 					name: 'rowNum',
 					width: 40,
-					align: 'center',
+					align: 'right',
 					// hidden: true,
 				},
 				{
@ -389,7 +389,7 @@ export default {
 					// `;
 					// }
 					renderer: {
-						type: CustumButton,
+						type: CustomButton,
 						options: {
 							value: '계획수정',
 						},
@ -402,7 +402,7 @@ export default {
 					align: 'center',
 					hidden: true,
 					renderer: {
-						type: CustumButton,
+						type: CustomButton,
 						options: {
 							value: '계획수정',
 						},
--- a/plugins/gridUtility.js
+++ b/plugins/gridUtility.js
@ -115,7 +115,7 @@ export class CustomCalcNumberEditor {
 	}
 }

-export class CustumChecbox {
+export class CustomCheckbox {
 	constructor(props) {
 		const el = document.createElement('input');
 		const { grid, rowKey, columnInfo } = props;
@ -169,7 +169,7 @@ export class CustumChecbox {
 	}
 }

-export class CustumButton {
+export class CustomButton {
 	constructor(props) {
 		const el = document.createElement('button');
 		const { grid, rowKey, columnInfo } = props;
Author	SHA1	Message	Date
Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK	5735777bb1	fixbug	2025-08-04 18:53:30 +09: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