|
@@ -298,6 +298,21 @@
|
|
|
{{ detail.parameter.size }}
|
|
|
</a-form-item>
|
|
|
</div>
|
|
|
+ <div class="downLoad" v-if="active=='VIDEO'">
|
|
|
+ <a-form-item label="生成水印素材" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
|
+ <a-select :defaultValue="4" v-model="size" style="width:70%">
|
|
|
+ <a-select-option :value="item.id" :key="item.id" v-for="item of sizeType">{{
|
|
|
+ item.name
|
|
|
+ }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ <a-button type="primary" @click="getWater">生成</a-button>
|
|
|
+ </a-form-item>
|
|
|
+ </div>
|
|
|
+ <div v-if="showUrlWater">
|
|
|
+ <a-form-item label="水印素材链接" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
|
+ <a-input v-model="showUrlWater" type="text" readonly />
|
|
|
+ </a-form-item>
|
|
|
+ </div>
|
|
|
<a-form-item label="标签" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="detail.tag">
|
|
|
<a-tag v-for="(item, index) of detail.tag" :key="index">{{ item }}</a-tag>
|
|
|
</a-form-item>
|
|
@@ -339,9 +354,12 @@
|
|
|
import moment from 'moment'
|
|
|
|
|
|
import selectTable from '@/views/modules/Statistics/components/selecTable.vue'
|
|
|
-
|
|
|
+ import {
|
|
|
+ stopOtherVideo,
|
|
|
+ closeAllVideoFun
|
|
|
+ } from '@/utils/videoControl'
|
|
|
import BMF from 'browser-md5-file'
|
|
|
-
|
|
|
+ import qs from 'qs'
|
|
|
import accountCheck from './accountCheck'
|
|
|
export default {
|
|
|
name: 'YardList',
|
|
@@ -445,7 +463,9 @@
|
|
|
noList: [],
|
|
|
material: [],
|
|
|
excellent: 0,
|
|
|
- code: ''
|
|
|
+ code: '',
|
|
|
+ sizeType: [],
|
|
|
+ size: ""
|
|
|
}
|
|
|
},
|
|
|
filters: {
|
|
@@ -495,6 +515,11 @@
|
|
|
// }).then(res => {
|
|
|
// this.role = res
|
|
|
// })
|
|
|
+ getAction('/ctop/videoWatermarkTemplate/list').then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ this.sizeType = res.result.records
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
watch: {
|
|
|
'queryParam.projectId': function (n, o) {
|
|
@@ -504,6 +529,25 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ getWater() {
|
|
|
+ var params = qs.stringify({
|
|
|
+ id: this.id,
|
|
|
+ watermarkTemplateId: this.size
|
|
|
+ })
|
|
|
+ postAction('/ctop/materialInfo/watermark', params).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ // getAction("/ctop/videoWatermarkTask/list").then(res=>{
|
|
|
+ // console.log(res)
|
|
|
+ // })
|
|
|
+ this.$message.success('水印素材生成中,请一分钟后刷新')
|
|
|
+ this.visibleDetail = false
|
|
|
+ this.refuseFile = []
|
|
|
+ this.refuseReason = ''
|
|
|
+ closeAllVideoFun()
|
|
|
+ this.loadData()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
setSuccess() {
|
|
|
var params = {}
|
|
|
params.id = this.code
|
|
@@ -671,7 +715,7 @@
|
|
|
this.visibleDetail = true
|
|
|
this.showUrl = item.url
|
|
|
this.showUrlWater = item.watermarkUrl ? item.watermarkUrl : null
|
|
|
- this.name = item.watermarkMaterialName ? item.watermarkMaterialName : null
|
|
|
+ // this.name = item.watermarkMaterialName ? item.watermarkMaterialName : null
|
|
|
this.id = item.id
|
|
|
this.code = item.code
|
|
|
this.excellent = item.excellent
|
|
@@ -680,6 +724,9 @@
|
|
|
materialId: item.id
|
|
|
}).then(res => {
|
|
|
this.detail = res
|
|
|
+ this.size =
|
|
|
+ res.parameter.width == '1080' ? 3 : res.parameter.width == '1920' ? 1 : res.parameter.width == '1280' ?
|
|
|
+ 2 : 4
|
|
|
})
|
|
|
},
|
|
|
okEditShow(item, editStatus) {
|