From b0e41615233213f882d003afda468424fe4d3e4a Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Thu, 28 Apr 2022 15:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/course/Curriculum.vue | 5 +++-- src/views/course/contentSettings.vue | 2 +- src/views/customer/AddCustomer.vue | 2 +- src/views/customer/customer.vue | 5 +++-- src/views/order/Order.vue | 5 +++-- src/views/serve/Configure.vue | 5 +++-- src/views/serve/projectAdd.vue | 2 +- src/views/serve/projectList.vue | 10 ++++++++-- src/views/system/log.vue | 2 ++ src/views/user/User.vue | 3 ++- 10 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/views/course/Curriculum.vue b/src/views/course/Curriculum.vue index 03ed1c9..d69542c 100644 --- a/src/views/course/Curriculum.vue +++ b/src/views/course/Curriculum.vue @@ -135,9 +135,9 @@ export default { curriculumType: "", curriculumName: "" }, - pageNo: 1, + pageNo: +this.$route.query.page || 1, pageSize: 10, - totals: 1, + totals: 0, subjectList: [], // 学科类别 ProfessionalClassList: [], // 专业类 ProfessionalList: [], // 专业 @@ -284,6 +284,7 @@ export default { // 处理页码切换 handleCurrentChange(val) { this.pageNo = val; + this.$router.push(`curriculum?page=${val}`) this.getData(); }, // 课程名称条件搜索 diff --git a/src/views/course/contentSettings.vue b/src/views/course/contentSettings.vue index 1956535..9e7714f 100644 --- a/src/views/course/contentSettings.vue +++ b/src/views/course/contentSettings.vue @@ -293,7 +293,7 @@ export default { if (this.previewing) { this.closeIframe(); } else { - this.$router.push("/curriculum"); + this.$router.back() } }, iframeOnload() { diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue index fe94a75..fc7173f 100644 --- a/src/views/customer/AddCustomer.vue +++ b/src/views/customer/AddCustomer.vue @@ -649,7 +649,7 @@ export default { }, goback(){ - this.$router.go(-1) + this.$router.back() } } }; diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue index 5bf63c5..db2c7b6 100644 --- a/src/views/customer/customer.vue +++ b/src/views/customer/customer.vue @@ -115,9 +115,9 @@ export default { multipleSelection: [], provinceList: [], cityList: [], - page: 1, + page: +this.$route.query.page || 1, pageSize: 10, - total: 1, + total: 0, ruleIds: [] }; }, @@ -237,6 +237,7 @@ export default { }, handleCurrentChange(val) { this.page = val + this.$router.push(`customer?page=${val}`) this.getData() }, resetPassword(row){ diff --git a/src/views/order/Order.vue b/src/views/order/Order.vue index dfa766a..688530c 100644 --- a/src/views/order/Order.vue +++ b/src/views/order/Order.vue @@ -155,9 +155,9 @@ export default { name: "已取消", value: 2 }], - pageNo: 1, + pageNo: +this.$route.query.page || 1, pageSize: 10, - totals: 1, + totals: 0, searchTimer: null }; }, @@ -310,6 +310,7 @@ export default { }, handleCurrentChange(val) { this.pageNo = val; + this.$router.push(`order?page=${val}`) this.getData(); }, // 选择客户触发 diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue index 5f58d50..0f43830 100644 --- a/src/views/serve/Configure.vue +++ b/src/views/serve/Configure.vue @@ -101,7 +101,7 @@ export default { systemSearch: "", searchTimer: null, systemData: [], - totals: 1, + totals: 0, systemBelongList: [ { label: "外部产品", @@ -134,7 +134,7 @@ export default { 0: '运行中', 1: '默认' }, - pageNo: 1, + pageNo: +this.$route.query.page || 1, pageSize: 10 }; }, @@ -170,6 +170,7 @@ export default { }, handleCurrentChange(val) { this.pageNo = val; + this.$router.push(`configure?page=${val}`) this.getData(); }, edit(row) { diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue index c898aca..7aa55e1 100644 --- a/src/views/serve/projectAdd.vue +++ b/src/views/serve/projectAdd.vue @@ -747,7 +747,7 @@ export default { }, // 返回列表 toList() { - this.$router.push(`/projectList?systemId=${this.$route.query.systemId}&show=${this.isDetails}&founder=${this.founder}&name=${this.$route.query.name}`); + this.$router.back() }, // 返回 back() { diff --git a/src/views/serve/projectList.vue b/src/views/serve/projectList.vue index e2f510b..e86da4d 100644 --- a/src/views/serve/projectList.vue +++ b/src/views/serve/projectList.vue @@ -197,7 +197,7 @@ export default { 0: '草稿箱', 1: '已发布' }, - page: 1, + page: +this.$route.query.page || 1, pageSize: 10, multipleSelection: [], copyVisible: false, @@ -215,7 +215,6 @@ export default { } }, mounted() { - console.log(this.$route.query.founder) if (this.$route.query.founder && this.$route.query.founder != 'undefined'){ this.queryData.founder = +this.$route.query.founder }else{ @@ -245,6 +244,13 @@ export default { }, handleCurrentChange(val) { // 切换页码 this.page = val; + this.$router.push({ + path: 'projectList', + query: { + ...this.$route.query, + page: val + } + }) this.getData(); }, add() { // 新增项目 diff --git a/src/views/system/log.vue b/src/views/system/log.vue index 7d6e226..49770e6 100644 --- a/src/views/system/log.vue +++ b/src/views/system/log.vue @@ -58,6 +58,7 @@ export default { this.searchTimer = setTimeout(() => { const list = this.listData this.listData = val ? list.filter(e => e.name.includes(val)) : this.listDataAll + this.total = this.listData.length }, 500); } }, @@ -75,6 +76,7 @@ export default { }) this.listDataAll = res.logManagementListVo this.listData = res.logManagementListVo + this.total = this.listData.length }).catch(res => {}) }, currentChange(val) { diff --git a/src/views/user/User.vue b/src/views/user/User.vue index 9e5bccb..69a47c1 100644 --- a/src/views/user/User.vue +++ b/src/views/user/User.vue @@ -209,7 +209,7 @@ export default { label: '数据前瞻' }, ], - page: 1, + page: +this.$route.query.page || 1, pageSize: 10, totals: 0, multipleSelection: [], @@ -326,6 +326,7 @@ export default { }, currentChange(val) { this.page = val + this.$router.push(`user?page=${val}`) this.getData() }, toDetail(row, detail){