From d109b375063dd3e59754973ff55cd88d51d8b95f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 10:41:00 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index 06438ed..4e1e81c 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -29,13 +29,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) {
@@ -123,8 +124,8 @@
             , {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿', hide: false}
             ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
             ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
-            ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: false}
-            ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: false}
+            ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
+            ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
             , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 350}
         ]],
         request: {
@@ -316,7 +317,9 @@
         var file = _uploadFile
         $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�")
 
-        putObject(file).then((result) => {
+        putObject(file,(p) => {
+            $("#upload-file-id-" + file.lastModified).html("涓婁紶涓細" + (Math.round(p * 100)) + "%")
+        }).then((result) => {
             var filename = result.name
             layer.msg('涓婁紶鎴愬姛', {icon: 1});
             $("#upload-file-id-" + file.lastModified).html("涓婁紶鎴愬姛")

--
Gitblit v1.9.1