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

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

@@ -30,7 +30,7 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
     if(!$.isEmpty(handsOnId)){
         var ret = Common.getAjax("/jlw/handsOn/view.json",{handsOnId:handsOnId});
         if(ret.code == 0){
-            layedit.setContent(one,Lib.repLaceltgt(ret.data.applicationIntroduction),false);
+            layedit.setContent(one,Lib.repLaceltgt(ret.data.handsOnRecommend),false);
         }else {
             layer.msg(ret.msg, {
                 offset: ['50%'],

web/src/main/resources/static/js/jlw/resourcesInfo/index.js

@@ -195,6 +195,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                             var htm = d.sourceType == 1?"院校添加":"系统内置";
                             return htm;
                         }
+                    },{
+                        field: 'addTypeText', title: '上传人', align: "center",hide:isAdmin?true:false
                     },
                     {
                         field: 'resourcesInfoType', title: '资源类型', align: "center", templet: function (d) {//(1视频 2PPT 3PDF)

web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js

@@ -26,9 +26,9 @@ layui.define([ 'form', 'laydate', 'table','laytpl','upload','layedit','teacherOp
     var teacherOpenCourseId = $("input[name='teacherOpenCourseId']").val();
     var one = layedit.build('test-editor'); //建立编辑器
     if(!$.isEmpty(handsOnId)){
-        var ret = Common.getAjax("/jlw/handsOn/view.json",{handsOnId:handsOnId});
+        var ret = Common.getAjax("/jlw/teacherOpenCourseHandsOn/view.json",{handsOnId:handsOnId});
         if(ret.code == 0){
-            layedit.setContent(one,Lib.repLaceltgt(ret.data.applicationIntroduction),false);
+            layedit.setContent(one,Lib.repLaceltgt(ret.data.handsOnRecommend),false);
         }else {
             layer.msg(ret.msg, {
                 offset: ['50%'],

web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html

@@ -4,8 +4,6 @@
 <script src="${ctxPath}/plugins/editorMd/editormd.min.js"></script>
 <link rel="stylesheet" href="${ctxPath}/plugins/highlight/styles/a11y-light.min.css"/>
 <script type="text/javascript" src="${ctxPath}/plugins/highlight/highlight.min.js?v=${jsVer}"></script>
-<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/uploader.js?v=${jsVer}"></script>
-<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/app.js?v=${jsVer}"></script>
 
 <form class="layui-form" id="updateForm">
     <div class="layui-row" style="margin: 0 auto;">
@@ -90,7 +88,25 @@
                             </tr>
                             </thead>
                             <tbody id="demoList">
-
+                            <!--#if(teacherOpenCourseHandsOn.trainingData != null && teacherOpenCourseHandsOn.trainingData != '' && teacherOpenCourseHandsOn.trainingData != '""'){-->
+                            <!--# var files = JsonString(teacherOpenCourseHandsOn.trainingData); //数据集-->
+                            <!--# for(item in files){ -->
+                            <tr class="uploader-file">
+                                <td class="uploader-file-name"><a href="/server/${item.url}">${item.name}</a></td>
+                                <td class="uploader-file-size" style="text-align: center;">-</td>
+                                <td class="uploader-file-progress" style="text-align: center;"><span
+                                        style="color: #73a2f8;">完成</span></td>
+                                <td style="text-align: center;">
+                                        <span class="uploader-file-cancel" style="padding: 0 10px;">
+                                            <img src="${ctxPath}/plugins/simple-uploader/public/cancel.png"
+                                                 title="Cancel upload">
+                                        </span>
+                                    <input name="imgFile" type="hidden" title="文件路径" value="${item.url}">
+                                    <input name="fileName" type="hidden" title="文件名字" value="${item.name}">
+                                </td>
+                            </tr>
+                            <!--#} -->
+                            <!--#}-->
                             </tbody>
                         </table>
                     </div>
@@ -102,7 +118,8 @@
         <div>
             <label class="layui-form-label">实操任务：</label>
             <div class="layui-input-block">
-                <button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon">&#xe654;</i>
+                <button type="button" class="layui-btn bg_button button_add" style="float: left">
+                    <i class="layui-icon">&#xe654;</i>
                 </button>
             </div>
         </div>
@@ -221,14 +238,16 @@
         </div>
     </div>-->
 	<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
-	<input type="hidden" name="handsOnId" value="${teacherOpenCourseHandsOn.handsOnId}" />
+	<input type="hidden" name="实操任务" value="${teacherOpenCourseHandsOn.handsOnId}" />
     <input type="hidden" id="teacherOpenCourseId" name="teacherOpenCourseId"  value="${teacherOpenCourseHandsOn.teacherOpenCourseId}"   class="layui-input" >
     <!--    <layui:submitButtons id="updateButton"  buttonType="" showExamine="2" />-->
 </form>
 <!--#} -->
 <script>
-layui.use(['edit'], function(){
-    var teacherOpenCourseHandsOnEdit = layui.edit
-    teacherOpenCourseHandsOnEdit.init();
-});
+    layui.use(['edit'], function(){
+        var teacherOpenCourseHandsOnEdit = layui.edit
+        teacherOpenCourseHandsOnEdit.init();
+    });
 </script>
+<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/uploader.js?v=${jsVer}"></script>
+<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/app.js?v=${jsVer}"></script>