From acea164a61489e809576e0ff382d9b1510b50548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Tue, 14 Feb 2023 03:39:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8F=8D=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jlw/resourcesQuestion/importPage.html | 19 ++++++++--------
.../templates/jlw/schoolClass/add.html | 2 +-
.../templates/jlw/teacher/importPage.html | 22 ++++++++++---------
3 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html b/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html
index 9c348cf2..59b3b60a 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html
@@ -59,7 +59,7 @@
{{# layui.each(d.list, function(index, item){ }}
<tr>
<td style="text-align: center;">{{index + 1}}</td>
- <td>{{item[0]}}</td>
+ <td>{{item.failMessage}}</td>
<!-- <td style="text-align: center;">-->
<!-- {{#if(item.length ==2){}}-->
<!-- <a resourcesQuestionId="{{item[1]}}" class="layui-btn layui-btn-sm bg_button del">删除</a>-->
@@ -95,17 +95,18 @@
},
done: function (res, index, upload) { //上传后的回调
layer.closeAll('loading');
- localStorage.setItem($.getKeyInfo("resourcesQuestionLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
- var getTpl = demo.innerHTML
- , view = document.getElementById('view');
- laytpl(getTpl).render({list: res.data}, function (html) {
- view.innerHTML = html;
- $(".del").click(deleteInfo);
- });
+ //localStorage.setItem($.getKeyInfo("resourcesQuestionLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
+
if (res.code == 0) {
+ parent.window.dataReload();
layer.msg(res.msg, {icon: 1});
} else {
- layer.msg(res.msg, {icon: 2});
+ var getTpl = demo.innerHTML
+ ,view = document.getElementById('view');
+ laytpl(getTpl).render({list:JSON.parse(res.msg)}, function(html){
+ view.innerHTML = html;
+ $(".del").click(deleteInfo);
+ });
}
},
error: function () { //请求异常回调
diff --git a/web/src/main/resources/templates/jlw/schoolClass/add.html b/web/src/main/resources/templates/jlw/schoolClass/add.html
index a0cf17ad..ef8b2c3e 100644
--- a/web/src/main/resources/templates/jlw/schoolClass/add.html
+++ b/web/src/main/resources/templates/jlw/schoolClass/add.html
@@ -39,7 +39,7 @@
<label class="layui-form-label"><span class="req">*</span>所属院系：</label>
<div class="layui-input-inline">
<layui:simpleDictSelect style='layui-input-inline'
- type="university_faculty.university_faculty_name.university_faculty_status=1,find_in_set(org_id, ${user.get().orgId!''})"
+ type="university_faculty.university_faculty_name.university_faculty_status=1,universities_colleges_id=${schoolClass.universitiesCollegesId!''}"
id="universityFacultyId" name="universityFacultyId" value="${universityFacultyId!''}" layFilter="select_universityFacultyIds" lay-verify="required"/>
</div>
</div>
diff --git a/web/src/main/resources/templates/jlw/teacher/importPage.html b/web/src/main/resources/templates/jlw/teacher/importPage.html
index 240cca4a..9cd4c88c 100644
--- a/web/src/main/resources/templates/jlw/teacher/importPage.html
+++ b/web/src/main/resources/templates/jlw/teacher/importPage.html
@@ -61,12 +61,13 @@
{{# layui.each(d.list, function(index, item){ }}
<tr>
<td style="text-align: center;">{{index + 1}}</td>
- <td>{{item[0]}}</td>
+ <td>{{item.failMessage}}</td>
+ <!--<td>{{item[0]}}</td>
<td style="text-align: center;">
{{#if(item.length ==2){}}
<a teacherId="{{item[1]}}" class="layui-btn layui-btn-sm bg_button del">删除</a>
{{#}}}
- </td>
+ </td>-->
</tr>
{{# }); }}
</script>
@@ -99,17 +100,18 @@
},
done: function (res, index, upload) { //上传后的回调
layer.closeAll('loading');
- localStorage.setItem($.getKeyInfo("teacherLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
- var getTpl = demo.innerHTML
- ,view = document.getElementById('view');
- laytpl(getTpl).render({list:res.data}, function(html){
- view.innerHTML = html;
- $(".del").click(deleteInfo);
- });
+ //localStorage.setItem($.getKeyInfo("teacherLocal"), JSON.stringify(res.data)); //存入本次导入出现错误的数据
+
if (res.code == 0) {
+ parent.window.dataReload();
layer.msg(res.msg, {icon: 1});
} else {
- layer.msg(res.msg, {icon: 2});
+ var getTpl = demo.innerHTML
+ ,view = document.getElementById('view');
+ laytpl(getTpl).render({list:JSON.parse(res.msg)}, function(html){
+ view.innerHTML = html;
+ $(".del").click(deleteInfo);
+ });
}
},
error: function () { //请求异常回调