tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent f041023e49 1e292a6bea
commit 2f17254a19
5 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
web/src/main/resources/templates/jlw/competition/add.html
Unescape Escape View File

@ -741,7 +741,7 @@
<div class="layui-form" style="margin: 0 60px 30px;border: 1px solid rgba(215, 215, 215, 1);border-radius: 10px;">
<blockquote class="layui-elem-quote">证券投资赛项设置</blockquote>
<div class="layui-inline ${competition.competitionContestStartTime==''||competition.competitionContestStartTime==null?'renWu renWuON':'renWu'}">
<label class="layui-form-label">时间设置：</label>
<label class="layui-form-label">开始时间：</label>
<div class="layui-input-block">
<!--# var start_1 = simpleDateFormat(competition.competitionTaskOneStartTime,'YMDHM');-->
<!--# var end_1 = simpleDateFormat(competition.competitionTaskOneEndTime,'YMDHM');-->

8
web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html
Unescape Escape View File

@ -74,7 +74,7 @@
var upload = layui.upload;
var laytpl = layui.laytpl;
var resourcesQuestionLocal = localStorage.getItem($.getKeyInfo("resourcesQuestionLocal")); //取出上次导入出现错误的数据
/*var resourcesQuestionLocal = localStorage.getItem($.getKeyInfo("resourcesQuestionLocal")); //取出上次导入出现错误的数据
if (!$.isEmpty(resourcesQuestionLocal)) {
var getTpl = demo.innerHTML
, view = document.getElementById('view');
@ -82,7 +82,7 @@
view.innerHTML = html;
$(".del").click(deleteInfo);
});
}
}*/
upload.render({
elem: '#importTemplate',
@ -95,15 +95,15 @@
},
done: function (res, index, upload) { //上传后的回调
layer.closeAll('loading');
if (res.code == 0) {
localStorage.setItem($.getKeyInfo("resourcesQuestionLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
layer.msg(res.msg, {icon: 1});
var getTpl = demo.innerHTML
, view = document.getElementById('view');
laytpl(getTpl).render({list: res.data}, function (html) {
view.innerHTML = html;
$(".del").click(deleteInfo);
});
if (res.code == 0) {
layer.msg(res.msg, {icon: 1});
} else {
layer.msg(res.msg, {icon: 2});
}

9
web/src/main/resources/templates/jlw/schoolClass/importPage.html
Unescape Escape View File

@ -74,7 +74,7 @@
var upload = layui.upload;
var laytpl = layui.laytpl;
var studentLocal = localStorage.getItem($.getKeyInfo("studentLocal")); //取出上次导入出现错误的数据
/*var studentLocal = localStorage.getItem($.getKeyInfo("studentLocal")); //取出上次导入出现错误的数据
if(!$.isEmpty(studentLocal)){
var getTpl = demo.innerHTML
,view = document.getElementById('view');
@ -82,7 +82,7 @@
view.innerHTML = html;
$(".del").click(deleteInfo);
});
}
}*/
upload.render({
elem: '#importTemplate',
@ -96,16 +96,17 @@
},
done: function (res, index, upload) { //上传后的回调
layer.closeAll('loading');
if (res.code == 0) {
parent.window.dataReload();
localStorage.setItem($.getKeyInfo("studentLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
layer.msg(res.msg, {icon: 1});
var getTpl = demo.innerHTML
,view = document.getElementById('view');
laytpl(getTpl).render({list:res.data}, function(html){
view.innerHTML = html;
$(".del").click(deleteInfo);
});
if (res.code == 0) {
layer.msg(res.msg, {icon: 1});
} else {
layer.msg(res.msg, {icon: 2});
}

11
web/src/main/resources/templates/jlw/student/importPage.html
Unescape Escape View File

@ -34,7 +34,7 @@
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">批量导入错误列表：</label>
<label class="layui-form-label">批量导入错误列表1：</label>
</div>
</div>
</div>
@ -74,7 +74,7 @@
var upload = layui.upload;
var laytpl = layui.laytpl;
var studentLocal = localStorage.getItem($.getKeyInfo("studentLocal")); //取出上次导入出现错误的数据
/*var studentLocal = localStorage.getItem($.getKeyInfo("studentLocal")); //取出上次导入出现错误的数据
if(!$.isEmpty(studentLocal)){
var getTpl = demo.innerHTML
,view = document.getElementById('view');
@ -82,7 +82,7 @@
view.innerHTML = html;
$(".del").click(deleteInfo);
});
}
}*/
upload.render({
elem: '#importTemplate',
@ -96,16 +96,17 @@
},
done: function (res, index, upload) { //上传后的回调
layer.closeAll('loading');
if (res.code == 0) {
parent.window.dataReload();
localStorage.setItem($.getKeyInfo("studentLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
layer.msg(res.msg, {icon: 1});
var getTpl = demo.innerHTML
,view = document.getElementById('view');
laytpl(getTpl).render({list:res.data}, function(html){
view.innerHTML = html;
$(".del").click(deleteInfo);
});
if (res.code == 0) {
layer.msg(res.msg, {icon: 1});
} else {
layer.msg(res.msg, {icon: 2});
}

8
web/src/main/resources/templates/jlw/teacher/importPage.html
Unescape Escape View File

@ -76,7 +76,7 @@
var upload = layui.upload;
var laytpl = layui.laytpl;
var teacherLocal = localStorage.getItem($.getKeyInfo("teacherLocal")); //取出上次导入出现错误的数据
/*var teacherLocal = localStorage.getItem($.getKeyInfo("teacherLocal")); //取出上次导入出现错误的数据
if(!$.isEmpty(teacherLocal)){
var getTpl = demo.innerHTML
,view = document.getElementById('view');
@ -84,7 +84,7 @@
view.innerHTML = html;
$(".del").click(deleteInfo);
});
}
}*/
//导入
upload.render({
@ -99,15 +99,15 @@
},
done: function (res, index, upload) { //上传后的回调
layer.closeAll('loading');
if (res.code == 0) {
localStorage.setItem($.getKeyInfo("teacherLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
layer.msg(res.msg, {icon: 1});
var getTpl = demo.innerHTML
,view = document.getElementById('view');
laytpl(getTpl).render({list:res.data}, function(html){
view.innerHTML = html;
$(".del").click(deleteInfo);
});
if (res.code == 0) {
layer.msg(res.msg, {icon: 1});
} else {
layer.msg(res.msg, {icon: 2});
}

Write Preview
Loading…
Cancel
Save