Merge pull request 'change style editor link button match desgin' (#110) from dev-manhph1-figbug into dev

Reviewed-on: #110

assets/scss/common/editor.scss

@@ -83,7 +83,7 @@
 
 .toastui-editor-dark .toastui-editor-popup,
 .toastui-editor-dark .toastui-editor-context-menu {
-  background-color: #121212;
+  background-color: #212224;
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
   border-color: #494c56;
 }
@@ -92,8 +92,25 @@
   background-color: #36383f;
 }
 
+.toastui-editor-dark .toastui-editor-popup-add-heading h1,
+.toastui-editor-dark .toastui-editor-popup-add-heading h2,
+.toastui-editor-dark .toastui-editor-popup-add-heading h3,
+.toastui-editor-dark .toastui-editor-popup-add-heading h4,
+.toastui-editor-dark .toastui-editor-popup-add-heading h5,
+.toastui-editor-dark .toastui-editor-popup-add-heading h6 {
+  color: #eee;
+}
+
+.toastui-editor-popup-body label,
+.toastui-editor-popup-body button,
+.toastui-editor-popup-body .tab-item,
+.toastui-editor-popup-body span,
+.toastui-editor-popup-body input {
+    font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important;
+}
+
 .toastui-editor-dark .toastui-editor-popup-body label {
-  color: #9a9da3;
+  color: rgba(255, 255, 255, 0.85098);
 }
 
 .toastui-editor-dark .toastui-editor-popup-body input[type='text'] {
@@ -107,7 +124,7 @@
 }
 
 .toastui-editor-dark .toastui-editor-popup-body input[type='text'].disabled {
-  color: #969aa5;
+  color:  rgba(255, 255, 255, 0.85098);
   border-color: #303238;
   background-color: rgba(48, 50, 56, 0.4);
 }
@@ -126,6 +143,10 @@
   border-bottom-color: #67ccff;
 }
 
+.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-file-name.has-file {
+  color:#eee;
+}
+
 .toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-name {
   border-color: #303238;
   color: #eee;
@@ -141,24 +162,54 @@
   border-color: #494c56;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button {
-  color: #eee;
-  border-color: #303238;
-  background-color: #232428;
+.toastui-editor-defaultUI .toastui-editor-button-container button{
+  border-radius: 6px;
+  height: 32px;
+  font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif);
+  font-size: var(--desktop-normal-font-size, 14px);
+  font-weight: 400;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button:hover {
-  border-color: #494c56;
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-close-button{
+  background: #FFFFFF;
+  color: rgba(0, 0, 0, 0.87843);
+  border: 1px solid #D9D9D9;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button {
-  color: #121212;
-  background-color: #67ccff;
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-close-button:hover {
+  border-color: #D9D9D9;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button:hover {
-  color: #121212;
-  background-color: #32baff;
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-close-button {
+  background: #212224;
+  color: rgba(255, 255, 255, 0.85098);
+  border: 1px solid #424242;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-close-button:hover {
+  border-color: #424242;
+}
+
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-ok-button{
+  background: #1677FF;
+  border-color: #1677FF;
+  color: #FFF;
+}
+
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-ok-button:hover{
+  color: #FFF;
+  background-color: #1677FF;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-ok-button {
+  background: #1668DC;
+  border-color: #1668DC;
+  color: #212224;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-ok-button:hover {
+  color: #212224;
+  background-color: #1668DC;
 }
 
 .toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell {

assets/scss/common/input.scss

@@ -1,5 +1,5 @@
 .v-select__custom {
-  padding: 0.125rem;
+  // padding: 0.125rem;
 
   &.v-text-field.v-text-field--solo:not(.v-text-field--solo-flat)>.v-input__control>.v-input__slot {
     box-shadow: none;

assets/scss/common/pagination.scss

@@ -22,6 +22,10 @@
       background-color: transparent !important;
     }
 
+    .ant-pagination-item-ellipsis {
+      color: map-deep-get($config, #{$theme}, "paging-text") !important;
+    }
+
     .ant-pagination-item,
     .ant-pagination-prev,
     .ant-pagination-next {

assets/scss/datepicker.scss

@@ -70,6 +70,15 @@
       .v-icon {
         color: map-deep-get($config, #{$theme}, "v-icon-chevron-down") !important;
       }
+
+      .v-select .v-input__slot {
+        border-radius: 8px !important;
+        border: solid 1px map-deep-get($config, #{$theme}, "tui-datepicker-border-color") !important;
+      }
+    
+      .v-select fieldset {
+        border: none;
+      } 
     }
 
     .v-input__custom {

components/Pagination.vue

@@ -69,7 +69,7 @@ export default {
 		},
 		limit: {
 			type: Number,
-			default: 0,
+			default: 10,
 		},
 		itemsPerPageArray: {
 			type: Array,

components/common/AdminMenu.vue

@@ -43,16 +43,16 @@
 			<!--        </div>-->
 			<!--      </v-list-item>-->
 			<v-list-item>
-				<v-btn @click="pswdChange" small elevation="0">
+				<v-list-item-title @click="pswdChange" class="body-2">
 					<v-icon class="mr-1" size="20">mdi-account-outline</v-icon>
 					<span class="body-2">비밀번호 변경</span>
-				</v-btn>
+				</v-list-item-title>
 			</v-list-item>
 			<v-list-item>
-				<v-btn @click="logout" small elevation="0">
+				<v-list-item-title @click="logout" class="body-2">
 					<v-icon class="mr-1" size="20">mdi-logout</v-icon>
 					<span class="body-2">로그아웃</span>
-				</v-btn>
+				</v-list-item-title>
 			</v-list-item>
 		</v-list>
 	</v-menu>
@@ -105,7 +105,7 @@ export default {
 			});
 		},
 		pswdChange() {
-			this.$parent.$parent.$parent.$parent.$refs['changePswdPop'].dialog = true;
+			this.$parent.$parent.$parent.$refs['changePswdPop'].dialog = true;
 		},
 	},
 	mounted() {},

components/common/DatepickerTimeSelectBox.vue

@@ -549,5 +549,10 @@ export default {
       color: #000 !important;
     }
   }
+
+	.datepicker-timeselect .v-input__slot {
+		margin: 3px;
+	}
+
 }
 </style>

components/common/Grid.vue

@@ -173,8 +173,9 @@ export default {
 				this.gridScrollTop = e.target.scrollTop;
 				this.gridScrollLeft = e.target.scrollLeft;
 			});
-
-			if (!(this.scrollBody.scrollHeight > this.scrollBody.clientHeight)) {
+			if (this.scrollBody.scrollHeight > this.scrollBody.clientHeight) {
+				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.remove('tui-grid-no-scroll-y');
+			} else {
 				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.add('tui-grid-no-scroll-y');
 			}
 		}

components/common/Pagination.vue

@@ -34,7 +34,7 @@ export default {
 		},
 		itemsPerPageArray: {
 			type: Array,
-			default: () => [20, 50, 100],
+			default: () => [10, 20, 50],
 		},
 	},
 	data() {

components/common/modal/ChangePswdPop.vue

@@ -104,7 +104,6 @@ export default {
 	},
 	watch: {
 		async chkDialog(val) {
-			//console.log("watch : ", val)
 			if (val) {
 				this.openDialog();
 

components/common/modal/EqpmBaseInfoPop.vue

@@ -23,7 +23,7 @@
 					<span class="custom-title-4">{{ option.modalTitle }}</span>
 					<a-button icon="close" type="text" @click="dialogOpenCloseEvent(dialog)"></a-button>
 				</v-card-title>
-				<div class="pa-6 pt-0">
+				<div class="pa-6 pt-0 pb-3">
 					<v-row align="center">
 						<v-col :cols="5">
 							<component :is="'SelectBox'" ref="SelectBox1" :labelCols="12" :textCols="12"
@@ -43,7 +43,7 @@
 										물리량명
 									</label>
 								</v-col>
-								<v-col :cols="9"> <v-text-field append-icon="" class="v-input__custom" outlined
+								<v-col :cols="10" class="pr-2"> <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 -->
@@ -51,8 +51,7 @@
 
 
 										</template></v-text-field></v-col>
-								<v-spacer></v-spacer>
-								<v-col cols="3" class="text-right">
+								<v-col cols="2" class="text-right">
 									<a-button icon="search" type="primary" @click="search()"
 										class="search-button">조회</a-button>
 
@@ -63,9 +62,9 @@
 
 				</div>
 				<!-- <div :style="'height: calc(50vh)'"> -->
-				<div :style="'height: 429px;'">
+				<div :style="{ height: 'calc(100% - 60px)' }">
 					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
-					<div ref="modalGridParent" class="h100 px-6 py-4">
+					<div ref="modalGridParent" class="px-6 py-4">
 						<component :is="loadGrid && dialog ? 'Grid' : null" :gridName="gridName"
 							:dataPath="searchParam.modalDataEqpmBaseInfoPop.eqpmBaseInfoPop"
 							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" @dblClick="setUpdate($event)" />

components/common/modal/EvtObjPop.vue

@@ -53,7 +53,7 @@
 					</v-col>
 				</v-row>
 				<!-- <div :style="'height: calc(65vh)'"> -->
-				<div :style="'height: 600px'" class="px-5">
+				<div :style="'height: 620px'" class="px-5">
 					<!-- <div :style="{ height: 'calc(100% - 213px)' }"> -->
 					<div ref="modalGridParent" class="h100 py-3">
 						<!-- :is="loadGrid && dialog ? 'Grid' : null" -->

components/pages/ems/EccInfo/EccAddInfoTab.vue

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

components/pages/ems/EccInfo/EccIaoTab.vue

@@ -107,7 +107,7 @@ export default {
 				this.detailList[4].class = 'pl-4 mt-2';
 				this.detailList[3].class = 'd-block';
 				this.detailList[2].class = 'd-none';
-				this.detailList[1].class = 'd-block pl-4 mt-1 pb-0';
+				this.detailList[1].class = 'd-block pl-4 mt-3-new pb-0';
 			}
 		},
 	},
@@ -503,5 +503,10 @@ const myDetail = [
 		.tui-grid-layer-state{
 			top: 40px !important;
 		}
+
+		.mt-3-new{
+			margin-top: 3px;
+		}
+
 	}
 </style>

components/pages/ems/ReadObjInfo/ReadObjAddInfoTab.vue

@@ -102,7 +102,7 @@ export default {
 			this.gridInit();
 		},
 		gridInit() {
-			const gridHeight = this.$refs.gridParent.offsetHeight - 31;
+			const gridHeight = this.$refs.gridParent.offsetHeight - 37;
 
 			const myOptions = {
 				columnOptions: {
@@ -113,8 +113,8 @@ export default {
 				header: {
 					height: 28,
 				},
-				rowHeight: 36,
-				minRowHeight: 36,
+				rowHeight: 37,
+				minRowHeight: 37,
 				selectionUnit: 'row',
 				editingEvent: 'click',
 			};
@@ -122,7 +122,6 @@ export default {
 				gridKey: this.gridName,
 				value: myOptions,
 			});
-
 			const _this = this;
 			let useFgSelectList = [];
 			this.pageData.useFgList.forEach(item => {
@@ -442,12 +441,8 @@ export default {
 </script>
 <style lang="scss" scoped >
 ::v-deep {
-	.tui-grid-layer-state {
-		top: 40px !important;
-	}
-	
 	.tui-grid-cell-content-editor {
-		height: 36px !important;
+		height: 37px !important;
 	}
 
 }

layouts/default.vue

@@ -61,7 +61,9 @@
                 </v-list-item>
               </v-list>
             </v-menu>
-            <a-button id="removeBm" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
+            <a-button id="removeBm" :style="{
+                    display: 'flex',
+                    alignItems: 'center'}" class="btn-header" @click="removeBookMark" v-if="bookmarkBtn == 1">
               <span class="material-icons" style="font-size: 17px">star</span>
             </a-button>
             <a-button id="addBm" class="btn-header" :style="{
@@ -175,6 +177,8 @@ import ThemeSwitch from "@/components/common/ThemeSwitch";
 import AdminMenu from "@/components/common/AdminMenu";
 import FadeLoader from "vue-spinner/src/FadeLoader.vue";
 import ChangePswdPop from "~/components/common/modal/ChangePswdPop";
+import { notification } from 'ant-design-vue';
+
 
 export default {
   components: {
@@ -231,6 +235,7 @@ export default {
       drawer: (state) => state.drawer,
       userInfo: (state) => state.userInfo,
       pageData: "pageData",
+      openTabList: (state) => state.openTabList 
     }),
     activeTabs() {
       if (this.routerTabInstance) {
@@ -273,6 +278,11 @@ export default {
 				var _this = this;
 				const nv = newVal[0];
 				const ov = oldVal[0];
+        // Check open tab at menu
+        if (this.openTabList.length > 7 && !this.openTabList.some(tab => tab.to === to.fullPath)) {
+          return;
+        }
+        
 				if (nv !== ov) {
 					if (!nv) {
 						// 중복클릭 시 발생 상황 기존 값을 다시 넣어줌
@@ -393,6 +403,24 @@ export default {
 
     this.$router.beforeEach((to, from, next) => {
       _this.isLoading = true;
+     
+      const tabList = this.openTabList;
+      const targetPrgmId = to.query.prgmId;
+      const currentPrgmId = from.query.prgmId;
+
+      const isTabAlreadyOpen = tabList.includes(targetPrgmId);
+      const isSamePage = to.fullPath === from.fullPath || targetPrgmId === currentPrgmId;
+
+      if (tabList.length >= 7 && !isTabAlreadyOpen && !isSamePage) {  
+        notification.error({
+          message: 'Error',
+          description: '탭을 7개 이상 열 수 없습니다.',
+        });
+        next(false);
+        return;
+      }
+
+
       // console.log('$router.beforeEach...');
       // console.log('state : ', _this.$store.state)
       // console.log('activeActionCnt : ', _this.$store.state.activeActionCnt)

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

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

pages/comm/base/BatchLogMngPage.vue

@@ -117,8 +117,8 @@ export default {
 			// rowGridOrigin: [],
 			detailList: myDetail,
 			itemsPerPage: 20,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};
@@ -143,7 +143,7 @@ export default {
 		chkIsFind(val) {
 			if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
 		},
 		chkExecRsltCd() {
@@ -249,14 +249,16 @@ export default {
 
 			this.loadGrid = true;
 		},
-		async search() {
-			await this.getRowGridData();
+		async search(isPaging) {
+			await this.getRowGridData(isPaging);
 			await this.setPageData({
 				isFind: false,
 			});
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			// this.setGridData({
 			// 	gridKey: this.gridName,
 			// 	value: [],
@@ -369,7 +371,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };

pages/comm/base/NoticeMngPage.vue

@@ -295,8 +295,8 @@ export default {
 			selectedRowKey: null,
 			selectedRowData: null,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 			writeActionData: {
@@ -426,7 +426,7 @@ export default {
 			}
 		},
 		search() {
-			this.getGridData();
+			this.getGridData(false);
 		},
 		gridInit() {
 			const gridHeight = this.$refs.contents.offsetHeight - 120;
@@ -498,18 +498,18 @@ export default {
 			});
 			this.getGridData();
 		},
-		async getGridData() {
+		async getGridData(isPaging) {
 			var params = {
 				bordNo: 'BORD0001',
 				limit: this.limit,
 				page: this.page,
 				offset: (this.page - 1) * this.limit, // MariaDB Query에서 직접 계산이 안됨
 			};
-
-			this.loadGrid = false;
-
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			const res = await this.postApiReturn({
-				apiKey: 'selectPostPage',
+				apiKey: 'selectPostData',
 				resKey: 'postPage',
 				sendParam: params,
 			});
@@ -1059,7 +1059,8 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			// this.search();
+			this.getGridData(true);
 		},
 	},
 };

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/comm/base/PrgmMngPage_Pagination.vue

@@ -134,8 +134,8 @@ export default {
 			// rowGridOrigin: [],
 			detailList: myDetail,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

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/EnrgReadPlaceMngPage.vue

@@ -63,7 +63,7 @@
 						<v-tabs-items v-model="tab" style="height: calc(100% - 65px);" class="pt-6 py-2">
 							<v-tab-item v-for="(item, idx) in items" :key="item.id">
 								<component v-if="item.id == 'readPlcBaseInfoTab'" :is="'Form'" :parentPrgmId="myPrgmId"
-									:detailList="f" :bindingData="gridName"
+									:detailList="detailList" :bindingData="gridName"
 									@gridEditingFinish="gridEditingFinish" />
 								<ReadPlcAddInfoTab v-if="item.id == 'readPlcAddInfoTab'" :parentPrgmId="myPrgmId"
 									:innerTabGridInfo="{ tab, idx }" />
@@ -923,51 +923,6 @@ const defaultData = {
 	},
 };
 
-const sampleData = [
-	{
-		readPlcNm: '서울 본사',
-		plcKind: '본사',
-		useFg: '사용',
-		_children: [
-			{
-				readPlcNm: '서울 본사 - 1층',
-				plcKind: '층',
-				useFg: '사용',
-			},
-			{
-				readPlcNm: '서울 본사 - 2층',
-				plcKind: '층',
-				useFg: '미사용',
-			},
-		],
-	},
-	{
-		readPlcNm: '부산 지사',
-		plcKind: '지사',
-		useFg: '사용',
-		_children: [
-			{
-				readPlcNm: '부산 지사 - A동',
-				plcKind: '건물',
-				useFg: '사용',
-				_children: [
-					{
-						readPlcNm: '부산 지사 - A동 1층',
-						plcKind: '층',
-						useFg: '사용',
-					},
-				],
-			},
-		],
-	},
-	{
-		readPlcNm: '대전 창고',
-		plcKind: '창고',
-		useFg: '미사용',
-	},
-];
-
-
 const myDetail = [
 	{
 		type: 'InputText',

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/PastRsltDataReadPage.vue

@@ -12,7 +12,7 @@
 						</v-col>
 						<v-col :cols="3">
 							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								class="no-gutters" customClass="select-large" />
+								class="no-gutters" customClass="select-large pa-0" />
 						</v-col>
 						<v-col :cols="3">
 							<!-- 대상일 -->
@@ -30,8 +30,8 @@
 		</v-row>
 		<v-row ref="contents">
 			<v-col :cols="12" class="h100">
-				<v-card class="px-5 py-5">
-					<div ref="gridParent" class="px-5" style="height:calc(100% - 40px)">
+				<v-card class="pa-5 pb-0">
+					<div ref="gridParent" class="px-5" style="height:calc(100% - 70px)">
 						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 							:parentPrgmId="myPrgmId" />
 					</div>
@@ -117,8 +117,8 @@ export default {
 				formFg: false,
 			},
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};
@@ -144,17 +144,17 @@ export default {
 		chkIsFind(val) {
 			if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
 		},
 		chkTagId(val) {
 			if (this.initFlag && val != null) {
-				this.search();
+				this.search(false);
 			}
 		},
 		chkTagNm() {
 			if (this.initFlag) {
-				this.search();
+				this.search(false);
 			}
 		},
 		chkReadPlcId() {
@@ -193,13 +193,13 @@ export default {
 			postApiReturn: 'modules/list/postApiReturn',
 			chkOpenTabList: 'chkOpenTabList',
 		}),
-		async search() {
+		async search(isPaging) {
 			// this.gridInit();
 			if (this.initFlag) {
 				if (this.pageData.tagId == '' || this.pageData.tagId == null) {
 					alert('TAG를 선택해 주세요');
 				} else {
-					this.getRowGridData();
+					this.getRowGridData(isPaging);
 				}
 			}
 			this.setPageData({
@@ -289,9 +289,10 @@ export default {
 
 			this.loadGrid = true;
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
-
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			let res = [];
 			let res2 = [];
 			let yearQuarterData = [];
@@ -476,7 +477,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };

pages/ems/base/ReadResultCloseMngPage.vue

@@ -167,8 +167,8 @@ export default {
       gridName: "rowGrid",
       loadGrid: false,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
     };
@@ -198,7 +198,7 @@ export default {
     chkIsFind(val) {
       if (val) {
 				this.page = 1;
-				this.search();
+				this.search(false);
 			}
     },
     chkBlocId() {
@@ -265,12 +265,13 @@ export default {
         value: myColumns,
       });
     },
-    async search() {
-      await this.getRowGridData();
+    async search(isPaging) {
+      await this.getRowGridData(isPaging);
     },
-    async getRowGridData() {
-      this.loadGrid = false;
-
+    async getRowGridData(isPaging) {
+      if(!isPaging) {
+        this.loadGrid = false;
+      }
       if (
         this.pageData.blocMstrList.length > 0 &&
         this.pageData.commCdList.length > 0 &&
@@ -356,7 +357,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
   },
 };
@@ -465,3 +466,10 @@ const myColumns = [
   },
 ];
 </script>
+<style lang="scss" scoped>
+	::v-deep{
+		.tui-grid-layer-state{
+			top: 40px !important;
+		}
+	}
+</style>

pages/ems/base/TagMngPage_Pagination.vue

@@ -153,8 +153,8 @@ export default {
 			detailList: myDetail,
 			alrmFg: null,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

pages/ems/effc/DataSetMngPage.vue

@@ -783,5 +783,8 @@ const dataPathDataExample = getPathDataExample({
   .v-window {
     overflow: visible;
   }
+  .ant-checkbox-inner {
+    padding: 8px;
+  }
 }
 </style>

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -159,8 +159,8 @@ export default {
 			eqpmGdIdxFlag: false,
 			fabFlag: false,
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			routeData: {},
 			totalCount: 0,
@@ -211,7 +211,7 @@ export default {
 			}
 		},
 		chkIsFind(val) {
-			if (val) this.search();
+			if (val) this.search(false);
 		},
 		fabId(val) { },
 		fabNm(val) { },
@@ -371,8 +371,8 @@ export default {
 			}
 			await this.gridInit();
 		},
-		async search() {
-			await this.getRowGridData();
+		async search(isPaging) {
+			await this.getRowGridData(isPaging);
 			this.setPageData({
 				isFind: false,
 			});
@@ -561,12 +561,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				rowHeaders: [
-					{
-						type: 'rowNum',
-						align: 'right',
-					},
-				],
 				header: {
 					height: 37,
 				},
@@ -623,6 +617,7 @@ export default {
 				}
 			}
 			const myColumns = [
+				{ header: 'No.', name: 'rowSeq', align: 'right', width: 90 },
 				{
 					header: 'FAB',
 					name: 'fabNm',
@@ -725,9 +720,10 @@ export default {
 
 			this.getRowGridData();
 		},
-		async getRowGridData() {
-			this.loadGrid = false;
-
+		async getRowGridData(isPaging) {
+			if(!isPaging) {
+				this.loadGrid = false;
+			}
 			var res = await this.postApiReturn({
 				apiKey: 'selectEnrgEffcEqpmDetlMntr',
 				resKey: 'eqpmDetlData',
@@ -806,7 +802,7 @@ export default {
 			this.page = pageNum;
 			this.limit = limit;
 
-			this.search();
+			this.search(true);
 		},
 	},
 };

pages/ems/effc/EnrgUsePlanPage.vue

@@ -110,8 +110,8 @@ export default {
 			rowKey: null,
 			edtingFinishFlag: 'Y',
 			itemsPerPage: 10,
-			itemsPerPageArray: [10, 20, 30],
-			limit: 20,
+			itemsPerPageArray: [10, 20, 50],
+			limit: 10,
 			page: 1,
 			totalCount: 0,
 		};

plugins/gridUtility.js

@@ -327,6 +327,10 @@ export class NewCustomEditor {
 			} else {
 				el.checked = false;
 			}
+
+			divEl.style.position = 'relative';
+			divEl.style.top = rowKey === 0 ? '1px' : '2px';
+
 			el.addEventListener('change', (ev) => {
 				// console.log('props: %o', ev);
 				if (ev.target.checked) {
@@ -401,4 +405,4 @@ export class NewCustomEditor {
 		// }
 		this.el.select();
 	}
-}
+}

store/index.js

@@ -136,6 +136,10 @@ export const state = () => Object.assign({}, INIT_STATE);
 export const mutations = {
 	// 활성화 페이지 메뉴정보 set
 	setActiveMenuInfo(state, payload) {
+		const isTabAlreadyOpen = state.openTabList.includes(payload.prgmId);
+		if(state.openTabList.length >= 7 && !isTabAlreadyOpen) {
+			return;
+		} 
 		// console.log("=======================================================");
 		// console.log(
 		//   ">>>>>>>>>> ",

store/modules/list.js

@@ -514,7 +514,7 @@ const INIT_URL_STATE = {
 
 	// prgmId: "PRG0003" 공지사항
 	selectPostList: 'comm/base/NoticeMngCtr/selectPostList',
-	selectPostPage: 'comm/base/NoticeMngCtr/selectPostPage',
+	selectPostData: 'comm/base/NoticeMngCtr/selectPostData',
 	selectPostPageTotal: 'comm/base/NoticeMngCtr/selectPostPageTotal',
 	deletePostList: 'comm/base/NoticeMngCtr/deletePost',