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 @@ -
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 @@ -
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 @@
-
+
{{item.name}}
@@ -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'); } }