|
|
@@ -168,6 +168,11 @@
|
|
|
<div style="padding: 4px 12px;background: linear-gradient(to right, rgb(196 219 255), #409EFF)">{{ formatDuration(scope.row.duration) }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="视频展示类型" align="center" prop="displayType" width="110">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.displayType === 'portrait' ? '竖屏' : '横屏' }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
|
@@ -235,6 +240,13 @@
|
|
|
<el-input-number v-model="form.sort" :min="0" label="请输入排序"></el-input-number>
|
|
|
</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="视频展示类型" prop="displayType">
|
|
|
+ <el-radio-group v-model="form.displayType">
|
|
|
+ <el-radio label="landscape">横屏</el-radio>
|
|
|
+ <el-radio label="portrait">竖屏</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="关联题目" prop="projectIds">
|
|
|
<el-select
|
|
|
ref="customSelect"
|
|
|
@@ -594,6 +606,13 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="视频展示类型" prop="displayType">
|
|
|
+ <el-radio-group v-model="batchUploadForm.displayType">
|
|
|
+ <el-radio label="landscape">横屏</el-radio>
|
|
|
+ <el-radio label="portrait">竖屏</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="关联题目" prop="projectIds" v-show="currentProject === 'myhk'">
|
|
|
<el-select
|
|
|
ref="customSelect"
|
|
|
@@ -635,6 +654,13 @@
|
|
|
<el-input v-model="batchEditDialog.form.resourceName" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="视频展示类型" prop="displayType">
|
|
|
+ <el-radio-group v-model="batchEditDialog.form.displayType">
|
|
|
+ <el-radio label="landscape">横屏</el-radio>
|
|
|
+ <el-radio label="portrait">竖屏</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="文件名称" prop="fileName" style="margin-top: 20px;display: none">
|
|
|
<el-input v-model="batchEditDialog.form.fileName" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
@@ -865,6 +891,7 @@ export default {
|
|
|
typeSubId: null,
|
|
|
projectIds: [],
|
|
|
sort: null,
|
|
|
+ displayType: 'landscape',
|
|
|
hsyVid:null,//火山云上传视频返回vid
|
|
|
hsyVodUrl:null,//火山云url
|
|
|
// 新增上传状态字段
|
|
|
@@ -930,7 +957,8 @@ export default {
|
|
|
typeId: null,
|
|
|
typeSubId: null,
|
|
|
projectIds: [],
|
|
|
- files: []
|
|
|
+ files: [],
|
|
|
+ displayType: 'landscape'
|
|
|
},
|
|
|
batchFileList: [],
|
|
|
|
|
|
@@ -1049,7 +1077,8 @@ export default {
|
|
|
videoUrl: null,
|
|
|
typeId: null,
|
|
|
typeSubId: null,
|
|
|
- projectIds: []
|
|
|
+ projectIds: [],
|
|
|
+ displayType: 'landscape'
|
|
|
};
|
|
|
// 重置表单验证状态
|
|
|
this.resetForm("form");
|
|
|
@@ -1105,6 +1134,10 @@ export default {
|
|
|
// 获取数据并设置表单
|
|
|
getVideoResource(id).then(async response => {
|
|
|
this.form = response.data;
|
|
|
+ // 视频展示类型:旧数据可能为空,默认横屏
|
|
|
+ if (!this.form.displayType) {
|
|
|
+ this.form.displayType = 'landscape';
|
|
|
+ }
|
|
|
await this.changeCateType(this.form.typeId)
|
|
|
|
|
|
// 处理projectIds,确保是数组格式
|
|
|
@@ -1845,7 +1878,8 @@ export default {
|
|
|
typeId: null,
|
|
|
typeSubId: null,
|
|
|
projectIds: [],
|
|
|
- files: []
|
|
|
+ files: [],
|
|
|
+ displayType: 'landscape'
|
|
|
};
|
|
|
this.subTypeList = []
|
|
|
}
|
|
|
@@ -1878,6 +1912,7 @@ export default {
|
|
|
typeId: this.batchUploadForm.typeId,
|
|
|
typeSubId: this.batchUploadForm.typeSubId,
|
|
|
projectIds: this.batchUploadForm.projectIds,
|
|
|
+ displayType: this.batchUploadForm.displayType || 'landscape',
|
|
|
progress: 0,
|
|
|
uploadStatus: 'queued', // Set initial status to queued
|
|
|
uploadDetails: {
|