处理冲突

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

@@ -107,12 +107,12 @@ Component({
         return;
       }
       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),
-        deepValley: Number(data?.deepValley || 0),
+        overall: data?.overall ? Number(data?.overall || 0) : null,
+        critical: data?.overall ? Number(data?.sharp || 0) : null,
+        peak: data?.overall ? Number(data?.peak || 0) : null,
+        flat: data?.overall ? Number(data?.flat || 0) : null,
+        valley: data?.overall ? Number(data?.valley || 0) : null,
+        deepValley: data?.deepValley ? Number(data?.deepValley || 0) : null,
         meter04kvType: data?.meter04kvType,
         status: data?.breakType ? '合闸' : "分闸",
       })

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

@@ -122,6 +122,7 @@
     park="{{park}}"
     bindconfirm="onConfirm"
     bindcancel="onCancel"
+    filterBind="{{true}}"
 />
 
 <date-time-picker 

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

@@ -55,12 +55,12 @@ Component({
         return;
       }
       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),
-        deepValley: Number(data?.deepValley || 0),
+        overall: data?.overall ? Number(data?.overall || 0) : null,
+        critical: data?.overall ? Number(data?.sharp || 0) : null,
+        peak: data?.overall ? Number(data?.peak || 0) : null,
+        flat: data?.overall ? Number(data?.flat || 0) : null,
+        valley: data?.overall ? Number(data?.valley || 0) : null,
+        deepValley: data?.deepValley ? Number(data?.deepValley || 0) : null,
         meter04kvType: data?.meter04kvType,
         status: data?.breakType ? '合闸' : "分闸"
       })

pages/workBenchNew/components/workBenchTenement/index.js

@@ -20,7 +20,17 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    console.log("options", options)
+    const { park, parkName, name, id } = options
+    this.setData({
+      park,
+      parkName,
+      tenementName: name,
+      tenement: id
+    })
+    if (id) {
+      this.getTenementInfo();
+    }
   },
   onParkFocus(e) {
     this.setData({