From c32c0611a92f428cf0d2da76eff110ac065f664c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 27 十月 2025 10:39:05 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/controller/ImagePreviewController.java | 8 ++++----
src/main/webapp/static/js/mat/mat.js | 33 +++++++++++++++++++++++++++++++++
src/main/webapp/views/mat/mat.html | 2 ++
3 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ImagePreviewController.java b/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
index 75ca0e0..71d1ee4 100644
--- a/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
+++ b/src/main/java/com/zy/asrs/controller/ImagePreviewController.java
@@ -28,8 +28,8 @@
//涓婁紶鍥剧墖
@ApiResponses({@ApiResponse(code = 200, message = "涓婁紶鎴愬姛"), @ApiResponse(code = 400, message = "涓婁紶澶辫触"), @ApiResponse(code = 500, message = "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�")})
@RequestMapping(value = "/saveImage", method = RequestMethod.POST)
- public Map<String, Object> saveImage(@RequestParam("files") MultipartFile[] files) {
- Map<String, Object> map = new HashMap<>();
+ public R saveImage(@RequestParam("files") MultipartFile[] files) {
+// Map<String, Object> map = new HashMap<>();
List<String> list = new ArrayList<>();
for (int i = 0; i < files.length; i++) {
MultipartFile mfile = files[i];
@@ -46,8 +46,8 @@
list.add("uploadimage/" + mfile.getOriginalFilename());
}
}
- map.put("imgList", list);
- return map;
+// map.put("imgList", list);
+ return R.ok("涓婁紶鎴愬姛");
}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 68492d2..840d810 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -461,6 +461,10 @@
function importExcel() {
$("#importExcel").trigger("click");
}
+// 绠�鍥句笂浼�
+function importImage() {
+ $("#importImage").trigger("click");
+}
function upload(obj){
if(!obj.files) {
return;
@@ -490,6 +494,35 @@
$("#importExcel").val("");
});
}
+function uploadImage(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/saveImage";
+ var form = new FormData();
+ form.append("files", file);
+ xhr = new XMLHttpRequest();
+ xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+ layer.closeAll('loading');
+ $("#importImage").val("");
+ };
+ // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+ xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+ ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
+ oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+ };
+ xhr.send(form);
+ }, function(index){
+ $("#importImage").val("");
+ });
+}
function uploadComplete(evt) {
var res = JSON.parse(evt.target.responseText);
if(res.code === 200) {
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index fc3aeb1..032be51 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -128,6 +128,8 @@
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger"><a onclick="importImage()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>涓婁紶绠�鍥�</a></button>
+ <li style="display: none"><input id="importImage" type="file" onchange="uploadImage(this)" ></li>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<div class="dropdown-menu" style="float: right">
<button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
--
Gitblit v1.9.1