Skip to content

M
mould-vuecli3
Commit 780a265f authored by Jeff's avatar Jeff
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop 

# Conflicts:
#	src/views/videoConverter.vue
parents ac332bc1 97e31c7a
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 75 deletions
src/views/videoConverter.vue
View file @ 780a265f
<template> <template>
<div class="videoConverter"> <div class="videoConverter">
<ul> <ul>
<li <li
v-for="(item, index) in taskList" v-for="(item, index) in taskList"
:key="index" :key="index">
> <div class="info">
<div class="info"> <div class="cove">视频封面</div>
<div class="cove"> <div>
视频封面 <div>{{ item.name }}.mp4</div>
</div> <div>时长:{{ item.duration }}</div>
<div> </div>
<div>{{ item.name }}.mp4</div> </div>
<div>时长:{{ item.duration }}</div> <div class="operationPanel">
</div> <div
</div> class="wait"
<div class="operationPanel"> v-show="item.state == 0">
<div <div>输出格式</div>
class="wait" <div class="selectionFormat">mp4</div>
v-show="item.state == 0" <div
> class="delete"
<div>输出格式</div> @click="clearTask(item)">删除</div>
<div class="selectionFormat"> </div>
mp4 <div
</div> class="active"
<div v-show="item.state == 1">
class="delete" <div class="progress">
@click="clearAllTasks(item)" <div>转换中{{ item.progress }}%</div>
> <div class="slide">
删除 <div></div>
</div> </div>
</div> </div>
<div
class="active" <div
v-show="item.state == 1" class="stop"
> @click="stopTask(item)">取消</div>
<div class="progress"> </div>
<div>转换中{{ item.progress }}%</div> </div>
<div class="slide"> </li>
<div /> </ul>
</div>
</div>
<div class="editBar">
<div <div
class="stop" class="addVideo"
@click="stopTask(item)" @click="addVideo">添加视频</div>
> <div
取消 class="clearList"
</div> @click="clearAllTasks">清空列表</div>
</div> <div class="clearWatermark">去除水印</div>
</div> </div>
</li>
</ul>
<div class="editBar">
<div
class="addVideo"
@click="addVideo"
>
添加视频
</div>
<div
class="clearList"
@click="clearAllTasks"
>
清空列表
</div>
<div class="clearWatermark">
去除水印
</div>
</div>
<div <div
class="startAll" class="startAll"
@click="startAllTasks" @click="startAllTasks">开始转换</div>
>
开始转换
</div> </div>
</div>
</template> </template>
<script> <script>
...@@ -106,7 +82,7 @@ export default { ...@@ -106,7 +82,7 @@ export default {
item.state = 0 item.state = 0
}, },
clearTask(item) { clearTask(item) {
let index = this.taskList(item) let index = this.taskList.indexOf(item)
if (index > -1) { if (index > -1) {
this.taskList.splice(index, 1) this.taskList.splice(index, 1)
} }
...@@ -154,7 +130,7 @@ export default { ...@@ -154,7 +130,7 @@ export default {
height: 100%; height: 100%;
border: 1px solid black; border: 1px solid black;
flex-grow: 1; flex-grow: 1;
overflow-y: scroll; overflow-y: auto;
> li { > li {
padding: 5px 0; padding: 5px 0;
height: 60px; height: 60px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment