From 5f5db5ddcccd858e45bf9e9b92f55646218d4643 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 十一月 2023 10:29:59 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/plan/plan.js |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 518566f..9f6eac5 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -248,7 +248,7 @@
                 var tr = $(['<tr id="upload-'+ index +'">'
                     ,'<td>'+ file.name +'</td>'
                     ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>'
-                    ,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
+                    ,'<td><div class="layui-progress" id="progress-id-'+ index +'" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></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>'
@@ -273,15 +273,24 @@
             });
         }
         ,done: function(res, index, upload){ //鎴愬姛鐨勫洖璋�
+            if (res.code == 200) {
+                element.progress('progress-demo-'+ index, '100%'); //鎵ц杩涘害鏉°�俷 鍗充负杩斿洖鐨勮繘搴︾櫨鍒嗘瘮
+                layer.msg('涓婁紶鎴愬姛', {icon: 1});
+                $("#progress-id-" + index).html("宸插畬鎴�")
+            }else {
+                element.progress('progress-demo-'+ index, '100%'); //鎵ц杩涘害鏉°�俷 鍗充负杩斿洖鐨勮繘搴︾櫨鍒嗘瘮
+                layer.msg('涓婁紶澶辫触', {icon: 2});
+                $("#progress-id-" + index).html("涓婁紶澶辫触")
+            }
             var that = this;
             //if(res.code == 0){ //涓婁紶鎴愬姛
             var tr = that.elemList.find('tr#upload-'+ index)
                 ,tds = tr.children();
             tds.eq(3).html(''); //娓呯┖鎿嶄綔
             delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
-            return;
+            // return;
             //}
-            this.error(index, upload);
+            // this.error(index, upload);
         }
         ,allDone: function(obj){ //澶氭枃浠朵笂浼犲畬姣曞悗鐨勭姸鎬佸洖璋�
             console.log(obj)
@@ -293,7 +302,7 @@
             tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず閲嶄紶
         }
         ,progress: function(n, elem, e, index){
-            element.progress('progress-demo-'+ index, n + '%'); //鎵ц杩涘害鏉°�俷 鍗充负杩斿洖鐨勮繘搴︾櫨鍒嗘瘮
+            element.progress('progress-demo-'+ index, '90%'); //鎵ц杩涘害鏉°�俷 鍗充负杩斿洖鐨勮繘搴︾櫨鍒嗘瘮
         }
     });
 
@@ -646,7 +655,9 @@
             data: { downloadUrl: downloadUrl },  // 浼犻�掍笅杞介摼鎺ヤ綔涓哄弬鏁�
             success: function(response) {
                 console.log(response)
-                layer.msg(response.msg+',宸蹭笅杞借嚦榛樿璺緞锛佽缁嗕笅杞借矾寰勶細'+response.data, {icon: 1});
+                // layer.msg(response.msg+',宸蹭笅杞借嚦榛樿璺緞锛佽缁嗕笅杞借矾寰勶細'+response.data, {icon: 1});
+                layer.msg(response.msg, {icon: 1});
+                location.href = response.data
         //         // window.open(baseUrl+response.msg)
         //         // 鍒涘缓涓�涓狟lob瀵硅薄
         //         var blob = new Blob([response]);

--
Gitblit v1.9.1