Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js

@@ -690,7 +690,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
                 loadResourcesInfo(resourcesInfoType,resourcesInfoTypePlural);
                 $(".search").unbind();
                 $(".search").click(function () {searchList(resourcesInfoType,resourcesInfoTypePlural);}); //搜索
-                table.reload('resourcesInfoTable');//刷新table
+                //table.reload('resourcesInfoTable');//刷新table
             }, yes: function (index) {
                 var checkStatus = table.checkStatus("resourcesInfoTable"); //获取选中行状态
                 var dataNew = checkStatus.data, ids = Common.concatBatchId(dataNew, "resourcesInfoId");  //获取选中行数据

web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js

@@ -677,7 +677,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
                 loadResourcesInfo(resourcesInfoType,resourcesInfoTypePlural);
                 $(".search").unbind();
                 $(".search").click(function () {searchList(resourcesInfoType,resourcesInfoTypePlural);}); //搜索
-                table.reload('resourcesInfoTable');//刷新table
+                //table.reload('resourcesInfoTable');//刷新table
             }, yes: function (index) {
                 var checkStatus = table.checkStatus("resourcesInfoTable"); //获取选中行状态
                 var dataNew = checkStatus.data, ids = Common.concatBatchId(dataNew, "resourcesInfoId");  //获取选中行数据
@@ -696,7 +696,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
     }
 
     //资源库表格
-    function loadResourcesInfo(resourcesInfoType) {
+    function loadResourcesInfo(resourcesInfoType,resourcesInfoTypePlural) {
         $("#edit_dialog input[name='resourcesInfoName']").val("");
         resourcesInfoTable = table.render({
             elem: '#resourcesInfoTable',
@@ -706,7 +706,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
             even: true,
             //url: Common.ctxPath + '/jlw/resourcesInfo/list.json' // 数据接口
             url: Common.ctxPath + '/jlw/resourcesInfo/resourcesList.json' // 数据接口
-            , where: getParamRe(resourcesInfoType)
+            , where: getParamRe(resourcesInfoType,resourcesInfoTypePlural)
             , page: Lib.tablePage // 开启分页
             , limit: 10,
             cols: [[ // 表头

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>

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>
                     <!--#} -->

web/src/main/resources/templates/jlw/teacherOpenCourseHandsOnSimulationTasks/add.html

@@ -699,11 +699,8 @@
         </div>
         <div class="layui-inline">
             <label class="layui-form-label" style="width: 80px">归属课程:</label>
-            <div class="layui-input-block" style="margin-left: -80px;">
-                <layui:simpleDictSelect style='layui-input-block'
-                                        type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
-                                        id="courseInfoIds" name="courseInfoId_1"
-                                        layFilter="select_courseInfoIds"/>
+            <div class="layui-input-block" style="margin-left: 110px;">
+                <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_1", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类"}) {} -->
             </div>
         </div>
         <div class="layui-inline" style="left: 30px;">