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

小程序大版本变更

main
姜玉琦 2023-08-24 18:44:06 +08:00
parent e2eb86a3cf
commit 10f55a9fee
106 changed files with 4252 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
miniprogram/app.js
View File

@ -32,6 +32,7 @@ App({
//reqUrl:'https://sxyanzhu.com/jhwxapp',
reqUrl:'https://cf.makalu.cc',
//reqUrl:'http://127.0.0.1:8091',
uploadUrl:"http://62.234.3.186/jhapi",
//御景路数字化集成管控平台接口访问域名
szhUrl:'https://szh.makalu.cc',
@ -81,27 +82,7 @@ App({
onLoad(){
},
/**
* 获取用户openid
*/
getOPenId:function () {
wx.login({
success :res=>{
console.log(res)
wx.request({
url: this.globalData.reqUrl+'/weixin/userLogin/getOpenId',
data:{
"code": res.code,
"appId":"wxc44b5d588f599758",
},
success:(res)=>{
wx.setStorageSync("token","eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImRjYzEwMTI5LWM0Y2ItNDAyMS1iNzEzLTFlOTMzODdmOWEwYyJ9.zpE5EZ7Zz0yj8Z7lJTUUnASBy7wXqVG2eZlxOu7rTHz0oeDyJY8FO5uSkWMwkQvK_Uk3tc9qt5jbtc46BCN1vQ");
wx.setStorageSync('openId', res.data.openid)
}
})
}
})
},
//页面弹窗
toast: function (msg) {
wx.showToast({

12
miniprogram/app.json
View File

@ -80,7 +80,17 @@
"technical-management/index",
"project_checking/add/index",
"project_checking/list/index",
"project_checking/info/index"
"project_checking/info/index",
"project_problemmodify/security/list/index",
"project_problemmodify/security/info/index",
"project_problemmodify/security/modify/index",
"project_problemmodify/security/check/index",
"project_problemmodify/security/add/index",
"project_problemmodify/quality/list/index",
"project_problemmodify/quality/info/index",
"project_problemmodify/quality/modify/index",
"project_problemmodify/quality/check/index",
"project_problemmodify/quality/add/index"
],
"independent": false
}

30
miniprogram/app.wxss
View File

@ -1485,6 +1485,36 @@ swiper-item video{
.pass{
padding-right: 25rpx;
}
.problem_submit_to_delete{
border-bottom: 1px solid red;
background-color: red;
}
.code_label{
font-size: 0.6rem;
width: 120rpx;
margin: auto;
text-align: center;
padding: 0.1rem;
border-radius: 0.5rem 0 0.5rem 0;
margin-bottom: 15rpx;
margin-left: -3rpx;
}
.code_label_green{
background: green;
color: #FFFFFF;
}
.code_label_red{
background: red;
color: #FFFFFF;
}
.code_label_blueviolet{
background: blueviolet;
color: #FFFFFF;
}
.code_label_yellow{
background: #ff9800;
color: #FFFFFF;
}

BIN
miniprogram/images/delete.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

BIN
miniprogram/images/loding2.gif 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
miniprogram/images/nodata.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 246 KiB

40
miniprogram/newComponents/select-group-person/index.js
View File

@ -7,8 +7,11 @@ Component({
title:{
type:String
},
index:{
type:String
},
choose:{
type:Array
type:String
},
multiple:{
type:Boolean,
@ -20,11 +23,7 @@ Component({
}
},
observers: {
choose: function (val) {
this.setData({
gridData : val
})
},
},
lifetimes: {
created: function(){
@ -47,8 +46,7 @@ Component({
data: {
show:false,
gridData:[],
selectedIndex:[],
titleValue:""
selectedIndex:[]
},
/**
@ -91,29 +89,31 @@ Component({
let _gridData=[{userName:userdata.nickName+" ["+userdata.jobTypeName+"]",phoneNumber:userdata.phonenumber}];
this.triggerEvent('selected',_gridData)
this.setData({
titleValue:_gridData[0].userName,
choose:_gridData[0].userName,
rectifierData:data,
show:false
})
}else{
if(of>-1){
this.data.selectedIndex.splice(of, 1);
userdata.state = false;
}else{
this.data.selectedIndex.push(index);
userdata.state = true;
}
this.setData({
rectifierData : data
})
}
},
onConfirm(){
var data = this.data.rectifierData
let gridData = data.filter(x => x.state == true);
this.triggerEvent('selected',gridData)
var data = this.data.rectifierData;
let _gridData=[];
let chooses="";
if(this.data.selectedIndex.length>1){
this.data.selectedIndex.forEach((item) =>{
let _indexs = item.split('_');
let name = data[_indexs[0]].userinfoList[_indexs[1]].nickName+" ["+data[_indexs[0]].userinfoList[_indexs[1]].jobTypeName+"]";
_gridData.push({userName:name,phoneNumber:data[_indexs[0]].userinfoList[_indexs[1]].phonenumber});
chooses+=","+name;
});
}
this.triggerEvent('selected',_gridData)
this.setData({
gridData:gridData,
choose:chooses.substring(1),
show:false
})
}

4
miniprogram/newComponents/select-group-person/index.wxml
View File

@ -2,13 +2,13 @@
<view class="nspect_info_rectifier">
<van-row>
<van-col span="24" style="text-align: left;">
<input placeholder="请选择{{title}}" data-index="{{index}}" placeholder-style="color:#6777aa;" class="inspect_input_fill_in" bindtap="onAddResponsible" disabled="true" value="{{titleValue}}"/>
<input placeholder="请选择{{title}}" data-index="{{index}}" placeholder-style="color:#6777aa;" class="inspect_input_fill_in" bindtap="onAddResponsible" disabled="true" value="{{choose}}"/>
</van-col>
</van-row>
</view>
<van-popup show="{{ show }}" bind:close="onClose">
<van-popup show="{{ show }}" bind:close="onClose" position="bottom">
<view class="rectifier_max">
<view class="rectifier_title">
<view class="rectifier_text">{{title}}</view>

14
miniprogram/newComponents/select-group-person/index.wxss
View File

@ -1,4 +1,7 @@
/* newComponents/select-person/index.wxss */
page{
height:100%
}
.rectifier_add_to{
width: 100rpx;
height: 100rpx;
@ -12,9 +15,11 @@
border-radius: 5rpx;
}
.rectifier_max{
width: 600rpx;
width: 100%;
background: #232a44;
border-radius: 15rpx;
position: relative;
height: 100%;
}
.rectifier_title{
position: relative;
@ -36,13 +41,13 @@
padding:20rpx 40rpx;
}
.rectifier_list_height{
height: 580rpx;
height: 990rpx;
overflow: auto;
}
.rectifier_list_for{
display: flex;
align-items: center;
padding: 8rpx 0;
padding: 18rpx 15rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@ -86,12 +91,11 @@
}
.rectifier_list-group_for{
height: 65rpx;
background-color: #58628a;
background-color: #879ff97d;
line-height: 65rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin-top: 20rpx;
}
.inspect_input_fill_in {
height: 90rpx;

2
miniprogram/pageage/AIWarningList/index.wxml
View File

@ -48,7 +48,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/AIvideoAnalysis/index.wxml
View File

@ -116,7 +116,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/Material-Management/index.wxml
View File

@ -317,7 +317,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/biangeng/index.wxml
View File

@ -123,7 +123,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/dangerousProject/index.wxml
View File

@ -107,7 +107,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/educations-add/index.wxml
View File

@ -73,7 +73,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/educations-details/index.wxml
View File

@ -98,7 +98,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/educations-list/index.wxml
View File

@ -159,7 +159,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/lw-baobiaochaxun/lw-baobiaochaxun.wxml
View File

@ -78,7 +78,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/lw-gerenxinxi/lw-gerenxinxi.wxml
View File

@ -82,7 +82,7 @@
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/lw-index/lw-index.wxml
View File

@ -72,7 +72,7 @@
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/lw-jibenxinxi/lw-jibenxinxi.wxml
View File

@ -133,7 +133,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay> -->

17
miniprogram/pageage/project_checking/add/index.js
View File

@ -1,4 +1,5 @@
// pageage/safetyManagement/addSafetyInspect/index.js
import api from '../../../utils/api'
const app = getApp()
Page({
@ -53,7 +54,7 @@ Page({
getProjectUserData(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/weixin/projectuserinfo/list',
url: app.globalData.reqUrl+'/wechat/projectuserinfo/list',
method:"get",
data:{
projectId:that.data.projectId
@ -154,6 +155,13 @@ Page({
})
return;
}
if(imageInfoData.length==0){
app.toast("请上传举牌验收现场图片!")
that.setData({
loadShow:false
})
return;
}
if(qualityUser==""||qualityUserName==""){
app.toast("请选择质量专员!")
that.setData({
@ -199,7 +207,7 @@ Page({
let fileUrls = [];
imageInfoData.forEach(async (item)=>{
let uploadUrl = app.globalData.reqUrl+'/weixin/common/upload'
let uploadUrl = app.globalData.uploadUrl+'/common/upload'
let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,item,name);
@ -221,10 +229,11 @@ Page({
imageUrls:fileUrls.toString()
}
wx.request({
url: app.globalData.reqUrl + '/weixin/projectchecking/add',
url: app.globalData.reqUrl + '/wechat/projectchecking/add',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
@ -238,7 +247,7 @@ Page({
wx.navigateTo({
url: '../list/index',
})
},2000)
},200)
}
}
})

2
miniprogram/pageage/project_checking/add/index.json
View File

@ -1,6 +1,6 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationBarTitleText": "新增举牌验收"
}

2
miniprogram/pageage/project_checking/add/index.wxml
View File

@ -57,7 +57,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

70
miniprogram/pageage/project_checking/info/index.js
View File

@ -9,7 +9,11 @@ Page({
id:"",
infoData:{},
imgs:[],
loadShow:false
loadShow:false,
imgShow:false,
preImgUrl:"",
loginName:"",
showDel:false,
},
/**
@ -22,7 +26,8 @@ Page({
key: 'userinfo',
success:res=>{
this.setData({
id
id,
loginName:res.data.loginName
})
this.getInfo();
}
@ -38,7 +43,7 @@ Page({
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/weixin/projectchecking/info',
url: app.globalData.reqUrl+'/wechat/projectchecking/info',
method:"get",
data:{
id:id
@ -46,16 +51,73 @@ Page({
success(res){
res = res.data
if(res.code == 200){
let urls = [];
res.data.imageUrls.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
infoData:res.data,
imgs:res.data.imageUrls.split(','),
imgs:urls,
loadShow:false
})
//判断当前能否删除
if(res.data.createBy==that.data.loginName){
that.setData({
showDel:true
})
}
}
}
})
},
//打开放大的图片
enlargeImage(e){
this.setData({
preImgUrl:e.currentTarget.dataset.url,
imgShow:true
})
},
//关闭放大的图片
closeImages(){
this.setData({
imgShow:false
})
},
onDelete(){
//弹出确认
let that = this
wx.showModal({
title: '提示',
content: '是否确定撤回删除此条数据？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.deleteData();
} else if (sm.cancel) {
console.log('用户点击取消');
}
}
})
},
deleteData(){
let {id} = this.data
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety',
data:{
id:id
},
method:"get",
success(res){
app.toast("删除成功！")
wx.navigateTo({
url: `../list/index`,
})
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

4
miniprogram/pageage/project_checking/info/index.json
View File

@ -1,4 +1,6 @@
{
"usingComponents": {},
"usingComponents": {
"van-popup": "@vant/weapp/popup/index"
},
"navigationBarTitleText": "举牌验收详情"
}

55
miniprogram/pageage/project_checking/info/index.wxml
View File

@ -72,56 +72,7 @@
</view>
</view>
</view>
<view class="problem_list_max">
<view class="problem_list_for" wx:for="{{problemData}}" wx:key="index">
<view class="problem_list_title" bindtap="onExpandDetails" data-index="{{index}}">
<view class="module_title module_title_flex" style="background: none;padding-left: 0;">
<view class="module_title_text">{{index+1}}、{{item.existing_problems}}</view>
<view class="inspect_list_title_state">
<text class="state_colour_0" wx:if="{{item.state == 0}}">待整改</text>
<text class="state_colour_1" wx:if="{{item.state == 1}}">已整改</text>
</view>
</view>
</view>
<view class="problem_list_content" wx:if="{{item.overall_state}}">
<view>
<view class="problem_list_module">
<view class="problem_list_content_title">存在问题</view>
<view class="problem_list_info">
<view class="problem_list_info_title">存在问题</view>
<view class="problem_list_info_con">{{item.existing_problems}}</view>
</view>
<view class="problem_list_info">
<view class="problem_list_info_title">整改前</view>
<view class="problem_list_info_con">
<van-uploader file-list="{{item.rectify_front}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</view>
<view class="problem_list_info">
<view class="problem_list_info_title">整改责任人</view>
<view class="problem_list_info_con">{{item.rectify_person}}</view>
</view>
</view>
</view>
<view wx:if="{{item.state == 1}}" class="problem_list_module_border">
<view class="problem_list_content_title">问题整改</view>
<view class="problem_list_info">
<view class="problem_list_info_title">整改情况</view>
<view class="problem_list_info_con">{{item.rectify_situation}}</view>
</view>
<view class="problem_list_info">
<view class="problem_list_info_title">整改照片</view>
<view class="problem_list_info_con">
<van-uploader file-list="{{item.rectify_photo}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</view>
<view class="problem_list_info">
<view class="problem_list_info_title">整改时间</view>
<view class="problem_list_info_con">{{item.rectify_time}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">撤回删除</view>
</view>

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

@ -24,13 +24,13 @@ Page({
this.setData({ show: true });
},
skipCheckAdd(){
skipAdd(){
wx.navigateTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text,
})
},
getProjectCheckingInfo(e){
getInfo(e){
let {id} = e.currentTarget.dataset.set
wx.navigateTo({
url: `../info/index?id=${id}`,
@ -64,7 +64,7 @@ Page({
getProjectCheckingData(projectId,loginName,deptId) {
var that = this;
wx.request({
url: app.globalData.reqUrl + '/weixin/projectchecking/list',
url: app.globalData.reqUrl + '/wechat/projectchecking/list',
data: {
"projectId": projectId,
"nowUserName":loginName,

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

@ -5,7 +5,7 @@
</van-sticky>
<view class="inspect_max">
<view class="inspect_list">
<view class="inspect_for" wx:for="{{listData}}" wx:key="index" data-set="{{item}}" bindtap="getProjectCheckingInfo">
<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">
@ -16,12 +16,13 @@
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.checkResult==1}}" class="code_label code_label_green">合格</view>
<view wx:if="{{item.checkResult==2}}" class="code_label code_label_red">不合格</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{item.mainImage+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">总包单位：<text>{{item.deptName}}</text></view>
<view wx:if="{{item.checkResult == '1'}}" class="inspect_list_info_data_prop">验收结果：<text class="color_green">验收合格</text></view>
<view wx:if="{{item.checkResult == '2'}}" class="inspect_list_info_data_prop">验收结果：<text class="color_orange">验收不合格</text></view>
<view class="inspect_list_info_data_prop">质量专员：<text>{{item.qualityUserName}}</text></view>
<view class="inspect_list_info_data_prop">监理专员：<text>{{item.superviseUserName}}</text></view>
<view class="inspect_list_info_data_prop">验收时间：<text class="color_blue">{{item.checkingDate}}</text></view>
</view>
</view>
@ -30,9 +31,15 @@
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="../../../images/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</view>
</view>
</view>
<view class="inspect_add_to" bindtap="skipCheckAdd">
<view class="inspect_add_to" bindtap="skipAdd">
<view style="padding-top: 22rpx;">
<image src="../../../images/new_add.png"></image>
<view>新增</view>

414
miniprogram/pageage/project_problemmodify/quality/add/index.js 100644
View File

@ -0,0 +1,414 @@
// pageage/safetyManagement/addSafetyInspect/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
maxDate:new Date(2088,1,1).getTime(),
minDate:new Date().getTime()+(3600*48*1000),
projectId:"",
projectName:"",
loginName:"",
userName:"",
rectifierData:[],
rectifierData2:[],
rectifierData3:[],
imageInfoData:[],
//验收时间
nickedTime:'',
loadShow:false,
lordSent:"",
lordSentUser:"",
copySend:"",
copySendUser:"",
recheckSend:"",
recheckSendUser:"",
workParts:"",
changeInfo:"",
dangerType:"",
dangerTypeList:[],
selectValue:"",
selectIndex:""
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {projectId,projectName} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
projectId,
projectName,
loginName:res.data.loginName,
userName:res.data.nickName,
recheckSend:res.data.nickName,
recheckSendUser:res.data.loginName
})
this.getAllProjectUserData();
this.getDangerTypeList();
}
})
},
//查询项目人员数据
getAllProjectUserData(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/queryAllProjectUserByParams',
method:"get",
data:{
projectId:that.data.projectId,
loginName:that.data.loginName
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
that.setData({
rectifierData:res.data,
rectifierData2:res.data,
rectifierData3:res.data,
})
}
}
})
},
getDangerTypeList(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryDangerType',
method:"get",
data:{
type:'ssp_zlyhlx'
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
let list=[{"id":"",text:""}];
res.data.forEach(it =>{
list.push({"id":it.dictValue,"text":it.dictLabel});
})
that.setData({
dangerTypeList:list
})
}
}
})
},
//隐患描述
onInputWorkParts(e){
let workParts = e.detail.value
this.setData({
workParts
})
},
//整改要求
onInputChangeInfoValue(e){
let changeInfo = e.detail.value
this.setData({
changeInfo
})
},
//验收时间
onInputTime(e){
let nickedTime = e.detail
this.setData({
nickedTime
})
},
// list 上传图片
onImagesArr(e){
var data = this.data.imageInfoData
data = e.detail
this.setData({
imageInfoData:data
})
},
//添加整改人
onAddLordSent(e){
if(e.detail.length>0){
this.setData({
lordSent:e.detail[0].userName,
lordSentUser:e.detail[0].phoneNumber
})
}
},
//添加抄送人
onAddCopySend(e){
if(e.detail.length>0){
let phoneNumbers="";
let userNames="";
e.detail.forEach(it =>{
phoneNumbers+=","+it.phoneNumber;
userNames+=","+it.userName;
});
this.setData({
copySend:phoneNumbers.substring(1),
copySendUser:userNames.substring(1)
})
}else{
this.setData({
copySend:"",
copySendUser:""
})
}
},
//添加复检人
onAddRecheckSend(e){
if(e.detail.length>0){
this.setData({
recheckSend:e.detail[0].phoneNumber,
recheckSendUser:e.detail[0].userName
})
}
},
//取消页面
cancelSaveView(){
wx.navigateBack()
},
//保存
onProblemSubmitSave(){
this.setData({
loadShow:true
})
let that = this
let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,userName} = that.data;
//数据效验
if(projectId==""||loginName==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(imageInfoData.length==0){
app.toast("请上传隐患现场图片!")
that.setData({
loadShow:false
})
return;
}
if(dangerType==""){
app.toast("请选择隐患类型!")
that.setData({
loadShow:false
})
return;
}
if(workParts==""){
app.toast("请填写隐患描述!")
that.setData({
loadShow:false
})
return;
}
if(changeInfo==""){
app.toast("请填写隐患整改要求!")
that.setData({
loadShow:false
})
return;
}
if(nickedTime==""){
app.toast("请选择整改截至时间!")
that.setData({
loadShow:false
})
return;
}
if(lordSent==""||lordSentUser==""){
app.toast("请选择整改人!")
that.setData({
loadShow:false
})
return;
}
if(recheckSend==""||recheckSendUser==""){
app.toast("请选择复检人!")
that.setData({
loadShow:false
})
return;
}
if(copySend==""||copySendUser==""){
app.toast("请选择抄送人!")
that.setData({
loadShow:false
})
return;
}
let pos = copySend.split(",");
pos.forEach(it =>{
if(it==lordSent){
app.toast("抄送人中不能包含整改人!")
that.setData({
loadShow:false
})
return;
}
});
let fileUrls = [];
imageInfoData.forEach(async (item)=>{
let uploadUrl = app.globalData.uploadUrl+'/common/upload'
let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,item,name);
fileUrls.push(obj.data.fileName);
//验证图片上传完毕
if(fileUrls.length == imageInfoData.length){
let params = {
projectId,
infoType:"1",
problemArea:projectName,
workParts,
changeInfo,
lordSent,
lordSentUser,
copySend,
copySendUser,
checkState:0,
nickedTime:nickedTime+" 23:59",
smarkUrl:fileUrls.toString(),
createUser:loginName,
dangerType,
recheckSend,
recheckSendUser
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/addQuality',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res =res.data
if(res.code == 200){
app.toast("添加成功!")
setTimeout(()=>{
wx.navigateTo({
url: '../list/index',
})
},200)
}
}
})
}
})
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
syncUploadImage(url,uploadFile,name) {
return new Promise((resolve, reject) => {
wx.uploadFile({
url, // 上传的服务器接口地址
filePath: uploadFile,
header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
},
name, //上传的所需字段，后端提供
formData: { user: 'test' },
success: (res) => {
// 上传完成操作
const data = JSON.parse(res.data)
resolve({
data: data
})
},
fail: (err) => {
//上传失败：修改pedding为reject
console.log("访问接口失败", err);
wx.showToast({
title: "网络出错,上传失败",
icon: 'none',
duration: 1000
});
reject(err)
}
});
})
},
//选择培训类型
onSelectDangerType(e){
this.setData({
dangerType:e.detail.id
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

6
miniprogram/pageage/project_problemmodify/quality/add/index.json 100644
View File

@ -0,0 +1,6 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationBarTitleText": "新增质量隐患"
}

118
miniprogram/pageage/project_problemmodify/quality/add/index.wxml 100644
View File

@ -0,0 +1,118 @@
<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
<view class="inspect_info">
<view class="module_title module_title_flex">
<view>{{projectName}}</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">隐患图片</view>
<view class="problem_list_info_con">
<file-uploader bindimages="onImagesArr"></file-uploader>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">隐患类型</view>
<view class="inspect_info_content">
<voucher-select columns="{{dangerTypeList}}" placeholder="请选择隐患类型" bindchange="onSelectDangerType" selectValue="{{activeName}}" selectIndex="{{activeIndex}}"></voucher-select>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">隐患描述</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写质量隐患描述"
placeholder-style="color:#6777aa;" bindinput="onInputWorkParts" maxlength="200"/>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">整改要求</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写隐患整改要求"
placeholder-style="color:#6777aa;" bindinput="onInputChangeInfoValue" maxlength="200"/>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title">整改截至时间</view>
<view class="inspect_info_content">
<voucher-date counts="5" placeholder="请选整改截至时间" minDate="{{minDate}}" maxDate="{{maxDate}}" bindchange="onInputTime"></voucher-date>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改人</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人" >
</select-group-person>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">复检人</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData2}}" multiple="{{fales}}" bindselected="onAddRecheckSend" index="2" title="请选择复检人" choose="{{recheckSendUser}}">
</select-group-person>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">抄送人</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData3}}" multiple="{{true}}" bindselected="onAddCopySend" index="3" title="请选择抄送人" >
</select-group-person>
</view>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">提交隐患</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

7
miniprogram/pageage/project_problemmodify/quality/add/index.wxss 100644
View File

@ -0,0 +1,7 @@
/* pageage/safetyManagement/addSafetyInspect/index.wxss */
.van-popup{
background: none !important;
}
.van-image__img{
border-radius: 10rpx !important;
}

272
miniprogram/pageage/project_problemmodify/quality/check/index.js 100644
View File

@ -0,0 +1,272 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imgs:[],
loadShow:false,
auditInfo:{},
auditImgs:[],
reject:false,
rejectOpinion:"",
loadShow:false,
loginName:""
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
loginName:res.data.loginName
})
this.getInfo();
this.getAuditinfo();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
res.data.smarkUrl.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
infoData:res.data,
imgs:urls,
loadShow:false
})
}
}
})
},
getAuditinfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200 && res.data){
let urls = [];
res.data.fileUrls.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
auditInfo:res.data,
auditImgs:urls
})
}
}
})
},
//取消页面
cancelSaveView(){
wx.navigateBack()
},
//保存
onSubmitSave(status){
this.setData({
loadShow:true
})
let that = this
let {id,reject,rejectOpinion,loginName} = that.data;
//数据效验
if(id==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(reject && rejectOpinion==""){
app.toast("请填写整改驳回意见!")
that.setData({
loadShow:false
})
return;
}
let params = {
mainId:id,
processState:status,
opinion:rejectOpinion,
createUser:loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/modifyProblem',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res =res.data
if(res.code == 200){
app.toast("操作成功!")
setTimeout(()=>{
wx.navigateTo({
url: '../list/index',
})
},200)
}
}
})
},
//审核驳回
onRejectSave(){
let that = this;
if(that.data.reject){
if(that.data.rejectOpinion!=""){
//弹出确认
wx.showModal({
title: '提示',
content: '是否确认复检驳回？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.onSubmitSave(2);
} else if (sm.cancel) {
console.log('用户点击取消');
}
}
})
}else{
app.toast("请填写整改驳回意见!")
that.setData({
loadShow:false
})
return;
}
}else{
that.setData({
reject:true
});
}
},
//审核通过
onPassSave(){
let that = this;
//弹出确认
wx.showModal({
title: '提示',
content: '是否确定确认复检通过？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.setData({
reject:false,
rejectOpinion:""
});
that.onSubmitSave(4);
} else if (sm.cancel) {
console.log('用户点击取消');
}
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
//驳回意见
onInputOpinion(e){
let rejectOpinion = e.detail.value
this.setData({
rejectOpinion
})
},
// list 上传图片
onImagesArr(e){
var data = this.data.imageInfoData
data = e.detail
this.setData({
imageInfoData:data
})
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/quality/check/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationBarTitleText": "质量隐患复检"
}

130
miniprogram/pageage/project_problemmodify/quality/check/index.wxml 100644
View File

@ -0,0 +1,130 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{imgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患类型</text></van-col>
<van-col span="18">{{infoData.dangerTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患描述</text></van-col>
<van-col span="18">{{infoData.workParts}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改要求</text></van-col>
<van-col span="18">{{infoData.changeInfo}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查人</text></van-col>
<van-col span="18">{{infoData.createUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改人</text></van-col>
<van-col span="18" class="color_blue">{{infoData.lordSent}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">抄送人</text></van-col>
<van-col span="18">{{infoData.copySend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">复检人</text></van-col>
<van-col span="18">{{infoData.recheckSend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">截至时间</text></van-col>
<van-col span="18">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState==1 || infoData.checkState==4}}">
<view class="module_title module_title_padding">
<view>问题整改</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改说明</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改后图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{auditImgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.checkState==4}}">
<van-row>
<van-col span="6"><text class="color_purple">完成时间</text></van-col>
<van-col span="18" class="color_green">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{reject}}">
<view class="module_title module_title_padding">
<view>整改驳回意见</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_info_list" >
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写整改说明"
placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
</view>
</view>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="onRejectSave">整改驳回</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onPassSave">整改通过</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

1
miniprogram/pageage/project_problemmodify/quality/check/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking/info/index.wxss */

195
miniprogram/pageage/project_problemmodify/quality/info/index.js 100644
View File

@ -0,0 +1,195 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imgs:[],
loadShow:false,
auditInfo:{},
auditImgs:[],
loginName:"",
showDel:false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
loginName:res.data.loginName
})
this.getInfo();
this.getAuditinfo();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
res.data.smarkUrl.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
infoData:res.data,
imgs:urls,
loadShow:false
})
//判断当前能否删除
if(res.data.checkState!=4 && res.data.createUser==that.data.loginName){
that.setData({
showDel:true
})
}
}
}
})
},
getAuditinfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200 && res.data){
let urls = [];
res.data.fileUrls.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
auditInfo:res.data,
auditImgs:urls
})
}
}
})
},
onDelete(){
//弹出确认
let that = this
wx.showModal({
title: '提示',
content: '是否确定撤回删除此条数据？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.deleteData();
} else if (sm.cancel) {
console.log('用户点击取消');
}
}
})
},
deleteData(){
let {id} = this.data
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety',
data:{
id:id
},
method:"get",
success(res){
app.toast("删除成功！")
wx.navigateTo({
url: `../list/index`,
})
}
})
},
//打开放大的图片
enlargeImage(e){
this.setData({
imgUrl:e.currentTarget.dataset.url,
imgShow:true
})
},
//关闭放大的图片
closeImages(){
this.setData({
imgShow:false
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

4
miniprogram/pageage/project_problemmodify/quality/info/index.json 100644
View File

@ -0,0 +1,4 @@
{
"usingComponents": {},
"navigationBarTitleText": "质量隐患详情"
}

130
miniprogram/pageage/project_problemmodify/quality/info/index.wxml 100644
View File

@ -0,0 +1,130 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{imgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患类型</text></van-col>
<van-col span="18">{{infoData.dangerTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患描述</text></van-col>
<van-col span="18">{{infoData.workParts}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改要求</text></van-col>
<van-col span="18">{{infoData.changeInfo}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查人</text></van-col>
<van-col span="18">{{infoData.createUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改人</text></van-col>
<van-col span="18" class="color_blue">{{infoData.lordSent}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">抄送人</text></van-col>
<van-col span="18">{{infoData.copySend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">复检人</text></van-col>
<van-col span="18">{{infoData.recheckSend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">截至时间</text></van-col>
<van-col span="18">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState=='1' || infoData.checkState=='4'}}">
<view class="module_title module_title_padding">
<view>问题整改</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改说明</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改后图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{auditImgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.checkState==4}}">
<van-row>
<van-col span="6"><text class="color_purple">完成时间</text></van-col>
<van-col span="18" class="color_green">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState==3}}">
<view class="module_title module_title_padding">
<view>问题整改驳回</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回意见</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回时间</text></van-col>
<van-col span="18" class="color_orange">{{auditInfo.createTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">撤回删除</view>
</view>

1
miniprogram/pageage/project_problemmodify/quality/info/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking/info/index.wxss */

200
miniprogram/pageage/project_problemmodify/quality/list/index.js 100644
View File

@ -0,0 +1,200 @@
// pageage/safetyManagement/securityCheckGR/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
deptId:"",
loginName:"",
userName:"",
projectId:"",
projectData:{},
projectNameArgs:"",
initData: {},
show:false,
listData:[],
activeState:"dzg",
dzgCount:0,
yclCount:0,
zgcsCOunt:0
},
onClose(){
this.setData({ show: false });
},
showPopup() {
this.setData({ show: true });
},
skipAdd(){
wx.navigateTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text,
})
},
getInfo(e){
let {id,checkState,lordSentUser,recheckSendUser} = e.currentTarget.dataset.set
if((checkState==0 || checkState==3) && lordSentUser==this.data.loginName){
//整改页面（状态时待整改&&整改人是当前登录人）
wx.navigateTo({
url: `../modify/index?id=${id}`,
})
}else if(checkState==1 && recheckSendUser==this.data.loginName){
//复检页面 (状态时待复检&&复检人是当前登录人)
wx.navigateTo({
url: `../check/index?id=${id}`,
})
}else{
wx.navigateTo({
url: `../info/index?id=${id}`,
})
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
deptId:res.data.deptId,
loginName:res.data.loginName,
userName:res.data.userName,
projectId:app.globalData.projectId,
projectNameArgs:app.globalData.projectName,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
this.getListData();
}
})
},
/**
* 查询项目举牌验收数据
*/
getListData() {
var that = this;
let param = {
"infoType":"1",//1质量类，0安全类
"projectId": that.data.projectId,
"nowRole":"99",//默认传普通角色，真实角色查看的数据量太大，这里只查看自己相关的数据
"nowUser":that.data.loginName,
"activeName":that.data.activeState
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/list',
data:param,
method: "get",
success: function (res) {
that.setData({
listData:res.data.data
})
}
});
//查询统计数量
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryCount',
data: param,
method: "get",
success: function (res) {
let sum1=0;
if(res.data.data.check0){
sum1+=res.data.data.check0;
}
if(res.data.data.check1){
sum1+=res.data.data.check1;
}
if(res.data.data.check3){
sum1+=res.data.data.check3;
}
let sum4=0;
let sum99=0;
if(res.data.data.check4){
sum4+=res.data.data.check4;
}
if(res.data.data.check99){
sum99+=res.data.data.check99;
}
that.setData({
dzgCount:sum1,
yclCount:sum4,
zgcsCount:sum99
});
}
});
},
/**
* 标签切换
*/
trainingTypeJump(e){
let index = e.currentTarget.dataset.index;
let nav = "";
if(index == 1){
nav = 'dzg';
}else if(index == 2){
nav = 'ycl';
}else if(index == 3){
nav = 'zgcs';
}
this.setData({
activeState:nav
});
this.getListData();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/quality/list/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index" ,
"van-popup": "@vant/weapp/popup/index"
},
"navigationBarTitleText": "质量隐患排查"
}

61
miniprogram/pageage/project_problemmodify/quality/list/index.wxml 100644
View File

@ -0,0 +1,61 @@
<van-sticky offset-top="{{ 0 }}">
<view style="background: #191d28;">
<project-select init="{{initData}}"></project-select>
</view>
</van-sticky>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理（{{dzgCount}}）</text></view>
<view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成（{{yclCount}}）</text></view>
<view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>整改超时（{{zgcsCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<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">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.workParts}}</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.checkState==0}}" class="code_label code_label_yellow">待整改</view>
<view wx:if="{{item.checkState==1}}" class="code_label code_label_blueviolet">待复检</view>
<view wx:if="{{item.checkState==3}}" class="code_label code_label_red">复检驳回</view>
<view wx:if="{{item.checkState==4}}" class="code_label code_label_green">整改完成</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{item.marksPicture+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">隐患类型：<text>{{item.dangerTypeName}}</text></view>
<view class="inspect_list_info_data_prop">检查单位：<text>{{item.deptName}}</text></view>
<view class="inspect_list_info_data_prop">检查时间：<text class="color_blue">{{item.createTime}}</text></view>
</view>
</view>
<view class="inspect_list_info_position">整改要求：<text class="color_purple">{{item.changeInfo}}</text></view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="../../../../images/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</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>

1
miniprogram/pageage/project_problemmodify/quality/list/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking_list/project_checking_list.wxss */

274
miniprogram/pageage/project_problemmodify/quality/modify/index.js 100644
View File

@ -0,0 +1,274 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imgs:[],
loadShow:false,
auditInfo:{},
auditImgs:[],
opinion:"",
imageInfoData:[],
loadShow:false,
loginName:"",
status:"0"
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
loginName:res.data.loginName
})
this.getInfo();
this.getAuditinfo();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
res.data.smarkUrl.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
infoData:res.data,
imgs:urls,
loadShow:false
})
}
}
})
},
getAuditinfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200 && res.data){
let urls = [];
res.data.fileUrls.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
auditInfo:res.data,
auditImgs:urls
})
}
}
})
},
//取消页面
cancelSaveView(){
wx.navigateBack()
},
//保存
onSubmitSave(){
this.setData({
loadShow:true
})
let that = this
let {id,opinion,status,imageInfoData,loginName} = that.data;
//数据效验
if(id==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(opinion==""){
app.toast("请填写整改说明!")
that.setData({
loadShow:false
})
return;
}
if(imageInfoData.length==0){
app.toast("请上传整改后图片!")
that.setData({
loadShow:false
})
return;
}
let fileUrls = [];
imageInfoData.forEach(async (item)=>{
let uploadUrl = app.globalData.uploadUrl+'/common/upload'
let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,item,name);
fileUrls.push(obj.data.fileName);
//验证图片上传完毕
if(fileUrls.length == imageInfoData.length){
let params = {
mainId:id,
processState:status,
opinion,
createUser:loginName,
fileUrls:fileUrls.toString()
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/modifyProblem',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res =res.data
if(res.code == 200){
app.toast("提交成功!")
setTimeout(()=>{
wx.navigateTo({
url: '../list/index',
})
},200)
}
}
})
}
})
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
syncUploadImage(url,uploadFile,name) {
return new Promise((resolve, reject) => {
wx.uploadFile({
url, // 上传的服务器接口地址
filePath: uploadFile,
header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
},
name, //上传的所需字段，后端提供
formData: { user: 'test' },
success: (res) => {
// 上传完成操作
const data = JSON.parse(res.data)
resolve({
data: data
})
},
fail: (err) => {
//上传失败：修改pedding为reject
console.log("访问接口失败", err);
wx.showToast({
title: "网络出错,上传失败",
icon: 'none',
duration: 1000
});
reject(err)
}
});
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
//验收描述
onInputOpinion(e){
let opinion = e.detail.value
this.setData({
opinion
})
},
// list 上传图片
onImagesArr(e){
var data = this.data.imageInfoData
data = e.detail
this.setData({
imageInfoData:data
})
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/quality/modify/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationBarTitleText": "质量隐患整改"
}

131
miniprogram/pageage/project_problemmodify/quality/modify/index.wxml 100644
View File

@ -0,0 +1,131 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{imgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患类型</text></van-col>
<van-col span="18">{{infoData.dangerTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患描述</text></van-col>
<van-col span="18">{{infoData.workParts}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改要求</text></van-col>
<van-col span="18">{{infoData.changeInfo}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查人</text></van-col>
<van-col span="18">{{infoData.createUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改人</text></van-col>
<van-col span="18" class="color_blue">{{infoData.lordSent}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">抄送人</text></van-col>
<van-col span="18">{{infoData.copySend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">复检人</text></van-col>
<van-col span="18">{{infoData.recheckSend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">截至时间</text></van-col>
<van-col span="18">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState==3}}">
<view class="module_title module_title_padding">
<view>问题整改驳回</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回意见</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回时间</text></van-col>
<van-col span="18" class="color_orange">{{auditInfo.createTime}}</van-col>
</van-row>
</view>
</view>
</view>
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>问题整改</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_info_list" >
<view class="inspect_info_title">整改说明</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写整改说明"
placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改后图片</view>
<view class="problem_list_info_con">
<file-uploader bindimages="onImagesArr"></file-uploader>
</view>
</view>
</view>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onSubmitSave">保存</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

1
miniprogram/pageage/project_problemmodify/quality/modify/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking/info/index.wxss */

421
miniprogram/pageage/project_problemmodify/security/add/index.js 100644
View File

@ -0,0 +1,421 @@
// pageage/safetyManagement/addSafetyInspect/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
maxDate:new Date(2088,1,1).getTime(),
minDate:new Date().getTime()+(3600*48*1000),
projectId:"",
projectName:"",
loginName:"",
userName:"",
rectifierData:[],
rectifierData2:[],
rectifierData3:[],
imageInfoData:[],
//验收时间
nickedTime:'',
loadShow:false,
lordSent:"",
lordSentUser:"",
copySend:"",
copySendUser:"",
recheckSend:"",
recheckSendUser:"",
workParts:"",
changeInfo:"",
dangerType:"",
dangerTypeList:[],
selectValue:"",
selectIndex:""
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {projectId,projectName} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
projectId,
projectName,
loginName:res.data.loginName,
userName:res.data.nickName,
recheckSend:res.data.nickName,
recheckSendUser:res.data.loginName
})
this.getAllProjectUserData();
this.getDangerTypeList();
}
})
},
//查询项目人员数据
getAllProjectUserData(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/queryAllProjectUserByParams',
method:"get",
data:{
projectId:that.data.projectId,
loginName:that.data.loginName
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
that.setData({
rectifierData:res.data,
rectifierData2:res.data,
rectifierData3:res.data,
})
}
}
})
},
getDangerTypeList(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryDangerType',
method:"get",
data:{
type:'ssp_aqyhlx'
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
let list=[];
res.data.forEach(it =>{
list.push({"id":it.dictValue,"text":it.dictLabel});
})
that.setData({
dangerTypeList:list
})
}
}
})
},
//隐患描述
onInputWorkParts(e){
let workParts = e.detail.value
this.setData({
workParts
})
},
//整改要求
onInputChangeInfoValue(e){
let changeInfo = e.detail.value
this.setData({
changeInfo
})
},
//验收时间
onInputTime(e){
let nickedTime = e.detail
this.setData({
nickedTime
})
},
// list 上传图片
onImagesArr(e){
var data = this.data.imageInfoData
data = e.detail
this.setData({
imageInfoData:data
})
},
//添加整改人
onAddLordSent(e){
if(e.detail.length>0){
this.setData({
lordSent:e.detail[0].userName,
lordSentUser:e.detail[0].phoneNumber
})
}
},
//添加抄送人
onAddCopySend(e){
if(e.detail.length>0){
let phoneNumbers="";
let userNames="";
e.detail.forEach(it =>{
phoneNumbers+=","+it.phoneNumber;
userNames+=","+it.userName;
});
this.setData({
copySend:phoneNumbers.substring(1),
copySendUser:userNames.substring(1)
})
}else{
this.setData({
copySend:"",
copySendUser:""
})
}
},
//添加复检人
onAddRecheckSend(e){
if(e.detail.length>0){
this.setData({
recheckSend:e.detail[0].phoneNumber,
recheckSendUser:e.detail[0].userName
})
}
},
//取消页面
cancelSaveView(){
wx.navigateBack()
},
//保存
onProblemSubmitSave(){
this.setData({
loadShow:true
})
let that = this
let {projectId,projectName,dangerType,lordSent,lordSentUser,copySend,copySendUser,workParts,changeInfo,nickedTime,recheckSend,recheckSendUser,imageInfoData,loginName,userName} = that.data;
//数据效验
if(projectId==""||loginName==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(imageInfoData.length==0){
app.toast("请上传隐患现场图片!")
that.setData({
loadShow:false
})
return;
}
if(dangerType==""){
app.toast("请选择隐患类型!")
that.setData({
loadShow:false
})
return;
}
if(workParts==""){
app.toast("请填写隐患描述!")
that.setData({
loadShow:false
})
return;
}
if(changeInfo==""){
app.toast("请填写隐患整改要求!")
that.setData({
loadShow:false
})
return;
}
if(nickedTime==""){
app.toast("请选择整改截至时间!")
that.setData({
loadShow:false
})
return;
}
if(lordSent==""||lordSentUser==""){
app.toast("请选择整改人!")
that.setData({
loadShow:false
})
return;
}
if(recheckSend==""||recheckSendUser==""){
app.toast("请选择复检人!")
that.setData({
loadShow:false
})
return;
}
if(copySend==""||copySendUser==""){
app.toast("请选择抄送人!")
that.setData({
loadShow:false
})
return;
}
if(lordSent==recheckSend){
app.toast("整改人中不能包含复检人!")
that.setData({
loadShow:false
})
return;
}
let pos = copySend.split(",");
pos.forEach(it =>{
if(it==lordSent){
app.toast("抄送人中不能包含整改人!")
that.setData({
loadShow:false
})
return;
}
});
let fileUrls = [];
imageInfoData.forEach(async (item)=>{
let uploadUrl = app.globalData.uploadUrl+'/common/upload'
let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,item,name);
fileUrls.push(obj.data.fileName);
//验证图片上传完毕
if(fileUrls.length == imageInfoData.length){
let params = {
projectId,
infoType:"0",
problemArea:projectName,
workParts,
changeInfo,
lordSent,
lordSentUser,
copySend,
copySendUser,
checkState:0,
nickedTime:nickedTime+" 23:59",
smarkUrl:fileUrls.toString(),
createUser:loginName,
dangerType,
recheckSend,
recheckSendUser
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/addSafety',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res =res.data
if(res.code == 200){
app.toast("添加成功!")
setTimeout(()=>{
wx.navigateTo({
url: '../list/index',
})
},200)
}
}
})
}
})
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
syncUploadImage(url,uploadFile,name) {
return new Promise((resolve, reject) => {
wx.uploadFile({
url, // 上传的服务器接口地址
filePath: uploadFile,
header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
},
name, //上传的所需字段，后端提供
formData: { user: 'test' },
success: (res) => {
// 上传完成操作
const data = JSON.parse(res.data)
resolve({
data: data
})
},
fail: (err) => {
//上传失败：修改pedding为reject
console.log("访问接口失败", err);
wx.showToast({
title: "网络出错,上传失败",
icon: 'none',
duration: 1000
});
reject(err)
}
});
})
},
//选择培训类型
onSelectDangerType(e){
this.setData({
dangerType:e.detail.id
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

6
miniprogram/pageage/project_problemmodify/security/add/index.json 100644
View File

@ -0,0 +1,6 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationBarTitleText": "新增安全隐患"
}

118
miniprogram/pageage/project_problemmodify/security/add/index.wxml 100644
View File

@ -0,0 +1,118 @@
<!--pageage/safetyManagement/addSafetyInspect/index.wxml-->
<view class="inspect_info">
<view class="module_title module_title_flex">
<view>{{projectName}}</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">隐患图片</view>
<view class="problem_list_info_con">
<file-uploader bindimages="onImagesArr"></file-uploader>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">隐患类型</view>
<view class="inspect_info_content">
<voucher-select columns="{{dangerTypeList}}" placeholder="请选择隐患类型" bindchange="onSelectDangerType" selectValue="{{activeName}}" selectIndex="{{activeIndex}}"></voucher-select>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">隐患描述</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写质量隐患描述"
placeholder-style="color:#6777aa;" bindinput="onInputWorkParts" maxlength="200"/>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">整改要求</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写隐患整改要求"
placeholder-style="color:#6777aa;" bindinput="onInputChangeInfoValue" maxlength="200"/>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title">整改截至时间</view>
<view class="inspect_info_content">
<voucher-date counts="5" placeholder="请选整改截至时间" minDate="{{minDate}}" maxDate="{{maxDate}}" bindchange="onInputTime"></voucher-date>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改人</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData}}" multiple="{{fales}}" bindselected="onAddLordSent" index="1" title="请选择整改人" >
</select-group-person>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">复检人</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData2}}" multiple="{{fales}}" bindselected="onAddRecheckSend" index="2" title="请选择复检人" choose="{{recheckSendUser}}">
</select-group-person>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">抄送人</view>
<view class="inspect_info_content">
<select-group-person rectifierData="{{rectifierData3}}" multiple="{{true}}" bindselected="onAddCopySend" index="3" title="请选择抄送人" >
</select-group-person>
</view>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onProblemSubmitSave">提交隐患</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

7
miniprogram/pageage/project_problemmodify/security/add/index.wxss 100644
View File

@ -0,0 +1,7 @@
/* pageage/safetyManagement/addSafetyInspect/index.wxss */
.van-popup{
background: none !important;
}
.van-image__img{
border-radius: 10rpx !important;
}

272
miniprogram/pageage/project_problemmodify/security/check/index.js 100644
View File

@ -0,0 +1,272 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imgs:[],
loadShow:false,
auditInfo:{},
auditImgs:[],
reject:false,
rejectOpinion:"",
loadShow:false,
loginName:""
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
loginName:res.data.loginName
})
this.getInfo();
this.getAuditinfo();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
res.data.smarkUrl.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
infoData:res.data,
imgs:urls,
loadShow:false
})
}
}
})
},
getAuditinfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200 && res.data){
let urls = [];
res.data.fileUrls.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
auditInfo:res.data,
auditImgs:urls
})
}
}
})
},
//取消页面
cancelSaveView(){
wx.navigateBack()
},
//保存
onSubmitSave(status){
this.setData({
loadShow:true
})
let that = this
let {id,reject,rejectOpinion,loginName} = that.data;
//数据效验
if(id==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(reject && rejectOpinion==""){
app.toast("请填写整改驳回意见!")
that.setData({
loadShow:false
})
return;
}
let params = {
mainId:id,
processState:status,
opinion:rejectOpinion,
createUser:loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/modifyProblem',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res =res.data
if(res.code == 200){
app.toast("操作成功!")
setTimeout(()=>{
wx.navigateTo({
url: '../list/index',
})
},200)
}
}
})
},
//审核驳回
onRejectSave(){
let that = this;
if(that.data.reject){
if(that.data.rejectOpinion!=""){
//弹出确认
wx.showModal({
title: '提示',
content: '是否确认复检驳回？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.onSubmitSave(2);
} else if (sm.cancel) {
console.log('用户点击取消');
}
}
})
}else{
app.toast("请填写整改驳回意见!")
that.setData({
loadShow:false
})
return;
}
}else{
that.setData({
reject:true
});
}
},
//审核通过
onPassSave(){
let that = this;
//弹出确认
wx.showModal({
title: '提示',
content: '是否确定确认复检通过？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.setData({
reject:false,
rejectOpinion:""
});
that.onSubmitSave(4);
} else if (sm.cancel) {
console.log('用户点击取消');
}
}
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
//驳回意见
onInputOpinion(e){
let rejectOpinion = e.detail.value
this.setData({
rejectOpinion
})
},
// list 上传图片
onImagesArr(e){
var data = this.data.imageInfoData
data = e.detail
this.setData({
imageInfoData:data
})
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/security/check/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationBarTitleText": "安全隐患复检"
}

130
miniprogram/pageage/project_problemmodify/security/check/index.wxml 100644
View File

@ -0,0 +1,130 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{imgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患类型</text></van-col>
<van-col span="18">{{infoData.dangerTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患描述</text></van-col>
<van-col span="18">{{infoData.workParts}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改要求</text></van-col>
<van-col span="18">{{infoData.changeInfo}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查人</text></van-col>
<van-col span="18">{{infoData.createUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改人</text></van-col>
<van-col span="18" class="color_blue">{{infoData.lordSent}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">抄送人</text></van-col>
<van-col span="18">{{infoData.copySend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">复检人</text></van-col>
<van-col span="18">{{infoData.recheckSend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">截至时间</text></van-col>
<van-col span="18">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState==1 || infoData.checkState==4}}">
<view class="module_title module_title_padding">
<view>问题整改</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改说明</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改后图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{auditImgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.checkState==4}}">
<van-row>
<van-col span="6"><text class="color_purple">完成时间</text></van-col>
<van-col span="18" class="color_green">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{reject}}">
<view class="module_title module_title_padding">
<view>整改驳回意见</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_info_list" >
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写整改说明"
placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
</view>
</view>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="onRejectSave">整改驳回</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onPassSave">整改通过</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

1
miniprogram/pageage/project_problemmodify/security/check/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking/info/index.wxss */

192
miniprogram/pageage/project_problemmodify/security/info/index.js 100644
View File

@ -0,0 +1,192 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imgs:[],
auditInfo:{},
auditImgs:[],
showDel:false,
loginName:""
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
loginName:res.data.loginName
})
this.getInfo();
this.getAuditinfo();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
res.data.smarkUrl.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
infoData:res.data,
imgs:urls,
})
//判断当前能否删除
if(res.data.checkState!=4 && res.data.createUser==that.data.loginName){
that.setData({
showDel:true
})
}
}
}
})
},
getAuditinfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200 && res.data){
let urls = [];
res.data.fileUrls.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
auditInfo:res.data,
auditImgs:urls
})
}
}
})
},
onDelete(){
//弹出确认
let that = this
wx.showModal({
title: '提示',
content: '是否确定撤回删除此条数据？',
success: function (sm) {
if (sm.confirm) {
// 用户点击了确定 可以调用了
that.deleteData();
} else if (sm.cancel) {
console.log('用户点击取消');
}
}
})
},
deleteData(){
let {id} = this.data
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/removeSafety',
data:{
id:id
},
method:"get",
success(res){
app.toast("删除成功！")
wx.navigateTo({
url: `../list/index`,
})
}
})
},
//打开放大的图片
enlargeImage(e){
this.setData({
imgUrl:e.currentTarget.dataset.url,
imgShow:true
})
},
//关闭放大的图片
closeImages(){
this.setData({
imgShow:false
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

4
miniprogram/pageage/project_problemmodify/security/info/index.json 100644
View File

@ -0,0 +1,4 @@
{
"usingComponents": {},
"navigationBarTitleText": "安全隐患详情"
}

130
miniprogram/pageage/project_problemmodify/security/info/index.wxml 100644
View File

@ -0,0 +1,130 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{imgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患类型</text></van-col>
<van-col span="18">{{infoData.dangerTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患描述</text></van-col>
<van-col span="18">{{infoData.workParts}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改要求</text></van-col>
<van-col span="18">{{infoData.changeInfo}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查人</text></van-col>
<van-col span="18">{{infoData.createUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改人</text></van-col>
<van-col span="18" class="color_blue">{{infoData.lordSent}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">抄送人</text></van-col>
<van-col span="18">{{infoData.copySend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">复检人</text></van-col>
<van-col span="18">{{infoData.recheckSend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">截至时间</text></van-col>
<van-col span="18">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState=='1' || infoData.checkState=='4'}}">
<view class="module_title module_title_padding">
<view>问题整改</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改说明</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改后图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{auditImgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list" wx:if="{{infoData.checkState==4}}">
<van-row>
<van-col span="6"><text class="color_purple">完成时间</text></van-col>
<van-col span="18" class="color_green">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState==3}}">
<view class="module_title module_title_padding">
<view>问题整改驳回</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回意见</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回时间</text></van-col>
<van-col span="18" class="color_orange">{{auditInfo.createTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="problem_submit_to" wx:if="{{showDel}}">
<view class="problem_submit_to_btn problem_submit_to_delete" bindtap="onDelete">撤回删除</view>
</view>

1
miniprogram/pageage/project_problemmodify/security/info/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking/info/index.wxss */

200
miniprogram/pageage/project_problemmodify/security/list/index.js 100644
View File

@ -0,0 +1,200 @@
// pageage/safetyManagement/securityCheckGR/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
deptId:"",
loginName:"",
userName:"",
projectId:"",
projectData:{},
projectNameArgs:"",
initData: {},
show:false,
listData:[],
activeState:"dzg",
dzgCount:0,
yclCount:0,
zgcsCOunt:0
},
onClose(){
this.setData({ show: false });
},
showPopup() {
this.setData({ show: true });
},
skipAdd(){
wx.navigateTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text,
})
},
getInfo(e){
let {id,checkState,lordSentUser,recheckSendUser} = e.currentTarget.dataset.set
if((checkState==0 || checkState==3) && lordSentUser==this.data.loginName){
//整改页面（状态时待整改&&整改人是当前登录人）
wx.navigateTo({
url: `../modify/index?id=${id}`,
})
}else if(checkState==1 && recheckSendUser==this.data.loginName){
//复检页面 (状态时待复检&&复检人是当前登录人)
wx.navigateTo({
url: `../check/index?id=${id}`,
})
}else{
wx.navigateTo({
url: `../info/index?id=${id}`,
})
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
deptId:res.data.deptId,
loginName:res.data.loginName,
userName:res.data.userName,
projectId:app.globalData.projectId,
projectNameArgs:app.globalData.projectName,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
this.getListData();
}
})
},
/**
* 查询项目举牌验收数据
*/
getListData() {
var that = this;
let param = {
"infoType":"0",//1质量类，0安全类
"projectId": that.data.projectId,
"nowRole":"99",//默认传普通角色，真实角色查看的数据量太大，这里只查看自己相关的数据
"nowUser":that.data.loginName,
"activeName":that.data.activeState
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/list',
data:param,
method: "get",
success: function (res) {
that.setData({
listData:res.data.data
})
}
});
//查询统计数量
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/queryCount',
data: param,
method: "get",
success: function (res) {
let sum1=0;
if(res.data.data.check0){
sum1+=res.data.data.check0;
}
if(res.data.data.check1){
sum1+=res.data.data.check1;
}
if(res.data.data.check3){
sum1+=res.data.data.check3;
}
let sum4=0;
let sum99=0;
if(res.data.data.check4){
sum4+=res.data.data.check4;
}
if(res.data.data.check99){
sum99+=res.data.data.check99;
}
that.setData({
dzgCount:sum1,
yclCount:sum4,
zgcsCount:sum99
});
}
});
},
/**
* 标签切换
*/
trainingTypeJump(e){
let index = e.currentTarget.dataset.index;
let nav = "";
if(index == 1){
nav = 'dzg';
}else if(index == 2){
nav = 'ycl';
}else if(index == 3){
nav = 'zgcs';
}
this.setData({
activeState:nav
});
this.getListData();
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/security/list/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-overlay": "@vant/weapp/overlay/index" ,
"van-popup": "@vant/weapp/popup/index"
},
"navigationBarTitleText": "安全隐患排查"
}

62
miniprogram/pageage/project_problemmodify/security/list/index.wxml 100644
View File

@ -0,0 +1,62 @@
<view>
<van-sticky offset-top="{{ 0 }}">
<view style="background: #191d28;">
<project-select init="{{initData}}"></project-select>
</view>
</van-sticky>
<view class="modify_video_nav" style="margin-top: 5rpx;">
<view class="{{activeState=='dzg'?'active':''}}" bindtap="trainingTypeJump" data-index="1"><text>待我办理（{{dzgCount}}）</text></view>
<view class="{{activeState=='ycl'?'active':''}}" bindtap="trainingTypeJump" data-index="2"><text>整改完成（{{yclCount}}）</text></view>
<view class="{{activeState=='zgcs'?'active':''}}" bindtap="trainingTypeJump" data-index="3"><text>整改超时（{{zgcsCount}}）</text></view>
</view>
<view class="inspect_max">
<view class="inspect_list">
<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">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.workParts}}</view>
</view>
</view>
<view class="inspect_list_info">
<view class="inspect_list_info_details">
<view class="inspect_list_info_img">
<view wx:if="{{item.checkState==0}}" class="code_label code_label_yellow">待整改</view>
<view wx:if="{{item.checkState==1}}" class="code_label code_label_blueviolet">待复检</view>
<view wx:if="{{item.checkState==3}}" class="code_label code_label_red">复检驳回</view>
<view wx:if="{{item.checkState==4}}" class="code_label code_label_green">整改完成</view>
<van-image width="120rpx" height="120rpx" fit="cover" src="{{item.marksPicture+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">隐患类型：<text>{{item.dangerTypeName}}</text></view>
<view class="inspect_list_info_data_prop">检查单位：<text>{{item.deptName}}</text></view>
<view class="inspect_list_info_data_prop">检查时间：<text class="color_blue">{{item.createTime}}</text></view>
</view>
</view>
<view class="inspect_list_info_position">整改要求：<text class="color_purple">{{item.changeInfo}}</text></view>
</view>
</view>
</view>
<view wx:if="{{listData.length==0}}">
<view style="padding-top: 70px;text-align: -webkit-center;">
<image src="../../../../images/nodata.png" style="width: 130px;height: 105px;"></image>
<view style="color: #a5abbb;">暂无数据</view>
</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>

1
miniprogram/pageage/project_problemmodify/security/list/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking_list/project_checking_list.wxss */

274
miniprogram/pageage/project_problemmodify/security/modify/index.js 100644
View File

@ -0,0 +1,274 @@
// pageage/project_checking/info/index.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
id:"",
infoData:{},
imgs:[],
loadShow:false,
auditInfo:{},
auditImgs:[],
opinion:"",
imageInfoData:[],
loadShow:false,
loginName:"",
status:"0"
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
loginName:res.data.loginName
})
this.getInfo();
this.getAuditinfo();
}
})
},
/**
* 获取安全检查详情信息
*
*/
getInfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/info',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200){
let urls = [];
res.data.smarkUrl.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
infoData:res.data,
imgs:urls,
loadShow:false
})
}
}
})
},
getAuditinfo(){
let {id} = this.data
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectProblemmodify/queryAuditInfo',
method:"get",
data:{
id:id
},
success(res){
res = res.data
if(res.code == 200 && res.data){
let urls = [];
res.data.fileUrls.split(',').forEach(element => {
urls.push(element+'.min.jpg');
});
that.setData({
auditInfo:res.data,
auditImgs:urls
})
}
}
})
},
//取消页面
cancelSaveView(){
wx.navigateBack()
},
//保存
onSubmitSave(){
this.setData({
loadShow:true
})
let that = this
let {id,opinion,status,imageInfoData,loginName} = that.data;
//数据效验
if(id==""){
app.toast("数据异常，请刷新页面重试!")
that.setData({
loadShow:false
})
return;
}
if(opinion==""){
app.toast("请填写整改说明!")
that.setData({
loadShow:false
})
return;
}
if(imageInfoData.length==0){
app.toast("请上传整改后图片!")
that.setData({
loadShow:false
})
return;
}
let fileUrls = [];
imageInfoData.forEach(async (item)=>{
let uploadUrl = app.globalData.uploadUrl+'/common/upload'
let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,item,name);
fileUrls.push(obj.data.fileName);
//验证图片上传完毕
if(fileUrls.length == imageInfoData.length){
let params = {
mainId:id,
processState:status,
opinion,
createUser:loginName,
fileUrls:fileUrls.toString()
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectProblemmodify/modifyProblem',
method:"POST",
data:params,
header: {
"Username": loginName,
"Content-Type": "application/json"
},
success(res){
that.setData({
loadShow:false
})
res =res.data
if(res.code == 200){
app.toast("提交成功!")
setTimeout(()=>{
wx.navigateTo({
url: '../list/index',
})
},200)
}
}
})
}
})
},
/**
* 这里考虑上传图片异步问题，封装为同步
*/
syncUploadImage(url,uploadFile,name) {
return new Promise((resolve, reject) => {
wx.uploadFile({
url, // 上传的服务器接口地址
filePath: uploadFile,
header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
},
name, //上传的所需字段，后端提供
formData: { user: 'test' },
success: (res) => {
// 上传完成操作
const data = JSON.parse(res.data)
resolve({
data: data
})
},
fail: (err) => {
//上传失败：修改pedding为reject
console.log("访问接口失败", err);
wx.showToast({
title: "网络出错,上传失败",
icon: 'none',
duration: 1000
});
reject(err)
}
});
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
//验收描述
onInputOpinion(e){
let opinion = e.detail.value
this.setData({
opinion
})
},
// list 上传图片
onImagesArr(e){
var data = this.data.imageInfoData
data = e.detail
this.setData({
imageInfoData:data
})
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

7
miniprogram/pageage/project_problemmodify/security/modify/index.json 100644
View File

@ -0,0 +1,7 @@
{
"usingComponents": {
"van-popup": "@vant/weapp/popup/index",
"van-overlay": "@vant/weapp/overlay/index"
},
"navigationBarTitleText": "安全隐患整改"
}

130
miniprogram/pageage/project_problemmodify/security/modify/index.wxml 100644
View File

@ -0,0 +1,130 @@
<!--pageage/safetyManagement/problemRectification/index.wxml-->
<view>
<view class="inspect_overview_max">
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>{{infoData.problemArea}}</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患图片</text></van-col>
<view class="problem_list_info_con">
<van-uploader file-list="{{imgs}}" show-upload="{{fales}}" deletable="{{fales}}"/>
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患类型</text></van-col>
<van-col span="18">{{infoData.dangerTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">隐患描述</text></van-col>
<van-col span="18">{{infoData.workParts}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改要求</text></van-col>
<van-col span="18">{{infoData.changeInfo}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查单位</text></van-col>
<van-col span="18">{{infoData.deptName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查人</text></van-col>
<van-col span="18">{{infoData.createUserName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">检查时间</text></van-col>
<van-col span="18">{{infoData.createTime}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">整改人</text></van-col>
<van-col span="18" class="color_blue">{{infoData.lordSent}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">抄送人</text></van-col>
<van-col span="18">{{infoData.copySend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">复检人</text></van-col>
<van-col span="18">{{infoData.recheckSend}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">截至时间</text></van-col>
<van-col span="18">{{infoData.nickedTime}}</van-col>
</van-row>
</view>
</view>
</view>
</view>
<view class="inspect_overview" wx:if="{{infoData.checkState==3}}">
<view class="module_title module_title_padding">
<view>问题整改驳回</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回意见</text></van-col>
<van-col span="18">{{auditInfo.opinion}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">驳回时间</text></van-col>
<van-col span="18" class="color_orange">{{auditInfo.createTime}}</van-col>
</van-row>
</view>
</view>
</view>
<view class="inspect_overview">
<view class="module_title module_title_padding">
<view>问题整改</view>
</view>
<view class="inspect_overview_list_max">
<view class="inspect_info_list" >
<view class="inspect_info_title">整改说明</view>
<view class="inspect_info_content">
<textarea class="add_textarea" placeholder="请填写整改说明"
placeholder-style="color:#6777aa;" bindinput="onInputOpinion" maxlength="200"/>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">整改后图片</view>
<view class="problem_list_info_con">
<file-uploader bindimages="onImagesArr"></file-uploader>
</view>
</view>
</view>
</view>
</view>
<view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
<view class="problem_submit_to_btn problem_submit_to_save" bindtap="onSubmitSave">保存</view>
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="../../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

1
miniprogram/pageage/project_problemmodify/security/modify/index.wxss 100644
View File

@ -0,0 +1 @@
/* pageage/project_checking/info/index.wxss */

2
miniprogram/pageage/safetyManagement/addSafetyInspect/index.wxml
View File

@ -79,7 +79,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/safetyManagement/problemRectificationGR/index.wxml
View File

@ -116,7 +116,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/samplingAddRetestingDeliver/index.wxml
View File

@ -108,7 +108,7 @@
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/samplingRetesting/index.wxml
View File

@ -54,7 +54,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/samplingRetestingDeliver/index.wxml
View File

@ -108,7 +108,7 @@
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/samplingRetestingDetail/index.wxml
View File

@ -96,7 +96,7 @@
</view>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/samplingRetestingUpload/index.wxml
View File

@ -146,7 +146,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/vehicleManage/index.wxml
View File

@ -110,7 +110,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/voucherManagement/index.wxml
View File

@ -103,7 +103,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/voucherManagementAddto/index.wxml
View File

@ -56,7 +56,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml
View File

@ -119,7 +119,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/xiangmushipin/xiangmushipin.wxml
View File

@ -109,7 +109,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/xiangmuyujing/xiangmuyujing.wxml
View File

@ -277,7 +277,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pageage/yujingxinxi/yujingxinxi.wxml
View File

@ -133,7 +133,7 @@
<van-overlay show="{{show}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

5
miniprogram/pages/components/select-date/index.js
View File

@ -11,6 +11,10 @@ Component({
type:Number,
value:new Date().getTime()
},
minDate:{
type:Number,
value:new Date(2020,1,1).getTime()
},
currentDate:{
type:Number,
value:new Date().getTime()
@ -30,7 +34,6 @@ Component({
* 组件的初始数据
*/
data: {
minDate: new Date(2022,1,1).getTime(),
count:3,
formatter(type, value) {
if (type === 'year') {

3
miniprogram/pages/components/voucher-date/index.js
View File

@ -20,6 +20,9 @@ Component({
type:Number,
value:new Date().getTime()
},
minDate:{
type:Number
},
value:{
type:String,
value:''

2
miniprogram/pages/components/voucher-date/index.wxml
View File

@ -16,7 +16,7 @@
<view>{{placeholder}}</view>
<view class="option_list_title_btn" bindtap="onConfirm">确认</view>
</view>
<select-date bindchange="onChangeDate" maxDate="{{maxDate}}" currentDate="{{currentDate}}" counts="{{counts}}"></select-date>
<select-date bindchange="onChangeDate" minDate="{{minDate}}" maxDate="{{maxDate}}" currentDate="{{currentDate}}" counts="{{counts}}"></select-date>
</van-popup>

2
miniprogram/pages/construction-details/index.wxml
View File

@ -750,7 +750,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>正在提交，请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/construction/index.wxml
View File

@ -785,7 +785,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>正在提交，请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/deepExcavation/index.wxml
View File

@ -180,7 +180,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

16
miniprogram/pages/gengduogongneng/gengduogongneng.js
View File

@ -64,21 +64,25 @@ Page({
projectId:app.globalData.projectId,
projectName:app.globalData.projectName,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
})
that.selectMenuList(res.data.loginName);
}
})
that.selectMenuList();
},
selectMenuList:function(){
selectMenuList:function(loginName){
var that = this;
wx.request({
url: app.globalData.reqUrl+'/weixin/userLogin/selectMenuList',
url: app.globalData.reqUrl+'/wechat/selectRoleMenuList',
data:{
username:loginName
},
method:"get",
success:function(res){
if(res.data.code =='200'){
if(res.statusCode =='200'){
that.setData({
menuList:res.data.data
menuList:res.data
})
}
}

2
miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml
View File

@ -146,7 +146,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

106
miniprogram/pages/login/login.js
View File

@ -43,15 +43,18 @@ Page({
getOPenId:function () {
wx.login({
success :res=>{
console.log(res);
wx.request({
url: app.globalData.reqUrl+'/weixin/userLogin/getOpenId',
//启动蒙版
let oid = wx.getStorageSync("openId");
if(!oid){
this.onClickShow();
wx.request({
url: app.globalData.reqUrl+'/wechat/getOpenId',
data:{
"code": res.code,
"appId": app.globalData.appId,
},
success:(res)=>{
console.log(res);
this.onClickHide();
this.setData({
openId:res.data.openid,
})
@ -59,54 +62,65 @@ Page({
this.selectUserInfoByOpenId(res.data.openid);
}
})
}else{
//验证登录用户
this.selectUserInfoByOpenId(oid);
}
}
})
},
//验证用户是否是第一次登陆
selectUserInfoByOpenId:function(openId){
//跳转页面
let isRelogin=wx.getStorageSync("isReload");
if(isRelogin){
return;
}
this.onClickShow();
var that = this;
wx.setStorageSync('openId', openId)
wx.request({
url: app.globalData.reqUrl+'/weixin/userLogin/selectUserInfoByOpenId',
url: app.globalData.reqUrl+'/wechat/openIdLogin',
data:{
"openId":openId
},
method:"GET",
method:"POST",
success:function(res){
if(res.data.code == '200'){
app.globalData.userProjectId = res.data.userinfo.projectId
//把数据存到缓存中
wx.setStorage({
key: 'userinfo',
data: res.data.userinfo
data: res.data.data.userinfo
});
//跳转页面
let isRelogin=wx.getStorageSync("isReload");
if(!isRelogin){
//只有一个项目时直接跳转详情页
if(res.data.projectInfo!=null || res.data.projectInfo!=undefined){
//赋值到公共参数
app.globalData.projectId = res.data.projectInfo.projectId;
app.globalData.projectName = res.data.projectInfo.projectName;
app.globalData.projectInfoList = JSON.stringify(res.data.projectInfo.projectInfoList);
app.globalData.value1 = res.data.projectInfo.shengName;
app.globalData.value2 = res.data.projectInfo.shiName+'/'+res.data.projectInfo.quName;
app.globalData.value3 = res.data.projectInfo.logCompanyName;
wx.redirectTo({
url: '../xiangmugaikuang/xiangmugaikuang',
})
}else{
wx.redirectTo({
url: '../map/map',
});
}
}
wx.setStorageSync({
key: 'token',
data: res.data.token
});
that.onClickHide();
let rd = res.data.data;
//只有一个项目时直接跳转详情页
if(rd.projectInfo!=null || rd.projectInfo!=undefined){
//赋值到公共参数
app.globalData.projectId = rd.projectInfo.projectId;
app.globalData.projectName = rd.projectInfo.projectName;
app.globalData.projectInfoList = rd.projectInfo.projectInfoList;
app.globalData.value1 = rd.projectInfo.shengName;
app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
app.globalData.value3 = rd.projectInfo.logCompanyName;
wx.redirectTo({
url: '../xiangmugaikuang/xiangmugaikuang',
})
}else{
//跳转页面
wx.redirectTo({
url: '../map/map',
})
}
}
}
})
},
//登录
userLogin:function(){
@ -125,33 +139,37 @@ Page({
that.onClickShow();
//发送请求
wx.request({
url: app.globalData.reqUrl+'/weixin/userLogin/checkPassWord',
url: app.globalData.reqUrl+'/wechat/login',
data:{
"username":username,
"password":password,
"openId":this.data.openId,
},
menubar:"GET",
method:"POST",
success(res){
console.log(res.data);
wx.setStorageSync('isReload', "")
//关闭蒙版
that.onClickHide();
if(res.data.data=='200'){
if(res.data.code=='200'){
//把数据存到缓存中
wx.setStorage({
key: 'userinfo',
data: res.data.userinfo
data: res.data.data.userinfo
});
wx.setStorageSync({
key: 'token',
data: res.data.token
});
wx.setStorageSync('isReload', "");
let rd = res.data.data;
//只有一个项目时直接跳转详情页
if(res.data.projectInfo!=null || res.data.projectInfo!=undefined){
if(rd.projectInfo!=null || rd.projectInfo!=undefined){
//赋值到公共参数
app.globalData.projectId = res.data.projectInfo.projectId;
app.globalData.projectName = res.data.projectInfo.projectName;
app.globalData.projectInfoList = res.data.projectInfo.projectInfoList;
app.globalData.value1 = res.data.projectInfo.shengName;
app.globalData.value2 = res.data.projectInfo.shiName+'/'+res.data.projectInfo.quName;
app.globalData.value3 = res.data.projectInfo.logCompanyName;
app.globalData.projectId = rd.projectInfo.projectId;
app.globalData.projectName = rd.projectInfo.projectName;
app.globalData.projectInfoList = rd.projectInfo.projectInfoList;
app.globalData.value1 = rd.projectInfo.shengName;
app.globalData.value2 = rd.projectInfo.shiName+'/'+rd.projectInfo.quName;
app.globalData.value3 = rd.projectInfo.logCompanyName;
wx.redirectTo({
url: '../xiangmugaikuang/xiangmugaikuang',
})
@ -162,7 +180,7 @@ Page({
})
}
}else{
app.toast(res.data.info);
app.toast(res.data.msg);
}
}
})

5
miniprogram/pages/login/login.wxml
View File

@ -21,10 +21,11 @@
<van-overlay show="{{show}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>正在登陆中！请稍后...</view>
</view>
</van-overlay>
</van-overlay>
</view>

2
miniprogram/pages/map/map.wxml
View File

@ -233,7 +233,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/ranyuanguanli-map/map.wxml
View File

@ -188,7 +188,7 @@
<van-overlay show="{{ryshow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/renyuanguanli/renyuanguanli.wxml
View File

@ -177,7 +177,7 @@
</view>
<van-overlay show="{{jzshow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/saft-education-user-bind/index.wxml
View File

@ -82,7 +82,7 @@
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/shebeiguanli-map/jixiedingwei.wxml
View File

@ -197,7 +197,7 @@
</van-popup>
<van-overlay show="{{show}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/shebieguanli-jxsb/shajiangguan.wxml
View File

@ -152,7 +152,7 @@
</view>
<van-overlay show="{{show}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

2
miniprogram/pages/shebieguanli-tzsb/taji.wxml
View File

@ -291,7 +291,7 @@
</van-tabbar>
<van-overlay show="{{loadShow}}">
<view class="gif">
<image src="http://fileimg.makalu.cc/866000e905ae45a8b79d80de52bb4e9a.gif"></image>
<image src="../../images/loding2.gif"></image>
<view>数据加载中！请稍后...</view>
</view>
</van-overlay>

Some files were not shown because too many files have changed in this diff Show More