Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整easyui版本、用户、组织导入模板下载方式

Browse Source
This commit is contained in:
wanggeng 2022-05-12 17:30:45 +08:00
parent 495b4c7fc9
commit 00975c85b6
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
module-examine/pom.xml Normal file
View File

@ -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>

3
pom.xml
View File

@ -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>

5
service-department/src/main/resources/templates/department/upload/upload-excel.html
View File

@ -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() {

6
service-user/src/main/resources/templates/user/upload/upload-excel.html
View File

@ -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() {