Skip to content

N
national_museum_vod
Commit ff759e36 authored by xulili's avatar xulili
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/qzhxx/national_museum_vod

parents ceb5463a e260cc21
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 56 deletions
src/page/content/components/uploadVue/uploadImg.vue
View file @ ff759e36
...@@ -24,12 +24,7 @@ export default { ...@@ -24,12 +24,7 @@ export default {
props:{ props:{
fileList:{ fileList:{
type:Array, type:Array,
default:[ default:[]
{
name: "",
url: "",
},
]
}, },
}, },
data() { data() {
......
src/page/content/learn/content/add.vue
View file @ ff759e36
...@@ -371,6 +371,7 @@ export default { ...@@ -371,6 +371,7 @@ export default {
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
console.log(data,"dhwdhwid")
vm.assetType2 = data; vm.assetType2 = data;
}) })
.catch(function(err) { .catch(function(err) {
......
src/page/content/video/content/index.vue
View file @ ff759e36
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
placeholder="请选择视频版权方" placeholder="请选择视频版权方"
@focus="getAssetCopyrightData" @focus="getAssetCopyrightData"
v-model="form.videoContentCopyrightOwnerId" v-model="form.videoContentCopyrightOwnerId"
clearable
> >
<el-option <el-option
v-for="item in copyrightOwner" v-for="item in copyrightOwner"
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
placeholder="请选择预设视频分类" placeholder="请选择预设视频分类"
@focus="getAssetTypeData" @focus="getAssetTypeData"
v-model="form.videoContentCatId" v-model="form.videoContentCatId"
clearable
> >
<el-option <el-option
v-for="item in videoContentCat" v-for="item in videoContentCat"
......
src/page/content/video/remit/index.vue
View file @ ff759e36
...@@ -2,24 +2,44 @@ ...@@ -2,24 +2,44 @@
<div class="listPage H100"> <div class="listPage H100">
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form" class="search-form" onsubmit="return false;"> <el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
<el-form-item label="版权方名称"> <el-form-item label="">
<el-input <el-input
size="mini" placeholder="请输入视频名称"
placeholder="请输入版权方名称" v-model="form.nameOrCode"
v-model="form.name"
@keyup.enter.native="Search" @keyup.enter.native="Search"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item label="">
<el-date-picker <el-select
v-model="value1" placeholder="请选择视频版权方"
type="daterange" @focus="getAssetCopyrightData"
range-separator="至" v-model="form.videoContentCopyrightOwnerId"
start-placeholder="开始日期" clearable
end-placeholder="结束日期" >
></el-date-picker> <el-option
</el-form-item> v-for="item in copyrightOwner"
:label="item.name"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<el-select
placeholder="请选择预设视频分类"
@focus="getAssetTypeData"
v-model="form.videoContentCatId"
clearable
>
<el-option
v-for="item in videoContentCat"
:label="item.name"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<div class="btn-group"> <div class="btn-group">
<el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button> <el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button>
...@@ -47,14 +67,13 @@ ...@@ -47,14 +67,13 @@
> >
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="120" label="序号"></el-table-column> <el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column label="视频名称" prop="name"></el-table-column> <el-table-column label="视频名称" prop="videoContentCopyrightOwnerName"></el-table-column>
<el-table-column label="版权方" prop="copyrightOwnerName"></el-table-column> <el-table-column label="版权方" prop="exhibitionBoardName"></el-table-column>
<el-table-column label="视频类别" prop="createTime"></el-table-column> <el-table-column label="视频类别" prop="videoContentCatName"></el-table-column>
</el-table> </el-table>
</div> </div>
<div class="partyt-pagination"> <div class="partyt-pagination">
<el-pagination <el-pagination
small
background background
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page="page.currentPage" :current-page="page.currentPage"
...@@ -79,6 +98,8 @@ export default { ...@@ -79,6 +98,8 @@ export default {
} }
}; };
return { return {
copyrightOwner:[],
videoContentCat:[],
type: true, type: true,
value1: "", value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 }, page: { currentPage: 1, pageSize: 10, total: 0 },
...@@ -87,7 +108,7 @@ export default { ...@@ -87,7 +108,7 @@ export default {
FormVisible1: false, FormVisible1: false,
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
name: "" nameOrCode: ""
}, },
editform: { editform: {
menuName: "", menuName: "",
...@@ -132,6 +153,39 @@ export default { ...@@ -132,6 +153,39 @@ export default {
}, },
components: {}, components: {},
methods: { methods: {
// 获取展板分类列表
getAssetCopyrightData(){
let vm = this;
vm.$https({
url: "copyrightOwner/getList",
method: "get",
authType: this.backToken
},
{copyrightOwnerType:'VIDEO_CONTENT'})
.then(res => {
let data = res.data.data;
this.copyrightOwner = data;
})
.catch(function(err) {
console.log(err);
});
},
// 获取视频分类列表
getAssetTypeData() {
let vm = this;
vm.$https({
url: "videoContentCat/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.videoContentCat = data;
})
.catch(function(err) {
console.log(err);
});
},
// 渲染父级权限 // 渲染父级权限
getPermis() { getPermis() {
let vm = this; let vm = this;
...@@ -162,7 +216,7 @@ export default { ...@@ -162,7 +216,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "videoContentCat/getPageList", url: "asset/getPageList",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
...@@ -192,7 +246,6 @@ export default { ...@@ -192,7 +246,6 @@ export default {
}, },
// 重置 // 重置
Reset(){ Reset(){
// this.$refs["form"].resetFields();
this.form = {} this.form = {}
this.Search() this.Search()
}, },
...@@ -202,7 +255,9 @@ export default { ...@@ -202,7 +255,9 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name nameOrCode: _this.form.nameOrCode,
videoContentCatId:_this.form.videoContentCatId,
videoContentCopyrightOwnerId:_this.form.videoContentCopyrightOwnerId
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
...@@ -234,11 +289,11 @@ export default { ...@@ -234,11 +289,11 @@ export default {
_this.selection.forEach(function(e) { _this.selection.forEach(function(e) {
arr.push(e.id); arr.push(e.id);
}); });
// str = arr.join(","); str = arr.join(",");
str = arr; // str = arr;
} else { } else {
// str = ""; str = "";
str = []; // str = [];
} }
return str; return str;
}, },
...@@ -249,31 +304,36 @@ export default { ...@@ -249,31 +304,36 @@ export default {
// console.log(str) // console.log(str)
if (str.length > 0) { if (str.length > 0) {
console.log(str); console.log(str);
// _this.$https({ _this.$https({
// url: "menu/batchDel?menuIds=" + str, url: "asset/download",
// method: "post", method: "get",
// authType: this.backToken authType: this.backToken
// }) },
// .then( {idList:str}
// res => { )
// if (res.data.status == 201 || res.data.status == 200) { .then(
// var reader = new FileReader(); res => {
// reader.readAsDataURL(blob); // 转换为base64，可以直接放入a表情href const blob = new Blob([res.data], {
// reader.onload = function(e) { type:
// var a = document.createElement("a"); "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'"
// a.download = })
// genUUID() + (batchno !== "" ? "_" + batchno : "") + ".zip"; //下载文件名 const downloadElement = document.createElement('a')
// a.href = e.target.result; const contentDisposition = res.headers['content-disposition']
// $("body").append(a); // 修复firefox中无法触发click const patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*')
// a.click(); const result = patt.exec(contentDisposition)
// $(a).remove(); const filename = decodeURI(result[1])
// }; const href = window.URL.createObjectURL(blob) // 创建下载的链接
// } downloadElement.href = href
// //重新查询数据 downloadElement.download = filename // 下载后文件名
// _this.onSearch(); document.body.appendChild(downloadElement)
// }, downloadElement.click() // 点击下载
// error => {} document.body.removeChild(downloadElement) // 下载完成移除元素
// ); window.URL.revokeObjectURL(href) // 释放blob对象
},
error => {}
);
} else { } else {
this.$message({ this.$message({
type: "info", type: "info",
......
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