From 790d3e76fb0c8a93eeb56902d98bc5cd1c3b65f7 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Fri, 28 Feb 2020 16:52:21 +0800
Subject: [PATCH] none

---
 vue/src/bizComponents/UploadFile/index.vue | 30 +++++++++++++++-------
 vue/src/components/ImageViewer/main.vue    |  2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/vue/src/bizComponents/UploadFile/index.vue b/vue/src/bizComponents/UploadFile/index.vue
index ef75016..59060c3 100644
--- a/vue/src/bizComponents/UploadFile/index.vue
+++ b/vue/src/bizComponents/UploadFile/index.vue
@@ -240,16 +240,28 @@
         display: none;
     }
 
-    .el-upload-list--picture-card .progress-mask {
-        position: absolute;
-        top: 0;
-        height: 100%;
-        width: 100%;
-        background-color: #fff;
-        opacity: 0.9;
+    .el-upload-list--picture-card {
+        .el-progress {
+            width: 100%;
+            height: 100%;
 
-        .el-progress__text {
-            color: $--color-primary;
+            .el-progress-circle {
+                height: 100% !important;
+                width: 100% !important;
+            }
+        }
+
+        .progress-mask {
+            position: absolute;
+            top: 0;
+            height: 100%;
+            width: 100%;
+            background-color: #fff;
+            opacity: 0.9;
+
+            .el-progress__text {
+                color: $--color-primary;
+            }
         }
     }
 
diff --git a/vue/src/components/ImageViewer/main.vue b/vue/src/components/ImageViewer/main.vue
index 3559740..6da2867 100644
--- a/vue/src/components/ImageViewer/main.vue
+++ b/vue/src/components/ImageViewer/main.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-image-viewer v-show="value" :initial-index="index" :on-close="close" :url-list="urlList"/>
+    <el-image-viewer v-show="value" :initial-index="index" :on-close="close" :url-list="urlList" :z-index="200000"/>
 </template>
 
 <script>