From baec2b14de042814f72ba0e5d8cdce4c1832127b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 28 Sep 2020 11:50:02 +0800 Subject: [PATCH] fix --- .../result/chart/componments/chart-bar-form/index.vue | 5 +++-- .../result/chart/componments/chart-form/index.vue | 11 ++++++++++- .../result/report/componments/query-form/index.vue | 4 +++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/views/modules/result/chart/componments/chart-bar-form/index.vue b/src/views/modules/result/chart/componments/chart-bar-form/index.vue index 8055209..1ed68bb 100644 --- a/src/views/modules/result/chart/componments/chart-bar-form/index.vue +++ b/src/views/modules/result/chart/componments/chart-bar-form/index.vue @@ -40,9 +40,10 @@ jump: function (e) { if (this.clickAble) { // 目前逻辑一致 跳转相同 - this.$router.push({name: 'resultDistribution'}, () => { + // 先不跳转 可能误操作 + /* this.$router.push({name: 'resultDistribution'}, () => { this.mainTabsActiveName = this.$route.name - }) + }) */ } else { this.clickAble = true } diff --git a/src/views/modules/result/chart/componments/chart-form/index.vue b/src/views/modules/result/chart/componments/chart-form/index.vue index 234dd65..0a203c0 100644 --- a/src/views/modules/result/chart/componments/chart-form/index.vue +++ b/src/views/modules/result/chart/componments/chart-form/index.vue @@ -68,7 +68,16 @@ }, chartEvents: { click: (e) => { // resultDistribution - this.$router.push({name: 'resultReport'}, () => { + if (e.name === '未提交') { + this.status = 0 + } + if (e.name === '审核中') { + this.status = 108 + } + if (e.name === '已完成') { + this.status = 109 + } + this.$router.push({name: 'resultReport', query: { status: this.status }}, () => { this.mainTabsActiveName = this.$route.name }) console.log('---------' + e.name) diff --git a/src/views/modules/result/report/componments/query-form/index.vue b/src/views/modules/result/report/componments/query-form/index.vue index dfc6974..5a6b22c 100644 --- a/src/views/modules/result/report/componments/query-form/index.vue +++ b/src/views/modules/result/report/componments/query-form/index.vue @@ -44,7 +44,8 @@ v-for="item in levelList" :key="item.value" :label="item.label" - :value="item.value"> + :value="item.value" + > @@ -148,6 +149,7 @@ computed: {}, beforeMount () { }, created () { + this.status = this.$route.query.status this.handleGetMenuList() this.handleChangeData() },