diff --git a/app.js b/app.js
index a75ea24..2036e08 100644
--- a/app.js
+++ b/app.js
@@ -74,8 +74,8 @@ App({
},
globalData: {
userInfo: 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://192.168.0.102:8000/',
//serverUrl:'http://10.7.100.250:8000/',
isaqy: 0,
diff --git a/app.json b/app.json
index 1348412..74b5aad 100644
--- a/app.json
+++ b/app.json
@@ -67,7 +67,8 @@
"pages/risktask/main",
"pages/riskact/index",
"pages/riskact/detail",
- "pages/riskact/check"
+ "pages/riskact/check",
+ "pages/chart/report"
],
"window": {
"backgroundTextStyle": "light",
diff --git a/pages/chart/report.js b/pages/chart/report.js
new file mode 100644
index 0000000..ec5305b
--- /dev/null
+++ b/pages/chart/report.js
@@ -0,0 +1,66 @@
+// pages/chart/report.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/chart/report.json b/pages/chart/report.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/chart/report.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/chart/report.wxml b/pages/chart/report.wxml
new file mode 100644
index 0000000..e0c104e
--- /dev/null
+++ b/pages/chart/report.wxml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/pages/chart/report.wxss b/pages/chart/report.wxss
new file mode 100644
index 0000000..df2ef15
--- /dev/null
+++ b/pages/chart/report.wxss
@@ -0,0 +1 @@
+/* pages/chart/report.wxss */
\ No newline at end of file
diff --git a/pages/examtest/index.js b/pages/examtest/index.js
index 7f70e92..8d8df95 100644
--- a/pages/examtest/index.js
+++ b/pages/examtest/index.js
@@ -183,7 +183,7 @@ Page({
}else{
wx.showModal({
title: "系统提示",
- content: '考试还未关闭,请稍候查看',
+ content: '发布人未关闭考试,暂不能查看',
showCancel: false,
confirmText: "确定"
})
diff --git a/pages/examtest/note.js b/pages/examtest/note.js
index 7d5a929..68d19bb 100644
--- a/pages/examtest/note.js
+++ b/pages/examtest/note.js
@@ -24,7 +24,6 @@ Page({
let ksdata = res.data
if (ksdata.starttime != null) {
let st = new Date(ksdata.starttime)
- ksdata.starttime = util.formatTime2(st)
if(new Date() et) {
this.setData({
testdisable: true
diff --git a/pages/examtest/note.wxml b/pages/examtest/note.wxml
index 638b3c0..d12485f 100644
--- a/pages/examtest/note.wxml
+++ b/pages/examtest/note.wxml
@@ -7,10 +7,10 @@
答卷时长:{{duration}}分钟
满分{{totalscore}};{{passscore}}以上通过
{{exampaper__total.dx.num}}道单选题,{{exampaper__total.duox.num}}道多选题,{{exampaper__total.pd.num}}道判断题
- 考试开启时间:
+ 最早参加时间:
{{starttime}}
无
- 考试关闭时间:
+ 最迟参加时间:
{{endtime}}
无
diff --git a/pages/miss/missdetail.js b/pages/miss/missdetail.js
index 3e58dea..7c5cacc 100644
--- a/pages/miss/missdetail.js
+++ b/pages/miss/missdetail.js
@@ -93,8 +93,8 @@ Page({
for (var i = 0; i < wsdata.missimg.length; i++) {
wsdata.missimg[i] = this.data.serverUrl + wsdata.missimg[i];
}
- if (wsdata.misstime != '') { wsdata.misstime = util.formatTime(new Date(wsdata.misstime)) }
- if (wsdata.submittime != '') { wsdata.submittime = util.formatTime(new Date(wsdata.submittime)) }
+ // if (wsdata.misstime != '') { wsdata.misstime = util.formatTime(new Date(wsdata.misstime)) }
+ // if (wsdata.submittime != '') { wsdata.submittime = util.formatTime(new Date(wsdata.submittime)) }
this.setData(wsdata)
}
}
diff --git a/pages/observe/observedetail.js b/pages/observe/observedetail.js
index 33d8f69..afb7ec6 100644
--- a/pages/observe/observedetail.js
+++ b/pages/observe/observedetail.js
@@ -93,8 +93,6 @@ Page({
for (var i = 0; i < gcdata.lookimg.length; i++) {
gcdata.lookimg[i] = this.data.serverUrl + gcdata.lookimg[i];
}
- if (gcdata.looktime != '') { gcdata.looktime = util.formatTime(new Date(gcdata.looktime)) }
- if (gcdata.submittime != '') { gcdata.submittime = util.formatTime(new Date(gcdata.submittime)) }
this.setData(gcdata)
}
}
diff --git a/pages/operation/operationdetail.js b/pages/operation/operationdetail.js
index 5d1c738..139022e 100644
--- a/pages/operation/operationdetail.js
+++ b/pages/operation/operationdetail.js
@@ -30,11 +30,6 @@ Page({
for (var i = 0; i < zydata.zyimg2.length; i++) {
zydata.zyimg2[i] = this.data.serverUrl + zydata.zyimg2[i];
}
- for (var i = 0; i < zydata.spxq.length; i++) {
- zydata.spxq[i].submittime = util.formatTime(new Date(zydata.spxq[i].submittime));
- }
- if (zydata.kssj != '') { zydata.kssj = util.formatTime(new Date(zydata.kssj)) }
- if (zydata.jssj != '') { zydata.jssj = util.formatTime(new Date(zydata.jssj)) }
this.setData(zydata)
switch (zydata.zyzt) {
}
diff --git a/pages/risktask/index.wxml b/pages/risktask/index.wxml
index 7199bc5..ea0987d 100644
--- a/pages/risktask/index.wxml
+++ b/pages/risktask/index.wxml
@@ -30,8 +30,9 @@
一般风险
较大风险
重大风险
- 已完成
+ 已执行
作废
+ 未执行
diff --git a/pages/suggest/detail.js b/pages/suggest/detail.js
index 793990f..fb9f491 100644
--- a/pages/suggest/detail.js
+++ b/pages/suggest/detail.js
@@ -104,7 +104,6 @@ Page({
for (var i = 0; i < jydata.jyimg2.length; i++) {
jydata.jyimg2[i] = this.data.serverUrl + jydata.jyimg2[i];
}
- if (jydata.submittime != '') { jydata.submittime = util.formatTime(new Date(jydata.submittime)) }
this.setData(jydata)
}
}
diff --git a/pages/train/detail.js b/pages/train/detail.js
index 204f8ae..01ad89f 100644
--- a/pages/train/detail.js
+++ b/pages/train/detail.js
@@ -121,7 +121,6 @@ Page({
wx.hideLoading();
if (res.statusCode === 200) {
var pxdata = res.data
- if (pxdata.starttime != '') { pxdata.starttime = util.formatTime(new Date(pxdata.starttime)) }
for (var i = 0; i < pxdata.cjrydetail.length; i++) {
let qdsj = pxdata.cjrydetail[i].qdsj
if (qdsj != null)
diff --git a/pages/train/detail.wxml b/pages/train/detail.wxml
index c6d286d..6143735 100644
--- a/pages/train/detail.wxml
+++ b/pages/train/detail.wxml
@@ -68,9 +68,7 @@
-
培训内容
-
{{traincontent__dickeyname}}
diff --git a/pages/trouble/troubledetail.js b/pages/trouble/troubledetail.js
index e214bf2..cecf5b5 100644
--- a/pages/trouble/troubledetail.js
+++ b/pages/trouble/troubledetail.js
@@ -32,12 +32,12 @@ Page({
for (var i = 0; i < yhdata.zghtp.length; i++) {
yhdata.zghtp[i] = this.data.serverUrl + yhdata.zghtp[i];
}
- if (yhdata.fxsj != '') { yhdata.fxsj = util.formatTime(new Date(yhdata.fxsj)) }
- if (yhdata.zgqx != '') { yhdata.zgqx = util.formatTime(new Date(yhdata.zgqx)) }
+ // if (yhdata.fxsj != '') { yhdata.fxsj = util.formatTime(new Date(yhdata.fxsj)) }
+ // if (yhdata.zgqx != '') { yhdata.zgqx = util.formatTime(new Date(yhdata.zgqx)) }
- for (var i = 0; i < yhdata.lcxq.length; i++) {
- yhdata.lcxq[i]['accesssj'] = util.formatTime(new Date(res.data.lcxq[i]['accesssj']));
- }
+ // for (var i = 0; i < yhdata.lcxq.length; i++) {
+ // yhdata.lcxq[i]['accesssj'] = util.formatTime(new Date(res.data.lcxq[i]['accesssj']));
+ // }
this.setData(yhdata)
}
}