From f1549efaacbc34ab14ead2c01a7fa71f15b0e746 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 29 十一月 2023 08:32:29 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/priOnline2/priOnline.js | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index ce892f9..e654353 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"></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) {
@@ -83,7 +85,7 @@
cellMinWidth: 150,
cols: [[
{type: 'checkbox', fixed: 'left'}
- , {field: 'id', title: 'ID', sort: true, align: 'center', fixed: 'left', width: 80, hide: true}
+ , {field: 'id', title: 'ID', sort: true, align: 'center', fixed: 'left', width: 80, hide: true, sort:true}
, {
field: 'templateName',
align: 'center',
@@ -91,10 +93,10 @@
style: 'color: #1890ff;cursor:pointer',
event: 'moreCstmr',
width: 350,
- hide: false
+ hide: false, sort:true
}
, {field: 'cstmrId$', align: 'center', title: '瀹㈡埛id', hide: true}
- , {field: 'orderNum', align: 'center', title: '鏍镐环鍗曞彿', hide: false}
+ , {field: 'orderNum', align: 'center', title: '鏍镐环鍗曞彿', hide: false, sort:true}
, {
field: 'planId$',
align: 'center',
@@ -103,7 +105,7 @@
event: 'morePlan',
hide: false
}
- , {field: 'itemId', align: 'center', title: '瑙勫垝鍗曞彿', hide: true}
+ , {field: 'itemId', align: 'center', title: '瑙勫垝鍗旾D', hide: true, sort:true}
, {field: 'statusAll$', align: 'center',title: '鐘舵��'}
// ,{field: 'memberId$', align: 'center',title: ''}
, {
@@ -281,7 +283,8 @@
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-filename-userName-'+ '">' +'</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 +300,9 @@
});
$('#data-btn-file3').append(tr)
+
+ element.progress('progress-demo-'+ file.lastModified, '0%'); //鎵ц杩涘害鏉°��
+ element.init();
_uploadFile = file
})
@@ -314,16 +320,17 @@
});
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("涓婁紶鎴愬姛")
$("#upload-filename-id-" + file.lastModified).html(filename)
-
+ let token = localStorage.getItem("token");
$.ajax({
- url: baseUrl+"/plan/insert/file/auth",
+ url: baseUrl+"/pri/online/url/insert/file/auth",
headers: {'token': localStorage.getItem('token')},
data: {
'planId': $('.layui-layer-title').text(),
@@ -604,20 +611,23 @@
case "uploadLink":
// 鎵撳紑寮圭獥
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
- var planIdSign = data.id;
+ var planIdSign = data.itemId;
if (data.assistantHostSign==1){
planIdSign = data.hostPlanId;
}
layer.open({
type: 1,
- title: '涓婁紶鏂囦欢-'+planIdSign,
- content: $('#myModal')
+ title: '涓婁紶鏂囦欢-'+planIdSign+'-'+data.id,
+ content: $('#myModal'),
+
});
// 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
$.ajax({
- url: '/plan/view/file/auth',
+ url: '/pri/online/url/view/file/auth',
+ headers: {'token': localStorage.getItem('token')},
data:{
- planId:planIdSign
+ planId:planIdSign,
+ planIdI:data.itemId
},
success: function(response) {
if (response.code==200){
@@ -630,6 +640,7 @@
tr.id = "upload-"+index;
tr.innerHTML = '<td>' + file.name + '</td>'
+ '<td>' + (file.size / 1024).toFixed(1) + 'kb</td>'
+ + '<td>' + file.userName + '</td>'
// + '<td><div class="layui-progress" lay-filter="progress-demo-' + index ,100 + '%'+ '"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
+ '<td>'+'宸插畬鎴�'+'</td>'
+ '<td>'
--
Gitblit v1.9.1