修改新需求

app.json

@@ -43,7 +43,9 @@
     "pages/update_patrol_point/update_patrol_point",
     "pages/xungengdetails/xungengdetails",
     "pages/xungengjilu/xungengjilu",
-    "pages/early_warning_list/early_warning_list"
+    "pages/early_warning_list/early_warning_list",
+    "pages/me_danger_list/me_danger_list",
+    "pages/me_xuncha_list/me_xuncha_list"
   ],
   "requiredPrivateInfos": [
     "getLocation"

base/httputil.js

@@ -141,6 +141,38 @@ function post(url, data, successfun) {
 }
 
 /**
+ * 携带token表单数据POST请求
+ * @param {*} url 
+ * @param {*} data 
+ * @param {*} successfun 
+ */
+function post_nocheck(url, data, successfun) {
+  // if (app.globalToken == null) {
+  //   wx.showToast({
+  //     title: '尚未登录，登录后即可使用',
+  //     icon: 'none'
+  //   })
+  //   return
+  // }
+  wx.request({
+    url: BASE_Server + url, //仅为示例，并非真实的接口地址
+    method: "POST",
+    header: {
+      'content-type': 'application/x-www-form-urlencoded',
+      'Authorization': 'Bearer ' + app.globalToken
+    },
+    data: data,
+    success(res) {
+      successfun(res.data)
+    },
+    fail(res){
+      wx.showToast({
+        title: "网络请求失败",
+      })
+    }
+  })
+}
+/**
  * 无token json数据使用的POST请求
  * @param {*} url 
  * @param {*} data 
@@ -332,6 +364,7 @@ module.exports = {
   post: post,
   send_post: send_post,
   post_token: post_token,
+  post_nocheck: post_nocheck,
   // wxpost: wxpost,
   get: get,
   send_get:send_get,

pages/fcdetail/fcdetail.js

@@ -12,10 +12,6 @@ Page({
     askCompany:null,
     opinion:null,
     nickname:null,
-    qianming:null,
-    qianming1:null,
-    number:null,
-    number1:null,
     lasttime:null,
     gzsTime:null,
     deptName:null,
@@ -23,6 +19,10 @@ Page({
     checkTime:null,
     checker1Code:null,
     checker2Code:null,
+    qianming01:null,
+    qianming02:null,
+    qianming03:null,
+    signature:null,
   },
   /**
    * 生命周期函数--监听页面加载
@@ -35,23 +35,25 @@ Page({
     })
     var obj={};
     obj["logId"]=this.data.logId
-  
-    http.post("/system/AppXunchaController/getFcyjgzsDetail",obj,this.detailsSuccess)
+    // obj["userId"]=app.loginUserId;
+    http.post_nocheck("/system/AppXunchaController/getFcyjgzsDetail",obj,this.detailsSuccess)
   },
   detailsSuccess(e){
     
     if(e.code == 200){
       this.data.lasttime=util.formatDate(new Date(e.data.fcyjgzs.lasttime),'yyyy年MM月dd日') ;
-      this.data.deptName=e.data.dept_jd;
+      this.data.deptName=e.data.fcyjgzs.checkDept;
       this.data.askCompany=e.data.fcyjgzs.askCom;
       this.data.opinion=e.data.fcyjgzs.myoption;
-      this.data.nickname=e.data.fcyjgzs.checker1Sign;
-      this.data.qianming=e.data.fcyjgzs.checker2Sign;
+      this.data.qianming01=e.data.fcyjgzs.checker1Sign;
+      this.data.qianming02=e.data.fcyjgzs.checker2Sign;
+      this.data.qianming03=e.data.fcyjgzs.becheckerSign;
       this.data.checker1Code=e.data.fcyjgzs.checker1Code;
       this.data.checker2Code=e.data.fcyjgzs.checker2Code;
-      this.data.qianming1=e.data.fcyjgzs.becheckerSign;
       this.data.checkTime=util.formatDate(new Date(e.data.fcyjgzs.checkTime),'yyyy年MM月dd日') ;
       this.data.fcCode=e.data.fcyjgzs.code;
+      this.data.signature=e.data.fcyjgzs.seal;
+
       this.setData({
         lasttime:this.data.lasttime,
         checkTime:this.data.checkTime,
@@ -61,56 +63,22 @@ Page({
         fcCode:this.data.fcCode,
         checker1Code:this.data.checker1Code,
         checker2Code:this.data.checker2Code,
-        qianming:this.data.qianming,
-        qianming1:this.data.qianming1,
+        qianming01:this.data.qianming01,
+        qianming02:this.data.qianming02,
+        qianming03:this.data.qianming03,
         deptName:this.data.deptName,
+        signature:this.data.signature,
+
       })
     }
-  },
-  onShow() {
-     
-  
-  },
-  
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
+  }, 
+   /**
    * 用户点击右上角分享
    */
   onShareAppMessage() {
-
+    return{
+      title:'复查意见告知书',
+      url: '../fcdetail/fcdetail?logId='+this.data.buslogid,
+    }
   }
 })

pages/fcdetail/fcdetail.wxml

@@ -7,26 +7,37 @@
   <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的，我单位将提报相关执法部门进行依法查处。</view>
   <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 400rpx;"  disabled="disabled" value="{{askCompany}}"/>咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
 
-  <view class="flex_row mar_top">检查人员：{{nickname}}</view>
+  <!-- <view class="flex_row mar_top">检查人员：{{nickname}}</view>
+  <view class="flex_row mar_top">
+    <text>检查人员编号：</text><input type="text" style="width: 400rpx;"  disabled="disabled" value="{{checker1Code}}"/>
+  </view> -->
+  <view class="flex_row mar_top txt_vi">
+    <text>检查人员（签名）：</text>
+    <image wx:if="{{qianming01 != undefined && qianming01 != null}}" src="{{qianming01}}" class="qm_img"></image>
+  </view>
   <view class="flex_row mar_top">
     <text>检查人员编号：</text><input type="text" style="width: 400rpx;"  disabled="disabled" value="{{checker1Code}}"/>
   </view>
   <view class="flex_row mar_top txt_vi">
-    <text bindtap="bindQianming">监督人员（签名）：</text>
-    <image wx:if="{{qianming != undefined && qianming != null}}" src="{{qianming}}" class="qm_img"></image>
+    <text>检查人员（签名）：</text>
+    <image wx:if="{{qianming02 != undefined && qianqianming02ming != null}}" src="{{qianming02}}" class="qm_img"></image>
   </view>
   <view class="flex_row mar_top">
-    <text>监督人员编号：</text><input type="text" style="width: 400rpx;"  disabled="disabled" value="{{checker2Code}}"/>
+    <text>检查人员编号：</text><input type="text" style="width: 400rpx;"  disabled="disabled" value="{{checker2Code}}"/>
   </view>
   <view class="flex_row mar_top txt_vi">
-    <text bindtap="bindQianming1">被复查单位负责人（签名）：</text>
-    <image wx:if="{{qianming1 != undefined && qianming1 != null}}" src="{{qianming1}}" class="qm_img"></image>
+    <text>被复查单位负责人（签名）：</text>
+    <image wx:if="{{qianming03 != undefined && qianming03 != null}}" src="{{qianming03}}" class="qm_img"></image>
   </view>
-  <!-- <view class="flex_row mar_top" style="text-align: right;"><input type="text" style="width: 370rpx;"  disabled="disabled" value="{{deptName}}"/></view> -->
-  <!-- <view class="flex_row mar_top" style="text-align: right;"><input type="text" style="width: 340rpx;"  disabled="disabled" value="{{checkTime}}"/></view> -->
-  <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{deptName}}</view>
-  <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{checkTime}}</view>
+  <view class="flex_row mar_top2 sign_layout_parent">
+    <view style="text-align: right;" wx:if="{{signature != undefined && signature != null}}">
+      <view style="text-align: right;"><text type="text" style="width: 340rpx;" />{{deptName}}</view>
+      <view style="text-align: right;"><text type="text" style="width: 340rpx;" />{{checkTime}}</view>
+      <view class="sign_layout" style="text-align: right; ">
+        <image src="{{signature}}" class="sign_img"></image>
+      </view>
+    </view>
 
-  <!-- <button type="primary" bindtap="bindViewSubmit">提交</button> -->
-  <view style="height: 10rpx;"></view>
+  </view>
+  <view style="height: 20rpx;"></view>
 </view>

pages/fcdetail/fcdetail.wxss

@@ -61,4 +61,16 @@ width:400rpx ;
 }
 .color_red{
   color: #f00;
+}
+.sign_img{
+  width: 220rpx;
+  height: 220rpx;
+}
+.sign_layout_parent{
+  position: relative;
+}
+.sign_layout{
+  position: absolute;
+  top: -40%;
+  right: 35rpx;
 }

pages/me/me.js

@@ -71,6 +71,14 @@ bindViewClear(){
     }
   })
 },
+/**
+ * 跳转我的巡查
+ */
+bindViewMyXunCha(){
+  wx.navigateTo({
+    url: '../me_xuncha_list/me_xuncha_list',
+  })
+},
 GoMailList(){
   wx.navigateTo({
     url: '../maillist/maillist',

pages/me/me.wxml

@@ -32,6 +32,14 @@
         <i class="iconfont icon-xiangyou"></i>
       </view>
   </view>
+  <view class="tit_one" bindtap="bindViewMyXunCha" wx:if="{{isBindSuccess}}" >
+    <image src="../images/metit1.png" class="metit" />
+    <view class="meline">
+      <i class="iconfont icon-xunjianjilu" ></i>
+        <text>我的巡查</text>
+        <i class="iconfont icon-xiangyou"></i>
+      </view>
+  </view>
   <view class="tit_one" bindtap="bindViewTest">
     <image src="../images/metit1.png" class="metit" />
     <view class="meline">

pages/me_xuncha_list/me_xuncha_list.js

@@ -0,0 +1,190 @@
+import http from '../../base/httputil'
+const app = getApp()
+Page({
+
+  onLoad() {
+    this.onPullDownRefresh();
+  },
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    host: app.globalData.host,
+    xunchaList: null,
+    /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    isRefresh: true,
+    total: 0,
+    pageNum: 1, // 页码
+    serchValue: "",
+    menulist: [{
+        "id": "1",
+        "url": "icon-anquanxuncha",
+        "title": "巡更",
+        "bindtap": ""
+      },
+      {
+        "id": "2",
+        "url": "icon-xunjian",
+        "title": "巡检",
+        "bindtap": "bindViewQiYeChaXun"
+      },
+    ],
+    mainmodel: {
+
+    }
+  },
+
+  toBindXunjinaMore(e) {
+    let isrisk = e.currentTarget.dataset.isrisk
+    let buslogid = e.currentTarget.dataset.buslogid
+    if (isrisk == 0) {
+      wx.showToast({
+        title: '没有发现安全隐患,请放心!!',
+        icon: "none"
+      })
+    } else {
+      wx.navigateTo({
+        url: '../xunjianmore/xunjianmore?buslogid=' + buslogid
+      })
+    }
+  },
+
+  getXunchaListSuccess(res) {
+
+    if (res.code == 200) {
+      // 显示加载图标
+      wx.showLoading({
+        title: '玩命加载中',
+      })
+      var that = this
+
+      if (res.data.rows.length == 0) {
+        wx.showToast({
+          title: '暂无更多数据',
+          icon: "none"
+        })
+      }
+      if (this.data.isRefresh) {
+        this.setData({
+          xunchaList: res.data.rows,
+          total: res.data.total
+        })
+
+        // 隐藏导航栏加载框
+        setTimeout(function () {
+          that.setData({
+            loadingData: false
+          });
+          wx.hideNavigationBarLoading();
+          // 停止下拉动作
+          wx.stopPullDownRefresh();
+          wx.hideLoading()
+
+        }, 1000)
+
+      } else {
+        this.setData({
+          xunchaList: this.data.xunchaList.concat(res.data.rows)
+        })
+        // 隐藏加载框
+
+        setTimeout(function () {
+          that.setData({
+            hidden: true,
+            loadingData: false
+          });
+
+          wx.hideLoading();
+        }, 1000)
+
+      }
+    } else {
+      
+    }
+  },
+  onPullDownRefresh: function () {
+    wx.showNavigationBarLoading();
+    var that = this;
+    var loadingData = this.data.loadingData
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      pageNum: 1,
+      isRefresh: true
+    })
+
+    let obj = new Object()
+    obj.pageNum = this.data.pageNum
+    obj.busEnterpriseName = this.data.serchValue
+    obj.pageSize = 10
+    obj.reasonable = false
+    obj.createBy=app.loginUserId
+    this.list(obj)
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    let that = this
+    var loadingData = that.data.loadingData
+
+    var hidden = that.data.hidden
+    // 页数+1
+    that.setData({
+      pageNum: that.data.pageNum + 1,
+      isRefresh: false
+    })
+    if (hidden) {
+      that.setData({
+        hidden: false
+      });
+     
+    }
+
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      loadingData: true
+    });
+
+    let obj = new Object()
+    obj.pageNum = that.data.pageNum
+    obj.busEnterpriseName = that.data.serchValue
+    obj.pageSize = 10
+    obj.reasonable = false
+    obj.createBy=app.loginUserId
+    that.list(obj)
+  },
+  
+  getXunchaListByEnterpriseName(e) {
+    var obj = new Object()
+    this.setData({
+      serchValue: e.detail.value,
+      teamList: [],
+      hidden: true,
+      loadingData: false,
+      isRefresh: true,
+      total: 0,
+      pageNum: 1, // 页
+    })
+    obj.busEnterpriseName = e.detail.value
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable = false
+    obj.createBy=app.loginUserId
+    this.list(obj)
+  },
+  list(data) {
+    http.send_get("/system/AppXunchaController/getXunchaList", data, this.getXunchaListSuccess)
+  },
+
+})

pages/me_xuncha_list/me_xuncha_list.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {},
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "我的巡查",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true
+}

pages/me_xuncha_list/me_xuncha_list.wxml

@@ -0,0 +1,39 @@
+<!--pages/xunchaWu/xunchawu.wxml-->
+<!--pages/xunchalist/xunchalist.wxml-->
+<view class="container">
+  <!-- 搜索 -->
+  <view class="search-container">
+    <view class="search-left">
+      <input type="text" bindinput="getXunchaListByEnterpriseName" placeholder="搜索" />
+    </view>
+    <button bindtap="bindViewSearchEnd" class="search-right">
+      <text class="iconfont icon-sousuo"></text>
+    </button>
+  </view>
+
+  <!-- 列表 -->
+  <view class="list_vi">
+    <view class="list_li list_li_c" wx:for="{{xunchaList}}" wx:key="index"
+    bindtap="toBindXunjinaMore"
+     data-isrisk="{{item.isRisk}}" data-buslogid="{{item.busLogId}}">
+      <view class="list_r">
+        <view class="list_li1">
+          <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>
+        </view>
+        <view class="list_li2">
+          <text>{{item.deptName}}</text>
+          <text>{{item.nickName}}</text>
+          <text>{{item.createTime}}</text>
+        </view>
+      </view>
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+  </view>
+  <!--bindmenuItemClick为按钮点击的时候的回调方法  mainmodel是显示的按钮，menulist为折叠的菜单的数组数据-->
+  <menu bindmenuItemClick="menuItemClick" mainmodel="{{mainmodel}}" menulist="{{menulist}}"></menu>
+  <view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
+</view>

pages/me_xuncha_list/me_xuncha_list.wxss

@@ -0,0 +1,40 @@
+.qy_con{
+  display: flex;
+  flex-direction: row;
+  justify-content:space-around;
+  text-align: center;
+  margin: 30rpx 30rpx;
+}
+.qy_con view{
+height: 140rpx;
+color: #fff;
+display: flex;
+flex-direction: column;
+padding: 15rpx 40rpx;
+position: relative;
+}
+.qy_con view image{
+  position: absolute;
+  top:0px;
+  left: 0px;
+  width: 100%;
+  height: 100%;
+  z-index: -1;
+  }
+.qy_con view h2{
+  font-size: 58rpx;
+  font-weight: bolder;
+  padding-top: 10rpx;
+  }
+  .qy_con view p{
+    font-size: 35rpx;
+    }
+    .data-loading {
+      height: 100rpx;
+      line-height: 100rpx;
+      background-color: #fff;
+      text-align: center;
+      font-size: 14px;
+    }
+
+  

pages/qianming/qianming.js

@@ -10,9 +10,7 @@ Page({
    */
   data: {
     host: app.globalData.host,
-    index:null,
-    qianming:null,
-    qianming1:null
+    index: null,
   },
   // 画布的触摸移动开始手势响应
   start: function (event) {
@@ -52,7 +50,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.data.index=options.index
+    this.data.index = options.index
     that = this
     //获得Canvas的上下文
     content = wx.createCanvasContext('firstCanvas')
@@ -106,49 +104,27 @@ Page({
         var path = res.tempFilePath
         //上传图片
         // that.uploadSignPic(path)
-       // console.log(path)
+        // console.log(path)
         let page = getCurrentPages();
         let prevPage = page[page.length - 2];
-        if(that.data.index==0){
-          //获取全局唯一的文件管理器 
-          wx.getFileSystemManager().readFile({ //读取本地文件内容
-            filePath: path, // 文件路径
-            encoding: 'base64', // 返回格式
-            success: res => {
-              prevPage.setData({
-                index :0,
-                qianming:path,
-                qianmingBase64:res.data,
-              });
-               wx.navigateBack()
-            }
-          });
-          
-        }else if(that.data.index==1){
-          wx.getFileSystemManager().readFile({ //读取本地文件内容
-            filePath: path, // 文件路径
-            encoding: 'base64', // 返回格式
-            success: res => {
-              prevPage.setData({
-                index :1,
-                qianming1:path,
-                qianming1Base64:res.data,
-              });
-               wx.navigateBack()
-            }
-          });
-        }else if(that.data.index==2){
-          prevPage.setData({
-            index :2,
-            qianming:path,
-          });
-          wx.navigateBack()
-        }
-       
+        //获取全局唯一的文件管理器 
+        wx.getFileSystemManager().readFile({ //读取本地文件内容
+          filePath: path, // 文件路径
+          encoding: 'base64', // 返回格式
+          success: res => {
+            prevPage.setData({
+              index: that.data.index,
+              qianming: path,
+              qianmingBase64: res.data,
+            });
+            //返回页面
+            wx.navigateBack()
+          }
+        });
       }
     })
   },
-  
+
 
   // /**
   //  * 上传签名图片

pages/xqzgdetail/xqzgdetail.js

@@ -11,10 +11,6 @@ Page({
     logId:null,
     askCompany:null,
     nickname:null,
-    qianming:null,
-    qianming1:null,
-    number:null,
-    number1:null,
     lasttime:null,
     deptName:null,
     xqCode:null,
@@ -22,21 +18,25 @@ Page({
     checker1Code:null,
     checker2Code:null,
     listData:null,
+    qianming01:null,
+    qianming02:null,
+    qianming03:null,
+    signature:null,
   }, 
   getDetailsSuccess(e) {
-    
     if(e.code == 200){
       this.data.lasttime=util.formatDate(new Date(e.data.zgtzs.lastTime),'yyyy年MM月dd日') ;
-      this.data.deptName=e.data.dept_jd;
+      this.data.deptName=e.data.zgtzs.checkDept;
       this.data.askCompany=e.data.zgtzs.askCom;
-      this.data.nickname=e.data.zgtzs.checker1Sign;
-      this.data.qianming=e.data.zgtzs.checker2Sign;
+      this.data.qianming01=e.data.zgtzs.checker1Sign;
+      this.data.qianming02=e.data.zgtzs.checker2Sign;
       this.data.checker1Code=e.data.zgtzs.checker1Code;
       this.data.checker2Code=e.data.zgtzs.checker2Code;
-      this.data.qianming1=e.data.zgtzs.becheckerSign;
+      this.data.qianming03=e.data.zgtzs.becheckerSign;
       this.data.checkTime=util.formatDate(new Date(e.data.zgtzs.checkTime),'yyyy年MM月dd日') ;
       this.data.xqCode=e.data.zgtzs.code;
       this.data.listData=e.data.zgtzs_items;
+      this.data.signature=e.data.zgtzs.seal;
       this.setData({
         listData:this.data.listData,
         lasttime:this.data.lasttime,
@@ -46,9 +46,11 @@ Page({
         xqCode:this.data.xqCode,
         checker1Code:this.data.checker1Code,
         checker2Code:this.data.checker2Code,
-        qianming:this.data.qianming,
-        qianming1:this.data.qianming1,
+        qianming01:this.data.qianming01,
+        qianming02:this.data.qianming02,
+        qianming03:this.data.qianming03,
         deptName:this.data.deptName,
+        signature:this.data.signature,
       })
     }
   },
@@ -62,49 +64,8 @@ Page({
     this.data.busEnterpriseId = options.busEnterpriseId
     var obj ={}
     obj["logId"]=this.data.logId,
-    http.post('/system/AppXunchaController/getXHXqzgtzsDetail', obj, this.getDetailsSuccess);
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
+    // obj["userId"]=app.loginUserId;
+    http.post_nocheck('/system/AppXunchaController/getXHXqzgtzsDetail', obj, this.getDetailsSuccess);
   },
 
   /**
@@ -112,7 +73,10 @@ Page({
    */
 
   onShareAppMessage() {
-
+    return{
+      title:'隐患限期整改告知书',
+      url: '../xqzgdetail/xqzgdetail?logId='+this.data.buslogid,
+    }
   },
  
 })

pages/xqzgdetail/xqzgdetail.wxml

@@ -1,28 +1,41 @@
 <view class="container">
-  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;" disabled="disabled" value="{{xqCode}}"/></view>
+  <view class="zg_bh"><text>编号：</text><input type="number" style="width: 400rpx;" disabled="disabled" value="{{xqCode}}" /></view>
   <text class="con_tit mar_top">隐患限期整改告知书</text>
   <view class="flex_row text_ind mar_top2">经查，你单位存在下列问题： </view>
   <view wx:for="{{listData}}" wx:key="index" class="jcwt">
     {{index+1}}、{{item.itemContent}}
   </view>
   <!-- <b> {{pageData.latTime}}</b> -->
-  <view class="flex_row text_ind">现告知你单位对上述问题于<input type="text" style="width: 400rpx;" disabled="disabled" value="{{lasttime}}"/>,前整改完毕，达到有关法律法规规章和标准规定的要求。由此造成事故的，依法追究有关人员的责任。整改期间，你单位应当采取措施，确保安全生产。</view>
+  <view class="flex_row text_ind">现告知你单位对上述问题于<input type="text" style="width: 400rpx;" disabled="disabled" value="{{lasttime}}" />,前整改完毕，达到有关法律法规规章和标准规定的要求。由此造成事故的，依法追究有关人员的责任。整改期间，你单位应当采取措施，确保安全生产。</view>
   <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的，我单位将提报相关执法部门进行依法查处。</view>
-  <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 400rpx;" disabled="disabled" value="{{askCompany}}"/>咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
-  <view class="flex_row mar_top">检查人员：<text style="margin-right: 30rpx;">{{nickname}}</text></view>
-  <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" disabled="disabled" value="{{checker1Code}}"/></view>
-  <view class="flex_row mar_top2 txt_vi"><text>监督人员（签名）：</text>
-    <image wx:if="{{qianming != undefined && qianming != null}}" src="{{qianming}}" class="qm_img"></image>
+  <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 400rpx;" disabled="disabled" value="{{askCompany}}" />咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
+  <!-- <view class="flex_row mar_top">检查人员：<text style="margin-right: 30rpx;">{{nickname}}</text></view> -->
+  <!-- <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" disabled="disabled" value="{{checker1Code}}"/></view> -->
+  <view class="flex_row mar_top2 txt_vi"><text>检查人员（签名）：</text>
+    <image wx:if="{{qianming01 != undefined && qianming01 != null}}" src="{{qianming01}}" class="qm_img"></image>
   </view>
-  <view class="flex_row mar_top">监督人员编号<input type="text" style="width: 400rpx;" disabled="disabled" value="{{checker2Code}}"/></view>
+  <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" disabled="disabled" value="{{checker1Code}}" /></view>
+
+  <view class="flex_row mar_top2 txt_vi"><text>检查人员（签名）：</text>
+    <image wx:if="{{qianming02 != undefined && qianming02 != null}}" src="{{qianming02}}" class="qm_img"></image>
+  </view>
+  <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" disabled="disabled" value="{{checker2Code}}" /></view>
   <view class="flex_row mar_top2 txt_vi"><text>被复查单位负责人（签名）：</text>
-    <image wx:if="{{qianming1 != undefined && qianming1 != null}}" src="{{qianming1}}" class="qm_img"></image>
+    <image wx:if="{{qianming03 != undefined && qianming03 != null}}" src="{{qianming03}}" class="qm_img"></image>
   </view>
   <!-- <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 340rpx;"  disabled="disabled" value="{{deptName}}"/></view> -->
   <!-- <view class="flex_row mar_top2" style="text-align: right;"><input type="text" style="width: 340rpx;"  disabled="disabled" value="{{checkTime}}"/></view> -->
-  <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{deptName}}</view>
-  <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{checkTime}}</view>
 
-  <view style="height: 10rpx;"></view>
+  <view class="flex_row mar_top2 sign_layout_parent">
+    <view style="text-align: right;" >
+      <view style="text-align: right;"><text type="text" style="width: 340rpx;" />{{deptName}}</view>
+      <view style="text-align: right;"><text type="text" style="width: 340rpx;" />{{checkTime}}</view>
+      <view class="sign_layout" style="text-align: right; ">
+        <image wx:if="{{signature != undefined && signature != null}}" src="{{signature}}" class="sign_img"></image>
+      </view>
+    </view>
+
+  </view>
+  <view style="height: 20rpx;"></view>
 
 </view>

pages/xqzgdetail/xqzgdetail.wxss

@@ -68,4 +68,16 @@ button{
 }
 .txt_vi text{
   line-height: 160rpx;
+}
+.sign_img{
+  width: 220rpx;
+  height: 220rpx;
+}
+.sign_layout_parent{
+  position: relative;
+}
+.sign_layout{
+  position: absolute;
+  top: -40%;
+  right: 35rpx;
 }

pages/xqzggzs/xqzggzs.js

@@ -16,38 +16,45 @@ Page({
     askCompany:null,
     opinion:null,
     nickname:null,
-    qianming:null,
-    qianming1:null,
-    number:null,
-    number1:null,
+    qianming01:null,
+    qianming02:null,
+    qianming03:null,
+    number01:null,
+    number02:null,
     needLastTime:null,
     lasttime:null,
     gzsTime:null,
     deptName:null,
     yhzggzsCode:null,
     isFirst:true,
-    qianmingBase64:null,
-    qianming1Base64:null,
+    qianming01Base64:null,
+    qianming02Base64:null,
+    qianming03Base64:null,
   },
-  bindQianming() {
+  bindQianming01() {
     wx.navigateTo({
-      url: '../qianming/qianming?index=0',
+      url: '../qianming/qianming?index=1',
     })
   },
 
-  bindQianming1() {
+  bindQianming02() {
     wx.navigateTo({
-      url: '../qianming/qianming?index=1',
+      url: '../qianming/qianming?index=2',
+    })
+  },
+  bindQianming03() {
+    wx.navigateTo({
+      url: '../qianming/qianming?index=3',
     })
   },
   bindInputOpinionArea(e){
     this.data.opinion = e.detail.value;
   },
-  bindInputJianChaNumber(e){
-    this.data.number = e.detail.value;
+  bindInputJianCha01Number(e){
+    this.data.number01 = e.detail.value;
   },
-  bindInputJianDuNumber(e){
-    this.data.number1 = e.detail.value;
+  bindInputJianCha02Number(e){
+    this.data.number02 = e.detail.value;
   },
   bindInputCompany(e){
     this.data.askCompany = e.detail.value;
@@ -87,20 +94,27 @@ Page({
       let pages = getCurrentPages();
       let currPage = pages[pages.length-1];
       this.data.index=currPage.data.index;
-      if(this.data.index==0){
-        this.data.qianming=currPage.data.qianming;
-        if (this.data.qianming != undefined && this.data.qianming != null) {
+      if (currPage.data.qianming != undefined && currPage.data.qianming != null) {
+        if (this.data.index == 1) {
+          this.data.qianming01 = currPage.data.qianming;
+          this.data.qianming01Base64=currPage.data.qianmingBase64;
           this.setData({
-            qianming: this.data.qianming,
-            qianmingBase64:this.data.qianmingBase64
+            qianming01: currPage.data.qianming,
+            qianming01Base64: currPage.data.qianmingBase64
           })
-        }
-      }else if(this.data.index==1){
-        this.data.qianming1=currPage.data.qianming1;
-        if (this.data.qianming1 != undefined && this.data.qianming1 != null) {
+        }else if(this.data.index==2){
+          this.data.qianming02 = currPage.data.qianming;
+          this.data.qianming02Base64=currPage.data.qianmingBase64;
           this.setData({
-            qianming1: this.data.qianming1,
-            qianming1Base64:this.data.qianming1Base64
+            qianming02: currPage.data.qianming,
+            qianming02Base64: currPage.data.qianmingBase64
+          })
+        }else if(this.data.index==3){
+          this.data.qianming03 = currPage.data.qianming;
+          this.data.qianming03Base64=currPage.data.qianmingBase64;
+          this.setData({
+            qianming03: currPage.data.qianming,
+            qianming03Base64: currPage.data.qianmingBase64
           })
         }
       }
@@ -124,28 +138,36 @@ Page({
       })
       return
     }
-    if(this.data.number==null){
-      wx.showToast({
-        title: '请输入检查人员编号',
-        icon:'none'
-      })
-      return
-    }
-    if(this.data.qianming==null){
+    
+    if(this.data.qianming01==null){
       wx.showToast({
-        title: '请监督人员签名',
+        title: '请检查人员签名',
         icon:'none'
       })
       return
     }
-    if(this.data.number1==null){
+    if(this.data.number01==null){
       wx.showToast({
-        title: '请输入监督人员编号',
+        title: '请输入检查人员编号',
         icon:'none'
       })
       return
     }
-    if(this.data.qianming1==null){
+    // if (this.data.qianming02 == null && (this.data.number02)) {
+    //   wx.showToast({
+    //     title: '请检查人员签名',
+    //     icon: 'none'
+    //   })
+    //   return
+    // }
+    // if (this.data.qianming02 != null && (!this.data.number02)) {
+    //   wx.showToast({
+    //     title: '请输入检查人员编号',
+    //     icon: 'none'
+    //   })
+    //   return
+    // }
+    if(this.data.qianming03==null){
       wx.showToast({
         title: '请被复查单位负责人签名',
         icon:'none'
@@ -162,11 +184,11 @@ Page({
     bean["askCom"]=this.data.askCompany,
     bean["myoption"]=this.data.opinion, 
     bean["lasttime"]=this.data.needLastTime, 
-    bean["checker1Sign"]=this.data.nickname,
-    bean["checker1Code"]=this.data.number,
-    bean["checker2Sign"]=this.data.qianmingBase64,
-    bean["checker2Code"]=this.data.number1,
-    bean["becheckerSign"]=this.data.qianming1Base64,
+    bean["checker1Sign"]=this.data.qianming01Base64,
+    bean["checker1Code"]=this.data.number01,
+    bean["checker2Sign"]=this.data.qianming02Base64,
+    bean["checker2Code"]=this.data.number02,
+    bean["becheckerSign"]=this.data.qianming03Base64,
     bean["checkTime"]=new Date()
     data['tzsFcyjgzs']=bean
     http.send_post("/system/AppXunjianController/saveFCTZS",data,this.submitSuccess)
@@ -186,41 +208,6 @@ Page({
   },
 
   /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
    * 用户点击右上角分享
    */
   onShareAppMessage() {

pages/xqzggzs/xqzggzs.wxml

@@ -8,24 +8,30 @@
   <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的，我单位将提报相关执法部门进行依法查处。</view>
   <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 150rpx;" bindinput="bindInputCompany" />咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
 
-  <view class="flex_row mar_top">检查人员：{{nickname}}</view>
+  <!-- <view class="flex_row mar_top">检查人员：{{nickname}}</view>
   <view class="flex_row mar_top">
     <text>检查人员编号：</text><input type="text" style="width: 400rpx;" bindinput="bindInputJianChaNumber" />
+  </view> -->
+  <view class="flex_row mar_top txt_vi">
+    <text>检查人员（签名）：</text>
+    <text class="te_k" wx:if="{{qianming01 == undefined || qianming01 == null}}" bindtap="bindQianming01">点击签名</text>
+    <image wx:else src="{{qianming01}}" class="qm_img" bindtap="bindQianming01"></image>
+  </view>
+  <view class="flex_row mar_top">
+    <text>检查人员编号：</text><input type="text" style="width: 400rpx;" bindinput="bindInputJianCha01Number" />
   </view>
   <view class="flex_row mar_top txt_vi">
-    <text>监督人员（签名）：</text>
-    <text class="te_k" wx:if="{{qianming == undefined || qianming == null}}" bindtap="bindQianming">点击签名</text>
-    <!-- ="{{qianming != undefined && qianming != null}}"  -->
-    <image wx:else src="{{qianming}}" class="qm_img" bindtap="bindQianming"></image>
+    <text>检查人员（签名）：</text>
+    <text class="te_k" wx:if="{{qianming02 == undefined || qianming02 == null}}" bindtap="bindQianming02">点击签名</text>
+    <image wx:else src="{{qianming02}}" class="qm_img" bindtap="bindQianming02"></image>
   </view>
   <view class="flex_row mar_top">
-    <text>监督人员编号：</text><input type="text" style="width: 400rpx;" bindinput="bindInputJianDuNumber" />
+    <text>检查人员编号：</text><input type="text" style="width: 400rpx;" bindinput="bindInputJianCha02Number" />
   </view>
   <view class="flex_row mar_top txt_vi">
     <text>被复查单位负责人（签名）：</text>
-    <text class="te_k" wx:if="{{qianming1 == undefined || qianming1 == null}}" bindtap="bindQianming1">点击签名</text>
-    <!-- {{qianming1 != undefined && qianming1 != null}} -->
-    <image wx:else src="{{qianming1}}" class="qm_img" bindtap="bindQianming1"></image>
+    <text class="te_k" wx:if="{{qianming03 == undefined || qianming03 == null}}" bindtap="bindQianming03">点击签名</text>
+    <image wx:else src="{{qianming03}}" class="qm_img" bindtap="bindQianming03"></image>
   </view>
   <view class="flex_row mar_top" style="text-align: right;"><text type="text" style="width: 370rpx;">{{deptName}}</text></view>
   <!-- <view class="flex_row mar_top2" style="text-align: right;"><input type="number" style="width: 100rpx;" />年<input type="number" style="width: 100rpx;" />月<input type="number" style="width: 100rpx;" />日</view> -->

pages/xqzggzs2/xqzggzs2.js

@@ -10,31 +10,33 @@ Page({
     host: app.globalData.host,
     logId: null,
     pageData: null,
-    qianming: null,
-    qianming1: null,
-    busEnterpriseId : null,
-    time:null,
-    index:null,
-    isFirst:true,
-    company:null,
-    number:null,
-    number1:null,
-    submitdata:[],
-    qianmingBase64:null,
-    qianming1Base64:null,
+    busEnterpriseId: null,
+    time: null,
+    index: null,
+    isFirst: true,
+    company: null,
+    qianming01: null,
+    qianming02: null,
+    qianming03: null,
+    number01: null,
+    number02: null,
+    submitdata: [],
+    qianming01Base64: null,
+    qianming02Base64: null,
+    qianming03Base64: null,
     // {itemId:"",
     // itemContent:""}
   },
-  bindViewInputCompany(e){
+  bindViewInputCompany(e) {
     this.data.company = e.detail.value;
   },
-  
-  bindViewInputNumber(e){
-    this.data.number = e.detail.value;
+
+  bindViewInputNumber01(e) {
+    this.data.number01 = e.detail.value;
   },
-  
-  bindViewInputNumber1(e){
-    this.data.number1 = e.detail.value;
+
+  bindViewInputNumber02(e) {
+    this.data.number02 = e.detail.value;
   },
   getXqzggzs2() {
     var obj = new Object()
@@ -42,7 +44,7 @@ Page({
     http.post('/system/AppXunjianController/getXqzggzs2', obj, this.getXqzggzs2Success);
   },
   getXqzggzs2Success(e) {
-    
+
     this.setData({
       pageData: e.data
     })
@@ -52,17 +54,16 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-   
     this.data.logId = options.logId
     this.data.busEnterpriseId = options.busEnterpriseId
     this.getXqzggzs2()
-    var time= util.formatDate(new Date(),'yyyy年MM月dd日')
+    var time = util.formatDate(new Date(), 'yyyy年MM月dd日')
     this.setData({
-      time:time
+      time: time
     })
     wx.enableAlertBeforeUnload({
-        message: '巡检流程尚未完成,确定退出？',
-      })
+      message: '巡检流程尚未完成,确定退出？',
+    })
   },
 
   /**
@@ -76,33 +77,39 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    if(!this.data.isFirst){
+    if (!this.data.isFirst) {
       let pages = getCurrentPages();
-      let currPage = pages[pages.length-1];
-      this.data.index=currPage.data.index;
-      if(this.data.index==0){
-        this.data.qianming=currPage.data.qianming;
-        if (this.data.qianming != undefined && this.data.qianming != null) {
+      let currPage = pages[pages.length - 1];
+      this.data.index = currPage.data.index;
+      if (currPage.data.qianming != undefined && currPage.data.qianming != null) {
+        if (this.data.index == 1) {
+          this.data.qianming01 = currPage.data.qianming;
+          this.data.qianming01Base64 = currPage.data.qianmingBase64;
           this.setData({
-            qianming: this.data.qianming,
-            qianmingBase64:this.data.qianmingBase64
+            qianming01: currPage.data.qianming,
+            qianming01Base64: currPage.data.qianmingBase64
           })
-        }
-      }else if(this.data.index==1){
-        this.data.qianming1=currPage.data.qianming1;
-        if (this.data.qianming1 != undefined && this.data.qianming1 != null) {
+        } else if (this.data.index == 2) {
+          this.data.qianming02 = currPage.data.qianming;
+          this.data.qianming02Base64 = currPage.data.qianmingBase64;
           this.setData({
-            qianming1: this.data.qianming1,
-            qianming1Base64:this.data.qianming1Base64
-
+            qianming02: currPage.data.qianming,
+            qianming02Base64: currPage.data.qianmingBase64
+          })
+        } else if (this.data.index == 3) {
+          this.data.qianming03 = currPage.data.qianming;
+          this.data.qianming03Base64 = currPage.data.qianmingBase64;
+          this.setData({
+            qianming03: currPage.data.qianming,
+            qianming03Base64: currPage.data.qianmingBase64
           })
         }
       }
     }
-    this.data.isFirst=false
-  
+    this.data.isFirst = false
+
   },
- 
+
   /**
    * 生命周期函数--监听页面隐藏
    */
@@ -119,11 +126,11 @@ Page({
     //   content: '退出后需重新巡检',
     //   complete: (res) => {
     //     if (res.cancel) {
-          
+
     //     }
-    
+
     //     if (res.confirm) {
-          
+
     //     }
     //   }
     // })
@@ -151,64 +158,75 @@ Page({
 
   },
 
-  bindQianming() {
+  bindQianming01() {
     wx.navigateTo({
-      url: '../qianming/qianming?index=0',
+      url: '../qianming/qianming?index=1',
     })
   },
 
-  bindQianming1() {
+  bindQianming02() {
     wx.navigateTo({
-      url: '../qianming/qianming?index=1',
+      url: '../qianming/qianming?index=2',
+    })
+  },
+
+  bindQianming03() {
+    wx.navigateTo({
+      url: '../qianming/qianming?index=3',
     })
   },
-  submitXqzggzs2(){
-    if(this.data.company==null){
+  submitXqzggzs2() {
+    if (this.data.company == null) {
       wx.showToast({
         title: '请输入咨询组织名称',
-        icon:'none'
-      })
-      return
-    }
-    
-    if(this.data.number==null){
-      wx.showToast({
-        title: '请输入检查人员编号',
-        icon:'none'
+        icon: 'none'
       })
       return
     }
-    
-    if(this.data.qianming==null){
+
+    if (this.data.qianming01 == null) {
       wx.showToast({
-        title: '请监督人员签名',
-        icon:'none'
+        title: '请检查人员签名',
+        icon: 'none'
       })
       return
     }
-    
-    if(this.data.number1==null){
+    if (this.data.number01 == null) {
       wx.showToast({
-        title: '请输入监督人员编号',
-        icon:'none'
+        title: '请输入检查人员编号',
+        icon: 'none'
       })
       return
-    }
-    
-    if(this.data.qianming1==null){
+    } 
+    // if (this.data.qianming02 != null && (!this.data.number02)) {
+    //   wx.showToast({
+    //     title: '请输入检查人员编号',
+    //     icon: 'none'
+    //   })
+    //   return
+    // }
+    // if(this.data.qianming03==null){
+    //   wx.showToast({
+    //     title: '请被复查单位负责人签名',
+    //     icon:'none'
+    //   })
+    //   return
+    // }
+
+    if (this.data.qianming03 == null) {
       wx.showToast({
         title: '请被复查单位负责人签名',
-        icon:'none'
+        icon: 'none'
       })
       return
     }
 
- 
+
 
     // if(this.data.pageData!=null&&this.data.pageData.riskInspections!=null){
     //   let array=this.data.pageData.riskInspections;
     //   let listdata;
-      
+
     //     for(var i=0;i<array.length;i++){
     //       this.setData({
     //         [`submitdata[${i}].itemId `]: array[i].busItemsId,
@@ -219,46 +237,46 @@ Page({
     // }
     // http.post("/system/AppXunjianController/submitXqzggzs2",null,this.submitXqzggzs2Success)
     // var data={};
-    var xqzgtzs={};
+    var xqzgtzs = {};
     // var tzs_items=[];   
     // data["tzs_items"]=this.data.pageData.riskInspections,
-    xqzgtzs["logId"]=this.data.logId,
-    xqzgtzs["enterpriseId"]=this.data.busEnterpriseId,
-    xqzgtzs["lastTime"]=new Date(this.data.pageData.latTime.replace("年","-").replace("月","-").replace("日","")),
-    xqzgtzs["askCom"]=this.data.company,
-    xqzgtzs["checker1Sign"]=this.data.pageData.nickName,
-    xqzgtzs["checker1Code"]=this.data.number,
-    xqzgtzs["checker2Sign"]=this.data.qianmingBase64,
-    xqzgtzs["checker2Code"]=this.data.number1,
-    xqzgtzs["becheckerSign"]=this.data.qianming1Base64,
-    xqzgtzs["checkTime"]=new Date()
+    xqzgtzs["logId"] = this.data.logId,
+      xqzgtzs["enterpriseId"] = this.data.busEnterpriseId,
+      xqzgtzs["lastTime"] = new Date(this.data.pageData.latTime.replace("年", "-").replace("月", "-").replace("日", "")),
+      xqzgtzs["askCom"] = this.data.company,
+      xqzgtzs["checker1Sign"] = this.data.qianming01Base64,
+      xqzgtzs["checker1Code"] = this.data.number01,
+      xqzgtzs["checker2Sign"] = this.data.qianming02Base64,
+      xqzgtzs["checker2Code"] = this.data.number02,
+      xqzgtzs["becheckerSign"] = this.data.qianming03Base64,
+      xqzgtzs["checkTime"] = new Date()
     // data["xqzgtzs"]=xqzgtzs
 
-    let data=new Object();
-    data.tzs_items=this.data.pageData.riskInspections;
-    data.xqzgtzs=xqzgtzs;
-    
-    http.send_post("/system/AppXunjianController/saveZGTZS",data,this.submitXqzggzs2Success)
-    
-    
+    let data = new Object();
+    data.tzs_items = this.data.pageData.riskInspections;
+    data.xqzgtzs = xqzgtzs;
+
+    http.send_post("/system/AppXunjianController/saveZGTZS", data, this.submitXqzggzs2Success)
+
+
   },
-  submitXqzggzs2Success(e){
-    if(e.code == 200){
-       let page = getCurrentPages();
-       let prevPage = page[page.length - 2];
-       prevPage.setData({
-         isRefresh:true,
-       });
+  submitXqzggzs2Success(e) {
+    if (e.code == 200) {
+      let page = getCurrentPages();
+      let prevPage = page[page.length - 2];
+      prevPage.setData({
+        isRefresh: true,
+      });
       wx.showToast({
         title: '操作成功',
       })
       wx.disableAlertBeforeUnload()
 
-       setTimeout(()=>{
+      setTimeout(() => {
         wx.navigateBack()
-       },500)
-   
+      }, 500)
+
     }
   },
-  
+
 })

pages/xqzggzs2/xqzggzs2.wxml

@@ -10,18 +10,25 @@
   <view class="flex_row text_ind">现告知你单位对上述问题于<b> {{pageData.latTime}}</b>,前整改完毕，达到有关法律法规规章和标准规定的要求。由此造成事故的，依法追究有关人员的责任。整改期间，你单位应当采取措施，确保安全生产。</view>
   <view class="flex_row text_ind">逾期未整改或在整改过程中存在安全生产违法行为的，我单位将提报相关执法部门进行依法查处。</view>
   <view class="flex_row text_ind">如果对本告知内容有异议，可向<input type="text" style="width: 150rpx;" bindinput="bindViewInputCompany" />咨询或说明情况，也可通过12350安全生产举报电话进行反映。在没有新书面告知前，本告知要求不停止执行，法律另有规定的除外。</view>
-  <view class="flex_row mar_top">检查人员：<text style="margin-right: 30rpx;">{{pageData.nickName}}</text></view>
-  <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" maxlength="15" bindinput="bindViewInputNumber" /></view>
-  <view class="flex_row mar_top2 txt_vi" ><text>监督人员（签名）：</text>
-    <text class="te_k" wx:if="{{qianming == undefined || qianming == null}}" bindtap="bindQianming">点击签名</text>
+  <!-- <view class="flex_row mar_top">检查人员：<text style="margin-right: 30rpx;">{{pageData.nickName}}</text></view> -->
+  <!-- <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" maxlength="15" bindinput="bindViewInputNumber" /></view> -->
+  <view class="flex_row mar_top2 txt_vi" ><text>检查人员（签名）：</text>
+    <text class="te_k" wx:if="{{qianming01 == undefined || qianming01 == null}}" bindtap="bindQianming01">点击签名</text>
     <!-- ="{{qianming != undefined && qianming != null}}" -->
-    <image wx:else src="{{qianming}}" class="qm_img" bindtap="bindQianming"></image>
+    <image wx:else src="{{qianming01}}" class="qm_img" bindtap="bindQianming01"></image>
   </view>
-  <view class="flex_row mar_top">监督人员编号：<input type="text" style="width: 400rpx;" maxlength="15" bindinput="bindViewInputNumber1" /></view>
+  <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" maxlength="15" bindinput="bindViewInputNumber01" /></view>
+ 
+  <view class="flex_row mar_top2 txt_vi" ><text>检查人员（签名）：</text>
+    <text class="te_k" wx:if="{{qianming02 == undefined || qianming02 == null}}" bindtap="bindQianming02">点击签名</text>
+    <!-- ="{{qianming != undefined && qianming != null}}" -->
+    <image wx:else src="{{qianming02}}" class="qm_img" bindtap="bindQianming02"></image>
+  </view>
+  <view class="flex_row mar_top">检查人员编号：<input type="text" style="width: 400rpx;" maxlength="15" bindinput="bindViewInputNumber02" /></view>
   <view class="flex_row mar_top2 txt_vi" ><text>被复查单位负责人（签名）：</text>
-    <text class="te_k" wx:if="{{qianming1 == undefined || qianming1 == null}}" bindtap="bindQianming1">点击签名</text>
+    <text class="te_k" wx:if="{{qianming03 == undefined || qianming03 == null}}" bindtap="bindQianming03">点击签名</text>
     <!-- ="{{qianming1 != undefined && qianming1 != null}}" -->
-    <image wx:else src="{{qianming1}}" class="qm_img" bindtap="bindQianming1"></image>
+    <image wx:else src="{{qianming03}}" class="qm_img" bindtap="bindQianming03"></image>
   </view>
   <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{pageData.deptName}}</view>
   <view class="flex_row mar_top2" style="text-align: right;"><text type="text" style="width: 340rpx;" />{{time}}</view>

pages/xuncha/xuncha.js

@@ -9,10 +9,8 @@ Page({
     todayXunchaCount: 0,
     todayRiskCount: 0,
     todayEnterpriseCount: 0,
-
     xunchaList: null,
-
-
+    pageNum: 1, // 页码
     menulist: [{
         "id": "1",
         "url": "icon-anquanxuncha",

pages/xunchawu/xunchawu.js

@@ -3,7 +3,7 @@ const app = getApp()
 Page({
 
   onLoad() {
-    //this.getXunchaList()
+    this.onPullDownRefresh();
   },
   /**
    * 页面的初始数据
@@ -54,18 +54,9 @@ Page({
         url: '../xunjianmore/xunjianmore?buslogid=' + buslogid
       })
     }
-    // console.log(isrisk,"####",buslogid)
   },
 
-  // getXunchaList() {
-  //   http.post("/system/AppXunchaController/getXunchaList", null, this.getXunchaListSuccess)
-  // },
   getXunchaListSuccess(res) {
-  
-    // this.setData({
-    //   xunchaList: res.rows
-    // })
-
 
     if (res.code == 200) {
       // 显示加载图标
@@ -86,8 +77,6 @@ Page({
           total: res.data.total
         })
 
-
-
         // 隐藏导航栏加载框
         setTimeout(function () {
           that.setData({
@@ -121,14 +110,7 @@ Page({
     }
   },
   onPullDownRefresh: function () {
-    // 显示顶部刷新图标
-    if (this.data.serchValue == "") {
-      wx.showToast({
-        title: '请输入搜索内容',
-        icon: 'error'
-      })
-      return
-    }
+    this.data.pageNum=1;
     wx.showNavigationBarLoading();
     var that = this;
     var loadingData = this.data.loadingData
@@ -136,12 +118,12 @@ Page({
       return;
     }
     that.setData({
-      pageNum: 1,
+      pageNum:  that.data.pageNum,
       isRefresh: true
     })
 
     let obj = new Object()
-    obj.pageNum = this.data.pageNum
+    obj.pageNum = that.data.pageNum
     obj.busEnterpriseName = this.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
@@ -151,13 +133,14 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
+    this.data.pageNum=this.data.pageNum+1
     let that = this
     var loadingData = that.data.loadingData
 
     var hidden = that.data.hidden
     // 页数+1
     that.setData({
-      pageNum: that.data.pageNum + 1,
+      pageNum: that.data.pageNum,
       isRefresh: false
     })
     if (hidden) {
@@ -174,29 +157,14 @@ Page({
       loadingData: true
     });
 
-
-    //console.log("@@@@"+Math.ceil(this.data.total/10))
-    // if(Math.ceil(that.data.total/10)>=that.data.pageNum){
-    // that.loadData();
     let obj = new Object()
     obj.pageNum = that.data.pageNum
     obj.busEnterpriseName = that.data.serchValue
     obj.pageSize = 10
     obj.reasonable = false
     that.list(obj)
-
-    // }else{
-
-    //   setTimeout(function () {
-    //     that.setData({
-    //       hidden: true,
-    //     });
-
-    //   }, 2000)
-    // }
-
-
   },
+
   getXunchaListByEnterpriseName(e) {
     var obj = new Object()
     this.setData({
@@ -212,41 +180,10 @@ Page({
     obj.pageNum = this.data.pageNum
     obj.pageSize = 10
     obj.reasonable = false
-    //obj.busEnterpriseName = e.detail.value
     this.list(obj)
   },
   list(data) {
-
     http.send_get("/system/AppXunchaController/getXunchaList", data, this.getXunchaListSuccess)
   },
 
-
-
-
-  // // 搜索结果跳页
-  // bindViewSearchEnd() {
-  //   wx.navigateTo({
-  //     url: '../search/search'
-  //   })
-  // },
-  // 企业详细页
-  // bindViewDetails() {
-  //   wx.navigateTo({
-  //     url: '../details/details'
-  //   })
-  // },
-  // 企业查询页
-  // bindViewQiYeChaXun() {
-  //   wx.navigateTo({
-  //     url: '../qiyechaxun/qiyechaxun'
-  //   })
-  // },
-
-  menuItemClick: function (res) {
-    //获取点击事件的信息
-    let clickInfo = res.detail.iteminfo
-    // 根据不同类型进行判别处理
-    //事件的处理 代码
-  }
-
 })

pages/xunjian/xunjian.js

@@ -227,12 +227,12 @@ Page({
     this.pictureAuthSetting()
     this.data.busEnterpriseId = options.busEnterpriseId
     // this.getXunjianItems()
-    this.setData({
-      //通过bind(this)将函数绑定到this上,以后函数内的this就是指全局页面
-      //setdata以后,这两个函数就可以传递给mp-uploader了
-      selectFile: this.selectFile.bind(this),
-      uplaodFile: this.uplaodFile.bind(this),
-    })
+    // this.setData({
+    //   //通过bind(this)将函数绑定到this上,以后函数内的this就是指全局页面
+    //   //setdata以后,这两个函数就可以传递给mp-uploader了
+    //   selectFile: this.selectFile.bind(this),
+    //   uplaodFile: this.uplaodFile.bind(this),
+    // })
   },
   onShow: function () {
     let pages = getCurrentPages();
@@ -251,71 +251,71 @@ Page({
     }
   },
   //mpuploader选择图片时的过滤函数，返回true表示图片有效
-  selectFile(files) {
-    wx.showLoading({
-      title: '',
-    })
-    // 如果有大文件可以压缩一下
-    // 返回false可以阻止本次文件上传
-  },
-  uplaodFile(files) {
-    // 图片上传的函数，必须返回Promise
-    //Promise的callback里面必须resolve({urls})表示成功，否则表示失败
-    return new Promise((resolve, reject) => {
-      const tempFilePaths = files.tempFilePaths;
-      const that = this;
-      let finished = {
-        url: []
-      } //本次上次成功的URL存入这个变量,被success方法的e.detail承接
-
-      for (var i = 0; i < tempFilePaths.length; i++) {
-        let filePath = tempFilePaths[i] //原名
-        let cloudPath = 'qyzj' + new Date().getTime() + '-' + i + filePath.match(/\.[^.]+?$/)[0] //云存储文件名
-
-        wx.cloud.uploadFile({
-          filePath,
-          cloudPath,
-
-          //成功
-          success: function (res) {
-            if (res.statusCode != 200 && res.statusCode != 204 && res.statusCode != 205) reject('error') // 可能会有好几个200+的返回码，表示成功
-
-            finished.url.push({
-              url: res.fileID
-            }) //成功一个存一个到本次上传成功列表
-            //如果本次上传的文件都完成 或全局已经存满3张,resolve退出
-            if (finished.urls.length === tempFilePaths.length || that.data.files.length + finished.urls.length == this.data.maximgs)
-              resolve(finished)
-          },
-
-          //失败
-          fail: function (err) {
+  // selectFile(files) {
+  //   wx.showLoading({
+  //     title: '',
+  //   })
+  //   // 如果有大文件可以压缩一下
+  //   // 返回false可以阻止本次文件上传
+  // },
+  // uplaodFile(files) {
+  //   // 图片上传的函数，必须返回Promise
+  //   //Promise的callback里面必须resolve({urls})表示成功，否则表示失败
+  //   return new Promise((resolve, reject) => {
+  //     const tempFilePaths = files.tempFilePaths;
+  //     const that = this;
+  //     let finished = {
+  //       url: []
+  //     } //本次上次成功的URL存入这个变量,被success方法的e.detail承接
+
+  //     for (var i = 0; i < tempFilePaths.length; i++) {
+  //       let filePath = tempFilePaths[i] //原名
+  //       let cloudPath = 'qyzj' + new Date().getTime() + '-' + i + filePath.match(/\.[^.]+?$/)[0] //云存储文件名
+
+  //       wx.cloud.uploadFile({
+  //         filePath,
+  //         cloudPath,
+
+  //         //成功
+  //         success: function (res) {
+  //           if (res.statusCode != 200 && res.statusCode != 204 && res.statusCode != 205) reject('error') // 可能会有好几个200+的返回码，表示成功
+
+  //           finished.url.push({
+  //             url: res.fileID
+  //           }) //成功一个存一个到本次上传成功列表
+  //           //如果本次上传的文件都完成 或全局已经存满3张,resolve退出
+  //           if (finished.urls.length === tempFilePaths.length || that.data.files.length + finished.urls.length == this.data.maximgs)
+  //             resolve(finished)
+  //         },
+
+  //         //失败
+  //         fail: function (err) {
             
-          }
-        })
-      }
-    })
-  },
-  uploadError(e) {
+  //         }
+  //       })
+  //     }
+  //   })
+  // },
+  // uploadError(e) {
     
-    wx.hideLoading()
-    this.setData({
-      error: "上传失败,可能有些照片过大"
-    })
-  },
-  uploadSuccess(e) {
+  //   wx.hideLoading()
+  //   this.setData({
+  //     error: "上传失败,可能有些照片过大"
+  //   })
+  // },
+  // uploadSuccess(e) {
  
-    this.data.files = this.data.files.concat(e.detail.url)
-    this.setData({
-      files: this.data.files,
-    })
-    wx.hideLoading()
-  },
+  //   this.data.files = this.data.files.concat(e.detail.url)
+  //   this.setData({
+  //     files: this.data.files,
+  //   })
+  //   wx.hideLoading()
+  // },
 
   //删除图片 detail为{index, item}，index表示删除的图片的下标，item为图片对象。
-  delimg(e) {
-    this.data.files.splice(this.data.files.findIndex(item => item == e.detail.item), 1)
-  },
+  // delimg(e) {
+  //   this.data.files.splice(this.data.files.findIndex(item => item == e.detail.item), 1)
+  // },
 
   getXunjianItems() {
     // console.log("TAG","getXunjianItems")

pages/xunjian/xunjian.wxml

@@ -76,7 +76,7 @@
 
 
               <!--上传组件-->
-              <mp-uploader files="{{files}}" max-count="{{maximgs}}" max-size="{{10 * 1024 * 1024}}" title="图片上传" tips="最多上传三张图片" size-type="{{sizeType}}" sourceType="{{sourceType}}" delete="{{true}}" select="{{selectFile}}" upload="{{uplaodFile}}" binddelete="delimg" bindfail="uploadError" bindsuccess="uploadSuccess"></mp-uploader>
+              <!-- <mp-uploader files="{{files}}" max-count="{{maximgs}}" max-size="{{10 * 1024 * 1024}}" title="图片上传" tips="最多上传三张图片" size-type="{{sizeType}}" sourceType="{{sourceType}}" delete="{{true}}" select="{{selectFile}}" upload="{{uplaodFile}}" binddelete="delimg" bindfail="uploadError" bindsuccess="uploadSuccess"></mp-uploader> -->
             </swiper-item>
 
           </swiper>

pages/xunjianmore/xunjianmore.js

@@ -19,6 +19,7 @@ Page({
   onLoad(e) {
     this.data.buslogid = e.buslogid
     this.data.enterpriseId=e.busEnterpriseId
+    console.log(this.data.enterpriseId)
     let obj = new Object()
     obj.busLogId = this.data.buslogid
     http.post("/system/AppXunjianimgController/getXunjianimgList", obj, this.getXunjianMoreListSuccess)

project.private.config.json

@@ -1,7 +1,7 @@
 {
   "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",