From 1899eba902faa24d19205f26c160ed4945935578 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:52:56 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/priOnline2/priOnline.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index 06438ed..5c12009 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: {
@@ -281,7 +282,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 +298,9 @@
});
$('#data-btn-file3').append(tr)
+
+ element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+ element.init();
_uploadFile = file
})
@@ -314,9 +318,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("涓婁紶鎴愬姛")
--
Gitblit v1.9.1