合并

base/httputil.js

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

pages/denglu/denglu.wxml

@@ -15,8 +15,8 @@
   <!-- 中间内容 -->
   <view class="form_con">
     <view class="form_vi">
-      <input class="weui-input"  placeholder="请输入用户名" bindinput="bindViewUserName" maxlength="11"/>
-      <input class="weui-input" password type="text" placeholder="这是一个密码输入框" bindinput="bindViewPassword" maxlength="15"/>
+      <input class="weui-input"  placeholder="请输入用户名" bindinput="bindViewUserName" maxlength="11" />
+      <input class="weui-input" password placeholder="请输入密码" bindinput="bindViewPassword" maxlength="15"/>
       <button type="" class="dl_btn" bindtap="bindViewlogin">登录</button>
       <!-- <button type="" class="qx_btn">取消</button> -->
     </view>

pages/fcdetail/fcdetail.js

@@ -34,8 +34,9 @@ Page({
       time:time
     })
     var obj={};
-    obj["logId"]=this.data.logId,
-    http.send_post("/system/AppXunchaController/getFcyjgzsDetail",obj,this.detailsSuccess)
+    obj["logId"]=this.data.logId
+    console.log('XXXX'+this.data.logId)
+    http.post("/system/AppXunchaController/getFcyjgzsDetail",obj,this.detailsSuccess)
   },
   detailsSuccess(e){
     console.log(JSON.stringify(e))

pages/patrol_record_list/patrol_record_list.js

@@ -0,0 +1,131 @@
+import http from '../../base/httputil'
+const app = getApp()
+
+Page({
+  data: {
+
+    /**
+     * 控制上拉到底部时是否出现 "数据加载中..."
+     */
+    hidden: true,
+    /**
+     * 数据是否正在加载中，避免数据多次加载
+     */
+    loadingData: false,
+    mList: [],
+    isRefresh: true,
+    total: 0,
+    pageNum: 1 // 页码
+  },
+  onLoad: function () {
+    // wx.showLoading({
+    //   title: '加载中'
+    // })
+    this.loadData()
+  },
+  //加载数据
+  loadData: function () {
+    let obj = new Object()
+    obj.pageNum = this.data.pageNum
+    obj.pageSize = 10
+    obj.reasonable= false
+    http.send_get("/system/AppNoticeController/getNotice", obj, this.getRecordListSuccess)
+
+
+  },
+
+  getRecordListSuccess(res) {
+
+     wx.showLoading({
+      title: '玩命加载中',
+    })
+    var that = this
+
+    if(res.data.rows.length==0){
+      wx.showToast({
+        title: '暂无更多数据',
+        icon:"none"
+      })
+    }
+    if (this.data.isRefresh) {
+      this.setData({
+        mList: res.data.rows,
+        total: res.data.total
+      })
+
+
+      // 隐藏导航栏加载框
+      setTimeout(function () {
+        that.setData({
+          loadingData: false
+        });
+        wx.hideNavigationBarLoading();
+        // 停止下拉动作
+        wx.stopPullDownRefresh();
+        wx.hideLoading()
+
+      }, 1000)
+
+    } else {
+      this.setData({
+        enterpriseList: this.data.enterpriseList.concat(res.data.rows)
+      })
+      // 隐藏加载框
+
+      setTimeout(function () {
+        that.setData({
+          hidden: true,
+          loadingData: false
+        });
+
+        wx.hideLoading();
+      }, 1000)
+
+    }
+
+  },
+  onPullDownRefresh: function () {
+    // 显示顶部刷新图标
+    wx.showNavigationBarLoading();
+    var that = this;
+    var loadingData = this.data.loadingData
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      pageNum: 1,
+      isRefresh: true
+    })
+    this.loadData()
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  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
+      });
+      console.info(that.data.hidden);
+    }
+
+    if (loadingData) {
+      return;
+    }
+    that.setData({
+      loadingData: true
+    });
+ 
+      that.loadData();
+  },
+
+})

pages/patrol_record_list/patrol_record_list.json

@@ -0,0 +1,15 @@
+{
+  "component": true, 
+  "usingComponents": {
+    
+  },
+
+
+  "navigationBarBackgroundColor": "#f94b0e",
+  "navigationBarTextStyle": "white",
+  "enablePullDownRefresh": true,
+  "onPullDownRefresh": true,
+  "onReachBottom": true,
+  "navigationBarTitleText": "巡更记录"
+}
+

pages/patrol_record_list/patrol_record_list.wxml

@@ -0,0 +1,27 @@
+<!-- 列表 -->
+<view class="list_vi">
+    <view class="list_li3" catchtap="bindViewDetails" wx:for="{{mList}}" wx:key="index" data-index="{{item}}">
+      <!-- <i class="list_icon iconfont icon-queding" wx:if="{{item.riskCount == 0}}"></i>
+      <i class="list_icon iconfont icon-yingjipingtai" wx:if="{{item.riskCount > 0}}"></i> -->
+      <i class="iconfont icon-tongzhigonggao"></i>
+      <view class="notice_li">
+      
+      <view class="li_tit">{{item.noticeTitle}}</view>
+      <view class="li_time">
+      <text>发布人:{{item.createBy}}</text>
+      <text>{{item.createTime}}</text>
+      </view>
+      </view>
+  
+      <i class="iconfont icon-xiangyou list_right"></i>
+    </view>
+    <view class='data-loading' hidden='{{hidden}}'>
+    数据加载中...
+  </view>
+    </view>
+
+
+
+
+
+

pages/patrol_record_list/patrol_record_list.wxss

@@ -0,0 +1,47 @@
+.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;
+}
+
+.icon-jiahao {
+  font-size: 60rpx;
+}
+
+.data-loading {
+  height: 100rpx;
+  line-height: 100rpx;
+  background-color: #fff;
+  text-align: center;
+  font-size: 14px;
+}

pages/qianming/qianming.js

@@ -105,22 +105,38 @@ Page({
         //打印图片路径
         var path = res.tempFilePath
         //上传图片
-        that.uploadSignPic(path)
+        // that.uploadSignPic(path)
         console.log(path)
         let page = getCurrentPages();
         let prevPage = page[page.length - 2];
         if(that.data.index==0){
-          prevPage.setData({
-            index :0,
-            qianming:path,
+          //获取全局唯一的文件管理器 
+          wx.getFileSystemManager().readFile({ //读取本地文件内容
+            filePath: path, // 文件路径
+            encoding: 'base64', // 返回格式
+            success: res => {
+              prevPage.setData({
+                index :0,
+                qianming:path,
+                qianmingBase64:res.data,
+              });
+               wx.navigateBack()
+            }
           });
-           wx.navigateBack()
+          
         }else if(that.data.index==1){
-          prevPage.setData({
-            index :1,
-            qianming1:path,
+          wx.getFileSystemManager().readFile({ //读取本地文件内容
+            filePath: path, // 文件路径
+            encoding: 'base64', // 返回格式
+            success: res => {
+              prevPage.setData({
+                index :1,
+                qianming1:path,
+                qianming1Base64:res.data,
+              });
+               wx.navigateBack()
+            }
           });
-          wx.navigateBack()
         }else if(that.data.index==2){
           prevPage.setData({
             index :2,
@@ -132,13 +148,13 @@ Page({
       }
     })
   },
+  
 
-
-  /**
-   * 上传签名图片
-   */
-  uploadSignPic: function (path) {
-    //具体实现的业务逻辑
-  }
+  // /**
+  //  * 上传签名图片
+  //  */
+  // uploadSignPic: function (path) {
+  //   //具体实现的业务逻辑
+  // }
 
 })

pages/xqzggzs/xqzggzs.js

@@ -26,6 +26,8 @@ Page({
     deptName:null,
     yhzggzsCode:null,
     isFirst:true,
+    qianmingBase64:null,
+    qianming1Base64:null,
   },
   bindQianming() {
     wx.navigateTo({
@@ -89,14 +91,16 @@ Page({
         this.data.qianming=currPage.data.qianming;
         if (this.data.qianming != undefined && this.data.qianming != null) {
           this.setData({
-            qianming: this.data.qianming
+            qianming: this.data.qianming,
+            qianmingBase64:this.data.qianmingBase64
           })
         }
       }else if(this.data.index==1){
         this.data.qianming1=currPage.data.qianming1;
         if (this.data.qianming1 != undefined && this.data.qianming1 != null) {
           this.setData({
-            qianming1: this.data.qianming1
+            qianming1: this.data.qianming1,
+            qianming1Base64:this.data.qianming1Base64
           })
         }
       }
@@ -160,9 +164,9 @@ Page({
     bean["lasttime"]=this.data.needLastTime, 
     bean["checker1Sign"]=this.data.nickname,
     bean["checker1Code"]=this.data.number,
-    bean["checker2Sign"]=this.data.qianming,
+    bean["checker2Sign"]=this.data.qianmingBase64,
     bean["checker2Code"]=this.data.number1,
-    bean["becheckerSign"]=this.data.qianming1,
+    bean["becheckerSign"]=this.data.qianming1Base64,
     bean["checkTime"]=new Date()
     data['tzsFcyjgzs']=bean
     http.send_post("/system/AppXunjianController/saveFCTZS",data,this.submitSuccess)

pages/xqzggzs2/xqzggzs2.js

@@ -20,6 +20,8 @@ Page({
     number:null,
     number1:null,
     submitdata:[],
+    qianmingBase64:null,
+    qianming1Base64:null,
     // {itemId:"",
     // itemContent:""}
   },
@@ -79,14 +81,17 @@ Page({
         this.data.qianming=currPage.data.qianming;
         if (this.data.qianming != undefined && this.data.qianming != null) {
           this.setData({
-            qianming: this.data.qianming
+            qianming: this.data.qianming,
+            qianmingBase64:this.data.qianmingBase64
           })
         }
       }else if(this.data.index==1){
         this.data.qianming1=currPage.data.qianming1;
         if (this.data.qianming1 != undefined && this.data.qianming1 != null) {
           this.setData({
-            qianming1: this.data.qianming1
+            qianming1: this.data.qianming1,
+            qianming1Base64:this.data.qianming1Base64
+
           })
         }
       }
@@ -182,6 +187,9 @@ Page({
       })
       return
     }
+   console.log('qianmingBase64:'+this.data.qianmingBase64)
+   console.log('qianming1Base64:'+this.data.qianming1Base64)
+
     // if(this.data.pageData!=null&&this.data.pageData.riskInspections!=null){
     //   let array=this.data.pageData.riskInspections;
     //   let listdata;
@@ -205,17 +213,19 @@ Page({
     xqzgtzs["askCom"]=this.data.company,
     xqzgtzs["checker1Sign"]=this.data.pageData.nickName,
     xqzgtzs["checker1Code"]=this.data.number,
-    xqzgtzs["checker2Sign"]=this.data.qianming,
+    xqzgtzs["checker2Sign"]=this.data.qianmingBase64,
     xqzgtzs["checker2Code"]=this.data.number1,
-    xqzgtzs["becheckerSign"]=this.data.qianming1,
+    xqzgtzs["becheckerSign"]=this.data.qianming1Base64,
     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)
+    
+    
   },
   submitXqzggzs2Success(e){
     if(e.code == 200){
@@ -224,7 +234,6 @@ Page({
       })
       wx.navigateBack()
     }
-  }
-
-
+  },
+  
 })