From 253572002324108826e60d89767d9a694b973398 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Sat, 11 Oct 2025 15:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=94=B5=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E8=A7=A3=E7=BB=91=E7=94=B5=E8=A1=A8=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E4=BC=A0=E5=B0=96=E5=B3=B0=E5=B9=B3=E8=B0=B7?=
 =?UTF-8?q?=E5=92=8C=E4=BF=9D=E5=AD=98=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=A0?=
 =?UTF-8?q?=E5=B9=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workBenchTenement/components/bindMeter/index.js    | 10 ++++++++--
 .../workBenchTenement/components/bindMeter/index.wxml  |  4 ++--
 .../workBenchTenement/components/unBindMeter/index.js  |  8 +++++++-
 .../components/unBindMeter/index.wxml                  |  4 ++--
 .../components/workBenchTenement/index.wxml            |  2 ++
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.js b/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.js
index 0ad9d61..caba95d 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 } = this.data;
+      const { overall, critical, peak, valley, park, tenement, meter, readAt, flat } = this.data;
       const { code, message } = await bindMeter(
         park, 
         tenement, 
@@ -73,6 +73,7 @@ Component({
           overall:overall? Number(overall) : overall, 
           critical : critical ? Number(critical) : critical, 
           peak: peak ? Number(peak) : peak, 
+          flat: flat ? Number(flat) : flat, 
           valley : valley ? Number(valley) : valley, 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         }
@@ -106,7 +107,12 @@ Component({
       }
       this.setData({
         overall: Number(data?.overall || 0),
-        status: data?.breakType ? '合闸' : "分闸"
+        critical: Number(data?.sharp || 0),
+        peak: Number(data?.peak || 0),
+        flat: Number(data?.flat || 0),
+        valley: Number(data?.valley || 0),
+        meter04kvType: data?.meter04kvType,
+        status: data?.breakType ? '合闸' : "分闸",
       })
     },
     dateTimeConfirm(e) {
diff --git a/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml b/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml
index 0e2ed30..42bd669 100644
--- a/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml
+++ b/pages/workBenchNew/components/workBenchTenement/components/bindMeter/index.wxml
@@ -82,12 +82,12 @@
         type="digit"
     />
     <van-field
-        value="{{ overall }}"
+        value="{{ flat }}"
         label="平"
         title-width="132rpx"
         border="{{false}}"
         bind:change="onChange"
-        data-name="overall"
+        data-name="flat"
         placeholder="请输入有功（平）"
         type="digit"
     />
diff --git a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js b/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js
index ebdda83..7ee64fc 100644
--- a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js
+++ b/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.js
@@ -56,6 +56,11 @@ Component({
       }
       this.setData({
         overall: Number(data?.overall || 0),
+        critical: Number(data?.sharp || 0),
+        peak: Number(data?.peak || 0),
+        flat: Number(data?.flat || 0),
+        valley: Number(data?.valley || 0),
+        meter04kvType: data?.meter04kvType,
         status: data?.breakType ? '合闸' : "分闸"
       })
     },
@@ -69,7 +74,7 @@ Component({
       })
     },
     async onSubmit() {
-      const { overall, critical, peak, valley, park, tenement, meterId,readAt } = this.data;
+      const { overall, critical, peak, valley, park, tenement, meterId,readAt, flat } = this.data;
       const { code, message, } = await unbindMeter(
         park, 
         tenement, 
@@ -78,6 +83,7 @@ Component({
           overall:overall? Number(overall) : overall, 
           critical : critical ? Number(critical) : critical, 
           peak: peak ? Number(peak) : peak, 
+          flat: flat ? Number(flat) : flat,
           valley : valley ? Number(valley) : valley, 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         });
diff --git a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml b/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml
index 7a9952f..a4c37fc 100644
--- a/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml
+++ b/pages/workBenchNew/components/workBenchTenement/components/unBindMeter/index.wxml
@@ -70,12 +70,12 @@
         type="number"
     />
     <van-field
-        value="{{ overall }}"
+        value="{{ flat }}"
         label="平"
         title-width="132rpx"
         border="{{false}}"
         bind:change="onChange"
-        data-name="overall"
+        data-name="flat"
         type="number"
         placeholder="请输入有功（平）"
     />
diff --git a/pages/workBenchNew/components/workBenchTenement/index.wxml b/pages/workBenchNew/components/workBenchTenement/index.wxml
index ab67b7e..bf34e00 100644
--- a/pages/workBenchNew/components/workBenchTenement/index.wxml
+++ b/pages/workBenchNew/components/workBenchTenement/index.wxml
@@ -118,6 +118,7 @@
 
 <bindMeter 
     visible="{{bindVisible}}" 
+    wx:if="{{bindVisible}}" 
     park="{{park}}" 
     tenement="{{tenement}}"
     tenementName="{{tenementName}}"
@@ -126,6 +127,7 @@
 />
 
 <unBindMeter 
+    wx:if="{{unbindVisible}}"
     visible="{{unbindVisible}}"
     park="{{park}}" 
     tenement="{{tenement}}"