This commit is contained in:
shilixia 2020-04-16 14:40:10 +08:00
parent f535c9c0e5
commit d69c974eac
4 changed files with 77 additions and 66 deletions

4
app.js
View File

@ -97,8 +97,8 @@ App({
perms:[], perms:[],
openid:null openid:null
}, },
serverUrl: 'https://safeyun.ctcshe.com/', //serverUrl: 'https://safeyun.ctcshe.com/',
// serverUrl: 'http://127.0.0.1:8000/', serverUrl: 'http://127.0.0.1:8000/',
//serverUrl: 'http://10.21.28.148:8000/', //serverUrl: 'http://10.21.28.148:8000/',
//serverUrl: 'http://192.168.0.103:8000/', //serverUrl: 'http://192.168.0.103:8000/',
//serverUrl:'http://10.0.11.195:8000/', //serverUrl:'http://10.0.11.195:8000/',

View File

@ -31,6 +31,7 @@
<view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="background-color:blue;color:white">正在检查</view> <view class="weui-media-box__title" wx:if="{{item.taskstate == 1}}" style="background-color:blue;color:white">正在检查</view>
<view class="weui-media-box__title" wx:if="{{item.taskstate == 2}}" style="background-color:yellow">检查完毕</view> <view class="weui-media-box__title" wx:if="{{item.taskstate == 2}}" style="background-color:yellow">检查完毕</view>
<view class="weui-media-box__title" wx:if="{{item.taskstate == 3}}" style="background-color:orange">任务关闭</view> <view class="weui-media-box__title" wx:if="{{item.taskstate == 3}}" style="background-color:orange">任务关闭</view>
<view class="weui-media-box__title" wx:if="{{item.taskstate == 4}}" style="background-color:green">未执行</view>
</view> </view>
</navigator> </navigator>

View File

@ -17,6 +17,8 @@ Page({
cjry:"", cjry:"",
yhtp1: [], yhtp1: [],
zghtp1: [], zghtp1: [],
jcwt:"",
zgqk:"",
}, },
bindjcwtInput: function (e) { bindjcwtInput: function (e) {
this.data.jcwt = e.detail.value this.data.jcwt = e.detail.value
@ -166,13 +168,7 @@ Page({
}, },
submit: function () { submit: function () {
if (!this.data.jcwt) { if (!this.data.jczt) {
this.Tap1('请填写检查问题!')
}
else if (!this.data.zgqk) {
this.Tap1('请填写整改情况!')
}
else if (!this.data.jczt) {
this.Tap1('请选择检查状态!') this.Tap1('请选择检查状态!')
} }
@ -243,8 +239,9 @@ Page({
this.getGcdetail(options.id); this.getGcdetail(options.id);
this.setData({ this.setData({
jobid: options.id jobid: options.id,
}) })
}, },
/** /**
@ -335,16 +332,24 @@ Page({
wx.hideLoading(); wx.hideLoading();
console.log(res.data); console.log(res.data);
if (res.statusCode === 200) { if (res.statusCode === 200) {
var data = res.data var yhdata = res.data
//格式化观察信息 //格式化隐患信息
if(yhdata.yhtp!=null)
{
for (var i = 0; i < yhdata.yhtp.length; i++) {
yhdata.yhtp[i] = this.data.serverUrl + yhdata.yhtp[i];
}
}
this.setData(data) this.setData(yhdata)
} }
} }
}); });
}, },
}) })

View File

@ -1,57 +1,57 @@
<!--pages/checkjob/job.wxml--> <!--pages/checkjob/job.wxml-->
<view class="page"> <view class="page">
<view class="page__bd"> <view class="page__bd">
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>任务名称</view> <view>任务名称</view>
</view> </view>
<view class="weui-cell__ft"> <view class="weui-cell__ft">
{{checktask__checktaskname}} {{checktask__checktaskname}}
</view> </view>
</view> </view>
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>检查人</view> <view>检查人</view>
</view> </view>
<view class="weui-cell__ft"> <view class="weui-cell__ft">
{{checkname__username}} {{checkname__name}}
</view> </view>
</view> </view>
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>检查时间</view> <view>检查时间</view>
</view> </view>
<view class="weui-cell__ft"> <view class="weui-cell__ft">
{{checktask__checktime}} {{checktask__checktime}}
</view> </view>
</view> </view>
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>检查内容</view> <view>检查内容</view>
</view> </view>
<view class="weui-cell__ft" style="width:200px"> <view class="weui-cell__ft" style="width:200px">
{{checktask__checktype__checkcontent}} {{checktask__checktype__checkcontent}}
</view> </view>
</view> </view>
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>检查地点</view> <view>检查地点</view>
</view> </view>
<view class="weui-cell__ft" style="width:200px"> <view class="weui-cell__ft" style="width:200px">
{{checktask__checkplace}} {{checktask__checkplace}}
</view> </view>
</view> </view>
<view class="weui-cells__title">检查问题</view> <view class="weui-cells__title">检查问题</view>
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<view class="weui-cell"> <view class="weui-cell">
<view class="weui-cell__bd"> <view class="weui-cell__bd">
<textarea class="weui-textarea" placeholder="请输入" style="height: 4.6em" bindinput="bindjcwtInput" maxlength="-1" /> <textarea class="weui-textarea" value="{{checkquestion}}" placeholder="请输入" style="height: 4.6em" bindinput="bindjcwtInput" maxlength="-1" />
</view> </view>
</view> </view>
</view> </view>
<view class="weui-cells__title">问题图片</view> <view class="weui-cells__title">问题图片</view>
@ -63,9 +63,14 @@
<view class="weui-uploader__files"> <view class="weui-uploader__files">
<block wx:for="{{yhtp1}}" wx:for-item="image" wx:key="unique"> <block wx:for="{{yhtp1}}" wx:for-item="image" wx:key="unique">
<view class="weui-uploader__file"> <view class="weui-uploader__file">
<image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image> <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
</view> </view>
</block> </block>
<block wx:for="{{yhtp}}" wx:for-item="image" wx:key="unique">
<view class="weui-uploader__file">
<image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="yhtpPreview"></image>
</view>
</block>
</view> </view>
<view class="weui-uploader__input-box"> <view class="weui-uploader__input-box">
<view class="weui-uploader__input" bindtap="chooseImage"></view> <view class="weui-uploader__input" bindtap="chooseImage"></view>
@ -79,7 +84,7 @@
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<view class="weui-cell"> <view class="weui-cell">
<view class="weui-cell__bd"> <view class="weui-cell__bd">
<textarea class="weui-textarea" placeholder="请输入" style="height: 4.6em" bindinput="bindzgqkInput" maxlength="-1" /> <textarea class="weui-textarea" value="{{zgjg}}" placeholder="请输入" style="height: 4.6em" bindinput="bindzgqkInput" maxlength="-1" />
</view> </view>
</view> </view>
</view> </view>