From b96bbe7fb830135f526c0efa33cc3fd26c9bc8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Fri, 17 Mar 2023 03:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/common/container.html | 86 +++++++++---------- .../common/tag/simpleDictSelect.tag.html | 5 +- .../src/main/resources/templates/index.html | 10 ++- ...isdictionExperimentalSystemController.java | 3 +- .../resources/static/js/jlw/handsOn/index.js | 6 +- .../static/js/jlw/resourcesInfo/index.js | 7 +- .../static/js/jlw/resourcesQuestion/index.js | 1 + .../index.js | 2 +- .../templates/common/courseInfoSelect.html | 2 +- .../jlw/courseInfo/courseConfigureNew.html | 5 +- .../templates/jlw/handsOn/index.html | 18 ++-- .../templates/jlw/handsOn/index1.html | 2 +- .../jlw/resourcesCompetition/index.html | 17 ++-- .../templates/jlw/resourcesInfo/index.html | 21 +++-- .../jlw/resourcesQuestion/index.html | 18 ++-- .../jlw/resourcesTraining/index.html | 17 ++-- .../jlw/teacher/statisticalReport.html | 1 + .../jlw/teacher/studentUsageLog.html | 1 + .../add.html | 18 ++-- 19 files changed, 140 insertions(+), 100 deletions(-) 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 @@ - - - 金融虚拟仿真实验课程平台 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 金融虚拟仿真实验课程平台 + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-${layoutContent} + ${layoutContent}
- +
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)){ - - + +
@@ -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('') + } } //监听提醒窗体切换 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 = "", 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(""); 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)); --> - 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 @@ } + + + + + + + + +
- +
- + +
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 @@
- +
+ + + + + + + + +
- +
- + +
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 @@ } -
- -
- + + + + + + + + + +
+ +
+ +
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 @@
- - - - - - - - + + + + + + + + @@ -34,7 +34,7 @@
-
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 @@ } + + + + + + + + +
- +
- + +
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 @@
+

使用情况统计报表

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 @@
- - + + +
${universitiesCollegesName}
+ + + +
@@ -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("请选择授权院校！！！");