diff --git a/miniprogram/app.js b/miniprogram/app.js
index 3802ede..76c30c8 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -30,10 +30,10 @@ App({
// reqUrl:"http://wxw.ngrok.makalu.cc",
//reqUrl:'https://jaapplets.makalu.cc',
//reqUrl:'https://sxyanzhu.com/jhwxapp',
- reqUrl:'https://cf.makalu.cc',
- //reqUrl:'http://127.0.0.1:8091',
- uploadUrl:"https://cf.makalu.cc/wechat",
- //uploadUrl:'http://127.0.0.1:8091/wechat',
+ //reqUrl:'https://cf.makalu.cc',
+ reqUrl:'http://127.0.0.1:8091',
+ //uploadUrl:"https://cf.makalu.cc/wechat",
+ uploadUrl:'http://127.0.0.1:8091/wechat',
//御景路数字化集成管控平台接口访问域名
szhUrl:'https://szh.makalu.cc',
diff --git a/miniprogram/app.json b/miniprogram/app.json
index 66cbff5..71e8fab 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -111,7 +111,10 @@
"project_insurance/info/index",
"project_insurance/list/index",
"project_deptWorks/add/index",
- "project_deptWorks/list/index"
+ "project_deptWorks/list/index",
+ "project_standard/list/index",
+ "project_standard/add/index",
+ "project_standard/info/index"
],
"independent": false
}
diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.wxml b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
index f99851a..26a7047 100644
--- a/miniprogram/pageage/project_problemmodify/security/add/index.wxml
+++ b/miniprogram/pageage/project_problemmodify/security/add/index.wxml
@@ -19,7 +19,7 @@
隐患图片
-
+
diff --git a/miniprogram/pageage/project_standard/add/index.js b/miniprogram/pageage/project_standard/add/index.js
new file mode 100644
index 0000000..8e06faf
--- /dev/null
+++ b/miniprogram/pageage/project_standard/add/index.js
@@ -0,0 +1,267 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ deptId:"",
+ projectId:"",
+ projectName:"",
+ loginName:"",
+ imageInfoData:[],
+ loadShow:false,
+ standardType:"1",
+ standardTypeList:[],
+ info:"",
+ standardDesc:""
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ 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.getStandardTypeList();
+ }
+ })
+ },
+
+ getStandardTypeList(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectStandard/queryStandardType',
+ method:"get",
+ data:{},
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let list=[];
+ res.data.forEach(it =>{
+ list.push({"id":it.dictValue,"text":it.dictLabel,"info":it.remark});
+ })
+ that.setData({
+ standardTypeList:list,
+ standardType:res.data[0].dictValue,
+ info:res.data[0].remark
+ })
+ }
+ }
+ })
+ },
+
+ //图片描述
+ onInputStandardDesc(e){
+ let standardDesc = e.detail.value
+ this.setData({
+ standardDesc
+ })
+ },
+
+ // list 上传图片
+ onImagesArr(e){
+ var data = this.data.imageInfoData
+ data = e.detail
+ this.setData({
+ imageInfoData:data
+ })
+ },
+
+ //取消页面
+ cancelSaveView(){
+ this.returnToPage()
+ },
+
+ //保存
+ onSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {projectId,loginName, deptId,standardType,standardDesc,imageInfoData} = that.data;
+ //数据效验
+ if(projectId==""||loginName==""||deptId==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(imageInfoData.length==0){
+ app.toast("请上传标准图片!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(standardType==""){
+ app.toast("请选择标准类型!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(standardDesc==""){
+ app.toast("请填写图片描述!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ let fileUrls = [];
+ imageInfoData.forEach(async (item)=>{
+ let uploadUrl = app.globalData.uploadUrl+'/common/upload'
+ let name = "file"
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ let obj = await that.syncUploadImage(uploadUrl,item,name);
+ fileUrls.push(obj.data.fileName);
+ //验证图片上传完毕
+ if(fileUrls.length == imageInfoData.length){
+ let params = {
+ projectId,
+ deptId,
+ imageFile:fileUrls.toString(),
+ standardType,
+ standardDesc,
+ ord:1,
+ createBy:loginName
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectStandard/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) {
+ return new Promise((resolve, reject) => {
+ wx.uploadFile({
+ url, // 上传的服务器接口地址
+ filePath: uploadFile,
+ header: {
+ "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+ },
+ name, //上传的所需字段，后端提供
+ formData: { user: 'test' },
+ success: (res) => {
+ // 上传完成操作
+ const data = JSON.parse(res.data)
+ resolve({
+ data: data
+ })
+ },
+ fail: (err) => {
+ //上传失败：修改pedding为reject
+ console.log("访问接口失败", err);
+ wx.showToast({
+ title: "网络出错,上传失败",
+ icon: 'none',
+ duration: 1000
+ });
+ reject(err)
+ }
+ });
+ })
+ },
+
+ //选择测量类型
+ onSelectStandardType(e){
+ this.setData({
+ standardType:e.detail.id,
+ info:e.detail.info
+ })
+ },
+
+ 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_standard/add/index.json b/miniprogram/pageage/project_standard/add/index.json
new file mode 100644
index 0000000..aeb0384
--- /dev/null
+++ b/miniprogram/pageage/project_standard/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_standard/add/index.wxml b/miniprogram/pageage/project_standard/add/index.wxml
new file mode 100644
index 0000000..8373cc4
--- /dev/null
+++ b/miniprogram/pageage/project_standard/add/index.wxml
@@ -0,0 +1,101 @@
+
+
+
+
+
+ {{projectName}}
+
+
+ 标准类型
+
+
+
+
+ {{info}}
+
+
+
+ 标准图片
+
+
+
+
+
+ 图片描述
+
+
+
+
+
+
+ 取消
+ 提交
+
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_standard/add/index.wxss b/miniprogram/pageage/project_standard/add/index.wxss
new file mode 100644
index 0000000..38bd48d
--- /dev/null
+++ b/miniprogram/pageage/project_standard/add/index.wxss
@@ -0,0 +1,7 @@
+/* pageage/safetyManagement/addSafetyInspect/index.wxss */
+.van-popup{
+ background: none !important;
+}
+.van-image__img{
+ border-radius: 10rpx !important;
+}
diff --git a/miniprogram/pageage/project_standard/info/index.js b/miniprogram/pageage/project_standard/info/index.js
new file mode 100644
index 0000000..a3683da
--- /dev/null
+++ b/miniprogram/pageage/project_standard/info/index.js
@@ -0,0 +1,182 @@
+// pageage/project_checking/info/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id:"",
+ infoData:{},
+ loadShow:false,
+ loginName:"",
+ projectName:"",
+ showDel:false,
+ imageList:[],
+ minImageList:[],
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ loginName:res.data.loginName,
+ projectName:app.globalData.projectName
+ })
+ this.getInfo();
+ }
+ })
+ },
+
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo(){
+ let {id} = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectStandard/info',
+ method:"get",
+ data:{
+ id:id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let urls = [];
+ let minUrls = [];
+ if(res.data.imageFile){
+ res.data.imageFile.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
+ that.setData({
+ infoData:res.data,
+ imageList:urls,
+ minImageList:minUrls,
+ loadShow:false
+ })
+ //判断当前能否删除
+ if(res.data.createBy!=that.data.loginName){
+ that.setData({
+ showDel:true
+ })
+ }
+ }
+ }
+ })
+ },
+
+ onDelete(){
+ //弹出确认
+ let that = this
+ wx.showModal({
+ title: '提示',
+ content: '是否确定删除此条数据？',
+ success: function (sm) {
+ if (sm.confirm) {
+ // 用户点击了确定 可以调用了
+ that.deleteData();
+ } else if (sm.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ })
+ },
+ deleteData(){
+ let {id} = this.data
+ let that = this;
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectStandard/remove',
+ header: {
+ "Username": that.data.loginName,
+ },
+ data:{
+ id:id
+ },
+ method:"get",
+ success(res){
+ app.toast("删除成功！")
+ wx.redirectTo({
+ url: `../list/index`,
+ })
+ }
+ })
+ },
+
+ //展示图片
+ showImg:function(e){
+ var that=this;
+ wx.previewImage({
+ urls: that.data.imageList,
+ current: that.data.imageList[e.currentTarget.dataset.index]
+ })
+ },
+
+ 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_standard/info/index.json b/miniprogram/pageage/project_standard/info/index.json
new file mode 100644
index 0000000..1f022fa
--- /dev/null
+++ b/miniprogram/pageage/project_standard/info/index.json
@@ -0,0 +1,7 @@
+{
+ "usingComponents": {
+ "van-collapse": "@vant/weapp/collapse",
+ "van-collapse-item": "@vant/weapp/collapse-item"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_standard/info/index.wxml b/miniprogram/pageage/project_standard/info/index.wxml
new file mode 100644
index 0000000..fed686c
--- /dev/null
+++ b/miniprogram/pageage/project_standard/info/index.wxml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+ {{projectName}}
+
+
+
+
+ 标准类型
+ {{infoData.standardTypeName}}
+
+
+ {{infoData.standardTypeRemark}}
+
+
+ 标准图片
+
+
+
+
+
+
+
+
+
+ 图片描述
+ {{infoData.standardDesc}}
+
+
+
+
+ 提交单位
+ {{infoData.deptName}}
+
+
+
+
+ 提交用户
+ {{infoData.createBy}}
+
+
+
+
+ 提交时间
+ {{infoData.createTime}}
+
+
+
+
+
+
+ 删除
+ 返回
+
+
+
diff --git a/miniprogram/pageage/project_standard/info/index.wxss b/miniprogram/pageage/project_standard/info/index.wxss
new file mode 100644
index 0000000..029322f
--- /dev/null
+++ b/miniprogram/pageage/project_standard/info/index.wxss
@@ -0,0 +1,70 @@
+/* pageage/project_checking/info/index.wxss */
+.in-img-max:after{
+ display:block;
+ clear:both;
+ content:"";
+ visibility:hidden;
+ height:0
+ }
+ .in-img-max{
+ width: auto;
+ zoom:1
+ }
+ .in-img-div{
+ position: relative;
+ margin: 0 8px 8px 0;
+ float: left;
+ }
+ .in-img-div image{
+ width: 180rpx;
+ height: 180rpx;
+ border-radius: 15rpx;
+ position: relative;
+ }
+ .van-collapse.van-hairline--top-bottom:after{
+ border-width: 0px 0;
+ }
+ .van-cell.van-cell--borderless{
+ background-color: #2b345b;
+ color: #fff;
+ margin-top: 30rpx;
+ border-radius: 5rpx;
+ }
+ .van-cell.van-cell--borderless:active{
+ background-color: #2b345b;
+ }
+ .van-collapse-item__title.van-collapse-item__title--expanded:active{
+ background-color: #2b345b;
+ }
+ .van-collapse-item .van-cell:after{
+ border-bottom: 0;
+ }
+ .van-collapse-item.van-hairline--top:after{
+ border-top-width:0
+ }
+ .van-cell.van-cell--clickable{
+ background-color: #2b345b;
+ margin-top: 30rpx;
+ color: #fff;
+ border-radius: 15rpx;
+
+ }
+ .van-cell.van-cell--clickable:active{
+ background-color: #2b345b;
+ }
+ .van-collapse-item__wrapper .van-collapse-item__content{
+ background-color: #1e2336;
+ color:#8ca4ec ;
+ border-width: 0px 0;
+ }
+ .gk_open_con view{
+ padding: 10rpx 0;
+ width: 100%;
+ }
+ .gk_open_con image{
+ width: 30rpx;
+ height: 30rpx;
+ margin-right: 5rpx;
+ position: relative;
+ top: 5rpx;
+ }
\ No newline at end of file
diff --git a/miniprogram/pageage/project_standard/list/index.js b/miniprogram/pageage/project_standard/list/index.js
new file mode 100644
index 0000000..231ee47
--- /dev/null
+++ b/miniprogram/pageage/project_standard/list/index.js
@@ -0,0 +1,143 @@
+// pageage/safetyManagement/securityCheckGR/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ deptId:"",
+ loginName:"",
+ projectId:"",
+ minRoleId:"",
+ projectData:{},
+ initData: {},
+ show:false,
+ listData:[],
+ request:app.globalData.reqUrl
+ },
+
+ skipAdd(){
+ wx.redirectTo({
+ url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text,
+ })
+ },
+
+ getInfo(e){
+ let {id} = e.currentTarget.dataset.set
+ 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,
+ 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;
+ }
+ let param = {
+ "projectId": projectId,
+ "deptId":deptId,
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectStandard/list',
+ data:param,
+ method: "get",
+ success: function (res) {
+ that.setData({
+ listData:res.data.data
+ })
+ }
+ });
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../../../pages/gengduogongneng/gengduogongneng',
+ })
+ },
+
+ //项目切换 返回值
+ onProjectSelect(e){
+ let projectId = e.detail.id;
+ let projectName = e.detail.text;
+ app.globalData.projectId = projectId;
+ app.globalData.projectName = projectName;
+ this.onLoad();
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_standard/list/index.json b/miniprogram/pageage/project_standard/list/index.json
new file mode 100644
index 0000000..c38e268
--- /dev/null
+++ b/miniprogram/pageage/project_standard/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_standard/list/index.wxml b/miniprogram/pageage/project_standard/list/index.wxml
new file mode 100644
index 0000000..ebf1ca5
--- /dev/null
+++ b/miniprogram/pageage/project_standard/list/index.wxml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ {{item.standardTypeName}}
+
+
+
+
+
+
+
+
+ {{item.standardDesc}}
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_standard/list/index.wxss b/miniprogram/pageage/project_standard/list/index.wxss
new file mode 100644
index 0000000..f370194
--- /dev/null
+++ b/miniprogram/pageage/project_standard/list/index.wxss
@@ -0,0 +1 @@
+/* pageage/project_checking_list/project_checking_list.wxss */