提交diamond

miniprogram/pageage/project_checkDetection/list/index.js

@@ -17,6 +17,10 @@ Page({
     activeState: "jxz",
     jxzCount: 0,
     ywcCount: 0,
+    pageNum: 1,
+    pageSize: 10,
+    lastDataSize: 10,
+    list: [],
     request: app.globalData.reqUrl
   },
 
@@ -133,8 +137,12 @@ Page({
           loginName: res.data.loginName,
           projectId: app.globalData.projectId,
           minRoleId: res.data.minRoleId,
+          pageNum: 1,
+          pageSize: 10,
+          lastDataSize: 10,
+          listData: []
         })
-        this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
+        this.getListData();
       },
       fail: err => {
         //未获取用户信息时，重新登录
@@ -148,29 +156,59 @@ Page({
   /**
    * 查询项目材料进场验收数据
    */
-  getListData(projectId, deptId, minRoleId) {
+  getListData() {
+    //进入这里说明数据加载完毕
+    if (this.data.lastDataSize < this.data.pageSize) {
+      //app.toast("已经到底了，暂无可继续加载数据!")
+      return;
+    }
     var that = this;
     //判断角色，
-    if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+    let mr = this.data.minRoleId;
+    let deptId = this.data.deptId;
+    if (mr == 2 || mr == 3 || mr == 4) {
       deptId = 0;
     }
+    this.queryCount(this.data.projectId, deptId);
     let param = {
-      "projectId": projectId,
+      "projectId": this.data.projectId,
       "deptId": deptId,
       "nowUserName": this.data.loginName,
       "activeName": that.data.activeState
     }
+    param.pageNum = that.data.pageNum;
+    param.pageSize = that.data.pageSize;
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectDetection/list',
       data: param,
       method: "get",
       success: function (res) {
+        res = res.data;
+        if (res.code == "200") {
+          //这里处理this.data.lastDataSize=this.data.pageSize
+          if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
             that.setData({
-          listData: res.data.data
+              lastDataSize: 0,
+            })
+          } else {
+            that.setData({
+              pageNum: that.data.pageNum + 1,
+              lastDataSize: res.data.length,
+              list: res.data,
+              listData: that.data.listData.concat(res.data)
             })
           }
+        }
+      }
     });
-    this.queryCount(projectId, deptId);
+  },
+
+  /**
+   * 加载更多数据
+   */
+  onScrollToLower() {
+    console.log("滚动条到底了，开始加载新数据");
+    this.getListData();
   },
 
   //查询统计
@@ -207,9 +245,14 @@ Page({
       nav = 'ywc';
     }
     this.setData({
-      activeState: nav
+      activeState: nav,
+      pageNum: 1,
+      pageSize: 10,
+      lastDataSize: 10,
+      listData: [],
+      list: []
     });
-    this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
+    this.getListData();
   },
 
   /**

miniprogram/pageage/project_checkDetection/list/index.wxml

@@ -2,7 +2,9 @@
   <view class="header_title_row">
     <van-row>
       <van-col span="4">
-        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+        <view class="header_img" bindtap="returnToPage">
+          <image src="/images/left.png"></image>
+        </view>
       </van-col>
       <van-col span="15">
         <view class="header_name">材料取样复试</view>
@@ -10,15 +12,14 @@
     </van-row>
   </view>
 </view>
-<view class="max_content">    
+<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
   <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
   <view class="modify_video_nav" style="margin-top: 5rpx;">
     <view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
     <view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
   </view>
-<view class="inspect_max">
+  <view class="inspect_max_scroll">
-   <view class="inspect_list">
+    <view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
-       <view class="inspect_for" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
       <view class="inspect_for_bgd">
         <view class="inspect_list_title">
           <view class="inspect_list_title_label inspect_list_title_width">
@@ -48,17 +49,10 @@
         </view>
       </view>
     </view>
-</view>
     <view class="inspect_add_to" bindtap="skipAdd">
       <view style="padding-top: 22rpx;">
         <image src="/images/new_add.png"></image>
         <view>新增</view>
       </view>
     </view>
-</view>
+</scroll-view>
-
-
-
-
-
-

miniprogram/pageage/project_checking/list/index.js

@@ -19,6 +19,10 @@ Page({
     jxzCount: 0,
     ywcCount: 0,
     activeState: "jxz",
+    pageNum: 1,
+    pageSize: 10,
+    lastDataSize: 10,
+    list: [],
     request: app.globalData.reqUrl
   },
 
@@ -141,8 +145,12 @@ Page({
           minRoleId: res.data.minRoleId,
           projectId: app.globalData.projectId,
           projectNameArgs: app.globalData.projectName,
+          pageNum: 1,
+          pageSize: 10,
+          lastDataSize: 10,
+          listData: []
         })
-        this.getProjectCheckingData(app.globalData.projectId, res.data.loginName, res.data.deptId, res.data.minRoleId);
+        this.getProjectCheckingData();
       },
       fail: err => {
         //未获取用户信息时，重新登录
@@ -156,31 +164,61 @@ Page({
   /**
    * 查询项目举牌验收数据
    */
-  getProjectCheckingData(projectId, loginName, deptId, minRoleId) {
+  getProjectCheckingData() {
+    //进入这里说明数据加载完毕
+    if (this.data.lastDataSize < this.data.pageSize) {
+      //app.toast("已经到底了，暂无可继续加载数据!")
+      return;
+    }
     var that = this;
     //判断角色，
-    if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+    let mr = this.data.minRoleId;
+    let deptId = this.data.deptId;
+    if (mr == 2 || mr == 3 || mr == 4) {
       deptId = 0;
     }
     let param = {
-      "projectId": projectId,
+      "projectId": this.data.projectId,
-      "nowUserName": loginName,
       "deptId": deptId,
+      "nowUserName": this.data.loginName,
       "activeName": this.data.activeState
     }
     this.queryCount(param);
+    param.pageNum = that.data.pageNum;
+    param.pageSize = that.data.pageSize;
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectchecking/list',
       data: param,
       method: "get",
       success: function (res) {
+        res = res.data;
+        if (res.code == "200") {
+          //这里处理this.data.lastDataSize=this.data.pageSize
+          if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
             that.setData({
-          listData: res.data.data
+              lastDataSize: 0,
+            })
+          } else {
+            that.setData({
+              pageNum: that.data.pageNum + 1,
+              lastDataSize: res.data.length,
+              list: res.data,
+              listData: that.data.listData.concat(res.data)
             })
           }
+        }
+      }
     })
   },
 
+  /**
+   * 加载更多数据
+   */
+  onScrollToLower() {
+    console.log("滚动条到底了，开始加载新数据");
+    this.getProjectCheckingData();
+  },
+
   //查询统计
   queryCount(param) {
     //查询统计数量
@@ -210,9 +248,14 @@ Page({
       nav = 'ywc';
     }
     this.setData({
-      activeState: nav
+      activeState: nav,
+      pageNum: 1,
+      pageSize: 10,
+      lastDataSize: 10,
+      listData: [],
+      list: []
     });
-    this.getProjectCheckingData(this.data.projectId, this.data.loginName, this.data.deptId, this.data.minRoleId)
+    this.getProjectCheckingData();
   },
 
   returnToPage: function () {

miniprogram/pageage/project_checking/list/index.wxml

@@ -2,7 +2,9 @@
     <view class="header_title_row">
         <van-row>
             <van-col span="4">
-        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+                <view class="header_img" bindtap="returnToPage">
+                    <image src="/images/left.png"></image>
+                </view>
             </van-col>
             <van-col span="15">
                 <view class="header_name">举牌验收管理</view>
@@ -10,15 +12,14 @@
         </van-row>
     </view>
 </view>
-<view class="max_content">
+<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
     <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
     <view class="modify_video_nav" style="margin-top: 5rpx;">
         <view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
         <view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
     </view>
-<view class="inspect_max">
+    <view class="inspect_max_scroll">
-   <view class="inspect_list">
+        <view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
-       <view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
             <view class="inspect_for_bgd">
                 <view class="inspect_list_title">
                     <view class="inspect_list_title_label inspect_list_title_width">
@@ -47,7 +48,6 @@
                     </view>
                 </view>
             </view>
-   </view>
             <view wx:if="{{listData.length==0}}">
                 <view style="padding-top: 70px;text-align: -webkit-center;">
                     <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
@@ -61,11 +61,5 @@
                 <image src="/images/new_add.png"></image>
                 <view>新增</view>
             </view>
-</view></view>
+        </view>
-
+</scroll-view>
-
-
-
-
-
-

miniprogram/pageage/project_materialSeal/list/index.js

@@ -15,6 +15,10 @@ Page({
     jxzCount: 0,
     ywcCount: 0,
     activeState: "jxz",
+    pageNum: 1,
+    pageSize: 10,
+    lastDataSize: 10,
+    list: [],
     request: app.globalData.reqUrl
   },
 
@@ -124,12 +128,12 @@ Page({
           loginName: res.data.loginName,
           projectId: app.globalData.projectId,
           minRoleId: res.data.minRoleId,
-          initData: {
+          pageNum: 1,
-            text: app.globalData.projectName,
+          pageSize: 10,
-            id: app.globalData.projectId
+          lastDataSize: 10,
-          }
+          listData: []
         })
-        this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
+        this.getListData();
       },
       fail: err => {
         //未获取用户信息时，重新登录
@@ -143,31 +147,61 @@ Page({
   /**
    * 查询项目材料封样数据
    */
-  getListData(projectId, deptId, minRoleId) {
+  getListData() {
+    //进入这里说明数据加载完毕
+    if (this.data.lastDataSize < this.data.pageSize) {
+      //app.toast("已经到底了，暂无可继续加载数据!")
+      return;
+    }
     var that = this;
     //判断角色，
-    if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+    let mr = this.data.minRoleId;
+    let deptId = this.data.deptId;
+    if (mr == 2 || mr == 3 || mr == 4) {
       deptId = 0;
     }
     let param = {
+      "projectId": this.data.projectId,
       "deptId": deptId,
-      "projectId": projectId,
       "nowUserName": this.data.loginName,
       "activeName": this.data.activeState,
     }
     this.queryCount(param);
+    param.pageNum = that.data.pageNum;
+    param.pageSize = that.data.pageSize;
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/list',
       data: param,
       method: "get",
       success: function (res) {
+        res = res.data;
+        if (res.code == "200") {
+          //这里处理this.data.lastDataSize=this.data.pageSize
+          if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
             that.setData({
-          listData: res.data.data
+              lastDataSize: 0,
+            })
+          } else {
+            that.setData({
+              pageNum: that.data.pageNum + 1,
+              lastDataSize: res.data.length,
+              list: res.data,
+              listData: that.data.listData.concat(res.data)
             })
           }
+        }
+      }
     })
   },
 
+  /**
+   * 加载更多数据
+   */
+  onScrollToLower() {
+    console.log("滚动条到底了，开始加载新数据");
+    this.getListData();
+  },
+
   //查询统计
   queryCount(param) {
     //查询统计数量
@@ -197,9 +231,14 @@ Page({
       nav = 'ywc';
     }
     this.setData({
-      activeState: nav
+      activeState: nav,
+      pageNum: 1,
+      pageSize: 10,
+      lastDataSize: 10,
+      listData: [],
+      list: []
     });
-    this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
+    this.getListData();
   },
 
   returnToPage: function () {

miniprogram/pageage/project_materialSeal/list/index.wxml

@@ -2,7 +2,9 @@
     <view class="header_title_row">
         <van-row>
             <van-col span="4">
-        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+                <view class="header_img" bindtap="returnToPage">
+                    <image src="/images/left.png"></image>
+                </view>
             </van-col>
             <van-col span="15">
                 <view class="header_name">材料封样管理</view>
@@ -10,15 +12,14 @@
         </van-row>
     </view>
 </view>
-<view class="max_content">
+<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
     <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
     <view class="modify_video_nav" style="margin-top: 5rpx;">
         <view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
         <view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
     </view>
-<view class="inspect_max">
+    <view class="inspect_max_scroll">
-   <view class="inspect_list">
+        <view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
-       <view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
             <view class="inspect_for_bgd">
                 <view class="inspect_list_title">
                     <view class="inspect_list_title_label inspect_list_title_width">
@@ -43,7 +44,6 @@
                     </view>
                 </view>
             </view>
-   </view>
             <view wx:if="{{listData.length==0}}">
                 <view style="padding-top: 70px;text-align: -webkit-center;">
                     <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
@@ -57,11 +57,5 @@
                 <image src="/images/new_add.png"></image>
                 <view>新增</view>
             </view>
-</view></view>
+        </view>
-
+</scroll-view>
-
-
-
-
-
-

miniprogram/pageage/project_measure/list/index.js

@@ -17,6 +17,10 @@ Page({
     jxzCount: 0,
     ywcCount: 0,
     activeState: "jxz",
+    pageNum: 1,
+    pageSize: 10,
+    lastDataSize: 10,
+    list:[],
     request: app.globalData.reqUrl
   },
 
@@ -130,9 +134,13 @@ Page({
           initData: {
             text: app.globalData.projectName,
             id: app.globalData.projectId
-          }
+          },
+          pageNum: 1,
+          pageSize: 10,
+          lastDataSize: 10,
+          listData: []
         })
-        this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
+        this.getListData();
       },
       fail: err => {
         //未获取用户信息时，重新登录
@@ -146,31 +154,61 @@ Page({
   /**
    * 查询项目实测实量数据
    */
-  getListData(projectId, deptId, minRoleId) {
+  getListData() {
+    //进入这里说明数据加载完毕
+    if (this.data.lastDataSize < this.data.pageSize) {
+      //app.toast("已经到底了，暂无可继续加载数据!")
+      return;
+    }
     var that = this;
-    //判断角色，
+    //判断角色
-    if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
+    let mr = this.data.minRoleId;
+    let deptId = this.data.deptId;
+    if (mr == 2 || mr == 3 || mr == 4) {
       deptId = 0;
     }
     let param = {
-      "projectId": projectId,
+      "projectId": this.data.projectId,
       "deptId": deptId,
       "nowUserName": this.data.loginName,
       "activeName": this.data.activeState,
     }
     this.queryCount(param);
+    param.pageNum=that.data.pageNum;
+    param.pageSize=that.data.pageSize;
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectMeasure/list',
       data: param,
       method: "get",
       success: function (res) {
+        res = res.data;
+        if (res.code == "200") {
+          //这里处理this.data.lastDataSize=this.data.pageSize
+          if (that.data.list.length > 0 && res.data.length > 0 && that.data.list[0].id == res.data[0].id) {
             that.setData({
-          listData: res.data.data
+              lastDataSize: 0,
+            })
+          } else {
+            that.setData({
+              pageNum: that.data.pageNum + 1,
+              lastDataSize: res.data.length,
+              list: res.data,
+              listData: that.data.listData.concat(res.data)
             })
           }
+        }
+      }
     });
   },
 
+  /**
+   * 加载更多数据
+   */
+  onScrollToLower(){
+    console.log("滚动条到底了，开始加载新数据");
+    this.getListData();
+  },
+
   //查询统计
   queryCount(param) {
     //查询统计数量
@@ -200,9 +238,14 @@ Page({
       nav = 'ywc';
     }
     this.setData({
-      activeState: nav
+      activeState: nav,
+      pageNum:1,
+      pageSize:10,
+      lastDataSize:10,
+      listData:[],
+      list:[]
     });
-    this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
+    this.getListData();
   },
 
   /**

miniprogram/pageage/project_measure/list/index.wxml

@@ -2,7 +2,9 @@
     <view class="header_title_row">
         <van-row>
             <van-col span="4">
-        <view class="header_img" bindtap="returnToPage"><image src="/images/left.png"></image></view>
+                <view class="header_img" bindtap="returnToPage">
+                    <image src="/images/left.png"></image>
+                </view>
             </van-col>
             <van-col span="15">
                 <view class="header_name">实测实量管理</view>
@@ -10,15 +12,14 @@
         </van-row>
     </view>
 </view>
-<view class="max_content">    
+<scroll-view class="max_content_scroll" type="list" scroll-y bindscrolltolower="onScrollToLower">
     <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
     <view class="modify_video_nav" style="margin-top: 5rpx;">
         <view class="{{activeState=='jxz'?'active':''}}" bindtap="typeJump" data-index="1"><text>进行中（{{jxzCount}}）</text></view>
         <view class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
     </view>
-<view class="inspect_max">
+    <view class="inspect_max_scroll">
-   <view class="inspect_list">
+        <view class="inspect_for_scroll" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
-       <view class="inspect_for" v-if="{{ listData.length>0 }}" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getInfo">
             <view class="inspect_for_bgd">
                 <view class="inspect_list_title">
                     <view class="inspect_list_title_label inspect_list_title_width">
@@ -51,17 +52,10 @@
                 </view>
             </view>
         </view>
-</view>
         <view class="inspect_add_to" bindtap="skipAdd">
             <view style="padding-top: 22rpx;">
                 <image src="/images/new_add.png"></image>
                 <view>新增</view>
             </view>
         </view>
-</view>
+</scroll-view>
-
-
-
-
-
-

miniprogram/pageage/project_problemmodify/security/info/index.js

@@ -16,7 +16,17 @@ Page({
     auditImageList: [],
     auditMinImageList: [],
     request: app.globalData.reqUrl,
-        flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}],
+    flowNodes: [{
+      text: '开始'
+    }, {
+      text: '提交隐患'
+    }, {
+      text: '隐患整改'
+    }, {
+      text: '隐患复检'
+    }, {
+      text: '结束'
+    }],
     active: 100
   },
 
@@ -24,7 +34,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-        let {id} = options
+    let {
+      id
+    } = options
     //获取缓存数据
     wx.getStorage({
       key: 'userinfo',
@@ -45,7 +57,9 @@ Page({
    * 
    */
   getInfo() {
-        let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectProblemmodify/info',
@@ -92,7 +106,9 @@ Page({
   },
 
   getAuditinfo() {
-      let {id} = this.data
+    let {
+      id
+    } = this.data
     let that = this
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryAuditInfo',
@@ -138,7 +154,9 @@ Page({
     })
   },
   deleteData() {
-      let {id} = this.data
+    let {
+      id
+    } = this.data
     wx.request({
       url: app.globalData.reqUrl + '/wechat/projectProblemmodify/removeSafety',
       header: {