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