|
@@ -22,12 +22,12 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane label="电网" name="first">
|
|
|
+ <el-tab-pane label="市电" name="first">
|
|
|
<div class="container-block">
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
|
|
<el-form-item label="服务区" prop="areaCode">
|
|
|
<el-select v-model="queryParams.areaCode" placeholder="请选择服务区" @change="handleQuery">
|
|
|
- <el-option label="南北区汇总" value="" />
|
|
|
+ <el-option label="汇总" value="" />
|
|
|
<el-option v-for="item in areaOptions" :key="item.areaCode" :label="item.areaName"
|
|
|
:value="item.areaCode" />
|
|
|
</el-select>
|
|
@@ -79,7 +79,7 @@
|
|
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
|
|
<el-form-item label="服务区" prop="areaCode">
|
|
|
<el-select v-model="queryParams.areaCode" placeholder="请选择服务区" @change="handleQuery">
|
|
|
- <el-option label="南北区汇总" value="" />
|
|
|
+ <el-option label="汇总" value="" />
|
|
|
<el-option v-for="item in areaOptions" :key="item.areaCode" :label="item.areaName"
|
|
|
:value="item.areaCode" />
|
|
|
</el-select>
|
|
@@ -449,11 +449,18 @@ export default {
|
|
|
this.elecQuantity.series[0].data = [
|
|
|
{
|
|
|
value: supply?.quantity,
|
|
|
- name: '电网',
|
|
|
+ name: '市电',
|
|
|
+ itemStyle: {
|
|
|
+ color: '#6395FA',
|
|
|
+ },
|
|
|
+
|
|
|
},
|
|
|
{
|
|
|
value: pv?.useQuantity,
|
|
|
name: '光伏',
|
|
|
+ itemStyle: {
|
|
|
+ color: '#8CDF6C',
|
|
|
+ },
|
|
|
},
|
|
|
];
|
|
|
|
|
@@ -461,10 +468,16 @@ export default {
|
|
|
{
|
|
|
value: supply?.cost,
|
|
|
name: '实际电费',
|
|
|
+ itemStyle: {
|
|
|
+ color: '#6395FA',
|
|
|
+ },
|
|
|
},
|
|
|
{
|
|
|
value: pv?.upEarn,
|
|
|
name: '节省电费',
|
|
|
+ itemStyle: {
|
|
|
+ color: '#8CDF6C',
|
|
|
+ },
|
|
|
},
|
|
|
];
|
|
|
|
|
@@ -483,17 +496,24 @@ export default {
|
|
|
supply,
|
|
|
} = data;
|
|
|
const series = [
|
|
|
- {
|
|
|
- name: '光伏',
|
|
|
+ {
|
|
|
+ name: '市电',
|
|
|
type: 'bar',
|
|
|
barWidth: '30%', // 调整柱状图宽度
|
|
|
data: [],
|
|
|
- }, {
|
|
|
- name: '市电',
|
|
|
+ itemStyle: {
|
|
|
+ color: '#6395FA',
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: '光伏',
|
|
|
type: 'bar',
|
|
|
barWidth: '30%', // 调整柱状图宽度
|
|
|
data: [],
|
|
|
- },
|
|
|
+ itemStyle: {
|
|
|
+ color: '#8CDF6C',
|
|
|
+ },
|
|
|
+ }
|
|
|
];
|
|
|
xaxis.forEach((item, index) => {
|
|
|
let timeIndex = index + 1;
|