From 20211168e925998d751419f554b764a10677caad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Thu, 21 Aug 2025 10:37:17 +0700
Subject: [PATCH 1/2] fix bugs grid on popup

---
 assets/scss/layout.scss                   |  4 +--
 components/common/PastRsltDatePicker.vue  |  5 ++++
 components/common/modal/EqpmSelectPop.vue | 17 +++++++----
 layouts/default.vue                       | 25 ++++++++++++++--
 pages/ems/base/ReadResultCloseMngPage.vue | 36 ++++++++++++++++-------
 pages/ems/effc/EnrgMapPage.vue            |  2 +-
 store/index.js                            |  1 +
 7 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/assets/scss/layout.scss b/assets/scss/layout.scss
index 715c112..a008ef5 100644
--- a/assets/scss/layout.scss
+++ b/assets/scss/layout.scss
@@ -448,8 +448,8 @@
 
       .router-tab {
         .router-tab__header {
-          background-color: map-deep-get($config, #{$theme}, "router-header");
-          border-color: map-deep-get($config, #{$theme}, "router-header");
+          // background-color: map-deep-get($config, #{$theme}, "router-header");
+          // border-color: map-deep-get($config, #{$theme}, "router-header");
           height: 46px;
           z-index: 7;
           max-width: calc(100vw - 290px);
diff --git a/components/common/PastRsltDatePicker.vue b/components/common/PastRsltDatePicker.vue
index a73b12a..f14d18f 100644
--- a/components/common/PastRsltDatePicker.vue
+++ b/components/common/PastRsltDatePicker.vue
@@ -58,6 +58,11 @@ export default {
 			require: false,
 			default: false,
 		},
+		required: {
+			type: Boolean,
+			require: false,
+			default: false,
+		},
 		labelCols: {
 			type: Number,
 			require: false,
diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue
index 7cea177..3c1cbc7 100644
--- a/components/common/modal/EqpmSelectPop.vue
+++ b/components/common/modal/EqpmSelectPop.vue
@@ -400,7 +400,6 @@ export default {
 				header: {
 					height: 'auto',
 				},
-				// rowHeaders:[{ type: 'checkbox' }],
 				rowHeight: 'auto',
 			};
 			if (this.isMulti) {
@@ -408,8 +407,6 @@ export default {
 				myOptions['rowHeight'] = 'auto';
 			}
 
-
-
 			this.setModalGridOption({
 				modalKey: this.myModalKey,
 				gridKey: this.gridName,
@@ -463,8 +460,6 @@ export default {
 				modalDataKey: this.modalDataKey,
 				value: myColumns,
 			});
-
-
 			// this.getRowGridData();
 		},
 		async getRowGridData() {
@@ -588,6 +583,18 @@ var eqpmSelectPop = {
 		overflow-y: hidden;
 	}
 
+	.tui-grid-lside-area {
+		.tui-grid-table {
+			.tui-grid-cell-header {
+				&.tui-grid-cell  {
+					input[type=checkbox] {
+						margin-top: 0px;
+					}
+				}
+			}
+		}
+	}
+
 }
 
 </style>
diff --git a/layouts/default.vue b/layouts/default.vue
index d32df3a..06d74ff 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -104,7 +104,9 @@
                   :items="treevieItems" activatable hoverable color="#3896ff" open-on-click @update:open="openNode">
                   <template slot="label" slot-scope="{ item }">
                     <button :class="{ 'justify-center': miniVariant }" @mouseover="doMouseOver">
-                      
+                      <!-- <span v-if="['MNU0065', 'MNU0027'].includes(item.menuId)" >
+                        {{ item }}
+                      </span> -->
                       <v-icon 
                         v-if="item.lvl === 1 && menuIconKeys.includes(item.menuId)"
                         :class="{ 'mr-2': !miniVariant }" 
@@ -142,8 +144,12 @@
               </v-navigation-drawer>
             </div>
 
-            <v-col>
-              <router-tab ref="routerTab" :tabs="treevieItems" :keep-last-tab="false" :contextmenu="false">
+            <v-col :class="`${isDarkMode ? 'dark' : 'light'}`">
+              <router-tab ref="routerTab" 
+                :tabs="treevieItems" 
+                :keep-last-tab="false" 
+                :contextmenu="false"
+              >
                 <template slot-scope="{ title, closable, to, base }">
                   <span>{{ title }}</span>
                   <v-icon size="20" class="ml-2" v-if="closable" @click.stop="onCloseTab(to)">mdi-close</v-icon>
@@ -700,4 +706,17 @@ export default {
 
 <style lang="scss" scoped>
 @import '@/assets/scss/layout.scss';
+
+</style>
+
+<style lang="scss">
+.light .router-tab .router-tab__header {
+    background-color: #fff;
+    border-color: #fff;
+}
+
+.dark .router-tab .router-tab__header {
+    background-color: #212224;
+    border-color: #212224;
+}
 </style>
diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue
index 136704c..c0cefde 100644
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@@ -129,10 +129,20 @@ let myPrgmId;
 export default {
   mixins: [mixinGlobal, resize],
   async asyncData(context) {
-    const myState = context.store.state;
-    myPrgmId = context.route.query.prgmId;
-    await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
-    myTitle = await myState.activeMenuInfo.menuNm;
+    console.log('----DEBUG-----ReadResultCloseMngPage--asyncData:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
+    try{
+      myPrgmId = context.route.query.prgmId;
+      const myState = context.store.state;
+      const activeMenuInfo = myState.menuData[myPrgmId];
+      myTitle = activeMenuInfo.menuNm;
+
+      console.log('-----DEBUG----store.commit----setActiveMenuInfo:', activeMenuInfo);
+      await context.store.commit("setActiveMenuInfo", activeMenuInfo);
+      myTitle = await myState.activeMenuInfo.menuNm;
+      console.log('-----DEBUG----store.commit----setActiveMenuInfo---Compeleted:', myState.activeMenuInfo);
+    }catch(err){
+      console.log('-----DEBUG----err', err);
+    }
   },
   meta: {
     title: () => {
@@ -206,18 +216,22 @@ export default {
       this.setPageData({ isFind: true });
     },
   },
-  async beforeCreate() {
+  beforeCreate() { 
+    console.log('----DEBUG-----ReadResultCloseMngPage--beforeCreate:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
     myPrgmId = this.$route.query.prgmId;
-    await this.$store.dispatch("chkOpenTabList", {
-      key: "create",
-      prgmId: myPrgmId,
-      defaultData: defaultData,
-    });
+    // const context = {
+    //   key: "create",
+    //   prgmId: myPrgmId,
+    //   defaultData: defaultData,
+    // };
+    // this.$store.dispatch("chkOpenTabList", context);
+    // this.chkOpenTabList(context)
   },
   mounted() {
     this.init();
   },
-  created() {},
+  created() { 
+  },
   methods: {
     ...mapMutations({
       setPageData: "setPageData",
diff --git a/pages/ems/effc/EnrgMapPage.vue b/pages/ems/effc/EnrgMapPage.vue
index b6699e6..257eeab 100644
--- a/pages/ems/effc/EnrgMapPage.vue
+++ b/pages/ems/effc/EnrgMapPage.vue
@@ -239,7 +239,7 @@ export default {
 			try{
 				await this.getChartData();
 			}catch(err){
-				this.initTestChart();
+				// this.initTestChart();
 			}
 			this.setPageData({
 				isFind: false,
diff --git a/store/index.js b/store/index.js
index d88baf9..73ccb5e 100644
--- a/store/index.js
+++ b/store/index.js
@@ -513,6 +513,7 @@ export const actions = {
 				//commit("pageInit", {});
 				break;
 			case 'create':
+				console.log("---------DEBUGmyPrgmId:", myPrgmId);
 				if (!list.some(it => it === myPrgmId)) {
 					// console.log("클릭 한 메뉴가 기존 목록에 없다 => 새로 push"); // & 초기화 세팅
 					localStorage.setItem('pageData', JSON.stringify(state.pageData));
-- 
2.50.1.windows.1


From cd1abec719c7bc8abc958bfb9021223ac4df95b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?=
 =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com>
Date: Thu, 21 Aug 2025 10:43:44 +0700
Subject: [PATCH 2/2] resolve comment

---
 pages/ems/base/ReadResultCloseMngPage.vue | 23 +++++++++++------------
 store/index.js                            |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue
index c0cefde..c481bb9 100644
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@@ -129,19 +129,19 @@ let myPrgmId;
 export default {
   mixins: [mixinGlobal, resize],
   async asyncData(context) {
-    console.log('----DEBUG-----ReadResultCloseMngPage--asyncData:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
+    // console.log('----DEBUG-----ReadResultCloseMngPage--asyncData:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
     try{
       myPrgmId = context.route.query.prgmId;
       const myState = context.store.state;
       const activeMenuInfo = myState.menuData[myPrgmId];
       myTitle = activeMenuInfo.menuNm;
 
-      console.log('-----DEBUG----store.commit----setActiveMenuInfo:', activeMenuInfo);
+      // console.log('-----DEBUG----store.commit----setActiveMenuInfo:', activeMenuInfo);
       await context.store.commit("setActiveMenuInfo", activeMenuInfo);
       myTitle = await myState.activeMenuInfo.menuNm;
-      console.log('-----DEBUG----store.commit----setActiveMenuInfo---Compeleted:', myState.activeMenuInfo);
+      // console.log('-----DEBUG----store.commit----setActiveMenuInfo---Compeleted:', myState.activeMenuInfo);
     }catch(err){
-      console.log('-----DEBUG----err', err);
+      // console.log('-----DEBUG----err', err);
     }
   },
   meta: {
@@ -217,15 +217,14 @@ export default {
     },
   },
   beforeCreate() { 
-    console.log('----DEBUG-----ReadResultCloseMngPage--beforeCreate:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
+    // console.log('----DEBUG-----ReadResultCloseMngPage--beforeCreate:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
     myPrgmId = this.$route.query.prgmId;
-    // const context = {
-    //   key: "create",
-    //   prgmId: myPrgmId,
-    //   defaultData: defaultData,
-    // };
-    // this.$store.dispatch("chkOpenTabList", context);
-    // this.chkOpenTabList(context)
+    const context = {
+      key: "create",
+      prgmId: myPrgmId,
+      defaultData: defaultData,
+    };
+    this.$store.dispatch("chkOpenTabList", context);
   },
   mounted() {
     this.init();
diff --git a/store/index.js b/store/index.js
index 73ccb5e..fafbeab 100644
--- a/store/index.js
+++ b/store/index.js
@@ -513,7 +513,7 @@ export const actions = {
 				//commit("pageInit", {});
 				break;
 			case 'create':
-				console.log("---------DEBUGmyPrgmId:", myPrgmId);
+				// console.log("---------DEBUGmyPrgmId:", myPrgmId);
 				if (!list.some(it => it === myPrgmId)) {
 					// console.log("클릭 한 메뉴가 기존 목록에 없다 => 새로 push"); // & 초기화 세팅
 					localStorage.setItem('pageData', JSON.stringify(state.pageData));
-- 
2.50.1.windows.1