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 +