From 596584258c4939ba221fe8d958b78382be17127b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sun, 25 Jun 2023 17:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/static/js/jlw/handsOn/add.js | 2 +-
.../static/js/jlw/resourcesInfo/index.js | 2 +
.../js/jlw/teacherOpenCourseHandsOn/edit.js | 4 +-
.../jlw/teacherOpenCourseHandsOn/edit.html | 37 ++++++++++++++-----
4 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/web/src/main/resources/static/js/jlw/handsOn/add.js b/web/src/main/resources/static/js/jlw/handsOn/add.js
index 3a5a3493..4a3a3acc 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/add.js
+++ b/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%'],
diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
index 561f1d6d..0ed3b920 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
+++ b/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)
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js
index 7c9c9b7a..19ca6efb 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/edit.js
+++ b/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%'],
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html b/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
index cf17926b..82c9798e 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/edit.html
+++ b/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"></i>
+ <button type="button" class="layui-btn bg_button button_add" style="float: left">
+ <i class="layui-icon"></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>
\ No newline at end of file