ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

考试模块

This commit is contained in:
flower 2018-12-27 22:32:03 +08:00
parent 50ef7bd77b
commit ddcc650816
3 changed files with 70 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ExamExaminationController.java
View File

@ -113,8 +113,11 @@ public class ExamExaminationController extends BaseController
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(ExamExamination examExamination)
{
return toAjax(examExaminationService.updateById(examExamination));
{
examExamination.setDelFlag("0");
examExamination.setUpdateDate(new Date());
examExamination.setUpdateBy(ShiroUtils.getLoginName());
return toAjax(examExaminationService.updateSelectiveById(examExamination));
}
/**

38
ruoyi-exam/src/main/resources/templates/exam/examExamination/add.html
View File

@ -22,7 +22,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">考试试卷：</label>
<div class="col-sm-3">
<input id="treeName" name="treeName" onclick="selectExamPaperCategoryTree()" class="form-control" type="text" readonly="true">
<input id="treeName" name="treeName" value="试卷分类" onclick="selectExamPaperCategoryTree()" class="form-control" type="text" readonly="true">
</div>
<div class="col-sm-5">
<select id="examPaperId" name="examPaperId" class="form-control m-b" >
@ -114,13 +114,47 @@
<script type="text/javascript">
var prefix = ctx + "exam/examExamination"
$(function () {
var config = {
url: ctx + "exam/examPaper"+ "/list",
type: "post",
dataType: "json",
data: {examPaperCategoryId:1},
// contentType:"application/json",
success: function(result) {
$("#examPaperId").html("<option value=''>---请选择---</option>");
var rows =result.rows;
for(var i in rows){
$("#examPaperId").append("<option value='"+rows[i].id+"'>"+rows[i].name+"</option>");
}
}
};
$.ajax(config)
})
$("#form-examExamination-add").validate({
rules:{
xxxx:{
name:{
required:true,
},
examPaperId:{
required:true,
},
startTime:{
required:true,
},
endTime:{
required:true,
},
passMark:{
required:true,
},
timeLength:{
required:true
}
}
});

38
ruoyi-exam/src/main/resources/templates/exam/examExamination/edit.html
View File

@ -6,6 +6,7 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-examExamination-edit" th:object="${examExamination}">
<input id="id" name="id" th:field="*{id}" type="hidden">
<input id="paperId" name="paperId" th:value="${examExamination.examPaperId}" type="hidden">
<div class="form-group">
<div class="form-group">
@ -21,8 +22,8 @@
<input id="treeName" name="treeName" value="试卷分类" onclick="selectExamPaperCategoryTree()" class="form-control" type="text" readonly="true">
</div>
<div class="col-sm-5">
<select id="examPaperId" name="examPaperId" class="form-control m-b" >
<option>---请选择---</option>
<select id="examPaperId" name="examPaperId" class="form-control m-b" >
<option value="">---请选择---</option>
</select>
</div>
</div>
@ -113,14 +114,17 @@
url: ctx + "exam/examPaper"+ "/list",
type: "post",
dataType: "json",
data: {examPaperCategoryId:$("#examPaperId").val()},
data: {examPaperCategoryId:1},
// contentType:"application/json",
success: function(result) {
$("#examPaperId").html("<option>---请选择---</option>");
debugger
var id = $("#paperId").val();
$("#examPaperId").html("<option value=''>---请选择---</option>");
var rows =result.rows;
for(var i in rows){
$("#examPaperId").append("<option value='"+rows[i].id+"'>"+rows[i].name+"</option>");
}
$("#examPaperId").val(id);
}
};
$.ajax(config)
@ -128,11 +132,27 @@
$("#form-examExamination-edit").validate({
rules:{
xxxx:{
required:true,
},
}
rules:{
name:{
required:true,
},
examPaperId:{
required:true,
},
startTime:{
required:true,
},
endTime:{
required:true,
},
passMark:{
required:true,
},
timeLength:{
required:true
}
}
});
function submitHandler() {