From 4787c6aaf99f0c65ef708863a411c94bd1e514d4 Mon Sep 17 00:00:00 2001 From: liuye Date: Thu, 7 Sep 2023 10:59:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A2=E9=BE=99=E6=96=B0=E5=A2=9E=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pages/selectGird.vue | 4 ++++ .../lulong/AppHandSnapshot/Statistics.vue | 21 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue index 5592d7bf..4ae8e701 100644 --- a/src/components/pages/selectGird.vue +++ b/src/components/pages/selectGird.vue @@ -62,6 +62,7 @@ export default { selected: v => [v.$route?.query.selected].flat() }, onLoad(option) { + console.log(this.$route.query.action) if (option.isFormMap) { this.isFormMap = option.isFormMap } @@ -81,6 +82,9 @@ export default { if (this.isMyGirds) { url = `/app/appgirdmemberinfo/queryMyGirdListByLevel2` } + if(this.$route.query.action) { + url = this.$route.query.action + } this.$http.post(url, null, {params}).then((res) => { if (res?.data) { let parents = res.data.map(e => e.parentGirdId) diff --git a/src/project/lulong/AppHandSnapshot/Statistics.vue b/src/project/lulong/AppHandSnapshot/Statistics.vue index 109c28a7..8d24f006 100644 --- a/src/project/lulong/AppHandSnapshot/Statistics.vue +++ b/src/project/lulong/AppHandSnapshot/Statistics.vue @@ -2,7 +2,8 @@
- +
@@ -70,11 +71,7 @@ export default { }, mounted() { - // this.selectGird.girdName = this.user.girdName - // this.selectGird.girdId = this.user.girdId - this.$dict.load('clapEventStatusHistory').then(() => { - this.getStatistics() - }) + this.getGirdInfo() }, methods: { getStatistics() { @@ -135,6 +132,18 @@ export default { }) }, + getGirdInfo() { + this.$http.post(`/app/apppatrolreportinfo/getRootByGirdMember`).then((res) => { + if (res.code == 0) { + this.selectGird.girdName = res.data.girdName + this.selectGird.id = res.data.id + this.$dict.load('clapEventStatusHistory').then(() => { + this.getStatistics() + }) + } + }) + }, + finishChartInit() { this.finishChart = echarts.init(document.getElementById('finish')) var option = {