diff --git a/.cloudbase/container/debug.json b/.cloudbase/container/debug.json
new file mode 100644
index 0000000..0d44458
--- /dev/null
+++ b/.cloudbase/container/debug.json
@@ -0,0 +1 @@
+{"containers":[],"config":{}}
\ No newline at end of file
diff --git a/pages/checkjob/check2.js b/pages/checkjob/check2.js
index acdb878..552550a 100644
--- a/pages/checkjob/check2.js
+++ b/pages/checkjob/check2.js
@@ -49,7 +49,7 @@ Page({
title: '加载中',
})
wx.request({
- url: getApp().globalData.serverUrl + 'api/risk?a=listall&table_type=2&riskact=' + this.data.riskact,
+ url: getApp().globalData.serverUrl + 'api/risk?a=listall&table_type=2&riskact=' + this.data.riskact + '&riskacttask=' + this.data.riskacttask,
header: {
'content-type': 'application/json', // 默认值
'Cookie': getApp().globalData.sessionId,
diff --git a/pages/main/main.js b/pages/main/main.js
index 592458d..aac64fc 100644
--- a/pages/main/main.js
+++ b/pages/main/main.js
@@ -15,6 +15,7 @@ Page({
wsnoread: 0,
jytodonum: 0,
tasknum: 0,
+ tasknum2: 0,
checknum:0,
sbtodonum:0,
yhgznum:0,
@@ -121,6 +122,7 @@ Page({
this.getwsnoreadnum()//未遂未读
this.getjytodonum()
this.gettasknum()
+ this.gettasknum2()
this.getchecknum()//检查任务
this.getsbycnum()
this.getyhgznum()
@@ -337,6 +339,26 @@ Page({
}
});
},
+ gettasknum2: function () {
+ var that = this
+ //获取待考
+ wx.request({
+ url: this.data.serverUrl + 'api/riskacttask?a=todonum2&table_type=2',
+ header: {
+ 'content-type': 'application/json', // 默认值
+ 'Cookie': getApp().globalData.sessionId,
+ },
+ data: {},
+ success: res => {
+ if (res.statusCode === 200) {
+ //console.log(res.data)
+ this.setData({
+ tasknum2: res.data.todonum,
+ })
+ }
+ }
+ });
+ },
getchecknum: function () {
var that = this
//获取待考
diff --git a/pages/main/main.wxml b/pages/main/main.wxml
index 4f7bb51..67996c8 100644
--- a/pages/main/main.wxml
+++ b/pages/main/main.wxml
@@ -27,7 +27,7 @@
检查任务新
- {{checknum}}
+ {{tasknum2}}
diff --git a/pages/trouble/addtrouble.js b/pages/trouble/addtrouble.js
index cd79889..696147d 100644
--- a/pages/trouble/addtrouble.js
+++ b/pages/trouble/addtrouble.js
@@ -289,12 +289,29 @@ Page({
var alllist = prevPage.data.alllist
alllist[this.data.riskcheckindex].trouble = res.data.trouble
alllist[this.data.riskcheckindex].yhnum = res.data.yhnum
- prevPage.setData(
- {alllist:alllist}
- )
- wx.navigateBack({
- delta: 1
- })
+ var pdata = {'risk': alllist[this.data.riskcheckindex].id, 'riskacttask': prevPage.data.riskacttask, 'trouble': res.data.trouble}
+ wx.request({
+ url: this.data.serverUrl + 'api/riskcheck2?a=check',
+ header: {
+ 'content-type': 'application/json', //
+ 'Cookie': getApp().globalData.sessionId,
+ },
+ method: 'POST',
+ data: pdata,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.hideLoading();
+ prevPage.setData(
+ {alllist:alllist}
+ )
+ wx.navigateBack({
+ delta: 1
+ })
+
+ }
+ }
+ });
+
}
else{
wx.hideLoading();
diff --git a/pages/trouble/addtroublezg.js b/pages/trouble/addtroublezg.js
index cfc0b1d..64c037b 100644
--- a/pages/trouble/addtroublezg.js
+++ b/pages/trouble/addtroublezg.js
@@ -239,12 +239,29 @@ Page({
var alllist = prevPage.data.alllist
alllist[this.data.riskcheckindex].trouble = res.data.trouble
alllist[this.data.riskcheckindex].yhnum = res.data.yhnum
- prevPage.setData(
- { alllist: alllist }
- )
- wx.navigateBack({
- delta: 2
- })
+ var pdata = {'risk': alllist[this.data.riskcheckindex].id, 'riskacttask': prevPage.data.riskacttask, 'trouble': res.data.trouble}
+ wx.request({
+ url: this.data.serverUrl + 'api/riskcheck2?a=check',
+ header: {
+ 'content-type': 'application/json', //
+ 'Cookie': getApp().globalData.sessionId,
+ },
+ method: 'POST',
+ data: pdata,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.hideLoading();
+ prevPage.setData(
+ { alllist: alllist }
+ )
+ wx.navigateBack({
+ delta: 2
+ })
+
+ }
+ }
+ });
+
}
else{
wx.hideLoading();
diff --git a/pages/trouble/addtroublezp.js b/pages/trouble/addtroublezp.js
index 9cb7a7c..e0f0cc4 100644
--- a/pages/trouble/addtroublezp.js
+++ b/pages/trouble/addtroublezp.js
@@ -208,12 +208,29 @@ Page({
var alllist = prevPage.data.alllist
alllist[this.data.riskcheckindex].trouble = res.data.trouble
alllist[this.data.riskcheckindex].yhnum = res.data.yhnum
- prevPage.setData(
- { alllist: alllist }
- )
- wx.navigateBack({
- delta: 2
- })
+ var pdata = {'risk': alllist[this.data.riskcheckindex].id, 'riskacttask': prevPage.data.riskacttask, 'trouble': res.data.trouble}
+ wx.request({
+ url: this.data.serverUrl + 'api/riskcheck2?a=check',
+ header: {
+ 'content-type': 'application/json', //
+ 'Cookie': getApp().globalData.sessionId,
+ },
+ method: 'POST',
+ data: pdata,
+ success: res => {
+ if (res.statusCode === 200) {
+ wx.hideLoading();
+ prevPage.setData(
+ { alllist: alllist }
+ )
+ wx.navigateBack({
+ delta: 2
+ })
+
+ }
+ }
+ });
+
}
else{
wx.hideLoading();