支持深谷

childPackage/pages/billDetail/index.wxml

@@ -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>

childPackage/pages/electricQuery/components/reading/index.wxml

@@ -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>
   

childPackage/pages/electricQuery/index.js

@@ -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
           })

pages/billMeterDetail/index.js

@@ -13,6 +13,7 @@ Page({
       { title: '峰',renderBody: (item) => { return item?.peak } },
       { title: '平',renderBody: (item) => { return item?.flat } },
       { title: '谷',renderBody: (item) => { return item?.valley } },
+      { title: '深谷',renderBody: (item) => { return item?.deepValley } },
     ],
     list: []
   },
@@ -25,13 +26,13 @@ Page({
     this.setData({
       data: data,
       list: [
-        { type: "起码", sharp: data.startSharp, peak: data.startPeak, flat: data.startFlat, valley: data.startValley },
+        { type: "起码", sharp: data.startSharp, peak: data.startPeak, flat: data.startFlat, valley: data.startValley, deepValley: data.startDeepValley },
-        { type: "止码", sharp: data.endSharp, peak: data.endPeak, flat: data.endFlat, valley: data.endValley },
+        { type: "止码", sharp: data.endSharp, peak: data.endPeak, flat: data.endFlat, valley: data.endValley, deepValley: data.endDeepValley },
-        { type: "退补电量", sharp: data.refundSharp, peak: data.refundPeak, flat: data.refundFlat, valley: data.refundValley },
+        { type: "退补电量", sharp: data.refundSharp, peak: data.refundPeak, flat: data.refundFlat, valley: data.refundValley, deepValley: data.refundDeepValley },
-        { type: "从表电量", sharp: getRoundNumber(data.nestSharp), peak: getRoundNumber(data.nestPeak), flat: getRoundNumber(data.nestFlat), valley: getRoundNumber(data.nestValley) },
+        { type: "从表电量", sharp: getRoundNumber(data.nestSharp), peak: getRoundNumber(data.nestPeak), flat: getRoundNumber(data.nestFlat), valley: getRoundNumber(data.nestValley), deepValley: getRoundNumber(data.nestDeepValley) },
-        { type: "电度电量", sharp: getRoundNumber(data?.critical?.amount), peak: getRoundNumber(data.peak?.amount), flat: getRoundNumber(data.flat?.amount), valley: getRoundNumber(data.valley?.amount) },
+        { type: "电度电量", sharp: getRoundNumber(data?.critical?.amount), peak: getRoundNumber(data.peak?.amount), flat: getRoundNumber(data.flat?.amount), valley: getRoundNumber(data.valley?.amount), deepValley: getRoundNumber(data?.deepValley?.amount) },
-        { type: "分时单价", sharp: data.critical?.price, peak: data.peak?.price, flat: data.flat?.price, valley: data.valley?.price },
+        { type: "分时单价", sharp: data.critical?.price, peak: data.peak?.price, flat: data.flat?.price, valley: data.valley?.price , valley: data.valley?.price, deepValley: data.deepValley?.price},
-        { type: "电费", sharp: getRoundNumber(data.chargeSharp), peak: getRoundNumber(data.chargePeak), flat: getRoundNumber(data.chargeFlat), valley: getRoundNumber(data.chargeValley) },
+        { type: "电费", sharp: getRoundNumber(data.chargeSharp), peak: getRoundNumber(data.chargePeak), flat: getRoundNumber(data.chargeFlat), valley: getRoundNumber(data.chargeValley), deepValley: getRoundNumber(data.chargeDeepValley) },
       ]
     })
   },

pages/workBench/components/tenement/components/bindMeter/index.js

@@ -64,7 +64,7 @@ Component({
       })
     },
     async onSubmit() {
-      const { overall, critical, peak, valley, park, tenement, meter, readAt } = this.data;
+      const { overall, critical, peak, valley, park, tenement, meter, readAt, deepValley } = this.data;
       const { code, message } = await bindMeter(
         park, 
         tenement, 
@@ -74,6 +74,7 @@ Component({
           critical : critical ? Number(critical) : critical, 
           peak: peak ? Number(peak) : peak, 
           valley : valley ? Number(valley) : valley, 
+          deepValley : deepValley ? Number(deepValley) : deepValley, 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         }
         )

pages/workBench/components/tenement/components/bindMeter/index.wxml

@@ -101,6 +101,16 @@
         type="digit"
         placeholder="请输入有功（谷）"
     />
+    <van-field
+        value="{{ deepValley }}"
+        label="深谷"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="deepValley"
+        type="digit"
+        placeholder="请输入有功（深谷）"
+    />
 </view>
  
 </van-dialog>

pages/workBench/components/tenement/components/unBindMeter/index.js

@@ -69,7 +69,7 @@ Component({
       })
     },
     async onSubmit() {
-      const { overall, critical, peak, valley, park, tenement, meterId,readAt } = this.data;
+      const { overall, critical, peak, valley, deepValley, park, tenement, meterId,readAt } = this.data;
       const { code, message, } = await unbindMeter(
         park, 
         tenement, 
@@ -79,6 +79,7 @@ Component({
           critical : critical ? Number(critical) : critical, 
           peak: peak ? Number(peak) : peak, 
           valley : valley ? Number(valley) : valley, 
+          deepValley: deepValley ? Number(deepValley) : deepValley, 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         });
       if (code !== OK) {

pages/workBench/components/tenement/components/unBindMeter/index.wxml

@@ -89,6 +89,16 @@
         data-name="valley"
         placeholder="请输入有功（谷）"
     />
+    <van-field
+        value="{{ deepValley }}"
+        label="深谷"
+        type="number"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="deepValley"
+        placeholder="请输入有功（深谷）"
+    />
 </view>
  
 </van-dialog>

pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.js

@@ -64,7 +64,7 @@ Component({
       })
     },
     async onSubmit() {
-      const { overall, critical, peak, valley, park, tenement, meter, readAt, flat } = this.data;
+      const { overall, critical, peak, valley, deepValley, park, tenement, meter, readAt, flat } = this.data;
       const { code, message } = await bindMeter(
         park, 
         tenement, 
@@ -75,6 +75,7 @@ Component({
           peak: peak ? Number(peak) : peak, 
           flat: flat ? Number(flat) : flat, 
           valley : valley ? Number(valley) : valley, 
+          deepValley: deepValley ? Number(deepValley) : deepValley, 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         }
         )
@@ -111,6 +112,7 @@ Component({
         peak: Number(data?.peak || 0),
         flat: Number(data?.flat || 0),
         valley: Number(data?.valley || 0),
+        deepValley: Number(data?.deepValley || 0),
         meter04kvType: data?.meter04kvType,
         status: data?.breakType ? '合闸' : "分闸",
       })

pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml

@@ -101,6 +101,16 @@
         type="digit"
         placeholder="请输入有功（谷）"
     />
+    <van-field
+        value="{{ deepValley }}"
+        label="深谷"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="deepValley"
+        type="digit"
+        placeholder="请输入有功（深谷）"
+    />
 </view>
  
 </van-dialog>

pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js

@@ -60,6 +60,7 @@ Component({
         peak: Number(data?.peak || 0),
         flat: Number(data?.flat || 0),
         valley: Number(data?.valley || 0),
+        deepValley: Number(data?.deepValley || 0),
         meter04kvType: data?.meter04kvType,
         status: data?.breakType ? '合闸' : "分闸"
       })
@@ -74,7 +75,7 @@ Component({
       })
     },
     async onSubmit() {
-      const { overall, critical, peak, valley, park, tenement, meterId,readAt, flat } = this.data;
+      const { overall, critical, peak, valley, deepValley, park, tenement, meterId,readAt, flat } = this.data;
       const { code, message, } = await unbindMeter(
         park, 
         tenement, 
@@ -85,6 +86,7 @@ Component({
           peak: peak ? Number(peak) : peak, 
           flat: flat ? Number(flat) : flat,
           valley : valley ? Number(valley) : valley, 
+          deepValley: deepValley ? Number(deepValley) : deepValley, 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         });
       if (code !== OK) {

pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml

@@ -89,6 +89,16 @@
         data-name="valley"
         placeholder="请输入有功（谷）"
     />
+    <van-field
+        value="{{ deepValley }}"
+        label="深谷"
+        type="number"
+        title-width="132rpx"
+        border="{{false}}"
+        bind:change="onChange"
+        data-name="deepValley"
+        placeholder="请输入有功（深谷）"
+    />
 </view>
  
 </van-dialog>