From ff056a3f34af5062dd8a9ff8800fdfb26654f7c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Wed, 21 Jun 2023 01:59:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=AE=AD=E6=A1=88?=
=?UTF-8?q?=E4=BE=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/static/js/jlw/courseInfo/add.js | 8 ++
.../resources/static/js/jlw/handsOn/add.js | 7 ++
.../resources/static/js/jlw/handsOn/index.js | 27 ++--
.../static/js/jlw/resourcesInfo/add.js | 22 ++--
.../static/js/jlw/resourcesInfo/index.js | 117 +++++++++++-------
.../templates/common/courseInfoSelect.html | 6 +-
.../resources/templates/jlw/handsOn/add.html | 14 +--
.../templates/jlw/handsOn/index.html | 18 +--
.../jlw/resourcesCompetition/add.html | 5 +-
.../jlw/resourcesCompetition/index.html | 2 +-
.../templates/jlw/resourcesInfo/add.html | 8 +-
.../templates/jlw/resourcesInfo/index.html | 14 ++-
.../templates/jlw/resourcesQuestion/add.html | 4 +-
.../jlw/resourcesQuestion/index.html | 2 +-
.../templates/jlw/resourcesTraining/add.html | 5 +-
.../jlw/resourcesTraining/index.html | 2 +-
.../teacherOpenCourseScheduleSession/add.html | 4 +-
.../index.html | 2 +-
18 files changed, 156 insertions(+), 111 deletions(-)
diff --git a/web/src/main/resources/static/js/jlw/courseInfo/add.js b/web/src/main/resources/static/js/jlw/courseInfo/add.js
index 3f359964..ca862a2a 100644
--- a/web/src/main/resources/static/js/jlw/courseInfo/add.js
+++ b/web/src/main/resources/static/js/jlw/courseInfo/add.js
@@ -42,6 +42,14 @@ layui.define([ 'form', 'laydate', 'table','courseInfoApi',"layedit"], function(e
// }else {
// layer.msg(ret.msg);
// }
+ layedit.set({ //富文本上传图片
+ uploadImage: {
+ url: Common.ctxPath + "/jlw/file/update.do",
+ imgUrl:Common.ctxPath,
+ type: 'post' //默认post
+ }
+ });
+
var courseInfoContent_ = layedit.build('courseInfoContent',{height:100}); //题干
var view = {
init:function(){
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 8ad3eacc..646f65b3 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/add.js
+++ b/web/src/main/resources/static/js/jlw/handsOn/add.js
@@ -14,6 +14,13 @@ layui.define(['form', 'laydate', 'table','laytpl','upload','layedit', 'handsOnAp
}
});
+ var courseInfoParentId = $("select[name='courseInfoId']").val();//课程ID
+ var sourceType = $("select[name='courseInfoId']").find('option:selected').attr("status");
+ var childValue = $("#courseChildNode").val();
+ //反显章节下拉框（key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull）
+ Lib.getCourseInfo($("select[name='courseChildNode']"),courseInfoParentId,2,sourceType,'',childValue);
+ form.render();
+
window.loadList = function (){//重新加载实训任务列表
getListInfo();
}
diff --git a/web/src/main/resources/static/js/jlw/handsOn/index.js b/web/src/main/resources/static/js/jlw/handsOn/index.js
index 724f25f0..215c4d1b 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/index.js
+++ b/web/src/main/resources/static/js/jlw/handsOn/index.js
@@ -54,18 +54,18 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
{
field: 'systemCourseChildNodeText',
title: '归属章节', align: "center"
- },
- {
- field: 'orgIdText',
- title: '归属院校', align: "center"
}, {
field: 'addTime',
title: '导入时间',
align: "center",
+ }, {
+ field: 'orgIdText',
+ title: '案例来源', align: "center",hide:isAdmin?false:true
}, {
field: 'dataType',
title: '案例来源',
align: "center",
+ hide:isAdmin?true:false,
templet: function (d) {
return d.dataType == 'FACULTY_ADD' ? '院校添加' : (d.dataType == 'ADMIN_ADD' ? '系统内置': '')
}
@@ -80,18 +80,18 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
field: 'operation_',
title: '操作',
align: "center",
- fixed: 'right',
width: 260,
templet: function (d) {
var css = isAdmin? "" : "display: none;";
- var htm = '<a class="layui-table-link" lay-event="up" data-item="${JSON.stringify(d)}" >上架</a>';
+ var htm = '<div style="text-align:left"><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">'+ (isAdmin?'编辑':'查看')+'</a>';
- htm += '<a class="layui-table-link" lay-event="addTask">添加任务</a>';
- if(d.dataType == 'FACULTY_ADD'|| isAdmin){
+ htm += '<a class="layui-table-link" lay-event="edit">'+ ((d.dataType == 'FACULTY_ADD' && !isAdmin)||(d.dataType == 'ADMIN_ADD' && isAdmin)?'编辑':'查看')+'</a>';
+ if((d.dataType == 'FACULTY_ADD' && !isAdmin)||(d.dataType == 'ADMIN_ADD' && isAdmin)){
+ htm += '<a class="layui-table-link" lay-event="addTask">添加任务</a>';
htm += '<a class="layui-table-link" lay-event="del">删除</a>';
}
+ htm +='</div>';
return htm;
}
}
@@ -154,6 +154,9 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/handsOn/add.do?handsOnId=" + data.handsOnId;
+ if(data.dataType == 'FACULTY_ADD'){
+ url = "/jlw/teacherOpenCourseHandsOn/edit.do?resourcesInfoId=" + data.handsOnId;
+ }
Common.openDlg(url, "实操管理>" + data.handsOnName + ">编辑");
} else if (obj.event === "result") {
var url = "/jlw/handsOnAchievement/index2.do?handsOnId=" + data.handsOnId;
@@ -203,7 +206,11 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
};
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds)', function (obj) {
- Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value, 1);
+ //Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value, 1);
+
+ let sourceType = $("select[name='courseInfoId']").find('option:selected').attr("status");
+ let courseInfoType = 2;//courseInfoType（2 章节，3 节）
+ Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value,courseInfoType,sourceType, 1);
});
/*//选择归属课程 并且根据选择的课程查询章节
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 85e3a214..34833e57 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/add.js
@@ -7,24 +7,25 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi',
var layedit = layui.layedit;
var laytpl = layui.laytpl ;
- var courseInfoContent_ = layedit.build('resourcesInfoContent',{height: 400});
- var courseId = $("select[name='courseInfoId_0']").val();//课程ID
- var chapterId = $("select[name='courseInfoId_1']").val();//章ID
- var courseInfoId = $("select[name='courseInfoId_2']").val();//节ID
- var sourceType = $("select[name='courseInfoId_0']").find('option:selected').attr("status");
- var childValue = $("#courseInfoId_1").val();
- var childChildValue = $("#courseInfoId_2").val();
-
layedit.set({ //富文本上传图片
uploadImage: {
url: Common.ctxPath + "/jlw/file/update.do",
- imgUrl:Common.ctxPath
+ imgUrl:Common.ctxPath,
+ type: 'post' //默认post
}
});
+ var courseId = $("select[name='courseInfoId_0']").val();//课程ID
+ var sourceType = $("select[name='courseInfoId_0']").find('option:selected').attr("status");
+ var childValue = $("#courseInfoId_1").val();
+ var childChildValue = $("#courseInfoId_2").val();
+
Lib.getCourseInfo($("select[name='courseInfoId_1']"),courseId,2,sourceType,'',childValue);//key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull
Lib.getCourseInfo($("select[name='courseInfoId_2']"),childValue,3,sourceType,'',childChildValue);//key,courseInfoParentId,courseInfoType,sourceType,resourcesQuestionIdsIsNotNull
+ var courseInfoContent_ = layedit.build('resourcesInfoContent',{height: 400});
+ form.render();
+
var view = {
init:function(){
Lib.initGenrealForm($("#addForm"),form);
@@ -33,6 +34,9 @@ layui.define([ 'form', 'laydate', 'table','element','upload','resourcesInfoApi',
initSubmit:function(){
$("#addButton").click(function(){
form.on('submit(form)', function(){
+ var courseId = $("select[name='courseInfoId_0']").val();//课程ID
+ var chapterId = $("select[name='courseInfoId_1']").val();//章ID
+ var courseInfoId = $("select[name='courseInfoId_2']").val();//节ID
var resourcesInfoId = $("input[name='resourcesInfoId']").val();
var resourcesInfoType = $("select[name='resourcesInfoType']").val(); // 资源类型(详细见数据字典，resources_info_type)
var sourceType = 2;
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 56b9f247..561f1d6d 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
@@ -39,7 +39,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}
currentAuthCourseInfoDetails.forEach(function(e,i){
- if(e.sourceType == 2){
+ if(e.sourceType == 2 && isAdmin){
if(e.courseLabelType == '考证课程类'){
textualResearchCourseList.push(e);
}else if(e.courseLabelType == '理论课程类'){
@@ -47,7 +47,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}else if(e.courseLabelType == '应用课程类'){
applicationCourseList.push(e);
}
- }else if(e.sourceType == 1){
+ }else if(e.sourceType == 1&&!isAdmin){
openCourseList.push(e)
}
});
@@ -69,10 +69,10 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}
if(isAdmin){
- selectList += htmY + '</optgroup>' + htmK + '</optgroup>' + htmL + '</optgroup>' + htmO + '</optgroup>' + "</select>";
+ selectList += htmY + '</optgroup>' + htmK + '</optgroup>' + htmL + '</optgroup>' + "</select>";
//console.log($("#isUser").val())
}else {
- selectList+= htmL + '</optgroup>' + htmO + '</optgroup>' + "</select>";
+ selectList+= htmO + '</optgroup>' + "</select>";
}
/*$.each(courseLabelTypes, function (key, value) {
@@ -114,67 +114,88 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
field: 'courseInfoParentParentName',
title: '归属课程',
templet: function (d) {
- return selectList; //一级
+ if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
+ return selectList; //一级
+ }else {
+ return d.courseInfoParentParentName||"";
+ }
}
- },
- {
+ },{
field: 'courseInfoParentName',
title: '归属章节',
align: "center",
templet: function (d) {
- var htm = "<select lay-filter='select_courseInfoIds_1'><option value=''>请选择</option>";
- if (!$.isEmpty(d.courseInfoParentId)) {
- if ($.isEmpty(selectMap[d.courseInfoParentParentId])) {
- var h = htm;
- var courseInfoChildtList = childCourseList(d.courseInfoParentParentId,2,d.sourceType);
- if (!$.isEmpty(courseInfoChildtList)) {
- courseInfoMap[d.courseInfoParentParentId] = courseInfoChildtList;
- $.each(courseInfoChildtList, function (key, v) {
- h += "<option value='" + v.courseInfoId + "'>" + v.courseInfoName + "</option>";
- });
+ if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
+ var htm = "<select lay-filter='select_courseInfoIds_1'><option value=''>请选择</option>";
+ if (!$.isEmpty(d.courseInfoParentId)&&!$.isEmpty(d.courseInfoParentParentId)) {
+ if ($.isEmpty(selectMap[d.courseInfoParentParentId])) {
+ var h = htm;
+ var courseInfoChildtList = childCourseList(d.courseInfoParentParentId,2,d.sourceType);
+ if (!$.isEmpty(courseInfoChildtList)) {
+ courseInfoMap[d.courseInfoParentParentId] = courseInfoChildtList;
+ $.each(courseInfoChildtList, function (key, v) {
+ h += "<option value='" + v.courseInfoId + "'>" + v.courseInfoName + "</option>";
+ });
+ }
+ selectMap[d.courseInfoParentParentId] = h + "</select>";
+ return h;
+ } else {
+ return selectMap[d.courseInfoParentParentId];
}
- selectMap[d.courseInfoParentParentId] = h + "</select>";
- return h;
} else {
- return selectMap[d.courseInfoParentParentId];
+ return htm + "</select>"; //二级
}
- } else {
- return htm + "</select>"; //二级
+ }else{
+ var value = '';
+ if(!$.isEmpty(d.courseInfoParentParentId)){
+ value = d.courseInfoParentName||"";
+ }
+ return value;
}
-
}
},
{
field: 'courseInfoName', title: '归属小节', align: "center", width: 200, templet: function (d) {
- var htm = "<select lay-filter='select_courseInfoIds_2'><option value=''>请选择</option>";
- if (!$.isEmpty(d.courseInfoId)) {
- if ($.isEmpty(selectMap[d.courseInfoParentId])) {
- var h = htm;
- var courseInfoChildtChildList = childCourseList(d.courseInfoParentId,3,d.sourceType);
- if (!$.isEmpty(courseInfoChildtChildList)) {
- zjMap[d.courseInfoParentId] = courseInfoChildtChildList;
- $.each(courseInfoChildtChildList, function (key, v) {
- h += "<option value='" + v.courseInfoId + "'>" + v.courseInfoName + "</option>";
- });
+ if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
+ var htm = "<select lay-filter='select_courseInfoIds_2'><option value=''>请选择</option>";
+ if (!$.isEmpty(d.courseInfoId)&&!$.isEmpty(d.courseInfoParentParentId)) {
+ if ($.isEmpty(selectMap[d.courseInfoParentId])) {
+ var h = htm;
+ var courseInfoChildtChildList = childCourseList(d.courseInfoParentId,3,d.sourceType);
+ if (!$.isEmpty(courseInfoChildtChildList)) {
+ zjMap[d.courseInfoParentId] = courseInfoChildtChildList;
+ $.each(courseInfoChildtChildList, function (key, v) {
+ h += "<option value='" + v.courseInfoId + "'>" + v.courseInfoName + "</option>";
+ });
+ }
+ selectMap[d.courseInfoParentId] = h + "</select>";
+ return h;
+ } else {
+ return selectMap[d.courseInfoParentId];
}
- selectMap[d.courseInfoParentId] = h + "</select>";
- return h;
+
} else {
- return selectMap[d.courseInfoParentId];
+ return htm + "</select>"; //三级
}
-
- } else {
- return htm + "</select>"; //三级
+ }else{
+ var value = '';
+ if(!$.isEmpty(d.courseInfoParentParentId)){
+ value = d.courseInfoName||"";
+ }
+ return value;
}
-
}
},
{
- field: 'addTypeText', title: '来源', align: "center"
+ field: 'addTypeText', title: '来源', align: "center",hide:isAdmin?false:true
+ },
+ {
+ field: 'sourceType', title: '来源', align: "center",hide:isAdmin?true:false,
+ templet:function (d) {
+ var htm = d.sourceType == 1?"院校添加":"系统内置";
+ return htm;
+ }
},
- /*{
- field: 'orgIdText', title: '上传院校', align: "center"
- },*/
{
field: 'resourcesInfoType', title: '资源类型', align: "center", templet: function (d) {//(1视频 2PPT 3PDF)
var text = d.resourcesInfoType == 1 ? "视频" : d.resourcesInfoType == 2 ? "PPT" : d.resourcesInfoType == 3 ? "PDF" : d.resourcesInfoType == 4 ? "链接" : d.resourcesInfoType == 5 ? "图文" : '-';
@@ -183,16 +204,20 @@ 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>';
+ var htm='<div style="text-align:left">';
+ if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
+ 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>';
}else {
htm += '<a class="layui-table-link" lay-event="previewPage" >预览</a>';
}
- if(d.sourceType == 1 || isAdmin){
+ if((d.sourceType == 1 && !isAdmin)||(d.sourceType == 2 && isAdmin)){
htm += '<a class="layui-table-link" lay-event="del">删除</a>';
}
+ htm += '</div>'
return htm;
}
}
diff --git a/web/src/main/resources/templates/common/courseInfoSelect.html b/web/src/main/resources/templates/common/courseInfoSelect.html
index 88acf147..7f8f78a9 100644
--- a/web/src/main/resources/templates/common/courseInfoSelect.html
+++ b/web/src/main/resources/templates/common/courseInfoSelect.html
@@ -7,7 +7,7 @@
id 标签的ID值;
isShowGroupName 显示分组名称（默认：true）;
defaultValue 默认值;
- filterName 过滤的分类名称，多个逗号隔开；只支持【应用课程类】、【理论课程类】、【考证课程类】，showGroupName为false也会过滤数据。
+ filterName 过滤的分类名称，多个逗号隔开；只支持【应用课程类】、【理论课程类】、【考证课程类】,【开课类】，showGroupName为false也会过滤数据。
isShowOpentCourse 显示开课课程
*/
@@ -62,7 +62,7 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0') + '_' + @cn.hutool.c
* </select>
*/
- // jq选择器
+ // jq选择器
var ele = $('#${newId}');
// 过滤label
var filterNames = '${filterName!""}';
@@ -131,7 +131,7 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0') + '_' + @cn.hutool.c
}
if (isShowGroupNameHandler()) ele.append('</optgroup>');
}
- if (filterNames.indexOf('开课课程类') >= 0 || filterNames === "") {
+ if (filterNames.indexOf('开课类') >= 0 || filterNames === "") {
if (isShowGroupNameHandler()) ele.append('<optgroup label="开课课程类">');
for (let currentAuthCourseInfoDetail of openCourseList) {
var cid = currentAuthCourseInfoDetail.courseInfoId || '-1';
diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html
index 5d3fadcb..ef2bdb04 100644
--- a/web/src/main/resources/templates/jlw/handsOn/add.html
+++ b/web/src/main/resources/templates/jlw/handsOn/add.html
@@ -48,10 +48,10 @@
<!--#if(user.get().isAdmin){ -->
<!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoIds", "isShowGroupName": "true","defaultValue": courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "应用课程类,理论课程类,考证课程类","defaultValue": courseInfoId}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类","defaultValue": courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类","defaultValue": courseInfoId}) {} -->
<!--#} -->
</div>
</div>
@@ -60,15 +60,10 @@
<div class="layui-form-item">
<label class="layui-form-label"><span class="req">*</span>归属章节：</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}"
- id="courseInfoId1" name="courseChildNode" layFilter="select_courseInfoIds_1"/>
- <!--#}else{-->
- <select name="courseInfoId_1" lay-filter="select_courseInfoIds_1">
+ <input type="hidden" id="courseChildNode" value="${twoChildNode}"/>
+ <select name="courseChildNode" lay-filter="select_courseInfoIds_1">
<option value="">请选择</option>
</select>
- <!--#}-->
</div>
</div>
</div>
@@ -106,6 +101,7 @@
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>
+ <a class="uploader-browse-pvwpm" style="display: none;"><u>select [.ppt', '.pptx', '.doc', '.docx', '.pdf', '.mp4']</u></a>
<button type="button" class="layui-btn bg_button uploader-browse">选择文件</button>
<button type="button" class="layui-btn bg_button" style="display: none;" id="testListAction">
开始上传
diff --git a/web/src/main/resources/templates/jlw/handsOn/index.html b/web/src/main/resources/templates/jlw/handsOn/index.html
index dc52a0db..1bc24766 100644
--- a/web/src/main/resources/templates/jlw/handsOn/index.html
+++ b/web/src/main/resources/templates/jlw/handsOn/index.html
@@ -28,7 +28,7 @@
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoId", "isShowGroupName": "true"}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoId", "isShowGroupName": "false","filterName": "理论课程类"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId", "id": "courseInfoId", "isShowGroupName": "true","filterName": "理论课程类,开课类"}) {} -->
<!--#} -->
</div>
</div>
@@ -41,16 +41,6 @@
</div>
</div>
-<!--
-这里是demo 新增加initArray
-<div class="layui-inline">
- <label class="layui-form-label">来源：</label>
- <div class="layui-input-block">
- <layui:simpleDictSelect style='layui-input-inline' laySearch="lay-search"
- type="course_info.course_info_name.course_info_status=1,course_info_type=2"
- id="courseChildNode" name="courseChildNode" layFilter="select_courseInfoIds_" initArray="1,超级管理员"/>
- </div>
- </div> -->
<div class="layui-inline">
<label class="layui-form-label">案例名称：</label>
<div class="layui-input-block">
@@ -62,15 +52,15 @@
<div class="layui-inline">
<label class="layui-form-label">案例来源：</label>
<div class="layui-input-block">
- <input type="text" name="addTypeText" class="layui-input" >
+ <input type="text" name="orgIdText" class="layui-input" >
</div>
</div>
<!--#}else{ -->
<div class="layui-inline">
<label class="layui-form-label">案例来源：</label>
<div class="layui-input-block">
- <select name="handsOnFrom" lay-filter="selectHandsOnFrom">
- <option value="">请选择</option>
+ <select name="dataType" lay-filter="selectHandsOnFrom">
+ <option value="">全部</option>
<option value="ADMIN_ADD">系统内置</option>
<option value="FACULTY_ADD">院校添加</option>
</select>
diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html
index 34fcc19c..60adfde0 100644
--- a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html
@@ -44,10 +44,10 @@
<!--#if(user.get().isAdmin){ -->
<!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "应用课程类,理论课程类,考证课程类"}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类"}) {} -->
<!--#} -->
</div>
</div>
@@ -104,6 +104,7 @@
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>
+ <a class="uploader-browse-pvwpm" style="display: none;"><u>select [.ppt', '.pptx', '.doc', '.docx', '.pdf', '.mp4']</u></a>
<button type="button" class="layui-btn bg_button uploader-browse"><span class="iconfont"></span> 选择文件</button>
<button type="button" class="layui-btn bg_button" style="display: none;" id="testListAction">
开始上传
diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html
index bde502bd..e8e5ed04 100644
--- a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html
@@ -27,7 +27,7 @@
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true"}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类"}) {} -->
<!--#} -->
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/add.html b/web/src/main/resources/templates/jlw/resourcesInfo/add.html
index a4052ac3..67be9564 100644
--- a/web/src/main/resources/templates/jlw/resourcesInfo/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesInfo/add.html
@@ -13,10 +13,10 @@
<!--#if(user.get().isAdmin){ -->
<!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true", "defaultValue":courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "应用课程类,理论课程类,考证课程类", "defaultValue":courseInfoId}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类,开课课程类", "defaultValue":courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类", "defaultValue":courseInfoId}) {} -->
<!--#} -->
</div>
</div>
@@ -65,8 +65,8 @@
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>
- <a class="uploader-browse" style="display: none;"><u>select images</u></a>
- <button type="button" class="layui-btn bg_button uploader-browse-pvwpm"
+ <a class="uploader-browse" style="display: none;"><u>select all</u></a>
+ <button type="button" class="layui-btn bg_button uploader-browse-pvwpm"
style="float: left;margin-right: 20px;margin-bottom: 20px;">选择文件
</button>
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/index.html b/web/src/main/resources/templates/jlw/resourcesInfo/index.html
index 4adb0e10..c79af54e 100644
--- a/web/src/main/resources/templates/jlw/resourcesInfo/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesInfo/index.html
@@ -56,7 +56,7 @@
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoId", "isShowGroupName": "true"}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoId", "isShowGroupName": "true","filterName": "理论课程类,开课课程类"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoId", "isShowGroupName": "true","filterName": "理论课程类,开课类"}) {} -->
<!--#} -->
</div>
</div>
@@ -76,15 +76,21 @@
id="courseChildNodeNode" name="courseInfoId_2"/>
</div>
</div>
- <!--#if(user.get().isAdmin){ -->
<div class="layui-inline">
<label class="layui-form-label">资源来源：</label>
<div class="layui-input-block">
<input type="text" name="addTypeText" class="layui-input" >
</div>
</div>
+ <!--#if(user.get().isAdmin){ -->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">资源来源：</label>
+ <div class="layui-input-block">
+ <input type="text" name="addTypeText" class="layui-input" >
+ </div>
+ </div>-->
<!--#}else{ -->
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">资源来源：</label>
<div class="layui-input-block">
<select name="sourceType" lay-filter="selectHandsOnFrom">
@@ -93,7 +99,7 @@
<option value="1">院校添加</option>
</select>
</div>
- </div>
+ </div>-->
<!--#} -->
</layui:searchForm>
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
index d5a15d71..e7c3ff70 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html
@@ -18,10 +18,10 @@
<!--#if(user.get().isAdmin){ -->
<!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","defaultValue":courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true", "filterName": "应用课程类,理论课程类,考证课程类", "defaultValue":courseInfoId}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类","defaultValue": courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类","defaultValue": courseInfoId}) {} -->
<!--#} -->
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
index 3bf3b7c7..83a0fce7 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
@@ -32,7 +32,7 @@
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true"}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类"}) {} -->
<!--#} -->
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/resourcesTraining/add.html b/web/src/main/resources/templates/jlw/resourcesTraining/add.html
index c12c609b..9460f6ef 100644
--- a/web/src/main/resources/templates/jlw/resourcesTraining/add.html
+++ b/web/src/main/resources/templates/jlw/resourcesTraining/add.html
@@ -43,10 +43,10 @@
<!--#if(user.get().isAdmin){ -->
<!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","defaultValue": courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "应用课程类,理论课程类,考证课程类","defaultValue": courseInfoId}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类","defaultValue": courseInfoId}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类","defaultValue": courseInfoId}) {} -->
<!--#} -->
</div>
</div>
@@ -96,6 +96,7 @@
<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>
+ <a class="uploader-browse-pvwpm" style="display: none;"><u>select [.ppt', '.pptx', '.doc', '.docx', '.pdf', '.mp4']</u></a>
<button type="button" class="layui-btn bg_button uploader-browse" ><i class="iconfont"></i> 选择文件</button>
<button type="button" class="layui-btn bg_button" style="display: none;" id="testListAction">开始上传</button>
</div>
diff --git a/web/src/main/resources/templates/jlw/resourcesTraining/index.html b/web/src/main/resources/templates/jlw/resourcesTraining/index.html
index e393eb4e..8c088b74 100644
--- a/web/src/main/resources/templates/jlw/resourcesTraining/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesTraining/index.html
@@ -27,7 +27,7 @@
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true"}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "false","filterName": "理论课程类"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": "courseInfoIds", "isShowGroupName": "true","filterName": "理论课程类,开课类"}) {} -->
<!--#} -->
</div>
<div class="layui-inline">
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index 977a6f4b..0477a696 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -61,10 +61,10 @@
<!--#if(user.get().isAdmin){ -->
<!--#// 查询授权的课程列表。自动根据身份判断 isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
- <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "true", "defaultValue":teacherOpenCourseScheduleSession.teacherOpenCourseId, isShowOpentCourse:"true"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "true", "filterName": "应用课程类,理论课程类,考证课程类", "defaultValue":teacherOpenCourseScheduleSession.teacherOpenCourseId}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "false","filterName": "理论课程类", "defaultValue":!isEmpty(teacherOpenCourseScheduleSession.teacherOpenCourseId!)?teacherOpenCourseScheduleSession.teacherOpenCourseId:teacherOpenCourseScheduleSession.courseInfoId, isShowOpentCourse:"true"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "teacherOpenCourseId", "isShowGroupName": "true","filterName": "理论课程类,开课类", "defaultValue":!isEmpty(teacherOpenCourseScheduleSession.teacherOpenCourseId!)?teacherOpenCourseScheduleSession.teacherOpenCourseId:teacherOpenCourseScheduleSession.courseInfoId, isShowOpentCourse:"true"}) {} -->
<!--#} -->
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
index 1a682304..5dcff102 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/index.html
@@ -28,7 +28,7 @@
<!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "", "isShowGroupName": "true", isShowOpentCourse:"true"}) {} -->
<!--#}else{ -->
- <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "", "isShowGroupName": "false","filterName": "理论课程类", isShowOpentCourse:"true"}) {} -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"teacherOpenCourseId", "id": "", "isShowGroupName": "true","filterName": "理论课程类,开课类", isShowOpentCourse:"true"}) {} -->
<!--#} -->
</div>
</div>