|
@@ -172,8 +172,8 @@
|
|
|
</div>
|
|
|
<div class="mg-l-16" style="flex:1 1 auto;" ref="lineChart">
|
|
|
<panel title="72小时功率曲线图">
|
|
|
- <multiple-line-chart height="18.519vh" v-if="Powertrend" :list="Powertrend.value"
|
|
|
- :units="Powertrend.units" :showLegend="true" />
|
|
|
+ <multiple-y-line-chart-normal height="18.519vh" v-if="Powertrend" :list="Powertrend.value"
|
|
|
+ :yAxises="PowertrendYAxises" :showLegend="true" />
|
|
|
</panel>
|
|
|
</div>
|
|
|
<div class="mg-l-16" style="flex:0 0 400px;">
|
|
@@ -211,13 +211,13 @@
|
|
|
<Col :span="8">
|
|
|
<panel title="日发电量对比">
|
|
|
<multiple-bar-line-chart height="21.296vh" :barData="CompleteElectricity.data"
|
|
|
- :units="CompleteElectricity.units" :lineData="CompleteElectricity.lineData"/>
|
|
|
+ :units="CompleteElectricity.units" :lineData="CompleteElectricity.lineData" />
|
|
|
</panel>
|
|
|
</Col>
|
|
|
<Col :span="8">
|
|
|
<panel title="月发电量对比">
|
|
|
- <multiple-bar-line-chart height="21.296vh" :barData="MonthCompare.data"
|
|
|
- :units="MonthCompare.units" :lineData="MonthCompare.lineData"/>
|
|
|
+ <multiple-bar-line-chart height="21.296vh" :barData="MonthCompare.data" :units="MonthCompare.units"
|
|
|
+ :lineData="MonthCompare.lineData" />
|
|
|
</panel>
|
|
|
</Col>
|
|
|
</row>
|
|
@@ -229,7 +229,7 @@
|
|
|
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 MultipleYLineChartNormal from "../../../../components/chart/line/multiple-y-line-chart-normal.vue";
|
|
|
import NormalLineChart from "../../../../components/chart/line/normal-line-chart.vue";
|
|
|
import DualPieChart from "../../../../components/chart/pie/dual-pie-chart.vue";
|
|
|
import BtnGroupDouble from "../../../../components/coms/btn/btn-group-double.vue";
|
|
@@ -255,7 +255,6 @@
|
|
|
Col,
|
|
|
Panel,
|
|
|
DualPieChart,
|
|
|
- MultipleLineChart,
|
|
|
Panel3,
|
|
|
SvgIcon,
|
|
|
HoverBarChart,
|
|
@@ -264,7 +263,8 @@
|
|
|
LightMatrix,
|
|
|
BtnGroupDouble,
|
|
|
Station,
|
|
|
- MultipleBarLineChart
|
|
|
+ MultipleBarLineChart,
|
|
|
+ MultipleYLineChartNormal
|
|
|
},
|
|
|
// 数据
|
|
|
data() {
|
|
@@ -320,6 +320,21 @@
|
|
|
value: [],
|
|
|
}, ],
|
|
|
},
|
|
|
+ PowertrendYAxises: [{
|
|
|
+ name: "功率",
|
|
|
+ min: 0,
|
|
|
+ // max: 500,
|
|
|
+ unit: "(万kWh)",
|
|
|
+ position: "left",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "风速",
|
|
|
+ min: 0,
|
|
|
+ max: 30,
|
|
|
+ unit: "(m/s)",
|
|
|
+ position: "right",
|
|
|
+ },
|
|
|
+ ],
|
|
|
// 月发电量对比
|
|
|
MonthCompare: {
|
|
|
data: [{
|
|
@@ -335,7 +350,7 @@
|
|
|
],
|
|
|
units: ["(万KWh)", ""],
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
selectIndex: 0,
|
|
|
rowIndex: 0,
|
|
|
btnGroupsss: [{
|
|
@@ -621,13 +636,13 @@
|
|
|
value: [],
|
|
|
},
|
|
|
];
|
|
|
-
|
|
|
+
|
|
|
let lineData = {
|
|
|
- name: "风速",
|
|
|
- unit: "km",
|
|
|
- data: [],
|
|
|
+ name: "风速",
|
|
|
+ unit: "km",
|
|
|
+ data: [],
|
|
|
};
|
|
|
-
|
|
|
+
|
|
|
res.data.forEach((ele) => {
|
|
|
data[0].value.push({
|
|
|
text: ele.timestr,
|
|
@@ -657,7 +672,7 @@
|
|
|
wpId: that.wpId,
|
|
|
},
|
|
|
success(res) {
|
|
|
-
|
|
|
+
|
|
|
let data = [{
|
|
|
title: "月发电量",
|
|
|
yAxisIndex: 0,
|
|
@@ -670,11 +685,11 @@
|
|
|
},
|
|
|
];
|
|
|
let lineData = {
|
|
|
- name: "风速",
|
|
|
- unit: "km",
|
|
|
- data: [],
|
|
|
+ name: "风速",
|
|
|
+ unit: "km",
|
|
|
+ data: [],
|
|
|
};
|
|
|
-
|
|
|
+
|
|
|
res.data.forEach((ele) => {
|
|
|
data[0].value.push({
|
|
|
text: ele.timestr,
|