From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/static/js/plan/plan.js | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index ccc691d..4aad49b 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -246,7 +246,7 @@
var tr = $(['<tr id="upload-">'
,'<td id="upload-filename-id-'+ file.lastModified + '">' + file.name +'</td>'
,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
- ,'<td id="upload-file-id-' + file.lastModified + '">涓婁紶涓�</td>'
+ ,'<td id="upload-file-id-' + file.lastModified + '">鍑嗗涓婁紶</td>'
,'<td>'
,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>'
,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
@@ -272,14 +272,20 @@
return false;
}
+ var index = layer.load(1, {
+ shadeClose: false,
+ title: '涓婁紶涓�..',
+ shade: [0.5,'#000']
+ });
+
var file = _uploadFile
+ $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
- var filename = dateToStr2(new Date()) + "_" + file.name
- $("#upload-filename-id-" + file.lastModified).html(filename)
-
- putObject(file, filename).then((result) => {
+ putObject(file).then((result) => {
+ var filename = result.name
layer.msg('涓婁紶鎴愬姛', {icon: 1});
$("#upload-file-id-" + file.lastModified).html("涓婁紶鎴愬姛")
+ $("#upload-filename-id-" + file.lastModified).html(filename)
$.ajax({
url: baseUrl+"/plan/insert/file/auth",
@@ -292,6 +298,7 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
+ layer.close(index)
console.log(res)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
@@ -649,7 +656,8 @@
var downloadUrl = $(this).attr('href');
let url = getObjectUrl(downloadUrl)
layer.msg("鍑嗗涓嬭浇涓�", {icon: 1});
- location.href = url
+ // location.href = url
+ window.open(url)
return false; // 闃绘榛樿鐨勯摼鎺ヨ烦杞涓�
});
--
Gitblit v1.9.1