|
@@ -512,7 +512,7 @@ a {
|
|
</div>
|
|
</div>
|
|
<div style="flex:3;padding:10px;box-sizing:border-box;">
|
|
<div style="flex:3;padding:10px;box-sizing:border-box;">
|
|
<a-form v-if="detail" class="detail">
|
|
<a-form v-if="detail" class="detail">
|
|
- <!-- <a-form-item
|
|
|
|
|
|
+ <a-form-item
|
|
label="视频时长"
|
|
label="视频时长"
|
|
:label-col="{ span: 6 }"
|
|
:label-col="{ span: 6 }"
|
|
:wrapper-col="{ span: 18 }"
|
|
:wrapper-col="{ span: 18 }"
|
|
@@ -525,7 +525,7 @@ a {
|
|
</a-form-item>
|
|
</a-form-item>
|
|
<a-form-item label="大小" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
<a-form-item label="大小" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
{{ detail.parameter.size }}
|
|
{{ detail.parameter.size }}
|
|
- </a-form-item> -->
|
|
|
|
|
|
+ </a-form-item>
|
|
<a-form-item label="策划" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
<a-form-item label="策划" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
{{ detail.ascription.planName }}
|
|
{{ detail.ascription.planName }}
|
|
</a-form-item>
|
|
</a-form-item>
|
|
@@ -543,8 +543,20 @@ a {
|
|
<a-form-item label="标签" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
<a-form-item label="标签" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
<a-tag v-for="(item, index) of detail.tag" :key="index">{{ item }}</a-tag>
|
|
<a-tag v-for="(item, index) of detail.tag" :key="index">{{ item }}</a-tag>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
- <a-form-item label="水印素材下载" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="showUrlWater">
|
|
|
|
- <a-button type="primary" @click="downloadByBlob">下载</a-button>
|
|
|
|
|
|
+ <a-form-item label="水印素材下载" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="name">
|
|
|
|
+ <a-button type="primary" @click="downloadByBlob" v-if="showUrlWater">下载</a-button>
|
|
|
|
+ <span v-else>水印素材生成中......</span>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ <a-form-item label="水印素材链接" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="showUrlWater">
|
|
|
|
+ <a-input v-model="showUrlWater" type="text" readonly/>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ <a-form-item label="生成水印素材" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
|
|
|
|
+ <a-select :defaultValue="1" style="width:50%" v-model="size">
|
|
|
|
+ <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>
|
|
</a-form-item>
|
|
<a-form-item label="审核人" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="active == '2'">
|
|
<a-form-item label="审核人" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }" v-if="active == '2'">
|
|
{{ detail.auditorName }}
|
|
{{ detail.auditorName }}
|
|
@@ -635,7 +647,7 @@ import JEllipsis from '@/components/jeecg/JEllipsis'
|
|
import UploadToAli from '@femessage/upload-to-ali'
|
|
import UploadToAli from '@femessage/upload-to-ali'
|
|
import { fileCheck, fileInsert, fileEdit } from '@/api/actor'
|
|
import { fileCheck, fileInsert, fileEdit } from '@/api/actor'
|
|
import { getAction, postAction, postFile } from '@/api/manage'
|
|
import { getAction, postAction, postFile } from '@/api/manage'
|
|
-
|
|
|
|
|
|
+import qs from 'qs'
|
|
import { mapGetters } from 'vuex'
|
|
import { mapGetters } from 'vuex'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
|
|
|
|
@@ -713,7 +725,9 @@ export default {
|
|
id: '',
|
|
id: '',
|
|
role: { roleCode: '', roleName: '' },
|
|
role: { roleCode: '', roleName: '' },
|
|
key: '0',
|
|
key: '0',
|
|
- mediaId: null
|
|
|
|
|
|
+ mediaId: null,
|
|
|
|
+ sizeType: [],
|
|
|
|
+ size: 1
|
|
}
|
|
}
|
|
},
|
|
},
|
|
filters: {
|
|
filters: {
|
|
@@ -761,6 +775,12 @@ export default {
|
|
getAction('/sys/user/getRoleInfo', { userId: this.userInfo().id }).then(res => {
|
|
getAction('/sys/user/getRoleInfo', { userId: this.userInfo().id }).then(res => {
|
|
this.role = res
|
|
this.role = res
|
|
})
|
|
})
|
|
|
|
+ getAction('/ctop/videoWatermarkTemplate/list').then(res => {
|
|
|
|
+ console.log(res)
|
|
|
|
+ if (res.success) {
|
|
|
|
+ this.sizeType = res.result.records
|
|
|
|
+ }
|
|
|
|
+ })
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
$route: function(n, o) {
|
|
$route: function(n, o) {
|
|
@@ -878,11 +898,27 @@ export default {
|
|
inputValue: ''
|
|
inputValue: ''
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ 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.loadData()
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
showDetail(item) {
|
|
showDetail(item) {
|
|
this.visibleDetail = true
|
|
this.visibleDetail = true
|
|
this.showUrl = item.url
|
|
this.showUrl = item.url
|
|
this.showUrlWater = item.watermarkUrl ? item.watermarkUrl : null
|
|
this.showUrlWater = item.watermarkUrl ? item.watermarkUrl : null
|
|
- this.name = item.watermarkMaterialName ? item.watermarkMaterialName : null
|
|
|
|
|
|
+ this.name = item.watermarkCode ? item.watermarkCode : null
|
|
this.id = item.id
|
|
this.id = item.id
|
|
if (this.active == '2') {
|
|
if (this.active == '2') {
|
|
this.refuseReason = item.refuseReason
|
|
this.refuseReason = item.refuseReason
|