From 510510acc4215ac4b43eb7e31b3450ab9fa3f9fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 六月 2020 17:06:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatCodeController.java | 5 +-
src/main/webapp/views/matCode/matCode.html | 20 ++++++----
src/main/webapp/static/js/matCode/matCode.js | 58 +++++++++++++++++------------
src/main/webapp/static/image/Excel.png | 0
4 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index e5fd20f..97bcf76 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -112,8 +112,9 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
@ManagerAuth
- public R matCodeImport(MultipartFile file) throws IOException {
- EasyExcel.read(file.getInputStream(), EnInitData.class, new EnInitDataListener()).sheet().doRead();
+ public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
+ Thread.sleep(2000);
+// EasyExcel.read(file.getInputStream(), EnInitData.class, new EnInitDataListener()).sheet().doRead();
return R.ok();
}
diff --git a/src/main/webapp/static/image/Excel.png b/src/main/webapp/static/image/Excel.png
index 3806a2b..78b5084 100644
--- a/src/main/webapp/static/image/Excel.png
+++ b/src/main/webapp/static/image/Excel.png
Binary files differ
diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index 3208ba7..ee89ed4 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -116,27 +116,6 @@
});
});
- // 瀵煎叆excel
- upload.render({
- elem: '#uploadEx'
- , url: baseUrl + '/matCode/import/auth'
- , headers: {token: localStorage.getItem('token')}
- , accept: 'file'
- , exts: 'xls|excel|xlsx'
- , auto: false
- , bindAction: '#uploadDo'
- , choose: function(obj){
- layui.$('#uploadDemoView').removeClass('layui-hide');
- obj.preview(function(index, file, result){
- console.log(file.name); //寰楀埌鏂囦欢鍚嶇О
- });
- }
- , done: function (res) {
- layer.msg('涓婁紶鎴愬姛');
- limit();
- }
- })
-
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(matCode)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -232,18 +211,49 @@
layer.open({
type: 1,
title: '鏁版嵁瀵煎叆',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
shadeClose: true,
content: $('#importDataDiv'),
success: function(layero, index){
-
+ uploader.reload();
}
});
break;
}
});
+ // 瀵煎叆excel
+ var uploader = upload.render({
+ elem: '#uploadEx'
+ , url: baseUrl + '/matCode/import/auth'
+ , headers: {token: localStorage.getItem('token')}
+ , accept: 'file'
+ , exts: 'xls|excel|xlsx'
+ , auto: false
+ , bindAction: '#uploadDo'
+ , before: function(obj){
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ }
+ , choose: function(obj){
+ $('#uploadDesc').hide();
+ $('#uploadDemoView').show();
+ obj.preview(function(index, file, result){
+ $('#fileMame').html(file.name);
+ });
+ }
+ , done: function (res) {
+ limit();
+ $('#uploadDesc').show();
+ $('#uploadDemoView').hide();
+ $('#fileMame').html("");
+ layer.closeAll('loading');
+ layer.msg(res.msg);
+ }
+ , error: function(index, upload){
+ layer.closeAll('loading');
+ }
+ })
+
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(matCode)', function(obj){
var data = obj.data;
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 61ed92c..be8388d 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -53,16 +53,20 @@
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
<!-- 瀵煎叆鎿嶄綔寮圭獥 -->
-<div id="importDataDiv" style="display: none">
- <div class="layui-upload-drag" id="uploadEx">
- <i class="layui-icon">顧�</i>
- <p>鐐瑰嚮娣诲姞锛屾垨灏嗘枃浠舵嫋鎷藉埌姝ゅ</p>
- <div class="layui-hide" id="uploadDemoView">
- <hr>
- <img src="../../static/image/Excel.png" alt="涓婁紶鎴愬姛鍚庢覆鏌�" style="max-width: 196px">
+<div id="importDataDiv" style="display: none;padding: 20px">
+ <div class="layui-upload-drag" id="uploadEx" style="width: 200px; font-size: x-small; padding: 10px; text-align: center; box-sizing: border-box">
+ <div id="uploadDesc" style="display: inline-block; ">
+ <i class="layui-icon">顧�</i>
+ <p>鐐瑰嚮娣诲姞锛屾垨灏嗘枃浠舵嫋鎷藉埌姝ゅ</p>
+ </div>
+ <div id="uploadDemoView" style="display: none">
+ <img src="../../static/image/Excel.png" alt="涓婁紶鎴愬姛鍚庢覆鏌�" style="max-width: 196px; padding: 20px 0 10px 0">
+ <span id="fileMame" style="display: block; font-size: small; color: #333"></span>
</div>
</div>
- <button class="layui-btn" id="uploadDo">寮�濮嬪鍏�</button>
+ <div style="text-align: center; margin-top: 20px">
+ <button class="layui-btn" id="uploadDo">寮�濮嬪鍏�</button>
+ </div>
</div>
</body>
--
Gitblit v1.9.1