From 8ee9ee0e47512994c47872143bf977dd360d0f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Fri, 4 Aug 2023 03:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=9E=E6=93=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=AE=9E=E6=93=8D=E8=AF=95=E9=A2=98=E9=AA=8C?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/jlw/handsOnSimulationTasks/add.js      | 19 ++++++++++++++++++-
 .../add.js                                    | 14 ++++++++++++++
 .../jlw/handsOnSimulationTasks/add.html       |  2 +-
 .../add.html                                  |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

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 @@
                             </script>
                             <tbody id="tableData4_view">
                             <!--# var scoreInfo = 0;if(handsOnSimulationTasks.handsOnSimulationTasksAssessmentList != null){-->
-                                <!--# var oni = 0;for(item in handsOnSimulationTasks.handsOnSimulationTasksAssessmentList){ scoreInfo = scoreInfo + item.handsOnSimulationTasksAssessmentScore; -->
+                                <!--# var oni = 0;for(item in handsOnSimulationTasks.handsOnSimulationTasksAssessmentList){  scoreInfo = scoreInfo + item.handsOnSimulationTasksAssessmentScore!""; -->
                                     <tr class="infoTr">
                                         <td class="t_c"><span class="handsOnSimulationTasksAssessmentQuestion">${item.handsOnSimulationTasksAssessmentQuestion}</span></td>
                                         <td>
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
index 6e208c51..a7ba02a0 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
@@ -424,7 +424,7 @@
                                 </script>
                                 <tbody id="tableData4_view">
                                 <!--# var scoreInfo = 0;if(teacherOpenCourseHandsOnSimulationTasks.handsOnSimulationTasksAssessmentList != null){-->
-                                <!--# var oni = 0;for(item in teacherOpenCourseHandsOnSimulationTasks.handsOnSimulationTasksAssessmentList){ scoreInfo = scoreInfo + item.handsOnSimulationTasksAssessmentScore; -->
+                                <!--# var oni = 0;for(item in teacherOpenCourseHandsOnSimulationTasks.handsOnSimulationTasksAssessmentList){ scoreInfo = scoreInfo + item.handsOnSimulationTasksAssessmentScore!""; -->
                                 <tr class="infoTr">
                                     <td class="t_c"><span class="handsOnSimulationTasksAssessmentQuestion">${item.handsOnSimulationTasksAssessmentQuestion}</span></td>
                                     <td>