From 00975c85b697ad5731f52c397b0be1a88466da24 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Thu, 12 May 2022 17:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4easyui=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E3=80=81=E7=94=A8=E6=88=B7=E3=80=81=E7=BB=84=E7=BB=87=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module-examine/pom.xml                        | 30 +++++++++++++++++++
 pom.xml                                       |  3 +-
 .../department/upload/upload-excel.html       |  5 ++--
 .../templates/user/upload/upload-excel.html   |  6 ++--
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 module-examine/pom.xml

diff --git a/module-examine/pom.xml b/module-examine/pom.xml
new file mode 100644
index 00000000..44b6ef21
--- /dev/null
+++ b/module-examine/pom.xml
@@ -0,0 +1,30 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+    <parent>
+        <artifactId>wg-basic</artifactId>
+        <groupId>ink.wgink</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>module-examine</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>ink.wgink</groupId>
+            <artifactId>basic-exception</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>ink.wgink</groupId>
+            <artifactId>basic-annotation</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>ink.wgink</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 5d6d98e7..5eb8bbca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
         <module>module-database</module>
         <module>module-form</module>
         <module>basic-abstract</module>
+        <module>module-examine</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -57,7 +58,7 @@
         <fastjson.version>1.2.25</fastjson.version>
         <fastjson2.version>2.0.2</fastjson2.version>
         <json.version>20210307</json.version>
-        <easyexcel.version>2.2.11</easyexcel.version>
+        <easyexcel.version>3.0.5</easyexcel.version>
         <cglib.version>3.2.12</cglib.version>
         <mysql.version>5.1.47</mysql.version>
         <durid.version>1.1.9</durid.version>
diff --git a/service-department/src/main/resources/templates/department/upload/upload-excel.html b/service-department/src/main/resources/templates/department/upload/upload-excel.html
index 7088766a..246ff98b 100644
--- a/service-department/src/main/resources/templates/department/upload/upload-excel.html
+++ b/service-department/src/main/resources/templates/department/upload/upload-excel.html
@@ -23,6 +23,7 @@
             </button>
         </div>
     </div>
+    <iframe style="display: none" name="downloadTarget"></iframe>
 </div>
 <script src="assets/layuiadmin/layui/layui.js"></script>
 <script>
@@ -36,11 +37,11 @@
         var common = layui.common;
 
         $('#downloadFile').click(function() {
-            window.open('route/department/upload/upload-excel-template')
+            window.open('route/department/upload/upload-excel-template', 'downloadTarget')
         })
 
         $(document).on('click', '.error-excel', function() {
-            window.open('route/file/download/false/'+ this.dataset.errorId);
+            window.open('route/file/download/false/'+ this.dataset.errorId, 'downloadTarget');
         })
 
         function closeBox() {
diff --git a/service-user/src/main/resources/templates/user/upload/upload-excel.html b/service-user/src/main/resources/templates/user/upload/upload-excel.html
index 8cab538a..e10aec81 100644
--- a/service-user/src/main/resources/templates/user/upload/upload-excel.html
+++ b/service-user/src/main/resources/templates/user/upload/upload-excel.html
@@ -15,7 +15,7 @@
     <div class="layui-card" style="text-align: center;">
         <div class="layui-card-body" style="padding: 15px;">
             <blockquote class="layui-elem-quote">下载“下载模板”整理数据，点击“导入数据”上传，格式为xls或xlsx</blockquote>
-            <button id="downloadFile" type="button" class="layui-btn layui-btn" onclick="window.open('route/user/upload/upload-excel-template', 'downloadTarget')">
+            <button id="downloadFile" type="button" class="layui-btn layui-btn">
                 <i class="fa fa-lg fa-cloud-download"></i> 下载模板
             </button>
             <button type="button" class="layui-btn layui-btn" id="uploadExcel">
@@ -37,11 +37,11 @@
         var common = layui.common;
 
         $('#downloadFile').click(function() {
-            window.open('route/user/upload/upload-excel-template');
+            window.open('route/user/upload/upload-excel-template', 'downloadTarget');
         })
 
         $(document).on('click', '.error-excel', function() {
-            window.open('route/file/download/false/'+ this.dataset.errorId);
+            window.open('route/file/download/false/'+ this.dataset.errorId, 'downloadTarget');
         })
 
         function closeBox() {