|
|
@@ -45,7 +45,7 @@
|
|
|
{{ scope.row.meteredValue }}
|
|
|
</template>
|
|
|
</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"
|
|
|
@@ -65,7 +65,7 @@
|
|
|
{{ scope.row.meteredValue }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="totalPrice" align="center" label="总金额(￥)">
|
|
|
+ <el-table-column prop="totalPrice" align="center" label="合并费用(￥)">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<BaseChart width="100%" height="300px" :option="overviewOptions" />
|
|
|
@@ -92,7 +92,7 @@
|
|
|
{{ scope.row.meteredValue }}
|
|
|
</template>
|
|
|
</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="sharedPrice" align="center" label="公摊费用(￥)">
|
|
|
</el-table-column>
|
|
|
@@ -101,7 +101,7 @@
|
|
|
{{formatDict(scope.row.sharedComputeType,'computeTypeOptions')}}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="totalPrice" align="center" label="总金额(￥)">
|
|
|
+ <el-table-column prop="totalPrice" align="center" label="总费用(￥)">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
@@ -126,16 +126,17 @@
|
|
|
{{ scope.row.meteredValue }}
|
|
|
</template>
|
|
|
</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="sharedPrice" align="center" label="公摊价格">
|
|
|
+ <el-table-column prop="sharedPrice" align="center" label="公摊费用(￥)">
|
|
|
</el-table-column>
|
|
|
+ <!--
|
|
|
<el-table-column prop="sharedComputeType" align="center" label="公摊类型">
|
|
|
<template slot-scope="scope">
|
|
|
{{formatDict(scope.row.sharedComputeType,'computeTypeOptions')}}
|
|
|
</template>
|
|
|
</el-table-column> -->
|
|
|
- <el-table-column prop="totalPrice" align="center" label="总价(￥)">
|
|
|
+ <el-table-column prop="totalPrice" align="center" label="合并费用(￥)">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<BaseChart width="100%" height="300px" :option="elecOptions" />
|
|
|
@@ -266,7 +267,7 @@ export default {
|
|
|
parms.data.value +
|
|
|
`${meterCls === 45 ? '度' : '吨'}` +
|
|
|
'</br>' +
|
|
|
- '金额：' +
|
|
|
+ '费用：' +
|
|
|
parms.data.price +
|
|
|
'元'
|
|
|
return str
|
|
|
@@ -353,7 +354,7 @@ export default {
|
|
|
left: '5%'
|
|
|
},
|
|
|
legend: {
|
|
|
- data:['商户用量', '商户金额', '公摊用量', '公摊金额']
|
|
|
+ data:['商户用量', '个户费用', '公摊用量', '公摊费用']
|
|
|
},
|
|
|
xAxis: {
|
|
|
type: 'category',
|
|
|
@@ -396,7 +397,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- name: '商户金额',
|
|
|
+ name: '个户费用',
|
|
|
type: 'line',
|
|
|
yAxisIndex: 1,
|
|
|
data: cost,
|
|
|
@@ -408,7 +409,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- name: '公摊金额',
|
|
|
+ name: '公摊费用',
|
|
|
type: 'line',
|
|
|
yAxisIndex: 1,
|
|
|
data: shareCost,
|
|
|
@@ -439,7 +440,7 @@ export default {
|
|
|
left: '5%'
|
|
|
},
|
|
|
legend: {
|
|
|
- data: ['用量', '金额']
|
|
|
+ data: ['用量', '费用']
|
|
|
},
|
|
|
xAxis: {
|
|
|
type: 'category',
|
|
|
@@ -471,7 +472,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- name: '金额',
|
|
|
+ name: '费用',
|
|
|
type: 'line',
|
|
|
yAxisIndex: 1,
|
|
|
data: cost,
|
