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

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



See merge request !184

src/views/yqrange/live-manage.vue

@@ -752,18 +752,20 @@ export default {
         this.$refs.upload.abort();
         this.$refs.upload.clearFiles();
         unsubscribe();
-        if(vm.videoSize > 500){
-          setTimeout(() => {
-            closeLoading(this);
-            vm.$message.success('取消成功');
-          }, 2000);
-        }
-        else {
+        // if(vm.videoSize > 500){
+        //   setTimeout(() => {
+        //     closeLoading(this);
+        //     vm.$message.success('取消成功');
+        //   }, 2000);
+        // }
+        // else {
+        //   closeLoading(this);
+        //   vm.$message.success('取消成功');
+        // }
         closeLoading(this);
         vm.$message.success('取消成功');
-        }
-        // vm.uploadProgress1 = Number("0.00");
-        // vm.uploadProgress = Number("0.00");
+        vm.uploadProgress1 = Number("0.00");
+        vm.uploadProgress = Number("0.00");
       }
       // vm.uploadProgress1 = 0;
       vm.fileFlag = true;