Tenlion/bt-yjj-system-examination-signup
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ly19960718 2021-05-12 10:45:51 +08:00
commit 6e9158e6f6
4 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/static/route/examapply/list-check.html
View File

@ -166,13 +166,13 @@
return '-';
}
if(rowData == '0') {
rowData = '<a class="layui-btn layui-btn-xs">待审批</a>';
rowData = '<a class="layui-btn layui-btn-warm layui-btn-xs">待审批</a>';
}
if(rowData == '1') {
rowData = '<a class="layui-btn layui-btn-xs">审批通过</a>';
}
if(rowData == '2') {
rowData = '<a class="layui-btn layui-btn-xs">审批驳回</a>';
rowData = '<a class="layui-btn layui-btn-danger layui-btn-xs">审批驳回</a>';
}
return rowData;
}

10
src/main/resources/static/route/examapply/list.html
View File

@ -166,13 +166,13 @@
return '-';
}
if(rowData == '0') {
rowData = '<a class="layui-btn layui-btn-xs">待审批</a>';
rowData = '<a class="layui-btn layui-btn-warm layui-btn-xs">待审批</a>';
}
if(rowData == '1') {
rowData = '<a class="layui-btn layui-btn-xs">审批通过</a>';
}
if(rowData == '2') {
rowData = '<a class="layui-btn layui-btn-xs">审批驳回</a>';
rowData = '<a class="layui-btn layui-btn-danger layui-btn-xs">审批驳回</a>';
}
return rowData;
}
@ -184,7 +184,7 @@
return '-';
}
if(rowData == '0') {
rowData = '<a class="layui-btn layui-btn-xs">未分配</a>';
rowData = '<a class="layui-btn layui-btn-warm layui-btn-xs">未分配</a>';
}
if(rowData == '1') {
rowData = '<a class="layui-btn layui-btn-xs">已分配</a>';
@ -199,7 +199,7 @@
return '-';
}
if(rowData == '0') {
rowData = '<a class="layui-btn layui-btn-xs">未分配</a>';
rowData = '<a class="layui-btn layui-btn-warm layui-btn-xs">未分配</a>';
}
if(rowData == '1') {
rowData = '<a class="layui-btn layui-btn-xs">已分配</a>';
@ -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) {

80
src/main/resources/static/route/examapply/update.html
View File

@ -196,7 +196,7 @@
<div class="layui-form-item layui-layout-admin">
<div class="layui-input-block">
<div class="layui-footer" style="left: 0;">
<button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交编辑</button>
<button type="button" class="layui-btn" id="subBtn" lay-submit lay-filter="submitForm">提交编辑</button>
<button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
</div>
</div>
@ -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']);

9
src/main/resources/static/route/examcheck/list.html
View File

@ -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 = '<a class="layui-btn layui-btn-warm layui-btn-xs">待审核</a>';
}
if('2' == rowData) {
rowData = '审核通过';
rowData = '<a class="layui-btn layui-btn-xs">审核通过</a>';
}
if('3' == rowData) {
rowData = '审核驳回';
rowData = '<a class="layui-btn layui-btn-danger layui-btn-xs">审核驳回</a>';
}
return rowData;
}