Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

beetlsql3-dev
c1769 2 years ago
commit cff0ae81e9

@ -104,7 +104,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
@GetMapping(MODEL + "/add.do")
@Function("teacherOpenCourseHandsOnSimulationTasks.add")
public ModelAndView add(Long taskId, Long handsOnId,Long courseInfoId) {
public ModelAndView add(Long taskId, Long handsOnId,Long teacherOpenCourseId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html");
if(null != taskId){
TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksService.queryById(taskId);
@ -114,7 +114,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
view.addObject("teacherOpenCourseHandsOnSimulationTasks", new TeacherOpenCourseHandsOnSimulationTasks());
}
view.addObject("handsOnId",handsOnId);
view.addObject("courseInfoId", courseInfoId);
view.addObject("teacherOpenCourseId", teacherOpenCourseId);
return view;
}

@ -98,10 +98,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
templet: function (d) {
var css = isAdmin? "" : "display: none;";
var htm = '<div style="text-align:left">';
if(d.dataType == 'ADMIN_ADD'&&isAdmin){
htm += '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>'
+ '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
}
htm += '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>'
+ '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
// htm += '<a class="layui-table-link" lay-event="edit"style="' + css + '">编辑</a>';
htm += '<a class="layui-table-link" lay-event="edit">'+ ((d.dataType == 'FACULTY_ADD' && !isAdmin)||(d.dataType == 'ADMIN_ADD' && isAdmin)?'编辑':'查看')+'</a>';
@ -288,11 +286,12 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
// var url = "/jlw/handsOn/add.do?handsOnId=" + data.handsOnId+'&sign=1';
// Common.openDlg(url, "课程实训案例管理>新增课程实训案例>添加实训任务");
var courseInfoId = data.dataType === 'FACULTY_ADD'?data.teacherOpenCourseId:data.systemCourseInfoId;
var url;
if(isAdmin){
url = "/jlw/handsOnSimulationTasks/add.do?handsOnId=" + data.handsOnId + '&courseInfoId=' + courseInfoId;
url = "/jlw/handsOnSimulationTasks/add.do?handsOnId=" + data.handsOnId;
}else {
url = "/jlw/teacherOpenCourseHandsOnSimulationTasks/add.do?handsOnId="+ data.handsOnId + '&courseInfoId=' + courseInfoId;
url = "/jlw/teacherOpenCourseHandsOnSimulationTasks/add.do?handsOnId="+ data.handsOnId+'&teacherOpenCourseId='+courseInfoId;
}
Common.openDlg(url);
} else if (obj.event === "up") {

@ -44,27 +44,16 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp
initSubmit:function(){
$("#updateButton").click(function(){
form.on('submit(form)', function(){
var sourceType = $("select[name='courseInfoId']").find('option:selected').attr("status");
//保存校验
var courseInfoId = '',teacherOpenCourseId = '';
if(sourceType == '2'){//系统课程
courseInfoId = $("select[name='courseInfoId']").val();
}else if(sourceType == '1'){//开课课程
teacherOpenCourseId = $("select[name='courseInfoId']").val();
}
//归属课程
var courseInfoId = $("select[name='courseInfoId']").val();
//归属章节
var courseChildNode = $("select[name='courseChildNode']").val();
var handsOnName = $("#handsOnName").val();
var oneContent = layedit.getContent(one);
if ($.isEmpty(courseInfoId)) {
if($.isEmpty(teacherOpenCourseId)){
layer.msg('归属课程必填', {icon: 5})
return
}
layer.msg('归属课程必填', {icon: 5})
return
}
if ($.isEmpty(courseChildNode)) {
layer.msg('归属章节必填', {icon: 5})
@ -88,14 +77,23 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp
url:imgFile
});
});
var param = $("#updateForm").serializeJson();
if(trainingData.length > 0){ //数据集大于O时
param.trainingData = JSON.stringify(trainingData);
var param ={
teacherOpenCourseId:courseInfoId,
courseInfoId:courseInfoId,
teacherOpenCourseMergeCourseInfoId:courseChildNode,
handsOnName:handsOnName,
handsOnRecommend:layedit.getContent(one),
trainingData:JSON.stringify(trainingData),
handsOnId:$("#updateForm input[name='handsOnId']").val()
};
/*if(trainingData.length > 0){ //数据集大于O时
param.trainingData = ;
}
param.handsOnRecommend = layedit.getContent(one);
param.handsOnRecommend = ;
handsOnId = $("#updateForm input[name='handsOnId']").val();
param.courseInfoId = courseInfoId;
param.teacherOpenCourseId = teacherOpenCourseId;
param.teacherOpenCourseId = courseChildNode;
param.teacherOpenCourseMergeCourseInfoId = courseChildNode;*/
var url = "/jlw/teacherOpenCourseHandsOn/edit.json";
var ret = Common.postAjax(url,param);
@ -136,8 +134,9 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp
$(".button_add").click(() => {
handsOnId = $("#updateForm input[name='handsOnId']").val();
var teacherOpenCourseId = $("select[name='courseInfoId']").val();
if (!$.isEmpty(handsOnId)){
var url = "/jlw/teacherOpenCourseHandsOnSimulationTasks/add.do?handsOnId="+handsOnId;
var url = "/jlw/teacherOpenCourseHandsOnSimulationTasks/add.do?handsOnId="+handsOnId + "&teacherOpenCourseId="+teacherOpenCourseId;
Common.openDlg(url);
}
});

@ -22,7 +22,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
var tableData4 = [];
var resourcesQuestionIds = ""; //选中题目id
var courseInfoIds = $("input[name=courseInfoId_1]").val();
var teacherOpenCourseId = $("input[name=teacherOpenCourseId]").val();
var typeInfo = $("#taskTypeInfo input[name='taskType']:checked").val(); //当前操作的类型
if (typeInfo == 1){
$(".progressCss_mp4 .closeInfo").unbind();
@ -33,7 +33,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
$(".progressCss_ppt .closeInfo").unbind();
$(".progressCss_ppt .closeInfo").click(function (){
$(this).parents(".progressCss_ppt").remove();
});;
});
}else if(typeInfo == 3){
getQuestionTotal();
resourcesQuestionIds = $("input[name='taskList']").val(); //选中的题目ID
@ -225,7 +225,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
, btn: ['保存','关闭']
,success:function () {
resourcesQuestionTable();
Lib.getCourseInfo($("select[name='courseInfoId_1']"), courseInfoIds);
Lib.getCourseInfo($("select[name='courseInfoId_1']"), teacherOpenCourseId);
}
, yes: function (index, layero) {
var ret = Common.getAjax('/jlw/handsOnSimulationTasks/getObjectiveProblem.do?problemIds='+resourcesQuestionIds);
@ -250,7 +250,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
btn.on('click', function () {
resourcesQuestionTable1.reload({
where: {
'courseInfoParentId':courseInfoIds,
'courseInfoParentId':teacherOpenCourseId,
'courseInfoId':$("#resourcesQuestionTable_demo select[name='courseInfoId_1']").find("option:selected").val(),
"questionStem":$("#resourcesQuestionTable_demo input[name='generalQuestionSettingName']").val(),
'questionType':$("#resourcesQuestionTable_demo select[name='questionType']").find("option:selected").val()
@ -296,7 +296,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
resourcesQuestionIds = [];
$("#countQ").html(0);
var param = {
'courseInfoParentId':courseInfoIds,
'courseInfoParentId':teacherOpenCourseId,
'courseInfoId':$("#resourcesQuestionTable_demo select[name='courseInfoId_1']").find("option:selected").val(),
"questionStem":$("#resourcesQuestionTable_demo input[name='generalQuestionSettingName']").val(),
'questionType':$("#resourcesQuestionTable_demo select[name='questionType']").find("option:selected").val()
@ -319,7 +319,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
url: Common.ctxPath + '/jlw/resourcesQuestion/list.json' // 数据接口
, page: Lib.tablePage // 开启分页
, limit: 8
, where: {"courseInfoParentId": courseInfoIds}
, where: {"courseInfoParentId": teacherOpenCourseId}
,cols: [[ // 表头
{
type: 'checkbox', align: "center"
@ -369,9 +369,9 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
var taskId = $("#addForm input[name='taskId']").val();
var taskId = $("#addForm input[name='taskId']").val(),param = {},
handsOnId = $("#addForm input[name='handsOnId']").val();
handsOnId = $("#addForm input[name='handsOnId']").val(),
teacherOpenCourseId = $("#addForm input[name='teacherOpenCourseId']").val();
var taskType = $("#taskTypeInfo input[name='taskType']:checked").val(); //得到当前操作的任务类型 1观看视频 2PPT 3理论测评 4实操 5报告撰写
var key = $("#taskTypeContent .layui-show");
param.taskTitle = key.find("input[name='taskTitle']").val(); //标题
@ -494,6 +494,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
param.taskType = taskType;
param.taskId = taskId;
param.handsOnId = handsOnId; //案例ID
param .teacherOpenCourseId = teacherOpenCourseId;
var url = "/jlw/teacherOpenCourseHandsOnSimulationTasks/edit.json";
if($.isEmpty(taskId)){
url = "/jlw/teacherOpenCourseHandsOnSimulationTasks/add.json";
@ -505,24 +506,11 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
time: 1500 //2秒关闭如果不配置默认是3秒
}, function () {
if (ret.code == 0) {
window.parent.location.reload();
Lib.closeFrame();
parent.loadList();
}
});
/*if(!$.isEmpty(taskId)){
teacherOpenCourseHandsOnSimulationTasksApi.updateTeacherOpenCourseHandsOnSimulationTasks($('#addForm'),function(){
parent.window.dataReload();
Common.info("更新成功");
Lib.closeFrame();
});
}else{
teacherOpenCourseHandsOnSimulationTasksApi.addTeacherOpenCourseHandsOnSimulationTasks($('#addForm'),function(){
parent.window.dataReload();
Common.info("添加成功");
Lib.closeFrame();
});
}*/
});
});

@ -63,7 +63,8 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeResourcesQuesti
var v = $("select[name='questionType']").val();// 1:单选 2多选 3判断
var param = {
teacherOpenCourseMergeResourcesQuestionId:teacherOpenCourseMergeResourcesQuestionId,
teacherOpenCourseInfoId:courseInfoId,
teacherOpenCourseId:courseInfoId_0,
teacherOpenCourseMergeCourseInfoId:courseInfoId_1,
questionScore:questionScore,
questionStem:questionStem,
questionType:v,
@ -77,8 +78,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseMergeResourcesQuesti
param.questionOptionD = questionOptionD;
param.questionOptionE = questionOptionE;
}
console.log(param)
return;
var url = "/jlw/teacherOpenCourseMergeResourcesQuestion/add.json";
if(!$.isEmpty(teacherOpenCourseMergeResourcesQuestionId)){
url = "/jlw/teacherOpenCourseMergeResourcesQuestion/edit.json";

@ -636,7 +636,7 @@
<!-- 业务对象须有hidden字段保存delFlag和version字段-->
<input type="hidden" name="taskId" value="${teacherOpenCourseHandsOnSimulationTasks.taskId}" />
<input type="hidden" id="handsOnId" name="handsOnId" value="${handsOnId}" class="layui-input">
<input type="hidden" id="courseInfoId" name="courseInfoId" value="${courseInfoId}" class="layui-input">
<input type="hidden" id="teacherOpenCourseId" name="teacherOpenCourseId" value="${teacherOpenCourseId}" class="layui-input">
<div class="layui-form-item" style="/*position:absolute;*/right:10px;bottom:0px;">
<button class="layui-btn layui-btn-primary" type="button" style="padding: 0 30px;" id="addButton-cancel">返回</button>
<button class="layui-btn layui-btn-danger"

@ -34,7 +34,7 @@
<div class="layui-inline">
<label class="layui-form-label">归属课程:</label>
<div class="layui-input-inline" style="margin-left: 30px;">
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类","defaultValue": teacherOpenCourseMergeResourcesQuestion.teacherOpenCourseId}) {} -->
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "开课类","defaultValue": teacherOpenCourseMergeResourcesQuestion.teacherOpenCourseId}) {} -->
</div>
</div>
</div>

Loading…
Cancel
Save