Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/views/permission/round-score-import.vue

@@ -77,7 +77,8 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" v-loading="upload.isUploading"
+               append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -107,7 +108,7 @@
         <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button type="primary" :disabled="upload.isUploading" @click="submitFileForm">确 定</el-button>
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -337,6 +338,7 @@ export default {
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
+      debugger
       this.upload.isUploading = true
     },
     // 文件上传成功处理
@@ -353,6 +355,7 @@ export default {
         this.$alert('请输入导入名称')
         return
       }
+      this.upload.isUploading = true
       this.$refs.upload.submit()
     },
     /** 打开详情页 */

src/views/permission/select-class-import.vue

@@ -89,7 +89,8 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" v-loading="upload.isUploading"
+               append-to-body>
       <el-upload
         ref="upload"
         :limit="1"
@@ -346,6 +347,7 @@ export default {
     },
     // 提交上传文件
     submitFileForm() {
+      this.upload.isUploading = true
       this.$refs.upload.submit()
     },
     /*  查看详情  */