From 939e2d3ddaeacbfce1f30d4af8e41f2d1429307a Mon Sep 17 00:00:00 2001
From: kim131 <1035828775@qq.com>
Date: Tue, 10 Nov 2020 15:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main_web/workspace/components/file-item.vue     | 11 +++++++++--
 src/views/main_web/workspace/workspace.vue          | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/main_web/workspace/components/file-item.vue b/src/views/main_web/workspace/components/file-item.vue
index 7aa0e855..4bd3d9d9 100644
--- a/src/views/main_web/workspace/components/file-item.vue
+++ b/src/views/main_web/workspace/components/file-item.vue
@@ -73,10 +73,17 @@
             class="downloadIcon"
             v-if="isClient && file.downloadStatus === DownloadStatus.UPLOADING"
           >
-            <span class="spanjuzhong">
+            <div class="progress-circle">
+              <img class="bg-pic" src="/static/img/upload.png" alt="">
+              <el-progress :width="45" :height="45"  
+              type="circle" :show-text="false"
+              :percentage="file.loadProgress" :stroke-width="3" color="rgb(140, 0, 255)">
+              </el-progress>
+            </div>
+            <!-- <span class="spanjuzhong">
               <i class="el-icon-loading largeicon"></i>
               <div class="minifont">上传中 {{file.loadProgress}}</div>
-            </span>
+            </span> -->
           </div>
 
           <div v-if="file.status == 1" class="yijianxietong isonselect_defual">
diff --git a/src/views/main_web/workspace/workspace.vue b/src/views/main_web/workspace/workspace.vue
index 8020ebdb..23c1b657 100644
--- a/src/views/main_web/workspace/workspace.vue
+++ b/src/views/main_web/workspace/workspace.vue
@@ -586,10 +586,17 @@
                               isClient && file.downloadStatus === 3
                             "
                           >
-                            <span class="spanjuzhong">
+                            <div class="progress-circle">
+                              <img class="bg-pic" src="/static/img/upload.png" alt="">
+                              <el-progress :width="45" :height="45"  
+                              type="circle" :show-text="false"
+                              :percentage="file.loadProgress" :stroke-width="3" color="rgb(140, 0, 255)">
+                              </el-progress>
+                            </div>
+                            <!-- <span class="spanjuzhong">
                               <i class="el-icon-loading largeicon"></i>
                               <div class="minifont">上传中 {{file.loadProgress}}</div>
-                            </span>
+                            </span> -->
                           </div>
                           <div
                             v-if="file.status == 1"
@@ -7312,7 +7319,7 @@ export default {
     background-color: #fff;
     border-radius: 50%;
   }
- ::v-deep .progress-circle , .readytodownload-icon img, .progress-circle .bg-pic{
+ ::v-deep .progress-circle , ::v-deep .readytodownload-icon img, ::v-deep .progress-circle .bg-pic{
     position: absolute;
     top: 50%;
     left: 50%;