巡更点新增 接口

pages/details/details.js

@@ -72,7 +72,7 @@ Page({
   //巡更点跳转
   xungengList(){
     wx.navigateTo({
-      url: '../patrol_list/patrol_list',
+      url: '../patrol_list/patrol_list?enterpriseId='+this.data.busEnterpriseId,
     })
   },
   //导航

pages/new_patrol_point/new_patrol_point.js

@@ -1,9 +1,5 @@
-
-// pages/new_patrol_point/new_patrol_point.js
-
 import http from '../../base/httputil'
 const app = getApp()
-
 Page({
 
   /**
@@ -18,21 +14,17 @@ Page({
       latitude: Number,
       name: null,
       code: null,
-      address: null,
+      remark: null,
     },
 
 
-
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
-
-
-    this.enterpriseId = options.id
+    this.data.enterpriseId = options.enterpriseId
     // this.getDetails()
   },
 
@@ -50,8 +42,8 @@ Page({
   bindInputName(e) {
     this.data.details.name = e.detail.value
   },
-  bindInputAddress(e) {
-    this.data.details.address = e.detail.value
+  bindInputRemark(e) {
+    this.data.details.remark = e.detail.value
   },
   bindInputCode(e) {
     this.data.details.code = e.detail.value
@@ -60,13 +52,33 @@ Page({
   //------------------------------------------
 
   updateDetails() {
+    if(this.data.details.name==null){
+      wx.showToast({
+        title:'请输入巡更点名称',
+      })
+    }
+    
+    if(this.data.details.code==null){
+      wx.showToast({
+        title:'请扫描巡更点编码',
+      })
+    }
+    
+    if(this.data.details.longitude||this.data.details.latitude){
+      wx.showToast({
+        title:'请点击定位当前位置',
+      })
+    }
+  
     let obj = new Object();
-    obj.enterpriseId = this.data.details.enterpriseId
-    obj.name = this.data.details.name
-    obj.address = this.data.details.address
-    obj.code = this.data.details.code
+    obj.busEnterpriseId = this.data.enterpriseId
+    obj.busPatrolstationName = this.data.details.name
+    obj.busPatrolstationCode = this.data.details.code
+    obj.longitude=this.data.details.longitude
+    obj.latitude=this.data.details.latitude
+    obj.remarks = this.data.details.remark
     
-    // http.post("/system/AppEnterpriseController/updateEnterprise", obj, this.updateDetailsSuccess)
+    http.post("/system/AppPatrolstationController/addPatrolstation", obj, this.updateDetailsSuccess)
   },
   updateDetailsSuccess(res) {
     wx.showToast({
@@ -74,9 +86,6 @@ Page({
     })
     if(res.code == 200){
       wx.navigateBack()
-      // wx.navigateTo({
-        // url: '../details/details?busEnterpriseId=' + this.busEnterpriseId,
-      // })
     }
   },
   deletePatrolPoint() {
@@ -94,7 +103,6 @@ Page({
   //     })
   //   }
   // },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -142,7 +150,6 @@ Page({
    */
   onShareAppMessage() {
 
-
   },
   
   getLocation() {

pages/new_patrol_point/new_patrol_point.json

@@ -1,11 +1,8 @@
 {
-
-  
   "usingComponents": {},
 
 
   "navigationBarBackgroundColor": "#f94b0e",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "新增巡更点"
-
 }

pages/new_patrol_point/new_patrol_point.wxml

@@ -1,17 +1,15 @@
-
-<!--pages/new_patrol_point/new_patrol_point.wxml-->
-
+<!--pages/qiyexqtable/qiyexqtanle.wxml-->
 <!-- 巡更点新增页面 -->
 <view class="container">
   <view class="page-section">
-    <!-- <view class="input_vi">
+    <view class="input_vi">
       <view class="input_title">经度</view>
       <input class="inp_txt" bindtap="getLocation" value="{{details.longitude}}" auto-focus placeholder="点击获取当前位置" disabled="true" />
     </view>
     <view class="input_vi">
       <view class="input_title">纬度</view>
-      <input class="inp_txt" value="{{details.latitude}}" placeholder="点击获取当前位置"disabled="true" />
-    </view> -->
+      <input class="inp_txt" bindtap="getLocation"  value="{{details.latitude}}" placeholder="点击获取当前位置"disabled="true" />
+    </view>
     <view class="input_vi">
       <view class="input_title">巡更点名称</view>
       <input class="inp_txt" bindinput="bindInputName" value="{{details.name}}"  placeholder="请输入巡更点名称"/>
@@ -21,8 +19,8 @@
       <input class="inp_txt" bindinput="bindInputCode" value="{{details.code}}"  placeholder="请输入巡更点编号"/>
     </view>
     <view class="input_vi">
-      <view class="input_title">巡更点地址</view>
-      <input class="inp_txt" bindinput="bindInputAddress" value="{{details.address}}"  placeholder="请输入巡更点地址"/>
+      <view class="input_title">巡更点描述</view>
+      <input class="inp_txt" bindinput="bindInputRemark" value="{{details.remark}}"  placeholder="请输入巡更点描述"/>
     </view>
   </view>
 
@@ -30,5 +28,4 @@
     <button type="primary" class="tj_btn" bindtap="updateDetails">提交</button>
   </view>
 
-</view>
-
+</view>

pages/new_patrol_point/new_patrol_point.wxss

@@ -1,6 +1,4 @@
-
-/* pages/new_patrol_point/new_patrol_point.wxss */
-
+/* pages/qiyexqtable/qiyexqtanle.wxss */
 .container{
   padding: 30rpx 30rpx;
 }
@@ -49,5 +47,4 @@ padding: 24rpx 0px!important;
   font-size: 32rpx;
   margin: 60rpx auto;
   padding: 24rpx 0px!important;
-}
-
+}

pages/patrol_list/patrol_list.js

@@ -1,7 +1,3 @@
-
-// pages/patrol_list/patrol_list.js
-
-
 import http from '../../base/httputil'
 const app = getApp()
 Page({
@@ -10,10 +6,12 @@ Page({
    */
   data: {
     host: app.globalData.host,
+    enterpriseId:null,
     mList: null,
   },
 
-  onLoad() {
+  onLoad(options) {
+    this.data.enterpriseId=options.enterpriseId
     this.getPatrolPointList()
   },
 
@@ -23,6 +21,7 @@ Page({
     obj.busEnterpriseName = ""
     obj.pageSize = 10
     obj.reasonable = true
+    obj.enterpriseId=this.data.enterpriseId
     // http.send_get("/system/AppXunchaController/getXunchaList", obj, this.getPatrolPointListSuccess)
   },
   getPatrolPointListSuccess(res) {
@@ -61,7 +60,7 @@ Page({
   // },
   bindViewAddPatrol(){
     wx.navigateTo({
-      url: '../new_patrol_point/new_patrol_point'
+      url: '../new_patrol_point/new_patrol_point?enterpriseId='+this.data.enterpriseId
     })
   },
   bindViewToDetails(e){
@@ -72,5 +71,4 @@ Page({
     })
   }
  
-
 })

pages/patrol_list/patrol_list.json

@@ -1,12 +1,8 @@
 {
-
-
-
   "component": true, 
   "usingComponents": {},
   "navigationBarBackgroundColor": "#f94b0e",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "巡更点列表"
  
-
 }

pages/patrol_list/patrol_list.wxml

@@ -1,6 +1,3 @@
-
-<!--pages/patrol_list/patrol_list.wxml-->
-
 <view class="container">
   <!-- 搜索 -->
   <view class="search-container" bindtap="bindViewSearchEnd" >
@@ -39,5 +36,4 @@
 
   <!-- 巡检悬浮按钮 -->
   <view class="float_btn iconfont icon-jiahao" bindtap="bindViewAddPatrol"></view>
-</view>
-
+</view>

pages/patrol_list/patrol_list.wxss

@@ -1,6 +1,4 @@
-
-/* pages/patrol_list/patrol_list.wxss */
-
+/**index.wxss**/
 
 .qy_con{
   display: flex;
@@ -57,5 +55,4 @@ position: relative;
   line-height: 60rpx;
   padding-bottom: 10rpx;
 }
-  
-
+