From 0137eb578e1353a508409d570d4f11c5ba358519 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 15 十一月 2023 15:23:34 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/priOnline2/priOnline.js |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index ce892f9..e460e2e 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -5,7 +5,7 @@
     base: baseUrl + "/static/layui/lay/modules/"
 }).extend({
     cascader: 'cascader/cascader',
-}).use(['table', 'laydate', 'form', 'admin', 'xmSelect', 'element', 'cascader', 'tree', 'dropdown'], function () {
+}).use(['table', 'laydate', 'form', 'admin', 'xmSelect', 'element', 'cascader', 'tree', 'dropdown','element'], function () {
     var table = layui.table;
     var $ = layui.jquery;
     var layer = layui.layer;
@@ -13,6 +13,7 @@
     var tree = layui.tree;
     var form = layui.form;
     var dropdown = layui.dropdown;
+    var element = layui.element;
     admin = layui.admin;
 
     $('#organization').html(localStorage.getItem('nickname') + ' <i class="layui-icon">&#xe61a;</i>');
@@ -29,13 +30,14 @@
 
     // 鏍戝舰鍥�
     var organizationTree;
-    window.loadTree = function (condition) {
+    window.loadTree = function (condition,allSwitch) {
         var loadIndex = layer.load(2);
         $.ajax({
             url: baseUrl + "/dept/user/tree/auth",
             headers: {'token': localStorage.getItem('token')},
             data: {
-                'condition': condition
+                'condition': condition,
+                'allSwitch': allSwitch
             },
             method: 'POST',
             success: function (res) {
@@ -281,7 +283,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 + '"><div class="layui-progress layui-progress-big" lay-showPercent="true" lay-filter="progress-demo-'+ file.lastModified +'"><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>'
@@ -297,6 +299,9 @@
         });
 
         $('#data-btn-file3').append(tr)
+
+        element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+        element.init();
 
         _uploadFile = file
     })
@@ -314,9 +319,10 @@
         });
 
         var file = _uploadFile
-        $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
 
-        putObject(file).then((result) => {
+        putObject(file,(p) => {
+            element.progress('progress-demo-'+ file.lastModified, (Math.round(p * 100)) + "%"); //鎵ц杩涘害鏉°��
+        }).then((result) => {
             var filename = result.name
             layer.msg('涓婁紶鎴愬姛', {icon: 1});
             $("#upload-file-id-" + file.lastModified).html("涓婁紶鎴愬姛")
@@ -604,7 +610,7 @@
             case "uploadLink":
                 // 鎵撳紑寮圭獥
                 // 鏋勫缓甯﹀弬鏁扮殑鍐呭
-                var planIdSign = data.id;
+                var planIdSign = data.itemId;
                 if (data.assistantHostSign==1){
                     planIdSign = data.hostPlanId;
                 }

--
Gitblit v1.9.1