diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue index 4509e1f..0e86503 100644 --- a/dangan-ui/src/views/dangan/collection/index.vue +++ b/dangan-ui/src/views/dangan/collection/index.vue @@ -200,7 +200,11 @@
- + +
+ {{ percentage }} / + {{ pictureRecard.length }} +
拼命识别中...
@@ -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; diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue index 05ff127..d754e98 100644 --- a/dangan-ui/src/views/dangan/pictureRecard/index.vue +++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue @@ -153,10 +153,15 @@ @pagination="getList" /> -
- -
拼命识别中...
+
+ +
+ +
+ {{ percentage }} / + {{ selectionList.length }}
+
拼命识别中...
@@ -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){ - clearInterval(this.Interval); - this.Interval = null; - } + this.percentage = response.data.file_counts + + 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 {