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

取消上传提示，Code Review：bo.dang



See merge request !180

src/views/yqrange/live-manage.vue

@@ -190,7 +190,6 @@
           <span v-show="downloadVideoFlag">②上传回放视频</span>
           <span v-show="!downloadVideoFlag">①上传回放视频</span>
           <el-upload style="float:right;"
-            v-model="playbackUrl"
             action="#"
             accept="*/*"
             :limit="1"
@@ -210,6 +209,7 @@
             status="success"
             v-show="uploadProgress1 > 0 && uploadProgress1 < 100 && deleteFileFlag">
             </el-progress>
+
           <div v-if="deleteFileFlag">
             <span v-show="playbackForm.videos[0].videoSource == 2">{{videoToName(playbackForm.videos[0].videoName, 6)}}({{videoToSize(playbackForm.videos[0].videoSize, 1)}}M)</span>
             <el-button v-show="playbackForm.videos[0].videoSource == 2 && (deleteFileFlag || uploadProgress1 > 0)" @click="delVideo" style="margin-left: 100px;" size="small" type="text">{{uploadProgress1 && uploadProgress1 < 100 ? '取消上传' : '删除'}}</el-button>
@@ -359,6 +359,7 @@ export default {
       circleId: null,
       streamType: 1,
       downloadSuccessStatus: 1,
+      videoSize: 0,
     };
   },
   created() {
@@ -525,6 +526,9 @@ export default {
 
                }
 
+             // 初始化
+             vm.uploadProgress1 = Number("0.00");
+             vm.uploadProgress = Number("0.00");
                // if(row.streamType == 1){
                //
                //   vm.downloadVideoFlag = true;
@@ -679,8 +683,9 @@ export default {
     // 上传视频
     beforeUploadMore(file, fileLimit){
 
-      const isMp4 = file.type === 'video/mp4'
-      const isSize = file.size / 1024 / 1024 < fileLimit.size
+      const isMp4 = file.type === 'video/mp4';
+      vm.videoSize = file.size / 1024 / 1024;
+      const isSize =  vm.videoSize < fileLimit.size;
       if (!isMp4) {
         vm.$message.error('上传回放视频只能是mp4格式!')
         // vm.isDisabledIns = false;
@@ -713,8 +718,8 @@ export default {
       }];
 
       // 初始化
-      vm.uploadProgress1 = 0;
-      vm.uploadProgress = 0;
+      vm.uploadProgress1 = Number("0.00");
+      vm.uploadProgress = Number("0.00");
       // vm.$message.success('开始上传')
       doUpload(vm,file, getFilePath(file,null), 'preview4', 'uploadProgress1', '').then(function (path) {
         if(vm.playbackForm.videos != null && vm.playbackForm.videos[0] != null){
@@ -731,6 +736,9 @@ export default {
 
         vm.deleteFileFlag = true;
 
+        vm.uploadProgress1 = Number("0.00");
+        vm.uploadProgress = Number("0.00");
+
         vm.$message.success('上传成功');
       });
     },
@@ -738,9 +746,22 @@ export default {
     // 删除视频
     delVideo(){
       if(vm.uploadProgress1 > 0 && vm.uploadProgress1 < 100){
+        openLoading(this);
         unsubscribe();
+        if(vm.videoSize > 500){
+          setTimeout(() => {
+            closeLoading(this);
+            vm.$message.success('取消成功');
+          }, 2000);
+        }
+        else {
+          closeLoading(this);
+          vm.$message.success('取消成功');
+        }
+        vm.uploadProgress1 = Number("0.00");
+        vm.uploadProgress = Number("0.00");
       }
-      vm.uploadProgress1 = 0;
+      // vm.uploadProgress1 = 0;
       vm.fileFlag = true;
       vm.deleteFileFlag = false;
       vm.playbackForm.videos = [];