From a374ecea1c22a7d1e79eac799556b6e119a033a3 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Tue, 14 Apr 2020 11:41:46 +0800 Subject: [PATCH] xiaochengxurenwu --- app.js | 4 +- pages/checkjob/detail.js | 28 ++++++- pages/checkjob/detail.wxml | 32 +++++++- pages/checkjob/index.js | 4 +- pages/checkjob/job.js | 158 ++++++++++++++++++++++++++++++++++-- pages/checkjob/job.wxml | 49 ++++++++++- pages/checkjob/yanshou.js | 27 +++++- pages/checkjob/yanshou.wxml | 33 ++++++-- pages/inspect/add.js | 2 +- pages/trouble/addtrouble.js | 1 + 10 files changed, 305 insertions(+), 33 deletions(-) diff --git a/app.js b/app.js index cfbf7c9..c05cb5f 100644 --- a/app.js +++ b/app.js @@ -97,8 +97,8 @@ App({ perms:[], openid:null }, - serverUrl: 'https://safeyun.ctcshe.com/', - // serverUrl: 'http://127.0.0.1:8000/', + // serverUrl: 'https://safeyun.ctcshe.com/', + serverUrl: 'http://127.0.0.1:8000/', //serverUrl: 'http://10.21.28.148:8000/', //serverUrl: 'http://192.168.0.103:8000/', //serverUrl:'http://10.0.11.195:8000/', diff --git a/pages/checkjob/detail.js b/pages/checkjob/detail.js index 78dc6f5..0ff4bf6 100644 --- a/pages/checkjob/detail.js +++ b/pages/checkjob/detail.js @@ -88,12 +88,34 @@ Page({ wx.hideLoading(); console.log(res.data); if (res.statusCode === 200) { - var data = res.data - //格式化观察信息 + var yhdata = res.data + //格式化隐患信息 + for (var i = 0; i < yhdata.yhtp.length; i++) { + yhdata.yhtp[i] = this.data.serverUrl + yhdata.yhtp[i]; + } + for (var i = 0; i < yhdata.zghtp.length; i++) { + yhdata.zghtp[i] = this.data.serverUrl + yhdata.zghtp[i]; + } - this.setData(data) + this.setData(yhdata) } } }); }, + yhtpPreview: function (e) { + var current = e.target.dataset.src + + wx.previewImage({ + current: current, + urls: this.data.yhtp + }) + }, + zghtpPreview: function (e) { + var current = e.target.dataset.src + + wx.previewImage({ + current: current, + urls: this.data.zghtp + }) + } }) \ No newline at end of file diff --git a/pages/checkjob/detail.wxml b/pages/checkjob/detail.wxml index d71a0c9..8fefe37 100644 --- a/pages/checkjob/detail.wxml +++ b/pages/checkjob/detail.wxml @@ -13,7 +13,7 @@ 检查人 - {{checkname__username}} + {{checkname__name}} @@ -34,12 +34,25 @@ - 检查发现问题 + 检查问题 {{checkquestion}} + + + 问题图片 + + + + + + + + + + 整改情况 @@ -48,7 +61,18 @@ {{zgjg}} - + + + 整改图片 + + + + + + + + + 检查状态 @@ -67,7 +91,7 @@ - 处理意见 + 经验教训 {{content}} diff --git a/pages/checkjob/index.js b/pages/checkjob/index.js index 422b9c9..afa7c23 100644 --- a/pages/checkjob/index.js +++ b/pages/checkjob/index.js @@ -10,7 +10,7 @@ Page({ serverUrl: getApp().globalData.serverUrl, alllist: [], tabs: ["我的任务", "全部任务", "验收任务"], - activeIndex: 1, + activeIndex: 0, sliderOffset: 0, sliderLeft: 0 }, @@ -235,7 +235,7 @@ Page({ title: '加载中', }), wx.request({ - url: this.data.serverUrl + 'api/checkproject?a=listallx&rows=10&page=' + page, + url: this.data.serverUrl + 'api/checkproject?a=wxlistall&rows=10&page=' + page, header: { 'content-type': 'application/json', // 默认值 'Cookie': getApp().globalData.sessionId, diff --git a/pages/checkjob/job.js b/pages/checkjob/job.js index cde17d5..9bf0124 100644 --- a/pages/checkjob/job.js +++ b/pages/checkjob/job.js @@ -1,5 +1,4 @@ var util = require('../../utils/util.js') -// pages/observe/observedetail.js Page({ /** @@ -13,7 +12,11 @@ Page({ { name: '1', value: '正在整改中'}, { name: '2', value: '已整改完成' }, - ] + ], + cjryname:"", + cjry:"", + yhtp1: [], + zghtp1: [], }, bindjcwtInput: function (e) { this.data.jcwt = e.detail.value @@ -27,7 +30,140 @@ Page({ radioChange: function (e) { this.data.jczt = e.detail.value }, - + deleteImage: function (e) { + var that = this; + var yhtp1 = that.data.yhtp1; + var index = e.currentTarget.dataset.index; //获取当前长按图片下标 + wx.showModal({ + title: '系统提醒', + content: '确定要删除此图片吗？', + success: function (res) { + if (res.confirm) { + yhtp1.splice(index, 1); + } else if (res.cancel) { + return false; + } + that.setData({ + yhtp1: yhtp1 + }); + } + }) + }, + chooseImage: function () { + var that = this + wx.chooseImage({ + count: 9, + sizeType: ['original', 'compressed'], + sourceType: ['album', 'camera'], + success: function (res) { + console.log(that.data.yhtp1.concat(res.tempFilePaths)) + that.setData({ + yhtp1: that.data.yhtp1.concat(res.tempFilePaths) + }) + + } + }) + }, + previewImage: function (e) { + var current = e.target.dataset.src + wx.previewImage({ + current: current, + urls: this.data.yhtp1 + }) + }, + //上传图片 + upimg:function(x,y){ + var that=this + if(x - 检查发现问题 + 检查问题 @@ -54,6 +54,27 @@ + 问题图片 + + + + + + + + + + + + + + + + + + + + 整改情况 @@ -62,7 +83,27 @@ - + 整改图片 + + + + + + + + + + + + + + + + + + + + @@ -79,7 +120,7 @@ - 处罚内容 + 经验教训 @@ -89,7 +130,7 @@ - 被处罚人 + 涉及人员 diff --git a/pages/checkjob/yanshou.js b/pages/checkjob/yanshou.js index cf183e8..3187785 100644 --- a/pages/checkjob/yanshou.js +++ b/pages/checkjob/yanshou.js @@ -110,10 +110,16 @@ Page({ wx.hideLoading(); console.log(res.data); if (res.statusCode === 200) { - var data = res.data - //格式化观察信息 + var yhdata = res.data + //格式化隐患信息 + for (var i = 0; i < yhdata.yhtp.length; i++) { + yhdata.yhtp[i] = this.data.serverUrl + yhdata.yhtp[i]; + } + for (var i = 0; i < yhdata.zghtp.length; i++) { + yhdata.zghtp[i] = this.data.serverUrl + yhdata.zghtp[i]; + } - this.setData(data) + this.setData(yhdata) } } }); @@ -121,5 +127,20 @@ Page({ }, + yhtpPreview: function (e) { + var current = e.target.dataset.src + wx.previewImage({ + current: current, + urls: this.data.yhtp + }) + }, + zghtpPreview: function (e) { + var current = e.target.dataset.src + + wx.previewImage({ + current: current, + urls: this.data.zghtp + }) + } }) \ No newline at end of file diff --git a/pages/checkjob/yanshou.wxml b/pages/checkjob/yanshou.wxml index 96fd1f6..9076f0a 100644 --- a/pages/checkjob/yanshou.wxml +++ b/pages/checkjob/yanshou.wxml @@ -17,7 +17,7 @@ 检查人 - {{checkname__username}} + {{checkname__name}} @@ -38,11 +38,23 @@ - 检查发现问题 + 检查问题 {{checkquestion}} + + + + 问题图片 + + + + + + + + @@ -52,7 +64,18 @@ {{zgjg}} - + + + 整改图片 + + + + + + + + + 检查状态 @@ -71,7 +94,7 @@ - 处罚内容 + 经验教训 {{content}} @@ -79,7 +102,7 @@ - 被处罚人员 + 涉及人员 {{bcfr==[]?'kkl':bcfr}} diff --git a/pages/inspect/add.js b/pages/inspect/add.js index 695c7cd..c531657 100644 --- a/pages/inspect/add.js +++ b/pages/inspect/add.js @@ -47,7 +47,7 @@ Page({ this.setData({ itemscheck:res.items }) - console.log(itemscheck) + } wx.hideLoading(); } diff --git a/pages/trouble/addtrouble.js b/pages/trouble/addtrouble.js index a42a023..66c5fb7 100644 --- a/pages/trouble/addtrouble.js +++ b/pages/trouble/addtrouble.js @@ -86,6 +86,7 @@ Page({ sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], success: function (res) { + console.log() that.setData({ yhtp: that.data.yhtp.concat(res.tempFilePaths) })