支持深谷

This commit is contained in:
2025-11-12 08:58:33 +08:00
parent 2535720023
commit e82ffd6bfc
12 changed files with 76 additions and 12 deletions

View File

@@ -129,6 +129,7 @@
<view class="colContentValue2">峰: {{ detail.comprehensive.peakAmount }} </view>
<view class="colContentValue2">平: {{ detail.comprehensive.flatAmount }} </view>
<view class="colContentValue2">谷: {{ detail.comprehensive.valleyAmount }} </view>
<view class="colContentValue2">深谷: {{ detail.comprehensive.deepValleyAmount }} </view>
</view>
</van-col>
<van-col span="12">
@@ -141,6 +142,7 @@
<view class="colContentValue2">峰: {{ detail.comprehensive.pricePeak }} </view>
<view class="colContentValue2">平: {{ detail.comprehensive.priceFlat }} </view>
<view class="colContentValue2">谷: {{ detail.comprehensive.priceValley }} </view>
<view class="colContentValue2">深谷: {{ detail.comprehensive.priceDeepValley }} </view>
</view>
</van-col>
</van-row>

View File

@@ -136,6 +136,13 @@
readonly
wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
/>
<van-field
value="{{ readingDetail.deepValley }}"
border="{{ false }}"
label="当前表字(深谷)"
readonly
wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
/>
<van-field
value="{{ readingDetail.valleyAmount }}"
border="{{ false }}"
@@ -143,6 +150,13 @@
readonly
wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
/>
<van-field
value="{{ readingDetail.deepValleyAmount }}"
border="{{ false }}"
label="深谷用电量"
readonly
wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}"
/>
<view class="text">上次抄表记录起,至现在时间内的用电量</view>
</van-cell-group>

View File

@@ -41,6 +41,7 @@ Page({
{ key: 'peak', title: '峰' },
{ key: 'flat', title: '平' },
{ key: 'valley', title: '谷' },
{ key: 'deepValley', title: '深谷' },
],
list: [],
visible: false,
@@ -171,7 +172,7 @@ Page({
const newList = [...times].map(item => {
const exist = list.find(ele => ele.time === item)
if (exist) {
return Number(exist.critical)+ Number(exist.peak)+Number(exist.flat)+Number(exist.valley);
return Number(exist.critical || 0)+ Number(exist.peak || 0)+Number(exist.flat || 0)+Number(exist.valley || 0)+Number(exist.deepValley || 0);
}
return null
})