Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/firm.vue

@@ -19,8 +19,8 @@
         </div>
       </div>
       <div class="upFile">
-        <beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept">
-        </beUpload>
+        <el-progress v-if="progress.show" style="width: 300px;margin-top: 10px;" :percentage="progress.value" :format="ProgressFormat"></el-progress>
+        <beUpload @getFile="getFile" v-show="!progress.show" :navName="'上传文件'" :accept="accept" :progress="progress"></beUpload>
       </div>
     </div>
 
@@ -151,6 +151,10 @@ export default {
         total: 0,
         lim: 8,
       },
+      progress:{
+        value:50,
+        show:false
+      }
     };
   },
   methods: {
@@ -227,11 +231,15 @@ export default {
             this.tableData.push(item);
           });
           this.Page.total = res.data[1][0]["total"];
+          this.progress.show = false;
         })
         .catch((err) => {
           console.log(err);
         });
     },
+    ProgressFormat(value){
+      return value ==100?'100%':`${value}%`
+    }
   },
   watch:{
     input:{
@@ -356,6 +364,7 @@ export default {
 }
 .upFile {
   height: 40px !important;
+  width: auto;
 }
 // #footerPage {
 //   width: 100%;