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