Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup

This commit is contained in:
Renpc-kilig 2021-06-19 18:03:13 +08:00
commit 7864428956
6 changed files with 119 additions and 301 deletions

View File

@ -357,6 +357,24 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl
dto.setReportType(examCheck.getCheckStatus() + "");
dto.setReportReason(examCheck.getReason());
}
// 补充考试申请时提交的图片及PDF
params.put("classPlanId", classPlanId);
Map<String, Object> examFile = classPlanDao.getExamFile(params);
if(examFile != null && examFile.get("examImages") != null){
dto.setExamImages(examFile.get("examImages").toString());
}
if(examFile != null && examFile.get("examPDF") != null){
dto.setExamPDF(examFile.get("examPDF").toString());
}
// 补充考试申请退回原因
params.put("examId",classPlanId);
ExamApplyDTO examApplyDTO = examApplyService.get(params);
if(examApplyDTO != null && examApplyDTO.getCheckStatus() != null){
dto.setExamType(examApplyDTO.getCheckStatus() + "");
}
if(examApplyDTO != null && examApplyDTO.getReason() != null){
dto.setExamReason(examApplyDTO.getReason());
}
return dto;
}
@ -481,14 +499,10 @@ public class ClassPlanServiceImpl extends DefaultBaseService implements IClassPl
// 查询工种类型
WorkTypeDTO workTypeDTO = workTypeService.get(item.getWorkerCatalog());
item.setWorkerCatalogName(workTypeDTO == null ? "" : workTypeDTO.getWorkTypeName());
//查询已报名人数
queryMap.put("applyClassId",item.getClassPlanId());
List<String> applyAuditStates = new ArrayList<>();
applyAuditStates.add("3");
queryMap.put("applyAuditStates",applyAuditStates);
List<ApplyDTO> list = applyService.list(queryMap);
item.setSignUpUserCount(list == null ? 0 : list.size());
//查询计划申请状态
//查询申考人员
List<ApplyStudentsDTO> applyStudentsDTOS = studentsService.listByClssId(item.getClassPlanId());
item.setSignUpUserCount(applyStudentsDTOS == null ? 0 : applyStudentsDTOS.size());
//查询考试申请状态
queryMap.clear();
queryMap.put("examId",item.getClassPlanId());
ExamApplyDTO examApplyDTO = examApplyService.get(queryMap);

View File

@ -98,7 +98,7 @@
cols: [
[
{field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '<span>{{d.LAY_INDEX}}</span>'},
{width:150, title: '操作', fixed: 'left', align:'center',
{width:100, title: '操作', fixed: 'left', align:'center',
templet: function(row) {
var dom = '';
if(row['examType'] === ''){
@ -106,15 +106,15 @@
return dom;
}
if(row['examType'] === '0'){
dom += '<a type="button" class="layui-btn layui-btn-primary layui-btn-xs" lay-event="updateEvent">查看详情</a>';
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">查看申请</a>';
return dom;
}
if(row['examType'] === '1'){
dom += '<a type="button" class="layui-btn layui-btn-primary layui-btn-xs" lay-event="showEvent">查看详情</a>';
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">查看申请</a>';
return dom;
}
if(row['examType'] === '-1'){
dom += '<a type="button" class="layui-btn layui-btn-primary layui-btn-xs" lay-event="updateEvent">修改重申</a>';
dom += '<a type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="updateEvent">修改重申</a>';
return dom;
}
}
@ -153,7 +153,8 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData === '') {
return '-';
}
return '<span style="color: #0a54a6">' + rowData + '</span> 人';
var dom = '<a type="button" class="layui-btn layui-btn-primary layui-btn-xs" lay-event="signUpUserEvent">查看</a>';
return '<span style="color: #0a54a6">' + rowData + '</span> 人 ' + dom;
}
},
{field: 'planNumber', width: 400, title: '班次及培训名称', align:'center',
@ -178,7 +179,17 @@
return end.substring(0,10);
}
},
{field: 'projectCatalogName', width: 180, title: '培训项目', align:'center',
{field: 'chargePerson', width: 110, title: '负责人', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData;
}
},
{field: 'chargePersonTel', width: 120, title: '联系方式', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -262,12 +273,12 @@
if(layEvent == 'showEvent'){
layer.open({
type: 2,
title: '查看申请结果',
title: '查看申请',
closeBtn: 1,
area: ['80%', '80%'],
shadeClose: false,
anim: 2,
content: top.restAjax.path('route/classplan/show-report-exam.html?classPlanId={classPlanId}', [obj.data.classPlanId]),
content: top.restAjax.path('route/classplan/update-exam-commit.html?classPlanId={classPlanId}', [obj.data.classPlanId]),
end: function () {
}
});
@ -275,12 +286,27 @@
if(layEvent == 'updateEvent'){
layer.open({
type: 2,
title: '查看申请信息',
title: '修改重申',
closeBtn: 1,
area: ['60%', '80%'],
shadeClose: false,
anim: 2,
content: top.restAjax.path('route/classplan/update-report-exam.html?classPlanId={classPlanId}', [obj.data.classPlanId]),
content: top.restAjax.path('route/classplan/update-exam-commit.html?classPlanId={classPlanId}', [obj.data.classPlanId]),
end: function () {
reloadTable();
}
});
}
if(layEvent == 'signUpUserEvent') {
layer.open({
type: 2,
title: '报名人员列表',
closeBtn: 1,
area: ['90%', '90%'],
shadeClose: true,
anim: 2,
content: top.restAjax.path('route/classplan/list-signup-user.html?classPlanId={arg}&reportType={arg1}&orgId={arg2}&workerCatalog={arg3}',
[obj.data.classPlanId,'1', obj.data.orgId,obj.data.workerCatalog]),
end: function () {
reloadTable();
}

View File

@ -61,7 +61,7 @@
var orgId = top.restAjax.params(window.location.href).orgId;
var workerCatalog = top.restAjax.params(window.location.href).workerCatalog;
var tableUrl = '';
if(reportType == '2'){
if(reportType == '1'){
tableUrl = 'api/applystudents/listpage';
} else{
$('#add-apply-user').show();
@ -82,7 +82,7 @@
where :{
applyInstitutionId: orgId,
applyWorkTypeId : workerCatalog,
applyClassId : reportType == "2" ? classPlanId : '',
applyClassId : reportType == "1" ? classPlanId : '',
applyAuditStates : '2'
},
toolbar: false,

View File

@ -93,17 +93,17 @@
templet: function(row) {
var dom = '';
if(row['reportType'] === '0'){
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">报名人员</a>';
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">参培人员</a>';
dom += '<a type="button" class="layui-btn layui-btn-info layui-btn-xs" lay-event="showEvent">查看申请</a>';
return dom;
}
if(row['reportType'] === '1'){
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">报名人员</a>';
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">参培人员</a>';
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="showEvent">申请通过</a>';
return dom;
}
if(row['reportType'] === '-1'){
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">报名人员</a>';
dom += '<a type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="signUpUserEvent">参培人员</a>';
dom += '<a type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="unPassEvent">修改重申</a>';
return dom;
}

View File

@ -21,15 +21,14 @@
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>班号</label>
<div class="layui-input-block">
<input type="text" id="planNumber" name="planNumber" class="layui-input" value="" readonly="readonly" maxlength="100">
<input type="text" id="planNumber" name="planNumber" class="layui-input" value=""
autocomplete="off" placeholder="班号不可重复" lay-verify="required" maxlength="100">
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>名称</label>
<label class="layui-form-label"><span style="color: red">*</span>开班名称</label>
<div class="layui-input-block">
<input type="text" id="planName" name="planName" class="layui-input" value=""
autocomplete="off" placeholder="请输入班级名称" lay-verify="required" maxlength="255">
@ -42,7 +41,7 @@
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>培训类型</label>
<div class="layui-input-block">
<select id="planType" name="planType" readonly="readonly">
<select id="planType" name="planType">
<option value="1">初训</option>
<option value="2">复训</option>
</select>
@ -51,32 +50,23 @@
</div>
<div class="layui-col-md3">
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>培训项目</label>
<label class="layui-form-label"><span style="color: red">*</span>培训时间</label>
<div class="layui-input-block">
<input type="hidden" id="projectCatalogId" name="projectCatalogId" value="">
<input type="text" id="projectCatalogName" name="projectCatalogName" class="layui-input" value="" style="cursor: pointer;" lay-verify="required" placeholder="请选择培训项目" readonly="readonly">
<input type="text" id="planStartTime" name="planStartTime" class="layui-input" value="" placeholder="请选择开班时间" readonly style="cursor: pointer;" lay-verify="required">
</div>
</div>
</div>
<div class="layui-col-md3">
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>开始时间</label>
<label class="layui-form-label"><span style="color: red">*</span>结培时间</label>
<div class="layui-input-block">
<input type="text" id="planStartTime" name="planStartTime" class="layui-input" value="" placeholder="请选择培训开始时间" readonly style="cursor: pointer;" lay-verify="required">
</div>
</div>
</div>
<div class="layui-col-md3">
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>结束时间</label>
<div class="layui-input-block">
<input type="text" id="planEndTime" name="planEndTime" class="layui-input" value="" placeholder="请选择培训结束时间" readonly style="cursor: pointer;" lay-verify="required">
<input type="text" id="planEndTime" name="planEndTime" class="layui-input" value="" placeholder="请选择结课时间" readonly style="cursor: pointer;" lay-verify="required">
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md6">
<div class="layui-col-md3">
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>负责人</label>
<div class="layui-input-block">
@ -85,7 +75,7 @@
</div>
</div>
</div>
<div class="layui-col-md6">
<div class="layui-col-md3">
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>联系方式</label>
<div class="layui-input-block">
@ -94,9 +84,7 @@
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>培训地点</label>
<div class="layui-input-block">
@ -107,14 +95,14 @@
</div>
</div>
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-col-md6">
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">图片文件</label>
<label class="layui-form-label">考试申请-图片</label>
<div class="layui-input-block">
<input type="hidden" id="planImages" name="planImages">
<div class="layui-btn-container" id="planImagesFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="planImagesFileDownload" type="text/html">
{{# var fileName = 'planImages'; }}
<input type="hidden" id="examImages" name="examImages">
<div class="layui-btn-container" id="examImagesFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="examImagesFileDownload" type="text/html">
{{# var fileName = 'examImages'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
@ -129,16 +117,14 @@
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-col-md6">
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">PDF文件</label>
<label class="layui-form-label">考试申请-PDF</label>
<div class="layui-input-block">
<input type="hidden" id="planPDF" name="planPDF">
<div class="layui-btn-container" id="planPDFFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="planPDFFileDownload" type="text/html">
{{# var fileName = 'planPDF'; }}
<input type="hidden" id="examPDF" name="examPDF">
<div class="layui-btn-container" id="examPDFFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="examPDFFileDownload" type="text/html">
{{# var fileName = 'examPDF'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
@ -159,57 +145,27 @@
<table class="layui-table" id="dataTable" lay-filter="dataTable">
<thead>
<tr>
<th style="width: 50px; text-align: center"><b>确认课程</b></th>
<th style="width: 100px; text-align: center"><b>选择讲师</b></th>
<th style="width: 200px; text-align: center"><b>授课时间</b></th>
<th style="width: 260px; text-align: center"><b>课程名称</b></th>
<th style="width: 100px; text-align: center"><b>课程类型</b></th>
<th style="width: 100px; text-align: center"><b>授课方式</b></th>
<th style="width: 200px; text-align: center"><b>课程名称</b></th>
<th style="width: 200px; text-align: center"><b>讲师姓名</b></th>
<th style="width: 200px; text-align: center"><b>授课日期</b></th>
<th style="width: 260px; text-align: center"><b>时间</b></th>
</tr>
</thead>
<tbody id="lessonTbodyBox"></tbody>
<script type="text/html" id="lessonTbodyTemplate">
{{# for(var i = 0, item; item = d.lesson[i++];) { }}
<tr id="lesson-{{item.lessonId}}" data-lesson-id="{{item.lessonId}}">
<td style="text-align: center">
<input data-lesson-id="{{item.lessonId}}" type="checkbox" name="lessonCheckBox" lay-skin="primary" lay-filter="lessonCheckBox" disabled>
</td>
<td style="text-align: center">
<select id="select-{{item.lessonId}}">
<option value="">请选择</option>
{{# for(var j = 0, teacher; teacher = d.teacher[j++];) { }}
<option value="{{teacher.teacherId}}">{{teacher.teacherName}}</option>
{{# } }}
</select>
</td>
<td>
<div class="test-table-reload-btn">
<div class="layui-inline">
<input type="text" id="date-start-{{item.lessonId}}" value="" class="layui-input search-item lessons-date"
style="width: 150px" placeholder="开始时间" readonly>
</div>
<div class="layui-inline">
<input type="text" id="date-end-{{item.lessonId}}" value="" class="layui-input search-item lessons-date"
style="width: 150px" placeholder="结束时间" readonly>
</div>
</div>
</td>
<tbody id="lessonTeacherBox"></tbody>
<script type="text/html" id="lessonTeacherTemplate">
{{# for(var i = 0, item; item = d[i++];) { }}
<tr>
<td style="text-align: center">
{{item.lessonName}}
</td>
<td style="text-align: center">
{{# if(item.lessonType == '1'){ }}
必修
{{# } }}
{{# if(item.lessonType == '2'){ }}
选修
{{# } }}
{{item.teacherName}}
</td>
<td style="text-align: center">
{{# if(item.teachWay == '1'){ }}
面授
{{# } }}
{{item.startDate}} 至 {{item.endDate}}
</td>
<td style="text-align: center">
{{item.startTime}} - {{item.endTime}}
</td>
</tr>
{{# } }}
@ -217,54 +173,6 @@
</table>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">考试申请图片</label>
<div class="layui-input-block">
<input type="hidden" id="examImages" name="examImages">
<div class="layui-btn-container" id="examImagesFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="examImagesFileDownload" type="text/html">
{{# var fileName = 'examImages'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
<div class="upload-image-box">
<span class="upload-image-span">
<img src="route/file/download/false/{{item.fileId}}" align="加载失败">
</span>
</div>
{{# } }}
{{# } }}
</script>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">考试申请PDF</label>
<div class="layui-input-block">
<input type="hidden" id="examPDF" name="examPDF">
<div class="layui-btn-container" id="examPDFFileBox" style="border: 1px solid #e6e6e6;"></div>
<script id="examPDFFileDownload" type="text/html">
{{# var fileName = 'examPDF'; }}
{{# if(d[fileName].length > 0) { }}
{{# var files = d[fileName];}}
{{# for(var i = 0, item = files[i]; item = files[i++];) { }}
<div class="upload-image-box">
<span class="upload-image-span">
<img src="assets/images/pdf_icon.jpg" title="{{item.fileName}}" data-id="{{item.fileId}}" align="加载失败" class="pdf-open-show">
</span>
</div>
{{# } }}
{{# } }}
</script>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
@ -290,7 +198,7 @@
var classPlanLessons = [];
var classPlanId = top.restAjax.params(window.location.href).classPlanId;
var orgId = '';
var planImagesViewerObj = {};
var lessonTeacherArray = [];
var examImagesViewerObj = {};
// 初始化内容
@ -303,24 +211,23 @@
}
dataFormData['planStartTime'] = dataFormData['planStartTime'].substring(0,10);
dataFormData['planEndTime'] = dataFormData['planEndTime'].substring(0,10);
dataFormData['signUpStartTime'] = dataFormData['signUpStartTime'].substring(0,10);
dataFormData['signUpEndTime'] = dataFormData['signUpEndTime'].substring(0,10);
form.val('dataForm', dataFormData);
form.render(null, 'dataForm');
if(dataFormData['reportReason'] = ''){
$('#report-reason-block').show();
}
//初始化课程列表
initTeacherList(data.orgId);
classPlanLessons = data.classPlanLessons;
orgId = data.orgId;
initPlanImagesUploadFile();
initPlanPDFUploadFile();
lessonTeacherArray = data['classPlanLessons'];
initLessonTeacher();
initExamImagesUploadFile();
initExamPDFUploadFile();
setTimeout(function(){
$('.layui-card').height($('.layui-card').height());
},1000);
if($win.height() < $('.layui-card').height()){
$('.layui-card').height($('.layui-card').height());
} else {
$('.layui-card').height($win.height());
}
},100);
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {
@ -331,143 +238,10 @@
}
initData();
//查询讲师列表
function initTeacherList(orgId){
top.restAjax.get(top.restAjax.path('api/teacher/list',[]), {orgId : orgId}, null, function(code,data){
teacherList = data;
initLessonsList();
},function(code,data){
top.dialog.msg(data.msg);
});
}
//查询课程列表
function initLessonsList(){
var dataObj = {};
var projectCatalogId = $('#projectCatalogId').val();
if(projectCatalogId == ''){
dataObj['lesson'] = [];
dataObj['teacher'] = [];
laytpl(document.getElementById('lessonTbodyTemplate').innerHTML).render(dataObj, function(html) {
document.getElementById('lessonTbodyBox').innerHTML = html;
});
form.render();
return;
}
top.restAjax.get(top.restAjax.path('api/lessons/list',[]), {projectCatalogId : projectCatalogId, orgId: orgId}, null, function(code,data){
dataObj['lesson'] = data;
dataObj['teacher'] = teacherList;
laytpl(document.getElementById('lessonTbodyTemplate').innerHTML).render(dataObj, function(html) {
document.getElementById('lessonTbodyBox').innerHTML = html;
});
form.render();
reloadLessonsList();
},function(code,data){
top.dialog.msg(data.msg);
});
}
// 初始化图片上传
function initPlanImagesUploadFile() {
var files = $('#planImages').val();
initFileList('planImages', files, function(fileName) {
var viewer = new Viewer(document.getElementById(fileName +'FileBox'), {navbar: false});
planImagesViewerObj[fileName] = viewer;
});
form.on('button(planImagesUploadFile)', function(obj) {
var name = this.dataset.name;
var explain = this.dataset.explain;
top.dialog.file({
type: 'image',
title: '上传'+ explain,
width: '400px',
height: '420px',
maxFileCount: '1',
onClose: function() {
var uploadFileArray = top.dialog.dialogData.uploadFileArray;
if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
var files = $('#'+ name).val();
for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
if(files.length > 0) {
files += ',';
}
files += file.data;
}
initFileList(name, files, function(fileName) {
planImagesViewerObj[fileName].update();
});
}
}
});
});
form.on('button(planImagesRemoveFile)', function(obj) {
var name = this.dataset.name;
var id = this.dataset.id;
var files = $('#'+ name).val().replace(id, '');
files = files.replace(/\,+/g, ',');
if(files.charAt(0) == ',') {
files = files.substring(1);
}
if(files.charAt(files.length - 1) == ',') {
files = files.substring(0, files.length - 1);
}
initFileList(name, files, function(fileName) {
planImagesViewerObj[fileName].update();
});
});
}
// 初始化PDF上传
function initPlanPDFUploadFile() {
var files = $('#planPDF').val();
initFileList('planPDF', files, function(fileName) {
$(document).on('click', '.pdf-open-show', function(obj){
var fileId = this.dataset.id;
window.open('route/file/download/true/' + fileId);
})
});
form.on('button(planPDFUploadFile)', function(obj) {
var name = this.dataset.name;
var explain = this.dataset.explain;
top.dialog.file({
type: 'file',
title: '上传'+ explain,
width: '400px',
height: '420px',
maxFileCount: '1',
onClose: function() {
var uploadFileArray = top.dialog.dialogData.uploadFileArray;
if(typeof(uploadFileArray) != 'undefined' && uploadFileArray.length > 0) {
var files = $('#'+ name).val();
for(var j = 0, file = uploadFileArray[j]; file = uploadFileArray[j++];) {
if(files.length > 0) {
files += ',';
}
files += file.data;
}
initFileList(name, files, function(fileName) {
});
}
}
});
});
form.on('button(planPDFRemoveFile)', function(obj) {
var name = this.dataset.name;
var id = this.dataset.id;
var files = $('#'+ name).val().replace(id, '');
files = files.replace(/\,+/g, ',');
if(files.charAt(0) == ',') {
files = files.substring(1);
}
if(files.charAt(files.length - 1) == ',') {
files = files.substring(0, files.length - 1);
}
initFileList(name, files, function(fileName) {
});
// 加载已添加的课程及讲师
function initLessonTeacher(){
laytpl(document.getElementById('lessonTeacherTemplate').innerHTML).render(lessonTeacherArray, function(html) {
document.getElementById('lessonTeacherBox').innerHTML = html;
});
}

View File

@ -128,8 +128,12 @@
initExamImagesUploadFile();
initExamPDFUploadFile();
setTimeout(function(){
$('.layui-card').height($('.layui-card').height());
},1000);
if($win.height() < $('.layui-card').height()){
$('.layui-card').height($('.layui-card').height());
} else {
$('.layui-card').height($win.height());
}
},100);
}, function(code, data) {
top.dialog.msg(data.msg);
}, function() {