From d5272a9430c484503df214a44ce2c15627628334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Tue, 1 Aug 2023 15:55:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/js/jlw/handsOnSimulationTasks/add.js   |  1 -
 .../main/resources/templates/jlw/handsOn/add.html |  6 +++---
 .../jlw/teacherOpenCourseHandsOn/edit.html        | 15 ++++++++++-----
 3 files changed, 13 insertions(+), 9 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 2bc395bf..f8008aa4 100644
--- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
+++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
@@ -711,7 +711,6 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
     //资源库表格
     function loadResourcesInfo(resourcesInfoType,resourcesInfoTypePlural) {
         $("#edit_dialog input[name='resourcesInfoName']").val("");
-        console.log("进入加载资源")
         resourcesInfoTable = table.render({
             elem: '#resourcesInfoTable',
             height: Lib.getTableHeight(),
diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html
index f820801a..95cd6a1f 100644
--- a/web/src/main/resources/templates/jlw/handsOn/add.html
+++ b/web/src/main/resources/templates/jlw/handsOn/add.html
@@ -119,7 +119,7 @@
                             </tr>
                             </thead>
                             <tbody id="demoList">
-                            <!--#if(handsOn.trainingData != null && handsOn.trainingData != ''){-->
+                            <!--#if(handsOn.trainingData != null && handsOn.trainingData != '' && handsOn.trainingData != 'null' && handsOn.trainingData != '""' ){-->
                             <!--# var files = JsonString(handsOn.trainingData); //数据集-->
                             <!--# for(item in files){ -->
                             <tr class="uploader-file">
@@ -181,13 +181,13 @@
                             </td>
                             <td>{{item.taskScore}}</td>
                             <td><a taskid="{{item.taskId}}" class="layui-btn layui-btn-sm bg_button bj">编辑</a>
-                                <a taskid="{{item.taskId}}" style="${user.get().isAdmin?'background-color: red':'display: none;'}" style="background-color: red" class="layui-btn layui-btn-sm sc">删除</a>
+                                <a taskid="{{item.taskId}}" style="${user.get().isAdmin?'background-color: red':'display: none;'}"  class="layui-btn layui-btn-sm sc">删除</a>
                             </td>
                         </tr>
                         {{#  }); }}
                     </script>
                     <tbody id="sc_view">
-                    <!--#if(handsOnSimulationTasks != null && handsOnSimulationTasks != ''){-->
+                    <!--#if(handsOnSimulationTasks != null && handsOnSimulationTasks != 'null' && handsOnSimulationTasks != '""'  &&  handsOnSimulationTasks != ''){-->
                     <!--# for(item in handsOnSimulationTasks){ -->
                     <tr>
                         <td>${item.taskOrder}</td>
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
index 6f603914..53a3f774 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
@@ -91,7 +91,10 @@
                             </tr>
                             </thead>
                             <tbody id="demoList">
-                            <!--#if(teacherOpenCourseHandsOn.trainingData != null && teacherOpenCourseHandsOn.trainingData != '' && teacherOpenCourseHandsOn.trainingData != '""'){-->
+                            <div></div>
+                            <!--#if(teacherOpenCourseHandsOn.trainingData != null && teacherOpenCourseHandsOn.trainingData != 'null'
+                             && teacherOpenCourseHandsOn.trainingData != ''
+                             && teacherOpenCourseHandsOn.trainingData != '""'){-->
                             <!--# var files = JsonString(teacherOpenCourseHandsOn.trainingData); //数据集-->
                             <!--# for(item in files){ -->
                             <tr class="uploader-file">
@@ -105,7 +108,7 @@
                                                  title="Cancel upload">
                                         </span>
                                     <input name="imgFile" type="hidden" title="文件路径" value="${item.url}">
-                                    <input name="fileName" type="hidden" title="文件名字" value="${item.name}">
+                                    <input name="fileName" type="hidden" style="${user.get().isAdmin?'background-color: red':'display: none;'}" title="文件名字" value="${item.name}">
                                 </td>
                             </tr>
                             <!--#} -->
@@ -146,7 +149,7 @@
                     </thead>
 
                     <tbody >
-                    <!--#if(handsOnSimulationTasks != null && handsOnSimulationTasks != '' && handsOnSimulationTasks != '""'&& handsOnSimulationTasks != []){-->
+                    <!--#if(handsOnSimulationTasks != null &&  && handsOnSimulationTasks != 'null' && handsOnSimulationTasks != '""' && handsOnSimulationTasks != []){-->
                     <!--# for(item in handsOnSimulationTasks){ -->
                     <tr>
                         <td>${item.taskOrder}</td>
@@ -155,8 +158,10 @@
                             '3'?'理论测评':item.taskType == '4'?'实训操作步骤':item.taskType == '5'?'报告撰写':'其他'}
                         </td>
                         <td>${item.taskScore}</td>
-                        <td><a taskid="${item.taskId}" class="layui-btn layui-btn-sm bg_button bj">编辑</a> <a
-                                taskid="${item.taskId}" style="background-color: red" class="layui-btn layui-btn-sm sc">删除</a>
+                        <td>
+                            <a taskid="${item.taskId}" class="layui-btn layui-btn-sm bg_button bj">编辑</a>
+                            <a taskid="${item.taskId}" style="${user.get().isAdmin?'display: none;':'background-color: red'}"
+                               class="layui-btn layui-btn-sm sc">删除</a>
                         </td>
                     </tr>
                     <!--#} -->