修改字符串格式的数字为“”的时候接口报错的问题和装表的时候未过滤已装电表的问题

components/searchSelect/index.js

@@ -222,7 +222,7 @@ Component({
     },
     async onSearchInventoryMeter() {
       const { searchText = "", park, filterBind } = this.data;
-      const { code, message, data: parks = [] } = await getInventoryMeter({keyword: searchText, park, isNeedBind: !filterBind, a : 1});
+      const { code, message, data: parks = [] } = await getInventoryMeter({keyword: searchText, park, isNeedBind: !filterBind, status: 1});
       if (code !== OK) {
         alertInfo(message)
         return

pages/workBench/components/tenement/components/bindMeter/index.js

@@ -70,11 +70,11 @@ Component({
         tenement, 
         { 
           code: meter,  
-          overall:overall? Number(overall) : overall, 
-          critical : critical ? Number(critical) : critical, 
-          peak: peak ? Number(peak) : peak, 
-          valley : valley ? Number(valley) : valley, 
-          deepValley : deepValley ? Number(deepValley) : deepValley, 
+          overall:overall? Number(overall) : (overall === "" ? null : overall), 
+          critical : critical ? Number(critical) : (critical === "" ? null : critical), 
+          peak: peak ? Number(peak) : (peak === "" ? null : peak), 
+          valley : valley ? Number(valley) : (valley === "" ? null : valley), 
+          deepValley : deepValley ? Number(deepValley) : (deepValley === "" ? null : deepValley), 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         }
         )

pages/workBench/components/tenement/components/unBindMeter/index.js

@@ -75,11 +75,11 @@ Component({
         tenement, 
         meterId, 
         { 
-          overall:overall? Number(overall) : overall, 
-          critical : critical ? Number(critical) : critical, 
-          peak: peak ? Number(peak) : peak, 
-          valley : valley ? Number(valley) : valley, 
-          deepValley: deepValley ? Number(deepValley) : deepValley, 
+          overall:overall? Number(overall) : (overall === "" ? null : overall), 
+          critical : critical ? Number(critical) : (critical === "" ? null : critical), 
+          peak: peak ? Number(peak) : (peak === "" ? null : peak), 
+          valley : valley ? Number(valley) : (valley === "" ? null : valley), 
+          deepValley: deepValley ? Number(deepValley) : (deepValley === "" ? null : deepValley), 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         });
       if (code !== OK) {

pages/workBenchNew/components/installMeter/index.js

@@ -428,7 +428,13 @@ Page({
     const { code, data, message } = await installMeter({
       park, meterSn: meter, address, building, meterBox, meterType,  
       ratio, area, card, collectionA, collectionB, collectionC,
-      tenement, sharp, peak, flat, valley, overall, url, sn
+      tenement, 
+      sharp: sharp === "" ? null : sharp, 
+      peak: peak === "" ? null : peak, 
+      flat: flat === "" ? null : flat, 
+      valley: valley === "" ? null : valley, 
+      overall: overall === "" ? null : overall, 
+      url, sn
     })
     if (code !== OK) {
       alertInfo(message)

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

@@ -70,12 +70,12 @@ Component({
         tenement, 
         { 
           code: meter,  
-          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, 
-          deepValley: deepValley ? Number(deepValley) : deepValley, 
+          overall:overall? Number(overall) : (overall === "" ? null : overall), 
+          critical : critical ? Number(critical) : (critical === "" ? null : critical), 
+          peak: peak ? Number(peak) : (peak === "" ? null : peak), 
+          flat: flat ? Number(flat) : (flat === "" ? null : flat), 
+          valley : valley ? Number(valley) : (valley === "" ? null : valley), 
+          deepValley: deepValley ? Number(deepValley) : (deepValley === "" ? null : deepValley), 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         }
         )

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

@@ -81,12 +81,12 @@ Component({
         tenement, 
         meterId, 
         { 
-          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, 
-          deepValley: deepValley ? Number(deepValley) : deepValley, 
+          overall:overall? Number(overall) : (overall === "" ? null : overall), 
+          critical : critical ? Number(critical) : (critical === "" ? null : critical), 
+          peak: peak ? Number(peak) : (peak === "" ? null : peak), 
+          flat: flat ? Number(flat) : (flat === "" ? null : flat),
+          valley : valley ? Number(valley) : (valley === "" ? null : valley), 
+          deepValley: deepValley ? Number(deepValley) : (deepValley === null ? "" : deepValley), 
           readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         });
       if (code !== OK) {

pages/workBenchTodoList/index.js

@@ -228,9 +228,7 @@ onMenuSelect(e) {
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    loadingFunc(async () => {
-      await this.init()
-    })
+    
   },
 
   /**
@@ -244,7 +242,9 @@ onMenuSelect(e) {
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    loadingFunc(async () => {
+      await this.init()
+    })
   },
 
   /**

pages/workBenchTodoList/index.wxml

@@ -60,7 +60,13 @@
                                     {{ item.address }}
                                 </view>
                                 <view class="th" style="flex: 0 0 150rpx;">
-                                    {{ item.current_user_audit_status === 0 ? "处理中" : "已确认" }}
+                                    <view 
+                                        class="primaryTextBtn" 
+                                        wx:if="{{item.flow_status === 1}}"
+                                        data-id="{{item.id}}" 
+                                        bind:tap="handleDoNotice"   
+                                    > 确认 </view>
+                                    <view wx:else> 已确认 </view>
                                 </view>
                                 <view class="th" style="flex: 0 0 120rpx; justify-content: flex-end; display: flex; align-items: center;">
                                     <van-icon name="ellipsis" size="24px" bind:tap="showActionMenu" data-id="{{item.id}}" data-data="{{index}}" data-status="{{item.current_user_audit_status}}" class="more-icon" />
@@ -73,11 +79,7 @@
                                         
                                         close-on-click-action 
                                     />
-                                    <!-- <view 
-                                        class="primaryTextBtn" 
-                                        wx:if="{{item.flow_status === 1}}"
-                                        data-id="{{item.id}}"    
-                                    > 确认 </view> -->
+                      
                                 </view>
                             </view>
 

utils/index.js

@@ -45,10 +45,10 @@ export function getConfigByEnv() {
   switch (envVersion) {
     // 开发版
     case 'develop':
-      // api = "http://localhost:8000"
+      api = "http://localhost:8000"
       // api = "https://zgd.hbhcbn.com/api3"
       // TODO: 发布正式时使用此路径
-      api = "https://zgd.hbhcbn.com/wxApi"
+      // api = "https://zgd.hbhcbn.com/wxApi"
       // api = "http://127.0.0.1:4523/m1/4143821-0-default"
       break;
     // 体验版