From a0f013c8bae16a77a8d9f2c07ffc91aa94268e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 3 Aug 2023 12:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E7=AB=AF-=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=9E=E6=93=8D=E5=8F=8D=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/jlw/handsOnSimulationTasks/add.js      | 32 ++++----
 .../add.js                                    | 74 ++++++++++---------
 .../jlw/handsOnSimulationTasks/add.html       |  4 +-
 .../add.html                                  | 13 ++--
 4 files changed, 66 insertions(+), 57 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 217ec83d..e21b53e9 100644
--- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
+++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
@@ -81,7 +81,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
         ,url: Common.ctxPath +'/jlw/file/update.do'
         ,accept:'video'
         , progress: function(value) {
-            var v =
+            var v = value + '%'
             element.progress('progressBar',v);
         }
         ,choose: function(obj){
@@ -432,15 +432,17 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
                              });
                          });
                          var resourcesInfoTableData = table.cache["resourcesInfoShowTable"]||[]; //获取showtable数据 视频
-
-                         for (var i = 0;i<resourcesInfoTableData.length;i++){
-                             if(resourcesInfoTableData[i].resourcesInfoType == "1"){
-                                 tasksFile.push({
-                                     fileName:resourcesInfoTableData[i].resourcesInfoName,
-                                     fileUrl:resourcesInfoTableData[i].resourcesInfoContent
-                                 });
+                         if(resourcesInfoTableData.length > 0){
+                             for (var i = 0;i<resourcesInfoTableData.length;i++){
+                                 if(resourcesInfoTableData[i].resourcesInfoType == "1"){
+                                     tasksFile.push({
+                                         fileName:resourcesInfoTableData[i].resourcesInfoName,
+                                         fileUrl:resourcesInfoTableData[i].resourcesInfoContent
+                                     });
+                                 }
                              }
                          }
+
                          if (tasksFile.length <= 0){
                              Common.info("请上传视频！");
                              return;
@@ -470,12 +472,14 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
                              });
                          });
                          var resourcesInfoTableData = table.cache["resourcesInfoShowPPTTable"]||[]; //获取showtable数据 ppt
-                         for (var i = 0;i<resourcesInfoTableData.length;i++){
-                             if(resourcesInfoTableData[i].resourcesInfoType == "2" || resourcesInfoTableData[i].resourcesInfoType == "3"){
-                                 tasksFile.push({
-                                     fileName:resourcesInfoTableData[i].resourcesInfoName,
-                                     fileUrl:resourcesInfoTableData[i].resourcesInfoContent
-                                 });
+                         if(resourcesInfoTableData.length > 0){
+                             for (var i = 0;i<resourcesInfoTableData.length;i++){
+                                 if(resourcesInfoTableData[i].resourcesInfoType == "2" || resourcesInfoTableData[i].resourcesInfoType == "3"){
+                                     tasksFile.push({
+                                         fileName:resourcesInfoTableData[i].resourcesInfoName,
+                                         fileUrl:resourcesInfoTableData[i].resourcesInfoContent
+                                     });
+                                 }
                              }
                          }
 
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 4cbbe2f8..f66c3ea0 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
@@ -414,20 +414,21 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
                              });
                          });
                          var resourcesInfoTableData = table.cache["resourcesInfoShowTable"]; //获取showtable数据
-
-                         for (var i = 0;i<resourcesInfoTableData.length;i++){
-                             if(resourcesInfoTableData[i].resourcesInfoType == "1"){
-                                 tasksFile.push({
-                                     fileName:resourcesInfoTableData[i].resourcesInfoName,
-                                     fileUrl:resourcesInfoTableData[i].resourcesInfoContent
-                                 });
+                         if(resourcesInfoTableData.length > 0){
+                             for (var i = 0;i<resourcesInfoTableData.length;i++){
+                                 if(resourcesInfoTableData[i].resourcesInfoType == "1"){
+                                     tasksFile.push({
+                                         fileName:resourcesInfoTableData[i].resourcesInfoName,
+                                         fileUrl:resourcesInfoTableData[i].resourcesInfoContent
+                                     });
+                                 }
                              }
                          }
                          if (tasksFile.length <= 0){
                              Common.info("请上传视频！");
                              return;
                          }
-                         param.teacherOpenCourseHandsOnSimulationlasksFile = JSON.stringify(tasksFile);
+                         param.tasksFile = JSON.stringify(tasksFile);
                      }else if (taskType == 2){ //PPT
                          param.taskScore = key.find("input[name='taskScore']").val(); //分值
                          param.assessmentRequirements = key.find("input[name='assessmentRequirements']").val(); //至少观看时长
@@ -452,19 +453,22 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
                              });
                          });
                          var resourcesInfoTableData = table.cache["resourcesInfoShowPPTTable"]; //获取showtable数据
-                         for (var i = 0;i<resourcesInfoTableData.length;i++){
-                             if(resourcesInfoTableData[i].resourcesInfoType == "2"||resourcesInfoTableData[i].resourcesInfoType == "3"){
-                                 tasksFile.push({
-                                     fileName:resourcesInfoTableData[i].resourcesInfoName,
-                                     fileUrl:resourcesInfoTableData[i].resourcesInfoContent
-                                 });
+                         if(resourcesInfoTableData.length > 0){
+                             for (var i = 0;i<resourcesInfoTableData.length;i++){
+                                 if(resourcesInfoTableData[i].resourcesInfoType == "2"||resourcesInfoTableData[i].resourcesInfoType == "3"){
+                                     tasksFile.push({
+                                         fileName:resourcesInfoTableData[i].resourcesInfoName,
+                                         fileUrl:resourcesInfoTableData[i].resourcesInfoContent
+                                     });
+                                 }
                              }
                          }
+
                          if (tasksFile.length <= 0){
                              Common.info("请上传PPT！");
                              return;
                          }
-                         param.teacherOpenCourseHandsOnSimulationlasksFile = JSON.stringify(tasksFile);
+                         param.tasksFile = JSON.stringify(tasksFile);
                      }else if (taskType == 3){ //理论测评
                          var tableQuestionData = [];
                          var isFalse = false;
@@ -522,7 +526,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
                              Common.info("请上传报告参考模板！");
                              return;
                          }
-                         param.teacherOpenCourseHandsOnSimulationlasksFile = JSON.stringify(tasksFile);
+                         param.tasksFile = JSON.stringify(tasksFile);
                      }
                      param.taskType = taskType;
                      param.taskId = taskId;
@@ -552,30 +556,30 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
             });
         }
     			
-    }
+    };
 
     form.on('radio(taskType)', obj => {
         element.tabChange('demo', obj.value);
-    if (obj.value === "4") {
-        if (editor === null) {
-            editor = Lib.editorMd("test-editor");
-            editor.setToolbarAutoFixed(false);
-        }
-    }
-    if(obj.value == "2"||obj.value == "1"){
-        if(!$.isEmpty(resourcesInfoShowTable)){
-            resourcesInfoShowTable.reload({data:[]});
+        if (obj.value === "4") {
+            if (editor === null) {
+                editor = Lib.editorMd("test-editor");
+                editor.setToolbarAutoFixed(false);
+            }
         }
-        if(!$.isEmpty(resourcesInfoShowPPTTable)){
-            resourcesInfoShowPPTTable.reload({data:[]});
+        if(obj.value == "2"||obj.value == "1"){
+            if(!$.isEmpty(resourcesInfoShowTable)){
+                resourcesInfoShowTable.reload({data:[]});
+            }
+            if(!$.isEmpty(resourcesInfoShowPPTTable)){
+                resourcesInfoShowPPTTable.reload({data:[]});
+            }
         }
-    }
-    // $("input[name='taskTitle']").val("");
-    // $("input[name='taskScore']").val("");
-    // $("input[name='taskOrder']").val("");
-    // $("input[name='assessmentRequirements']").val("");
-    // $("input[name='assessmentTime']").val("");
-});
+        // $("input[name='taskTitle']").val("");
+        // $("input[name='taskScore']").val("");
+        // $("input[name='taskOrder']").val("");
+        // $("input[name='assessmentRequirements']").val("");
+        // $("input[name='assessmentTime']").val("");
+    });
 
     //理论测评分值修改
     function getQuestionTotal(){
diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
index 4d13f94f..c40d9f9d 100644
--- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
+++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
@@ -530,9 +530,7 @@
     <!--style="${user.get().isAdmin ? 'margin-bottom: 10px;padding: 0 28px;':'display: none;'}"-->
     <div class="layui-form-item" style="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"
-                style="${user.get().isAdmin ?'background-color: #73a2f8;padding: 0 30px;':'display: none;'}"
-                type="button" id="addButton" lay-submit="" lay-filter="form">确定</button>
+        <button class="layui-btn layui-btn-danger" style="${user.get().isAdmin ?'background-color: #73a2f8;padding: 0 30px;':'display: none;'}" type="button" id="addButton" lay-submit="" lay-filter="form">确定</button>
     </div>
 
     <!--题库弹窗开始-->
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
index c57de55a..6e208c51 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html
@@ -122,8 +122,9 @@
                                     <button type="button" id="videoClick" style="margin-bottom: 10px;" class="layui-btn layui-btn-normal">视频资源库</button>
                                 </div>
                                 <div id="mp4Info">
-                                    <!--#if(teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile != null){-->
-                                    <!--#for(item in teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile){ -->
+                                    <!--#if(teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile != null && teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile != ''){-->
+                                    <!--# var files = JsonString(teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile); //数据集-->
+                                    <!--#for(item in files){ -->
                                     <div class="progressCss_mp4">
                                         <span type="text" class="nameV" style="width: 300px">${item.fileName}</span>
                                         <span class="mv_m" style="float: right;"></span>
@@ -207,7 +208,8 @@
                                 </div>
                                 <div id="pptInfo">
                                     <!--#if(teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile != null){-->
-                                    <!--#for(item in teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile){ -->
+                                    <!--# var files = JsonString(teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile); //数据集-->
+                                    <!--#for(item in files){ -->
                                     <div class="progressCss_ppt">
                                         <span type="text" class="nameV" style="width: 300px">${item.fileName}</span>
                                         <span class="mv_m" style="float: right;"></span>
@@ -498,8 +500,9 @@
                             <div class="layui-upload">
                                 <button type="button" style="margin-bottom: 10px;" class="layui-btn layui-btn-primary layui-font-blue" id="upload-normalFile"><i class="layui-icon"></i>点击添加</button>
                                 <div id="fileInfo">
-                                    <!--#if(teacherOpenCourseHandsOnSimulationTasks.tasksFileList != null){-->
-                                    <!--#for(item in teacherOpenCourseHandsOnSimulationTasks.tasksFileList){ -->
+                                    <!--#if(teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile != null){-->
+                                    <!--# var files = JsonString(teacherOpenCourseHandsOnSimulationTasks.teacherOpenCourseHandsOnSimulationTasksFile); //数据集-->
+                                    <!--#for(item in files){ -->
                                     <div class="progressCss_file">
                                         <span type="text" class="nameV" style="width: 300px">${item.fileName}</span>
                                         <span class="mv_m" style="float: right;"></span>