1.增加需求:预警列表功能开发，调试接口，功能测试，BUG处理；

2.BUG修改:部分原有功能修改校验逻辑；
3.BUG修改:整改进度页面功能逻辑修改

app.json

@@ -42,7 +42,8 @@
     "pages/new_patrol_point/new_patrol_point",
     "pages/update_patrol_point/update_patrol_point",
     "pages/xungengdetails/xungengdetails",
-    "pages/xungengjilu/xungengjilu"
+    "pages/xungengjilu/xungengjilu",
+    "pages/early_warning_list/early_warning_list"
   ],
   "requiredPrivateInfos": [
     "getLocation"

base/httputil.js

@@ -1,5 +1,5 @@
 // let BASE_Server = "http://127.0.0.1:8329"
-    // let BASE_Server = "https://192.168.1.100:8080"
+    // let BASE_Server = "https://192.168.1.109:8080"
 let BASE_Server = "https://sookajs.top:28080"
 
 

pages/index/index.js

@@ -45,8 +45,28 @@ Page({
     dofun: null,
     xunjianImgCount: '000,000',
     NoticeTitle: "登录查看公告",
-    noticeItem:''
+    noticeItem: '',
+    // mList: null,
   },
+  onReady() {
+    // this.popup = this.selectComponent("#popup");
+  },
+  // showPopup() {
+  //   this.setData({
+  //     mList: this.data.mList
+  //   })
+  //   this.popup.showPopup();
+  // },
+  //取消事件
+  // _error() {
+  //   console.log('你点击了取消');
+  //   this.popup.hidePopup();
+  // },
+  // //确认事件
+  // _success() {
+  //   console.log('你点击了确定');
+  //   this.popup.hidePopup();
+  // },
 
   onLoad() {
     this.setData({
@@ -55,10 +75,28 @@ Page({
         this.data.host + '/images/banner3.jpg',
         this.data.host + '/images/banner2.jpg'
       ]
-     
+
     })
+
+  
   },
+  // requestPopupData() {
+  //   // wx.navigateTo({
+  //   //   url: '../early_warning_list/early_warning_list',
+  //   // })
+  //   if (app.globalToken == null || app.globalToken == '') {
+  //     return
+  //   }
+  //   http.send_get("/system/AppIndexController/getLateInspectionList", null, this.getListSuccess)
+  // },
 
+  // menuItemClick(res) {
+  //   let busInspectionId = res.detail.iteminfo.busInspectionId
+  //   let buslogid = res.detail.iteminfo.busLogId
+  //   wx.navigateTo({
+  //     url: '../zhenggaijindu/zhenggaijindu?busInspectionId=' + busInspectionId + "&buslogId=" + buslogid,
+  //   })
+  // },
   onShow() {
     // if (app.globalToken == null) {
     //   wx.showToast({
@@ -66,7 +104,8 @@ Page({
     //     icon: 'none'
     //   })
     // }
-
+    
+    // this.requestPopupData()
     this.initIndexPage();
   },
 
@@ -171,12 +210,12 @@ Page({
       })
       return
     }
-     wx.navigateTo({
-     url: '../search/search',
-     })
+    wx.navigateTo({
+      url: '../search/search',
+    })
   },
   //巡更跳转
-  bindViewXungeng(){
+  bindViewXungeng() {
     if (app.globalToken == null) {
       wx.showToast({
         title: '尚未登录，登录后即可使用',
@@ -190,34 +229,34 @@ Page({
   scan() {
 
     wx.scanCode({
-      onlyFromCamera: true,
+      onlyFromCamera: true,
       success: (res) => {
 
-       
+
         wx.navigateTo({
-          url: '../xungengdetails/xungengdetails?id='+res.result,
+          url: '../xungengdetails/xungengdetails?id=' + res.result,
         })
 
-      
+
 
       },
 
       fail: (res) => {
 
-       // console.log(res);
-      //  wx.showToast({
-      //   title: '扫描失败',
-      //   icon:'none'
-      // })
+        // console.log(res);
+        //  wx.showToast({
+        //   title: '扫描失败',
+        //   icon:'none'
+        // })
 
       }
 
     })
 
- },
+  },
   // 使用攻略跳转
   bindViewIntroduction() {
-    
+
     wx.navigateTo({
       url: '../Introduction/Introduction'
     })
@@ -324,17 +363,18 @@ Page({
     }
 
     http.send_post("/system/AppIndexController/getIndexPageData", null, this.initIndexPageSuccess)
+
   },
 
   initIndexPageSuccess(res) {
 
-  
+
     if (res.code == 200) {
       this.setData({
         xunjianImgCount: res.data.xunjianImgCount,
       })
       if (res.data.noticeList.length > 0) {
-        
+
         this.setData({
           NoticeTitle: res.data.noticeList[0].noticeTitle,
           noticeItem: res.data.noticeList[0]
@@ -347,27 +387,65 @@ Page({
     }
 
   },
-goNoticeDetails(e){
-  
-  let details = e.currentTarget.dataset.item
-  if (app.globalToken == null) {
-    wx.showToast({
-      title: '尚未登录，登录后即可使用',
-      icon: 'none'
-    })
-    return
-  }
-  if(details==null||details==''){
-    wx.showToast({
-      title: '暂无公告',
-      icon: 'none'
+
+  getListSuccess(res) {
+    debugger
+    if (res.code == 200) {
+
+      var popInfo = res.data.late_inspection_list
+      console.log(popInfo)
+      if (res.data != null && res.data.late_inspection_list != null && res.data.late_inspection_list.length > 0) {
+        // this.data.mList = res.data.late_inspection_list
+        // // this.showPopup()
+        // this.popup.showPopup()
+        // this.setData({
+        //   mList: this.data.mList
+        // })
+        // setTimeout(() => {
+        //   this.popup.hidePopup();
+        // }, 2000)
+        wx.showModal({
+          title: '是否需要确认预警？',
+          content: '',
+          complete: (res) => {
+            if (res.cancel) {
+
+            }
+
+            if (res.confirm) {
+              wx.navigateTo({
+                url: '../early_warning_list/early_warning_list',
+              })
+            }
+          }
+        })
+      } else {
+
+      }
+    }
+  },
+
+  goNoticeDetails(e) {
+
+    let details = e.currentTarget.dataset.item
+    if (app.globalToken == null) {
+      wx.showToast({
+        title: '尚未登录，登录后即可使用',
+        icon: 'none'
+      })
+      return
+    }
+    if (details == null || details == '') {
+      wx.showToast({
+        title: '暂无公告',
+        icon: 'none'
+      })
+      return
+    }
+    wx.navigateTo({
+      url: '../notice/notice_details?details=' + JSON.stringify(details)
     })
-    return
-  }
-  wx.navigateTo({
-    url: '../notice/notice_details?details='+JSON.stringify(details)
-  })
-},
+  },
   // getSysUserInfo(info) {
   //   let that = this
   //   wx.login({
@@ -389,7 +467,7 @@ goNoticeDetails(e){
   //   })
   // },
   onTabItemTap(item) {
-   
+
   }
 
 

pages/index/index.json

@@ -1,6 +1,6 @@
 {
+  "component": true, 
   "usingComponents": {
-
   },
 "navigationBarBackgroundColor": "#f57c2a",
 "navigationStyle": "custom",

pages/index/index.wxml

@@ -127,5 +127,18 @@
       </view>
     </view>
   </view>
+   <!-- <button bindtap="requestPopupData"> 点我 </button> -->
+  <!-- <popup id='popup'
+      title='小组件'
+      content='学会了吗'
+      btn_no='没有'
+      btn_ok='学会了'
+      bind:error="_error" 
+      bind:success="_success"
+      menulist="{{mList}}" 
+      mainmodel="{{mainmodel}}"
+      bindmenuItemClick="menuItemClick" >
+
+  </popup> -->
 
 </view>

pages/me/me.js

@@ -143,10 +143,10 @@ clear(){
 
   },
   bindViewTest(){
-     wx.navigateTo({
-      // url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
-            url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
-    })
+    //  wx.navigateTo({
+    //   // url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
+    //         url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
+    // })
   }
   // bindViewXqzgDetail(){
   //   wx.navigateTo({

pages/me/me.wxml

@@ -32,14 +32,14 @@
         <i class="iconfont icon-xiangyou"></i>
       </view>
   </view>
-  <!-- <view class="tit_one" bindtap="bindViewTest">
+  <view class="tit_one" bindtap="bindViewTest">
     <image src="../images/metit1.png" class="metit" />
     <view class="meline">
     <i class="iconfont icon-guanyuwomen"></i>
         <text>关于我们</text>
         <i class="iconfont icon-xiangyou"></i>
       </view>
-  </view> -->
+  </view>
 </view>
 
   <!-- <button wx:if="{{!isBindSuccess}}" bindtap="init_userInfo" class="wd_btn">绑定账号</button>

pages/menu/menu.wxml

@@ -1,11 +1,10 @@
-
 <!--pages/menu/menu.wxml-->
 <view class='menu_box'>
     <view hidden='{{showmenus}}' class='menu_bg'>
     <block wx:for='{{menulist}}' wx:key='menulist'>
       <view class='menu_main' catchtap='itemclick' data-item='{{item}}'>
         <image class='menu_img iconfont {{item.url}}' src='' />
-        <text class='menu_title'  hidden='{{mainmodel.title.length > 0 ? flase:true}}'>{{item.title}}</text>
+        <text class='menu_title'  hidden='{{mainmodel.title.length > 0 ? false:true}}'>{{item.title}}</text>
       </view>
     </block>
     </view>

pages/new_patrol_point/new_patrol_point.js

@@ -67,30 +67,32 @@ Page({
   //------------------------------------------
 
   updateDetails() {
-    if(this.data.details.name==null){
+      
+    if(isNaN(this.data.details.longitude)||isNaN(this.data.details.latitude)){
       wx.showToast({
-        title:'请输入巡更点名称',
+        title:'请点击定位当前位置',
         icon:'none'
       })
       return
     }
-    
-    if(this.data.details.code==null){
+
+    if(this.data.details.name==null||this.data.details.name==''){
       wx.showToast({
-        title:'请扫描或输入巡更点编码',
+        title:'请输入巡更点名称',
         icon:'none'
       })
       return
     }
     
-    if(isNaN(this.data.details.longitude)||isNaN(this.data.details.latitude)){
+    if(this.data.details.code==null||this.data.details.name==''){
       wx.showToast({
-        title:'请点击定位当前位置',
+        title:'请扫描或输入巡更点编码',
         icon:'none'
       })
       return
     }
   
+  
     let obj = new Object();
     obj.busEnterpriseId = this.data.enterpriseId
     obj.busPatrolstationName = this.data.details.name

pages/new_patrol_point/new_patrol_point.wxml

@@ -4,24 +4,24 @@
   <view class="page-section">
     <view class="input_vi">
       <view class="input_title">经度</view>
-      <input class="inp_txt" bindtap="getLocation" value="{{details.longitude}}" auto-focus placeholder="点击获取当前位置" disabled="true" />
+      <input class="inp_txt" bindtap="getLocation" value="{{details.longitude}}" auto-focus placeholder="点击获取当前位置" disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">纬度</view>
-      <input class="inp_txt" bindtap="getLocation"  value="{{details.latitude}}" placeholder="点击获取当前位置"disabled="true" />
+      <input class="inp_txt" bindtap="getLocation"  value="{{details.latitude}}" placeholder="点击获取当前位置"disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点名称</view>
-      <input class="inp_txt" bindinput="bindInputName" value="{{details.name}}"  placeholder="请输入巡更点名称"/>
+      <input class="inp_txt" bindinput="bindInputName" value="{{details.name}}"  placeholder="请输入巡更点名称" maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点编号</view>
       <i class="iconfont icon-saoyisao1" bindtap="bindViewScan"></i>
-      <input class="inp_txt inp_txt2" bindinput="bindInputCode" value="{{details.code}}"  placeholder="请扫描巡更点编号"/>
+      <input class="inp_txt inp_txt2" bindinput="bindInputCode" value="{{details.code}}"  placeholder="请扫描巡更点编号" maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点描述</view>
-      <input class="inp_txt" bindinput="bindInputRemark" value="{{details.remark}}"  placeholder="请输入巡更点描述"/>
+      <input class="inp_txt" bindinput="bindInputRemark" value="{{details.remark}}"  placeholder="请输入巡更点描述" maxlength="100"/>
     </view>
   </view>
 

pages/qiyemore/qiyemore.js

@@ -74,35 +74,21 @@ Page({
     wx.scanCode({
       onlyFromCamera: true,
       success: (res) => {
-
-        
         //this.data.form.qrCode=res.result
         this.setData({
           ['form.enterpriseCode']: res.result
         })
-
-
-
-
-
-
       },
-
       fail: (res) => {
-
         wx.showToast({
           title: '扫描失败请手动输入',
           icon: 'none'
         })
-
       }
-
     })
   },
 
   addEnterprise(e) {
-  
-
     if (isNaN(this.data.form.latitude) || isNaN(this.data.form.longitude)) {
       wx.showToast({
         title: '请点击获取当前位置',
@@ -110,6 +96,46 @@ Page({
       })
       return
     }
+   
+    if(this.data.form.businessName==null||this.data.form.businessName==''){
+      wx.showToast({
+        title: '请输入企业名称',
+        icon:'none'
+      })
+      return
+    }
+
+    if(this.data.form.enterpriseCode==null||this.data.form.enterpriseCode==''){
+      wx.showToast({
+        title: '请输入企业编码',
+        icon:'none'
+      })
+      return
+    }
+  
+    if(this.data.form.orgCode==null||this.data.form.orgCode==''){
+      wx.showToast({
+        title: '请输入机构代码证号',
+        icon:'none'
+      })
+      return
+    }
+
+    if(this.data.form.officeAddress==null||this.data.form.officeAddress==''){
+      wx.showToast({
+        title: '请输入办公地址',
+        icon:'none'
+      })
+      return
+    }
+  
+    if(this.data.form.mainPerson==null||this.data.form.mainPerson==''){
+      wx.showToast({
+        title: '请输入主要负责人姓名',
+        icon:'none'
+      })
+      return
+    }
     if(this.data.form.mainPersonPhone==null||this.data.form.mainPersonPhone==''){
       wx.showToast({
         title: '请输入主要负责人电话',

pages/qiyemore/qiyemore.wxml

@@ -4,42 +4,40 @@
   <view class="page-section">
     <view class="input_vi">
       <view class="input_title">经度</view>
-      <input bindtap="getLocation" value="{{form.longitude}}" disabled="true" class="inp_txt" auto-focus placeholder="点击获取当前位置" />
+      <input bindtap="getLocation" value="{{form.longitude}}" disabled="true" class="inp_txt" auto-focus placeholder="点击获取当前位置"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">纬度</view>
-      <input bindtap="getLocation" value="{{form.latitude}}" disabled="true" class="inp_txt" placeholder="点击获取当前位置" />
+      <input bindtap="getLocation" value="{{form.latitude}}" disabled="true" class="inp_txt" placeholder="点击获取当前位置" maxlength="100" />
     </view>
     <view class="input_vi">
       <view class="input_title">企业名称</view>
-      <input bindinput="get_businessName" class="inp_txt" placeholder="请输入企业名称" />
+      <input bindinput="get_businessName" class="inp_txt" placeholder="请输入企业名称" maxlength="100" />
     </view>
     <view class="input_vi">
       <view class="input_title">企业编码</view>
       <i class="iconfont icon-saoyisao1" bindtap="saoyisao"></i>
-      <input bindinput="get_qrCode" class="inp_txt inp_txt2" placeholder="请输入或扫描"value="{{form.enterpriseCode}}" />
-     
-   
+      <input bindinput="get_qrCode" class="inp_txt inp_txt2" placeholder="请输入或扫描"value="{{form.enterpriseCode}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">机构代码</view>
-      <input bindinput="get_orgCode" class="inp_txt" placeholder="请输入机构代码证号" />
+      <input bindinput="get_orgCode" class="inp_txt" placeholder="请输入机构代码证号"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">办公地址</view>
-      <input bindinput="get_officeAddress" class="inp_txt"  placeholder="请输入办公地址" />
+      <input bindinput="get_officeAddress" class="inp_txt"  placeholder="请输入办公地址"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">经营地址</view>
-      <input bindinput="get_businessAddress" class="inp_txt" placeholder="请输入经营地址" />
+      <input bindinput="get_businessAddress" class="inp_txt" placeholder="请输入经营地址"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">监管人员</view>
-      <input bindinput="get_supervisor" class="inp_txt" placeholder="请输入监管人员姓名" />
+      <input bindinput="get_supervisor" class="inp_txt" placeholder="请输入监管人员姓名"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">主管部门</view>
-      <input bindinput="get_tradeDept" class="inp_txt" placeholder="请输入主管部门名称" />
+      <input bindinput="get_tradeDept" class="inp_txt" placeholder="请输入主管部门名称" maxlength="100" />
     </view>
     <!-- <view class="input_vi">
       <view class="input_title">所属部门</view>
@@ -47,7 +45,7 @@
     </view> -->
     <view class="input_vi">
       <view class="input_title">主要负责人</view>
-      <input bindinput="get_mainPerson" class="inp_txt" placeholder="请输入主要负责人姓名" />
+      <input bindinput="get_mainPerson" class="inp_txt" placeholder="请输入主要负责人姓名"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">负责人电话</view>
@@ -55,7 +53,7 @@
     </view>
     <view class="input_vi">
       <view class="input_title">安全负责人</view>
-      <input bindinput="get_headSecurity" class="inp_txt" placeholder="请输入安全负责人" />
+      <input bindinput="get_headSecurity" class="inp_txt" placeholder="请输入安全负责人"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">负责人电话</view>

pages/qiyexqtable/qiyexqtable.js

@@ -78,6 +78,30 @@ Page({
   //------------------------------------------
 
   updateEnterprise() {
+    if(this.data.enterpriseDetails.businessName==null||this.data.enterpriseDetails.businessName==''){
+      wx.showToast({
+        title: '请输入企业名称',
+        icon:'none'
+      })
+      return
+    }
+
+    if(this.data.enterpriseDetails.officeAddress==null||this.data.enterpriseDetails.officeAddress==''){
+      wx.showToast({
+        title: '请输入办公地址',
+        icon:'none'
+      })
+      return
+    }
+  
+    if(this.data.enterpriseDetails.mainPerson==null||this.data.enterpriseDetails.mainPerson==''){
+      wx.showToast({
+        title: '请输入主要负责人姓名',
+        icon:'none'
+      })
+      return
+    }
+    
     if(this.data.enterpriseDetails.mainPersonPhone==null||this.data.enterpriseDetails.mainPersonPhone==''){
       wx.showToast({
         title: '请输入主要负责人电话',
@@ -85,6 +109,7 @@ Page({
       })
       return
     }
+    
     let obj = new Object();
     obj.busEnterpriseId = this.data.enterpriseDetails.busEnterpriseId
     obj.businessName = this.data.enterpriseDetails.businessName

pages/qiyexqtable/qiyexqtable.wxml

@@ -4,55 +4,55 @@
   <view class="page-section">
     <view class="input_vi">
       <view class="input_title">经度</view>
-      <input class="inp_txt" value="{{enterpriseDetails.longitude}}" disabled="true" />
+      <input class="inp_txt" value="{{enterpriseDetails.longitude}}" disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">纬度</view>
-      <input class="inp_txt" value="{{enterpriseDetails.latitude}}" disabled="true" />
+      <input class="inp_txt" value="{{enterpriseDetails.latitude}}" disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">企业名称</view>
-      <input class="inp_txt" bindinput="get_businessName" value="{{enterpriseDetails.businessName}}" />
+      <input class="inp_txt" bindinput="get_businessName" value="{{enterpriseDetails.businessName}}" maxlength="100" />
     </view>
     <view class="input_vi">
       <view class="input_title">机构代码</view>
-      <input class="inp_txt" value="{{enterpriseDetails.orgCode}}" disabled="true" />
+      <input class="inp_txt" value="{{enterpriseDetails.orgCode}}" disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">办公地址</view>
-      <input class="inp_txt" bindinput="get_officeAddress" value="{{enterpriseDetails.officeAddress}}" />
+      <input class="inp_txt" bindinput="get_officeAddress" value="{{enterpriseDetails.officeAddress}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">经营地址</view>
-      <input class="inp_txt" bindinput="get_businessAddress" value="{{enterpriseDetails.businessAddress}}" />
+      <input class="inp_txt" bindinput="get_businessAddress" value="{{enterpriseDetails.businessAddress}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">监管人员</view>
-      <input class="inp_txt" bindinput="get_supervisor" value="{{enterpriseDetails.supervisor}}" />
+      <input class="inp_txt" bindinput="get_supervisor" value="{{enterpriseDetails.supervisor}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">主管部门</view>
-      <input class="inp_txt" bindinput="get_tradeDept" value="{{enterpriseDetails.tradeDept}}" />
+      <input class="inp_txt" bindinput="get_tradeDept" value="{{enterpriseDetails.tradeDept}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">所属部门</view>
-      <input class="inp_txt" value="{{enterpriseDetails.deptName}}" disabled="true" />
+      <input class="inp_txt" value="{{enterpriseDetails.deptName}}" disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">主要负责人</view>
-      <input class="inp_txt" bindinput="get_mainPerson" value="{{enterpriseDetails.mainPerson}}" />
+      <input class="inp_txt" bindinput="get_mainPerson" value="{{enterpriseDetails.mainPerson}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">负责人电话</view>
-      <input type="number" maxlength="13" bindinput="get_mainPersonPhone" value="{{enterpriseDetails.mainPersonPhone}}" />
+      <input type="number" maxlength="13" bindinput="get_mainPersonPhone" value="{{enterpriseDetails.mainPersonPhone}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">安全负责人</view>
-      <input class="inp_txt" bindinput="get_headSecurity" value="{{enterpriseDetails.headSecurity}}" />
+      <input class="inp_txt" bindinput="get_headSecurity" value="{{enterpriseDetails.headSecurity}}"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">负责人电话</view>
-      <input type="number" maxlength="13" bindinput="headSecurityPhone" value="{{enterpriseDetails.headSecurityPhone}}" />
+      <input type="number" maxlength="13" bindinput="headSecurityPhone" value="{{enterpriseDetails.headSecurityPhone}}"  maxlength="100"/>
     </view>
   </view>
 

pages/update_patrol_point/update_patrol_point.wxml

@@ -4,24 +4,24 @@
   <view class="page-section">
     <view class="input_vi">
       <view class="input_title">经度</view>
-      <input class="inp_txt" bindtap="getLocation" value="{{longitude}}" auto-focus placeholder="点击获取当前位置" disabled="true" />
+      <input class="inp_txt" bindtap="getLocation" value="{{longitude}}" auto-focus placeholder="点击获取当前位置" disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">纬度</view>
-      <input class="inp_txt" bindtap="getLocation"  value="{{latitude}}" placeholder="点击获取当前位置"disabled="true" />
+      <input class="inp_txt" bindtap="getLocation"  value="{{latitude}}" placeholder="点击获取当前位置"disabled="true"  maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点名称</view>
-      <input class="inp_txt" bindinput="bindInputName" value="{{name}}"  placeholder="请输入巡更点名称"/>
+      <input class="inp_txt" bindinput="bindInputName" value="{{name}}"  placeholder="请输入巡更点名称" maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点编号</view>
       <i class="iconfont"></i>
-      <input class="inp_txt inp_txt2" bindinput="bindInputCode" disabled="disabled" value="{{code}}"  placeholder="请扫描巡更点编号"/>
+      <input class="inp_txt inp_txt2" bindinput="bindInputCode" disabled="disabled" value="{{code}}"  placeholder="请扫描巡更点编号" maxlength="100"/>
     </view>
     <view class="input_vi">
       <view class="input_title">巡更点描述</view>
-      <input class="inp_txt" bindinput="bindInputRemark" value="{{remark}}"  placeholder="请输入巡更点描述"/>
+      <input class="inp_txt" bindinput="bindInputRemark" value="{{remark}}"  placeholder="请输入巡更点描述" maxlength="100"/>
     </view>
   </view>
 

pages/xuncha/xuncha.js

@@ -23,6 +23,11 @@ Page({
         "url": "icon-xunjian",
         "title": "巡检",
       },
+      {
+        "id": "3",
+        "url": "icon-xunjian",
+        "title": "预警",
+      },
     ],
     // mainmodel: {
 
@@ -122,9 +127,12 @@ Page({
       wx.navigateTo({
         url: '../search/search',
       })
+    }else if(clickInfo.id==3){
+      wx.navigateTo({
+        url: '../early_warning_list/early_warning_list',
+      })
     }
-    // 根据不同类型进行判别处理
-    //事件的处理 代码
+  
   }
 
 })

pages/xuncha/xuncha.wxml

@@ -37,12 +37,9 @@
      data-isrisk="{{item.isRisk}}" data-buslogid="{{item.busLogId}}" data-busenterpriseid="{{item.busEnterpriseId}}">
       <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>
         <i class="iconfont icon-xiangyou list_right"></i>
       </view>
@@ -53,9 +50,10 @@
       </view>
       <!-- <view class="line2"></view> -->
     </view>
+        
     <!--bindmenuItemClick为按钮点击的时候的回调方法  mainmodel是显示的按钮，menulist为折叠的菜单的数组数据-->
     <menu bindmenuItemClick="menuItemClick" menulist="{{menulist}}" mainmodel="{{mainmodel}}"></menu>
-     
-    </view>
+ 
+  </view>
 
 </view>

pages/xunjianmore/xunjianmore.js

@@ -74,7 +74,7 @@ Page({
       url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
     })
   },
-  // 跳转整改进度
+  // 跳转限期整改告知书
   bindViewXqZgGzS() {
     wx.navigateTo({
       url: '../xqzggzs/xqzggzs?logId=' + this.data.buslogid,

pages/zhenggaijindu/zhenggaijindu.js

@@ -1,7 +1,9 @@
 import http from '../../base/httputil'
 const app = getApp()
 Page({
-
+data:{
+  flag:false
+},
   onLoad(e) {
 
     this.setData({
@@ -18,27 +20,25 @@ Page({
   },
   getZhenggaijinduSuccess(res) {
   
-    this.data.pictureBasePath = res.pictureBasePath
+    this.data.pictureBasePath = res.data.pictureBasePath
     this.setData({
-      pictureBasePath: res.pictureBasePath,
-      zgjdList: res.zgjdList
+      pictureBasePath: res.data.pictureBasePath,
+      zgjdList: res.data.zgjdList
     })
-    if(res.zgjdList!=null&&res.zgjdList.length>0){
-    if ( res.zgjdList[0].riskStatus == "risk_status_2") {
-
-      this.setData({
-        flag: false
-      })
+    if(res.data.zgjdList!=null&&res.data.zgjdList.length>0){
+          //items_type_1 限期整改
+          //risk_status_2 已整改
+        if (res.data.zgjdList[0].itemsType=="items_type_1"&&res.data.zgjdList[0].riskStatus != "risk_status_2") {
+          this.data.flag=true
+        }else{
+          this.data.flag=false
+        }
     }else{
-      this.setData({
-        flag: true
-      })
+      this.data.flag=false
     }
-  }else{
     this.setData({
-      flag: false
+      flag:this.data.flag
     })
-  }
   },
 
   bindPickerChange: function (e) {