修改bug

beetlsql3-dev
姚丹ab 2 years ago
parent ac3ed8b281
commit b96bbe7fb8

@ -2,57 +2,55 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta content="text/html;charset=UTF-8"/> <meta content="text/html;charset=UTF-8"/>
<title> <title>金融虚拟仿真实验课程平台</title>
金融虚拟仿真实验课程平台 <link rel="shortcut icon" href="${ctxPath}/plugins/logo.ico" type="image/x-icon">
</title> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<link rel="shortcut icon" href="${ctxPath}/plugins/logo.ico" type="image/x-icon"> <meta http-equiv="Pragma" content="no-cache"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> <meta http-equiv="Cache-Control" content="no cache"/>
<meta http-equiv ="Pragma" content = "no-cache"/> <meta http-equiv="Expires" content="0"/>
<meta http-equiv="Cache-Control" content="no cache" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
<meta http-equiv="Expires" content="0" /> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="format-detection" content="telephone=no"/>
<meta name="apple-mobile-web-app-capable" content="yes"> <script src="${ctxPath}/js/cdn/pace.min.js?v=${jsVer}"></script>
<meta name="format-detection" content="telephone=no"/> <link href="${ctxPath}/css/cdn/pace-theme-flash.css?v=${jsVer}" rel="stylesheet">
<script src="${ctxPath}/js/cdn/pace.min.js?v=${jsVer}"></script> <link rel="stylesheet" type="text/css" href="${ctxPath}/plugins/layui/css/layui.css?v=${jsVer}" media="all"/>
<link href="${ctxPath}/css/cdn/pace-theme-flash.css?v=${jsVer}" rel="stylesheet"> <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}/plugins/layui/css/layui.css?v=${jsVer}" media="all"/> <link rel="stylesheet" type="text/css" href="${ctxPath}/css/cdn/font_520106_q8xykrwf86ywrk9.css?v=${jsVer}"
<link rel="stylesheet" type="text/css" href="${ctxPath}/plugins/layui/css/modules/layui-icon-extend/iconfont.css"> media="all"/>
<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"/>
<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/jquery/jquery.min.js?v=${jsVer}"></script> <script type="text/javascript" src="${ctxPath}/plugins/cookie.js"></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}/plugins/jquery.cookie.js"></script> <!-- 业务公用库 -->
<!-- 业务公用库 --> <script type="text/javascript" src="${ctxPath}/js/common.js?v=${jsVer}"></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>
<script type="text/javascript" src="${ctxPath}/js/lib.js?v=${jsVer}"></script> <!-- layUI -->
<!-- layUI --> <script type="text/javascript" src="${ctxPath}/plugins/layui/layui.js?v=${jsVer}"></script>
<script type="text/javascript" src="${ctxPath}/plugins/layui/layui.js?v=${jsVer}"></script> <!-- 设置全局变量 -->
<!-- 设置全局变量 --> <script>
<script> Common.ctxPath = '${ctxPath}';
Common.ctxPath= '${ctxPath}'; Common.version = '${jsVer}';
Common.version= '${jsVer}'; </script>
</script> <script>
<script> //设定layui模块的版本
//设定layui模块的版本 layui.config({
layui.config({ base: "${ctxPath}/plugins/frame/js/",// 菜单切换等功能
base : "${ctxPath}/plugins/frame/js/",// 菜单切换等功能 version: Common.version
version : Common.version });
}); </script>
</script>
</head> </head>
<body> <body>
<div class="layui-layout layui-layout-admin"> <div class="layui-layout layui-layout-admin">
${layoutContent} ${layoutContent}
</div> </div>
<!-- 移动导航 --> <!-- 移动导航 -->
<div class="site-tree-mobile layui-hide"> <div class="site-tree-mobile layui-hide">
<i class="layui-icon">&#xe602;</i> <i class="layui-icon">&#xe602;</i>
</div> </div>
<div class="site-mobile-shade"></div> <div class="site-mobile-shade"></div>
</body> </body>

@ -30,7 +30,10 @@ if(has(readonly)){
<input type="hidden" name="${name}" ${isNotEmpty(layVerify)?('lay-verify="'+layVerify+'"'):''} value="${expected}"></input> <input type="hidden" name="${name}" ${isNotEmpty(layVerify)?('lay-verify="'+layVerify+'"'):''} value="${expected}"></input>
<!--#}else{ --> <!--#}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> <option value="">全部</option>
<!--# <!--#
var dicts = []; var dicts = [];

@ -167,7 +167,8 @@
<li class="layui-nav-item head_"> <li class="layui-nav-item head_">
<a href="javascript:void (0);"> <a href="javascript:void (0);">
<!--#if(user.get().head_img!''== null || user.get().head_img!''==''){--> <!--#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{--> <!--#}else{-->
<img src="${ctxPath}${user.get().head_img!''}" class="layui-nav-img"> <img src="${ctxPath}${user.get().head_img!''}" class="layui-nav-img">
<!--#}--> <!--#}-->
@ -358,8 +359,11 @@
function logoShow(){ function logoShow(){
var ret = Common.getAjax('/api/base/getUniInfo.do'); var ret = Common.getAjax('/api/base/getUniInfo.do');
if(!$.isEmpty(ret.data)){ 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+'>')
}
} }
//监听提醒窗体切换 //监听提醒窗体切换

@ -82,9 +82,10 @@ public class UniversitiesCollegesJurisdictionExperimentalSystemController{
@GetMapping(MODEL + "/add.do") @GetMapping(MODEL + "/add.do")
@Function("universitiesCollegesJurisdictionExperimentalSystem.add") @Function("universitiesCollegesJurisdictionExperimentalSystem.add")
@ResponseBody @ResponseBody
public ModelAndView add(Long universitiesCollegesId) { public ModelAndView add(Long universitiesCollegesId,String universitiesCollegesName) {
ModelAndView view = new ModelAndView("/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html"); ModelAndView view = new ModelAndView("/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html");
view.addObject("universitiesCollegesId", universitiesCollegesId); view.addObject("universitiesCollegesId", universitiesCollegesId);
view.addObject("universitiesCollegesName", universitiesCollegesName);
return view; return view;
} }

@ -185,13 +185,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}; };
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节 //选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds)', function (obj) { 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) { form.on('select(select_courseInfoIds_)', function (obj) {
Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value); Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value);
}); });*/
exports('index', view); exports('index', view);
}); });

@ -6,7 +6,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
courseInfoMap = {},//课程map courseInfoMap = {},//课程map
zjMap = {},//章节map zjMap = {},//章节map
selectMap = {},//已经生成过select的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 = Common.getAjax("/jlw/courseInfo/getTreeByCourseLabelTypes.json", {
courseLabelTypes: "应用课程类,考证课程类,理论课程类", courseLabelTypes: "应用课程类,考证课程类,理论课程类",
rankLimit: 3 rankLimit: 3
@ -270,8 +270,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
} }
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节 //选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds_)', function (obj) { form.on('select(select_courseInfoIds)', function (obj) {
console.log(obj.value)
Lib.getCourseInfo($("select[name='courseInfoId_2']"), obj.value, 1); 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"); var this_ = $(this).parents("td").next().find("select");
this_.empty(); this_.empty();
this_.append("<option value=''>请选择</option>"); this_.append("<option value=''>请选择</option>");

@ -239,6 +239,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}); });
}); });
}; };
//选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节 //选择归属课程 并且根据选择的课程查询章节 resourcesQuestionIdsIsNotNull:查询题目不为空的章节
form.on('select(select_courseInfoIds)', function (obj) { form.on('select(select_courseInfoIds)', function (obj) {
Lib.getCourseInfo($("select[name='courseInfoId_1']"), obj.value, 1); Lib.getCourseInfo($("select[name='courseInfoId_1']"), obj.value, 1);

@ -123,7 +123,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
}, initTableTool: table.on('tool(universitiesCollegesJurisdictionExperimentalSystemTable)', function (obj) { }, initTableTool: table.on('tool(universitiesCollegesJurisdictionExperimentalSystemTable)', function (obj) {
var data = obj.data; var data = obj.data;
if (obj.event === 'edit') { 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, ""); Common.openDlg(url, "");
} else if (obj.event === "del") { } else if (obj.event === "del") {
layer.confirm('是否确定删除该信息?', function (index) { layer.confirm('是否确定删除该信息?', function (index) {

@ -8,7 +8,7 @@
*/ */
var newId = !isEmpty(id) ? id : ('select_id_' + name + '_' + @cn.hutool.core.util.RandomUtil.randomString(10)); 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> <option value="">请选择</option>
</select> </select>

@ -439,8 +439,6 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
addPW(data); addPW(data);
}else if (obj.event === 'look') {//查看 }else if (obj.event === 'look') {//查看
Lib.downloadFile(data); Lib.downloadFile(data);
}else if (obj.event === 'update') {//上传
updataResourcesOpen(data);
}else if(obj.event === 'edit'){ }else if(obj.event === 'edit'){
var title="章节目录"; var title="章节目录";
var param = {}; var param = {};
@ -700,6 +698,7 @@ type="course_info.course_info_name.course_info_status!=3,course_info_type=1,find
} }
var param={} var param={}
var ret; var ret;
if(sign==2){ if(sign==2){
param = {resourcesInfoIds: ids,courseId:dataOld.courseInfoId}; param = {resourcesInfoIds: ids,courseId:dataOld.courseInfoId};
ret = Common.postAjax("/jlw/resourcesInfo/copy.json", param); 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秒 time: 1500 //2秒关闭如果不配置默认是3秒
}, function () { }, function () {
layer.close(index); layer.close(index);
courseInfoTable();
}); });
}else { }else {
param = {resourcesInfoId: dataOld.resourcesInfoId, 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 resourcesInfoType:dataNew[0].resourcesInfoType
}; };
postResourcesInfo(dataOld.resourcesInfoId,param,index); postResourcesInfo(dataOld.resourcesInfoId,param,index);
} }
}, btn2: function (index, layero) { }, btn2: function (index, layero) {
layer.close(index); layer.close(index);

@ -9,14 +9,20 @@
} }
</style> </style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <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"> <div class="layui-inline">
<label class="layui-form-label">课程筛选</label> <label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline"> <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, <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
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> </div>
<div class="layui-inline"> <div class="layui-inline">

@ -1,7 +1,7 @@
<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/handsOn/"}){ --> <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/handsOn/"}){ -->
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <layui:searchForm formId="searchForm" searchList="" condition="${search}">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">课程筛选</label> <label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<layui:simpleDictSelect style='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))" 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))"

@ -9,13 +9,20 @@
} }
</style> </style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <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"> <div class="layui-inline">
<label class="layui-form-label">课程筛选</label> <label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline"> <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))" <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

@ -37,13 +37,20 @@
} }
</style> </style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <layui:searchForm formId="searchForm" searchList="" condition="${search}">
<div class="layui-inline"> <!--#//<div class="layui-inline">-->
<label class="layui-form-label">课程筛选</label> <!--#// <label class="layui-form-label">课程筛选</label>-->
<div class="layui-input-inline"> <!--#//<div class="layui-input-inline">-->
<layui:simpleDictSelect style='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))" <!--#//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" <!--#//id="courseInfoId" name="courseInfoId_1"-->
layFilter="select_courseInfoIds_"/> <!--#//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> </div>
<div class="layui-inline"> <div class="layui-inline">

@ -18,14 +18,14 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">课程筛选</label> <label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<!--#// 注释 --> <!--#// 注释 -->
<!--#// <layui:simpleDictSelect style='layui-input-inline'--> <!--#// <layui:simpleDictSelect style='layui-input-inline'-->
<!--#// type="course_info.course_info_name.course_info_status=1,course_info_type=1,--> <!--#// 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)--> <!--#// find_in_set(course_label_id,(select group_concat(course_label_id)-->
<!--#// from course_label where course_label_status = 1))"--> <!--#// from course_label where course_label_status = 1))"-->
<!--#// id="courseInfoIds" name="courseInfoId_0"--> <!--#// id="courseInfoIds" name="courseInfoId_0"-->
<!--#// layFilter="select_courseInfoIds"/>--> <!--#// layFilter="select_courseInfoIds"/>-->
<!--#// 注释 --> <!--#// 注释 -->
<!--#// 查询授权的课程列表。自动根据身份判断 --> <!--#// 查询授权的课程列表。自动根据身份判断 -->
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} --> <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
@ -34,7 +34,7 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">归属章节:</label> <label class="layui-form-label">归属章节:</label>
<div class="layui-input-block"> <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" type="course_info.course_info_name.course_info_status=1,course_info_type=2"
id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_"/> id="courseInfoId1" name="courseInfoId_1" layFilter="select_courseInfoIds_"/>
</div> </div>

@ -9,13 +9,20 @@
} }
</style> </style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}"> <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"> <div class="layui-inline">
<label class="layui-form-label">课程筛选</label> <label class="layui-form-label">课程筛选</label>
<div class="layui-input-inline"> <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))" <!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
id="courseInfoIds" name="courseInfoId_0"
layFilter="select_courseInfoIds"/>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">

@ -142,6 +142,7 @@
var ret = Common.getAjax(url, param); var ret = Common.getAjax(url, param);
var data = ret.data; var data = ret.data;
if (ret.code == 0) { if (ret.code == 0) {
//console.log(data)
data.forEach(function(v, k) { data.forEach(function(v, k) {
onLineCountData.push(v.onLineCount); onLineCountData.push(v.onLineCount);
timeData.push(v.time) timeData.push(v.time)

@ -25,6 +25,7 @@
</style> </style>
<div class="layui-inline"> <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;"> <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-form-item" style="margin-bottom: 0;">
<div class="layui-inline"> <div class="layui-inline">

@ -31,12 +31,17 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">授权院校:</label> <label class="layui-form-label">授权院校:</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<!-- 时间久远,忘记这里是干啥的,先注释吧 --> <!--#if(universitiesCollegesId!=null){-->
<!-- 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))--> <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}" <layui:simpleDictSelect style='layui-input-inline' value="${universitiesCollegesId}"
type="universities_colleges.universities_colleges_name.universities_colleges_status=1" type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
id="universitiesCollegesId" name="universitiesCollegesId" id="universitiesCollegesId" name="universitiesCollegesId"
layFilter="select_universitiesColleges"/> layFilter="select_universitiesColleges"/>
<!--#}-->
</div> </div>
</div> </div>
</div> </div>
@ -278,9 +283,8 @@
$("input[name='xt_id']:checked").each(function (obj) {typeIds += obj+',';}); $("input[name='xt_id']:checked").each(function (obj) {typeIds += obj+',';});
var ret = Common.getAjax("/jlw/universitiesCollegesJurisdictionCurriculumResources/getAllByQuery.json", { var ret = Common.getAjax("/jlw/universitiesCollegesJurisdictionCurriculumResources/getAllByQuery.json", {
universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId,
applicationIds:typeIds.substring(0,typeIds.length-1) applicationIds:typeIds.substring(0,typeIds.length-1)
});//获取课程系统 });//获取课程系统 universitiesCollegesId: $("select[name='universitiesCollegesId']").val() || onUniversitiesCollegesId,
kcList = ret.data; kcList = ret.data;
loadujr(kcList); loadujr(kcList);
} }
@ -313,7 +317,7 @@
//系统单选 //系统单选
form.on('checkbox(select_xt)', function (obj) { 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); $("input[name='xt_id']").prop("checked", false);
loadxtInfo(); loadxtInfo();
Common.info("请选择授权院校!!!"); Common.info("请选择授权院校!!!");
@ -325,7 +329,7 @@
$("input[name='allSelect_1']").prop("checked", false); $("input[name='allSelect_1']").prop("checked", false);
} }
loadkcInfo(); //loadkcInfo();
form.render(); form.render();
}); });
@ -517,7 +521,7 @@
//系统全选 //系统全选
form.on('checkbox(allSelect_1)', function (obj) { 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); $("input[name='allSelect_1']").prop("checked", false);
loadxtInfo(); loadxtInfo();
Common.info("请选择授权院校!!!"); Common.info("请选择授权院校!!!");

Loading…
Cancel
Save