sxyanzhu
/
jhwxapp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交diamond

main
姜玉琦 2024-04-14 23:43:48 +08:00
parent cab1ad2759
commit 52192a106a
9 changed files with 626 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
miniprogram/pageage/project_checkDetection/list/index.js
View File

@ -17,6 +17,10 @@ Page({
activeState: "jxz", activeState: "jxz",
jxzCount: 0, jxzCount: 0,
ywcCount: 0, ywcCount: 0,
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list: [],
request: app.globalData.reqUrl request: app.globalData.reqUrl
}, },
@ -133,8 +137,12 @@ Page({
loginName: res.data.loginName, loginName: res.data.loginName,
projectId: app.globalData.projectId, projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId, 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 => { 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; 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; deptId = 0;
} }
this.queryCount(this.data.projectId, deptId);
let param = { let param = {
"projectId": projectId, "projectId": this.data.projectId,
"deptId": deptId, "deptId": deptId,
"nowUserName": this.data.loginName, "nowUserName": this.data.loginName,
"activeName": that.data.activeState "activeName": that.data.activeState
} }
param.pageNum = that.data.pageNum;
param.pageSize = that.data.pageSize;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectDetection/list', url: app.globalData.reqUrl + '/wechat/projectDetection/list',
data: param, data: param,
method: "get", method: "get",
success: function (res) { 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({ 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'; nav = 'ywc';
} }
this.setData({ 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();
}, },
/** /**

32
miniprogram/pageage/project_checkDetection/list/index.wxml
View File

@ -2,7 +2,9 @@
<view class="header_title_row"> <view class="header_title_row">
<van-row> <van-row>
<van-col span="4"> <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>
<van-col span="15"> <van-col span="15">
<view class="header_name">材料取样复试</view> <view class="header_name">材料取样复试</view>
@ -10,15 +12,14 @@
</van-row> </van-row>
</view> </view>
</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> <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;"> <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=='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 class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</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_for_bgd">
<view class="inspect_list_title"> <view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width"> <view class="inspect_list_title_label inspect_list_title_width">
@ -48,17 +49,10 @@
</view> </view>
</view> </view>
</view> </view>
</view> <view class="inspect_add_to" bindtap="skipAdd">
<view class="inspect_add_to" bindtap="skipAdd"> <view style="padding-top: 22rpx;">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>新增</view> <view>新增</view>
</view> </view>
</view> </view>
</view> </scroll-view>

59
miniprogram/pageage/project_checking/list/index.js
View File

@ -19,6 +19,10 @@ Page({
jxzCount: 0, jxzCount: 0,
ywcCount: 0, ywcCount: 0,
activeState: "jxz", activeState: "jxz",
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list: [],
request: app.globalData.reqUrl request: app.globalData.reqUrl
}, },
@ -141,8 +145,12 @@ Page({
minRoleId: res.data.minRoleId, minRoleId: res.data.minRoleId,
projectId: app.globalData.projectId, projectId: app.globalData.projectId,
projectNameArgs: app.globalData.projectName, 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 => { 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; 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; deptId = 0;
} }
let param = { let param = {
"projectId": projectId, "projectId": this.data.projectId,
"nowUserName": loginName,
"deptId": deptId, "deptId": deptId,
"nowUserName": this.data.loginName,
"activeName": this.data.activeState "activeName": this.data.activeState
} }
this.queryCount(param); this.queryCount(param);
param.pageNum = that.data.pageNum;
param.pageSize = that.data.pageSize;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectchecking/list', url: app.globalData.reqUrl + '/wechat/projectchecking/list',
data: param, data: param,
method: "get", method: "get",
success: function (res) { 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({ 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) { queryCount(param) {
//查询统计数量 //查询统计数量
@ -210,9 +248,14 @@ Page({
nav = 'ywc'; nav = 'ywc';
} }
this.setData({ 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 () { returnToPage: function () {

38
miniprogram/pageage/project_checking/list/index.wxml
View File

@ -2,7 +2,9 @@
<view class="header_title_row"> <view class="header_title_row">
<van-row> <van-row>
<van-col span="4"> <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>
<van-col span="15"> <van-col span="15">
<view class="header_name">举牌验收管理</view> <view class="header_name">举牌验收管理</view>
@ -10,15 +12,14 @@
</van-row> </van-row>
</view> </view>
</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> <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;"> <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=='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 class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</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_for_bgd">
<view class="inspect_list_title"> <view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width"> <view class="inspect_list_title_label inspect_list_title_width">
@ -34,7 +35,7 @@
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view> <view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view> <view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view> <view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/> <van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}" />
</view> </view>
<view class="inspect_list_info_data"> <view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">工具部位：<text>{{item.checkWorkingPosition}}</text></view> <view class="inspect_list_info_data_prop">工具部位：<text>{{item.checkWorkingPosition}}</text></view>
@ -47,25 +48,18 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>
</view> </view>
<view class="inspect_add_to" bindtap="skipAdd"> <view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;"> <view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>新增</view> <view>新增</view>
</view> </view>
</view></view> </view>
</scroll-view>

61
miniprogram/pageage/project_materialSeal/list/index.js
View File

@ -15,6 +15,10 @@ Page({
jxzCount: 0, jxzCount: 0,
ywcCount: 0, ywcCount: 0,
activeState: "jxz", activeState: "jxz",
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list: [],
request: app.globalData.reqUrl request: app.globalData.reqUrl
}, },
@ -124,12 +128,12 @@ Page({
loginName: res.data.loginName, loginName: res.data.loginName,
projectId: app.globalData.projectId, projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId, 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 => { 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; 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; deptId = 0;
} }
let param = { let param = {
"projectId": this.data.projectId,
"deptId": deptId, "deptId": deptId,
"projectId": projectId,
"nowUserName": this.data.loginName, "nowUserName": this.data.loginName,
"activeName": this.data.activeState, "activeName": this.data.activeState,
} }
this.queryCount(param); this.queryCount(param);
param.pageNum = that.data.pageNum;
param.pageSize = that.data.pageSize;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/list', url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/list',
data: param, data: param,
method: "get", method: "get",
success: function (res) { 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({ 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) { queryCount(param) {
//查询统计数量 //查询统计数量
@ -197,9 +231,14 @@ Page({
nav = 'ywc'; nav = 'ywc';
} }
this.setData({ 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 () { returnToPage: function () {

38
miniprogram/pageage/project_materialSeal/list/index.wxml
View File

@ -2,7 +2,9 @@
<view class="header_title_row"> <view class="header_title_row">
<van-row> <van-row>
<van-col span="4"> <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>
<van-col span="15"> <van-col span="15">
<view class="header_name">材料封样管理</view> <view class="header_name">材料封样管理</view>
@ -10,15 +12,14 @@
</van-row> </van-row>
</view> </view>
</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> <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;"> <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=='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 class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</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_for_bgd">
<view class="inspect_list_title"> <view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width"> <view class="inspect_list_title_label inspect_list_title_width">
@ -32,7 +33,7 @@
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view> <view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view> <view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view> <view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/> <van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}" />
</view> </view>
<view class="inspect_list_info_data"> <view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop color_blue">封样名称：<text class="color_blue">{{item.materialName}}</text></view> <view class="inspect_list_info_data_prop color_blue">封样名称：<text class="color_blue">{{item.materialName}}</text></view>
@ -43,25 +44,18 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view wx:if="{{listData.length==0}}"> <view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;"> <view style="padding-top: 70px;text-align: -webkit-center;">
<image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view> <view style="color: #a5abbb;">暂无数据</view>
</view> </view>
</view> </view>
</view> </view>
<view class="inspect_add_to" bindtap="skipAdd"> <view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;"> <view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>新增</view> <view>新增</view>
</view> </view>
</view></view> </view>
</scroll-view>

61
miniprogram/pageage/project_measure/list/index.js
View File

@ -17,6 +17,10 @@ Page({
jxzCount: 0, jxzCount: 0,
ywcCount: 0, ywcCount: 0,
activeState: "jxz", activeState: "jxz",
pageNum: 1,
pageSize: 10,
lastDataSize: 10,
list:[],
request: app.globalData.reqUrl request: app.globalData.reqUrl
}, },
@ -130,9 +134,13 @@ Page({
initData: { initData: {
text: app.globalData.projectName, text: app.globalData.projectName,
id: app.globalData.projectId 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 => { 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; 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; deptId = 0;
} }
let param = { let param = {
"projectId": projectId, "projectId": this.data.projectId,
"deptId": deptId, "deptId": deptId,
"nowUserName": this.data.loginName, "nowUserName": this.data.loginName,
"activeName": this.data.activeState, "activeName": this.data.activeState,
} }
this.queryCount(param); this.queryCount(param);
param.pageNum=that.data.pageNum;
param.pageSize=that.data.pageSize;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/list', url: app.globalData.reqUrl + '/wechat/projectMeasure/list',
data: param, data: param,
method: "get", method: "get",
success: function (res) { 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({ 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) { queryCount(param) {
//查询统计数量 //查询统计数量
@ -200,9 +238,14 @@ Page({
nav = 'ywc'; nav = 'ywc';
} }
this.setData({ 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();
}, },
/** /**

36
miniprogram/pageage/project_measure/list/index.wxml
View File

@ -2,7 +2,9 @@
<view class="header_title_row"> <view class="header_title_row">
<van-row> <van-row>
<van-col span="4"> <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>
<van-col span="15"> <van-col span="15">
<view class="header_name">实测实量管理</view> <view class="header_name">实测实量管理</view>
@ -10,15 +12,14 @@
</van-row> </van-row>
</view> </view>
</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> <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="modify_video_nav" style="margin-top: 5rpx;"> <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=='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 class="{{activeState=='ywc'?'active':''}}" bindtap="typeJump" data-index="2"><text>已完成（{{ywcCount}}）</text></view>
</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_for_bgd">
<view class="inspect_list_title"> <view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width"> <view class="inspect_list_title_label inspect_list_title_width">
@ -32,7 +33,7 @@
<view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view> <view wx:if="{{item.approveStatus==1}}" class="code_label_2 code_label_blueviolet">待审批</view>
<view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view> <view wx:if="{{item.approveStatus==4}}" class="code_label_2 code_label_green">合格</view>
<view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view> <view wx:if="{{item.approveStatus==3}}" class="code_label_2 code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/> <van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}" />
</view> </view>
<view class="inspect_list_info_data"> <view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">测量类型：<text>{{item.measureTypeName}}</text></view> <view class="inspect_list_info_data_prop">测量类型：<text>{{item.measureTypeName}}</text></view>
@ -51,17 +52,10 @@
</view> </view>
</view> </view>
</view> </view>
</view> <view class="inspect_add_to" bindtap="skipAdd">
<view class="inspect_add_to" bindtap="skipAdd"> <view style="padding-top: 22rpx;">
<view style="padding-top: 22rpx;">
<image src="/images/new_add.png"></image> <image src="/images/new_add.png"></image>
<view>新增</view> <view>新增</view>
</view> </view>
</view> </view>
</view> </scroll-view>

130
miniprogram/pageage/project_problemmodify/security/info/index.js
View File

@ -6,17 +6,27 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
id:"", id: "",
infoData:{}, infoData: {},
auditInfo:{}, auditInfo: {},
showDel:false, showDel: false,
loginName:"", loginName: "",
imageList:[], imageList: [],
minImageList:[], minImageList: [],
auditImageList:[], auditImageList: [],
auditMinImageList:[], auditMinImageList: [],
request:app.globalData.reqUrl, request: app.globalData.reqUrl,
flowNodes:[{text:'开始'},{text:'提交隐患'},{text:'隐患整改'},{text:'隐患复检'},{text:'结束'}], flowNodes: [{
text: '开始'
}, {
text: '提交隐患'
}, {
text: '隐患整改'
}, {
text: '隐患复检'
}, {
text: '结束'
}],
active: 100 active: 100
}, },
@ -24,14 +34,16 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {id} = options let {
id
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
id, id,
loginName:res.data.loginName loginName: res.data.loginName
}) })
this.getInfo(); this.getInfo();
this.getAuditinfo(); this.getAuditinfo();
@ -44,18 +56,20 @@ Page({
* 获取安全检查详情信息 * 获取安全检查详情信息
* *
*/ */
getInfo(){ getInfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/info',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let state = that.data.active; let state = that.data.active;
if (res.data.checkState == "0") { if (res.data.checkState == "0") {
state = 2; state = 2;
@ -69,21 +83,21 @@ Page({
}) })
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.smarkUrl){ if (res.data.smarkUrl) {
res.data.smarkUrl.split(',').forEach(element => { res.data.smarkUrl.split(',').forEach(element => {
urls.push(that.data.request+element); urls.push(that.data.request + element);
minUrls.push(that.data.request+element+'.min.jpg'); minUrls.push(that.data.request + element + '.min.jpg');
}); });
} }
that.setData({ that.setData({
infoData:res.data, infoData: res.data,
imageList:urls, imageList: urls,
minImageList:minUrls minImageList: minUrls
}) })
//判断当前能否删除 //判断当前能否删除
if(res.data.checkState!=4 && res.data.createUser==that.data.loginName){ if (res.data.checkState != 4 && res.data.createUser == that.data.loginName) {
that.setData({ that.setData({
showDel:true showDel: true
}) })
} }
} }
@ -91,37 +105,39 @@ Page({
}) })
}, },
getAuditinfo(){ getAuditinfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryAuditInfo',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200 && res.data){ if (res.code == 200 && res.data) {
let urls = []; let urls = [];
let minUrls = []; let minUrls = [];
if(res.data.fileUrls){ if (res.data.fileUrls) {
res.data.fileUrls.split(',').forEach(element => { res.data.fileUrls.split(',').forEach(element => {
urls.push(that.data.request+element); urls.push(that.data.request + element);
minUrls.push(that.data.request+element+'.min.jpg'); minUrls.push(that.data.request + element + '.min.jpg');
}); });
} }
that.setData({ that.setData({
auditInfo:res.data, auditInfo: res.data,
auditImageList:urls, auditImageList: urls,
auditMinImageList:minUrls auditMinImageList: minUrls
}) })
} }
} }
}) })
}, },
onDelete(){ onDelete() {
//弹出确认 //弹出确认
let that = this let that = this
wx.showModal({ wx.showModal({
@ -137,18 +153,20 @@ Page({
} }
}) })
}, },
deleteData(){ deleteData() {
let {id} = this.data let {
id
} = this.data
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety', url: app.globalData.reqUrl + '/wechat/projectProblemmodify/removeSafety',
header: { header: {
"Username": this.data.loginName, "Username": this.data.loginName,
}, },
data:{ data: {
id:id id: id
}, },
method:"get", method: "get",
success(res){ success(res) {
app.toast("删除成功！") app.toast("删除成功！")
wx.redirectTo({ wx.redirectTo({
url: `../list/index`, url: `../list/index`,
@ -157,8 +175,8 @@ Page({
}) })
}, },
//展示图片 //展示图片
showImg:function(e){ showImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.imageList, urls: that.data.imageList,
current: that.data.imageList[e.currentTarget.dataset.index] current: that.data.imageList[e.currentTarget.dataset.index]
@ -166,8 +184,8 @@ Page({
}, },
//展示图片 //展示图片
showAuditinfoImg:function(e){ showAuditinfoImg: function (e) {
var that=this; var that = this;
wx.previewImage({ wx.previewImage({
urls: that.data.auditImageList, urls: that.data.auditImageList,
current: that.data.auditImageList[e.currentTarget.dataset.index] current: that.data.auditImageList[e.currentTarget.dataset.index]