From aa794aceef7c73053958ac2fda163cdcd1570bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com>
Date: Tue, 30 Jul 2024 19:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E4=BC=A0=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=EF=BC=8C=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/scTable/index.vue     |  1 -
 src/views/docsManager/document.vue   |  1 -
 src/views/docsManager/share.vue      |  1 -
 src/views/docsManager/uploadFile.vue | 24 +++++++++++++++++-------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index 713b989..dae1c08 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -189,7 +189,6 @@
 					reqData[config.request.sort_orders] = this.sort_orders;
 					delete reqData[config.request.prop]
 					delete reqData[config.request.order]
-					console.log(this.tableParams,344)
 				}
 				if(this.hidePagination){
 					delete reqData[config.request.page]
diff --git a/src/views/docsManager/document.vue b/src/views/docsManager/document.vue
index 6908d94..f772f04 100644
--- a/src/views/docsManager/document.vue
+++ b/src/views/docsManager/document.vue
@@ -52,7 +52,6 @@
 						</el-dropdown-menu>
 					</template>
 				</el-dropdown>
-<!--				<el-button type="primary" plain :size="size" icon="el-icon-sort"></el-button>-->
 			</div>
 			<div class="right-panel">
 				<scExportList :size="size" @updateShow="exportChangeShow" :exportList="exportList" :show="exportShow" type="14">
diff --git a/src/views/docsManager/share.vue b/src/views/docsManager/share.vue
index fabf493..4993da6 100644
--- a/src/views/docsManager/share.vue
+++ b/src/views/docsManager/share.vue
@@ -35,7 +35,6 @@
 						</el-dropdown-menu>
 					</template>
 				</el-dropdown>
-<!--				<el-button type="primary" plain :size="size" icon="el-icon-sort" :disabled="selection.length==0"></el-button>-->
 			</div>
 			<div class="right-panel">
 
diff --git a/src/views/docsManager/uploadFile.vue b/src/views/docsManager/uploadFile.vue
index 31bd3da..b360c22 100644
--- a/src/views/docsManager/uploadFile.vue
+++ b/src/views/docsManager/uploadFile.vue
@@ -35,7 +35,7 @@
 							<slot name="download"></slot>
 						</span>
 					</div>
-					<div class="importBox" v-if="progressShow && fileList.length>0">
+					<div class="importBox" v-if="progressShow && (fileList.length>0 || listProgress.length>0)">
 						<div v-if="uploadShow">
 							<div class="item" v-for="(item,index) in fileList" :key="item">
 								<div class="name">{{item.name}}</div>
@@ -94,7 +94,11 @@ export default {
 
 	},
 	watch:{
-
+		visible(val){
+			if(!val){
+				this.$TOOL.data.set('docsList', this.listProgress);
+			}
+		}
 	},
 	mounted() {
 		eventBus.$on('sockBack', this.getWsResult);
@@ -107,20 +111,26 @@ export default {
 			if(res.data && (res.data.type == 12)){
 				this.progressShow = true;
 
+				if(this.listProgress.length == 0){
+					const docsList = this.$TOOL.data.get('docsList');
+					this.listProgress = docsList;
+				}
 				this.listProgress.forEach(em=>{
 					if(em.uuid == res.data.file_unique_id){
 						em.rate = res.data.rate
-						if(res.data.status == 1){
-							// this.listProgress.splice(index,1);
-						}
+						// if(res.data.status == 1){
+						// 	this.listProgress.splice(index,1);
+						// }
 					}
 				})
-				if(this.listProgress.length==0 && res.data.status == 1){
+
+				let list = this.listProgress.filter(em=> em.rate != 100);
+				if(list.length==0 && res.data.status == 1){
 					this.progressShow = false;
+					this.$TOOL.data.set('docsList', []);
 				}
 				if(res.data.status == 1){
 					this.fileList.splice(this.fileList[0],1);
-					// this.handleRemove('',this.fileList,true);
 					this.$emit('uploadFileSuccess');
 				}
 			}