diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue index c38d89e..337d667 100644 --- a/pages/comm/base/BatchLogMngPage.vue +++ b/pages/comm/base/BatchLogMngPage.vue @@ -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); }, }, }; diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index 97f8212..69af853 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -426,7 +426,7 @@ export default { } }, search() { - this.getGridData(); + this.getGridData(false); }, gridInit() { const gridHeight = this.$refs.contents.offsetHeight - 120; @@ -498,16 +498,16 @@ 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: 'selectPostData', resKey: 'postPage', @@ -1059,7 +1059,8 @@ export default { this.page = pageNum; this.limit = limit; - this.search(); + // this.search(); + this.getGridData(true); }, }, }; diff --git a/pages/ems/base/PastRsltDataReadPage.vue b/pages/ems/base/PastRsltDataReadPage.vue index 7798bd5..27769b4 100644 --- a/pages/ems/base/PastRsltDataReadPage.vue +++ b/pages/ems/base/PastRsltDataReadPage.vue @@ -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); }, }, }; diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue index 217ba8d..42d693c 100644 --- a/pages/ems/base/ReadResultCloseMngPage.vue +++ b/pages/ems/base/ReadResultCloseMngPage.vue @@ -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); }, }, }; diff --git a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue index f1f6e96..4a85f1e 100644 --- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue +++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue @@ -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, }); @@ -725,9 +725,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 +807,7 @@ export default { this.page = pageNum; this.limit = limit; - this.search(); + this.search(true); }, }, };