diff --git a/miniprogram/app.json b/miniprogram/app.json
index e927e71..fbc694c 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -106,7 +106,9 @@
"project_checkDetection/check/index",
"project_insurance/add/index",
"project_insurance/info/index",
- "project_insurance/list/index"
+ "project_insurance/list/index",
+ "project_deptWorks/add/index",
+ "project_deptWorks/list/index"
],
"independent": false
}
diff --git a/miniprogram/pageage/project_deptWorks/add/index.js b/miniprogram/pageage/project_deptWorks/add/index.js
new file mode 100644
index 0000000..ced8ba5
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/add/index.js
@@ -0,0 +1,219 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ deptId:"",
+ projectId:"",
+ projectName:"",
+ loginName:"",
+ servicePersonnel:0,
+ supervisorPersonnel:0,
+ contractorPersonnel:0
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {projectId,projectName} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ projectId,
+ projectName,
+ deptId:res.data.deptId,
+ loginName:res.data.loginName
+ })
+ this.getLastData();
+ }
+ })
+ },
+
+ //获取数据
+ getLastData(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectDeptWroks/list',
+ method:"get",
+ data:{
+ projectId:this.data.projectId,
+ deptId:this.data.deptId
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ if(res.data){
+ this.setData({
+ servicePersonnel:res.data[0].servicePersonnel,
+ supervisorPersonnel:res.data[0].servicePersonnel,
+ contractorPersonnel:res.data[0].contractorPersonnel
+ });
+ }
+ }
+ }
+ })
+ },
+
+ //取消页面
+ cancelSaveView(){
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },
+
+ //保存
+ onSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {projectId,deptId,loginName,servicePersonnel,
+ supervisorPersonnel,
+ contractorPersonnel} = that.data;
+ //数据效验
+ if(projectId==""||loginName==""||deptId==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(servicePersonnel==""){
+ app.toast("请填写劳务人员数!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(supervisorPersonnel==""){
+ app.toast("请填写监理人员数!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(contractorPersonnel==""){
+ app.toast("请填写总包人员数!")
+ that.setData({
+ loadShow:false
+ });
+ return;
+ }
+ let params = {
+ projectId,
+ deptId,
+ servicePersonnel,
+ supervisorPersonnel,
+ contractorPersonnel,
+ createBy:loginName
+ }
+ wx.request({
+ url: app.globalData.reqUrl + "/wechat/projectDeptWroks/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){
+ if(res.data==-1){
+ app.toast("办理失败，当前单位已办理此类保险!")
+ }else{
+ app.toast("添加成功!")
+ setTimeout(()=>{
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },200)
+ }
+ }
+ }
+ })
+ },
+
+ servicePersonnelAction: function (options) {
+ let value = options.detail.value;
+ value = value.replace(/[^0-9]/g, ''); // 正则表达式替换非数字为空
+ this.data.servicePersonnel = value;
+ },
+
+ supervisorPersonnelAction: function (options) {
+ let value = options.detail.value;
+ value = value.replace(/[^0-9]/g, ''); // 正则表达式替换非数字为空
+ this.data.supervisorPersonnel = value;
+ },
+
+ contractorPersonnelAction: function (options) {
+ let value = options.detail.value;
+ value = value.replace(/[^0-9]/g, ''); // 正则表达式替换非数字为空
+ this.data.contractorPersonnel = value;
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_deptWorks/add/index.json b/miniprogram/pageage/project_deptWorks/add/index.json
new file mode 100644
index 0000000..aeb0384
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/add/index.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_deptWorks/add/index.wxml b/miniprogram/pageage/project_deptWorks/add/index.wxml
new file mode 100644
index 0000000..7af1f5a
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/add/index.wxml
@@ -0,0 +1,96 @@
+
+
+
+
+
+ {{projectName}}
+
+
+ 劳务人员
+
+
+
+
+
+ 监理人员
+
+
+
+
+
+ 总包人员
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_deptWorks/add/index.wxss b/miniprogram/pageage/project_deptWorks/add/index.wxss
new file mode 100644
index 0000000..6a3c08a
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/add/index.wxss
@@ -0,0 +1,36 @@
+/* pageage/safetyManagement/addSafetyInspect/index.wxss */
+.van-popup{
+ background: none !important;
+}
+.van-image__img{
+ border-radius: 10rpx !important;
+}
+.radio_custom_class{
+ padding: 10rpx 100rpx 10rpx 0;
+}
+.radio_label_class{
+ color: #ffffff !important;
+}
+.max_tab_name{
+ padding: 0 40rpx;
+ font-size:30rpx;
+ height: 460rpx;
+ overflow: auto;
+ margin-top: 20rpx;
+ text-align: center;
+ }
+ .van-popup.van-popup--bottom{
+ background: #232a44;
+ }
+ .van-popup {
+ background-color: var(--popup-background-color,#232a44) !important;
+ }
+ .font_color{
+ padding: 15rpx 0;
+ color: #157dd2;
+ }
+ .active{
+ font-size:30rpx;
+ font-weight: 600;
+ color: #14feff
+ }
diff --git a/miniprogram/pageage/project_deptWorks/list/index.js b/miniprogram/pageage/project_deptWorks/list/index.js
new file mode 100644
index 0000000..322f76c
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/list/index.js
@@ -0,0 +1,161 @@
+// pageage/safetyManagement/securityCheckGR/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ deptId:"",
+ loginName:"",
+ userName:"",
+ projectId:"",
+ projectData:{},
+ projectNameArgs:"",
+ initData: {},
+ show:false,
+ listData:[],
+ request:app.globalData.reqUrl
+ },
+
+ onClose(){
+ this.setData({ show: false });
+ },
+ showPopup() {
+ this.setData({ show: true });
+ },
+
+ skipAdd(){
+ wx.redirectTo({
+ url: `../add/index?projectId=${this.data.initData.id}&projectName=${this.data.initData.text}`,
+ })
+ },
+
+ getInfo(e){
+ let {id} = e.currentTarget.dataset.set;
+ if(!id){
+ app.toast("当前合同未办理，不能查看详情!");
+ return;
+ }
+ 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,
+ userName:res.data.userName,
+ projectId:app.globalData.projectId,
+ projectNameArgs:app.globalData.projectName,
+ minRoleId:res.data.minRoleId,
+ initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+ })
+ this.getListData(app.globalData.projectId,res.data.deptId,res.data.minRoleId);
+ }
+ })
+ },
+
+ /**
+ * 查询项目特种人员数据
+ */
+ getListData(projectId,deptId,minRoleId) {
+ var that = this;
+ //判断角色，
+ if(minRoleId==2||minRoleId==3||minRoleId==4){
+ deptId=0;
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectDeptWroks/list',
+ data: {
+ "deptId":deptId,
+ "projectId": projectId
+ },
+ method: "get",
+ success: function (res) {
+ that.setData({
+ listData:res.data.data
+ })
+ }
+ })
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ if(wx.getStorageSync('nav-menu')=="gd"){
+ wx.redirectTo({
+ url: '../../../pages/gengduogongneng/gengduogongneng',
+ })
+ }else{
+ wx.redirectTo({
+ url: '../../../pages/safety_manage/index',
+ })
+ }
+ },
+
+ //项目切换 返回值
+ onProjectSelect(e){
+ let projectId = e.detail.id;
+ let projectName = e.detail.text;
+ app.globalData.projectId = projectId;
+ app.globalData.projectName = projectName;
+ this.onLoad();
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_deptWorks/list/index.json b/miniprogram/pageage/project_deptWorks/list/index.json
new file mode 100644
index 0000000..c38e268
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/list/index.json
@@ -0,0 +1,7 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index" ,
+ "van-popup": "@vant/weapp/popup/index"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_deptWorks/list/index.wxml b/miniprogram/pageage/project_deptWorks/list/index.wxml
new file mode 100644
index 0000000..eb621ce
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/list/index.wxml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ {{item.deptName}}
+
+
+
+
+
+ 劳务人员：{{item.servicePersonnel}}
+
+ 监理人员：{{item.supervisorPersonnel}}
+
+ 总包人员：{{item.contractorPersonnel}}
+
+ 提交用户：{{item.createBy}}
+ 提交时间：{{item.createTime}}
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+ 变更
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_deptWorks/list/index.wxss b/miniprogram/pageage/project_deptWorks/list/index.wxss
new file mode 100644
index 0000000..f370194
--- /dev/null
+++ b/miniprogram/pageage/project_deptWorks/list/index.wxss
@@ -0,0 +1 @@
+/* pageage/project_checking_list/project_checking_list.wxss */
diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/gengduogongneng.js
index 24720e6..38c5abf 100644
--- a/miniprogram/pages/gengduogongneng/gengduogongneng.js
+++ b/miniprogram/pages/gengduogongneng/gengduogongneng.js
@@ -200,6 +200,7 @@ Page({
},
//修改密码
XGMM:function(){
+ wx.setStorageSync('nav-menu', "gd");
wx.redirectTo({
url: '../updatePassword/updatePassword'
})
diff --git a/miniprogram/pages/safety_manage/index.js b/miniprogram/pages/safety_manage/index.js
index 869e5a8..e2bd867 100644
--- a/miniprogram/pages/safety_manage/index.js
+++ b/miniprogram/pages/safety_manage/index.js
@@ -310,13 +310,13 @@ Page({
if(it.problemType=="1"){
this.setData({
"securityCheck.routineRectificationRate": (it.comTotal / it.total * 100).toFixed(2),
- "securityCheck.routineProblemTotal": it.total,
+ "securityCheck.routineProblemTotal": it.comTotal,
"securityCheck.routineCheckNumber": it.total
})
}else{
this.setData({
"securityCheck.specialRectificationRate": (it.comTotal / it.total * 100).toFixed(2),
- "securityCheck.specialProblemTotal": it.total,
+ "securityCheck.specialProblemTotal": it.comTotal,
"securityCheck.specialCheckNumber": it.total,
})
}
@@ -326,18 +326,48 @@ Page({
})
},
- goHighLightPage() {
+ goZXPX() {
+ wx.setStorageSync('nav-menu', "aq");
wx.navigateTo({
- url: '../../Highlight-photos/index',
+ url: '../../pageage/project_train/list/index?trainType=0',
})
},
/**
- * 教育培训页面
+ * 安全隐患页面
*/
- goEducations() {
+ goAQYH() {
+ wx.setStorageSync('nav-menu', "aq");
+ wx.redirectTo({
+ url: '../../pageage/project_problemmodify/security/list/index',
+ })
+ },
+
+ goTZRY() {
+ wx.setStorageSync('nav-menu', "aq");
+ wx.redirectTo({
+ url: '../../pageage/project_special/list/index',
+ })
+ },
+
+ goXMBX() {
+ wx.setStorageSync('nav-menu', "aq");
+ wx.redirectTo({
+ url: '../../pageage/project_insurance/list/index',
+ })
+ },
+
+ goZGRY() {
+ wx.setStorageSync('nav-menu', "aq");
+ wx.redirectTo({
+ url: '../../pageage/project_deptWorks/list/index',
+ })
+ },
+
+ goYJYL() {
+ wx.setStorageSync('nav-menu', "aq");
wx.navigateTo({
- url: '../../../pageage/educations-list/index?jumpState=1',
+ url: '../../pageage/project_train/list/index?trainType=1',
})
},
@@ -391,6 +421,7 @@ Page({
},
//修改密码
XGMM:function(){
+ wx.setStorageSync('nav-menu', "aq");
wx.redirectTo({
url: '../updatePassword/updatePassword'
})
diff --git a/miniprogram/pages/safety_manage/index.wxml b/miniprogram/pages/safety_manage/index.wxml
index 61ab7d3..c05b977 100644
--- a/miniprogram/pages/safety_manage/index.wxml
+++ b/miniprogram/pages/safety_manage/index.wxml
@@ -68,12 +68,12 @@
专项培训（{{trainTotal}}）
- 查看详情
+ 查看详情
-
+
@@ -94,26 +94,26 @@
安全检查
- 查看详情
+ 查看详情
- 常规检查次数
+ 常规检查问题数
-
+
整改率
{{securityCheck.routineRectificationRate}} %
- 检查问题数
+ 已整改问题数
{{securityCheck.routineProblemTotal}}
- 专项检查次数
+ 专项检查问题数
整改率
@@ -121,7 +121,7 @@
- 检查问题数
+ 已整改问题数
{{securityCheck.specialProblemTotal}}
@@ -134,7 +134,7 @@
特种作业人员
- 查看详情
+ 查看详情
@@ -143,7 +143,7 @@
项目保险
- 查看详情
+ 查看详情
@@ -153,7 +153,7 @@
在岗人员
- 查看详情
+ 查看详情
@@ -163,12 +163,12 @@
应急演练（{{emergencyDrillTotal}}）
- 查看详情
+ 查看详情
-
+
diff --git a/miniprogram/pages/updatePassword/updatePassword.js b/miniprogram/pages/updatePassword/updatePassword.js
index 685bb19..f613928 100644
--- a/miniprogram/pages/updatePassword/updatePassword.js
+++ b/miniprogram/pages/updatePassword/updatePassword.js
@@ -134,9 +134,20 @@ Page({
//返回到项目概况页面
goGCLB:function(){
- wx.redirectTo({
- url: '../xiangmugaikuang/xiangmugaikuang'
- })
+ let nav = wx.getStorageSync('nav-menu');
+ if(nav=="xm"){
+ wx.redirectTo({
+ url: '../xiangmugaikuang/xiangmugaikuang'
+ })
+ }else if(nav=="gd"){
+ wx.redirectTo({
+ url: '../gengduogongneng/gengduogongneng'
+ })
+ }else if(nav=="aq"){
+ wx.redirectTo({
+ url: '../safety_manage/index'
+ })
+ }
},
//修改密码
QRXG:function(){
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
index 3091068..a4c7ef5 100644
--- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
@@ -653,6 +653,7 @@ Page({
//修改密码
XGMM:function(){
+ wx.setStorageSync('nav-menu', "gd");
wx.redirectTo({
url: '../updatePassword/updatePassword'
})