|
|
@@ -37,9 +37,9 @@
|
|
|
<el-table :data="historyData" style="width: 100%;margin-bottom:20px" max-height="300px">
|
|
|
<el-table-column prop="meteredTime" align="center" label="账单月份">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="meteredValue" align="center" label="用量">
|
|
|
+ <el-table-column prop="meteredValue" align="center" label="商户用量">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="meteredPrice" align="center" label="金额">
|
|
|
+ <el-table-column prop="meteredPrice" align="center" label="商户金额">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="sharedValue" align="center" label="公摊用量">
|
|
|
</el-table-column>
|
|
|
@@ -189,7 +189,7 @@ export default {
|
|
|
{
|
|
|
value: meteredValue,
|
|
|
price: meteredPrice,
|
|
|
- name: meterCls === 45 ? '电表用量' : '水表用量',
|
|
|
+ name: '商户用量',
|
|
|
totalValue,
|
|
|
totalPrice,
|
|
|
itemStyle: {
|
|
|
@@ -323,7 +323,7 @@ export default {
|
|
|
left: '5%'
|
|
|
},
|
|
|
legend: {
|
|
|
- data: meterCls === 45 ? ['电表用量', '电表金额', '公摊用量', '公摊金额'] : ['水表用量', '水表金额', '公摊用量', '公摊金额']
|
|
|
+ data:['商户用量', '商户金额', '公摊用量', '公摊金额']
|
|
|
},
|
|
|
xAxis: {
|
|
|
type: 'category',
|
|
|
@@ -344,7 +344,7 @@ export default {
|
|
|
],
|
|
|
series: [
|
|
|
{
|
|
|
- name: meterCls === 45 ? '电表用量' : '水表用量',
|
|
|
+ name: '商户用量',
|
|
|
type: 'bar',
|
|
|
data: quantity,
|
|
|
barWidth: 30,
|
|
|
@@ -366,7 +366,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- name: meterCls === 45 ? '电表金额' : '水表金额',
|
|
|
+ name: '商户金额',
|
|
|
type: 'line',
|
|
|
yAxisIndex: 1,
|
|
|
data: cost,
|
