Merge branch 'dev-livemanage-20200702' into 'release'

取消上传优化，Code Review: bo.dang



See merge request !183

src/views/yqrange/live-manage.vue

@@ -192,6 +192,7 @@
           <el-upload style="float:right;"
             action="#"
             accept="*/*"
+            ref="upload"
             :limit="1"
             :show-file-list="false"
             :before-upload="beforeUploadVideo">
@@ -748,6 +749,8 @@ export default {
     delVideo(){
       if(vm.uploadProgress1 > 0 && vm.uploadProgress1 < 100){
         openLoading(this);
+        this.$refs.upload.abort();
+        this.$refs.upload.clearFiles();
         unsubscribe();
         if(vm.videoSize > 500){
           setTimeout(() => {