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

web/src/main/resources/templates/jlw/schoolClass/importPage.html

@@ -48,7 +48,7 @@
         <tr style="background-color: #e3e3e3;">
             <th style="text-align: center;">序号</th>
             <th>提示信息</th>
-            <th style="text-align: center;border-left:1px solid #dddddd;">操作</th>
+<!--            <th style="text-align: center;border-left:1px solid #dddddd;">操作</th>-->
         </tr>
         </thead>
         <tbody id="view" >
@@ -59,12 +59,12 @@
     {{#  layui.each(d.list, function(index, item){ }}
     <tr>
         <td style="text-align: center;">{{index + 1}}</td>
-        <td>{{item[0]}}</td>
-        <td style="text-align: center;">
-            {{#if(item.length ==2){}}
-            <a studentId="{{item[1]}}" class="layui-btn layui-btn-sm bg_button del">删除</a>
-            {{#}}}
-        </td>
+        <td>{{item.failMessage}}</td>
+<!--        <td style="text-align: center;">-->
+<!--            {{#if(item.length ==2){}}-->
+<!--            <a studentId="{{item[1]}}" class="layui-btn layui-btn-sm bg_button del">删除</a>-->
+<!--            {{#}}}-->
+<!--        </td>-->
     </tr>
     {{#  }); }}
 </script>
@@ -96,19 +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();
                     layer.msg(res.msg, {icon: 1});
                 } else {
-                    layer.msg(res.msg, {icon: 2});
+                    // localStorage.setItem($.getKeyInfo("studentLocal"), JSON.stringify(res.msg)); //存入本次导入出现错误的数据
+                    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 () { //请求异常回调