Commit 7a85ecb7 authored by guoyou's avatar guoyou

ANDROID分享

parent ed8665b7
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<!-- <p v-for="(item,index) in chartArr" :key="index">{{item.row}}</p> --> <!-- <p v-for="(item,index) in chartArr" :key="index">{{item.row}}</p> -->
<div v-for="(item,index) in chartArr" :key="index"> <div v-for="(item,index) in chartArr" :key="index">
<p style="text-align:center">{{checkArr.filter(val => val.id == item.title)[0].name}}</p> <p style="text-align:center">{{checkArr.filter(val => val.id == item.title)[0].name}}</p>
<ve-line :data="item" :extend="extend" :settings="chartSettings" :legend-visible="false"></ve-line> <ve-line :data="item" :extend="extend" :settings="chartSettings" :legend-visible="false" :data-zoom="dataZoom"></ve-line>
</div> </div>
</div> </div>
</div> </div>
...@@ -71,7 +71,14 @@ export default { ...@@ -71,7 +71,14 @@ export default {
data: function() { data: function() {
this.extend = { this.extend = {
'xAxis.0.axisLabel.rotate': 45 'xAxis.0.axisLabel.rotate': 45
} }
this.dataZoom = [
{
type: 'slider',
start: 0,
end: 20
}
]
this.chartSettings = { this.chartSettings = {
labelMap: { labelMap: {
orderAmount: '数量', orderAmount: '数量',
...@@ -149,7 +156,7 @@ export default { ...@@ -149,7 +156,7 @@ export default {
} }
], ],
chartData: { chartData: {
columns: ['date', 'orderAmount'], columns: ['dateStr', 'orderAmount'],
rows: [ rows: [
// { // {
// 日期: '2019-12-18', // 日期: '2019-12-18',
...@@ -294,28 +301,48 @@ export default { ...@@ -294,28 +301,48 @@ export default {
this.loading = true this.loading = true
received_statistics(this.listQuery).then(data => { received_statistics(this.listQuery).then(data => {
if (data.status == 200) { if (data.status == 200) {
let info = data.data let info = data.data
let params = {} let params = {}
let choose = this.listQuery.statisticalSigns let choose = this.listQuery.statisticalSigns
let way = this.listQuery.statisticalWay
var x
var y
let dateIndex = way == 3 ?1:way == 2?1:2
let orderIndex = way == 1 ? 3 : 0
for (let i = 0; i < choose.length; i++) { for (let i = 0; i < choose.length; i++) {
if (info[choose[i]] != '') { if (info[choose[i]] != '') {
params[choose[i]] = { params[choose[i]] = {
columns: [ columns: [
Object.keys(info[choose[i]][0])[1], Object.keys(info[choose[i]][0])[dateIndex],
Object.keys(info[choose[i]][0])[2] Object.keys(info[choose[i]][0])[orderIndex]
], ],
rows: info[choose[i]], rows: info[choose[i]].sort(function(a,b){
if(way===1){
x = a.date;
y = b.date;
}
if(way ===2){
x = a.weekOfYear;
y = b.weekOfYear;
}
if(way ===3){
x = a.month;
y = b.month;
}
return((x<y)?-1:((x>y)?1:0));
}),
title: choose[i] title: choose[i]
} }
} }
} }
this.chartArr = params this.chartArr = params
} }
setTimeout(() => { setTimeout(() => {
this.loading = false this.loading = false
}, 300) }, 300)
}) })
} },
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment