diff --git a/pages/risktask/check.js b/pages/risktask/check.js
index 84555c8..2e9888f 100644
--- a/pages/risktask/check.js
+++ b/pages/risktask/check.js
@@ -16,7 +16,13 @@ Page({
onLoad: function (options) {
console.log(options)
this.data.riskact = options.riskact
- this.data.group = options.group
+ if(options.group==undefined){
+ this.data.group = 'all'
+ }else{
+ this.data.group = options.group
+ }
+
+
},
getlist:function(){
var page = this.data.page
@@ -118,4 +124,30 @@ Page({
url: '/pages/trouble/addtrouble?type=risktask&index=' + e.currentTarget.dataset.index,
})
},
+ submit: function () {
+ console.log(this.data.alllist)
+ let data={'tasks':[]}
+ for (var i = 0; i < this.data.alllist.length; i++) {
+ data.tasks.push(this.data.alllist[i].id)
+ }
+ wx.showLoading({
+ title: '提交中',
+ })
+ wx.request({
+ url: getApp().globalData.serverUrl + 'api/risktask?a=update',
+ header: {
+ 'content-type': 'application/json', // 默认值
+ 'Cookie': wx.getStorageSync("sessionid"),
+ },
+ method: 'POST',
+ data:data,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.navigateBack({
+ })
+ }
+ wx.hideLoading();
+ }
+ });
+ },
})
\ No newline at end of file
diff --git a/pages/risktask/check.wxml b/pages/risktask/check.wxml
index 2f8f8cc..e710ec0 100644
--- a/pages/risktask/check.wxml
+++ b/pages/risktask/check.wxml
@@ -40,10 +40,13 @@
无
+ {{item.trouble__yhnum}}
-
+
diff --git a/pages/risktask/index.js b/pages/risktask/index.js
index 1c0aad3..3d32918 100644
--- a/pages/risktask/index.js
+++ b/pages/risktask/index.js
@@ -9,7 +9,7 @@ Page({
page: 1,
serverUrl: getApp().globalData.serverUrl,
alllist: [],
- tabs: ["我的已查", "我的待查", "全厂待办"],
+ tabs: ["历史任务", "我的任务", "全厂待办"],
activeIndex: 1,
sliderOffset: 0,
sliderLeft: 0
@@ -190,7 +190,7 @@ Page({
title: '加载中',
}),
wx.request({
- url: this.data.serverUrl + 'api/suggest?a=listself&rows=10&page=' + page,
+ url: this.data.serverUrl + 'api/listtask?a=list2done&rows=10&page=' + page,
header: {
'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"),
@@ -228,6 +228,18 @@ Page({
}
});
},
+ scan: function () {
+ wx.scanCode({
+ onlyFromCamera: true,
+ success(res) {
+ console.log(res)
+ let id = res.result.split('=')[1]
+ wx.navigateTo({
+ url: 'check?riskact=' + id,
+ })
+ }
+ })
+ },
gettodolist: function (page) {
var that = this;
if (page != 1) { page = that.data.todopage }
diff --git a/pages/risktask/index.wxml b/pages/risktask/index.wxml
index 1c7db05..557b144 100644
--- a/pages/risktask/index.wxml
+++ b/pages/risktask/index.wxml
@@ -12,18 +12,25 @@
共{{donetotal}}条已查
-
+
- {{item.jynr}}
- {{item.jynum}} {{item.jyr__name}}填报
- {{item.submittime}}
+
+ 风险点
+ {{item.risk__riskact__area__name}} {{item.risk__riskact__name}}
+
+
+ 排查岗位
+ {{item.risk__gkcj}} {{item.risk__group__groupname}}
+
+ 任务生成时间:{{item.taskadd}}
+ 任务过期时间:{{item.taskexpire}}
-
- 待评估
- 处理中
- 待确认
- 已归档
- {{item.todouser__name}}
+
+ 低风险
+ 一般风险
+ 较大风险
+ 重大风险
+ 已完成
@@ -36,12 +43,12 @@
- 风险点
- {{item.risk__riskact__area__name}} {{item.risk__riskact__name}}
+ 风险点
+ {{item.risk__riskact__area__name}} {{item.risk__riskact__name}}
- 排查岗位
- {{item.risk__gkcj}} {{item.risk__group__groupname}}
+ 排查岗位
+ {{item.risk__gkcj}} {{item.risk__group__groupname}}
任务生成时间:{{item.taskadd}}
任务过期时间:{{item.taskexpire}}
@@ -51,6 +58,7 @@
一般风险
较大风险
重大风险
+ 已完成
@@ -63,12 +71,12 @@
- 风险点
- {{item.risk__riskact__area__name}} {{item.risk__riskact__name}}
+ 风险点
+ {{item.risk__riskact__area__name}} {{item.risk__riskact__name}}
- 排查岗位
- {{item.risk__gkcj}} {{item.risk__group__groupname}}
+ 排查岗位
+ {{item.risk__gkcj}} {{item.risk__group__groupname}}
任务生成时间:{{item.taskadd}}
任务过期时间:{{item.taskexpire}}
@@ -78,7 +86,7 @@
一般风险
较大风险
重大风险
-
+ 已完成
@@ -88,8 +96,6 @@
-
-
-
-
+
+
\ No newline at end of file
diff --git a/pages/trouble/addtrouble.js b/pages/trouble/addtrouble.js
index d6b6077..d3f1b09 100644
--- a/pages/trouble/addtrouble.js
+++ b/pages/trouble/addtrouble.js
@@ -275,7 +275,7 @@ Page({
if (res.statusCode === 200) {
wx.hideLoading();
wx.navigateBack({
- delta: 2
+ delta: 1
})
}
diff --git a/pages/trouble/addtroublezg.js b/pages/trouble/addtroublezg.js
index 6253de2..2f27091 100644
--- a/pages/trouble/addtroublezg.js
+++ b/pages/trouble/addtroublezg.js
@@ -209,7 +209,31 @@ Page({
}
}
});
- }else{
+ }
+ else if (this.data.yhtype == 'risktask') {
+ let data = { 'risktask': null, 'trouble': null }
+ data.risktask = this.data.risktaskdata.id
+ data.trouble = res.data.trouble
+ wx.request({
+ url: this.data.serverUrl + 'api/risktask?a=checktrouble',
+ header: {
+ 'content-type': 'application/json', //
+ 'Cookie': wx.getStorageSync("sessionid"),
+ },
+ method: 'POST',
+ data: data,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.hideLoading();
+ wx.navigateBack({
+ delta: 2
+ })
+
+ }
+ }
+ });
+ }
+ else{
wx.hideLoading();
wx.navigateBack({
delta: 2
diff --git a/pages/trouble/addtroublezg.wxml b/pages/trouble/addtroublezg.wxml
index 2e96ed4..99a8622 100644
--- a/pages/trouble/addtroublezg.wxml
+++ b/pages/trouble/addtroublezg.wxml
@@ -1,6 +1,7 @@
{{inspectdata.equipment.name}} 设备异常
+ 风险 {{risktaskdata.risk__step}}
评估信息
diff --git a/pages/trouble/addtroublezp.js b/pages/trouble/addtroublezp.js
index c4c7561..488314b 100644
--- a/pages/trouble/addtroublezp.js
+++ b/pages/trouble/addtroublezp.js
@@ -169,7 +169,31 @@ Page({
}
}
});
- }else{
+ }
+ else if (this.data.yhtype == 'risktask') {
+ let data = { 'risktask': null, 'trouble': null }
+ data.risktask = this.data.risktaskdata.id
+ data.trouble = res.data.trouble
+ wx.request({
+ url: this.data.serverUrl + 'api/risktask?a=checktrouble',
+ header: {
+ 'content-type': 'application/json', //
+ 'Cookie': wx.getStorageSync("sessionid"),
+ },
+ method: 'POST',
+ data: data,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.hideLoading();
+ wx.navigateBack({
+ delta: 2
+ })
+
+ }
+ }
+ });
+ }
+ else{
wx.hideLoading();
wx.navigateBack({
delta: 2
diff --git a/pages/trouble/addtroublezp.wxml b/pages/trouble/addtroublezp.wxml
index b5e72ef..c75a0a0 100644
--- a/pages/trouble/addtroublezp.wxml
+++ b/pages/trouble/addtroublezp.wxml
@@ -1,6 +1,8 @@
- {{inspectdata.equipment.name}} 设备异常
+ {{inspectdata.equipment.name}} 设备异常
+
+ 风险 {{inspectdata.equipment.name}}
评估信息