commit

app.json

@@ -40,7 +40,8 @@
     "pages/fcdetail/fcdetail",
     "pages/patrol_list/patrol_list",
     "pages/new_patrol_point/new_patrol_point",
-    "pages/xungengdetails/xungengdetails"
+    "pages/xungengdetails/xungengdetails",
+    "pages/patrol_record_list/patrol_record_list"
   ],
   "requiredPrivateInfos": [
     "getLocation"

base/httputil.js

@@ -1,7 +1,7 @@
 // let BASE_Server = "http://127.0.0.1:8329"
 
-  let BASE_Server = "https://192.168.1.100:18080"
-//let BASE_Server = "https://sookajs.top:18080"
+  // let BASE_Server = "https://192.168.1.100:18080"
+let BASE_Server = "https://sookajs.top:18080"
 
 
 

pages/new_patrol_point/new_patrol_point.js

@@ -48,26 +48,47 @@ Page({
   bindInputCode(e) {
     this.data.details.code = e.detail.value
   },
-
+  bindViewScan(){
+    wx.scanCode({
+      onlyFromCamera: true,
+      success: (res) => {
+       this.setData({
+        ['details.code']:res.result,
+      })
+      },
+      fail: (res) => {
+        wx.showToast({
+          title: '扫描失败请重试',
+          icon:'none'
+        })
+      }
+    })
+  },
   //------------------------------------------
 
   updateDetails() {
     if(this.data.details.name==null){
       wx.showToast({
         title:'请输入巡更点名称',
+        icon:'none'
       })
+      return
     }
     
     if(this.data.details.code==null){
       wx.showToast({
         title:'请扫描巡更点编码',
+        icon:'none'
       })
+      return
     }
     
-    if(this.data.details.longitude||this.data.details.latitude){
+    if(this.data.details.longitude==0||this.data.details.latitude==0){
       wx.showToast({
         title:'请点击定位当前位置',
+        icon:'none'
       })
+      return
     }
   
     let obj = new Object();
@@ -158,10 +179,8 @@ Page({
       type: 'wgs84', //返回可以用于wx.openLocation的经纬度
       success: function (res) {
         that.setData({
-          details: {
-            longitude: res.longitude,
-            latitude: res.latitude
-          }
+          ['details.longitude']:  res.longitude,
+          ['details.latitude']:  res.latitude
         })
       },
     })

pages/new_patrol_point/new_patrol_point.wxml

@@ -16,7 +16,8 @@
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点编号</view>
-      <input class="inp_txt" bindinput="bindInputCode" value="{{details.code}}"  placeholder="请输入巡更点编号"/>
+      <i class="iconfont icon-saoyisao1" bindtap="bindViewScan"></i>
+      <input class="inp_txt inp_txt2" bindinput="bindInputCode" value="{{details.code}}"  placeholder="请扫描巡更点编号"/>
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点描述</view>

pages/new_patrol_point/new_patrol_point.wxss

@@ -47,4 +47,23 @@ padding: 24rpx 0px!important;
   font-size: 32rpx;
   margin: 60rpx auto;
   padding: 24rpx 0px!important;
-}
+}
+.input_vi input.inp_txt2{
+  border:0px;
+  height: 100rpx;
+  line-height: 100rpx;
+ padding-left: 20rpx;
+ border-radius: 10rpx;
+ font-size: 34rpx;
+ color: #555;
+ text-align: right;
+ float: right;
+}
+.input_vi i{
+  display: block;
+  float: right;
+  line-height: 100rpx;
+  margin-left: 14rpx;
+  color: #535353;
+  font-size: 48rpx;
+ }

pages/patrol_list/patrol_list.js

@@ -12,26 +12,26 @@ Page({
 
   onLoad(options) {
     this.data.enterpriseId=options.enterpriseId
+  },
+  onShow(){
     this.getPatrolPointList()
   },
 
   getPatrolPointList() {
     let obj = new Object()
-    obj.pageNum = this.data.pageNum
-    obj.busEnterpriseName = ""
-    obj.pageSize = 10
-    obj.reasonable = true
-    obj.enterpriseId=this.data.enterpriseId
-    // http.send_get("/system/AppXunchaController/getXunchaList", obj, this.getPatrolPointListSuccess)
+    // obj.pageNum = this.data.pageNum
+    // obj.busEnterpriseName = ""
+    // obj.pageSize = 10
+    // obj.reasonable = true
+    obj.busEnterpriseId=this.data.enterpriseId
+    http.send_get("/system/AppPatrolstationController/getPatrolstationList", obj, this.getPatrolPointListSuccess)
   },
   getPatrolPointListSuccess(res) {
-    console.log("@@@@",res)
     if(res.code==200){
        this.setData({
-        mList: res.data.rows
+        mList: res.data
        })
     }
-   
   },
 
 

pages/patrol_list/patrol_list.wxml

@@ -14,18 +14,18 @@
     <!--循环本行-->
     <!-- <i class="iconfont icon-wushuju zwsj"></i>
   <text class="zwsj_text">暂无数据</text> -->
-    <view class="list_li flex-c"  wx:for="{{xunchaList}}" wx:key="index"
+    <view class="list_li flex-c"  wx:for="{{mList}}" wx:key="index"
     bindtap="bindViewToDetails" data-buslogid="{{item.id}}">
       <view class="list_li_1">
         <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.isRisk != 1}}"></i> -->
         <!-- <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.isRisk == 1}}"></i> -->
-        <text>[{{item.busLogTypeLabel}}]{{item.busEnterpriseName}}</text>
+        <text>[{{item.busEnterpriseName}}]{{item.busPatrolstationName}}</text>
         <i class="iconfont icon-xiangyou list_right"></i>
       </view>
       <view class="list_li_2">
-        <text class="time-text">{{item.deptName}}</text>
-        <text class="time-text">{{item.nickName}}</text>
-        <text class="time-text">{{item.createTime}}</text>
+        <text class="time-text">{{item.busPatrolstationCode}}</text>
+        <text class="time-text">{{item.remarks}}</text>
+        <!-- <text class="time-text">{{item.busEnterpriseName}}</text> -->
       </view>
       <!-- <view class="line2"></view> -->
     </view>