From 771bacdafaf7bd5e1894e4bf0afd5bea0d8eac23 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Fri, 14 Nov 2025 17:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=A1=A8=E7=AE=B1=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8C=89=E5=BB=BA=E7=AD=91=E7=AD=9B=E9=80=89=EF=BC=8C=E5=80=8D?=
 =?UTF-8?q?=E7=8E=87=E5=BF=85=E5=A1=AB=EF=BC=8C=E6=8B=86=E8=A1=A8=E4=BC=A0?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/searchSelect/index.js                      | 5 +++--
 pages/workBenchNew/components/installMeter/index.js   | 2 +-
 pages/workBenchNew/components/installMeter/index.wxml | 3 +++
 pages/workBenchNew/components/uninstallMeter/index.js | 2 +-
 service/meter.js                                      | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/components/searchSelect/index.js b/components/searchSelect/index.js
index b27bdb6..1e86c61 100644
--- a/components/searchSelect/index.js
+++ b/components/searchSelect/index.js
@@ -19,6 +19,7 @@ Component({
     type: String,
     show: Boolean,
     park: String,
+    building: String,
     isBack: Boolean,
     filterBind: Boolean,
   },
@@ -248,8 +249,8 @@ Component({
       })
     },
     async onSearchMeterBox() {
-      const { park } = this.data;
-      const { code, message, data = [] } = await getParkBoxList({park});
+      const { park, building } = this.data;
+      const { code, message, data = [] } = await getParkBoxList({park, building});
       if (code !== OK) {
         alertInfo(message)
         return
diff --git a/pages/workBenchNew/components/installMeter/index.js b/pages/workBenchNew/components/installMeter/index.js
index 91f3904..2c02fe7 100644
--- a/pages/workBenchNew/components/installMeter/index.js
+++ b/pages/workBenchNew/components/installMeter/index.js
@@ -384,7 +384,7 @@ Page({
       tenement, sharp, peak, flat, valley, overall, url, sn, 
       collectionARatio, collectionBRatio, collectionCRatio
     } = this.data;
-    if (!park || !(meter || sn) || !address || meterType == null || !building || !meterBox) {
+    if (!park || !(meter || sn) || !address || meterType == null || !building || !meterBox || ratio == null) {
       alertInfo("请填写必填项后保存")
       return;
     }
diff --git a/pages/workBenchNew/components/installMeter/index.wxml b/pages/workBenchNew/components/installMeter/index.wxml
index e3aafef..3a1be0c 100644
--- a/pages/workBenchNew/components/installMeter/index.wxml
+++ b/pages/workBenchNew/components/installMeter/index.wxml
@@ -49,6 +49,7 @@
     placeholder="请选择电表箱"
     text="{{meterBoxName}}"
     bind:search="onMeterBoxFocus"
+
     required="{{true}}"
 />
 <searchSelectWrapper 
@@ -63,6 +64,7 @@
     placeholder="请输入倍率"
     type="input"
     text="ratio"
+    required="{{true}}"
     bind:changeText="changeRatio"
 />
 <searchSelectWrapper 
@@ -180,6 +182,7 @@
     title="{{title}}" 
     type="{{type}}" 
     park="{{park}}"
+    building="{{building}}"
     bindconfirm="onConfirm"
     bindcancel="onCancel"
     placeholder="{{placeholder}}"
diff --git a/pages/workBenchNew/components/uninstallMeter/index.js b/pages/workBenchNew/components/uninstallMeter/index.js
index 38f91fb..b92a280 100644
--- a/pages/workBenchNew/components/uninstallMeter/index.js
+++ b/pages/workBenchNew/components/uninstallMeter/index.js
@@ -152,7 +152,7 @@ Page({
       alertInfo("请选择表号")
       return;
     }
-    const { code, message } = await uninstallMeter({sn: meterInfo.meterSn, images: url, reason, tenement: meterInfo.tenement, critical, peak, flat, valley, overall, deepOverall})
+    const { code, message } = await uninstallMeter({sn: meter, images: url, reason, tenement: meterInfo.tenement, critical, peak, flat, valley, overall, deepOverall})
     if (code !== OK) {
       alertInfo(message)
       return
diff --git a/service/meter.js b/service/meter.js
index 15ac713..ff1afe8 100644
--- a/service/meter.js
+++ b/service/meter.js
@@ -49,8 +49,8 @@ export const getWorkMeterDetail = async function(code = '') {
 }
 
 // 获取某一园区下的电表箱列表
-export const getParkBoxList = async function({park = "", keyword = "", page = 1}) {
-  return await GET(`/box/${park}?page=${page}&keyword=${replaceSpecialIcon(keyword)}`);
+export const getParkBoxList = async function({park = "", keyword = "", page = 1, building =- ""}) {
+  return await GET(`/box/${park}?page=${page}&keyword=${replaceSpecialIcon(keyword)}&building=${building}`);
 }
 
 // 获取卡列表