提交 3b619e9f 编写于 作者: bo.dang's avatar bo.dang

取消上传提示

上级 d99e8666
...@@ -190,7 +190,6 @@ ...@@ -190,7 +190,6 @@
<span v-show="downloadVideoFlag">②上传回放视频</span> <span v-show="downloadVideoFlag">②上传回放视频</span>
<span v-show="!downloadVideoFlag">①上传回放视频</span> <span v-show="!downloadVideoFlag">①上传回放视频</span>
<el-upload style="float:right;" <el-upload style="float:right;"
v-model="playbackUrl"
action="#" action="#"
accept="*/*" accept="*/*"
:limit="1" :limit="1"
...@@ -203,13 +202,14 @@ ...@@ -203,13 +202,14 @@
<!--<video class="video-mg-url" controls preload :src="cleatBroadcast.liveInfo.mgUrl"></video>--> <!--<video class="video-mg-url" controls preload :src="cleatBroadcast.liveInfo.mgUrl"></video>-->
<!-- <img v-if="!cleatBroadcast.liveInfo.mgUrl" class="video-bg-img" src="../../../static/img/small.png"> --> <!-- <img v-if="!cleatBroadcast.liveInfo.mgUrl" class="video-bg-img" src="../../../static/img/small.png"> -->
</el-upload> </el-upload>
<el-progress <el-progress
:text-inside="true" :text-inside="true"
:stroke-width="20" :stroke-width="20"
:percentage="uploadProgress1" :percentage="uploadProgress1"
status="success" status="success"
v-show="uploadProgress1 > 0 && uploadProgress1 < 100 && deleteFileFlag"> v-show="uploadProgress1 > 0 && uploadProgress1 < 100 && deleteFileFlag">
</el-progress> </el-progress>
<div v-if="deleteFileFlag"> <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> <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> <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 { ...@@ -359,6 +359,7 @@ export default {
circleId: null, circleId: null,
streamType: 1, streamType: 1,
downloadSuccessStatus: 1, downloadSuccessStatus: 1,
videoSize: 0,
}; };
}, },
created() { created() {
...@@ -525,6 +526,9 @@ export default { ...@@ -525,6 +526,9 @@ export default {
} }
// 初始化
vm.uploadProgress1 = Number("0.00");
vm.uploadProgress = Number("0.00");
// if(row.streamType == 1){ // if(row.streamType == 1){
// //
// vm.downloadVideoFlag = true; // vm.downloadVideoFlag = true;
...@@ -679,8 +683,9 @@ export default { ...@@ -679,8 +683,9 @@ export default {
// 上传视频 // 上传视频
beforeUploadMore(file, fileLimit){ beforeUploadMore(file, fileLimit){
const isMp4 = file.type === 'video/mp4' const isMp4 = file.type === 'video/mp4';
const isSize = file.size / 1024 / 1024 < fileLimit.size vm.videoSize = file.size / 1024 / 1024;
const isSize = vm.videoSize < fileLimit.size;
if (!isMp4) { if (!isMp4) {
vm.$message.error('上传回放视频只能是mp4格式!') vm.$message.error('上传回放视频只能是mp4格式!')
// vm.isDisabledIns = false; // vm.isDisabledIns = false;
...@@ -713,8 +718,8 @@ export default { ...@@ -713,8 +718,8 @@ export default {
}]; }];
// 初始化 // 初始化
vm.uploadProgress1 = 0; vm.uploadProgress1 = Number("0.00");
vm.uploadProgress = 0; vm.uploadProgress = Number("0.00");
// vm.$message.success('开始上传') // vm.$message.success('开始上传')
doUpload(vm,file, getFilePath(file,null), 'preview4', 'uploadProgress1', '').then(function (path) { doUpload(vm,file, getFilePath(file,null), 'preview4', 'uploadProgress1', '').then(function (path) {
if(vm.playbackForm.videos != null && vm.playbackForm.videos[0] != null){ if(vm.playbackForm.videos != null && vm.playbackForm.videos[0] != null){
...@@ -731,6 +736,9 @@ export default { ...@@ -731,6 +736,9 @@ export default {
vm.deleteFileFlag = true; vm.deleteFileFlag = true;
vm.uploadProgress1 = Number("0.00");
vm.uploadProgress = Number("0.00");
vm.$message.success('上传成功'); vm.$message.success('上传成功');
}); });
}, },
...@@ -738,9 +746,22 @@ export default { ...@@ -738,9 +746,22 @@ export default {
// 删除视频 // 删除视频
delVideo(){ delVideo(){
if(vm.uploadProgress1 > 0 && vm.uploadProgress1 < 100){ if(vm.uploadProgress1 > 0 && vm.uploadProgress1 < 100){
openLoading(this);
unsubscribe(); 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.fileFlag = true;
vm.deleteFileFlag = false; vm.deleteFileFlag = false;
vm.playbackForm.videos = []; vm.playbackForm.videos = [];
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册