From 49a9f9e90b8558a9979926ae432502b307b0d149 Mon Sep 17 00:00:00 2001 From: Leeminha Date: Tue, 8 Nov 2022 18:40:30 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EC=9D=B4=EC=A0=84=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/modules/sysMgt/router/index.js | 2 +- .../src/modules/sysMgt/views/BatchDetail.vue | 54 +++++++++++-------- .../src/modules/sysMgt/views/BatchList.vue | 20 +++++-- frontend/src/router.js | 2 +- 4 files changed, 48 insertions(+), 30 deletions(-) diff --git a/frontend/src/modules/sysMgt/router/index.js b/frontend/src/modules/sysMgt/router/index.js index 9d58d97..126bcf0 100644 --- a/frontend/src/modules/sysMgt/router/index.js +++ b/frontend/src/modules/sysMgt/router/index.js @@ -38,7 +38,7 @@ export default [ meta: { public: false } }, { - path: '/sysMgt/batchDetail', + path: '/sysMgt/batchDetail/:batchId', component: BatchDetail, name: 'batchDetail', meta: { public: false } diff --git a/frontend/src/modules/sysMgt/views/BatchDetail.vue b/frontend/src/modules/sysMgt/views/BatchDetail.vue index 4ffdb61..4e3e009 100644 --- a/frontend/src/modules/sysMgt/views/BatchDetail.vue +++ b/frontend/src/modules/sysMgt/views/BatchDetail.vue @@ -9,7 +9,7 @@

- +

@@ -121,6 +121,7 @@ export default { pageType: 'CALC', batchId : this.$route.params.batchId, + batchNm : this.$route.params.batchNm, //상태조회 sttusCd: '', @@ -167,21 +168,30 @@ export default { created(){ this.setPeriodDay(0); this.setCodeData(); - if(this.$route.params.batchId != null){ - console.log("스토어저장") - this.$store.commit('dataStore/updateDataStore', this.$route.params.batchId); - } else { - var batchId2 = this.$store.getters['dataStore/getDataStore']; - this.batchId = batchId2; - } + // if(this.$route.params.batchId != null){ + // this.$store.commit('dataStore/updateDataStore', this.$route.params.batchId); + // } else { + // var batchId2 = this.$store.getters['dataStore/getDataStore']; + // this.batchId = batchId2; + // } }, destroyed() { - this.$store.commit('dataStore/updateDataStore', ''); + // this.$store.commit('dataStore/updateDataStore', ''); + this.$store.commit('searchcondition/updateSearchCondition', { + page: 1, + perPage: 50, + params: { + startDt: '', + endDt: '' + } + }); }, mounted(){ let page = 1; // 페이지 정보 및 검색 조건 const getCondition = this.$store.getters['searchcondition/getSearchCondition']; + + // store에 저장된 페이지 정보 및 검색 조건을 불러오기 let isKeep = false; if (getCondition) { this.grid.pagePerRows = getCondition.perPage; @@ -191,31 +201,29 @@ export default { } this.search(isKeep); }, - beforeRouteLeave(to, from, next) { + // beforeRouteLeave(to, from, next) { - const getP = this.$refs.table.getPagination(); - this.$store.commit('searchcondition/updateSearchCondition', { - page: getP._currentPage, - perPage: this.perPageCnt, - params: this.grid.params - }); - // 라우트 하기전 실행 - next(); - }, + // const getP = this.$refs.table.getPagination(); + // this.$store.commit('searchcondition/updateSearchCondition', { + // page: getP._currentPage, + // perPage: this.perPageCnt, + // params: this.grid.params + // }); + // // 라우트 하기전 실행 + // next(); + // }, methods: { search: function (isKeep) { - this.$refs.table.search(this.grid.params, isKeep); - + this.grid.params = { startDt: moment(this.startDate).format('YYYYMMDD'), endDt: moment(this.endDate).format('YYYYMMDD'), batchId: this.batchId, sttusCd: this.sttusCd } - this.$refs.table.search(this.grid.params, isKeep); - this.sendStoreData(); + //this.sendStoreData(); }, changePerPage: function () { // 페이지당 조회할 개수 this.grid.pagePerRows = this.perPageCnt; diff --git a/frontend/src/modules/sysMgt/views/BatchList.vue b/frontend/src/modules/sysMgt/views/BatchList.vue index 70ad2f2..4f83b9f 100644 --- a/frontend/src/modules/sysMgt/views/BatchList.vue +++ b/frontend/src/modules/sysMgt/views/BatchList.vue @@ -69,9 +69,9 @@ export default { {name: 'batchId', header:'배치ID', align:'center', width:'8%'}, {name: 'batchCycle', header:'실행일자',align:'center', width:'8%'}, {name: 'batchTime', header:'실행시간',align:'center', width:'7%'}, - {name: 'regDt', header:'배치 수행시간',align:'center', width:'20%'}, - {name: 'sttusCd', header:'상태',align:'center', width:'5%'}, - {name: 'errMsg', header:'메시지',align:'left', width:'30%'} + {name: 'regDt', header:'배치 수행시간',align:'center', width:'14%'}, + {name: 'sttusCd', header:'상태',align:'center', width:'10%'}, + {name: 'errMsg', header:'메시지',align:'left', width:'36%'} ] } }; @@ -81,7 +81,17 @@ export default { }, created(){ const getCondition = this.$store.getters['searchcondition/getSearchCondition']; - + }, + destroyed() { + // this.$store.commit('dataStore/updateDataStore', ''); + this.$store.commit('searchcondition/updateSearchCondition', { + page: 1, + perPage: 50, + params: { + startDt: '', + endDt: '' + } + }); }, mounted(){ let page = 1; @@ -103,7 +113,7 @@ export default { }, batchDetail(props){ this.row.batchId = props.batchId; - this.$router.push({name: 'batchDetail', params: this.row}); + this.$router.push({path: `/sysMgt/batchDetail/${props.batchId}`, params: this.row}); }, sendStoreData: function () { const getP = this.$refs.table.getPagination(); diff --git a/frontend/src/router.js b/frontend/src/router.js index 1582cdf..36bcd24 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -176,7 +176,7 @@ router.beforeEach((to, from, next) => { nextUrl == '/sysMgt/authAdd' || nextUrl == '/sysMgt/authModify' || nextUrl == '/sysMgt/authModify' || - nextUrl == '/sysMgt/batchDetail' + nextUrl.indexOf('/sysMgt/batchDetail') > -1 ) { for (var i = 0; i < menuUrls.length; i++) { if (menuUrls[i] == '/sysMgt/authList') {