tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
beetlsql3-dev
姚丹ab
parent 2804620c60
commit bffe1f487b
7 changed files with 99 additions and 26 deletions

3
web/src/main/resources/static/js/jlw/handsOn/index.js
Unescape Escape View File

@ -74,7 +74,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
var css = $("#isAdmin").val() === 'true' ? "" : "display: none;";
var htm = '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>';
htm += '<a class="layui-table-link" lay-event="drown" data-item="${JSON.stringify(d)}" style="color: #bebebe!important">下架</a>';
htm += '<a class="layui-table-link" lay-event="edit"style="' + css + '">编辑</a>';
// htm += '<a class="layui-table-link" lay-event="edit"style="' + css + '">编辑</a>';
htm += '<a class="layui-table-link" lay-event="edit">'+($("#isAdmin").val() === 'true' ?'编辑':'查看')+'</a>';
htm += '<a class="layui-table-link" lay-event="addTask">添加任务</a>';
htm += '<a class="layui-table-link" lay-event="del" style="' + css + '">删除</a>';
return htm;

13
web/src/main/resources/static/js/jlw/resourcesInfo/add.js
Unescape Escape View File

@ -1,9 +1,16 @@
layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi'], function(exports) {
layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi', "layedit"], function(exports) {
var form = layui.form;
var resourcesInfoApi = layui.resourcesInfoApi;
var index = layui.index;
var element = layui.element;
var upload = layui.upload;
var layedit = layui.layedit;
layedit.set({ //富文本上传图片
uploadImage: {
url: Common.ctxPath + "/jlw/file/update.do",
imgUrl:Common.ctxPath
}
});
var view = {
init:function(){
Lib.initGenrealForm($("#addForm"),form);
@ -80,5 +87,9 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi']
form.on('select(select_courseInfoIds_1)', function (obj) {
Lib.getCourseInfo($("select[name='courseInfoId_2']"),obj.value);
});
//选择链接、图文
form.on('select_courseInfoIds_3',function (obj) {
})
exports('add',view);
});

9
web/src/main/resources/static/js/jlw/resourcesInfo/index.js
Unescape Escape View File

@ -142,10 +142,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
{
field: 'userId', title: '操作', align: "center", field: 'right', templet: function (d) {
var htm = '<a class="layui-table-link" lay-event="edit">编辑</a>';
// htm += '<a class="layui-table-link" lay-event="previewPage" >' + (d.resourcesInfoType == 3 ? '下载' : '预览') + '</a>';
if(d.resourcesInfoType == 4){
htm += '<a class="layui-table-link" href="'+ d.resourcesInfoContent+'" target="_blank">预览</a>';
htm += '<a class="layui-table-link" href="'+d.resourcesInfoContent+'" target="_blank" >预览</a>';
}else {
htm += '<a class="layui-table-link" lay-event="previewPage" >' + (d.resourcesInfoType == 3 ? '下载' : '预览') + '</a>';
htm += '<a class="layui-table-link" lay-event="previewPage" >预览</a>';
}
htm += '<a class="layui-table-link" lay-event="del">删除</a>';
return htm;
@ -242,6 +243,10 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
deleteInfo(data.resourcesInfoId);
} else if (obj.event === "previewPage") {
Lib.downloadFile(data);
}else if(obj.event === "look"){
var url = data.resourcesInfoContent;
var name = data.resourcesInfoName;
Lib.downloadFile2(url,name);
}
})
}

4
web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
Unescape Escape View File

@ -379,11 +379,11 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
htm += '<a class="layui-table-link" lay-event="addPW">添加图文</a>';
}
if (!$.isEmpty(d.resourcesInfoType)) {
if (d.resourcesInfoType != 4){
if (d.resourcesInfoType != 4){
htm += '<a class="layui-table-link" lay-event="look">查看</a>';
// htm += '<a href='+Common.ctxPath + '/jlw/resourcesInfo/previewData.do?resourcesInfoId='+d.resourcesInfoId+' style="color: #01AAED" target="_blank">查看</a>';
}else {
htm += '<a href="http://www.baidu.com" style="color: #01AAED" target="_blank">查看</a>';
htm += '<a href="'+d.resourcesInfoContent+'" style="color: #01AAED" target="_blank">查看</a>';
}
}
htm += '<a class="layui-table-link" lay-event="edit">编辑</a>';

2
web/src/main/resources/templates/jlw/handsOn/add.html
Unescape Escape View File

@ -36,7 +36,7 @@
<div class="layui-row" style="margin: 0 auto;">
<a class="layui-btn layui-btn-primary" id="addButton-cancel" style="margin-bottom: 10px;padding: 0 30px;">返回</a>
<a class="layui-btn bg_button" id="addButton"
style="margin-bottom: 10px;padding: 0 28px;">确定</a>
style="${user.get().isAdmin ? 'margin-bottom: 10px;padding: 0 28px;':'display: none;'}">确定</a>
</div>
<div class="layui-row">
<div class="layui-form-item">

10
web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
Unescape Escape View File

@ -516,8 +516,14 @@
<!-- 业务对象须有hidden字段，保存delFlag和version字段-->
<input type="hidden" name="taskId" value="${handsOnSimulationTasks.taskId}"/>
<input type="hidden" name="courseInfoId_1" value="${courseInfoId}"/>
<layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
<!--<layui:submitButtons id="addButton" buttonType="" showExamine="2" />-->
<!--style="${user.get().isAdmin ? 'margin-bottom: 10px;padding: 0 28px;':'display: none;'}"-->
<div class="layui-form-item" style="right:10px;bottom:0px;">
<button class="layui-btn layui-btn-primary" type="button" style="padding: 0 30px;" id="addButton-cancel">返回</button>
<button class="layui-btn layui-btn-danger"
style="${user.get().isAdmin ?'background-color: #73a2f8;padding: 0 30px;':'display: none;'}"
type="button" id="addButton" lay-submit="" lay-filter="form">确定</button>
</div>
<div id="resourcesQuestionTable_demo" style="display: none;padding: 20px 50px;min-height: 400px">
<div class="layui-inline">

84
web/src/main/resources/templates/jlw/resourcesInfo/add.html
Unescape Escape View File

@ -1,8 +1,9 @@
<!--# layout("/common/layout.html",{"jsBase":"/js/jlw/resourcesInfo/"}){ -->
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
<link rel="stylesheet" type="text/css" href="${ctxPath}/css/soulTable.css?v=${jsVer}" media="all"/>
<form class="layui-form" id="addForm">
<layui:submitButtons id="addButton" buttonType="" />
<input type="hidden" name="resourcesInfoId" value="${resourcesInfo.resourcesInfoId}" />
<layui:submitButtons id="addButton" buttonType=""/>
<input type="hidden" name="resourcesInfoId" value="${resourcesInfo.resourcesInfoId}"/>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label">归属课程：</label>
@ -25,7 +26,8 @@
<label class="layui-form-label">归属章节：</label>
<div class="layui-input-block" style="width: 400px;">
<!--#if(courseInfoId != null){-->
<layui:simpleDictSelect style='layui-input-inline' value="${twoChildNode}" type="course_info.course_info_name.course_info_status=1,course_info_type=2,course_info_parent_id=${courseInfoId}"
<layui:simpleDictSelect style='layui-input-inline' value="${twoChildNode}"
type="course_info.course_info_name.course_info_status=1,course_info_type=2,course_info_parent_id=${courseInfoId}"
id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_1"/>
<!--#}else{-->
<select name="courseInfoId_1" lay-filter="select_courseInfoIds_1">
@ -40,7 +42,8 @@
<label class="layui-form-label">归属小节：</label>
<div class="layui-input-block" style="width: 400px;">
<!--#if(twoChildNode != null){-->
<layui:simpleDictSelect style='layui-input-inline' value="${threeChildNode}" type="course_info.course_info_name.course_info_status=1,course_info_type=3,course_info_parent_id=${twoChildNode}"
<layui:simpleDictSelect style='layui-input-inline' value="${threeChildNode}"
type="course_info.course_info_name.course_info_status=1,course_info_type=3,course_info_parent_id=${twoChildNode}"
id="courseInfoId2" name="courseInfoId_2"/>
<!--#}else{-->
<select name="courseInfoId_2">
@ -50,12 +53,14 @@
</div>
</div>
</div>
<div class="layui-row" style="${resourcesInfo.resourcesInfoId != null?'display:none':''}">
<div class="layui-row" style="${resourcesInfo.resourcesInfoId != null?'display:none':''}">
<div class="layui-form-item">
<label class="layui-form-label">资源类型：</label>
<div class="layui-input-block" style="width: 400px;">
<layui:simpleDictSelect style='layui-input-inline' value="${resourcesInfo.resourcesInfoType}" type="resources_info_type"
id="resourcesInfoType" name="resourcesInfoType" layFilter="select_courseInfoIds_3"/>
<layui:simpleDictSelect style='layui-input-inline' value="${resourcesInfo.resourcesInfoType}"
type="resources_info_type"
id="resourcesInfoType" name="resourcesInfoType"
layFilter="select_courseInfoIds_3"/>
</div>
</div>
</div>
@ -64,11 +69,17 @@
<label class="layui-form-label">上传资源：</label>
<div class="layui-input-block">
<div class="layui-upload">
<div class="uploader-drop" ondragenter="jQuery(this).addClass('uploader-dragover');" ondragend="jQuery(this).removeClass('uploader-dragover');" ondrop="jQuery(this).removeClass('uploader-dragover');">
<div class="uploader-drop" ondragenter="jQuery(this).addClass('uploader-dragover');"
ondragend="jQuery(this).removeClass('uploader-dragover');"
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" style="float: left;margin-right: 20px;margin-bottom: 20px;" >选择文件</button>
<button type="button" class="layui-btn bg_button" style="display: none;" id="testListAction">开始上传</button>
<button type="button" class="layui-btn bg_button uploader-browse"
style="float: left;margin-right: 20px;margin-bottom: 20px;">选择文件
</button>
<button type="button" class="layui-btn bg_button" style="display: none;" id="testListAction">
开始上传
</button>
<div class="layui-form-mid layui-word-aux">如果不选择小节，则根据资源名称添加到对应的小节</div>
</div>
@ -81,11 +92,13 @@
<col width="150">
</colgroup>
<thead>
<tr><th style="text-align: center;">文件名</th>
<tr>
<th style="text-align: center;">文件名</th>
<th style="text-align: center;">大小</th>
<th style="text-align: center;">上传进度</th>
<th style="text-align: center;">操作</th>
</tr></thead>
</tr>
</thead>
<tbody id="demoList"></tbody>
</table>
</div>
@ -93,14 +106,51 @@
</div>
</div>
</div>
<!--图文-->
<div id="addPW_dialog" class="layui-form" style="display: none;padding: 20px 20px 0 0;width: 900px;height:370px;">
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 80px"><span style="color: red">*</span>名称:</label>
<div class="layui-input-inline">
<input type="text" name="resourcesInfoName" class="layui-input">
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 80px">内容:</label>
<div class="layui-input-block" style="margin-left: 110px">
<textarea id="resourcesInfoContent" name="resourcesInfoContent" style="display:none;"></textarea>
</div>
</div>
</div>
</div>
<!--添加链接-->
<div id="addLine_dialog" class="layui-form" style="display: none;padding-top: 20px">
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 80px"><span style="color: red">*</span>链接名称:</label>
<div class="layui-input-inline">
<input type="text" name="resourcesInfoName" class="layui-input">
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 80px"><span style="color: red">*</span>链接地址:</label>
<div class="layui-input-inline">
<input type="text" name="resourcesInfoContent" class="layui-input">
</div>
</div>
</div>
</div>
</form>
<!--#} -->
<script>
layui.use(['add'], function(){
var resourcesInfoAdd = layui.add;
resourcesInfoAdd.init();
});
layui.use(['add'], function () {
var resourcesInfoAdd = layui.add;
resourcesInfoAdd.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>

Write Preview
Loading…
Cancel
Save