1.充电站详情设备列表增加刷新按钮；

2.编辑工单实际完成时间给出默认值（系统当前时间）
3.工单小类增加“其他”

pages/charginfo/charginfo.js

@@ -39,6 +39,7 @@ Page({
     carParkingRate: false,
     // 停车时间
     parkTime: 0,
+    scrollTop:0
   },
   execParking(that,stationId){
     wx.request({
@@ -220,7 +221,6 @@ Page({
     wx.showLoading({
       title: '数据加载中....',
     })
-
   let that = this;
     wx.request({
       url: getApp().globalData.postHeadAgreement +'/restapi/wechat/chargInfo',
@@ -274,6 +274,66 @@ Page({
     });
 
   },
+  refreshPage: function(e) {
+    wx.showLoading({
+      title: '数据加载中....',
+    })
+    let that = this;
+    that.setData({
+      pagenum:1
+    });
+    wx.request({
+      url: getApp().globalData.postHeadAgreement +'/restapi/wechat/chargInfo',
+      data: {
+        id: that.data.chargid,
+        pagenum: this.data.pagenum++,
+        pagesize: 10,
+      },
+      method: 'POST',
+      success(res) {
+        let chargList = res.data.chargList.rows;
+
+        chargList.forEach(key => {
+          let chargstatusname = '';
+          let chargstatusclass = '';
+          if(key.chargstatus == 2){
+            chargstatusname='空闲中'
+            chargstatusclass = 'chargstatus_kxz'
+          }else if(key.chargstatus == 11){
+            chargstatusname='已插枪'
+            chargstatusclass = 'chargstatus_ycq'
+          }else if(key.chargstatus == 3 || key.chargstatus == 10){
+            chargstatusname='充电中'
+            chargstatusclass = 'chargstatus_cdz'
+          }else if(key.chargstatus == 0){
+            chargstatusname='离线'
+            chargstatusclass = 'chargstatus_lx'
+          }else{
+            chargstatusname='故障'
+            chargstatusclass = 'chargstatus_gz'
+          }
+          key.chargstatusname = chargstatusname;
+          key.chargstatusclass = chargstatusclass;
+      })
+
+        console.log(chargList);
+        // that.rechargeTimeOrder(chargemoneylogs);
+        wx.hideLoading()
+        that.setData({
+          chargList: chargList,
+          total: res.data.total,
+          dataLoading: false,
+          fastFree : res.data.fastFree,
+          slowFree : res.data.slowFree,
+          fastSum : res.data.fastSum,
+          slowSum : res.data.slowSum
+        });
+      }
+    });
+    this.setData({
+      scrollTop: 0
+    });
+  },
   goScanResult(e){
     // scan_result
 

pages/charginfo/charginfo.wxml

@@ -96,8 +96,10 @@
   </view>
 
   <view class="title_list">终端列表</view>
-
-  <scroll-view class='context' scroll-y='true' bindscrolltolower="bindScrollTolowerEvent" >
+  <view  bindtap="refreshPage">
+    <image class= "refreshPage" src="/images/refresh.png"></image>
+  </view>
+  <scroll-view class='context' scroll-y='true' bindscrolltolower="bindScrollTolowerEvent"  id="scrollview" scrollTop="{{scrollTop}}" >
     <view class="charg"  hover-class='active' wx:key='{{key}}' wx:for="{{chargList}}" data-idx="{{item}}" bindtap="{{userInfo.flag ?'chargingLog':''}}">
       <view class="runstatus {{item.chargstatusclass}}">
       <view class="runstatus_inner ">{{item.chargstatusname}}</view>

pages/charginfo/charginfo.wxss

@@ -381,4 +381,13 @@ text.price {
     min-height: 42rpx;
     color: #9d9d9d;
     margin: 0;
+}
+.refreshPage{
+  width: 70rpx;
+  height: 70rpx;
+  /* float: right; */
+  z-index: 999;
+  position: absolute;
+  right: 5px;
+  bottom: 25px;
 }

pages/worksheetinfo/addworksheetinfo.js

@@ -68,7 +68,10 @@ Page({
       }, {
       value: 7,
       text: '工程验收'
-      }],
+      },{
+        value: 8,
+        text: '其他'
+        }],
     wokSmallclassIndex: 1,
     breakdownType: [{
       value: 1,

pages/worksheetinfo/worksheetinfo.js

@@ -68,6 +68,9 @@ Page({
       }, {
       value: 7,
       text: '工程验收'
+      }, {
+        value: 8,
+        text: '其他'
       }],
     wokSmallclassIndex: 1,
     breakdownType: [{
@@ -107,8 +110,8 @@ Page({
       placeholder: '请选择时间', 
       startDateTime: '2020-01-01 00:00',
       endDateTime: '2040-01-01 00:00',
-      // pText: Util.formatTimePicker(new Date()) //'2022-04-30 00:00'
-      pText: '0000-00-00 00:00' //'2022-04-30 00:00'
+      pText: Util.formatTimePicker(new Date()) //'2022-04-30 00:00'
+      // pText: '0000-00-00 00:00' //'2022-04-30 00:00'
     },
     accendantids: [],
     userNames:[],
@@ -608,7 +611,7 @@ Page({
       });
     }else{
       let finishparams = this.data.finishparams;
-      finishparams['pText'] = '0000-00-00 00:00'
+      finishparams['pText'] = Util.formatTimePicker(new Date())
       this.setData({
         finishparams: finishparams
       });

utils/wechat.js

@@ -21,7 +21,6 @@ class Wechat {
   /**
    * 设置本地数据缓存
    * @param {string} key 
-   * 
    * @param {string} value 
    * @return {Promise} 
    */