修改bug

beetlsql3-dev
姚丹ab 2 years ago
parent bf60f26fc2
commit 31860ab660

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

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

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

@ -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 ); //图片链接base64file.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 ); //图片链接base64file.name
});
}
,done: function(res){
//如果上传失败
if(res.code > 0){
return layer.msg('上传失败');
}
//上传成功
}
,error: function(){
//演示失败状态,并实现重传
var demoText = $('#upload-demoTextPPT');
demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-mini demo-reloadP">重试</a>');
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 ); //图片链接base64file.name
});
}
,done: function(res){
//如果上传失败
if(res.code > 0){
return layer.msg('上传失败');
}
//上传成功
}
,error: function(){
//演示失败状态,并实现重传
var demoText = $('#upload-demoTextFile');
demoText.html('<span style="color: #FF5722;">上传失败</span> <a class="layui-btn layui-btn-mini demo-reloadF">重试</a>');
demoText.find('.demo-reloadF').on('click', function(){
uploadInstFile.upload();
});
}
});
var view = {
init:function(){
Lib.initGenrealForm($("#addForm"),form);

@ -96,7 +96,8 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
var css = d.teacherOpenCourseStatus == 2 ? "textType2" : 'textType';
return '<span class="' + css + '">' + d.teacherOpenCourseStatusText + '</span>';
}
}, {
},
{
field: 'operation_', title: '操作', align: "center", width: "200", templet: function (d) {
var htm = '<a class="layui-table-link" lay-event="toPaike">去排课</a>';
htm += '<a class="layui-table-link" lay-event="enable">启用</a>';

@ -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 '<span class="' + css + '">' + d.teacherOpenCourseStatusText + '</span>';
}
},
{
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,

@ -401,7 +401,7 @@
<li lay-id="0" class="layui-this">初赛</li>
<li lay-id="1">决赛</li>
<li lay-id="2">冠军邀请赛</li>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="edit_nav"><i class="layui-icon"></i></button>
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="edit_nav"><i class="iconfont">&#xebd8;</i></button>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show" id="dsrw_view"></div>
@ -738,6 +738,10 @@
<script id="dsrw_demo" type="text/html">
<div style="margin: 0 60px 30px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;">
<blockquote class="layui-elem-quote">证券投资赛项设置</blockquote>
</div>
<div style="margin: 0 60px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;">
<input name="ct1QuestionIds" type="hidden" value="{{d.ct1QuestionIds || ''}}"/>
<label class="layui-form-label">客观题设置:</label>
<div class="layui-row">
@ -844,9 +848,8 @@
</table>
</div>
</div>
</div>
<div style="margin: 0 60px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;">
<input name="ct2QuestionIds" type="hidden" value="{{d.ct2QuestionIds || ''}}"/>
<label class="layui-form-label">竞赛案例设置:</label>
<div class="layui-row">

@ -151,7 +151,7 @@
param.page = 1;
param.limit = 10;
var ret = loadLayPage(param);
console.log(ret.data);
laypage.render({
elem: 'laypageInfo'
,limit:10

@ -4,6 +4,13 @@
<script src="${ctxPath}/plugins/editorMd/editormd.min.js"></script>
<link rel="stylesheet" href="${ctxPath}/plugins/highlight/styles/a11y-light.min.css" />
<script type="text/javascript" src="${ctxPath}/plugins/highlight/highlight.min.js?v=${jsVer}"></script>
<style>
.progressCss{
width: 300px;
background: #e9e9e9;
padding: 14px;
}
</style>
<form class="layui-form" id="addForm">
<input type="hidden" id="handsOnId" name="handsOnId" value="${handsOnSimulationTasks.handsOnId}"
class="layui-input">
@ -72,7 +79,7 @@
<div class="layui-input-block">
<div class="layui-inline">
<label class="layui-form-label" style="width: 110px">
<input type="radio" name="assessmentRequirements" value="男" title="至少观看" checked>
<input type="checkbox" name="assessmentRequirements" value="男" title="至少观看">
</label>
<div class="layui-input-inline" style="top: 10px">
<input type="text" name="assessmentTime"
@ -87,7 +94,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 220px">
<input type="radio" name="assessmentRequirements1" value="男" title="间隔所少分钟出现一次弹窗">
<input type="checkbox" name="assessmentRequirements" value="男" title="间隔所少分钟出现一次弹窗">
</label>
<div class="layui-input-inline" style="top: 10px">
<input type="text" name="assessmentTime1"
@ -105,12 +112,20 @@
</div>
<div class="layui-row">
<div class="layui-form-item" style="margin-left: 20px">
<div class="layui-form-label">考核任务添加视频</div>
<div class="layui-form-label">添加视频</div>
<div class="layui-input-block" style="margin-left: 20px">
<div class="layui-upload">
<button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="test-upload-normal"><i class="layui-icon"></i>点击添加</button>
<div class="progressCss">
<span type="text" id="nameV" style="width: 300px"></span>
<span id="mv_m" style="float: right;"></span>
<div class="layui-progress " lay-showPercent="yes" lay-filter="progressBar"
style="margin-top: 15px; width:300px">
<div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>
</div>
</div>
<div class="layui-upload-list">
<img class="layui-upload-img" id="test-upload-normal-img">
<span class="layui-upload-img" id="test-upload-normal-img"></span>
<p id="test-upload-demoText"></p>
</div>
</div>
@ -187,13 +202,22 @@
</div>
<div class="layui-row">
<div class="layui-form-item" style="margin-left: 20px">
<div class="layui-form-label">考核任务添加文档</div>
<div class="layui-form-label">添加文档</div>
<div class="layui-input-block" style="margin-left: 20px">
<div class="layui-upload">
<button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="test-upload-normal"><i class="layui-icon"></i>点击添加</button>
<button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="upload-normalPPT"><i class="layui-icon"></i>点击添加</button>
<div class="progressCss">
<span type="text" id="namePPT" style="width: 300px"></span>
<span id="sizePPT" style="float: right;"></span>
<div class="layui-progress " lay-showPercent="yes" lay-filter="progressBarPPT"
style="margin-top: 15px; width:300px">
<div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>
</div>
</div>
<div class="layui-upload-list">
<img class="layui-upload-img" id="test-upload-normal-img">
<p id="test-upload-demoText"></p>
<span class="layui-upload-img" id="test-upload-normal-img"></span>
<p id="upload-demoTextPPT"></p>
</div>
</div>
</div>
@ -308,11 +332,12 @@
</div>
</div>
<div class="layui-row">
<label class="layui-form-label">考核题目:</label>
<!--<label class="layui-form-label">考核题目:</label>
<div class="layui-input-block">
<button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon">&#xe654;</i></button>
</div>
</div>-->
<div class="layui-row">
<label class="layui-form-label">考核题目:</label>
<div class="layui-input-block">
<table class="layui-table" style="width: 60%;min-width: 1000px;">
<colgroup>
@ -397,10 +422,18 @@
<div class="layui-form-label">报告参考模板</div>
<div class="layui-input-block" style="margin-left: 20px">
<div class="layui-upload">
<button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="test-upload-normal"><i class="layui-icon"></i>点击添加</button>
<button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="upload-normalFile"><i class="layui-icon"></i>点击添加</button>
<div class="progressCss">
<span type="text" id="nameFile" style="width: 300px"></span>
<span id="sizeFile" style="float: right;"></span>
<div class="layui-progress " lay-showPercent="yes" lay-filter="progressBarFile"
style="margin-top: 15px; width:300px">
<div class="layui-progress-bar layui-bg-blue" lay-percent="0%"></div>
</div>
</div>
<div class="layui-upload-list">
<img class="layui-upload-img" id="test-upload-normal-img">
<p id="test-upload-demoText"></p>
<p id="upload-demoTextFile"></p>
</div>
</div>
</div>

@ -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(); //隐藏右键菜单
}

@ -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<data.length;i++){
ids += data[i].resourcesApplicationId;
if(i < data.length - 1){
ids += ",";
}
}
,data = checkStatus.data,ids = Common.concatBatchId(data, "studentClientLinkId");
if($.isEmpty(ids)){
layer.msg("请选择需要删除的应用!", {
offset: ['50%'],
@ -152,18 +147,17 @@
}, initTableTool: table.on('tool(resourcesApplicationTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/resourcesApplication/add.do?resourcesApplicationId="+data.resourcesApplicationId;
var url = "/jlw/studentClientLink/add.do?sign=4&studentClientLinkId="+data.studentClientLinkId;
Common.openDlg(url,"应用管理/编辑应用");
}else if(obj.event === "del"){
deleteInfo(data.resourcesApplicationId);
deleteInfo(data.studentClientLinkId);
}
})
}
function deleteInfo(ids){
layer.confirm('是否确定删除应用?', function (index) {
return;
var ret = Common.postAjax("/jlw/resourcesApplication/delete.json", {ids: ids});
var ret = Common.postAjax("/jlw/studentClientLink/delete.json", {ids: ids});
layer.msg(ret.code == 0 ? "删除成功!" : ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,

@ -134,13 +134,8 @@
Lib.doSearchForm($("#searchForm"), resourcesApplicationTable, 1);
},allDel:function (){
var checkStatus = table.checkStatus('resourcesApplicationTable')
,data = checkStatus.data,ids="";
for(var i = 0;i<data.length;i++){
ids += data[i].resourcesApplicationId;
if(i < data.length - 1){
ids += ",";
}
}
,data = checkStatus.data,ids = Common.concatBatchId(data, "studentClientLinkId");
if($.isEmpty(ids)){
layer.msg("请选择需要删除的应用!", {
offset: ['50%'],
@ -159,18 +154,17 @@
}, initTableTool: table.on('tool(resourcesApplicationTable)', function (obj) {
var data = obj.data;
if (obj.event === 'edit') {
var url = "/jlw/resourcesApplication/add.do?resourcesApplicationId="+data.resourcesApplicationId;
var url = "/jlw/studentClientLink/add.do?&sign=5&studentClientLinkId="+data.studentClientLinkId;
Common.openDlg(url,"应用管理/编辑应用");
}else if(obj.event === "del"){
deleteInfo(data.resourcesApplicationId);
deleteInfo(data.studentClientLinkId);
}
})
}
function deleteInfo(ids){
layer.confirm('是否确定删除应用?', function (index) {
return;
var ret = Common.postAjax("/jlw/resourcesApplication/delete.json", {ids: ids});
var ret = Common.postAjax("/jlw/studentClientLink/delete.json", {ids: ids});
layer.msg(ret.code == 0 ? "删除成功!" : ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,

@ -1,4 +1,21 @@
<!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourseMergeSchoolClass/"}){ -->
<style>
.layui-table a {
margin-right: 10px;
}
.textType {
border: 1px solid #0f9cfd;
color: #0f9cfd;
border-radius: 5px;
padding: 3px
}
.textType2 {
border: 1px solid #919191;
color: #919191;
border-radius: 5px;
padding: 3px
}
</style>
<layui:searchForm formId="searchForm" searchList="" condition="${search}">
<div class="layui-inline">
<label class="layui-form-label">课程名称</label>

Loading…
Cancel
Save