From 1e292a6beacf7a98f1c51f22e4915ac950b589db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Wed, 8 Feb 2023 01:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/jlw/competition/add.html        |  2 +-
 .../jlw/resourcesQuestion/importPage.html     | 18 +++++++--------
 .../templates/jlw/schoolClass/importPage.html | 21 +++++++++--------
 .../templates/jlw/student/importPage.html     | 23 ++++++++++---------
 .../templates/jlw/teacher/importPage.html     | 18 +++++++--------
 5 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/web/src/main/resources/templates/jlw/competition/add.html b/web/src/main/resources/templates/jlw/competition/add.html
index 88e58f5d..2b20c563 100644
--- a/web/src/main/resources/templates/jlw/competition/add.html
+++ b/web/src/main/resources/templates/jlw/competition/add.html
@@ -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');-->
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html b/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html
index 0f288c50..9c348cf2 100644
--- a/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html
+++ b/web/src/main/resources/templates/jlw/resourcesQuestion/importPage.html
@@ -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');
+                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);
+                });
                 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);
-                    });
                 } else {
                     layer.msg(res.msg, {icon: 2});
                 }
diff --git a/web/src/main/resources/templates/jlw/schoolClass/importPage.html b/web/src/main/resources/templates/jlw/schoolClass/importPage.html
index 5b5dbe88..e3da5f7d 100644
--- a/web/src/main/resources/templates/jlw/schoolClass/importPage.html
+++ b/web/src/main/resources/templates/jlw/schoolClass/importPage.html
@@ -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');
+                parent.window.dataReload();
+                localStorage.setItem($.getKeyInfo("studentLocal"), 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);
+                });
                 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);
-                    });
                 } else {
                     layer.msg(res.msg, {icon: 2});
                 }
diff --git a/web/src/main/resources/templates/jlw/student/importPage.html b/web/src/main/resources/templates/jlw/student/importPage.html
index bfc21e8d..c4c910c0 100644
--- a/web/src/main/resources/templates/jlw/student/importPage.html
+++ b/web/src/main/resources/templates/jlw/student/importPage.html
@@ -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');
+                parent.window.dataReload();
+                localStorage.setItem($.getKeyInfo("studentLocal"), 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);
+                });
                 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);
-                    });
+
                 } else {
                     layer.msg(res.msg, {icon: 2});
                 }
diff --git a/web/src/main/resources/templates/jlw/teacher/importPage.html b/web/src/main/resources/templates/jlw/teacher/importPage.html
index b28a8aab..240cca4a 100644
--- a/web/src/main/resources/templates/jlw/teacher/importPage.html
+++ b/web/src/main/resources/templates/jlw/teacher/importPage.html
@@ -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');
+                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);
+                });
                 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);
-                    });
                 } else {
                     layer.msg(res.msg, {icon: 2});
                 }