|
@@ -20,7 +20,8 @@
|
|
<!-- <el-scrollbar> -->
|
|
<!-- <el-scrollbar> -->
|
|
<div class="scrollbar-flex-content " style="transform: scale(.9)">
|
|
<div class="scrollbar-flex-content " style="transform: scale(.9)">
|
|
<p v-for="item in stationData" :key="item.no" class="scrollbar-demo-item"
|
|
<p v-for="item in stationData" :key="item.no" class="scrollbar-demo-item"
|
|
- :class="item.showBac === true ? 'changeBacksty' : 'defaultBacksty'" @click="changeStation(item.no)">
|
|
|
|
|
|
+ :class="item.showBac === true ? 'changeBacksty' : 'defaultBacksty'"
|
|
|
|
+ @click="changeStation(item.no)">
|
|
{{ item.stationName }}
|
|
{{ item.stationName }}
|
|
</p>
|
|
</p>
|
|
</div>
|
|
</div>
|
|
@@ -506,16 +507,16 @@
|
|
jsonData.globalPowerPredictionChartData2.dataFormatList.forEach(
|
|
jsonData.globalPowerPredictionChartData2.dataFormatList.forEach(
|
|
(iten) => {
|
|
(iten) => {
|
|
// if (iten.name !== "短期") {
|
|
// if (iten.name !== "短期") {
|
|
- legend.push(iten.name);
|
|
|
|
- let seriesObj = {
|
|
|
|
- name: iten.name,
|
|
|
|
- type: "line",
|
|
|
|
- data: iten.data.map((it) => {
|
|
|
|
- return that.$utils.isHasNum(it);
|
|
|
|
- }),
|
|
|
|
- symbol: "none",
|
|
|
|
- };
|
|
|
|
- series.push(seriesObj);
|
|
|
|
|
|
+ legend.push(iten.name);
|
|
|
|
+ let seriesObj = {
|
|
|
|
+ name: iten.name,
|
|
|
|
+ type: "line",
|
|
|
|
+ data: iten.data.map((it) => {
|
|
|
|
+ return that.$utils.isHasNum(it);
|
|
|
|
+ }),
|
|
|
|
+ symbol: "none",
|
|
|
|
+ };
|
|
|
|
+ series.push(seriesObj);
|
|
// }
|
|
// }
|
|
}
|
|
}
|
|
);
|
|
);
|
|
@@ -553,22 +554,31 @@
|
|
jsonData.installedCapacityData.name.forEach((item) => {
|
|
jsonData.installedCapacityData.name.forEach((item) => {
|
|
xAxis.push(item);
|
|
xAxis.push(item);
|
|
});
|
|
});
|
|
- jsonData.installedCapacityData.dataFormatList.forEach((iten, index) => {
|
|
|
|
- legend.push(iten.name);
|
|
|
|
- let seriesObj = {
|
|
|
|
- name: iten.name,
|
|
|
|
- type: "bar",
|
|
|
|
- barGap: 0,
|
|
|
|
- emphasis: {
|
|
|
|
- focus: "series",
|
|
|
|
- },
|
|
|
|
- data: iten.data.map((it) => {
|
|
|
|
- return that.$utils.isHasNum(it);
|
|
|
|
- }),
|
|
|
|
- };
|
|
|
|
- series.push(seriesObj);
|
|
|
|
- });
|
|
|
|
- that.getPowerBar("installChart", "功率统计", xAxis, legend, series);
|
|
|
|
|
|
+
|
|
|
|
+ let powerArr = ["装机", "理论", "可用", "预测", "实时"]
|
|
|
|
+ powerArr.forEach(it => {
|
|
|
|
+ jsonData.installedCapacityData.dataFormatList.forEach((iten, index) => {
|
|
|
|
+ if (it === iten.name) {
|
|
|
|
+ legend.push(iten.name);
|
|
|
|
+ let seriesObj = {
|
|
|
|
+ name: iten.name,
|
|
|
|
+ type: "bar",
|
|
|
|
+ barGap: 0,
|
|
|
|
+ emphasis: {
|
|
|
|
+ focus: "series",
|
|
|
|
+ },
|
|
|
|
+ data: iten.data.map((it) => {
|
|
|
|
+ return that.$utils.isHasNum(it);
|
|
|
|
+ }),
|
|
|
|
+ };
|
|
|
|
+ series.push(seriesObj);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ })
|
|
|
|
+ let color = ['#ea7ccc', '#5470c6', '#91cc75', '#ee6666', '#73c0de', '#fc8452',
|
|
|
|
+ '#9a60b4',
|
|
|
|
+ ]
|
|
|
|
+ that.getPowerBar("installChart", "功率统计", xAxis, legend, series, color);
|
|
}
|
|
}
|
|
|
|
|
|
{
|
|
{
|
|
@@ -922,7 +932,7 @@
|
|
}
|
|
}
|
|
if (datas.data.dataFormatList.length > 0) {
|
|
if (datas.data.dataFormatList.length > 0) {
|
|
let powerArr = ["理论", "可用", "AGC", "超短期", "短期", "实际"]
|
|
let powerArr = ["理论", "可用", "AGC", "超短期", "短期", "实际"]
|
|
- powerArr.forEach(it =>{
|
|
|
|
|
|
+ powerArr.forEach(it => {
|
|
datas.data.dataFormatList.forEach((iten) => {
|
|
datas.data.dataFormatList.forEach((iten) => {
|
|
if (it === iten.name) {
|
|
if (it === iten.name) {
|
|
legend.push(iten.name);
|
|
legend.push(iten.name);
|
|
@@ -937,7 +947,7 @@
|
|
series.push(seriesObj);
|
|
series.push(seriesObj);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
})
|
|
})
|
|
}
|
|
}
|
|
this.getPowerLine("powerChart", "功率预测", xAxis, legend, series);
|
|
this.getPowerLine("powerChart", "功率预测", xAxis, legend, series);
|
|
@@ -1179,23 +1189,31 @@
|
|
});
|
|
});
|
|
}
|
|
}
|
|
if (datas.data.dataFormatList.length > 0) {
|
|
if (datas.data.dataFormatList.length > 0) {
|
|
- datas.data.dataFormatList.forEach((iten, index) => {
|
|
|
|
- legend.push(iten.name);
|
|
|
|
- let seriesObj = {
|
|
|
|
- name: iten.name,
|
|
|
|
- type: "bar",
|
|
|
|
- barGap: 0,
|
|
|
|
- emphasis: {
|
|
|
|
- focus: "series",
|
|
|
|
- },
|
|
|
|
- data: iten.data.map((it) => {
|
|
|
|
- return this.$utils.isHasNum(it);
|
|
|
|
- }),
|
|
|
|
- };
|
|
|
|
- series.push(seriesObj);
|
|
|
|
- });
|
|
|
|
|
|
+ let powerArr = ["装机", "理论", "可用", "预测", "实时"]
|
|
|
|
+ powerArr.forEach(it => {
|
|
|
|
+ datas.data.dataFormatList.forEach((iten, index) => {
|
|
|
|
+ if (it === iten.name) {
|
|
|
|
+ legend.push(iten.name);
|
|
|
|
+ let seriesObj = {
|
|
|
|
+ name: iten.name,
|
|
|
|
+ type: "bar",
|
|
|
|
+ barGap: 0,
|
|
|
|
+ emphasis: {
|
|
|
|
+ focus: "series",
|
|
|
|
+ },
|
|
|
|
+ data: iten.data.map((it) => {
|
|
|
|
+ return this.$utils.isHasNum(it);
|
|
|
|
+ }),
|
|
|
|
+ };
|
|
|
|
+ series.push(seriesObj);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ })
|
|
}
|
|
}
|
|
- this.getPowerBar("installChart", "功率统计", xAxis, legend, series);
|
|
|
|
|
|
+ let color = ['#ea7ccc', '#5470c6', '#91cc75', '#ee6666', '#73c0de', '#fc8452',
|
|
|
|
+ '#9a60b4',
|
|
|
|
+ ]
|
|
|
|
+ this.getPowerBar("installChart", "功率统计", xAxis, legend, series, color);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -1241,7 +1259,7 @@
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
- getPowerBar(name, title, xAxis, legend, series) {
|
|
|
|
|
|
+ getPowerBar(name, title, xAxis, legend, series, color) {
|
|
let option = {
|
|
let option = {
|
|
backgroundColor: "",
|
|
backgroundColor: "",
|
|
title: {
|
|
title: {
|
|
@@ -1251,6 +1269,7 @@
|
|
fontWeight: "bold",
|
|
fontWeight: "bold",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
|
|
+ color: color,
|
|
tooltip: {
|
|
tooltip: {
|
|
trigger: "axis",
|
|
trigger: "axis",
|
|
axisPointer: {
|
|
axisPointer: {
|