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 e21b53e9..ed34428e 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js @@ -53,9 +53,10 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT tableData4.push({ handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID handsOnSimulationTasksAssessmentQuestion:$(this).find(".handsOnSimulationTasksAssessmentQuestion").text(), //考核题目 - handsOnSimulationTasksAssessmentAnswer:$(this).find("textarea[name='handsOnSimulationTasksAssessmentAnswer']").val(), //考核答案 handsOnSimulationTasksAssessmentScore:$(this).find("input[name='handsOnSimulationTasksAssessmentScore']").val(), //考核分值 + handsOnSimulationTasksAssessmentAnswer:$(this).find("textarea[name='handsOnSimulationTasksAssessmentAnswer']").val(), //考核答案 }); + }); getScoreInfo(); }else if (typeInfo == 5){ @@ -514,6 +515,22 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT Common.info("请输入考核内容!"); return; } + + if(tableData4.length<=0){ + Common.info("考核题目为空,请重新生成题目!!!"); + return; + } + var isFalse = false; + for(let item in tableData4){ + if($.isEmpty(tableData4[item].handsOnSimulationTasksAssessmentAnswer) || $.isEmpty(tableData4[item].handsOnSimulationTasksAssessmentScore)){ + isFalse = true + } + } + if(isFalse){ + Common.info("请填写题目分值、答案!"); + return; + } + param.handsOnSimulationTasksAssessment = JSON.stringify(tableData4); //考核答案 }else if (taskType == 5){ //报告撰写 param.taskScore = key.find("input[name='taskScore']").val(); //分值 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 f66c3ea0..34610d64 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js @@ -503,6 +503,20 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas Common.info("请输入考核内容!"); return; } + if(tableData4.length<=0){ + Common.info("考核题目为空,请重新生成题目!!!"); + return; + } + var isFalse = false; + for(let item in tableData4){ + if($.isEmpty(tableData4[item].handsOnSimulationTasksAssessmentAnswer) || $.isEmpty(tableData4[item].handsOnSimulationTasksAssessmentScore)){ + isFalse = true + } + } + if(isFalse){ + Common.info("请填写题目分值、答案!"); + return; + } param.handsOnSimulationTasksAssessment = JSON.stringify(tableData4); //考核答案 }else if (taskType == 5){ //报告撰写 param.taskScore = key.find("input[name='taskScore']").val(); //分值 diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html index c40d9f9d..efffc7f1 100644 --- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html @@ -421,7 +421,7 @@
- +