提交工作台和首页的更改

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

@@ -23,7 +23,7 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    dateTimeShow: false,
   },
 
   /**
@@ -64,11 +64,19 @@ Component({
       })
     },
     async onSubmit() {
-      const { overall, critical, peak, valley, park, tenement, meter } = this.data;
-      const { code, message } = await bindMeter(park, tenement, { code: meter,  overall:overall? Number(overall) : overall, 
-        critical : critical ? Number(critical) : critical, 
-        peak: peak ? Number(peak) : peak, 
-        valley : valley ? Number(valley) : valley, readAt: dayjs().format('YYYY-MM-DD HH:mm:ss') })
+      const { overall, critical, peak, valley, park, tenement, meter, readAt } = this.data;
+      const { code, message } = await bindMeter(
+        park, 
+        tenement, 
+        { 
+          code: meter,  
+          overall:overall? Number(overall) : overall, 
+          critical : critical ? Number(critical) : critical, 
+          peak: peak ? Number(peak) : peak, 
+          valley : valley ? Number(valley) : valley, 
+          readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
+        }
+        )
       if (code !== OK) {
         alertInfo(message)
         return;
@@ -101,6 +109,15 @@ Component({
         overall: Number(data?.overall || 0),
         status: data?.breakType ? '合闸' : "分闸"
       })
+    },
+    dateTimeConfirm(e) {
+      this.setData({ readAt: e.detail.time, dateTimeShow: false })
+    },
+    dateTimeCancal(e) {
+      this.setData({ dateTimeShow: false })
+    },
+    onTimeFocus() {
+      this.setData({ dateTimeShow: true })
     }
   }
 })

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

@@ -4,6 +4,7 @@
     "van-dialog": "@vant/weapp/dialog/index",
     "search-select": "/components/searchSelect/index",
     "van-field": "@vant/weapp/field/index",
-    "van-button": "@vant/weapp/button/index"
+    "van-button": "@vant/weapp/button/index",
+    "date-time-picker": "/components/DateTimePicker/index"
   }
 }

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

@@ -38,6 +38,19 @@
         readonly
         type="digit"
     />
+    <van-field
+        value="{{ readAt }}"
+        placeholder="请选择绑定时间"
+        label="时间"
+        readonly
+        border="{{ false }}"
+        use-button-slot
+        title-width="100rpx"
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onTimeFocus">
+        选择
+        </van-button>
+    </van-field>
     <van-field
         value="{{ overall }}"
         label="表字"
@@ -99,4 +112,10 @@
     park="{{park}}"
     bindconfirm="onConfirm"
     bindcancel="onCancel"
-/>
+/>
+
+<date-time-picker 
+    show="{{dateTimeShow}}"
+    bind:confirm="dateTimeConfirm"
+    bind:cancel="dateTimeCancal"
+/>

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

@@ -5,6 +5,7 @@ import request from "../../../../../../utils/request"
 import { alertInfo, alertSuccess } from "../../../../../../utils/index";
 const { OK } = request
 import { getWorkMeterDetail } from "../../../../../../service/meter"
+import dayjs from "../../../../../../utils/dayjs"
 
 Component({
 
@@ -28,7 +29,7 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    dateTimeShow: false
   },
 
   /**
@@ -68,13 +69,17 @@ Component({
       })
     },
     async onSubmit() {
-      const { overall, critical, peak, valley, park, tenement, meterId } = this.data;
-      const { code, message, } = await unbindMeter(park, tenement, meterId, 
+      const { overall, critical, peak, valley, park, tenement, meterId,readAt } = this.data;
+      const { code, message, } = await unbindMeter(
+        park, 
+        tenement, 
+        meterId, 
         { 
           overall:overall? Number(overall) : overall, 
           critical : critical ? Number(critical) : critical, 
           peak: peak ? Number(peak) : peak, 
           valley : valley ? Number(valley) : valley, 
+          readAt: readAt || dayjs().format('YYYY-MM-DD HH:mm:ss') 
         });
       if (code !== OK) {
         alertInfo(message)
@@ -82,6 +87,15 @@ Component({
       }
       alertSuccess("解绑成功")
       this.triggerEvent("ok")
+    },
+    dateTimeConfirm(e) {
+      this.setData({ readAt: e.detail.time, dateTimeShow: false })
+    },
+    dateTimeCancal(e) {
+      this.setData({ dateTimeShow: false })
+    },
+    onTimeFocus() {
+      this.setData({ dateTimeShow: true })
     }
   }
 })

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

@@ -3,6 +3,8 @@
   "usingComponents": {
     "van-dialog": "@vant/weapp/dialog/index",
     "search-select": "/components/searchSelect/index",
-    "van-field": "@vant/weapp/field/index"
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "date-time-picker": "/components/DateTimePicker/index"
   }
 }

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

@@ -26,6 +26,19 @@
         title-width="132rpx"
         border="{{false}}"
     />
+    <van-field
+        value="{{ readAt }}"
+        placeholder="请选择解绑时间"
+        label="时间"
+        readonly
+        border="{{ false }}"
+        use-button-slot
+        title-width="100rpx"
+    >
+        <van-button slot="button" size="small" type="info" bind:click="onTimeFocus">
+        选择
+        </van-button>
+    </van-field>
     <van-field
         value="{{ overall }}"
         label="表字"
@@ -78,4 +91,10 @@
     />
 </view>
  
-</van-dialog>
+</van-dialog>
+
+<date-time-picker 
+    show="{{dateTimeShow}}"
+    bind:confirm="dateTimeConfirm"
+    bind:cancel="dateTimeCancal"
+/>

pages/workBench/components/tenement/index.js

@@ -183,6 +183,9 @@ Component({
         bindVisible: false,
       })
       this.getTenementMeters();
+    },
+    onTimeConfirm(e) {
+      console.log('e', e)
     }
   }
 })

pages/workBench/components/tenement/index.wxml

@@ -132,4 +132,4 @@
     meterId="{{meterId}}"
     meterAddress="{{meterAddress}}"
     bind:ok="onUnbindOk"
-/>
+/>