From e44f5e02675b21562a4e033afc87db934a63d50d Mon Sep 17 00:00:00 2001
From: whycwx <1272078254@qq.com>
Date: 星期四, 18 三月 2021 17:21:23 +0800
Subject: [PATCH] 接口联调数据处理
---
src/pages/index.vue | 6 +
src/assets/js/charts/persons/wangxuan.js | 29 +++++++++
src/components/charts/dischargeCircuit.vue | 2
src/components/charts/histogramAlternating.vue | 2
src/components/charts/monomerVoltage.vue | 106 ++++++++++++++++++++++++----------
5 files changed, 109 insertions(+), 36 deletions(-)
diff --git a/src/assets/js/charts/persons/wangxuan.js b/src/assets/js/charts/persons/wangxuan.js
index e2c2035..3c8d305 100644
--- a/src/assets/js/charts/persons/wangxuan.js
+++ b/src/assets/js/charts/persons/wangxuan.js
@@ -26,7 +26,34 @@
x: 0.35,
y: 0.35,
type: 'monomerVoltage',
- setData:{}
+ setData:{
+ legendData : ['鍗曚綋鐢靛帇', '鍗曚綋鍐呴樆','鍗曚綋娓╁害'],
+ yAxisData : ['楂樺憡璀︽暟閲�', '浣庡憡璀︽暟閲�', '鍛婅鎬绘暟', '鍛婅鎬绘暟姣斾緥', '鍛婅鏈烘埧鎬绘暟', '鍛婅鏈烘埧鎬绘暟姣斾緥'],
+ data : [{
+ name: '鍗曚綋鐢靛帇',
+ type: 'bar',
+ data: [24, 18, 38, 31, 24, 13],
+ itemStyle:{
+ color:'#FED601'
+ }
+ },
+ {
+ name: '鍗曚綋鍐呴樆',
+ type: 'bar',
+ data: [19, 28, 46, 24, 14, 9],
+ itemStyle:{
+ color:'#67E0E3'
+ }
+ },
+ {
+ name: '鍗曚綋娓╁害',
+ type: 'bar',
+ data: [15, 22, 36, 15, 21, 8],
+ itemStyle:{
+ color:'#EB6F49'
+ }
+ }]
+ }
}
},{
img: require("@/assets/images/dischargeCircuit.png"),
diff --git a/src/components/charts/dischargeCircuit.vue b/src/components/charts/dischargeCircuit.vue
index 7963880..17bea21 100644
--- a/src/components/charts/dischargeCircuit.vue
+++ b/src/components/charts/dischargeCircuit.vue
@@ -8,7 +8,7 @@
<script>
import * as echarts from 'echarts';
-
+// 鏀剧數鐢垫祦 椤甸潰
export default {
name: "dischargeCircuit",
chart: "",
diff --git a/src/components/charts/histogramAlternating.vue b/src/components/charts/histogramAlternating.vue
index 5bc6852..1092816 100644
--- a/src/components/charts/histogramAlternating.vue
+++ b/src/components/charts/histogramAlternating.vue
@@ -12,7 +12,7 @@
<script>
import * as echarts from 'echarts';
-
+// 浜ゆ祦ABC 椤甸潰
export default {
name: "histogramAlternating",
chart: "",
diff --git a/src/components/charts/monomerVoltage.vue b/src/components/charts/monomerVoltage.vue
index ae977ff..68b18de 100644
--- a/src/components/charts/monomerVoltage.vue
+++ b/src/components/charts/monomerVoltage.vue
@@ -8,10 +8,11 @@
<script>
import * as echarts from 'echarts';
-
+// 鍗曚綋鐢靛帇銆佸唴闃诲拰娓╁害 椤甸潰
export default {
name: "monomerVoltage",
chart: "",
+ chartData: {},
props: {
id: {
require: true,
@@ -43,8 +44,48 @@
setOption(opt) {
this.$options.chart.setOption(opt);
},
- setData() {
- let option = {
+ setData(dataList) {
+ console.log(dataList)
+ let self = this;
+ let legendData = [];
+ let yAxisData = [];
+ let data = [];
+ // 瀛樺��
+ self.$options.chartData = dataList;
+ if(!dataList){
+ self.$axios({
+ method:"get",
+ url:"/batteryAlarm/monVRTAnalysis",
+ params:null
+ }).then(res=>{
+ if(res.data.code == 1){
+ let result = res.data.data;
+ let index = 0;
+ for (const key in result) {
+ let obj = {
+ name: key,
+ type: 'bar',
+ data:[]
+ }
+ legendData.push(key);
+ for (const item in result[key]) {
+ if(index === 0){
+ yAxisData.push(item);
+ }
+ obj.data.push(result[key][item])
+ }
+ data.push(obj);
+ index++;
+ }
+ self.optionSet(legendData,yAxisData,data);
+ }
+ })
+ }else{
+ self.optionSet(dataList.legendData,dataList.yAxisData,dataList.data);
+ }
+ },
+ optionSet(legendData,yAxisData,data){
+ let option = {
// title: {
// text: '涓栫晫浜哄彛鎬婚噺',
// subtext: '鏁版嵁鏉ヨ嚜缃戠粶'
@@ -57,7 +98,7 @@
},
legend: {
right:"4%",
- data: ['鍗曚綋鐢靛帇', '鍗曚綋鍐呴樆','鍗曚綋娓╁害'],
+ data: legendData,//['鍗曚綋鐢靛帇', '鍗曚綋鍐呴樆','鍗曚綋娓╁害'],
itemStyle:{
right:"0",
},
@@ -106,34 +147,35 @@
},
- data: ['楂樺憡璀︽暟閲�', '浣庡憡璀︽暟閲�', '鍛婅鎬绘暟', '鍛婅鎬绘暟姣斾緥', '鍛婅鏈烘埧鎬绘暟', '鍛婅鏈烘埧鎬绘暟姣斾緥']
+ data: yAxisData,//['楂樺憡璀︽暟閲�', '浣庡憡璀︽暟閲�', '鍛婅鎬绘暟', '鍛婅鎬绘暟姣斾緥', '鍛婅鏈烘埧鎬绘暟', '鍛婅鏈烘埧鎬绘暟姣斾緥']
},
- series: [
- {
- name: '鍗曚綋鐢靛帇',
- type: 'bar',
- data: [24, 18, 38, 31, 24, 13],
- itemStyle:{
- color:'#FED601'
- }
- },
- {
- name: '鍗曚綋鍐呴樆',
- type: 'bar',
- data: [19, 28, 46, 24, 14, 9],
- itemStyle:{
- color:'#67E0E3'
- }
- },
- {
- name: '鍗曚綋娓╁害',
- type: 'bar',
- data: [15, 22, 36, 15, 21, 8],
- itemStyle:{
- color:'#EB6F49'
- }
- }
- ]
+ series: data
+ // [
+ // {
+ // name: '鍗曚綋鐢靛帇',
+ // type: 'bar',
+ // data: [24, 18, 38, 31, 24, 13],
+ // itemStyle:{
+ // color:'#FED601'
+ // }
+ // },
+ // {
+ // name: '鍗曚綋鍐呴樆',
+ // type: 'bar',
+ // data: [19, 28, 46, 24, 14, 9],
+ // itemStyle:{
+ // color:'#67E0E3'
+ // }
+ // },
+ // {
+ // name: '鍗曚綋娓╁害',
+ // type: 'bar',
+ // data: [15, 22, 36, 15, 21, 8],
+ // itemStyle:{
+ // color:'#EB6F49'
+ // }
+ // }
+ // ]
};
this.setOption(option);
},
@@ -141,7 +183,7 @@
let self = this;
setTimeout(function(){
self.$options.chart.resize();
- self.setData(null);
+ self.setData(self.$options.chartData);
},300)
}
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 2aade34..cbdb7c1 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -110,10 +110,14 @@
// 鑾峰彇鍒楄〃鏁版嵁
getData() {
let self = this;
+ let opt = self.$route.query;
+ console.log(opt)
self.$axios({
method: "get",
url: "/application/all",
- data: null
+ data: {
+ userId:opt.userId || "1001"
+ }
}).then(res => {
if (res.data.code == 1) {
self.listData = res.data.data.map(item => {
--
Gitblit v1.9.1