diff --git a/project/activeAnalysis/app/AppActiveAnalysis/components/List.vue b/project/activeAnalysis/app/AppActiveAnalysis/components/List.vue index e550fa18..7f04c2ee 100644 --- a/project/activeAnalysis/app/AppActiveAnalysis/components/List.vue +++ b/project/activeAnalysis/app/AppActiveAnalysis/components/List.vue @@ -87,8 +87,10 @@ + :total="search1.total" + :current.sync="search1.current" + :size.sync="search1.size" + @getList="getActiveAnalysStatistics"> @@ -193,6 +195,11 @@ current: 1, wxUserId: '' }, + search1: { + size: 10, + total: 0, + current: 1 + }, search: { status: '', size: 10, @@ -373,7 +380,7 @@ series: y.map(key => { return { data: data.map(v => v[key]), - type: 'bar', + type: 'line', name: key, tooltip: { valueFormatter: function (value) { @@ -461,9 +468,17 @@ }, getActiveAnalysStatistics () { - this.instance.post(`/app/wxuseruselog/active-analysis-statistics?department=${this.department}&x=${this.x}&y=${this.y}`).then(res => { + this.instance.post(`/app/wxuseruselog/active-analysis-statistics`, null, { + params: { + department: this.department, + x: this.x, + y: this.y, + ...this.search1 + } + }).then(res => { if (res.code === 0) { - this.tableData = res.data + this.tableData = res.data.records + this.search1.total = res.data.total } }) },