|
@@ -161,6 +161,11 @@
|
|
|
<div style="padding: 4px 12px;background: linear-gradient(to right, rgb(196 219 255), #409EFF)">{{ formatDuration(scope.row.duration) }}</div>
|
|
<div style="padding: 4px 12px;background: linear-gradient(to right, rgb(196 219 255), #409EFF)">{{ formatDuration(scope.row.duration) }}</div>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
+ <el-table-column label="展示方式" align="center" prop="screenType">
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
|
+ <span>{{ scope.row.screenType === 1 ? '竖屏' : '横屏' }}</span>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
<el-button
|
|
@@ -329,6 +334,12 @@
|
|
|
<el-form-item label="时长">
|
|
<el-form-item label="时长">
|
|
|
<span>{{ formatDuration(form.duration) }}</span>
|
|
<span>{{ formatDuration(form.duration) }}</span>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+ <el-form-item label="展示方式" prop="screenType">
|
|
|
|
|
+ <el-radio-group v-model="form.screenType">
|
|
|
|
|
+ <el-radio :label="0">横屏</el-radio>
|
|
|
|
|
+ <el-radio :label="1">竖屏</el-radio>
|
|
|
|
|
+ </el-radio-group>
|
|
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button @click="cancel">取消</el-button>
|
|
<el-button @click="cancel">取消</el-button>
|
|
@@ -382,7 +393,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</minimizable-dialog>
|
|
</minimizable-dialog>
|
|
|
<!-- 批量选择视频弹窗 -->
|
|
<!-- 批量选择视频弹窗 -->
|
|
|
- <minimizable-dialog :title="'选择视频'" :visible.sync="batchAddVisible" width="1200px" append-to-body class="batch-dialog"
|
|
|
|
|
|
|
+ <minimizable-dialog :title="'选择视频'" :visible.sync="batchAddVisible" width="1500px" append-to-body class="batch-dialog"
|
|
|
:close-on-click-modal="false" :before-close="cancelBeforeBatch" @minimize="hasMinimizableDialog = true"
|
|
:close-on-click-modal="false" :before-close="cancelBeforeBatch" @minimize="hasMinimizableDialog = true"
|
|
|
@restore="hasMinimizableDialog = false">
|
|
@restore="hasMinimizableDialog = false">
|
|
|
<div class="filter-container">
|
|
<div class="filter-container">
|
|
@@ -454,6 +465,14 @@
|
|
|
{{ formatDuration(scope.row.duration) }}
|
|
{{ formatDuration(scope.row.duration) }}
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
+ <el-table-column label="展示方式" align="center" width="240">
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
|
+ <el-radio-group v-model="scope.row.screenType" class="table-radio-group">
|
|
|
|
|
+ <el-radio :label="0">横屏</el-radio>
|
|
|
|
|
+ <el-radio :label="1">竖屏</el-radio>
|
|
|
|
|
+ </el-radio-group>
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="上传进度" align="center" width="200">
|
|
<el-table-column label="上传进度" align="center" width="200">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<div class="batch-upload-progress">
|
|
<div class="batch-upload-progress">
|
|
@@ -1803,7 +1822,8 @@ export default {
|
|
|
line2Status: 'pending'
|
|
line2Status: 'pending'
|
|
|
},
|
|
},
|
|
|
file: file,
|
|
file: file,
|
|
|
- queuePosition: this.uploadQueue.length + 1 // Track queue position
|
|
|
|
|
|
|
+ queuePosition: this.uploadQueue.length + 1, // Track queue position
|
|
|
|
|
+ screenType: 0
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
this.uploadQueue.push(tempVideo);
|
|
this.uploadQueue.push(tempVideo);
|
|
@@ -3021,4 +3041,11 @@ export default {
|
|
|
font-size: 12px;
|
|
font-size: 12px;
|
|
|
padding: 4px 8px;
|
|
padding: 4px 8px;
|
|
|
}
|
|
}
|
|
|
|
|
+.table-radio-group .el-radio {
|
|
|
|
|
+ margin-right: 8px;
|
|
|
|
|
+ margin-left: 0;
|
|
|
|
|
+}
|
|
|
|
|
+.table-radio-group .el-radio:last-child {
|
|
|
|
|
+ margin-right: 0;
|
|
|
|
|
+}
|
|
|
</style>
|
|
</style>
|