This commit is contained in:
caoqianming 2019-08-19 09:09:03 +08:00
parent febb676688
commit fefc09a83b
17 changed files with 89 additions and 27 deletions

4
app.js
View File

@ -74,8 +74,8 @@ App({
}, },
globalData: { globalData: {
userInfo: null, userInfo: 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://192.168.0.102:8000/', //serverUrl: 'http://192.168.0.102:8000/',
//serverUrl:'http://10.7.100.250:8000/', //serverUrl:'http://10.7.100.250:8000/',
isaqy: 0, isaqy: 0,

View File

@ -67,7 +67,8 @@
"pages/risktask/main", "pages/risktask/main",
"pages/riskact/index", "pages/riskact/index",
"pages/riskact/detail", "pages/riskact/detail",
"pages/riskact/check" "pages/riskact/check",
"pages/chart/report"
], ],
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",

66
pages/chart/report.js Normal file
View File

@ -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 () {
}
})

3
pages/chart/report.json Normal file
View File

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

3
pages/chart/report.wxml Normal file
View File

@ -0,0 +1,3 @@
<!--pages/chart/report.wxml-->
<web-view src="https://safeyun.ctcshe.com/reporthtml"> </web-view>

1
pages/chart/report.wxss Normal file
View File

@ -0,0 +1 @@
/* pages/chart/report.wxss */

View File

@ -183,7 +183,7 @@ Page({
}else{ }else{
wx.showModal({ wx.showModal({
title: "系统提示", title: "系统提示",
content: '考试还未关闭,请稍候查看', content: '发布人未关闭考试,暂不能查看',
showCancel: false, showCancel: false,
confirmText: "确定" confirmText: "确定"
}) })

View File

@ -24,7 +24,6 @@ Page({
let ksdata = res.data let ksdata = res.data
if (ksdata.starttime != null) { if (ksdata.starttime != null) {
let st = new Date(ksdata.starttime) let st = new Date(ksdata.starttime)
ksdata.starttime = util.formatTime2(st)
if(new Date()<st){ if(new Date()<st){
this.setData({ this.setData({
testdisable:true testdisable:true
@ -33,7 +32,6 @@ Page({
} }
if (ksdata.endtime != null) { if (ksdata.endtime != null) {
let et = new Date(ksdata.endtime) let et = new Date(ksdata.endtime)
ksdata.endtime = util.formatTime2(et)
if (new Date() > et) { if (new Date() > et) {
this.setData({ this.setData({
testdisable: true testdisable: true

View File

@ -7,10 +7,10 @@
<view>答卷时长:<span style="color:red">{{duration}}分钟</span></view> <view>答卷时长:<span style="color:red">{{duration}}分钟</span></view>
<view>满分{{totalscore}};{{passscore}}以上通过</view> <view>满分{{totalscore}};{{passscore}}以上通过</view>
<view>{{exampaper__total.dx.num}}道单选题,{{exampaper__total.duox.num}}道多选题,{{exampaper__total.pd.num}}道判断题</view> <view>{{exampaper__total.dx.num}}道单选题,{{exampaper__total.duox.num}}道多选题,{{exampaper__total.pd.num}}道判断题</view>
<view>考试开启时间: <view>最早参加时间:
<span wx:if="{{starttime!=null}}">{{starttime}}</span> <span wx:if="{{starttime!=null}}">{{starttime}}</span>
<span wx:else>无</span> <span wx:else>无</span>
</view>考试关闭时间: </view>最迟参加时间:
<span wx:if="{{endtime!=null}}">{{endtime}}</span> <span wx:if="{{endtime!=null}}">{{endtime}}</span>
<span wx:else>无</span> <span wx:else>无</span>
</view> </view>

View File

@ -93,8 +93,8 @@ Page({
for (var i = 0; i < wsdata.missimg.length; i++) { for (var i = 0; i < wsdata.missimg.length; i++) {
wsdata.missimg[i] = this.data.serverUrl + wsdata.missimg[i]; wsdata.missimg[i] = this.data.serverUrl + wsdata.missimg[i];
} }
if (wsdata.misstime != '') { wsdata.misstime = util.formatTime(new Date(wsdata.misstime)) } // if (wsdata.misstime != '') { wsdata.misstime = util.formatTime(new Date(wsdata.misstime)) }
if (wsdata.submittime != '') { wsdata.submittime = util.formatTime(new Date(wsdata.submittime)) } // if (wsdata.submittime != '') { wsdata.submittime = util.formatTime(new Date(wsdata.submittime)) }
this.setData(wsdata) this.setData(wsdata)
} }
} }

View File

@ -93,8 +93,6 @@ Page({
for (var i = 0; i < gcdata.lookimg.length; i++) { for (var i = 0; i < gcdata.lookimg.length; i++) {
gcdata.lookimg[i] = this.data.serverUrl + gcdata.lookimg[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) this.setData(gcdata)
} }
} }

View File

@ -30,11 +30,6 @@ Page({
for (var i = 0; i < zydata.zyimg2.length; i++) { for (var i = 0; i < zydata.zyimg2.length; i++) {
zydata.zyimg2[i] = this.data.serverUrl + zydata.zyimg2[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) this.setData(zydata)
switch (zydata.zyzt) { switch (zydata.zyzt) {
} }

View File

@ -30,8 +30,9 @@
<view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view> <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
<view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view> <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
<view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view> <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
<view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view> <view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已执行</view>
<view wx:if="{{item.usable==2}}" class="weui-media-box__title" style="background-color:green;color:white">作废</view> <view wx:if="{{item.usable==2}}" class="weui-media-box__title" style="background-color:green;color:white">作废</view>
<view wx:if="{{item.user__userid==null}}" class="weui-media-box__title" style="background-color:red;color:white">未执行</view>
</view> </view>
</navigator> </navigator>
</block> </block>

View File

@ -104,7 +104,6 @@ Page({
for (var i = 0; i < jydata.jyimg2.length; i++) { for (var i = 0; i < jydata.jyimg2.length; i++) {
jydata.jyimg2[i] = this.data.serverUrl + jydata.jyimg2[i]; jydata.jyimg2[i] = this.data.serverUrl + jydata.jyimg2[i];
} }
if (jydata.submittime != '') { jydata.submittime = util.formatTime(new Date(jydata.submittime)) }
this.setData(jydata) this.setData(jydata)
} }
} }

View File

@ -121,7 +121,6 @@ Page({
wx.hideLoading(); wx.hideLoading();
if (res.statusCode === 200) { if (res.statusCode === 200) {
var pxdata = res.data var pxdata = res.data
if (pxdata.starttime != '') { pxdata.starttime = util.formatTime(new Date(pxdata.starttime)) }
for (var i = 0; i < pxdata.cjrydetail.length; i++) { for (var i = 0; i < pxdata.cjrydetail.length; i++) {
let qdsj = pxdata.cjrydetail[i].qdsj let qdsj = pxdata.cjrydetail[i].qdsj
if (qdsj != null) if (qdsj != null)

View File

@ -68,9 +68,7 @@
</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>培训内容</view> <view>培训内容</view>
</view>
<view class="weui-cell__ft"> <view class="weui-cell__ft">
{{traincontent__dickeyname}} {{traincontent__dickeyname}}
</view> </view>

View File

@ -32,12 +32,12 @@ Page({
for (var i = 0; i < yhdata.zghtp.length; i++) { for (var i = 0; i < yhdata.zghtp.length; i++) {
yhdata.zghtp[i] = this.data.serverUrl + yhdata.zghtp[i]; yhdata.zghtp[i] = this.data.serverUrl + yhdata.zghtp[i];
} }
if (yhdata.fxsj != '') { yhdata.fxsj = util.formatTime(new Date(yhdata.fxsj)) } // if (yhdata.fxsj != '') { yhdata.fxsj = util.formatTime(new Date(yhdata.fxsj)) }
if (yhdata.zgqx != '') { yhdata.zgqx = util.formatTime(new Date(yhdata.zgqx)) } // if (yhdata.zgqx != '') { yhdata.zgqx = util.formatTime(new Date(yhdata.zgqx)) }
for (var i = 0; i < yhdata.lcxq.length; i++) { // for (var i = 0; i < yhdata.lcxq.length; i++) {
yhdata.lcxq[i]['accesssj'] = util.formatTime(new Date(res.data.lcxq[i]['accesssj'])); // yhdata.lcxq[i]['accesssj'] = util.formatTime(new Date(res.data.lcxq[i]['accesssj']));
} // }
this.setData(yhdata) this.setData(yhdata)
} }
} }