进度样式调整

dangan-ui/src/views/dangan/collection/index.vue

@@ -200,7 +200,11 @@
     </el-dialog>
 
     <div class="myProgress" v-show="openProgress">
-      <el-progress type="circle" :percentage="percentage"></el-progress>
+<!--      <el-progress type="circle" :percentage="percentage"></el-progress>-->
+      <div style="font-size: 50px">
+        <span style="color: #409EFF">{{ percentage }}</span> /
+        <span style="color: #67C23A">{{ pictureRecard.length }} </span>
+      </div>
       <div style="margin-top:20px;">拼命识别中...</div>
     </div>
 
@@ -613,7 +617,7 @@ export default {
         });
 
         this.Interval = setInterval(()=> {
-          if(this.percentage===100||this.percentage>100){
+          if(this.percentage===this.pictureRecard.length||this.percentage>this.pictureRecard.length){
             clearInterval(this.Interval);
             this.Interval = null;
           }else {
@@ -659,9 +663,11 @@ export default {
         }
       })
         .then( (response)=> {
-          this.percentage = Math.round((response.data.file_counts/this.pictureRecard.length)*100);
+          // this.percentage = Math.round((response.data.file_counts/this.pictureRecard.length)*100);
+
+          this.percentage = response.data.file_counts
 
-          if(this.percentage===100||this.percentage>100){
+          if(this.percentage===this.pictureRecard.length||this.percentage>this.pictureRecard.length){
             clearInterval(this.Interval);
             this.Interval = null;
           }
@@ -700,15 +706,16 @@ export default {
   position: fixed;
   top:0;
   left:0;
-  z-index: 10;
+  z-index: 10000;
   width: 100%;
   height: 100%;
-  background: rgba(255,255,255,0.9);
+  background: rgba(0,0,0,0.7);
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
   font-size: 20px;
+  color: white;
 }
 .sm_col{
   display: flex;

dangan-ui/src/views/dangan/pictureRecard/index.vue

@@ -153,10 +153,15 @@
         @pagination="getList"
       />
 
-      <div class="myProgress" v-show="openProgress">
+    </div>
-        <el-progress type="circle" :percentage="percentage"></el-progress>
+
-        <div style="margin-top:20px;">拼命识别中...</div>
+    <div class="myProgress" v-show="openProgress">
+<!--      <el-progress type="circle" :percentage="percentage"></el-progress>-->
+      <div style="font-size: 50px">
+        <span style="color: #409EFF">{{ percentage }}</span> /
+        <span style="color: #67C23A">{{ selectionList.length }} </span>
       </div>
+      <div style="margin-top:20px;">拼命识别中...</div>
     </div>
 
   </div>
@@ -282,7 +287,7 @@ export default {
         });
 
         this.Interval = setInterval(()=> {
-          if(this.percentage===100||this.percentage>100){
+          if(this.percentage===this.selectionList.length||this.percentage>this.selectionList.length){
             clearInterval(this.Interval);
             this.Interval = null;
           }else {
@@ -316,12 +321,14 @@ export default {
           'Content-Type': 'application/x-www-form-urlencoded'
         }
       }).then((response)=>{
-          this.percentage = Math.round((response.data.file_counts/this.selectionList.length)*100);
+          // this.percentage = Math.round((response.data.file_counts/this.selectionList.length)*100);
 
-          if(this.percentage===100||this.percentage>100){
+        this.percentage = response.data.file_counts
-            clearInterval(this.Interval);
+
-            this.Interval = null;
+        if(this.percentage===this.selectionList.length||this.percentage>this.selectionList.length){
-          }
+          clearInterval(this.Interval);
+          this.Interval = null;
+        }
 
         }).catch(function (error) {
         // 处理错误情况
@@ -341,15 +348,16 @@ export default {
   position: fixed;
   top:0;
   left:0;
-  z-index: 10;
+  z-index: 10000;
   width: 100%;
   height: 100%;
-  background: rgba(255,255,255,0.8);
+  background: rgba(0,0,0,0.7);
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
   font-size: 20px;
+  color: white;
 }
 
 .c-tabs__item {