diff --git a/WebRoot/Excel/421b579f-5500-4209-976b-498dca3d7031.xlsx b/WebRoot/Excel/421b579f-5500-4209-976b-498dca3d7031.xlsx new file mode 100644 index 00000000..d1a9168d Binary files /dev/null and b/WebRoot/Excel/421b579f-5500-4209-976b-498dca3d7031.xlsx differ diff --git a/WebRoot/Excel/55fb74a4-b538-4e92-8db3-913bd215b6b0.xlsx b/WebRoot/Excel/55fb74a4-b538-4e92-8db3-913bd215b6b0.xlsx new file mode 100644 index 00000000..aaaae83e Binary files /dev/null and b/WebRoot/Excel/55fb74a4-b538-4e92-8db3-913bd215b6b0.xlsx differ diff --git a/WebRoot/Excel/ccafd6e1-e780-4ea4-9d77-0205ef1bdc0e.xlsx b/WebRoot/Excel/ccafd6e1-e780-4ea4-9d77-0205ef1bdc0e.xlsx new file mode 100644 index 00000000..d1306562 Binary files /dev/null and b/WebRoot/Excel/ccafd6e1-e780-4ea4-9d77-0205ef1bdc0e.xlsx differ diff --git a/WebRoot/view/tb/school/report_excel.html b/WebRoot/view/tb/school/report_excel.html index 71e882f9..99a19794 100644 --- a/WebRoot/view/tb/school/report_excel.html +++ b/WebRoot/view/tb/school/report_excel.html @@ -38,15 +38,26 @@ $("#downExcel").click(function () { window.location = "/QingLong/Excel/" + downExcelPath; }); - + upload.render({ elem: '#uploadExcel', url: '/QingLong/collect/importData', data: { job_id: jobId }, exts: 'xlsx', done: function (res) { - layer.msg('上传成功'); - console.log(res) + if (res.success) { + layer.msg('上传成功'); + } else { + layer.msg(res.message, { + icon: 2, + time: 2000 + }, function () { + console.log(res.upload_excel_filename_user) + window.location = "/QingLong/Excel/" + res.upload_excel_filename_user; + }); + } + + } });