|
|
@@ -30,12 +30,12 @@
|
|
|
<svg-icon icon-class="xlsx"></svg-icon>
|
|
|
<div class="file">
|
|
|
<p v-if="fileList[0]&&fileList[0].name">{{fileList[0].name}}</p>
|
|
|
- <el-progress v-if="progressFlag" :percentage="percentage" :show-text="false"></el-progress>
|
|
|
+ <el-progress v-if="resultData" :percentage="percentage" :show-text="false"></el-progress>
|
|
|
<b v-if="fileList[0]&&fileList[0].fileSize&&!progressFlag&&!uploading&&!resultData">{{fileList[0].fileSize}}</b>
|
|
|
- <div class="file-uploading" v-if="progressFlag">
|
|
|
+ <!-- <div class="file-uploading" v-if="progressFlag">
|
|
|
<span class="progress" v-if="realFileSize">{{'上传文件 '+alreadyUpload+'/'+realFileSize}}</span>
|
|
|
<span>{{percentage}}%</span>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div class="file-uploading" v-if="resultData">
|
|
|
<span class="progress">{{'导入数据 '+resultData.cur_count+'/'+resultData.total_count}}</span>
|
|
|
<span class="color-green" v-if="resultData.is_finish==='true'">完成</span>
|
|
|
@@ -237,6 +237,7 @@ export default {
|
|
|
this.$message.warning('请先上传文件');
|
|
|
return false
|
|
|
}
|
|
|
+ this.percentage = 0
|
|
|
this.loading = true
|
|
|
this.progressFlag = false
|
|
|
this.uploadFlag = false
|
|
|
@@ -257,6 +258,7 @@ export default {
|
|
|
clearInterval(this.timer);
|
|
|
this.timer = null;
|
|
|
this.uploading = false
|
|
|
+ this.percentage = parseInt(this.resultData.cur_count/this.resultData.total_count)*100
|
|
|
if(this.coverUser.indexOf('2')>-1){
|
|
|
window.open(this.resultData.archive_file_url, "_blank");
|
|
|
}
|
natasha