From 37ad0ada2dc5c055d9e41e044a628b7fa16f7d9d Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Sun, 8 Jan 2023 22:31:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=88=96=E8=80=85?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/js/common.js | 28 ++++++++++++++++++- .../src/main/resources/static/js/lib.js | 2 +- .../static/js/jlw/competition/add.js | 6 ++-- .../static/js/jlw/resourcesInfo/index.js | 2 -- .../resources/static/js/jlw/student/index.js | 2 +- .../resources/static/js/jlw/teacher/index.js | 2 +- .../teacherOpenCourseScoreDashboard/index.js | 2 +- .../index.js | 2 +- .../jlw/resourcesQuestion/importPage.html | 8 ++++-- .../templates/jlw/student/importPage.html | 8 ++++-- .../templates/jlw/teacher/importPage.html | 8 ++++-- .../jlw/teacher/statisticalReport.html | 2 +- .../templates/jlw/teacher/studentLogin.html | 2 +- .../jlw/teacher/studentUsageLog.html | 2 +- .../index.html | 17 +++++------ 15 files changed, 65 insertions(+), 28 deletions(-) diff --git a/admin-core/src/main/resources/static/js/common.js b/admin-core/src/main/resources/static/js/common.js index b4909070..12f22cd6 100644 --- a/admin-core/src/main/resources/static/js/common.js +++ b/admin-core/src/main/resources/static/js/common.js @@ -195,7 +195,7 @@ var Common = { if(!data) { data = {}; } - var form = $('
'); + var form = $(''); $.each(data, function (k, v) { form.append($('')); @@ -777,6 +777,32 @@ var Common = { } } return val; + }, + downFile:function (consturl,farmname,method){ //下载文件 + var xhr = new XMLHttpRequest(); + xhr.open(method || 'GET', consturl, true); // 也可以使用POST方式，根据接口 + xhr.responseType = "blob"; // 返回类型blob + // 定义请求完成的处理函数，请求前也可以增加加载框/禁用下载按钮逻辑 + xhr.onload = function () { + // 请求完成 + if (this.status === 200) { + // 返回200 + var blob = this.response; + var reader = new FileReader(); + reader.readAsDataURL(blob); // 转换为base64，可以直接放入a表情href + reader.onload = function (e) { + // 转换完成，创建一个a标签用于下载 + var a = document.createElement('a'); + a.download = farmname || Date.now()+'.xlsx'; + a.href = e.target.result; + $("body").append(a); // 修复firefox中无法触发click + a.click(); + $(a).remove(); + } + } + }; + // 发送ajax请求 + xhr.send() } }); diff --git a/admin-core/src/main/resources/static/js/lib.js b/admin-core/src/main/resources/static/js/lib.js index 02a2415b..6dc56227 100644 --- a/admin-core/src/main/resources/static/js/lib.js +++ b/admin-core/src/main/resources/static/js/lib.js @@ -1098,7 +1098,7 @@ var Lib = { a.setAttribute('download', data.resourcesInfoName); //a.download='文件名' a.click(); }else{ - window.open(Common.ctxPath + "/jlw/resourcesInfo/previewData.do?resourcesInfoId="+data.resourcesInfoId); + window.location.href = Common.ctxPath + "/jlw/resourcesInfo/previewData.do?resourcesInfoId="+data.resourcesInfoId; } },downloadFile2:function (url,name){ //下载指定文件/或者预览文件 resourcesInfoType：资源类型(1视频 2课件(ppt 、pdf) 3附件) var a = document.createElement('a'); diff --git a/web/src/main/resources/static/js/jlw/competition/add.js b/web/src/main/resources/static/js/jlw/competition/add.js index 73a9d5e9..3358da48 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -520,11 +520,11 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', //移除参赛学员 （个人） $(".del_competition_user").click(del_c_user); $(".export_gr").click(function () { //导出个人赛参赛人员信息 - window.open(Common.ctxPath + "/jlw/competition/export.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionStudent=1"); + $.downFile(Common.ctxPath + "/jlw/competition/export.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionStudent=1"); }); $(".export_td").click(function () { //导出团队赛参赛人员信息 - window.open(Common.ctxPath + "/jlw/competition/export.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionStudent=1"); + $.downFile(Common.ctxPath + "/jlw/competition/export.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionStudent=1"); }); @@ -1593,7 +1593,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', $(".search_t_no").click(search_t_no);//搜索大赛未添加评委 $(".export_pw").click(function () { //导出评委 - window.open(Common.ctxPath + "/jlw/competition/exportTeacher.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionJudge=1"); + $.downFile(Common.ctxPath + "/jlw/competition/exportTeacher.json?competitionId=" + $("input[name='competitionId']").val() + "&beCompetitionJudge=1"); }); //选择大赛评委 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 88a5ca55..b8f850a8 100644 --- a/web/src/main/resources/static/js/jlw/resourcesInfo/index.js +++ b/web/src/main/resources/static/js/jlw/resourcesInfo/index.js @@ -19,8 +19,6 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }); }); selectList += ""; - console.log(selectList) - console.log(courseLabelTypes) var view = { init: function () { this.initTable(); diff --git a/web/src/main/resources/static/js/jlw/student/index.js b/web/src/main/resources/static/js/jlw/student/index.js index 9494b59e..d31e21cc 100644 --- a/web/src/main/resources/static/js/jlw/student/index.js +++ b/web/src/main/resources/static/js/jlw/student/index.js @@ -130,7 +130,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { var classId = $("#searchForm select[name='classId']").val(), studentName = $("#searchForm input[name='studentName']").val(), studentSn = $("#searchForm input[name='studentSn']").val(); - window.open(Common.ctxPath + "/jlw/student/export.json?classId="+classId+"&studentName="+studentName+"&studentSn="+studentSn); + $.downFile(Common.ctxPath + "/jlw/student/export.json?classId="+classId+"&studentName="+studentName+"&studentSn="+studentSn); }); } }; diff --git a/web/src/main/resources/static/js/jlw/teacher/index.js b/web/src/main/resources/static/js/jlw/teacher/index.js index ee1ef1bf..9f58bae3 100644 --- a/web/src/main/resources/static/js/jlw/teacher/index.js +++ b/web/src/main/resources/static/js/jlw/teacher/index.js @@ -100,7 +100,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }, export: function () {//导出 layer.confirm('是否确定导出教师信息？', function (index) { layer.close(index); - window.open(Common.ctxPath + "/jlw/teacher/export.json"); + $.downFile(Common.ctxPath + "/jlw/teacher/export.json"); }); } }; diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/index.js index bb12aae8..e252f9e5 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScoreDashboard/index.js @@ -198,7 +198,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { layui.use([ 'teacherOpenCourseScoreDashboardApi' ], function() { var teacherOpenCourseScoreDashboardApi = layui.teacherOpenCourseScoreDashboardApi Common.openConfirm("确认要导出这些成绩数据?", function() { - window.open(Common.ctxPath + "/jlw/teacherOpenCourseScoreDashboard/excel/export.json"); + $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseScoreDashboard/excel/export.json"); }) }); }, diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js index c9fc5fe6..50c13b5e 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseStudentSigninSetting/index.js @@ -223,7 +223,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { Common.downLoad("/jlw/teacherOpenCourseMergeScheduleSession/excel/export.json", formPara, 'POST') */ layer.confirm('是否确定导出签到汇总表吗？', function (index) { - window.open(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json"); + $.downFile(Common.ctxPath + "/jlw/teacherOpenCourseStudentSigninSetting/exportSummary.json"); layer.close(index); }); } diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html b/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html index 101ace16..0f288c50 100644 --- a/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html +++ b/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html @@ -15,8 +15,8 @@
-
- +
+ 下载模板
@@ -126,6 +126,10 @@ }); } + $("#downloadTemplate").click(function () { + $.downFile(Common.ctxPath + "/jlw/resourcesQuestion/downloadTemplate.json",'题库导入模板.xlsx'); + }); + $("#addButton").click(function () { }); diff --git a/web/src/main/resources/templates/jlw/student/importPage.html b/web/src/main/resources/templates/jlw/student/importPage.html index 6fd614fd..bfc21e8d 100644 --- a/web/src/main/resources/templates/jlw/student/importPage.html +++ b/web/src/main/resources/templates/jlw/student/importPage.html @@ -15,8 +15,8 @@
-
- +
+ 下载模板
@@ -128,6 +128,10 @@ }); } + $("#downloadTemplate").click(function () { + $.downFile(Common.ctxPath + "/jlw/student/downloadTemplate.json",'学生导入模板.xlsx'); + }); + $("#addButton").click(function(){ Lib.closeFrame(); }); diff --git a/web/src/main/resources/templates/jlw/teacher/importPage.html b/web/src/main/resources/templates/jlw/teacher/importPage.html index eb839d46..b28a8aab 100644 --- a/web/src/main/resources/templates/jlw/teacher/importPage.html +++ b/web/src/main/resources/templates/jlw/teacher/importPage.html @@ -15,8 +15,8 @@
-
- +
+ 下载模板 @@ -131,6 +131,10 @@ }); } + $("#downloadTemplate").click(function () { + $.downFile(Common.ctxPath + "/jlw/teacher/downloadTemplate.json",'教师导入模板.xlsx'); + }); + $("#addButton").click(function(){ }); diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html index 44523367..3b5f9bc0 100644 --- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html +++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html @@ -145,7 +145,7 @@ Common.openDlg(url,""); },export: function () {//导出 /jlw/student/studentLogListExport.json layer.confirm('是否确定导出统计报表吗？', function (index) { - window.open(Common.ctxPath + "/jlw/student/studentLogAnalysisListExport.json"); + $.downFile(Common.ctxPath + "/jlw/student/studentLogAnalysisListExport.json"); layer.close(index); }); } diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html index 4e7b2dfa..f030e9d6 100644 --- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html +++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html @@ -210,7 +210,7 @@ Common.openDlg(url,""); }, export: function () {//导出 /jlw/student/studentLogListExport.json layer.confirm('是否确定导出登录日志吗？', function (index) { - window.open(Common.ctxPath + "/jlw/student/studentLoginLogListExport.json"); + $.downFile(Common.ctxPath + "/jlw/student/studentLoginLogListExport.json"); layer.close(index); }); } diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html index 41d8f15e..40cf4272 100644 --- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html +++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html @@ -207,7 +207,7 @@ Common.openDlg(url,""); },export:function () {//导出 /jlw/student/studentLogListExport.json layer.confirm('是否确定导出使用日志表吗？', function (index) { - window.open(Common.ctxPath + "/jlw/student/studentUseLogListExport.json"); + $.downFile(Common.ctxPath + "/jlw/student/studentUseLogListExport.json"); layer.close(index); }); } diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html index 3945b686..193137e6 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html @@ -1,20 +1,21 @@ -
+
-
- 导出 - 返回 -
From bf60f26fc2a535adc1bbf14f4b6d9c29aba8750b Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Sun, 8 Jan 2023 23:18:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B=E8=87=AA=E5=B7=B1=E7=9A=84?= =?UTF-8?q?=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/TeacherOpenCourseScoreDashboardController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java index b21c8434..839f354a 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScoreDashboardController.java @@ -9,7 +9,9 @@ import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.file.FileService; import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; +import com.ibeetl.jlw.dao.StudentDao; import com.ibeetl.jlw.entity.FileEntity; +import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.TeacherOpenCourseScoreDashboard; import com.ibeetl.jlw.service.TeacherOpenCourseScoreDashboardService; import com.ibeetl.jlw.web.query.TeacherOpenCourseScoreDashboardQuery; @@ -53,6 +55,8 @@ public class TeacherOpenCourseScoreDashboardController { @Autowired private TeacherOpenCourseScoreDashboardService teacherOpenCourseScoreDashboardService; + @Autowired + private StudentDao studentDao; @Autowired FileService fileService; @@ -64,6 +68,12 @@ public class TeacherOpenCourseScoreDashboardController { if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); } else { + if (coreUser.isStudent()) { + Student student = studentDao.getByUserId(coreUser.getId()); + if (student != null) { + condition.setStudentId(student.getStudentId()); + } + } PageQuery page = condition.getPageQuery(); teacherOpenCourseScoreDashboardService.queryByConditionQuery(page); return JsonResult.success(page); From 31860ab660a6489276c513970c3787cf8c6fd200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Mon, 9 Jan 2023 07:02:46 +0800 Subject: [PATCH 3/5] =?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/static/js/admin/user/index.js | 2 +- .../plugins/editorMd/examples/use-seajs.html | 2 +- .../static/js/jlw/competition/add.js | 15 +-- .../js/jlw/handsOnSimulationTasks/add.js | 94 ++++++++++++++++++- .../static/js/jlw/teacherOpenCourse/index.js | 3 +- .../index.js | 38 ++++---- .../templates/jlw/competition/add.html | 9 +- .../jlw/competition/patternList.html | 2 +- .../jlw/handsOnSimulationTasks/add.html | 57 ++++++++--- .../jlw/previewPage/trainingCases.html | 1 - .../studentClientLink/applicationAdmin.html | 16 +--- .../studentClientLink/applicationOther.html | 16 +--- .../index.html | 17 ++++ 13 files changed, 205 insertions(+), 67 deletions(-) diff --git a/admin-console/src/main/resources/static/js/admin/user/index.js b/admin-console/src/main/resources/static/js/admin/user/index.js index 19d6d90d..350e8e8e 100644 --- a/admin-console/src/main/resources/static/js/admin/user/index.js +++ b/admin-console/src/main/resources/static/js/admin/user/index.js @@ -282,7 +282,7 @@ layui.define(['form', 'transfer', 'table', 'userApi', 'tree', "laytpl"], functio // Common.openDlg(url,"用户管理>"+data.name+">角色管理"); loadUserRole(data.id, !$.isEmpty(data.roleIds) ? data.roleIds.split(",") : []); } else if (obj.event === "password") { - console.log("修改密码"); + layer.confirm('是否确定初始化该学生密码？', function (index) { var ret = Common.postAjax("/jlw/student/xxx.json", { userId: data.userId diff --git a/admin-core/src/main/resources/static/plugins/editorMd/examples/use-seajs.html b/admin-core/src/main/resources/static/plugins/editorMd/examples/use-seajs.html index e7e45f6b..f3e00433 100644 --- a/admin-core/src/main/resources/static/plugins/editorMd/examples/use-seajs.html +++ b/admin-core/src/main/resources/static/plugins/editorMd/examples/use-seajs.html @@ -107,7 +107,7 @@ imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp"], imageUploadURL : "./php/upload.php", onload : function() { - console.log('onload', this); + //this.fullscreen(); //this.unwatch(); //this.watch().fullscreen(); diff --git a/web/src/main/resources/static/js/jlw/competition/add.js b/web/src/main/resources/static/js/jlw/competition/add.js index 3358da48..9495de14 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -11,6 +11,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', var studentTempMap = {};//参赛学员Map var timeInfo = {}; //存储相应任务时间 用于选题时返显 var competitionType_ = $("select[name='competitionType']").val();//大赛模式 + var competitionStuTable = []; //已报名学生table 个人赛（0:已选参赛人 1：未选参赛人) 团队赛（2：已选参赛人 3：选队长 4：未选参赛人团队） var competitionStuIds = ""; //已报名学生ids var competitionStuIds_no = ""; //已报名学生ids @@ -210,7 +211,6 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', element.on('tab(dsrw_demoTabBrief)', function () { //saveInfo(1, onSign1); var sign = this.getAttribute('lay-id'); - //console.log(sign) loadDSRW('', '', sign); //loadView(sign); }); @@ -257,12 +257,16 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', $(".syb").click(function () { saveInfo(1); var i = $(".layui-tab-brief .layui-this").attr("lay-id");//当前操作tab位置 + //切换相应位置tab var showSign = $("input[name='sign']").val(); $(".layui-tab-brief .layui-this").removeClass("layui-this"); if (showSign == '2' && i == 7) {//1:金融 2:模拟交易大赛 - i = 2; + i = 3; + }else if(showSign == '2' && i == 2){ + i = 1; } + $(".layui-tab-brief .layui-tab-title li:eq(" + (i - 1) + ")").addClass("layui-this"); $(".layui-tab-brief .layui-show").removeClass("layui-show"); $(".layui-tab-brief .layui-tab-content .layui-tab-item:eq(" + (i - 1) + ")").addClass("layui-show"); @@ -294,6 +298,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', //part 代表部分值 1大赛概况 2竞赛时间 3参赛学员 4大赛任务 5成绩权重 6大赛评委 7获奖名单 8大赛动态 9常见问题 function loadView(sign) { onSign = sign; + console.log(sign) if (sign == 0) { $(".syb").hide(); $(".xyb").show(); @@ -308,7 +313,8 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', $(".syb").show(); $(".xyb").show(); $(".sbx").show(); - if (sign == 1) { + + if (sign == 2) { loadDSRW(); } if (sign == 4 && $.isEmpty(editor4)) { @@ -1278,7 +1284,6 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', studentsIds: item.studentsIds }); }); - console.log(studentTempMap); loadCompetitionUser(2, studentTempJson); }); } @@ -1294,7 +1299,6 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', area: ['800px', '660px'], content: $("#student_no_dialog"), success: function (layero, index) { - console.log(studentTempMap); loadCompetitionUser(4); }, yes: function (index) { var studentTempJson = new Array(); @@ -1396,7 +1400,6 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', } else if (nav == '2') { view = document.getElementById('dsrw_view2'); } - laytpl(getTpl).render(data, function (html) { view.innerHTML = html; jiSuanZF(); diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js index 028e97c1..162ba5dd 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js @@ -14,11 +14,24 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', //普通图片上传 var uploadInst = upload.render({ elem: '#test-upload-normal' - ,url: '/upload/' + ,url: Common.ctxPath +'/jlw/file/update.do' + ,accept:'video' + , progress: function(value) { + console.log("进度：" + value + '%'); + element.progress('progressBar',value + '%'); + }, + choose: function(obj) { + obj.preview(function(index, file, result) { + //$('input[name="src"]').html(file.name); + $('#nameV').html(file.name); + var size = (file.size/1014).toFixed(1)+'kb' + $('#mv_m').html(size); + }); + } ,before: function(obj){ //预读本地文件示例，不支持ie8 obj.preview(function(index, file, result){ - $('#test-upload-normal-img').attr('src', result); //图片链接（base64） + $('#test-upload-normal-img').text(file.name ); //图片链接（base64）file.name }); } ,done: function(res){ @@ -38,6 +51,83 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', } }); + var uploadInstPPT = upload.render({ + elem: '#upload-normalPPT' + ,url: Common.ctxPath +'/jlw/file/update.do' + ,accept:'file' + ,exts:'ppt|pps|pptx|ppsx|pot|ppa' + , progress: function(value) { + console.log("进度：" + value + '%'); + element.progress('progressBarPPT',value + '%'); + }, + choose: function(obj) { + obj.preview(function(index, file, result) { + //$('input[name="src"]').html(file.name); + $('#namePPT').html(file.name); + var size = (file.size/1014).toFixed(1)+'kb'; + $('#sizePPT').html(size); + }); + } + ,before: function(obj){ + //预读本地文件示例，不支持ie8 + obj.preview(function(index, file, result){ + $('#test-upload-normal-img').text(file.name ); //图片链接（base64）file.name + }); + } + ,done: function(res){ + //如果上传失败 + if(res.code > 0){ + return layer.msg('上传失败'); + } + //上传成功 + } + ,error: function(){ + //演示失败状态，并实现重传 + var demoText = $('#upload-demoTextPPT'); + demoText.html('上传失败 重试'); + demoText.find('.demo-reloadP').on('click', function(){ + uploadInstPPT.upload(); + }); + } + }); + var uploadInstFile = upload.render({ + elem: '#upload-normalFile' + ,url: Common.ctxPath +'/jlw/file/update.do' + ,accept:'file' + , progress: function(value) { + console.log("进度：" + value + '%'); + element.progress('progressBarFile',value + '%'); + }, + choose: function(obj) { + obj.preview(function(index, file, result) { + //$('input[name="src"]').html(file.name); + $('#nameFile').html(file.name); + var size = (file.size/1014).toFixed(1)+'kb'; + $('#sizeFile').html(size); + }); + } + ,before: function(obj){ + //预读本地文件示例，不支持ie8 + obj.preview(function(index, file, result){ + $('#test-upload-normal-img').text(file.name ); //图片链接（base64）file.name + }); + } + ,done: function(res){ + //如果上传失败 + if(res.code > 0){ + return layer.msg('上传失败'); + } + //上传成功 + } + ,error: function(){ + //演示失败状态，并实现重传 + var demoText = $('#upload-demoTextFile'); + demoText.html('上传失败 重试'); + demoText.find('.demo-reloadF').on('click', function(){ + uploadInstFile.upload(); + }); + } + }); var view = { init:function(){ Lib.initGenrealForm($("#addForm"),form); diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js index ff3dcb1b..95445f9b 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js @@ -96,7 +96,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) { var css = d.teacherOpenCourseStatus == 2 ? "textType2" : 'textType'; return '' + d.teacherOpenCourseStatusText + ''; } - }, { + }, + { field: 'operation_', title: '操作', align: "center", width: "200", templet: function (d) { var htm = '去排课'; htm += '启用'; diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js index 24a99ddf..96cb7236 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js @@ -26,7 +26,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) { height: Lib.getTableHeight(1), cellMinWidth: 100, method: 'post', - url: Common.ctxPath + '/jlw/teacherOpenCourseMergeSchoolClass/list.json' // 数据接口 + url: Common.ctxPath + '/jlw/teacherOpenCourse/list.json' // 数据接口 , page: Lib.tablePage // 开启分页 /*,toolbar: '#toolbar_teacherOpenCourseMergeSchoolClass' //自定义头部左侧工具栏 ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/ @@ -41,38 +41,41 @@ layui.define(['form', 'laydate', 'table'], function (exports) { align: "center", hideField: false, hide: $.isEmpty(sx_['teacherOpenCourseTitle']) ? false : sx_['teacherOpenCourseTitle'], - templet:function (d) { - return d.teacherOpenCourseIdText - } }, { - field: 'teacherIdText', //数据字典类型为 teacher_open_course.teacher_open_course_title.teacher_open_course_status=1 + field: 'teacherIdText', title: '上课教师', align: "center", hideField: false, hide: $.isEmpty(sx_['teacherIdText']) ? false : sx_['teacherIdText'], + templet:function (d) { + return d.teacherInfo.teacherName + } }, { - field: 'schoolClassIdText', //数据字典类型为 school_class.class_name.class_status=1 + field: 'schoolClassInfo', title: '上课班级', align: "center", - hideField: false, - hide: $.isEmpty(sx_['schoolClassIdText']) ? false : sx_['schoolClassIdText'], }, { - field: 'teacherOpenCourseMergeSchoolClassAddTime', + field: 'createTime', title: '创建时间', align: "center", hideField: false, - hide: $.isEmpty(sx_['teacherOpenCourseMergeSchoolClassAddTime']) ? false : sx_['teacherOpenCourseMergeSchoolClassAddTime'], + hide: $.isEmpty(sx_['createTime']) ? false : sx_['createTime'], }, { - field: 'teacherOpenCourseMergeSchoolClassStatusText', //数据字典类型为 global_open_status - title: '状态', + field: 'teacherOpenCourseStatusText', //数据字典类型为 global_open_status + // title : '开课状态（1启用 2禁用）', + title: '开课状态', align: "center", hideField: false, - hide: $.isEmpty(sx_['teacherOpenCourseMergeSchoolClassStatusText']) ? false : sx_['teacherOpenCourseMergeSchoolClassStatusText'], + hide: $.isEmpty(sx_['teacherOpenCourseStatusText']) ? false : sx_['teacherOpenCourseStatusText'], + templet: function (d) { + var css = d.teacherOpenCourseStatus == 2 ? "textType2" : 'textType'; + return '' + d.teacherOpenCourseStatusText + ''; + } }, { field: 'operation_', title: '操作', align: "center", templet: function (d) { @@ -130,13 +133,13 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }, examine:function () {//批量审核 var data = Common.getMoreDataFromTable(table, "teacherOpenCourseMergeSchoolClassTable"); - console.log(data) if (data == null) { return; } - var ids = Common.concatBatchId(data, "teacherOpenCourseMergeSchoolClassId"); + var ids = Common.concatBatchId(data, "teacherOpenCourseId"); layer.confirm('是否确定审核？？', function (index) { - var ret = Common.postAjax("/jlw/teacherOpenCourseMergeSchoolClass/edit.json", {ids: ids}); + var ret = Common.postAjax("/jlw/teacherOpenCourse/edit.json", + {teacherOpenCourseIdPlural: ids,teacherOpenCourseStatus:1}); layer.msg(ret.code == 0 ? "审核成功！" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, @@ -175,7 +178,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) { }); } else if (obj.event == 'examine') { layer.confirm('是否确定审核？？', function (index) { - var ret = Common.postAjax("/jlw/teacherOpenCourseMergeSchoolClass/edit.json", {id: data.teacherOpenCourseMergeSchoolClassId}); + var ret = Common.postAjax("/jlw/teacherOpenCourse/edit.json", + {teacherOpenCourseId: data.teacherOpenCourseId,teacherOpenCourseStatus:1}); layer.msg(ret.code == 0 ? "审核成功！" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html index 7e8dc067..bbfed4b5 100644 --- a/web/src/main/resources/templates/jlw/competition/add.html +++ b/web/src/main/resources/templates/jlw/competition/add.html @@ -401,7 +401,7 @@
  • 初赛
  • 决赛
  • 冠军邀请赛
    • - +
    @@ -738,6 +738,10 @@ + @@ -72,7 +79,7 @@
    -
    考核任务添加视频
    +
    添加视频
    +
    + + +
    +
    +
    +
    - +

    @@ -187,13 +202,22 @@
    -
    考核任务添加文档
    +
    添加文档
    - + +
    + + +
    +
    +
    +
    - -

    + + +

    @@ -308,11 +332,12 @@
    - +
    +
    @@ -397,10 +422,18 @@
    报告参考模板
    - + +
    + + +
    +
    +
    +
    -

    +

    diff --git a/web/src/main/resources/templates/jlw/previewPage/trainingCases.html b/web/src/main/resources/templates/jlw/previewPage/trainingCases.html index 08d53936..c38afd55 100644 --- a/web/src/main/resources/templates/jlw/previewPage/trainingCases.html +++ b/web/src/main/resources/templates/jlw/previewPage/trainingCases.html @@ -495,7 +495,6 @@ $(".layui-timeline").css("display",""); $(document).click(function(e){ var target = $(e.target); - console.log(target.closest(".layui-timeline").length); if(target.closest(".layui-timeline").length == 0 && target.closest(".kcml").length == 0 ){//点击class==rightmenu之外的地方触发 $('.layui-timeline').hide(); //隐藏右键菜单 } diff --git a/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html b/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html index 062ecbca..f4ae213b 100644 --- a/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html +++ b/web/src/main/resources/templates/jlw/studentClientLink/applicationAdmin.html @@ -127,13 +127,8 @@ Lib.doSearchForm($("#searchForm"), resourcesApplicationTable, 1); },allDel:function (){ var checkStatus = table.checkStatus('resourcesApplicationTable') - ,data = checkStatus.data,ids=""; - for(var i = 0;i +
    From eb80d98756e65be517cb771dadc24a7cc7dfc368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Mon, 9 Jan 2023 12:09:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/js/jlw/competition/add.js | 2 +- .../js/jlw/handsOnSimulationTasks/add.js | 12 ++-------- .../handsOnSimulationTasksApi.js | 4 ---- .../static/js/jlw/studentClientLink/index.js | 4 ++-- .../index.js | 4 ++-- .../jlw/handsOnSimulationTasks/add.html | 22 +++++++++---------- .../jlw/studentClientLink/logOnLink.html | 4 ++-- .../jlw/studentClientLink/popularizeLink.html | 4 ++-- 8 files changed, 22 insertions(+), 34 deletions(-) diff --git a/web/src/main/resources/static/js/jlw/competition/add.js b/web/src/main/resources/static/js/jlw/competition/add.js index 9495de14..c19671fa 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -283,7 +283,7 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', //切换相应位置tab $(".layui-tab-brief .layui-this").removeClass("layui-this"); - if (showSign == '2' && i == 1) {//1:金融 2:模拟交易大赛 + if (showSign == '2' && i == 2) {//1:金融 2:模拟交易大赛 i = 6; } $(".layui-tab-brief .layui-tab-title li:eq(" + (Number(i) + 1) + ")").addClass("layui-this"); diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js index 162ba5dd..51ab85fc 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js @@ -17,23 +17,16 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', ,url: Common.ctxPath +'/jlw/file/update.do' ,accept:'video' , progress: function(value) { - console.log("进度：" + value + '%'); element.progress('progressBar',value + '%'); }, choose: function(obj) { obj.preview(function(index, file, result) { //$('input[name="src"]').html(file.name); $('#nameV').html(file.name); - var size = (file.size/1014).toFixed(1)+'kb' + var size = (file.size/1014).toFixed(1)+'kb'; $('#mv_m').html(size); }); } - ,before: function(obj){ - //预读本地文件示例，不支持ie8 - obj.preview(function(index, file, result){ - $('#test-upload-normal-img').text(file.name ); //图片链接（base64）file.name - }); - } ,done: function(res){ //如果上传失败 if(res.code > 0){ @@ -57,7 +50,6 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', ,accept:'file' ,exts:'ppt|pps|pptx|ppsx|pot|ppa' , progress: function(value) { - console.log("进度：" + value + '%'); element.progress('progressBarPPT',value + '%'); }, choose: function(obj) { @@ -95,7 +87,6 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', ,url: Common.ctxPath +'/jlw/file/update.do' ,accept:'file' , progress: function(value) { - console.log("进度：" + value + '%'); element.progress('progressBarFile',value + '%'); }, choose: function(obj) { @@ -172,6 +163,7 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', $("input[name='taskTitle']").val(""); $("input[name='taskScore']").val(""); $("input[name='taskOrder']").val(""); + $("input[name='assessmentRequirements']").val(""); $("input[name='assessmentTime']").val(""); }); exports('add',view); diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js index 6cb5b402..098b1660 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js +++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js @@ -3,7 +3,6 @@ layui.define([], function(exports) { var api={ updateHandsOnSimulationTasks:function(form,callback){ var formPara = form.serializeJson(); - console.log(formPara) var taskTitleElement = formPara.taskTitle[0]; var taskScoreElement = formPara.taskScore[0]; var taskOrderElement = formPara.taskOrder[0]; @@ -12,19 +11,16 @@ layui.define([], function(exports) { formPara.taskScore = taskScoreElement; formPara.taskOrder = taskOrderElement; formPara.assessmentTime = assessmentTime; - console.log(formPara) Lib.submitForm("/jlw/handsOnSimulationTasks/edit.json",form,formPara,callback) }, addHandsOnSimulationTasks:function(form,callback){ var formPara = form.serializeJson(); - console.log(formPara) var taskTitleElement = formPara.taskTitle[0]; var taskScoreElement = formPara.taskScore[0]; var taskOrderElement = formPara.taskOrder[0]; formPara.taskTitle = taskTitleElement; formPara.taskScore = taskScoreElement; formPara.taskOrder = taskOrderElement; - console.log(formPara) Lib.submitForm("/jlw/handsOnSimulationTasks/add.json",form,formPara,callback) }, del:function(ids,callback){ diff --git a/web/src/main/resources/static/js/jlw/studentClientLink/index.js b/web/src/main/resources/static/js/jlw/studentClientLink/index.js index e15aa9ef..e42c26e3 100644 --- a/web/src/main/resources/static/js/jlw/studentClientLink/index.js +++ b/web/src/main/resources/static/js/jlw/studentClientLink/index.js @@ -56,8 +56,8 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { { field : 'operation_',title : '操作',align:"center", templet: function (d) { var htm = ''; - htm += ''; - htm += ''; + /*htm += ''; + htm += '';*/ return htm; } } diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js index 96cb7236..30430775 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeSchoolClass/index.js @@ -138,8 +138,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) { } var ids = Common.concatBatchId(data, "teacherOpenCourseId"); layer.confirm('是否确定审核？？', function (index) { - var ret = Common.postAjax("/jlw/teacherOpenCourse/edit.json", - {teacherOpenCourseIdPlural: ids,teacherOpenCourseStatus:1}); + var ret = Common.postAjax("/jlw/teacherOpenCourse/batchEditStatus.json", + {teacherOpenCourseIds: ids,status:1}); layer.msg(ret.code == 0 ? "审核成功！" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html index 524e170d..f8aad7d4 100644 --- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html @@ -79,11 +79,11 @@
    - +
    分钟 @@ -94,10 +94,10 @@
    -
    @@ -125,7 +125,7 @@
    - +

    @@ -171,22 +171,22 @@
    - +
    分钟
    - +
    Date: Mon, 9 Jan 2023 13:46:03 +0800 Subject: [PATCH 5/5] =?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/static/js/jlw/competition/add.js | 12 +++++++++++- .../resources/templates/jlw/competition/add.html | 16 ++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/web/src/main/resources/static/js/jlw/competition/add.js b/web/src/main/resources/static/js/jlw/competition/add.js index c19671fa..1b7da619 100644 --- a/web/src/main/resources/static/js/jlw/competition/add.js +++ b/web/src/main/resources/static/js/jlw/competition/add.js @@ -76,6 +76,13 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', $("input[name='competitionCarouselImage3']").val(res.data.src); } }); + //日期范围 + laydate.render({ + elem: '#test6' + //设置开始日期、日期日期的 input 选择器 + //数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可 + ,range: ['#test-startDate-1', '#test-endDate-1'] + }); //上传大赛动态图片 upload.render({ @@ -285,7 +292,11 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', if (showSign == '2' && i == 2) {//1:金融 2:模拟交易大赛 i = 6; + }else if(showSign == '2' && i == 0){ + i = 1; + } + $(".layui-tab-brief .layui-tab-title li:eq(" + (Number(i) + 1) + ")").addClass("layui-this"); $(".layui-tab-brief .layui-show").removeClass("layui-show"); $(".layui-tab-brief .layui-tab-content .layui-tab-item:eq(" + (Number(i) + 1) + ")").addClass("layui-show"); @@ -298,7 +309,6 @@ layui.define(['form', 'laydate', 'table', 'element', 'upload', 'competitionApi', //part 代表部分值 1大赛概况 2竞赛时间 3参赛学员 4大赛任务 5成绩权重 6大赛评委 7获奖名单 8大赛动态 9常见问题 function loadView(sign) { onSign = sign; - console.log(sign) if (sign == 0) { $(".syb").hide(); $(".xyb").show(); diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html index bbfed4b5..379959bb 100644 --- a/web/src/main/resources/templates/jlw/competition/add.html +++ b/web/src/main/resources/templates/jlw/competition/add.html @@ -739,6 +739,22 @@