|
@@ -26,7 +26,7 @@
|
|
|
mapMutations
|
|
|
} from 'vuex'
|
|
|
import echarts from 'echarts/lib/echarts'
|
|
|
- import 'echarts/lib/chart/line'
|
|
|
+ import 'echarts/lib/chart/bar'
|
|
|
import 'echarts/lib/component/legend'
|
|
|
import 'echarts/lib/component/title'
|
|
|
import 'echarts/lib/component/tooltip'
|
|
@@ -44,23 +44,19 @@
|
|
|
|
|
|
pageTitle: this.$route.query.title,
|
|
|
|
|
|
- listForm: {
|
|
|
- names: this.$route.query.type,
|
|
|
- },
|
|
|
-
|
|
|
typeList: '',
|
|
|
|
|
|
chartsList: [],
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- this.typeList = this.$route.query.type.split(',');
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
//获取图表数据
|
|
|
getChartList() {
|
|
|
this.isLoading = true;
|
|
|
- API_Health.getChartList(this.listForm).then(response => {
|
|
|
+ API_Health.geStepList().then(response => {
|
|
|
this.isLoading = false;
|
|
|
this.chartsList = response;
|
|
|
|
|
@@ -75,23 +71,19 @@
|
|
|
var legendData = [];
|
|
|
var xAxisData = [];
|
|
|
var series = [];
|
|
|
- for (var i = 0; i < this.typeList.length; i++) {
|
|
|
- var seriesData = [];
|
|
|
- legendData.push(this.chartsList[this.typeList[i]].name);
|
|
|
- var list = this.chartsList[this.typeList[i]].list;
|
|
|
- for (var j = 0; j < list.length; j++) {
|
|
|
- if (i == 0) {
|
|
|
- xAxisData.push(list[j].recordTime);
|
|
|
- }
|
|
|
- seriesData.push(list[j].value);
|
|
|
- }
|
|
|
- series.push({
|
|
|
- name: this.chartsList[this.typeList[i]].name,
|
|
|
- type: 'line',
|
|
|
- stack: '',
|
|
|
- data: seriesData
|
|
|
- });
|
|
|
+ var seriesData = [];
|
|
|
+ legendData.push('运动步数');
|
|
|
+ var list = this.chartsList;
|
|
|
+ for (var j = 0; j < list.length; j++) {
|
|
|
+ xAxisData.push(list[j].recordTime);
|
|
|
+ seriesData.push(list[j].value);
|
|
|
}
|
|
|
+ series.push({
|
|
|
+ name: '运动步数',
|
|
|
+ type: 'bar',
|
|
|
+ stack: '',
|
|
|
+ data: seriesData
|
|
|
+ });
|
|
|
this.echarts(legendData, xAxisData, series);
|
|
|
},
|
|
|
//显示图表
|