From d8bff9dff0c9c0c8e88e9e4be85c66de2b5b43ff Mon Sep 17 00:00:00 2001
From: whyczyk <525500596@qq.com>
Date: 星期五, 19 三月 2021 15:34:45 +0800
Subject: [PATCH] 数据模块对接
---
src/components/charts/triangleBarChart.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/src/components/charts/triangleBarChart.vue b/src/components/charts/triangleBarChart.vue
index afdbfcb..4aa2233 100644
--- a/src/components/charts/triangleBarChart.vue
+++ b/src/components/charts/triangleBarChart.vue
@@ -12,6 +12,9 @@
import {
chartFontsize
} from '@/assets/js/chartFontsize'
+ import {
+ batteryGroup
+ } from '@/assets/js/api'
export default {
name: "triangleBarChart",
chart: "",
@@ -32,11 +35,14 @@
setOption(opt) {
this.$options.chart.setOption(opt);
},
- setData(sendData) {
- this.$options.chartData = sendData;
+ organizeData(data) {
let inData = []
- sendData.data.map(item => {
- inData.push(item - 10);
+ data.data.map(item => {
+ if (item > 10) {
+ inData.push(item - 10);
+ } else {
+ inData.push(item);
+ }
})
let option = {
tooltip: {
@@ -62,7 +68,7 @@
},
xAxis: [{
type: 'category',
- data: sendData.xData,
+ data: data.xData,
axisLine: {
lineStyle: {
color: '#022664'
@@ -79,7 +85,7 @@
}, {
show: false,
type: 'category',
- data: sendData.xData,
+ data: data.xData,
axisLine: {
lineStyle: {
color: '#022664'
@@ -118,7 +124,7 @@
name: 'outData',
type: 'pictorialBar',
xAxisIndex: 0,
- data: sendData.data,
+ data: data.data,
barCategoryGap: "0%",
barWidth: '50%',
symbol: 'path://d="M150 50 L130 130 L170 130 Z',
@@ -161,10 +167,40 @@
// 璁剧疆閰嶇疆椤�
this.setOption(option);
},
+ setData(sendData) {
+ if (sendData) {
+ this.$options.chartData = sendData;
+ this.organizeData(sendData)
+ } else {
+ let userId = localStorage.getItem('userId');
+ let params = {
+ userId: userId
+ }
+ batteryGroup(params).then((res) => {
+ if (res.data.code == 1) {
+ let optionData = {
+ xData: [],
+ data: []
+ }
+ let resData = res.data.data;
+ for (let key in resData) {
+ optionData.xData.push(key);
+ optionData.data.push(resData[key]);
+ }
+ this.$options.chartData = optionData;
+ this.organizeData(optionData)
+ }
+ }).catch((err) => {
+ console.log(err)
+ });
+ }
+ },
resize() {
setTimeout(() => {
this.$options.chart.resize();
- this.setData(this.$options.chartData);
+ if (JSON.stringify(this.$options.chartData) != '{}') {
+ this.setData(this.$options.chartData);
+ }
}, 300)
}
},
--
Gitblit v1.9.1