update code

Reviewed-on: #85

assets/scss/layout.scss

@@ -448,8 +448,8 @@
 
       .router-tab {
         .router-tab__header {
-          // background-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");
+          border-color: map-deep-get($config, #{$theme}, "router-header");
           height: 46px;
           z-index: 7;
           max-width: calc(100vw - 290px);

components/common/PastRsltDatePicker.vue

@@ -58,11 +58,6 @@ export default {
 			require: false,
 			default: false,
 		},
-		required: {
-			type: Boolean,
-			require: false,
-			default: false,
-		},
 		labelCols: {
 			type: Number,
 			require: false,

components/common/modal/EqpmSelectPop.vue

@@ -2,14 +2,17 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols" class="mr-2">
 			<label for="" class="search-box-label">
-				<v-icon v-if="iconShow" small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
+				<v-icon v-if="iconShow" small
+					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="textCols">
 			<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
 				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
-				:disabled="disabled || false" :placeholder="placeholder">
+				:disabled="disabled || false"
+				:placeholder="placeholder"
+				>
 				<template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
@@ -28,17 +31,17 @@
 					<v-row align="end">
 						<v-col :cols="3.5">
 							<!-- 설비그룹 -->
-							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01" :label="'설비그룹'"
+							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
-								:disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
+								:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
-								:iconShow="true" />
+								:labelCols="12" :textCols="12" :iconShow="true" />
 						</v-col>
 						<v-col>
 							<!-- FAB -->
-							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02" :label="'FAB'"
+							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
-								:labelCols="12" :multiple="true" :disabled="fabDisabled" @update:propsValue="selectValue02 = $event"
+								:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
-								:textCols="12" :iconShow="true" />
+								@update:propsValue="selectValue02 = $event" :textCols="12" :iconShow="true" />
 						</v-col>
-						<v-col>
+						<v-col >
 							<v-row>
 								<v-col :cols="12" class="py-0">
 									<label for="" class="search-box-label">
@@ -83,16 +86,15 @@
 				</div>
 
 				<div class="pa-5" style="height:calc(100% - 30px)">
-					<div ref="modalGridParent" :class="['h100', 'w100', isDarkMode ? 'dark-mode' : 'light-mode']">
+					<div ref="modalGridParent" class="h100 w100">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
-							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName" :parentPrgmId="parentPrgmId"
+							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
-							@getRowsData="getRowData" />
+							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
 					</div>
 				</div>
 
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
+					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="ant-btn-popup-default mr-2">닫기</a-button>
-						class="ant-btn-popup-default mr-2">닫기</a-button>
 					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
@@ -245,7 +247,6 @@ export default {
 					eqpmKindId: data.eqpmKindId,
 				}
 			},
-			isDarkMode: "isDarkMode",
 		}),
 		selectValue: {
 			get() {
@@ -399,6 +400,7 @@ export default {
 				header: {
 					height: 'auto',
 				},
+				// rowHeaders:[{ type: 'checkbox' }],
 				rowHeight: 'auto',
 			};
 			if (this.isMulti) {
@@ -406,6 +408,8 @@ export default {
 				myOptions['rowHeight'] = 'auto';
 			}
 
+
+
 			this.setModalGridOption({
 				modalKey: this.myModalKey,
 				gridKey: this.gridName,
@@ -459,6 +463,8 @@ export default {
 				modalDataKey: this.modalDataKey,
 				value: myColumns,
 			});
+
+
 			// this.getRowGridData();
 		},
 		async getRowGridData() {
@@ -582,35 +588,6 @@ 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;
-					}
-				}
-			}
-		}
-	}
 }
 
-@each $theme in dark, light {
-	@include theme($theme);
-
-	.#{$theme}-mode {
-		::v-deep {
-			.tui-grid-lside-area {
-				.tui-grid-table{
-					border-right: 1px solid map-deep-get($config,
-						#{$theme},
-						"tui-grid-border-vertical-color"
-					) !important;
-				}
-			}
-		}
-	}
-
-}
 </style>

components/pages/ems/EccInfo/EccAddInfoTab.vue

@@ -112,10 +112,10 @@ export default {
 				bodyHeight: gridHeight,
 				minBodyHeight: gridHeight,
 				header: {
-					height: 28,
+					height: 37,
 				},
-				rowHeight: 29,
+				rowHeight: 37,
-				minRowHeight: 29,
+				minRowHeight: 37,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};

layouts/default.vue

@@ -104,9 +104,7 @@
                   :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 }" 
@@ -144,12 +142,8 @@
               </v-navigation-drawer>
             </div>
 
-            <v-col :class="`${isDarkMode ? 'dark' : 'light'}`">
+            <v-col>
-              <router-tab ref="routerTab" 
+              <router-tab ref="routerTab" :tabs="treevieItems" :keep-last-tab="false" :contextmenu="false">
-                :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>
@@ -347,12 +341,6 @@ export default {
         //console.log("localPageData", this.pageData);
       },
     },
-    isDarkMode(){
-      this.loadingStackCnt = 1;
-      setTimeout(() => {
-        this.loadingStackCnt = 0;
-      }, 1000);
-    },
     // menuLink: {
     //   deep: true,
     //   handler() {
@@ -712,17 +700,4 @@ 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>

pages/comm/auth/RoleMngPage.vue

@@ -505,3 +505,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/comm/auth/UserRoleMngPage.vue

@@ -1086,3 +1086,10 @@ function sha512(str) {
 		.digest('hex');
 }
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style> 

pages/comm/base/PrgmMngPage.vue

@@ -522,3 +522,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style> 

pages/ems/base/EnrgCostCenterMngPage.vue

@@ -1029,3 +1029,10 @@ const myDetail = [
 	},
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/base/EquipmentMasterMngPage.vue

@@ -1005,3 +1005,10 @@ const dataPathDataExample = getPathDataExample({
 		field2: '2222',
 	});
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/base/ReadResultCloseMngPage.vue

@@ -129,20 +129,10 @@ let myPrgmId;
 export default {
   mixins: [mixinGlobal, resize],
   async asyncData(context) {
-    // console.log('----DEBUG-----ReadResultCloseMngPage--asyncData:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
+    const myState = context.store.state;
-    try{
+    myPrgmId = context.route.query.prgmId;
-      myPrgmId = context.route.query.prgmId;
+    await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
-      const myState = context.store.state;
+    myTitle = await myState.activeMenuInfo.menuNm;
-      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: () => {
@@ -216,21 +206,18 @@ export default {
       this.setPageData({ isFind: true });
     },
   },
-  beforeCreate() { 
+  async beforeCreate() {
-    // console.log('----DEBUG-----ReadResultCloseMngPage--beforeCreate:', Utility.setFormatDate(new Date(), "YYYYMMDD"));
     myPrgmId = this.$route.query.prgmId;
-    const context = {
+    await this.$store.dispatch("chkOpenTabList", {
       key: "create",
       prgmId: myPrgmId,
       defaultData: defaultData,
-    };
+    });
-    this.$store.dispatch("chkOpenTabList", context);
   },
   mounted() {
     this.init();
   },
-  created() { 
+  created() {},
-  },
   methods: {
     ...mapMutations({
       setPageData: "setPageData",
@@ -465,3 +452,10 @@ const myColumns = [
   },
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

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,

store/index.js

@@ -513,7 +513,6 @@ 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));