diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js index c691f469..6c31b7c5 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js @@ -64,6 +64,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT $(this).parents(".progressCss_file").remove(); }); } + var assessmentContent = $("#assessmentContent").val(); window.loadYl = function (){//富文本代码编辑器 产生变化时触发 yl(); @@ -569,8 +570,13 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT editor.setToolbarAutoFixed(false); } } - resourcesInfoShowTable.reload({data:[]}); - resourcesInfoShowPPTTable.reload({data:[]}); + if(obj.value == "2"||obj.value == "1"){ + if(!$.isEmpty(resourcesInfoShowTable) || !$.isEmpty(resourcesInfoShowPPTTable)){ + resourcesInfoShowTable.reload({data:[]}); + resourcesInfoShowPPTTable.reload({data:[]}); + } + } + // $("input[name='taskTitle']").val(""); // $("input[name='taskScore']").val(""); // $("input[name='taskOrder']").val(""); @@ -619,16 +625,29 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT if(tableData4.length > val.split("[---]").length - 1){ tableData4 = tableData4.slice(0,val.split("[---]").length - 1); }else if(tableData4.length < val.split("[---]").length - 1){ - tableData4.push({ - handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID - handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 - handsOnSimulationTasksAssessmentAnswer:"", //考核答案 - handsOnSimulationTasksAssessmentScore:"", //考核分值 - }) + if((val.split("[---]").length - 1)-tableData4.length > 1){ + var length = (val.split("[---]").length - 1) - tableData4.length; + for(var i=0;i < length;i++){ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } + }else{ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } } }else{ tableData4 = []; } + console.log(tableData4) var getTpl = tableData4_demo.innerHTML ,view = document.getElementById('tableData4_view'); laytpl(getTpl).render({list:tableData4}, function(html){ diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js index d55bb001..e3b8f1bd 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js @@ -593,12 +593,24 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas if(tableData4.length > val.split("[---]").length - 1){ tableData4 = tableData4.slice(0,val.split("[---]").length - 1); }else if(tableData4.length < val.split("[---]").length - 1){ - tableData4.push({ - handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID - handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 - handsOnSimulationTasksAssessmentAnswer:"", //考核答案 - handsOnSimulationTasksAssessmentScore:"", //考核分值 - }) + if((val.split("[---]").length - 1)-tableData4.length > 1){ + var length = (val.split("[---]").length - 1) - tableData4.length; + for(var i=0;i < length;i++){ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } + }else{ + tableData4.push({ + handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID + handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目 + handsOnSimulationTasksAssessmentAnswer:"", //考核答案 + handsOnSimulationTasksAssessmentScore:"", //考核分值 + }) + } } }else{ tableData4 = []; @@ -618,7 +630,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas //PPT资源库button $("#pptClick").click(function (obj) { - updataResourcesOpenRe(2); + updataResourcesOpenRe(); }); /*资源库上传弹出框*/ diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html index d0678bb9..7829fc0a 100644 --- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html @@ -369,7 +369,7 @@
- +