commit

base/httputil.js

@@ -1,6 +1,6 @@
 // let BASE_Server = "http://127.0.0.1:8329"
-    //let BASE_Server = "https://192.168.1.100:18080"
-let BASE_Server = "https://sookajs.top:28080"
+    let BASE_Server = "https://192.168.1.114:18080"
+// let BASE_Server = "https://sookajs.top:18080"
 
 
 
@@ -97,6 +97,7 @@ function send_post(url, data, successfun) {
       successfun(res.data)
     },
     fail(res){
+      // console.log("TAG","返回数据："+res.errno+'_'+res.errMsg)
       wx.showToast({
         title: "网络请求失败",
       })

pages/patrol_list/patrol_list.js

@@ -8,6 +8,7 @@ Page({
     host: app.globalData.host,
     enterpriseId:null,
     mList: null,
+    keyword:null,
   },
 
   onLoad(options) {
@@ -24,6 +25,8 @@ Page({
     // obj.pageSize = 10
     // obj.reasonable = true
     obj.busEnterpriseId=this.data.enterpriseId
+    obj.searchValue=this.data.keyword
+    // obj.searchFrom='app'
     http.send_get("/system/AppPatrolstationController/getPatrolstationList", obj, this.getPatrolPointListSuccess)
   },
   getPatrolPointListSuccess(res) {
@@ -41,6 +44,11 @@ Page({
     // wx.navigateTo({
       // url: '../xunchawu/xunchawu'
     // })
+    this.getPatrolPointList();
+  },
+
+  bindViewInputSearch(e){
+    this.data.keyword= e.detail.value
   },
   // bindViewSearchEnd(e){
   //   let isrisk = e.currentTarget.dataset.isrisk

pages/patrol_list/patrol_list.wxml

@@ -1,8 +1,8 @@
 <view class="container">
   <!-- 搜索 -->
-  <view class="search-container" bindtap="bindViewSearchEnd" >
+  <view class="search-container" bindtap="bindViewSearchEnd">
     <view class="search-left">
-      <input type="text" placeholder="搜索"  />
+      <input type="text" placeholder="搜索" bindinput="bindViewInputSearch" />
     </view>
     <button class="search-right">
       <text class="iconfont icon-sousuo"></text>

pages/qiye/qiye.wxml

@@ -3,7 +3,7 @@
   <!-- 搜索 -->
   <view class="search-container">
     <view class="search-left">
-      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" />
+      <input type="text" bindtap="bindViewSearchEnd" placeholder="搜索" disabled="true"/>
     </view>
     <button bindtap="bindViewSearchEnd" class="search-right">
       <text class="iconfont icon-sousuo"></text>

pages/search/search.js

@@ -7,9 +7,12 @@ Page({
   data: {
     host: app.globalData.host,
     enterpriseList: [],
-    enterpriseCode:''
+    enterpriseCode:'',
+    keyword:null,
   },
   onLoad() {
+  },
+  onShow(){
     this.list(null)
   },
   // 搜索结果跳页
@@ -28,7 +31,8 @@ Page({
 
   searchEnterprise(e) {
     var obj = new Object()
-    obj.businessName = e.detail.value
+    // obj.businessName = e.detail.value
+    obj.searchValue=e.detail.value
     this.list(obj)
   },
 

pages/xqzggzs2/xqzggzs2.js

@@ -61,7 +61,7 @@ Page({
       time:time
     })
     wx.enableAlertBeforeUnload({
-        message: '退出后需重新进行巡检,确定退出？',
+        message: '巡检流程尚未完成,确定退出？',
       })
   },
 
@@ -245,11 +245,16 @@ Page({
   },
   submitXqzggzs2Success(e){
     if(e.code == 200){
+       let page = getCurrentPages();
+       let prevPage = page[page.length - 2];
+       prevPage.setData({
+         isRefresh:true,
+       });
+
       wx.showToast({
         title: '操作成功',
       })
       wx.disableAlertBeforeUnload()
-
       wx.navigateBack()
     }
   },

pages/xuncha/xuncha.js

@@ -79,6 +79,8 @@ Page({
   toBindXunjinaMore(e){
     let isrisk = e.currentTarget.dataset.isrisk
     let buslogid = e.currentTarget.dataset.buslogid
+    let enterpriseId=e.currentTarget.dataset.busenterpriseid;
+
     if(isrisk == 0){
       wx.showToast({
         title: '没有发现安全隐患,请放心!!',
@@ -87,7 +89,7 @@ Page({
     }else{
       console.log(isrisk,"####",buslogid)
       wx.navigateTo({
-        url: '../xunjianmore/xunjianmore?buslogid='+buslogid
+        url: '../xunjianmore/xunjianmore?buslogid='+buslogid+'&busEnterpriseId='+enterpriseId
       })
     }
    

pages/xuncha/xuncha.wxml

@@ -34,7 +34,7 @@
   <text class="zwsj_text">暂无数据</text> -->
     <view class="list_li flex-c"  wx:for="{{xunchaList}}" wx:key="index"
     bindtap="toBindXunjinaMore"
-     data-isrisk="{{item.isRisk}}" data-buslogid="{{item.busLogId}}">
+     data-isrisk="{{item.isRisk}}" data-buslogid="{{item.busLogId}}" data-busenterpriseid="{{item.busEnterpriseId}}">
       <view class="list_li_1">
        
 

pages/xunjian/xunjian.wxss

@@ -125,7 +125,7 @@ switch .wx-switch-input{
 .titleBox {
     /* 未选中文字的样式 */
     color: rgb(168, 170, 175);
-    font-size: 34rpx;
+    font-size: 28rpx;
     display: flex;
     flex-direction: column;
     align-items: center;

pages/xunjianmore/xunjianmore.js

@@ -14,9 +14,11 @@ Page({
     isHave_xqzgtzs: false,
     isHave_fcyjtzs: false,
     isRefresh: false,
+    enterpriseId:null,
   },
   onLoad(e) {
     this.data.buslogid = e.buslogid
+    this.data.enterpriseId=e.busEnterpriseId
     let obj = new Object()
     obj.busLogId = this.data.buslogid
     http.post("/system/AppXunjianimgController/getXunjianimgList", obj, this.getXunjianMoreListSuccess)
@@ -71,4 +73,11 @@ Page({
       url: '../xqzggzs/xqzggzs?logId=' + this.data.buslogid,
     })
   },
+  //补充告知书
+  bindViewAddGzs(){
+    //有限期整改的东西，去通知书页面
+    wx.navigateTo({
+      url: '../xqzggzs2/xqzggzs2?logId=' + this.data.buslogid + "&busEnterpriseId=" + this.data.enterpriseId,
+    })
+  }
 })

pages/xunjianmore/xunjianmore.wxml

@@ -33,5 +33,8 @@
           <i class="iconfont icon-zengjiashuzi" wx:if="{{!isHave_fcyjtzs}}" bindtap="bindViewXqZgGzS"></i>
         </view>
     </view>
+ 
+  <!-- 巡检悬浮按钮 -->
+  <view class="float_btn iconfont icon-jiahao" bindtap="bindViewAddGzs"  wx:if="{{!isHave_xqzgtzs}}"></view>
   </view>
 </view>

project.private.config.json

@@ -1,9 +1,9 @@
 {
   "projectname": "sooka_edyj_minapp",
   "setting": {
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "urlCheck": false
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "libVersion": "2.16.0"
+  "libVersion": "2.10.4"
 }