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

提交代码

main
姜玉琦 2024-04-08 00:58:58 +08:00
parent 34ef6dd8f9
commit 366a897e54
47 changed files with 2682 additions and 1448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miniprogram/api/login.js
View File

@ -29,7 +29,7 @@ export function updatePwd(data) {
// 用户退出方法 // 用户退出方法
export function loginOut() { export function loginOut() {
return request({ return request({
'url': '/wxApi/loginOut', 'url': '/wechat/loginOut',
'method': 'get' 'method': 'get'
}) })
} }

8
miniprogram/api/projectFiles.js
View File

@ -17,3 +17,11 @@ export function findCountByType(data){
data: data data: data
}) })
} }
// 文件阅读
export function readFile(id){
return request({
url: '/wechat/projectFiles/readFile/'+id,
method: 'get'
})
}

15
miniprogram/app.js
View File

@ -29,10 +29,10 @@ App({
userProjectId:'', userProjectId:'',
appId: "wx9997d071b4996f23", appId: "wx9997d071b4996f23",
// 智慧工地后台接口访问域名 // 智慧工地后台接口访问域名
//reqUrl:'https://szgcwx.jhncidg.com', reqUrl:'https://szgcwx.jhncidg.com',
reqUrl:'http://127.0.0.1:8091', //reqUrl:'http://127.0.0.1:8091',
//uploadUrl:"https://szgcwx.jhncidg.com/wechat", uploadUrl:"https://szgcwx.jhncidg.com/wechat",
uploadUrl:'http://127.0.0.1:8091/wechat', //uploadUrl:'http://127.0.0.1:8091/wechat',
//御景路数字化集成管控平台接口访问域名 //御景路数字化集成管控平台接口访问域名
szhUrl:'https://szh.makalu.cc', szhUrl:'https://szh.makalu.cc',
@ -79,6 +79,7 @@ App({
} }
this.autoUpdate(); this.autoUpdate();
}, },
onLoad(){ onLoad(){
}, },
@ -93,6 +94,12 @@ App({
}); });
}, },
initWxAuth:function(){
wx.redirectTo({
url: '../wx-auth/index',
})
},
//版本自动更新 //版本自动更新
autoUpdate:function(){ autoUpdate:function(){
var self = this var self = this

1
miniprogram/app.json
View File

@ -1,6 +1,7 @@
{ {
"pages": [ "pages": [
"pages/login/index", "pages/login/index",
"pages/wx-auth/index",
"pages/gongchengliebiao/index", "pages/gongchengliebiao/index",
"pages/gengduogongneng/index", "pages/gengduogongneng/index",
"pages/xiangmugaikuang/index", "pages/xiangmugaikuang/index",

3
miniprogram/config.js
View File

@ -2,7 +2,8 @@
module.exports = { module.exports = {
timeout: 60000, timeout: 60000,
appId: "wx9997d071b4996f23", appId: "wx9997d071b4996f23",
//baseUrl: 'http://127.0.0.1:8091',
baseUrl: 'https://szgcwx.jhncidg.com', baseUrl: 'https://szgcwx.jhncidg.com',
baseUrl: 'http://127.0.0.1:8091', manageUrl: 'https://szgc.jhncidg.com',
noSecuritys:['/wechat/captchaImage','/wxApi/login'] noSecuritys:['/wechat/captchaImage','/wxApi/login']
}; };

2
miniprogram/newComponents/safety-bar-chart/index.js
View File

@ -19,7 +19,7 @@ Component({
}, },
observers: { observers: {
data: function (val) { data: function (val) {
console.log(val) //console.log(val)
this.initChart() this.initChart()
}, },
}, },

2
miniprogram/newComponents/safety-pie-chart/index.js
View File

@ -18,7 +18,7 @@ Component({
}, },
observers: { observers: {
chartData: function (val) { chartData: function (val) {
console.log(val) //console.log(val)
this.initChart() this.initChart()
}, },
}, },

4
miniprogram/pageage/project_checkDetection/info/index.js
View File

@ -172,8 +172,8 @@ Page({
showImg:function(e){ showImg:function(e){
var that=this; var that=this;
wx.previewImage({ wx.previewImage({
urls: that.data.imageList, urls: that.data.detectionImageList,
current: that.data.imageList[e.currentTarget.dataset.index] current: that.data.detectionImageList[e.currentTarget.dataset.index]
}) })
}, },

2
miniprogram/pageage/project_checkDetection/info/index.wxml
View File

@ -141,7 +141,7 @@
<van-col span="6"><text class="color_purple">检测报告</text></van-col> <van-col span="6"><text class="color_purple">检测报告</text></van-col>
<van-col span="18"> <van-col span="18">
<view class="in-img-div" wx:if="{{minDetectionFileImages.length>0}}" wx:for="{{minDetectionFileImages}}" wx:key="index"> <view class="in-img-div" wx:if="{{minDetectionFileImages.length>0}}" wx:for="{{minDetectionFileImages}}" wx:key="index">
<image bindtap='showDetectionFileImg' data-index="{{index}}" src='{{item}}'></image> <image bindtap='showImg' data-index="{{index}}" src='{{item}}'></image>
</view> </view>
<view class="in-img-div" wx:if="{{detectionFiles.length>0}}"> <view class="in-img-div" wx:if="{{detectionFiles.length>0}}">
<image src='https://szgcwx.jhncidg.com/staticFiles/icon/pdf.png'></image> <image src='https://szgcwx.jhncidg.com/staticFiles/icon/pdf.png'></image>

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

@ -2,165 +2,245 @@
const app = getApp() const app = getApp()
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
deptId:"", deptId: "",
loginName:"", loginName: "",
projectId:"", projectId: "",
minRoleId:"", minRoleId: "",
projectData:{}, projectData: {},
initData: {}, initData: {},
show:false, show: false,
listData:[], listData: [],
activeState:"jxz", activeState: "jxz",
jxzCount:0, jxzCount: 0,
ywcCount:0, ywcCount: 0,
request:app.globalData.reqUrl request: app.globalData.reqUrl
}, },
skipAdd(){ skipAdd() {
wx.redirectTo({ wx.redirectTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, url: `../add/index?projectId=${this.data.initData.id}&projectName=` + this.data.initData.text,
}) })
}, },
getInfo(e){ getInfo(e) {
let {id,checkState,approveStatus,witnessUser} = e.currentTarget.dataset.set let {
if(approveStatus=="1" && witnessUser==this.data.loginName){ id,
wx.redirectTo({ checkState,
url: `../../../pages/project_approve/approveCheckDetection/index?id=${id}` approveStatus,
}) witnessUser
}else{ } = e.currentTarget.dataset.set
if(checkState=="1"){ if (approveStatus == "1" && witnessUser == this.data.loginName) {
wx.redirectTo({ wx.redirectTo({
url: `../check/index?id=${id}`, url: `../../../pages/project_approve/approveCheckDetection/index?id=${id}`
})
}else{
wx.redirectTo({
url: `../info/index?id=${id}`,
})
}
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
deptId:res.data.deptId,
loginName:res.data.loginName,
projectId:app.globalData.projectId,
minRoleId:res.data.minRoleId,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
this.getListData(app.globalData.projectId,res.data.deptId,res.data.minRoleId);
}
}) })
}, } else {
if (checkState == "1") {
wx.redirectTo({
url: `../check/index?id=${id}`,
})
} else {
wx.redirectTo({
url: `../info/index?id=${id}`,
})
}
}
},
/** /**
* 查询项目材料进场验收数据 * 生命周期函数--监听页面加载
*/ */
getListData(projectId,deptId,minRoleId) { onLoad(options) {
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
wx.getStorage({
key: 'projectInfoList',
success: res => {
app.globalData.projectInfoList = res.data;
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
} else {
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
} else {
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success: res => {
this.setData({
deptId: res.data.deptId,
loginName: res.data.loginName,
projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId,
})
this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
},
/**
* 查询项目材料进场验收数据
*/
getListData(projectId, deptId, minRoleId) {
var that = this; var that = this;
//判断角色， //判断角色，
if(minRoleId==2||minRoleId==3||minRoleId==4){ if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
deptId=0; deptId = 0;
} }
let param = { let param = {
"projectId": projectId, "projectId": projectId,
"deptId":deptId, "deptId": deptId,
"nowUserName":this.data.loginName, "nowUserName": this.data.loginName,
"activeName":that.data.activeState "activeName": that.data.activeState
} }
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectDetection/list', url: app.globalData.reqUrl + '/wechat/projectDetection/list',
data:param, data: param,
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
listData:res.data.data listData: res.data.data
}) })
} }
}); });
this.queryCount(projectId,deptId); this.queryCount(projectId, deptId);
}, },
//查询统计 //查询统计
queryCount(projectId,deptId){ queryCount(projectId, deptId) {
//查询统计数量 //查询统计数量
let param = { let param = {
"projectId": projectId, "projectId": projectId,
"deptId":deptId, "deptId": deptId,
"activeName":this.data.activeState "activeName": this.data.activeState
} }
let that = this; let that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectDetection/findGroupCountByApprove', url: app.globalData.reqUrl + '/wechat/projectDetection/findGroupCountByApprove',
data: param, data: param,
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
jxzCount:res.data.data.jxz, jxzCount: res.data.data.jxz,
ywcCount:res.data.data.ywc ywcCount: res.data.data.ywc
}); });
} }
}); });
}, },
/** /**
* 标签切换 * 标签切换
*/ */
typeJump(e){ typeJump(e) {
let index = e.currentTarget.dataset.index; let index = e.currentTarget.dataset.index;
let nav = ""; let nav = "";
if(index == 1){ if (index == 1) {
nav = 'jxz'; nav = 'jxz';
}else if(index == 2){ } else if (index == 2) {
nav = 'ywc'; nav = 'ywc';
} }
this.setData({ this.setData({
activeState:nav activeState: nav
}); });
this.getListData(this.data.projectId,this.data.deptId,this.data.minRoleId); this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady() { onReady() {
}, },
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow() { onShow() {
}, },
returnToPage: function () { returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
if(wx.getStorageSync('nav-menu')=="gd"){ if (wx.getStorageSync('nav-menu') == "gd") {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/gengduogongneng/index', url: '../../../pages/gengduogongneng/index',
}) })
}else{ } else {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/quality_manage/index', url: '../../../pages/quality_manage/index',
}) })
} }
}, },
//项目切换 返回值 //项目切换 返回值
onProjectSelect(e){ onProjectSelect(e) {
let projectId = e.detail.id; let projectId = e.detail.id;
let projectName = e.detail.text; let projectName = e.detail.text;
app.globalData.projectId = projectId; app.globalData.projectId = projectId;
@ -168,38 +248,38 @@ Page({
this.onLoad(); this.onLoad();
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide() { onHide() {
}, },
/** /**
* 生命周期函数--监听页面卸载 * 生命周期函数--监听页面卸载
*/ */
onUnload() { onUnload() {
}, },
/** /**
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh() { onPullDownRefresh() {
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom() { onReachBottom() {
}, },
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage() { onShareAppMessage() {
} }
}) })

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

@ -168,7 +168,7 @@ Page({
dataTypeLvl1:e.detail.id dataTypeLvl1:e.detail.id
}) })
let tempData = [] let tempData = []
this.dataTypeLvl2AllList.forEach(it =>{ this.data.dataTypeLvl2AllList.forEach(it =>{
if(it.remark==e.detail.id){ if(it.remark==e.detail.id){
tempData.push({"id":it.dictValue,"text":it.dictLabel}); tempData.push({"id":it.dictValue,"text":it.dictLabel});
} }

3
miniprogram/pageage/project_checking/edit/index.js
View File

@ -150,6 +150,7 @@ Page({
if(res.code == 200){ if(res.code == 200){
let tempData = [] let tempData = []
res.data.forEach(it =>{ res.data.forEach(it =>{
console.log(that.data.dt1,"xxxxxxxxxxxxxxxx");
if(it.remark==that.data.dt1){ if(it.remark==that.data.dt1){
tempData.push({"id":it.dictValue,"text":it.dictLabel}); tempData.push({"id":it.dictValue,"text":it.dictLabel});
} }
@ -176,7 +177,7 @@ Page({
dataTypeLvl1:e.detail.id dataTypeLvl1:e.detail.id
}) })
let tempData = [] let tempData = []
this.dataTypeLvl2AllList.forEach(it =>{ this.data.dataTypeLvl2AllList.forEach(it =>{
if(it.remark==e.detail.id){ if(it.remark==e.detail.id){
tempData.push({"id":it.dictValue,"text":it.dictLabel}); tempData.push({"id":it.dictValue,"text":it.dictLabel});
} }

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

@ -117,9 +117,9 @@ Page({
//跳转修改页面 //跳转修改页面
onUpdate:function(){ onUpdate:function(){
let id = this.data.id; let id = this.data.id;
let dt1= this.data.dataTypeLvl1 let dataTypeLvl1= this.data.infoData.dataTypeLvl1;
wx.redirectTo({ wx.redirectTo({
url: `../edit/index?id=${id}&dt1=${dt1}`, url: `../edit/index?id=${id}&dt1=${dataTypeLvl1}`,
}) })
}, },

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

@ -2,88 +2,171 @@
const app = getApp() const app = getApp()
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
deptId:"", deptId: "",
loginName:"", loginName: "",
userName:"", userName: "",
minRoleId:"", minRoleId: "",
projectId:"", projectId: "",
projectData:{}, projectData: {},
projectNameArgs:"", projectNameArgs: "",
initData: {}, initData: {},
show:false, show: false,
listData:[], listData: [],
jxzCount:0, jxzCount: 0,
ywcCount:0, ywcCount: 0,
activeState:"jxz", activeState: "jxz",
request:app.globalData.reqUrl request: app.globalData.reqUrl
}, },
onClose(){ onClose() {
this.setData({ show: false }); this.setData({
}, show: false
showPopup() { });
this.setData({ show: true }); },
}, showPopup() {
this.setData({
show: true
});
},
skipAdd(){ skipAdd() {
wx.redirectTo({ wx.redirectTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, url: `../add/index?projectId=${this.data.initData.id}&projectName=` + this.data.initData.text,
}) })
}, },
getInfo(e){ getInfo(e) {
let {id,approveStatus,superviseUser} = e.currentTarget.dataset.set let {
if(approveStatus=="1" && superviseUser==this.data.loginName){ id,
wx.redirectTo({ approveStatus,
url: `../../../pages/project_approve/approveChecking/index?id=${id}` superviseUser
}) } = e.currentTarget.dataset.set
}else{ if (approveStatus == "1" && superviseUser == this.data.loginName) {
wx.redirectTo({ wx.redirectTo({
url: `../info/index?id=${id}` url: `../../../pages/project_approve/approveChecking/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,
minRoleId:res.data.minRoleId,
projectId:app.globalData.projectId,
projectNameArgs:app.globalData.projectName,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
this.getProjectCheckingData(app.globalData.projectId,res.data.loginName,res.data.deptId,res.data.minRoleId);
}
}) })
}, } else {
wx.redirectTo({
url: `../info/index?id=${id}`
})
}
},
/** /**
* 查询项目举牌验收数据 * 生命周期函数--监听页面加载
*/ */
getProjectCheckingData(projectId,loginName,deptId,minRoleId) { onLoad(options) {
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
wx.getStorage({
key: 'projectInfoList',
success: res => {
app.globalData.projectInfoList = res.data;
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
} else {
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
} else {
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success: res => {
this.setData({
deptId: res.data.deptId,
loginName: res.data.loginName,
userName: res.data.userName,
minRoleId: res.data.minRoleId,
projectId: app.globalData.projectId,
projectNameArgs: app.globalData.projectName,
})
this.getProjectCheckingData(app.globalData.projectId, res.data.loginName, res.data.deptId, res.data.minRoleId);
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
},
/**
* 查询项目举牌验收数据
*/
getProjectCheckingData(projectId, loginName, deptId, minRoleId) {
var that = this; var that = this;
//判断角色， //判断角色，
if(minRoleId==2||minRoleId==3||minRoleId==4){ if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
deptId=0; deptId = 0;
} }
let param = { let param = {
"projectId": projectId, "projectId": projectId,
"nowUserName":loginName, "nowUserName": loginName,
"deptId":deptId, "deptId": deptId,
"activeName":this.data.activeState "activeName": this.data.activeState
} }
this.queryCount(param); this.queryCount(param);
wx.request({ wx.request({
@ -92,61 +175,61 @@ Page({
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
listData:res.data.data listData: res.data.data
}) })
} }
}) })
}, },
//查询统计 //查询统计
queryCount(param){ queryCount(param) {
//查询统计数量 //查询统计数量
let that = this; let that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectchecking/findGroupCountByApprove', url: app.globalData.reqUrl + '/wechat/projectchecking/findGroupCountByApprove',
data: param, data: param,
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
jxzCount:res.data.data.jxz, jxzCount: res.data.data.jxz,
ywcCount:res.data.data.ywc ywcCount: res.data.data.ywc
}); });
} }
}); });
}, },
/** /**
* 标签切换 * 标签切换
*/ */
typeJump(e){ typeJump(e) {
let index = e.currentTarget.dataset.index; let index = e.currentTarget.dataset.index;
let nav = ""; let nav = "";
if(index == 1){ if (index == 1) {
nav = 'jxz'; nav = 'jxz';
}else if(index == 2){ } else if (index == 2) {
nav = 'ywc'; nav = 'ywc';
} }
this.setData({ this.setData({
activeState:nav activeState: nav
}); });
this.getProjectCheckingData(this.data.projectId,this.data.loginName,this.data.deptId,this.data.minRoleId) this.getProjectCheckingData(this.data.projectId, this.data.loginName, this.data.deptId, this.data.minRoleId)
}, },
returnToPage: function () { returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
if(wx.getStorageSync('nav-menu')=="gd"){ if (wx.getStorageSync('nav-menu') == "gd") {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/gengduogongneng/index', url: '../../../pages/gengduogongneng/index',
}) })
}else{ } else {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/quality_manage/index', url: '../../../pages/quality_manage/index',
}) })
} }
}, },
//项目切换 返回值 //项目切换 返回值
onProjectSelect(e){ onProjectSelect(e) {
let projectId = e.detail.id; let projectId = e.detail.id;
let projectName = e.detail.text; let projectName = e.detail.text;
app.globalData.projectId = projectId; app.globalData.projectId = projectId;
@ -154,52 +237,52 @@ Page({
this.onLoad(); this.onLoad();
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady() { onReady() {
}, },
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow() { onShow() {
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide() { onHide() {
}, },
/** /**
* 生命周期函数--监听页面卸载 * 生命周期函数--监听页面卸载
*/ */
onUnload() { onUnload() {
}, },
/** /**
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh() { onPullDownRefresh() {
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom() { onReachBottom() {
}, },
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage() { onShareAppMessage() {
} }
}) })

34
miniprogram/pageage/project_files/index.js
View File

@ -1,5 +1,6 @@
import { import {
fileList, fileList,
readFile,
findCountByType, findCountByType,
} from '../../api/projectFiles' } from '../../api/projectFiles'
@ -21,6 +22,7 @@ Page({
pageSize: 10, pageSize: 10,
lastDataSize: 10, lastDataSize: 10,
list: [], list: [],
deptIds:"",
}, },
/** /**
@ -37,7 +39,26 @@ Page({
lastDataSize: 10, lastDataSize: 10,
listData: [] listData: []
}) })
this.getListData(); //获取缓存数据
wx.getStorage({
key: 'userinfo',
success: res => {
let fileDepts = "";
if(res.data.minRoleId>3){
if(res.data.minRoleId==4){
fileDepts += app.globalData.projectInfoList[0].projectInfoList[0].deptId;
}else{
app.globalData.projectInfoList.forEach(pro =>{
fileDepts += pro.projectInfoList[0].deptId;
});
}
}
this.setData({
deptIds:fileDepts
})
this.getListData();
}
})
}, },
/** /**
@ -50,11 +71,13 @@ Page({
return; return;
} }
let that = this; let that = this;
this.queryCount(); this.queryCount();
fileList({ fileList({
fileBelong: this.data.activeState, fileBelong: this.data.activeState,
pageNum: this.data.pageNum, pageNum: this.data.pageNum,
pageSize: this.data.pageSize pageSize: this.data.pageSize,
remark:this.data.deptIds
}).then(res => { }).then(res => {
//这里处理this.data.lastDataSize=this.data.pageSize //这里处理this.data.lastDataSize=this.data.pageSize
if (that.data.list.length > 0 && res.rows.length > 0 && that.data.list[0].id == res.rows[0].id) { if (that.data.list.length > 0 && res.rows.length > 0 && that.data.list[0].id == res.rows[0].id) {
@ -72,12 +95,12 @@ Page({
}); });
}, },
/** /**
* 统计文件传达 * 统计文件传达
*/ */
queryCount() { queryCount() {
let that = this; let that = this;
findCountByType({}).then(res => { findCountByType({remark:this.data.deptIds}).then(res => {
if (res.data.length > 0) { if (res.data.length > 0) {
let sjbm = 0, let sjbm = 0,
jtgs = 0, jtgs = 0,
@ -114,8 +137,9 @@ Page({
*/ */
openFile: function (e) { openFile: function (e) {
let { let {
filePath id,filePath
} = e.currentTarget.dataset.set } = e.currentTarget.dataset.set
readFile(id);
wx.downloadFile({ wx.downloadFile({
// 示例 url，并非真实存在 // 示例 url，并非真实存在
url: app.globalData.uploadUrl + '/common/download/resource?resource=' + filePath, url: app.globalData.uploadUrl + '/common/download/resource?resource=' + filePath,

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

@ -28,7 +28,7 @@
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view> <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" wx:if="{{item.fileBelong=='1'}}">上级部门</view> <view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='1'}}">上级部门</view>
<view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='2'}}">集团公司</view> <view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='2'}}">集团公司</view>
<view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='3'}}">子公司</view> <view class="module_title module_title_flex inspect_list_title_text" wx:if="{{item.fileBelong=='3'}}">{{item.deptName}}</view>
</view> </view>
</view> </view>
<view class="inspect_list_info"> <view class="inspect_list_info">

4
miniprogram/pageage/project_materialSeal/info/index.js
View File

@ -222,8 +222,8 @@ Page({
showSignFileImg:function(e){ showSignFileImg:function(e){
var that=this; var that=this;
wx.previewImage({ wx.previewImage({
urls: that.data.sifnFileImages, urls: that.data.signFileImages,
current: that.data.sifnFileImages[e.currentTarget.dataset.index] current: that.data.signFileImages[e.currentTarget.dataset.index]
}) })
}, },

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

@ -2,74 +2,157 @@
const app = getApp() const app = getApp()
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
deptId:"", deptId: "",
loginName:"", loginName: "",
projectId:"", projectId: "",
initData: {}, initData: {},
show:false, show: false,
listData:[], listData: [],
jxzCount:0, jxzCount: 0,
ywcCount:0, ywcCount: 0,
activeState:"jxz", activeState: "jxz",
request:app.globalData.reqUrl request: app.globalData.reqUrl
}, },
skipAdd(){ skipAdd() {
wx.redirectTo({ wx.redirectTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=${this.data.initData.text}` url: `../add/index?projectId=${this.data.initData.id}&projectName=${this.data.initData.text}`
}) })
}, },
getInfo(e){ getInfo(e) {
let {id,approveStatus,witnessUser} = e.currentTarget.dataset.set let {
if(approveStatus=="1" && witnessUser==this.data.loginName){ id,
wx.redirectTo({ approveStatus,
url: `../../../pages/project_approve/approveMaterialSeal/index?id=${id}` witnessUser
}) } = e.currentTarget.dataset.set
}else{ if (approveStatus == "1" && witnessUser == this.data.loginName) {
wx.redirectTo({ wx.redirectTo({
url: `../info/index?id=${id}` url: `../../../pages/project_approve/approveMaterialSeal/index?id=${id}`
})
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
deptId:res.data.deptId,
loginName:res.data.loginName,
projectId:app.globalData.projectId,
minRoleId:res.data.minRoleId,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
this.getListData(app.globalData.projectId,res.data.deptId,res.data.minRoleId);
}
}) })
}, } else {
wx.redirectTo({
url: `../info/index?id=${id}`
})
}
},
/** /**
* 查询项目材料封样数据 * 生命周期函数--监听页面加载
*/ */
getListData(projectId,deptId,minRoleId) { onLoad(options) {
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
wx.getStorage({
key: 'projectInfoList',
success: res => {
app.globalData.projectInfoList = res.data;
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
} else {
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
} else {
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success: res => {
this.setData({
deptId: res.data.deptId,
loginName: res.data.loginName,
projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId,
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
},
/**
* 查询项目材料封样数据
*/
getListData(projectId, deptId, minRoleId) {
var that = this; var that = this;
//判断角色， //判断角色，
if(minRoleId==2||minRoleId==3||minRoleId==4){ if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
deptId=0; deptId = 0;
} }
let param = { let param = {
"deptId":deptId, "deptId": deptId,
"projectId": projectId, "projectId": projectId,
"nowUserName":this.data.loginName, "nowUserName": this.data.loginName,
"activeName": this.data.activeState, "activeName": this.data.activeState,
} }
this.queryCount(param); this.queryCount(param);
@ -79,61 +162,61 @@ Page({
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
listData:res.data.data listData: res.data.data
}) })
} }
}) })
}, },
//查询统计 //查询统计
queryCount(param){ queryCount(param) {
//查询统计数量 //查询统计数量
let that = this; let that = this;
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/findGroupCountByApprove', url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/findGroupCountByApprove',
data: param, data: param,
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
jxzCount:res.data.data.jxz, jxzCount: res.data.data.jxz,
ywcCount:res.data.data.ywc ywcCount: res.data.data.ywc
}); });
} }
}); });
}, },
/** /**
* 标签切换 * 标签切换
*/ */
typeJump(e){ typeJump(e) {
let index = e.currentTarget.dataset.index; let index = e.currentTarget.dataset.index;
let nav = ""; let nav = "";
if(index == 1){ if (index == 1) {
nav = 'jxz'; nav = 'jxz';
}else if(index == 2){ } else if (index == 2) {
nav = 'ywc'; nav = 'ywc';
} }
this.setData({ this.setData({
activeState:nav activeState: nav
}); });
this.getListData(this.data.projectId,this.data.deptId,this.data.minRoleId); this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
}, },
returnToPage: function () { returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
if(wx.getStorageSync('nav-menu')=="gd"){ if (wx.getStorageSync('nav-menu') == "gd") {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/gengduogongneng/index', url: '../../../pages/gengduogongneng/index',
}) })
}else{ } else {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/quality_manage/index', url: '../../../pages/quality_manage/index',
}) })
} }
}, },
//项目切换 返回值 //项目切换 返回值
onProjectSelect(e){ onProjectSelect(e) {
let projectId = e.detail.id; let projectId = e.detail.id;
let projectName = e.detail.text; let projectName = e.detail.text;
app.globalData.projectId = projectId; app.globalData.projectId = projectId;
@ -141,52 +224,52 @@ Page({
this.onLoad(); this.onLoad();
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady() { onReady() {
}, },
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow() { onShow() {
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide() { onHide() {
}, },
/** /**
* 生命周期函数--监听页面卸载 * 生命周期函数--监听页面卸载
*/ */
onUnload() { onUnload() {
}, },
/** /**
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh() { onPullDownRefresh() {
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom() { onReachBottom() {
}, },
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage() { onShareAppMessage() {
} }
}) })

541
miniprogram/pageage/project_measure/add/index.js
View File

@ -6,144 +6,166 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
maxDate:new Date(2088,1,1).getTime(), maxDate: new Date(2088, 1, 1).getTime(),
currentDate:new Date().getTime(), currentDate: new Date().getTime(),
deptId:"", deptId: "",
projectId:"", projectId: "",
projectName:"", projectName: "",
loginName:"", loginName: "",
rectifierData:[], rectifierData: [],
rectifierData2:[], rectifierData2: [],
imageInfoData:[], imageInfoData: [],
loadShow:false, loadShow: false,
measureType:"1", measureType: "1",
measureTypeList:[], measureTypeList: [],
measureInfo:"1", measureInfo: "1",
measureInfoTypeList:[], infoTypeList: [],
measurePosition:"", measureInfoTypeList: [],
measurePointPosition:"", measurePosition: "",
qualityUser:"", measurePointPosition: "",
qualityUserName:"", qualityUser: "",
superviseUser:"", qualityUserName: "",
superviseUserName:"", superviseUser: "",
superviseUserName: "",
//验收时间 //验收时间
measureTime:'', measureTime: '',
measureResult:"1", measureResult: "1",
resultList:[{id:1,text:"合格"},{id:2,text:"不合格"}] limit: 9,
measureFiles: [],
resultList: [{
id: 1,
text: "合格"
}, {
id: 2,
text: "不合格"
}],
fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"]
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {projectId,projectName} = options let {
projectId,
projectName
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
projectId, projectId,
projectName, projectName,
deptId:res.data.deptId, deptId: res.data.deptId,
loginName:res.data.loginName loginName: res.data.loginName
}) })
this.getProjectUserData(); this.getProjectUserData();
this.getMeasureTypeList(); this.getMeasureTypeList();
this.getMeasureInfoTypeList(); this.getMeasureInfoTypeList();
} }
}) })
}, },
//查询项目人员数据 //查询项目人员数据
getProjectUserData(){ getProjectUserData() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser', url: app.globalData.reqUrl + '/wechat/projectuserinfo/selectProjectUnitUser',
method:"get", method: "get",
data:{ data: {
unitType:"4", unitType: "4",
projectId:that.data.projectId projectId: that.data.projectId
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
rectifierData:res.data, rectifierData: res.data,
}) })
} }
} }
}) })
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser', url: app.globalData.reqUrl + '/wechat/projectuserinfo/selectProjectUnitUser',
method:"get", method: "get",
data:{ data: {
unitType:"2", unitType: "2",
projectId:that.data.projectId projectId: that.data.projectId
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
rectifierData2:res.data, rectifierData2: res.data,
}) })
} }
} }
}) })
}, },
getMeasureTypeList(){ getMeasureTypeList() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/queryDictType', url: app.globalData.reqUrl + '/wechat/projectMeasure/queryDictType',
method:"get", method: "get",
data:{ data: {
type:'project_measure_type' type: 'project_measure_type'
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let list=[]; let list = [];
res.data.forEach(it =>{ res.data.forEach(it => {
list.push({"id":it.dictValue,"text":it.dictLabel}); list.push({
"id": it.dictValue,
"text": it.dictLabel
});
}) })
that.setData({ that.setData({
measureTypeList:list measureTypeList: list
}) })
} }
} }
}) })
}, },
getMeasureInfoTypeList(){ getMeasureInfoTypeList() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/queryDictType', url: app.globalData.reqUrl + '/wechat/projectMeasure/queryDictType',
method:"get", method: "get",
data:{ data: {
type:'project_measure_info_type' type: 'project_measure_info_type'
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let list=[]; let list = [];
res.data.forEach(it =>{ res.data.forEach(it => {
list.push({"id":it.dictValue,"text":it.dictLabel}); if (!it.remark) {
list.push({
"id": it.dictValue,
"text": it.dictLabel
});
}
}) })
that.setData({ that.setData({
measureInfoTypeList:list infoTypeList: res.data,
measureInfoTypeList: list
}) })
} }
} }
@ -151,7 +173,7 @@ Page({
}, },
//测量部位 //测量部位
onInputMeasurePosition(e){ onInputMeasurePosition(e) {
let measurePosition = e.detail.value let measurePosition = e.detail.value
this.setData({ this.setData({
measurePosition measurePosition
@ -159,7 +181,7 @@ Page({
}, },
//测量点位 //测量点位
onInputMeasurePointPosition(e){ onInputMeasurePointPosition(e) {
let measurePointPosition = e.detail.value let measurePointPosition = e.detail.value
this.setData({ this.setData({
measurePointPosition measurePointPosition
@ -167,7 +189,7 @@ Page({
}, },
//验收时间 //验收时间
onInputTime(e){ onInputTime(e) {
let measureTime = e.detail let measureTime = e.detail
this.setData({ this.setData({
measureTime measureTime
@ -175,123 +197,130 @@ Page({
}, },
// list 上传图片 // list 上传图片
onImagesArr(e){ onImagesArr(e) {
var data = this.data.imageInfoData var data = this.data.imageInfoData
data = e.detail data = e.detail
this.setData({ this.setData({
imageInfoData:data imageInfoData: data
}) })
}, },
//添加质量专员 //添加质量专员
onAddQualityUser(e){ onAddQualityUser(e) {
if(e.detail.length>0){ if (e.detail.length > 0) {
this.setData({ this.setData({
qualityUser:e.detail[0].phoneNumber, qualityUser: e.detail[0].phoneNumber,
qualityUserName:e.detail[0].userName qualityUserName: e.detail[0].userName
}) })
} }
}, },
//添加监理专员 //添加监理专员
onAddSuperviseUser(e){ onAddSuperviseUser(e) {
if(e.detail.length>0){ if (e.detail.length > 0) {
this.setData({ this.setData({
superviseUser:e.detail[0].phoneNumber, superviseUser: e.detail[0].phoneNumber,
superviseUserName:e.detail[0].userName superviseUserName: e.detail[0].userName
}) })
} }
}, },
//切换测量结果 //切换测量结果
onSelectType(e){ onSelectType(e) {
this.setData({ this.setData({
measureResult:e.detail.id measureResult: e.detail.id
}) })
}, },
//取消页面 //取消页面
cancelSaveView(){ cancelSaveView() {
this.returnToPage() this.returnToPage()
}, },
//保存 //保存
onSave(){ onSave() {
this.setData({ this.setData({
loadShow:true loadShow: true
}) })
let that = this let that = this
let {projectId,loginName, deptId,measureType, let {
measureInfo, projectId,
measurePosition, loginName,
measurePointPosition, deptId,
qualityUser, measureType,
qualityUserName, measureInfo,
superviseUser, measurePosition,
superviseUserName, measurePointPosition,
measureTime, qualityUser,
measureResult,imageInfoData} = that.data; qualityUserName,
superviseUser,
superviseUserName,
measureTime,
measureResult,
imageInfoData,
measureFiles
} = that.data;
//数据效验 //数据效验
if(projectId==""||loginName==""||deptId==""){ if (projectId == "" || loginName == "" || deptId == "") {
app.toast("数据异常，请刷新页面重试!") app.toast("数据异常，请刷新页面重试!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(imageInfoData.length==0){ if (imageInfoData.length == 0) {
app.toast("请上传测量现场图片!") app.toast("请上传测量现场图片!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(measureType==""){ if (measureType == "") {
app.toast("请选择测量类型!") app.toast("请选择测量类型!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(measureInfo==""){ if (measureInfo == "") {
app.toast("请选择测量内容!") app.toast("请选择测量内容!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(measurePosition==""){ if (measurePosition == "") {
app.toast("请填写测量部位!") app.toast("请填写测量部位!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(measurePointPosition==""){ if (measurePointPosition == "") {
app.toast("请填写测量点位!") app.toast("请填写测量点位!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(qualityUser==""||qualityUserName==""){ if (qualityUser == "" || qualityUserName == "") {
app.toast("请选择质量专员!") app.toast("请选择质量专员!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(superviseUser==""||superviseUserName==""){ if (superviseUser == "" || superviseUserName == "") {
app.toast("请选择监理专员!") app.toast("请选择监理专员!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(measureTime==""){ if (measureTime == "") {
app.toast("请选择测量时间!") app.toast("请选择测量时间!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
@ -302,120 +331,208 @@ Page({
// }) // })
// return; // return;
// } // }
if(superviseUser==qualityUser){ if (superviseUser == qualityUser) {
app.toast("质量专员和监理专员不能是同一人!") app.toast("质量专员和监理专员不能是同一人!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if (measureFiles.length > 0) {
for (let i = 0; i < measureFiles.length; i++) {
let _fileType = measureFiles[i].path.split('.');
_fileType = _fileType[_fileType.length - 1].toLowerCase();
//判断附件类型，如果是图片直接展示，非图片则显示附件
if (this.data.fileType.indexOf(_fileType) == -1) {
app.toast("当前 [ " + _fileType + " ] 文件不支持上传!")
that.setData({
loadShow: false
});
return;
}
}
}
let fileUrls = []; let fileUrls = [];
imageInfoData.forEach(async (item)=>{ let _measureFiles = [];
let uploadUrl = app.globalData.uploadUrl+'/common/upload' imageInfoData.forEach(async (item) => {
let uploadUrl = app.globalData.uploadUrl + '/common/upload'
let name = "file" let name = "file"
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片 //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
let obj = await that.syncUploadImage(uploadUrl,item,name); let obj = await that.syncUploadImage(uploadUrl, item, name);
fileUrls.push(obj.data.fileName); fileUrls.push(obj.data.fileName);
//验证图片上传完毕 //验证图片上传完毕
if(fileUrls.length == imageInfoData.length){ if (fileUrls.length == imageInfoData.length) {
let params = { if(measureFiles.length>0){
projectId, measureFiles.forEach(async (_file) => {
deptId, let uploadUrl = app.globalData.uploadUrl + '/common/upload'
imageUrls:fileUrls.toString(), let name = "file"
measureType, //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
measureInfo, let obj = await that.syncUploadImage(uploadUrl, _file.path, name);
measurePosition, _measureFiles.push(obj.data.fileName);
measurePointPosition, if (_measureFiles.length == measureFiles.length) {
qualityUser, this.submitFroms(fileUrls,_measureFiles);
qualityUserName,
superviseUser,
superviseUserName,
measureTime:measureTime+":00",
//measureResult,
approveStatus:"1",
createBy:loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/add',
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.redirectTo({
url: '../list/index',
})
},200)
} }
} });
}) }else{
//不传入附件信息
this.submitFroms(fileUrls,"");
} }
}) }
})
},
/**
* 表单提交
* @param {*} fileUrls
* @param {*} measureFiles
*/
submitFroms(fileUrls,measureFiles){
let that = this
let {
projectId,
loginName,
deptId,
measureType,
measureInfo,
measurePosition,
measurePointPosition,
qualityUser,
qualityUserName,
superviseUser,
superviseUserName,
measureTime,
} = that.data;
let params = {
projectId,
deptId,
imageUrls: fileUrls.toString(),
measureFiles: measureFiles.toString(),
measureType,
measureInfo,
measurePosition,
measurePointPosition,
qualityUser,
qualityUserName,
superviseUser,
superviseUserName,
measureTime: measureTime+":00",
approveStatus: "1",
createBy: loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/add',
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.redirectTo({
url: '../list/index',
})
}, 200)
}
}
})
}, },
/** /**
* 这里考虑上传图片异步问题，封装为同步 * 这里考虑上传图片异步问题，封装为同步
*/ */
syncUploadImage(url,uploadFile,name) { syncUploadImage(url, uploadFile, name) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
wx.uploadFile({ wx.uploadFile({
url, // 上传的服务器接口地址 url, // 上传的服务器接口地址
filePath: uploadFile, filePath: uploadFile,
header: { header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8" "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
}, },
name, //上传的所需字段，后端提供 name, //上传的所需字段，后端提供
formData: { user: 'test' }, formData: {
success: (res) => { user: 'test'
// 上传完成操作 },
const data = JSON.parse(res.data) success: (res) => {
resolve({ // 上传完成操作
data: data const data = JSON.parse(res.data)
}) resolve({
}, data: data
fail: (err) => { })
//上传失败：修改pedding为reject },
console.log("访问接口失败", err); fail: (err) => {
wx.showToast({ //上传失败：修改pedding为reject
title: "网络出错,上传失败", console.log("访问接口失败", err);
icon: 'none', wx.showToast({
duration: 1000 title: "网络出错,上传失败",
}); icon: 'none',
reject(err) duration: 1000
} });
reject(err)
}
}); });
}) })
}, },
//选择测量类型 /**
onSelectMeasureType(e){ * 文件上传
* @param {*} e
*/
fileUpload(e) {
this.setData({ this.setData({
measureType:e.detail.id measureFiles: e.detail
});
},
//选择测量类型
onSelectMeasureType(e) {
let list = [];
if (e.detail.id == 6) {
this.data.infoTypeList.forEach(item => {
if (item.remark == "gjgc") {
list.push({
"id": item.dictValue,
"text": item.dictLabel
});
}
})
} else {
this.data.infoTypeList.forEach(item => {
if (!item.remark) {
list.push({
"id": item.dictValue,
"text": item.dictLabel
});
}
})
}
this.setData({
measureType: e.detail.id,
measureInfo: list[0].id,
measureInfoTypeList: list
}) })
}, },
//选择测量内容 //选择测量内容
onSelectMeasureInfo(e){ onSelectMeasureInfo(e) {
this.setData({ this.setData({
measureInfo:e.detail.id measureInfo: e.detail.id
}) })
}, },
returnToPage: function () { returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({ wx.redirectTo({
url: '../list/index', url: '../list/index',
}) })
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成

8
miniprogram/pageage/project_measure/add/index.wxml
View File

@ -75,6 +75,14 @@
<voucher-select columns="{{resultList}}" placeholder="请选择测量结果" bindchange="onSelectType" ></voucher-select> <voucher-select columns="{{resultList}}" placeholder="请选择测量结果" bindchange="onSelectType" ></voucher-select>
</view> </view>
</view> </view>
<view class="inspect_info_list" style="width: 100%;">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">测量附件
<text style="font-size: small;">[可上传PDF/图片/WORD/PPT/XLS格式]</text>
</view>
<view class="problem_list_info_con">
<file-uploader-all bindfiles="fileUpload" limit="{{limit}}"></file-uploader-all>
</view>
</view>
</view> </view>
<view class="problem_submit_to"> <view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view> <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>

608
miniprogram/pageage/project_measure/edit/index.js
View File

@ -6,448 +6,578 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
maxDate:new Date(2088,1,1).getTime(), maxDate: new Date(2088, 1, 1).getTime(),
currentDate:new Date().getTime(), currentDate: new Date().getTime(),
id:"", id: "",
projectId:"", projectId: "",
projectName:"", projectName: "",
loginName:"", loginName: "",
rectifierData:[], rectifierData: [],
rectifierData2:[], rectifierData2: [],
imageInfoData:[], imageInfoData: [],
loadShow:false, loadShow: false,
measureTypeList:[], measureTypeList: [],
measureInfoTypeList:[], infoTypeList: [],
activeName:"", measureInfoTypeList: [],
flowRecordList:[], activeName: "",
request:app.globalData.reqUrl flowRecordList: [],
request: app.globalData.reqUrl,
limit: 9,
fileType: ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "pdf", "png", "jpg", "jpeg"],
type: "",
info: "",
filesData: [],
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
let {id} = options let {
id,
measureType,
measureInfo
} = options
//获取缓存数据 //获取缓存数据
wx.getStorage({ wx.getStorage({
key: 'userinfo', key: 'userinfo',
success:res=>{ success: res => {
this.setData({ this.setData({
id, id,
projectId:app.globalData.projectId, type: measureType,
projectName:app.globalData.projectName, info: measureInfo,
loginName:res.data.loginName projectId: app.globalData.projectId,
}) projectName: app.globalData.projectName,
loginName: res.data.loginName
})
this.getMeasureTypeList(); this.getMeasureTypeList();
this.getMeasureInfoTypeList(); this.getMeasureInfoTypeList();
this.getProjectUserData(); this.getProjectUserData();
this.getInfo(); this.getInfo();
this.getAuditinfo(); this.getAuditinfo();
} }
}) })
}, },
//查询项目人员数据 //查询项目人员数据
getProjectUserData(){ getProjectUserData() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser', url: app.globalData.reqUrl + '/wechat/projectuserinfo/selectProjectUnitUser',
method:"get", method: "get",
data:{ data: {
unitType:"4", unitType: "4",
projectId:that.data.projectId projectId: that.data.projectId
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
rectifierData:res.data, rectifierData: res.data,
}) })
} }
} }
}) })
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectuserinfo/selectProjectUnitUser', url: app.globalData.reqUrl + '/wechat/projectuserinfo/selectProjectUnitUser',
method:"get", method: "get",
data:{ data: {
unitType:"2", unitType: "2",
projectId:that.data.projectId projectId: that.data.projectId
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
rectifierData2:res.data, rectifierData2: res.data,
}) })
} }
} }
}) })
}, },
getMeasureTypeList(){ getMeasureTypeList() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/queryDictType', url: app.globalData.reqUrl + '/wechat/projectMeasure/queryDictType',
method:"get", method: "get",
data:{ data: {
type:'project_measure_type' type: 'project_measure_type'
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let list=[]; let list = [];
res.data.forEach(it =>{ res.data.forEach(it => {
list.push({"id":it.dictValue,"text":it.dictLabel}); list.push({
"id": it.dictValue,
"text": it.dictLabel
});
}) })
that.setData({ that.setData({
measureTypeList:list measureTypeList: list
}) })
} }
} }
}) })
}, },
getMeasureInfoTypeList(){ getMeasureInfoTypeList() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/queryDictType', url: app.globalData.reqUrl + '/wechat/projectMeasure/queryDictType',
method:"get", method: "get",
data:{ data: {
type:'project_measure_info_type' type: 'project_measure_info_type'
}, },
header:{ header: {
'content-type': 'application/x-www-form-urlencoded' 'content-type': 'application/x-www-form-urlencoded'
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let list=[]; let list = [];
res.data.forEach(it =>{ res.data.forEach(it => {
list.push({"id":it.dictValue,"text":it.dictLabel}); if (that.data.type == 6) {
if (it.remark) {
list.push({
"id": it.dictValue,
"text": it.dictLabel
});
}
} else {
if (!it.remark) {
list.push({
"id": it.dictValue,
"text": it.dictLabel
});
}
}
}) })
that.setData({ that.setData({
measureInfoTypeList:list infoTypeList: res.data,
measureInfoTypeList: list
}) })
} }
} }
}) })
}, },
/** /**
* 获取安全检查详情信息 * 获取安全检查详情信息
* *
*/ */
getInfo(){ getInfo() {
let {id} = this.data let {
id
} = this.data
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectMeasure/info', url: app.globalData.reqUrl + '/wechat/projectMeasure/info',
method:"get", method: "get",
data:{ data: {
id:id id: id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
let imageInfoData = []; let imageInfoData = [];
if(res.data.imageUrls){ if (res.data.imageUrls) {
res.data.imageUrls.split(',').forEach(element => { res.data.imageUrls.split(',').forEach(element => {
imageInfoData.push(that.data.request+element+'.min.jpg'); imageInfoData.push(that.data.request + element + '.min.jpg');
}); });
} }
that.setData({ let filesData = [];
infoData:res.data, if (res.data.measureFiles) {
imageInfoData, res.data.measureFiles.split(',').forEach(element => {
loadShow:false let it = element.split('/');
}) filesData.push({
name: it[it.length - 1],
path: element
});
});
}
that.setData({
infoData: res.data,
imageInfoData,
filesData,
loadShow: false
})
}
} }
}
}) })
}, },
/** /**
* 查询流程日志 * 查询流程日志
*/ */
getAuditinfo(){ getAuditinfo() {
let that = this let that = this
wx.request({ wx.request({
url: app.globalData.reqUrl+'/wechat/projectAuditinfo/selectProjectAuditinfo', url: app.globalData.reqUrl + '/wechat/projectAuditinfo/selectProjectAuditinfo',
method:"get", method: "get",
data:{ data: {
fromType:"2", fromType: "2",
fromId:this.data.id fromId: this.data.id
}, },
success(res){ success(res) {
res = res.data res = res.data
if(res.code == 200){ if (res.code == 200) {
that.setData({ that.setData({
flowRecordList:res.data flowRecordList: res.data
}) })
}
} }
}
}) })
}, },
// 手风琴 // 手风琴
onChange(event) { onChange(event) {
this.setData({ this.setData({
activeName: event.detail, activeName: event.detail,
}); });
}, },
//测量部位 //测量部位
onInputMeasurePosition(e){ onInputMeasurePosition(e) {
this.setData({ this.setData({
"infoData.measurePosition":e.detail.value "infoData.measurePosition": e.detail.value
}) })
}, },
//测量点位 //测量点位
onInputMeasurePointPosition(e){ onInputMeasurePointPosition(e) {
this.setData({ this.setData({
"infoData.measurePointPosition":e.detail.value "infoData.measurePointPosition": e.detail.value
}) })
}, },
//验收时间 //验收时间
onInputTime(e){ onInputTime(e) {
this.setData({ this.setData({
"infoData.measureTime":e.detail.value "infoData.measureTime": e.detail.value + ":00"
}) })
}, },
// list 上传图片 // list 上传图片
onImagesArr(e){ onImagesArr(e) {
var data = this.data.imageInfoData var data = this.data.imageInfoData
data = e.detail data = e.detail
this.setData({ this.setData({
imageInfoData:data imageInfoData: data
}) })
}, },
//添加质量专员 //添加质量专员
onAddQualityUser(e){ onAddQualityUser(e) {
if(e.detail.length>0){ if (e.detail.length > 0) {
this.setData({ this.setData({
"infoData.qualityUser":e.detail[0].phoneNumber, "infoData.qualityUser": e.detail[0].phoneNumber,
"infoData.qualityUserName":e.detail[0].userName "infoData.qualityUserName": e.detail[0].userName
}) })
} }
}, },
//添加监理专员 //添加监理专员
onAddSuperviseUser(e){ onAddSuperviseUser(e) {
if(e.detail.length>0){ if (e.detail.length > 0) {
this.setData({ this.setData({
"infoData.superviseUser":e.detail[0].phoneNumber, "infoData.superviseUser": e.detail[0].phoneNumber,
"infoData.superviseUserName":e.detail[0].userName "infoData.superviseUserName": e.detail[0].userName
}) })
} }
}, },
//取消页面 //取消页面
cancelSaveView(){ cancelSaveView() {
this.returnToPage() this.returnToPage()
}, },
//保存 //保存
onSave(){ onSave() {
this.setData({ this.setData({
loadShow:true loadShow: true
}) })
let that = this let that = this
let {id,loginName,imageInfoData,infoData} = that.data; let {
id,
loginName,
imageInfoData,
infoData,
measureFiles
} = that.data;
//数据效验 //数据效验
if(id==""){ if (id == "") {
app.toast("数据异常，请刷新页面重试!") app.toast("数据异常，请刷新页面重试!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(imageInfoData.length==0){ if (imageInfoData.length == 0) {
app.toast("请上传测量现场图片!") app.toast("请上传测量现场图片!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.measureType==""){ if (infoData.measureType == "") {
app.toast("请选择测量类型!") app.toast("请选择测量类型!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.measureInfo==""){ if (infoData.measureInfo == "") {
app.toast("请选择测量内容!") app.toast("请选择测量内容!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.measurePosition==""){ if (infoData.measurePosition == "") {
app.toast("请填写测量部位!") app.toast("请填写测量部位!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.measurePointPosition==""){ if (infoData.measurePointPosition == "") {
app.toast("请填写测量点位!") app.toast("请填写测量点位!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.qualityUser==""||infoData.qualityUserName==""){ if (infoData.qualityUser == "" || infoData.qualityUserName == "") {
app.toast("请选择质量专员!") app.toast("请选择质量专员!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.superviseUser==""||infoData.superviseUserName==""){ if (infoData.superviseUser == "" || infoData.superviseUserName == "") {
app.toast("请选择监理专员!") app.toast("请选择监理专员!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.measureTime==""){ if (infoData.measureTime == "") {
app.toast("请选择测量时间!") app.toast("请选择测量时间!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if(infoData.superviseUser==infoData.qualityUser){ if (infoData.superviseUser == infoData.qualityUser) {
app.toast("质量专员和监理专员不能是同一人!") app.toast("质量专员和监理专员不能是同一人!")
that.setData({ that.setData({
loadShow:false loadShow: false
}) })
return; return;
} }
if (measureFiles.length > 0) {
for (let i = 0; i < measureFiles.length; i++) {
let _fileType = measureFiles[i].path.split('.');
_fileType = _fileType[_fileType.length - 1].toLowerCase();
//判断附件类型，如果是图片直接展示，非图片则显示附件
if (this.data.fileType.indexOf(_fileType) == -1) {
app.toast("当前 [ " + _fileType + " ] 文件不支持上传!")
that.setData({
loadShow: false
});
return;
}
}
}
let fileUrls = []; let fileUrls = [];
imageInfoData.forEach(async (item)=>{ let _measureFiles = [];
imageInfoData.forEach(async (item) => {
//这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片 //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
if(item.indexOf(that.data.request)>-1){ if (item.indexOf(that.data.request) > -1) {
fileUrls.push(item.replace(that.data.request,"").replace(".min.jpg","")); fileUrls.push(item.replace(that.data.request, "").replace(".min.jpg", ""));
}else{ } else {
let uploadUrl = app.globalData.uploadUrl+'/common/upload' let uploadUrl = app.globalData.uploadUrl + '/common/upload'
let name = "file" let name = "file"
let obj = await that.syncUploadImage(uploadUrl,item,name); let obj = await that.syncUploadImage(uploadUrl, item, name);
fileUrls.push(obj.data.fileName); fileUrls.push(obj.data.fileName);
} }
//验证图片上传完毕 //验证图片上传完毕
if(fileUrls.length == imageInfoData.length){ if (fileUrls.length == imageInfoData.length) {
let params = { if (measureFiles.length > 0) {
id, measureFiles.forEach(async (_file) => {
imageUrls:fileUrls.toString(), if (_file.path.indexOf("/profile") > -1) {
measureType:infoData.measureType, _measureFiles.push(_file.path);
measureInfo:infoData.measureInfo, } else {
measurePosition:infoData.measurePosition, let uploadUrl = app.globalData.uploadUrl + '/common/upload'
measurePointPosition:infoData.measurePointPosition, let name = "file"
qualityUser:infoData.qualityUser, //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
qualityUserName:infoData.qualityUserName, let obj = await that.syncUploadImage(uploadUrl, _file.path, name);
superviseUser:infoData.superviseUser, _measureFiles.push(obj.data.fileName);
superviseUserName:infoData.superviseUserName,
measureTime:infoData.measureTime,
approveStatus:"1",
updateBy:loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/edit',
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.redirectTo({
url: '../list/index',
})
},200)
} }
} if (_measureFiles.length == measureFiles.length) {
}) this.submitFroms(fileUrls, _measureFiles);
}
});
} else {
//不传入附件信息
this.submitFroms(fileUrls, "");
} }
}) }
})
},
/**
* 表单提交
*/
submitFroms(fileUlrs, measureFiles) {
let that = this
let {
id,
loginName,
infoData
} = that.data;
let params = {
id,
imageUrls: fileUlrs.toString(),
measureFiles: measureFiles.toString(),
measureType: infoData.measureType,
measureInfo: infoData.measureInfo,
measurePosition: infoData.measurePosition,
measurePointPosition: infoData.measurePointPosition,
qualityUser: infoData.qualityUser,
qualityUserName: infoData.qualityUserName,
superviseUser: infoData.superviseUser,
superviseUserName: infoData.superviseUserName,
measureTime: infoData.measureTime,
approveStatus: "1",
updateBy: loginName
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/edit',
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.redirectTo({
url: '../list/index',
})
}, 200)
}
}
});
}, },
/** /**
* 这里考虑上传图片异步问题，封装为同步 * 这里考虑上传图片异步问题，封装为同步
*/ */
syncUploadImage(url,uploadFile,name) { syncUploadImage(url, uploadFile, name) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
wx.uploadFile({ wx.uploadFile({
url, // 上传的服务器接口地址 url, // 上传的服务器接口地址
filePath: uploadFile, filePath: uploadFile,
header: { header: {
"Content-Type": "application/x-www-form-urlencoded;charset=UTF-8" "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
}, },
name, //上传的所需字段，后端提供 name, //上传的所需字段，后端提供
formData: { user: 'test' }, formData: {
success: (res) => { user: 'test'
// 上传完成操作 },
const data = JSON.parse(res.data) success: (res) => {
resolve({ // 上传完成操作
data: data const data = JSON.parse(res.data)
}) resolve({
}, data: data
fail: (err) => { })
//上传失败：修改pedding为reject },
console.log("访问接口失败", err); fail: (err) => {
wx.showToast({ //上传失败：修改pedding为reject
title: "网络出错,上传失败", console.log("访问接口失败", err);
icon: 'none', wx.showToast({
duration: 1000 title: "网络出错,上传失败",
}); icon: 'none',
reject(err) duration: 1000
} });
reject(err)
}
}); });
}) })
}, },
//选择测量类型 /**
onSelectMeasureType(e){ * 文件上传
* @param {*} e
*/
fileUpload(e) {
this.setData({ this.setData({
"infoData.measureType":e.detail.id measureFiles: e.detail
});
},
//选择测量类型
onSelectMeasureType(e) {
let list = [];
if (e.detail.id == 6) {
this.data.infoTypeList.forEach(item => {
if (item.remark == "gjgc") {
list.push({
"id": item.dictValue,
"text": item.dictLabel
});
}
})
} else {
this.data.infoTypeList.forEach(item => {
if (!item.remark) {
list.push({
"id": item.dictValue,
"text": item.dictLabel
});
}
})
}
this.setData({
"infoData.measureType": e.detail.id,
"infoData.measureInfo": list[0].id,
measureInfoTypeList: list
}) })
}, },
//选择测量内容 //选择测量内容
onSelectMeasureInfo(e){ onSelectMeasureInfo(e) {
this.setData({ this.setData({
"infoData.measureInfo":e.detail.id "infoData.measureInfo": e.detail.id
}) })
}, },
returnToPage: function () { returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
wx.redirectTo({ wx.redirectTo({
url: '../list/index', url: '../list/index',
}) })
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成

8
miniprogram/pageage/project_measure/edit/index.wxml
View File

@ -96,6 +96,14 @@
<voucher-datetime counts="5" placeholder="请选择测量时间" maxDate="{{maxDate}}" currentDate="{{currentDate}}" bindchange="onInputTime" time="{{infoData.measureTime}}"></voucher-datetime> <voucher-datetime counts="5" placeholder="请选择测量时间" maxDate="{{maxDate}}" currentDate="{{currentDate}}" bindchange="onInputTime" time="{{infoData.measureTime}}"></voucher-datetime>
</view> </view>
</view> </view>
<view class="inspect_info_list" style="width: 100%;">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">测量附件
<text style="font-size: small;">[可上传PDF/图片/WORD/PPT/XLS格式]</text>
</view>
<view class="problem_list_info_con">
<file-uploader-all bindfiles="fileUpload" limit="{{limit}}" fileUrlArray="{{filesData}}"></file-uploader-all>
</view>
</view>
</view> </view>
<view class="problem_submit_to"> <view class="problem_submit_to">
<view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view> <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>

2
miniprogram/pageage/project_measure/info/index.js
View File

@ -150,7 +150,7 @@ Page({
onUpdate:function(){ onUpdate:function(){
let id = this.data.id; let id = this.data.id;
wx.redirectTo({ wx.redirectTo({
url: `../edit/index?id=${id}`, url: `../edit/index?id=${id}&measureType=${this.data.infoData.measureType}&measureInfo=${this.data.infoData.measureInfo}`,
}) })
}, },

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

@ -2,94 +2,177 @@
const app = getApp() const app = getApp()
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
deptId:"", deptId: "",
loginName:"", loginName: "",
projectId:"", projectId: "",
minRoleId:"", minRoleId: "",
projectData:{}, projectData: {},
initData: {}, initData: {},
show:false, show: false,
listData:[], listData: [],
jxzCount:0, jxzCount: 0,
ywcCount:0, ywcCount: 0,
activeState:"jxz", activeState: "jxz",
request:app.globalData.reqUrl request: app.globalData.reqUrl
}, },
skipAdd(){ skipAdd() {
wx.redirectTo({ wx.redirectTo({
url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text, url: `../add/index?projectId=${this.data.initData.id}&projectName=` + this.data.initData.text,
}) })
}, },
getInfo(e){ getInfo(e) {
let {id,approveStatus,superviseUser} = e.currentTarget.dataset.set let {
if(approveStatus=="1" && superviseUser==this.data.loginName){ id,
wx.redirectTo({ approveStatus,
url: `../../../pages/project_approve/approveMeasure/index?id=${id}` superviseUser
}) } = e.currentTarget.dataset.set
}else{ if (approveStatus == "1" && superviseUser == this.data.loginName) {
wx.redirectTo({ wx.redirectTo({
url: `../info/index?id=${id}` url: `../../../pages/project_approve/approveMeasure/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,
minRoleId:res.data.minRoleId,
initData:{text:app.globalData.projectName,id:app.globalData.projectId}
})
this.getListData(app.globalData.projectId,res.data.deptId,res.data.minRoleId);
}
}) })
}, } else {
wx.redirectTo({
url: `../info/index?id=${id}`
})
}
},
/** /**
* 查询项目实测实量数据 * 生命周期函数--监听页面加载
*/ */
getListData(projectId,deptId,minRoleId) { onLoad(options) {
if (options && options.barProId) {
//数据未加载完毕，从文件读取数据
if (app.globalData.projectInfoList.length == 0) {
wx.getStorage({
key: 'projectInfoList',
success: res => {
app.globalData.projectInfoList = res.data;
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
} else {
app.globalData.projectInfoList.forEach(item => {
if (item.projectId == options.barProId) {
app.globalData.projectId = item.projectId;
app.globalData.projectName = item.projectName;
}
});
//未查询到项目信息
if (!app.globalData.projectId) {
app.globalData.projectInfoList.push({
projectId: options.barProId,
projectId: options.barProName
});
app.globalData.projectId = options.barProId;
app.globalData.projectName = options.barProName;
}
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
} else {
//从缓存读取项目信息
this.setData({
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
}
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success: res => {
this.setData({
deptId: res.data.deptId,
loginName: res.data.loginName,
userName: res.data.userName,
projectId: app.globalData.projectId,
minRoleId: res.data.minRoleId,
initData: {
text: app.globalData.projectName,
id: app.globalData.projectId
}
})
this.getListData(app.globalData.projectId, res.data.deptId, res.data.minRoleId);
},
fail: err => {
//未获取用户信息时，重新登录
wx.redirectTo({
url: '../pages/login/index',
})
}
})
},
/**
* 查询项目实测实量数据
*/
getListData(projectId, deptId, minRoleId) {
var that = this; var that = this;
//判断角色， //判断角色，
if(minRoleId==2||minRoleId==3||minRoleId==4){ if (minRoleId == 2 || minRoleId == 3 || minRoleId == 4) {
deptId=0; deptId = 0;
} }
let param = { let param = {
"projectId": projectId, "projectId": projectId,
"deptId":deptId, "deptId": deptId,
"nowUserName":this.data.loginName, "nowUserName": this.data.loginName,
"activeName": this.data.activeState, "activeName": this.data.activeState,
} }
this.queryCount(param); this.queryCount(param);
wx.request({ wx.request({
url: app.globalData.reqUrl + '/wechat/projectMeasure/list', url: app.globalData.reqUrl + '/wechat/projectMeasure/list',
data:param, data: param,
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
listData:res.data.data listData: res.data.data
}) })
} }
}); });
}, },
//查询统计 //查询统计
queryCount(param){ queryCount(param) {
//查询统计数量 //查询统计数量
let that = this; let that = this;
wx.request({ wx.request({
@ -98,8 +181,8 @@ Page({
method: "get", method: "get",
success: function (res) { success: function (res) {
that.setData({ that.setData({
jxzCount:res.data.data.jxz, jxzCount: res.data.data.jxz,
ywcCount:res.data.data.ywc ywcCount: res.data.data.ywc
}); });
} }
}); });
@ -108,49 +191,49 @@ Page({
/** /**
* 标签切换 * 标签切换
*/ */
typeJump(e){ typeJump(e) {
let index = e.currentTarget.dataset.index; let index = e.currentTarget.dataset.index;
let nav = ""; let nav = "";
if(index == 1){ if (index == 1) {
nav = 'jxz'; nav = 'jxz';
}else if(index == 2){ } else if (index == 2) {
nav = 'ywc'; nav = 'ywc';
} }
this.setData({ this.setData({
activeState:nav activeState: nav
}); });
this.getListData(this.data.projectId,this.data.deptId,this.data.minRoleId); this.getListData(this.data.projectId, this.data.deptId, this.data.minRoleId);
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
*/ */
onReady() { onReady() {
}, },
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow() { onShow() {
}, },
returnToPage: function () { returnToPage: function () {
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
if(wx.getStorageSync('nav-menu')=="gd"){ if (wx.getStorageSync('nav-menu') == "gd") {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/gengduogongneng/index', url: '../../../pages/gengduogongneng/index',
}) })
}else{ } else {
wx.redirectTo({ wx.redirectTo({
url: '../../../pages/quality_manage/index', url: '../../../pages/quality_manage/index',
}) })
} }
}, },
//项目切换 返回值 //项目切换 返回值
onProjectSelect(e){ onProjectSelect(e) {
let projectId = e.detail.id; let projectId = e.detail.id;
let projectName = e.detail.text; let projectName = e.detail.text;
app.globalData.projectId = projectId; app.globalData.projectId = projectId;
@ -158,38 +241,38 @@ Page({
this.onLoad(); this.onLoad();
}, },
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
onHide() { onHide() {
}, },
/** /**
* 生命周期函数--监听页面卸载 * 生命周期函数--监听页面卸载
*/ */
onUnload() { onUnload() {
}, },
/** /**
* 页面相关事件处理函数--监听用户下拉动作 * 页面相关事件处理函数--监听用户下拉动作
*/ */
onPullDownRefresh() { onPullDownRefresh() {
}, },
/** /**
* 页面上拉触底事件的处理函数 * 页面上拉触底事件的处理函数
*/ */
onReachBottom() { onReachBottom() {
}, },
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */
onShareAppMessage() { onShareAppMessage() {
} }
}) })

2
miniprogram/pageage/project_train/add/index.js
View File

@ -28,7 +28,7 @@ Page({
deptNames:"", deptNames:"",
dataType:"", dataType:"",
trainDataTypeList:[], trainDataTypeList:[],
fileType:["doc","docx","xls","xlsx","ppt","pptx","txt","pdf","png","jpg","jpeg","mp4"] fileType:["doc","docx","xls","xlsx","ppt","pptx","pdf","png","jpg","jpeg"]
}, },
/** /**

2
miniprogram/pages/components/curve-echarts/index.js
View File

@ -23,7 +23,7 @@ Component({
}, },
observers: { observers: {
chartData: function (val) { chartData: function (val) {
console.log(val) //console.log(val)
this.initChart() this.initChart()
}, },
}, },

2
miniprogram/pages/components/pie-chart/index.js
View File

@ -15,7 +15,7 @@ Component({
}, },
observers: { observers: {
chartData: function (val) { chartData: function (val) {
console.log(val) //console.log(val)
this.initChart() this.initChart()
}, },
}, },

2
miniprogram/pages/components/pz-screen-training-index/index.js
View File

@ -19,7 +19,7 @@ Component({
/**数据监听 */ /**数据监听 */
observers: { observers: {
columns: function (val) { columns: function (val) {
console.log(val) //console.log(val)
if(val.length > 0){ if(val.length > 0){
this.setData({ this.setData({
floorList:val[0].floorList floorList:val[0].floorList

30
miniprogram/pages/components/user-infos/index.js
View File

@ -1,6 +1,9 @@
import { import {
removeToken removeToken
} from '../../../utils/auth' } from '../../../utils/auth'
import {
loginOut
} from '../../../api/login'
const app = getApp() const app = getApp()
Component({ Component({
/**数据监听 */ /**数据监听 */
@ -18,6 +21,7 @@ Component({
showOldPass: true, showOldPass: true,
showNewPass: true, showNewPass: true,
showPassWord: true, showPassWord: true,
binding: false,
}, },
created() { created() {
@ -59,6 +63,11 @@ Component({
}); });
}, },
//绑定公众号
binding: function () {
app.initWxAuth();
},
/** /**
* 修改密码返回 * 修改密码返回
*/ */
@ -68,9 +77,27 @@ Component({
}); });
}, },
/**
* 修改密码返回
*/
closeBinding: function () {
this.setData({
binding: false
});
},
bindingBuild: function () {
wx.previewImage({
urls: "https://szgcwx.jhncidg.com/staticFiles/qr.jpg".split(","),
current: 0
})
},
//退出登录 //退出登录
loginOut: function () { loginOut: function () {
removeToken(); loginOut({}).then(res => {
removeToken();
});
wx.clearStorageSync(); wx.clearStorageSync();
wx.setStorageSync('isReload', "1") wx.setStorageSync('isReload', "1")
wx.redirectTo({ wx.redirectTo({
@ -79,7 +106,6 @@ Component({
}, },
seeTap1() { seeTap1() {
debugger
let that = this; let that = this;
that.setData({ that.setData({
// 切换图标 // 切换图标

5
miniprogram/pages/components/user-infos/index.json
View File

@ -2,7 +2,10 @@
"usingComponents": { "usingComponents": {
"van-row": "@vant/weapp/row", "van-row": "@vant/weapp/row",
"van-col": "@vant/weapp/col", "van-col": "@vant/weapp/col",
"van-popup": "@vant/weapp/popup" "van-popup": "@vant/weapp/popup",
"van-notice-bar": "@vant/weapp/notice-bar/index",
"van-grid": "@vant/weapp/grid/index",
"van-grid-item": "@vant/weapp/grid-item/index"
}, },
"navigationStyle":"custom" "navigationStyle":"custom"
} }

15
miniprogram/pages/components/user-infos/index.wxml
View File

@ -20,9 +20,20 @@
</view> </view>
</van-col> </van-col>
</van-row> </van-row>
<view class="left_manage_min" wx:if="{{true}}">
<view class="message-title">关注公众号才能成功开启消息通知</view>
</view>
<button wx:if="{{true}}" type="default" size="default" style="margin-top: 40rpx;background-color: #513ea7;color: #FFF;" bindtap="bindingBuild">立即关注公众号</button>
<view class="left_manage_min" wx:if="{{binding}}">
<view class="left_manage" bindtap="binding">
<image src="/images/img_1.png" class="left_icon"></image>
<text class="left_binding">开启消息通知</text>
<image src="/images/right.png" class="left_flaot"></image>
</view>
</view>
<view class="left_manage_min"> <view class="left_manage_min">
<view class="left_manage" bindtap="resPassword"> <view class="left_manage" bindtap="resPassword">
<image src="/images/set.png" class="left_icon"></image> <image src="/images/img_5.png" class="left_icon"></image>
<text class="left_password">修改密码</text> <text class="left_password">修改密码</text>
<image src="/images/right.png" class="left_flaot"></image> <image src="/images/right.png" class="left_flaot"></image>
</view> </view>
@ -38,7 +49,7 @@
</van-popup> </van-popup>
<!--修改密码--> <!--修改密码-->
<van-popup show="{{ resPas }}" position="left" class="passClass" custom-style="width: 100%;height:100%;background: #191d28 url(http://fileimg.makalu.cc/CORE_40247DD946964A15AA0D4000E1031E19.png) no-repeat bottom/100%;" bind:close="closeResPas"> <van-popup show="{{ resPas }}" position="left" class="passClass" custom-style="width: 100%;height:100%;background: #191d28 url(https://szgcwx.jhncidg.com/staticFiles/img/CORE_40247DD946964A15AA0D4000E1031E19.png) no-repeat bottom/100%;" bind:close="closeResPas">
<view class="bg_bg"> <view class="bg_bg">
<image src="https://szgcwx.jhncidg.com/staticFiles/img/yanzhu_logo_blue.png"></image> <image src="https://szgcwx.jhncidg.com/staticFiles/img/yanzhu_logo_blue.png"></image>
</view> </view>

15
miniprogram/pages/components/user-infos/index.wxss
View File

@ -49,6 +49,15 @@
padding: 0 5%; padding: 0 5%;
margin-top: 40rpx; margin-top: 40rpx;
} }
.message-title{
color: #FFFFFF;
font-weight: 600;
text-align: center;
}
.color_blue {
color: #45affb;
}
.left_manage { .left_manage {
padding: 20rpx 20rpx 15rpx; padding: 20rpx 20rpx 15rpx;
@ -85,6 +94,12 @@
padding-bottom: 5rpx; padding-bottom: 5rpx;
} }
.left_binding {
text-align: center;
padding-bottom: 5rpx;
color: #45affb;
}
.left_sign { .left_sign {
text-align: center; text-align: center;
padding-bottom: 5rpx; padding-bottom: 5rpx;

16
miniprogram/pages/gongchengliebiao/index.js
View File

@ -1,4 +1,9 @@
// pages/gongchengliebiao/index.js\ import {
removeToken
} from '../../utils/auth'
import {
loginOut
} from '../../api/login'
const app = getApp() const app = getApp()
Page({ Page({
@ -289,6 +294,9 @@ Page({
this.setData({ loadShow: false }); this.setData({ loadShow: false });
}, },
onLogout(){ onLogout(){
loginOut({}).then(res => {
removeToken();
});
wx.clearStorageSync(); wx.clearStorageSync();
wx.setStorageSync('isReload', "1") wx.setStorageSync('isReload', "1")
wx.redirectTo({ wx.redirectTo({
@ -311,7 +319,6 @@ Page({
value3:app.globalData.value3 value3:app.globalData.value3
}) })
// let _dataList = app.globalData.projectInfoList; // let _dataList = app.globalData.projectInfoList;
// debugger
// if(app.globalData.type == "1"){ // if(app.globalData.type == "1"){
// that.setData({ // that.setData({
// "type":'1', // "type":'1',
@ -466,6 +473,11 @@ Page({
projectData:res.data, projectData:res.data,
projectInfoList:res.data projectInfoList:res.data
}) })
//存入文件中
wx.setStorage({
key: 'projectInfoList',
data: res.data
});
app.globalData.projectInfoList = res.data; app.globalData.projectInfoList = res.data;
//if(that.data.type == 1){ //if(that.data.type == 1){
// that.setData({ // that.setData({

4
miniprogram/pages/gongchengliebiao/index.wxml
View File

@ -92,9 +92,6 @@
<view class="font_color {{ index == nav3 ? 'active3' :' ' }}" wx:for = "{{ziGs}}" wx:key="ziGs" data-index="{{index}}" bindtap="onclassC" data-name="{{item.text}}" data-id="{{item.id}}"> {{item.text}}</view> <view class="font_color {{ index == nav3 ? 'active3' :' ' }}" wx:for = "{{ziGs}}" wx:key="ziGs" data-index="{{index}}" bindtap="onclassC" data-name="{{item.text}}" data-id="{{item.id}}"> {{item.text}}</view>
</view> </view>
</van-popup> </van-popup>
</van-row> </van-row>
</view> </view>
@ -102,7 +99,6 @@
{{value1}}/{{value2}}/{{value3}} {{value1}}/{{value2}}/{{value3}}
</view> </view>
<view class="list_title"> <view class="list_title">
总工程数<text>（{{proCount}}）</text> 总工程数<text>（{{proCount}}）</text>
</view> </view>

10
miniprogram/pages/login/index.js
View File

@ -133,6 +133,11 @@ Page({
app.globalData.value1 = rd.projectInfo.shengName; app.globalData.value1 = rd.projectInfo.shengName;
app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName; app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName;
app.globalData.value3 = rd.projectInfo.logCompanyName; app.globalData.value3 = rd.projectInfo.logCompanyName;
//存入文件中
wx.setStorage({
key: 'projectInfoList',
data: app.globalData.projectInfoList
});
wx.redirectTo({ wx.redirectTo({
url: '../xiangmugaikuang/index', url: '../xiangmugaikuang/index',
}) })
@ -225,6 +230,11 @@ Page({
app.globalData.value1 = rd.projectInfo.shengName; app.globalData.value1 = rd.projectInfo.shengName;
app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName; app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName;
app.globalData.value3 = rd.projectInfo.logCompanyName; app.globalData.value3 = rd.projectInfo.logCompanyName;
//存入文件中
wx.setStorage({
key: 'projectInfoList',
data: app.globalData.projectInfoList
});
wx.redirectTo({ wx.redirectTo({
url: '../xiangmugaikuang/index', url: '../xiangmugaikuang/index',
}) })

990
miniprogram/pages/map/map.js
View File

File diff suppressed because it is too large Load Diff

6
miniprogram/pages/project_approve/approveCheckDetection/index.js
View File

@ -200,11 +200,11 @@ Page({
}, },
//展示图片 //展示图片
showImg:function(e){ showDetectionFileImg:function(e){
var that=this; var that=this;
wx.previewImage({ wx.previewImage({
urls: that.data.imageList, urls: that.data.detectionImageList,
current: that.data.imageList[e.currentTarget.dataset.index] current: that.data.detectionImageList[e.currentTarget.dataset.index]
}) })
}, },

4
miniprogram/pages/project_approve/approveMaterialSeal/index.js
View File

@ -275,8 +275,8 @@ Page({
showSignFileImg:function(e){ showSignFileImg:function(e){
var that=this; var that=this;
wx.previewImage({ wx.previewImage({
urls: that.data.sifnFileImages, urls: that.data.signFileImages,
current: that.data.sifnFileImages[e.currentTarget.dataset.index] current: that.data.signFileImages[e.currentTarget.dataset.index]
}) })
}, },

5
miniprogram/pages/project_flowable/await/index.js
View File

@ -56,6 +56,11 @@ Page({
name: '特殊事项确认', name: '特殊事项确认',
icon: config.baseUrl + '/staticFiles/img/tssxqrl.png', icon: config.baseUrl + '/staticFiles/img/tssxqrl.png',
todoDB:0, todoDB:0,
}, {
id: 8,
name: '专项验收审批',
icon: config.baseUrl + '/staticFiles/img/zxyssp.png',
todoDB:0,
} }
], ],
}, },

1
miniprogram/pages/project_flowable/editTask/index.js
View File

@ -29,7 +29,6 @@ Page({
taskName:"", taskName:"",
passState:true, passState:true,
backName:"", backName:"",
filesData:[],
ret:"", ret:"",
remark:"", remark:"",
filesData:[], filesData:[],

68
miniprogram/pages/wx-auth/index.js 100644
View File

@ -0,0 +1,68 @@
import config from '../../config'
Page({
/**
* 页面的初始数据
*/
data: {
url:""
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
this.setData({
url:config.manageUrl+"/#/wxAuth?userOpenId=1111111111111111"
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

3
miniprogram/pages/wx-auth/index.json 100644
View File

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

2
miniprogram/pages/wx-auth/index.wxml 100644
View File

@ -0,0 +1,2 @@
<!--pages/wx-auth/index.wxml-->
<web-view src="{{url}}"></web-view>

1
miniprogram/pages/wx-auth/index.wxss 100644
View File

@ -0,0 +1 @@
/* pages/wx-auth/index.wxss */

3
miniprogram/pages/xiangmugaikuang/index.wxml
View File

@ -21,9 +21,6 @@
<!-- 中间内容 --> <!-- 中间内容 -->
<view class="max_content" > <view class="max_content" >
<project-select init="{{initData}}" bindchange="onProjectSelect"></project-select> <project-select init="{{initData}}" bindchange="onProjectSelect"></project-select>
<view class="official">
<official-account></official-account>
</view>
<!-- <view class="video_add"> <!-- <view class="video_add">
<view class="video_address"> <view class="video_address">
<view class="video_address_min" bindtap="GOMAP"> <view class="video_address_min" bindtap="GOMAP">

2
miniprogram/utils/request.js
View File

@ -35,7 +35,7 @@ function doRequest(url, method = 'GET', data, header = {}) {
if (code === 401) { if (code === 401) {
removeToken(); removeToken();
wx.redirectTo({ wx.redirectTo({
url: '../login/index', url: '../pages/login/index',
}); });
} else if (code === 500 || code === 403) { } else if (code === 500 || code === 403) {
app.toast(res.data.msg); app.toast(res.data.msg);

228
project.private.config.json
View File

@ -4,5 +4,233 @@
"setting": { "setting": {
"compileHotReLoad": true, "compileHotReLoad": true,
"urlCheck": false "urlCheck": false
},
"condition": {
"miniprogram": {
"list": [
{
"name": "db guide",
"pathName": "pages/databaseGuide/databaseGuide",
"query": ""
},
{
"name": "pages/gongchengliebiao/index",
"pathName": "pages/gongchengliebiao/index",
"query": "",
"scene": null
},
{
"name": "pages/gengduogongneng/index",
"pathName": "pages/gengduogongneng/index",
"query": "",
"scene": null
},
{
"name": "pages/login/index",
"pathName": "pages/login/index",
"query": "",
"scene": null
},
{
"name": "pages/xiangmushipin/xiangmushipin",
"pathName": "pages/xiangmushipin/xiangmushipin",
"query": "",
"scene": null
},
{
"name": "pageage/project_checking/list/index",
"pathName": "pageage/project_checking/list/index",
"query": "barProId=645",
"launchMode": "default",
"scene": null
},
{
"name": "pages/gengduogongneng/index",
"pathName": "pages/gengduogongneng/index",
"query": "",
"scene": null
},
{
"name": "pages/xiangmugaikuang/index",
"pathName": "pages/xiangmugaikuang/index",
"query": "",
"scene": null
},
{
"name": "pages/xiangmuhuanjing/xiangmuhuanjing",
"pathName": "pages/xiangmuhuanjing/xiangmuhuanjing",
"query": "",
"scene": null
},
{
"name": "pages/xiangmuyujing/xiangmuyujing",
"pathName": "pages/xiangmuyujing/xiangmuyujing",
"query": "",
"scene": null
},
{
"name": "pages/gengduogongneng/index",
"pathName": "pages/gengduogongneng/index",
"query": "",
"scene": null
},
{
"name": "pages/xiangmugaikuang/index",
"pathName": "pages/xiangmugaikuang/index",
"query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
"scene": null
},
{
"name": "pages/shebieguanli-taji/taji",
"pathName": "pages/shebieguanli-taji/taji",
"query": "",
"scene": null
},
{
"name": "pages/shebieguanli-shajiangguan/shajiangguan",
"pathName": "pages/shebieguanli-shajiangguan/shajiangguan",
"query": "",
"scene": null
},
{
"name": "pages/xiangmugaikuang/index",
"pathName": "pages/xiangmugaikuang/index",
"query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
"scene": null
},
{
"name": "pages/xiangmuyujing/xiangmuyujing",
"pathName": "pages/xiangmuyujing/xiangmuyujing",
"query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
"scene": null
},
{
"name": "pages/map/map",
"pathName": "pages/map/map",
"query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
"scene": null
},
{
"name": "pages/map/map",
"pathName": "pages/map/map",
"query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目",
"scene": null
},
{
"name": "pages/yujingxinxi/yujingxinxi",
"pathName": "pages/yujingxinxi/yujingxinxi",
"query": "",
"scene": null
},
{
"name": "pages/yujingxinxi/yujingxinxi",
"pathName": "pages/yujingxinxi/yujingxinxi",
"query": "",
"scene": null
},
{
"name": "pages/xiangmushipin/xiangmushipin",
"pathName": "pages/xiangmushipin/xiangmushipin",
"query": "",
"scene": null
},
{
"name": "pages/xiangmushipin/xiangmushipin",
"pathName": "pages/xiangmushipin/xiangmushipin",
"query": "projectId=9&projectName=路桥龙锦花园东区",
"scene": null
},
{
"name": "pages/renyuanguanli/renyuanguanli",
"pathName": "pages/renyuanguanli/renyuanguanli",
"query": "projectId=9&projectName=路桥龙锦花园东区",
"scene": null
},
{
"name": "pages/renyuanguanli/renyuanguanli",
"pathName": "pages/renyuanguanli/renyuanguanli",
"query": "",
"scene": null
},
{
"name": "pages/ranyuanguanli-map/map",
"pathName": "pages/ranyuanguanli-map/map",
"query": "",
"scene": null
},
{
"name": "pages/renyuanguanli/renyuanguanli",
"pathName": "pages/renyuanguanli/renyuanguanli",
"query": "projectId=616",
"scene": null
},
{
"name": "pages/shebieguanli-shajiangguan/shajiangguan",
"pathName": "pages/shebieguanli-jxsb/shajiangguan",
"query": "",
"scene": null
},
{
"name": "pages/shebeiguanli-map/jixiedingwei",
"pathName": "pages/shebeiguanli-map/jixiedingwei",
"query": "",
"scene": null
},
{
"name": "pages/shebieguanli-tzsb/taji",
"pathName": "pages/shebieguanli-tzsb/taji",
"query": "",
"scene": null
},
{
"name": "pages/jinduguanli/jinduguanli",
"pathName": "pages/jinduguanli/jinduguanli",
"query": "",
"scene": null
},
{
"name": "pages/xiangmuyujing/xiangmuyujing",
"pathName": "pages/xiangmuyujing/xiangmuyujing",
"query": "projectId=616",
"scene": null
},
{
"name": "pages/anquanguankong/anquanguankong",
"pathName": "pages/anquanguankong/anquanguankong",
"query": "",
"scene": null
},
{
"name": "pages/nenghaoguanli/nenghaoguanli",
"pathName": "pages/nenghaoguanli/nenghaoguanli",
"query": "",
"scene": null
},
{
"name": "pages/wuliaoguanli/wuliaoguanli",
"pathName": "pages/wuliaoguanli/wuliaoguanli",
"query": "",
"scene": null
},
{
"name": "pages/jinduguanli/jinduguanli",
"pathName": "pages/jinduguanli/jinduguanli",
"query": "projectId=621",
"scene": null
},
{
"name": "pages/lw-jibenxinxi/lw-jibenxinxi",
"pathName": "pages/lw-jibenxinxi/lw-jibenxinxi",
"query": "",
"scene": null
},
{
"name": "pages/lw-gerenxinxi/lw-gerenxinxi",
"pathName": "pages/lw-gerenxinxi/lw-gerenxinxi",
"query": "register=1",
"scene": null
}
]
}
} }
} }