Переглянути джерело

图表已改,但底下图表出现2个风速,已反馈前端

mw_666 3 роки тому
батько
коміт
6afdd24962
1 змінених файлів з 29 додано та 10 видалено
  1. 29 10
      src/views/WindSite/pages/Home/Home.vue

+ 29 - 10
src/views/WindSite/pages/Home/Home.vue

@@ -210,13 +210,14 @@
 				</Col>
 				<Col :span="8">
 				<panel title="日发电量对比">
-					<multiple-bar-chart height="21.296vh" :list="CompleteElectricity.data"
-						:units="CompleteElectricity.units" :showLegend="true" />
+					<multiple-bar-line-chart height="21.296vh" :barData="CompleteElectricity.data"
+						:units="CompleteElectricity.units" :lineData="CompleteElectricity.lineData"/>
 				</panel>
 				</Col>
 				<Col :span="8">
 				<panel title="月发电量对比">
-					<normal-line-chart height="21.296vh" :list="MonthCompare.value" :units="MonthCompare.units" />
+					<multiple-bar-line-chart height="21.296vh" :barData="MonthCompare.data"
+						:units="MonthCompare.units" :lineData="MonthCompare.lineData"/>
 				</panel>
 				</Col>
 			</row>
@@ -227,6 +228,7 @@
 <script>
 	import HoverBarChart from "../../../../components/chart/bar/hover-bar-chart.vue";
 	import MultipleBarChart from "../../../../components/chart/bar/multiple-bar-chart.vue";
+	import MultipleBarLineChart from "../../../../components/chart/combination/multiple-bar-line-chart.vue";
 	import MultipleLineChart from "../../../../components/chart/line/double-line-chart.vue";
 	import NormalLineChart from "../../../../components/chart/line/normal-line-chart.vue";
 	import DualPieChart from "../../../../components/chart/pie/dual-pie-chart.vue";
@@ -261,7 +263,8 @@
 			NormalLineChart,
 			LightMatrix,
 			BtnGroupDouble,
-			Station
+			Station,
+			MultipleBarLineChart
 		},
 		// 数据
 		data() {
@@ -317,11 +320,9 @@
 						value: [],
 					}, ],
 				},
-
 				// 月发电量对比
 				MonthCompare: {
-					units: ["(万KWh)"],
-					value: [{
+					data: [{
 							title: "月发电量",
 							yAxisIndex: 0,
 							value: [],
@@ -332,7 +333,9 @@
 							value: [],
 						},
 					],
+					units: ["(万KWh)", ""],
 				},
+				
 				selectIndex: 0,
 				rowIndex: 0,
 				btnGroupsss: [{
@@ -619,7 +622,13 @@
 								value: [],
 							},
 						];
-
+						
+						let lineData = {
+						  name: "风速",
+						  unit: "km",
+						  data: [],
+						};
+						
 						res.data.forEach((ele) => {
 							data[0].value.push({
 								text: ele.timestr,
@@ -629,9 +638,11 @@
 								text: ele.timestr,
 								value: ele.value2 || 0,
 							});
+							lineData.data.push(ele.value3 || 0);
 						});
 
 						that.CompleteElectricity.data = data;
+						that.CompleteElectricity.lineData = lineData;
 					},
 				});
 			},
@@ -647,6 +658,7 @@
 						wpId: that.wpId,
 					},
 					success(res) {
+						
 						let data = [{
 								title: "月发电量",
 								yAxisIndex: 0,
@@ -658,7 +670,12 @@
 								value: [],
 							},
 						];
-
+						let lineData = {
+						  name: "风速",
+						  unit: "km",
+						  data: [],
+						};
+						
 						res.data.forEach((ele) => {
 							data[0].value.push({
 								text: ele.timestr,
@@ -668,9 +685,11 @@
 								text: ele.timestr,
 								value: ele.value2,
 							});
+							lineData.data.push(ele.value3 || 0);
 						});
 
-						that.MonthCompare.value = data;
+						that.MonthCompare.data = data;
+						that.MonthCompare.lineData = lineData;
 					},
 				});
 			},