From e82ffd6bfce570f794f2687872afef5d5e3fd5ee Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Wed, 12 Nov 2025 08:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B7=B1=E8=B0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- childPackage/pages/billDetail/index.wxml | 2 ++ .../electricQuery/components/reading/index.wxml | 14 ++++++++++++++ childPackage/pages/electricQuery/index.js | 3 ++- pages/billMeterDetail/index.js | 15 ++++++++------- .../tenement/components/bindMeter/index.js | 3 ++- .../tenement/components/bindMeter/index.wxml | 10 ++++++++++ .../tenement/components/unBindMeter/index.js | 3 ++- .../tenement/components/unBindMeter/index.wxml | 10 ++++++++++ .../components/bindMeter/index.js | 4 +++- .../components/bindMeter/index.wxml | 10 ++++++++++ .../components/unBindMeter/index.js | 4 +++- .../components/unBindMeter/index.wxml | 10 ++++++++++ 12 files changed, 76 insertions(+), 12 deletions(-) diff --git a/childPackage/pages/billDetail/index.wxml b/childPackage/pages/billDetail/index.wxml index 443e46a..f69d1a3 100644 --- a/childPackage/pages/billDetail/index.wxml +++ b/childPackage/pages/billDetail/index.wxml @@ -129,6 +129,7 @@ 峰： {{ detail.comprehensive.peakAmount }} 平： {{ detail.comprehensive.flatAmount }} 谷： {{ detail.comprehensive.valleyAmount }} + 深谷： {{ detail.comprehensive.deepValleyAmount }} @@ -141,6 +142,7 @@ 峰： {{ detail.comprehensive.pricePeak }} 平： {{ detail.comprehensive.priceFlat }} 谷： {{ detail.comprehensive.priceValley }} + 深谷： {{ detail.comprehensive.priceDeepValley }} diff --git a/childPackage/pages/electricQuery/components/reading/index.wxml b/childPackage/pages/electricQuery/components/reading/index.wxml index 7aff417..01ca838 100644 --- a/childPackage/pages/electricQuery/components/reading/index.wxml +++ b/childPackage/pages/electricQuery/components/reading/index.wxml @@ -136,6 +136,13 @@ readonly wx:if="{{park.meter04kvType === 1|| park.meter04kvType === 2}}" /> + + 上次抄表记录起,至现在时间内的用电量 diff --git a/childPackage/pages/electricQuery/index.js b/childPackage/pages/electricQuery/index.js index 2e15552..9ae7766 100644 --- a/childPackage/pages/electricQuery/index.js +++ b/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 }) diff --git a/pages/billMeterDetail/index.js b/pages/billMeterDetail/index.js index a768265..6fd67ec 100644 --- a/pages/billMeterDetail/index.js +++ b/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.endSharp, peak: data.endPeak, flat: data.endFlat, valley: data.endValley }, - { type: "退补电量", sharp: data.refundSharp, peak: data.refundPeak, flat: data.refundFlat, valley: data.refundValley }, - { type: "从表电量", sharp: getRoundNumber(data.nestSharp), peak: getRoundNumber(data.nestPeak), flat: getRoundNumber(data.nestFlat), valley: getRoundNumber(data.nestValley) }, - { type: "电度电量", sharp: getRoundNumber(data?.critical?.amount), peak: getRoundNumber(data.peak?.amount), flat: getRoundNumber(data.flat?.amount), valley: getRoundNumber(data.valley?.amount) }, - { type: "分时单价", sharp: data.critical?.price, peak: data.peak?.price, flat: data.flat?.price, valley: data.valley?.price }, - { type: "电费", sharp: getRoundNumber(data.chargeSharp), peak: getRoundNumber(data.chargePeak), flat: getRoundNumber(data.chargeFlat), valley: getRoundNumber(data.chargeValley) }, + { 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, deepValley: data.endDeepValley }, + { 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), 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), deepValley: getRoundNumber(data?.deepValley?.amount) }, + { 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), deepValley: getRoundNumber(data.chargeDeepValley) }, ] }) }, diff --git a/pages/workBench/components/tenement/components/bindMeter/index.js b/pages/workBench/components/tenement/components/bindMeter/index.js index 0ad9d61..3be41b4 100644 --- a/pages/workBench/components/tenement/components/bindMeter/index.js +++ b/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') } ) diff --git a/pages/workBench/components/tenement/components/bindMeter/index.wxml b/pages/workBench/components/tenement/components/bindMeter/index.wxml index 0e2ed30..159812d 100644 --- a/pages/workBench/components/tenement/components/bindMeter/index.wxml +++ b/pages/workBench/components/tenement/components/bindMeter/index.wxml @@ -101,6 +101,16 @@ type="digit" placeholder="请输入有功（谷）" /> + diff --git a/pages/workBench/components/tenement/components/unBindMeter/index.js b/pages/workBench/components/tenement/components/unBindMeter/index.js index ebdda83..f3d72e2 100644 --- a/pages/workBench/components/tenement/components/unBindMeter/index.js +++ b/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) { diff --git a/pages/workBench/components/tenement/components/unBindMeter/index.wxml b/pages/workBench/components/tenement/components/unBindMeter/index.wxml index 7a9952f..9a5ac1e 100644 --- a/pages/workBench/components/tenement/components/unBindMeter/index.wxml +++ b/pages/workBench/components/tenement/components/unBindMeter/index.wxml @@ -89,6 +89,16 @@ data-name="valley" placeholder="请输入有功（谷）" /> + diff --git a/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.js b/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.js index caba95d..75f4d98 100644 --- a/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.js +++ b/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 ? '合闸' : "分闸", }) diff --git a/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml b/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml index 42bd669..be4eea3 100644 --- a/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml +++ b/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml @@ -101,6 +101,16 @@ type="digit" placeholder="请输入有功（谷）" /> + diff --git a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js b/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js index 7ee64fc..89ef917 100644 --- a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js +++ b/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) { diff --git a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml b/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml index a4c37fc..4c225f3 100644 --- a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml +++ b/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml @@ -89,6 +89,16 @@ data-name="valley" placeholder="请输入有功（谷）" /> +