|
@@ -136,10 +136,10 @@
|
|
</view>
|
|
</view>
|
|
<view class="total" >
|
|
<view class="total" >
|
|
<view class="total-item">
|
|
<view class="total-item">
|
|
- 用水量:{{sumQuantity}} m³
|
|
|
|
|
|
+ 当日用水量合计:{{sumQuantity}} m³
|
|
</view>
|
|
</view>
|
|
<view class="total-item" v-if="meterDetail&&meterDetail.price">
|
|
<view class="total-item" v-if="meterDetail&&meterDetail.price">
|
|
- 水费合计:{{(sumQuantity*meterDetail.price).toFixed(2)}}元
|
|
|
|
|
|
+ 当日水费合计:{{(sumQuantity*meterDetail.price).toFixed(2)}}元
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
@@ -834,10 +834,13 @@
|
|
var obj=list[name]
|
|
var obj=list[name]
|
|
var text= `<p>${name}</p>`
|
|
var text= `<p>${name}</p>`
|
|
|
|
|
|
-
|
|
|
|
|
|
+ if(this.meterDetail.price){
|
|
|
|
+ text += `<p>水价:`+this.meterDetail.price+`元/m³</p>`
|
|
|
|
+ }
|
|
if (obj.consumption != undefined) {
|
|
if (obj.consumption != undefined) {
|
|
text += `<p>用水量:${obj.consumption} m³</p>`
|
|
text += `<p>用水量:${obj.consumption} m³</p>`
|
|
- //text += `<p>单位:立方米</p>`
|
|
|
|
|
|
+ text += `<p>平均水量:${obj.consumptionAverage} m³</p>`
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
if (obj.amount != undefined) {
|
|
if (obj.amount != undefined) {
|