diff --git a/admin-core/src/main/resources/templates/common/container.html b/admin-core/src/main/resources/templates/common/container.html
index 95bd5214..62e3d1b3 100644
--- a/admin-core/src/main/resources/templates/common/container.html
+++ b/admin-core/src/main/resources/templates/common/container.html
@@ -2,57 +2,55 @@
<!DOCTYPE html>
<html>
<head>
- <meta content="text/html;charset=UTF-8"/>
- <title>
- 金融虚拟仿真实验课程平台
- </title>
- <link rel="shortcut icon" href="${ctxPath}/plugins/logo.ico" type="image/x-icon">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
- <meta http-equiv ="Pragma" content = "no-cache"/>
- <meta http-equiv="Cache-Control" content="no cache" />
- <meta http-equiv="Expires" content="0" />
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="format-detection" content="telephone=no"/>
- <script src="${ctxPath}/js/cdn/pace.min.js?v=${jsVer}"></script>
- <link href="${ctxPath}/css/cdn/pace-theme-flash.css?v=${jsVer}" rel="stylesheet">
- <link rel="stylesheet" type="text/css" href="${ctxPath}/plugins/layui/css/layui.css?v=${jsVer}" media="all"/>
- <link rel="stylesheet" type="text/css" href="${ctxPath}/plugins/layui/css/modules/layui-icon-extend/iconfont.css">
- <link rel="stylesheet" type="text/css" href="${ctxPath}/css/cdn/font_520106_q8xykrwf86ywrk9.css?v=${jsVer}" media="all"/>
- <link rel="stylesheet" type="text/css" href="${ctxPath}/css/fs.css?v=${jsVer}" media="all"/>
- <script type="text/javascript" src="${ctxPath}/plugins/jquery/jquery.min.js?v=${jsVer}"></script>
- <script type="text/javascript" src="${ctxPath}/plugins/cookie.js"></script>
- <script type="text/javascript" src="${ctxPath}/plugins/jquery.cookie.js"></script>
- <!-- 业务公用库 -->
- <script type="text/javascript" src="${ctxPath}/js/common.js?v=${jsVer}"></script>
- <script type="text/javascript" src="${ctxPath}/js/lib.js?v=${jsVer}"></script>
- <!-- layUI -->
- <script type="text/javascript" src="${ctxPath}/plugins/layui/layui.js?v=${jsVer}"></script>
- <!-- 设置全局变量 -->
- <script>
- Common.ctxPath= '${ctxPath}';
- Common.version= '${jsVer}';
- </script>
- <script>
- //设定layui模块的版本
- layui.config({
- base : "${ctxPath}/plugins/frame/js/",// 菜单切换等功能
- version : Common.version
- });
- </script>
-
-
-
+ <meta content="text/html;charset=UTF-8"/>
+ <title>金融虚拟仿真实验课程平台</title>
+ <link rel="shortcut icon" href="${ctxPath}/plugins/logo.ico" type="image/x-icon">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta http-equiv="Pragma" content="no-cache"/>
+ <meta http-equiv="Cache-Control" content="no cache"/>
+ <meta http-equiv="Expires" content="0"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
+ <meta name="apple-mobile-web-app-status-bar-style" content="black">
+ <meta name="apple-mobile-web-app-capable" content="yes">
+ <meta name="format-detection" content="telephone=no"/>
+ <script src="${ctxPath}/js/cdn/pace.min.js?v=${jsVer}"></script>
+ <link href="${ctxPath}/css/cdn/pace-theme-flash.css?v=${jsVer}" rel="stylesheet">
+ <link rel="stylesheet" type="text/css" href="${ctxPath}/plugins/layui/css/layui.css?v=${jsVer}" media="all"/>
+ <link rel="stylesheet" type="text/css" href="${ctxPath}/plugins/layui/css/modules/layui-icon-extend/iconfont.css">
+ <link rel="stylesheet" type="text/css" href="${ctxPath}/css/cdn/font_520106_q8xykrwf86ywrk9.css?v=${jsVer}"
+ media="all"/>
+ <link rel="stylesheet" type="text/css" href="${ctxPath}/css/fs.css?v=${jsVer}" media="all"/>
+ <script type="text/javascript" src="${ctxPath}/plugins/jquery/jquery.min.js?v=${jsVer}"></script>
+ <script type="text/javascript" src="${ctxPath}/plugins/cookie.js"></script>
+ <script type="text/javascript" src="${ctxPath}/plugins/jquery.cookie.js"></script>
+ <!-- 业务公用库 -->
+ <script type="text/javascript" src="${ctxPath}/js/common.js?v=${jsVer}"></script>
+ <script type="text/javascript" src="${ctxPath}/js/lib.js?v=${jsVer}"></script>
+ <!-- layUI -->
+ <script type="text/javascript" src="${ctxPath}/plugins/layui/layui.js?v=${jsVer}"></script>
+ <!-- 设置全局变量 -->
+ <script>
+ Common.ctxPath = '${ctxPath}';
+ Common.version = '${jsVer}';
+ </script>
+ <script>
+ //设定layui模块的版本
+ layui.config({
+ base: "${ctxPath}/plugins/frame/js/",// 菜单切换等功能
+ version: Common.version
+ });
+ </script>
+
+
</head>
<body>
<div class="layui-layout layui-layout-admin">
-${layoutContent}
+ ${layoutContent}
</div>
<!-- 移动导航 -->
<div class="site-tree-mobile layui-hide">
- <i class="layui-icon"></i>
+ <i class="layui-icon"></i>
</div>
<div class="site-mobile-shade"></div>
</body>
diff --git a/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html b/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html
index 1c649fbf..9282af64 100644
--- a/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html
+++ b/admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html
@@ -30,7 +30,10 @@ if(has(readonly)){
<input type="hidden" name="${name}" ${isNotEmpty(layVerify)?('lay-verify="'+layVerify+'"'):''} value="${expected}"></input>
<!--#}else{ -->
- <select data-group="${group!}" name="${name}" ${has(id)?("id="+id):''} ${isNotEmpty(layVerify)?('lay-verify="'+layVerify+'"'):''} ${isNotEmpty(layFilter)?('lay-filter="'+layFilter+'"'):''} ${isNotEmpty(dis)?('disabled="'+dis+'"'):''}>
+ <select data-group="${group!}" name="${name}" ${has(id)?("id="+id):''} ${isNotEmpty(layVerify)?('lay-verify="'+layVerify+'"'):''}
+ ${isNotEmpty(layFilter)?('lay-filter="'+layFilter+'"'):''} ${isNotEmpty(dis)?('disabled="'+dis+'"'):''}
+ ${isNotEmpty(laySearch)?'lay-search':''}
+ >
<option value="">全部</option>
<!--#
var dicts = [];
diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html
index 3bad2550..8c3b043c 100644
--- a/admin-core/src/main/resources/templates/index.html
+++ b/admin-core/src/main/resources/templates/index.html
@@ -167,7 +167,8 @@
<li class="layui-nav-item head_">
<a href="javascript:void (0);">
<!--#if(user.get().head_img!''== null || user.get().head_img!''==''){-->
- <img src="${ctxPath}/plugins/head_img.jpg" class="layui-nav-img">
+ <!--<img src="${ctxPath}/plugins/head_img.jpg" class="layui-nav-img">-->
+ <div></div>
<!--#}else{-->
<img src="${ctxPath}${user.get().head_img!''}" class="layui-nav-img">
<!--#}-->
@@ -358,8 +359,11 @@
function logoShow(){
var ret = Common.getAjax('/api/base/getUniInfo.do');
if(!$.isEmpty(ret.data)){
- $("#logoTL").attr('src',Common.ctxPath+ret.data.universitiesCollegesLogo);
- }
+ /*$("#logoTL").text('');
+ $("#logoTL").attr('src',Common.ctxPath+ret.data.universitiesCollegesLogo);*/
+ $(".layui-logo").text('');
+ $(".layui-logo").html('<img style="height: 55px;" id="logoTL" src='+Common.ctxPath+ret.data.universitiesCollegesLogo+'>')
+ }
}
//监听提醒窗体切换
diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java
index b0fdb220..4f5566a2 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java
@@ -82,9 +82,10 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemController{
@GetMapping(MODEL + "/add.do")
@Function("universitiesCollegesJurisdictionExperimentalSystem.add")
@ResponseBody
- public ModelAndView add(Long universitiesCollegesId) {
+ public ModelAndView add(Long universitiesCollegesId,String universitiesCollegesName) {
ModelAndView view = new ModelAndView("/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html");
view.addObject("universitiesCollegesId", universitiesCollegesId);
+ view.addObject("universitiesCollegesName", universitiesCollegesName);
return view;
}
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 2996775a..115c45e6 100644
--- a/web/src/main/resources/static/js/jlw/handsOn/index.js
+++ b/web/src/main/resources/static/js/jlw/handsOn/index.js
@@ -185,13 +185,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
};
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds)', function (obj) {
- Lib.getCourseInfo($("select[name='courseInfoId']"), obj.value, 1);
+ Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value, 1);
});
- //选择归属课程 并且根据选择的课程查询章节
+ /*//选择归属课程 并且根据选择的课程查询章节
form.on('select(select_courseInfoIds_)', function (obj) {
Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value);
- });
+ });*/
exports('index', view);
});
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 389d32c7..1f6c8075 100644
--- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
+++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js
@@ -6,7 +6,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
courseInfoMap = {},//课程map
zjMap = {},//章节map
selectMap = {},//已经生成过select的map
- selectList = "<select lay-filter='select_courseInfoIds'><option value=''>请选择</option>",
+ selectList = "<select lay-filter='select_courseInfoIds_'><option value=''>请选择</option>",
courseLabelTypes = Common.getAjax("/jlw/courseInfo/getTreeByCourseLabelTypes.json", {
courseLabelTypes: "应用课程类,考证课程类,理论课程类",
rankLimit: 3
@@ -270,8 +270,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
- form.on('select(select_courseInfoIds_)', function (obj) {
- console.log(obj.value)
+ form.on('select(select_courseInfoIds)', function (obj) {
Lib.getCourseInfo($("select[name='courseInfoId_2']"), obj.value, 1);
});
@@ -309,7 +308,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
});
//选择归属课程 并且根据选择的课程查询章节
- form.on('select(select_courseInfoIds)', function (obj) {
+ form.on('select(select_courseInfoIds_)', function (obj) {
var this_ = $(this).parents("td").next().find("select");
this_.empty();
this_.append("<option value=''>请选择</option>");
diff --git a/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js b/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js
index 80e44f8f..4dbf2192 100644
--- a/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js
+++ b/web/src/main/resources/static/js/jlw/resourcesQuestion/index.js
@@ -239,6 +239,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
});
});
};
+
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds)', function (obj) {
Lib.getCourseInfo($("select[name='courseInfoId_1']"), obj.value, 1);
diff --git a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js
index ecd86761..3fba7704 100644
--- a/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js
+++ b/web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js
@@ -123,7 +123,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}, initTableTool: table.on('tool(universitiesCollegesJurisdictionExperimentalSystemTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
- var url = "/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.do?universitiesCollegesId=" + data.universitiesCollegesId;
+ var url = "/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.do?universitiesCollegesId=" + data.universitiesCollegesId+"&universitiesCollegesName="+data.universitiesCollegesName;
Common.openDlg(url, "");
} else if (obj.event === "del") {
layer.confirm('是否确定删除该信息？', function (index) {
diff --git a/web/src/main/resources/templates/common/courseInfoSelect.html b/web/src/main/resources/templates/common/courseInfoSelect.html
index 57113300..b141d184 100644
--- a/web/src/main/resources/templates/common/courseInfoSelect.html
+++ b/web/src/main/resources/templates/common/courseInfoSelect.html
@@ -8,7 +8,7 @@
*/
var newId = !isEmpty(id) ? id : ('select_id_' + name + '_' + @cn.hutool.core.util.RandomUtil.randomString(10));
-->
-<select name="${name!''}" id="${newId ! ''}" lay-verify="" lay-search>
+<select name="${name!''}" id="${newId ! ''}" lay-verify="" lay-search lay-filter="select_courseInfoIds">
<option value="">请选择</option>
</select>
diff --git a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
index cbbcf288..c0fecfd5 100644
--- a/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
+++ b/web/src/main/resources/templates/jlw/courseInfo/courseConfigureNew.html
@@ -439,8 +439,6 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
addPW(data);
}else if (obj.event === 'look') {//查看
Lib.downloadFile(data);
- }else if (obj.event === 'update') {//上传
- updataResourcesOpen(data);
}else if(obj.event === 'edit'){
var title="章节目录";
var param = {};
@@ -700,6 +698,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
}
var param={}
var ret;
+
if(sign==2){
param = {resourcesInfoIds: ids,courseId:dataOld.courseInfoId};
ret = Common.postAjax("/jlw/resourcesInfo/copy.json", param);
@@ -709,6 +708,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
time: 1500 //2秒关闭（如果不配置，默认是3秒）
}, function () {
layer.close(index);
+ courseInfoTable();
});
}else {
param = {resourcesInfoId: dataOld.resourcesInfoId,
@@ -718,6 +718,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
resourcesInfoType:dataNew[0].resourcesInfoType
};
postResourcesInfo(dataOld.resourcesInfoId,param,index);
+
}
}, btn2: function (index, layero) {
layer.close(index);
diff --git a/web/src/main/resources/templates/jlw/handsOn/index.html b/web/src/main/resources/templates/jlw/handsOn/index.html
index 8fac6df7..a6d28077 100644
--- a/web/src/main/resources/templates/jlw/handsOn/index.html
+++ b/web/src/main/resources/templates/jlw/handsOn/index.html
@@ -9,14 +9,20 @@
}
</style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+ <!--#// <div class="layui-inline">-->
+ <!--#// <label class="layui-form-label">课程筛选</label>-->
+ <!--#// <div class="layui-input-inline">-->
+ <!--#// <layui:simpleDictSelect style='layui-input-inline'-->
+ <!--#// type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"-->
+ <!--#// id="courseInfoId" name="courseInfoId"-->
+ <!--#// layFilter="select_courseInfoIds"/>-->
+ <!--#//</div>-->
+ <!--#//</div>-->
<div class="layui-inline">
- <label class="layui-form-label">课程筛选</label>
+ <label class="layui-form-label">课程筛选：</label>
<div class="layui-input-inline">
- <layui:simpleDictSelect style='layui-input-inline'
- type="course_info.course_info_name.course_info_status=1,course_info_type=1,
- find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
- id="courseInfoId" name="courseInfoId"
- layFilter="select_courseInfoIds"/>
+ <!--#// 查询授权的课程列表。自动根据身份判断 -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
</div>
</div>
<div class="layui-inline">
diff --git a/web/src/main/resources/templates/jlw/handsOn/index1.html b/web/src/main/resources/templates/jlw/handsOn/index1.html
index 3188df48..a7a84a86 100644
--- a/web/src/main/resources/templates/jlw/handsOn/index1.html
+++ b/web/src/main/resources/templates/jlw/handsOn/index1.html
@@ -1,7 +1,7 @@
<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/handsOn/"}){ -->
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
<div class="layui-inline">
- <label class="layui-form-label">课程筛选</label>
+ <label class="layui-form-label">课程筛选：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html
index c57f9664..8ad69b0b 100644
--- a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html
@@ -9,13 +9,20 @@
}
</style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+ <!--#//<div class="layui-inline">-->
+ <!--#//<label class="layui-form-label">课程筛选</label>-->
+ <!--#//<div class="layui-input-inline">-->
+ <!--#//<layui:simpleDictSelect style='layui-input-inline'-->
+ <!--#//type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"-->
+ <!--#// id="courseInfoIds" name="courseInfoId_0"-->
+ <!--#// layFilter="select_courseInfoIds"/>-->
+ <!--#//</div>-->
+ <!--#//</div>-->
<div class="layui-inline">
- <label class="layui-form-label">课程筛选</label>
+ <label class="layui-form-label">课程筛选：</label>
<div class="layui-input-inline">
- <layui:simpleDictSelect style='layui-input-inline'
- type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
- id="courseInfoIds" name="courseInfoId_0"
- layFilter="select_courseInfoIds"/>
+ <!--#// 查询授权的课程列表。自动根据身份判断 -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
</div>
</div>
<div class="layui-inline">
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/index.html b/web/src/main/resources/templates/jlw/resourcesInfo/index.html
index 8b7088d3..0adc3422 100644
--- a/web/src/main/resources/templates/jlw/resourcesInfo/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesInfo/index.html
@@ -37,13 +37,20 @@
}
</style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
- <div class="layui-inline">
- <label class="layui-form-label">课程筛选</label>
- <div class="layui-input-inline">
- <layui:simpleDictSelect style='layui-input-inline'
- type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
- id="courseInfoId" name="courseInfoId_1"
- layFilter="select_courseInfoIds_"/>
+ <!--#//<div class="layui-inline">-->
+ <!--#// <label class="layui-form-label">课程筛选</label>-->
+ <!--#//<div class="layui-input-inline">-->
+ <!--#//<layui:simpleDictSelect style='layui-input-inline'-->
+ <!--#//type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"-->
+ <!--#//id="courseInfoId" name="courseInfoId_1"-->
+ <!--#//layFilter="select_courseInfoIds_"/>-->
+ <!--#//</div>-->
+ <!--#///div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">课程筛选：</label>
+ <div class="layui-input-inline">
+ <!--#// 查询授权的课程列表。自动根据身份判断 -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
</div>
</div>
<div class="layui-inline">
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
index 26dadb8b..e8ec31a5 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html
@@ -18,14 +18,14 @@
<div class="layui-inline">
<label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline">
-<!--#// 注释 -->
-<!--#// <layui:simpleDictSelect style='layui-input-inline'-->
-<!--#// type="course_info.course_info_name.course_info_status=1,course_info_type=1,-->
-<!--#// find_in_set(course_label_id,(select group_concat(course_label_id)-->
-<!--#// from course_label where course_label_status = 1))"-->
-<!--#// id="courseInfoIds" name="courseInfoId_0"-->
-<!--#// layFilter="select_courseInfoIds"/>-->
-<!--#// 注释 -->
+ <!--#// 注释 -->
+ <!--#// <layui:simpleDictSelect style='layui-input-inline'-->
+ <!--#// type="course_info.course_info_name.course_info_status=1,course_info_type=1,-->
+ <!--#// find_in_set(course_label_id,(select group_concat(course_label_id)-->
+ <!--#// from course_label where course_label_status = 1))"-->
+ <!--#// id="courseInfoIds" name="courseInfoId_0"-->
+ <!--#// layFilter="select_courseInfoIds"/>-->
+ <!--#// 注释 -->
<!--#// 查询授权的课程列表。自动根据身份判断 -->
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
@@ -34,7 +34,7 @@
<div class="layui-inline">
<label class="layui-form-label">归属章节：</label>
<div class="layui-input-block">
- <layui:simpleDictSelect style='layui-input-inline'
+ <layui:simpleDictSelect style='layui-input-inline' laySearch="lay-search"
type="course_info.course_info_name.course_info_status=1,course_info_type=2"
id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_"/>
</div>
diff --git a/web/src/main/resources/templates/jlw/resourcesTraining/index.html b/web/src/main/resources/templates/jlw/resourcesTraining/index.html
index 20a27f6a..4a3efc98 100644
--- a/web/src/main/resources/templates/jlw/resourcesTraining/index.html
+++ b/web/src/main/resources/templates/jlw/resourcesTraining/index.html
@@ -9,13 +9,20 @@
}
</style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
+ <!--#//<div class="layui-inline">-->
+ <!--#//<label class="layui-form-label">课程筛选:</label>-->
+ <!--#//<div class="layui-input-inline">-->
+ <!--#//<layui:simpleDictSelect style='layui-input-inline'-->
+ <!--#// type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"-->
+ <!--#//id="courseInfoIds" name="courseInfoId_0"-->
+ <!--#// layFilter="select_courseInfoIds"/>-->
+ <!--#// </div>-->
+ <!--#// </div>-->
<div class="layui-inline">
- <label class="layui-form-label">课程筛选</label>
+ <label class="layui-form-label">课程筛选：</label>
<div class="layui-input-inline">
- <layui:simpleDictSelect style='layui-input-inline'
- type="course_info.course_info_name.course_info_status=1,course_info_type=1,find_in_set(course_label_id,(select group_concat(course_label_id) from course_label where course_label_status = 1))"
- id="courseInfoIds" name="courseInfoId_0"
- layFilter="select_courseInfoIds"/>
+ <!--#// 查询授权的课程列表。自动根据身份判断 -->
+ <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
</div>
</div>
<div class="layui-inline">
diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
index 9b147197..2135ae1f 100644
--- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
+++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
@@ -142,6 +142,7 @@
var ret = Common.getAjax(url, param);
var data = ret.data;
if (ret.code == 0) {
+ //console.log(data)
data.forEach(function(v, k) {
onLineCountData.push(v.onLineCount);
timeData.push(v.time)
diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
index e6ee49a3..03083d92 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
@@ -25,6 +25,7 @@
</style>
<div class="layui-inline">
+ <h1 style="color: red;margin-bottom: 50px">使用情况统计报表</h1>
<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
<div class="layui-form-item" style="margin-bottom: 0;">
<div class="layui-inline">
diff --git a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
index f2ed0f97..9edead97 100644
--- a/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
+++ b/web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
@@ -31,12 +31,17 @@
<div class="layui-inline">
<label class="layui-form-label">授权院校：</label>
<div class="layui-input-inline">
-<!-- 时间久远，忘记这里是干啥的，先注释吧 -->
-<!-- universities_colleges.universities_colleges_name.universities_colleges_status=1,not find_in_set(universities_colleges_id,IFNULL((SELECT group_concat(universities_colleges_id) FROM universities_colleges_jurisdiction_experimental_system WHERE FIND_IN_SET(use_type,'1,2')),-1))-->
+ <!--#if(universitiesCollegesId!=null){-->
+ <input name="universitiesCollegesId" value="${universitiesCollegesId}" type="hidden">
+ <div class="layui-form-mid">${universitiesCollegesName}<div>
+ <!--#}else{-->
+ <!-- 时间久远，忘记这里是干啥的，先注释吧 -->
+ <!-- universities_colleges.universities_colleges_name.universities_colleges_status=1,not find_in_set(universities_colleges_id,IFNULL((SELECT group_concat(universities_colleges_id) FROM universities_colleges_jurisdiction_experimental_system WHERE FIND_IN_SET(use_type,'1,2')),-1))-->
<layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/>
+ <!--#}-->
</div>
</div>
</div>
@@ -278,9 +283,8 @@
$("input[name='xt_id']:checked").each(function (obj) {typeIds += obj+',';});
var ret = Common.getAjax("/jlw/universitiesCollegesJurisdictionCurriculumResources/getAllByQuery.json", {
- universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId,
applicationIds:typeIds.substring(0,typeIds.length-1)
- });//获取课程系统
+ });//获取课程系统 universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId,
kcList = ret.data;
loadujr(kcList);
}
@@ -313,7 +317,7 @@
//系统单选
form.on('checkbox(select_xt)', function (obj) {
- if($.isEmpty($("select[name='universitiesCollegesId']").val())){
+ if($.isEmpty($("select[name='universitiesCollegesId']").val())&&$.isEmpty(onUniversitiesCollegesId)){
$("input[name='xt_id']").prop("checked", false);
loadxtInfo();
Common.info("请选择授权院校！！！");
@@ -325,7 +329,7 @@
$("input[name='allSelect_1']").prop("checked", false);
}
- loadkcInfo();
+ //loadkcInfo();
form.render();
});
@@ -517,7 +521,7 @@
//系统全选
form.on('checkbox(allSelect_1)', function (obj) {
- if($.isEmpty($("select[name='universitiesCollegesId']").val())){
+ if($.isEmpty($("select[name='universitiesCollegesId']").val())&&$.isEmpty(onUniversitiesCollegesId)){
$("input[name='allSelect_1']").prop("checked", false);
loadxtInfo();
Common.info("请选择授权院校！！！");