From c376578c1fd001b8d7508a155bba2810e00e520b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Thu, 1 Jun 2023 23:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90=E7=AE=A1?=
=?UTF-8?q?=E7=90=86-=E6=B7=BB=E5=8A=A0=E8=AF=BE=E7=A8=8B=E8=B5=84?=
=?UTF-8?q?=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugins/simple-uploader/public/app.js | 2 +-
.../static/js/jlw/resourcesInfo/add.js | 46 +++++++++++++------
.../templates/jlw/resourcesInfo/add.html | 13 +++---
3 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/admin-core/src/main/resources/static/plugins/simple-uploader/public/app.js b/admin-core/src/main/resources/static/plugins/simple-uploader/public/app.js
index 013cbf19..055e6286 100644
--- a/admin-core/src/main/resources/static/plugins/simple-uploader/public/app.js
+++ b/admin-core/src/main/resources/static/plugins/simple-uploader/public/app.js
@@ -26,7 +26,7 @@
r.assignBrowse($('.uploader-browse')[0]);
r.assignBrowse($('.uploader-browse-folder')[0], true);
r.assignBrowse($('.uploader-browse-image')[0], false, false, {accept: 'image/*'});
-
+ r.assignBrowse($('.uploader-browse-pvwpm')[0], false, false, {accept: ['.ppt', '.pptx', '.doc', '.docx', '.pdf', '.mp4']});
// Handle file add event
r.on('filesAdded', function (files, fileList) {
// Show progress bar
diff --git a/web/src/main/resources/static/js/jlw/resourcesInfo/add.js b/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
index 856069e6..97a35cf7 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
@@ -11,7 +11,7 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi',
imgUrl:Common.ctxPath
}
});
- layedit.build('resourcesInfoContent',{height: 200});
+ var courseInfoContent_ = layedit.build('resourcesInfoContent',{height: 400});
var view = {
init:function(){
@@ -30,24 +30,40 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi',
var ret = "";
if($.isEmpty(resourcesInfoId)){
var resourcesInfoJson = new Array();
- $("#demoList tr").each(function (){
- var fileName = $(this).find("input[name='fileName']").val();
- var format = fileName.substr((~-fileName.lastIndexOf('.') >>> 0) + 2).toLowerCase();//获取文件后缀小写
- // var resourcesInfoType = ''; //资源类型(详细见数据字典，resources_info_type)
- // if('、avi、wmv、mpeg、mp4、mov、mkv、flv、f4v、m4v、rmvb、rm、3gp、dat、ts、mts、vob、'.indexOf("、"+format+"、") >= 0){
- // resourcesInfoType = 1;
- // }else if('、pdf、xls、xlsx、doc、docx、ppt、pptx、'.indexOf("、"+format+"、") >= 0){
- // resourcesInfoType = 2;
- // }else {
- // resourcesInfoType = 3;
- // }
+ if(resourcesInfoType == 4){
resourcesInfoJson.push({
courseInfoId:courseInfoId,
- resourcesInfoContent:$(this).find("input[name='imgFile']").val(),
- resourcesInfoName:fileName,
+ resourcesInfoContent:$("#addLine_dialog input[name='resourcesInfoContent']").val(),
+ resourcesInfoName:$("#addLine_dialog input[name='resourcesInfoName']").val(),
resourcesInfoType:resourcesInfoType
});
- });
+ }else if(resourcesInfoType == 5){
+ resourcesInfoJson.push({
+ courseInfoId:courseInfoId,
+ resourcesInfoContent:layedit.getContent(courseInfoContent_),
+ resourcesInfoName:$("#addPW_dialog input[name='resourcesInfoName']").val(),
+ resourcesInfoType:resourcesInfoType
+ });
+ }else{
+ $("#demoList tr").each(function (){
+ var fileName = $(this).find("input[name='fileName']").val();
+ var format = fileName.substr((~-fileName.lastIndexOf('.') >>> 0) + 2).toLowerCase();//获取文件后缀小写
+ // var resourcesInfoType = ''; //资源类型(详细见数据字典，resources_info_type)
+ // if('、avi、wmv、mpeg、mp4、mov、mkv、flv、f4v、m4v、rmvb、rm、3gp、dat、ts、mts、vob、'.indexOf("、"+format+"、") >= 0){
+ // resourcesInfoType = 1;
+ // }else if('、pdf、xls、xlsx、doc、docx、ppt、pptx、'.indexOf("、"+format+"、") >= 0){
+ // resourcesInfoType = 2;
+ // }else {
+ // resourcesInfoType = 3;
+ // }
+ resourcesInfoJson.push({
+ courseInfoId:courseInfoId,
+ resourcesInfoContent:$(this).find("input[name='imgFile']").val(),
+ resourcesInfoName:fileName,
+ resourcesInfoType:resourcesInfoType
+ });
+ });
+ }
ret = Common.postAjax("/jlw/resourcesInfo/addAll.json",{
resourcesInfoJson:JSON.stringify(resourcesInfoJson),
courseId:courseId,
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/add.html b/web/src/main/resources/templates/jlw/resourcesInfo/add.html
index 2d8729c6..5a817ae9 100644
--- a/web/src/main/resources/templates/jlw/resourcesInfo/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesInfo/add.html
@@ -75,9 +75,11 @@
ondrop="jQuery(this).removeClass('uploader-dragover');">
<a class="uploader-browse-folder" style="display: none;"><u>select folder</u></a>
<a class="uploader-browse-image" style="display: none;"><u>select images</u></a>
- <button type="button" class="layui-btn bg_button uploader-browse"
+ <a class="uploader-browse" style="display: none;"><u>select images</u></a>
+ <button type="button" class="layui-btn bg_button uploader-browse-pvwpm"
style="float: left;margin-right: 20px;margin-bottom: 20px;">选择文件
</button>
+
<button type="button" class="layui-btn bg_button" style="display: none;" id="testListAction">
开始上传
</button>
@@ -115,8 +117,7 @@
<label class="layui-form-label">链接名称:</label>
<div class="layui-input-block">
<div class="layui-input-inline">
- <input type="text" name="resourcesInfoName" required lay-verify="required"
- placeholder="请输入链接名称" class="layui-input">
+ <input type="text" name="resourcesInfoName" placeholder="请输入链接名称" class="layui-input">
</div>
</div>
</div>
@@ -145,10 +146,8 @@
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">内容:</label>
- <div class="layui-input-block">
- <div class="layui-input-inline">
- <textarea id="resourcesInfoContent" name="resourcesInfoContent" style="display:none;"></textarea>
- </div>
+ <div class="layui-input-block" style="width: 60%;">
+ <textarea id="resourcesInfoContent" name="resourcesInfoContent" style="display:none;"></textarea>
</div>
</div>
</div>