From d69c974eacaf080073df05ee8c34fcd7e3888350 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 16 Apr 2020 14:40:10 +0800
Subject: [PATCH] xaoche
---
app.js | 4 +-
pages/checkjob/index.wxml | 1 +
pages/checkjob/job.js | 29 +++++-----
pages/checkjob/job.wxml | 109 ++++++++++++++++++++------------------
4 files changed, 77 insertions(+), 66 deletions(-)
diff --git a/app.js b/app.js
index cfbf7c9..4a45bb9 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/index.wxml b/pages/checkjob/index.wxml
index 5a1f158..3663804 100644
--- a/pages/checkjob/index.wxml
+++ b/pages/checkjob/index.wxml
@@ -31,6 +31,7 @@
正在检查
检查完毕
任务关闭
+ 未执行
diff --git a/pages/checkjob/job.js b/pages/checkjob/job.js
index 9bf0124..ba9381c 100644
--- a/pages/checkjob/job.js
+++ b/pages/checkjob/job.js
@@ -17,6 +17,8 @@ Page({
cjry:"",
yhtp1: [],
zghtp1: [],
+ jcwt:"",
+ zgqk:"",
},
bindjcwtInput: function (e) {
this.data.jcwt = e.detail.value
@@ -166,13 +168,7 @@ Page({
},
submit: function () {
- if (!this.data.jcwt) {
- this.Tap1('请填写检查问题！')
- }
- else if (!this.data.zgqk) {
- this.Tap1('请填写整改情况！')
- }
- else if (!this.data.jczt) {
+ if (!this.data.jczt) {
this.Tap1('请选择检查状态！')
}
@@ -243,8 +239,9 @@ Page({
this.getGcdetail(options.id);
this.setData({
- jobid: options.id
+ jobid: options.id,
})
+
},
/**
@@ -335,16 +332,24 @@ Page({
wx.hideLoading();
console.log(res.data);
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)
}
}
});
},
-
+
})
\ No newline at end of file
diff --git a/pages/checkjob/job.wxml b/pages/checkjob/job.wxml
index 6bedd7a..5e2c3b6 100644
--- a/pages/checkjob/job.wxml
+++ b/pages/checkjob/job.wxml
@@ -1,57 +1,57 @@
-
+
-
-
-
- 任务名称
-
-
- {{checktask__checktaskname}}
-
-
-
-
- 检查人
-
-
- {{checkname__username}}
-
-
-
-
- 检查时间
-
-
- {{checktask__checktime}}
-
-
-
-
- 检查内容
-
-
- {{checktask__checktype__checkcontent}}
-
-
-
-
-
- 检查地点
-
-
- {{checktask__checkplace}}
-
-
-
- 检查问题
-
-
-
-
-
+
+
+
+ 任务名称
+
+
+ {{checktask__checktaskname}}
+
+
+
+
+ 检查人
+
+
+ {{checkname__name}}
+
+
+
+
+ 检查时间
+
+
+ {{checktask__checktime}}
+
+
+
+
+ 检查内容
+
+
+ {{checktask__checktype__checkcontent}}
+
+
+
+
+
+ 检查地点
+
+
+ {{checktask__checkplace}}
+
+
+
+ 检查问题
+
+
+
+
+
问题图片
@@ -63,9 +63,14 @@
-
+
+
+
+
+
+
@@ -79,7 +84,7 @@
-
+