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

修改bug

Browse Source
beetlsql3-dev
姚丹ab 2 years ago
parent ac3ed8b281
commit b96bbe7fb8
19 changed files with 140 additions and 100 deletions
Show Stats Download Patch File Download Diff File

8
admin-core/src/main/resources/templates/common/container.html
Unescape Escape View File

@ -3,9 +3,7 @@
<html>
<head>
<meta content="text/html;charset=UTF-8"/>
<title>
金融虚拟仿真实验课程平台
</title>
<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"/>
@ -19,7 +17,8 @@
<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/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>
@ -43,7 +42,6 @@
</script>
</head>
<body>
<div class="layui-layout layui-layout-admin">

5
admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html
Unescape Escape View File

@ -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 = [];

8
admin-core/src/main/resources/templates/index.html
Unescape Escape View File

@ -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,7 +359,10 @@
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+'>')
}
}

3
web/src/main/java/com/ibeetl/jlw/web/UniversitiesCollegesJurisdictionExperimentalSystemController.java
Unescape Escape View File

@ -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;
}

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

@ -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);
});

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

@ -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>");

1
web/src/main/resources/static/js/jlw/resourcesQuestion/index.js
Unescape Escape View File

@ -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);

2
web/src/main/resources/static/js/jlw/universitiesCollegesJurisdictionExperimentalSystem/index.js
Unescape Escape View File

@ -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) {

2
web/src/main/resources/templates/common/courseInfoSelect.html
Unescape Escape View File

@ -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>

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

@ -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);

18
web/src/main/resources/templates/jlw/handsOn/index.html
Unescape Escape View File

@ -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">

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

@ -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))"

17
web/src/main/resources/templates/jlw/resourcesCompetition/index.html
Unescape Escape View File

@ -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">

17
web/src/main/resources/templates/jlw/resourcesInfo/index.html
Unescape Escape View File

@ -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>-->
<!--#///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_1"
layFilter="select_courseInfoIds_"/>
<!--#// 查询授权的课程列表。自动根据身份判断 -->
<!--#layout("/common/courseInfoSelect.html",{"name":"courseInfoId_0", "id": ""}) {} -->
</div>
</div>
<div class="layui-inline">

2
web/src/main/resources/templates/jlw/resourcesQuestion/index.html
Unescape Escape View File

@ -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>

17
web/src/main/resources/templates/jlw/resourcesTraining/index.html
Unescape Escape View File

@ -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">

1
web/src/main/resources/templates/jlw/teacher/statisticalReport.html
Unescape Escape View File

@ -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)

1
web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
Unescape Escape View File

@ -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">

14
web/src/main/resources/templates/jlw/universitiesCollegesJurisdictionExperimentalSystem/add.html
Unescape Escape View File

@ -31,12 +31,17 @@
<div class="layui-inline">
<label class="layui-form-label">授权院校：</label>
<div class="layui-input-inline">
<!--#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("请选择授权院校！！！");

Write Preview
Loading…
Cancel
Save