From 47f62c3960bdfca159e303fe1f25f4841b221425 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Wed, 12 May 2021 10:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E7=BE=8E?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/route/examapply/list-check.html | 4 +- .../static/route/examapply/list.html | 10 ++- .../static/route/examapply/update.html | 84 ++++++++----------- .../static/route/examcheck/list.html | 9 +- 4 files changed, 51 insertions(+), 56 deletions(-) diff --git a/src/main/resources/static/route/examapply/list-check.html b/src/main/resources/static/route/examapply/list-check.html index f8cf955..d140616 100644 --- a/src/main/resources/static/route/examapply/list-check.html +++ b/src/main/resources/static/route/examapply/list-check.html @@ -166,13 +166,13 @@ return '-'; } if(rowData == '0') { - rowData = '待审批'; + rowData = '待审批'; } if(rowData == '1') { rowData = '审批通过'; } if(rowData == '2') { - rowData = '审批驳回'; + rowData = '审批驳回'; } return rowData; } diff --git a/src/main/resources/static/route/examapply/list.html b/src/main/resources/static/route/examapply/list.html index f74638a..e87d2e8 100644 --- a/src/main/resources/static/route/examapply/list.html +++ b/src/main/resources/static/route/examapply/list.html @@ -166,13 +166,13 @@ return '-'; } if(rowData == '0') { - rowData = '待审批'; + rowData = '待审批'; } if(rowData == '1') { rowData = '审批通过'; } if(rowData == '2') { - rowData = '审批驳回'; + rowData = '审批驳回'; } return rowData; } @@ -184,7 +184,7 @@ return '-'; } if(rowData == '0') { - rowData = '未分配'; + rowData = '未分配'; } if(rowData == '1') { rowData = '已分配'; @@ -199,7 +199,7 @@ return '-'; } if(rowData == '0') { - rowData = '未分配'; + rowData = '未分配'; } if(rowData == '1') { rowData = '已分配'; @@ -437,6 +437,8 @@ [data.examId]), {}, null, function(code, resultData) { if(null != resultData && resultData.length > 0) { top.dialog.msg('监考老师分配失败'); + }else { + top.dialog.msg('监考老师分配成功'); } reloadTable(); }, function(code, data) { diff --git a/src/main/resources/static/route/examapply/update.html b/src/main/resources/static/route/examapply/update.html index 08ec50a..ad62096 100644 --- a/src/main/resources/static/route/examapply/update.html +++ b/src/main/resources/static/route/examapply/update.html @@ -196,7 +196,7 @@
- +
@@ -297,22 +297,39 @@ }); } - // 初始化视频 - function initVideo(fileName, data) { - for(var i = 0, item; item = data[i++];) { - var player = new ckplayer({ - container: '#'+ fileName + i, - variable: 'player', - flashplayer: false, - video: { - file: 'route/file/download/true/'+ item.fileId, - type: 'video/mp4' + // 初始化理论考试开始时间时间戳 + function initTheoryExamStartTimeDateTime() { + laydate.render({ + elem: '#theoryExamStartTime', + type: 'datetime', + trigger: 'click', + done: function (value, date, endDate) { + var startDate = new Date(value).getTime(); + var endTime = new Date($('#theoryExamEndTime').val()).getTime(); + if (endTime <= startDate) { + layer.msg('理论考试结束时间不能早于等于开始时间'); } - }); - } + } + }); } - // 初始化理论考试开始时间时间戳 + // 初始化理论考试结束时间时间戳 + function initTheoryExamEndTimeDateTime() { + laydate.render({ + elem: '#theoryExamEndTime', + type: 'datetime', + trigger: 'click', + done: function (value, date, endDate) { + var startDate = new Date(value).getTime(); + var endTime = new Date($('#theoryExamStartTime').val()).getTime(); + if (endTime >= startDate) { + layer.msg('理论考试结束时间不能早于等于开始时间'); + } + } + }); + } + + // 初始化实操考试开始时间时间戳 function initPracticeExamStartTimeDateTime() { laydate.render({ elem: '#practiceExamStartTime', @@ -328,7 +345,7 @@ }); } - // 初始化理论考试结束时间时间戳 + // 初始化实操考试结束时间时间戳 function initPracticeExamEndTimeDateTime() { laydate.render({ elem: '#practiceExamEndTime', @@ -344,38 +361,6 @@ }); } - // 初始化实操考试开始时间时间戳 - function initTheoryExamStartTimeDateTime() { - laydate.render({ - elem: '#theoryExamStartTime', - type: 'datetime', - trigger: 'click', - done: function (value, date, endDate) { - var startDate = new Date(value).getTime(); - var endTime = new Date($('#theoryExamEndTime').val()).getTime(); - if (endTime >= startDate) { - layer.msg('理论考试结束时间不能早于等于开始时间'); - } - } - }); - } - - // 初始化实操考试结束时间时间戳 - function initTheoryExamEndTimeDateTime() { - laydate.render({ - elem: '#theoryExamEndTime', - type: 'datetime', - trigger: 'click', - done: function (value, date, endDate) { - var startDate = new Date(value).getTime(); - var endTime = new Date($('#theoryExamStartTime').val()).getTime(); - if (endTime >= startDate) { - layer.msg('理论考试结束时间不能早于等于开始时间'); - } - } - }); - } - // 初始化缴费凭证图片上传 function initPaymentVoucherUploadFile() { var files = $('#paymentVoucher').val(); @@ -438,6 +423,11 @@ for(var i in data) { dataFormData[i] = data[i] +''; } + /*if (null == data.status || '' == data.status || typeof (data.status) == 'undefined') { + $('#subBtn').show(); + } else { + $('#subBtn').hide(); + }*/ form.val('dataForm', dataFormData); form.render(null, 'dataForm'); initPracticeExamAddressIdSelect(data['practiceExamAddressId']); diff --git a/src/main/resources/static/route/examcheck/list.html b/src/main/resources/static/route/examcheck/list.html index a7ec176..65ab363 100644 --- a/src/main/resources/static/route/examcheck/list.html +++ b/src/main/resources/static/route/examcheck/list.html @@ -165,14 +165,17 @@ {field: 'checkStatus', width: 180, title: '审核状态', align:'center', templet: function(row) { var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + if(typeof(rowData) === 'undefined' || rowData === null || rowData === '') { return '-'; } + if('0' == rowData) { + rowData = '待审核'; + } if('2' == rowData) { - rowData = '审核通过'; + rowData = '审核通过'; } if('3' == rowData) { - rowData = '审核驳回'; + rowData = '审核驳回'; } return rowData; }