Skip to content

N
national_museum_vod
Commit bdaa5854 authored by 乐宝呗666's avatar 乐宝呗666
Browse files
Options

Merge branch 'master' into dev_fbl

parents c802945e 9cab4646
Show whitespace changes
Inline Side-by-side
Showing with 1050 additions and 499 deletions
src/config/menu.js
View file @ bdaa5854
...@@ -26,7 +26,7 @@ export const menuList = [ ...@@ -26,7 +26,7 @@ export const menuList = [
url: '', url: '',
children: [ children: [
{ name: '版权方管理', icon: 'icon-copyrights', color: 'index-red', avatar: '', url: '/videoCopyright' }, { name: '版权方管理', icon: 'icon-copyrights', color: 'index-red', avatar: '', url: '/videoCopyright' },
{ name: '分类管理', icon: 'icon-classify', color: 'index-blue', avatar: '', url: '/videoclassifyify' }, { name: '分类管理', icon: 'icon-classify', color: 'index-blue', avatar: '', url: '/videoclassify' },
{ name: '内容管理', icon: 'icon-content', color: 'index-green', avatar: '', url: '/videoContent' }, { name: '内容管理', icon: 'icon-content', color: 'index-green', avatar: '', url: '/videoContent' },
{ name: '视频汇出', icon: 'icon-plane', color: 'index-purple', avatar: '', url: '/videoRemit' }, { name: '视频汇出', icon: 'icon-plane', color: 'index-purple', avatar: '', url: '/videoRemit' },
] ]
......
src/page/check/display/index.vue
View file @ bdaa5854
...@@ -10,6 +10,14 @@ ...@@ -10,6 +10,14 @@
@keyup.enter.native="Search" @keyup.enter.native="Search"
clearable clearable
></el-input> ></el-input>
</el-form-item>
<el-form-item >
<el-select v-model="form.status" placeholder="请选择审核状态">
<el-option label="待初审" value="TBC"></el-option>
<el-option label="已驳回" value="REFUSED"></el-option>
<el-option label="待复审" value="TBCA"></el-option>
<el-option label="通过" value="APPROVED_FINAL"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div class="btn-group"> <div class="btn-group">
...@@ -20,13 +28,10 @@ ...@@ -20,13 +28,10 @@
</el-form> </el-form>
<div class="page-tip"> <div class="page-tip">
<span class="page-tip-title">页面说明:</span> <span class="page-tip-title">页面说明:</span>
<span class="page-tips">可查看视频待审核的所有内容，可根据审核类别进行筛选</span> <span class="page-tips">可查看展板待审核的所有内容，可根据审核类别进行筛选</span>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
<!-- <div class="btn-group">
<el-button type="primary" @click="addPermis()">新建视频分类</el-button>
</div> -->
<div class="party-table"> <div class="party-table">
<el-table <el-table
border border
...@@ -36,49 +41,48 @@ ...@@ -36,49 +41,48 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<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="name"></el-table-column>
<el-table-column label="提交人" prop="copyrightOwnerName"></el-table-column> <el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column> <el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="remarks"></el-table-column> <el-table-column label="审核项" prop="operation"></el-table-column>
<el-table-column label="审核状态" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span>
<span v-else-if="scope.row.status === 'REFUSED'">已驳回</span>
<span v-else-if="scope.row.status === 'TBCA'">待复审</span>
<span v-else-if="scope.row.status === 'APPROVED_FINAL'">通过</span>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<!-- <el-button <el-tooltip content="详情" placement="top">
title="删除" <el-button circle @click="openDetails(scope.row)">
type="text" <i class="icon-table icon-detail"></i>
size="mini" </el-button>
@click="handleDelete(scope.row)" </el-tooltip>
>删除&nbsp;&nbsp;</el-button> </div>
<el-button
title="请填写驳回原因"
size="mini"
type="text"
@click="reject(scope.row)"
>请填写驳回原因&nbsp;&nbsp;</el-button> -->
<el-button title="查看详情" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button>
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核" header-align="center" align="center"> <el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<!-- <el-button <!-- <el-tooltip content="详情" placement="top">
title="删除" <el-button circle @click="learnDetails(scope.row)">
type="text" <i class="icon-table icon-detail"></i>
size="mini" </el-button>
@click="handleDelete(scope.row)" </el-tooltip> -->
>删除&nbsp;&nbsp;</el-button> --> <el-tooltip content="通过" placement="top">
<el-button <el-button circle @click="adopt(scope.row)">
size="mini" <i class="icon-table icon-enable"></i>
type="text" </el-button>
@click="reject(scope.row)" </el-tooltip>
>驳回&nbsp;&nbsp;</el-button> <el-tooltip content="驳回" placement="top">
<el-button <el-button circle @click="reject(scope.row)">
size="mini" <i class="icon-table icon-disable"></i>
type="text" </el-button>
@click="adopt(scope.row)" </el-tooltip>
>通过&nbsp;&nbsp;</el-button> </div>
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -113,19 +117,19 @@ ...@@ -113,19 +117,19 @@
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer btn-group"> <div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" v-show="type" type="primary" @click="permisSave">确定</el-button> <el-button size="mini" type="primary" @click="permisSave">确定</el-button>
<el-button size="mini" v-show="!type" type="primary" @click="permisEdit">确定</el-button> <!-- <el-button size="mini" v-show="!type" type="primary" @click="permisEdit">确定</el-button> -->
<el-button size="mini" @click="close1">取 消</el-button> <el-button size="mini" @click="close1">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--请填写驳回原因--> <!--请填写驳回原因-->
<el-dialog custom-class="party-dialog" title="请填写驳回原因" width="468px" :visible.sync="FormVisible" :before-close="close" > <el-dialog custom-class="party-dialog" title="展板详情" width="468px" :visible.sync="FormVisible" :before-close="close" >
<div class="dialog-content"> <div class="dialog-content">
<el-form :model="editform" disabled class="party-form" ref="editform" label-width="80px" label-position="top" :rules="rules"> <el-form :model="editForm" disabled class="party-form" ref="editForm" label-width="80px" label-position="top" :rules="rules">
<el-form-item label="展板名称" :label-width="formLabelWidth"> <el-form-item label="展板名称" :label-width="formLabelWidth">
<el-input <el-input
size="small" size="small"
v-model="editform.sort" v-model="editForm.name"
auto-complete="off" auto-complete="off"
clearable clearable
></el-input> ></el-input>
...@@ -133,17 +137,17 @@ ...@@ -133,17 +137,17 @@
<el-form-item label="版权方" :label-width="formLabelWidth"> <el-form-item label="版权方" :label-width="formLabelWidth">
<el-input <el-input
size="small" size="small"
v-model="editform.menuName" v-model="editForm.menuName"
auto-complete="off" auto-complete="off"
clearable clearable
onkeyup="this.value=this.value.replace(/^ +| +$/g,'')" onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="宣传图" :label-width="formLabelWidth"> <el-form-item label="宣传图" :label-width="formLabelWidth">
<img class="imgSize" src="" alt=""> <img class="imgSize" :src="editForm.cover" alt="">
</el-form-item> </el-form-item>
<el-form-item label="简介" :label-width="formLabelWidth"> <el-form-item label="简介" :label-width="formLabelWidth">
<el-input type="textarea" v-model="editform.desc"></el-input> <el-input type="textarea" v-model="editForm.remarks"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="展板视频" :label-width="formLabelWidth"> <el-form-item label="展板视频" :label-width="formLabelWidth">
<div> <div>
...@@ -161,8 +165,8 @@ ...@@ -161,8 +165,8 @@
</div> </div>
<div slot="footer" class="dialog-footer btn-group"> <div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="submitForm('editform')">确定</el-button> <!-- <el-button size="mini" type="primary" @click="submitForm('editForm')">确定</el-button> -->
<el-button size="mini" @click="close">取 消</el-button> <el-button size="mini" type="primary" @click="close">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -188,20 +192,18 @@ export default { ...@@ -188,20 +192,18 @@ export default {
FormVisible1: false, FormVisible1: false,
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
name: "" name: "",
type:"EXHIBITION_BOARD"
}, },
editform: { editForm: {
menuName: "", name:"",
menuUrl: "", cover:'',
parentId: "", sort:""
sort: "",
id: ""
}, },
classForm: { classForm: {
menuName: "", status:"",
menuUrl: "", remarks:"",
parentId: "", id: ""
sort: ""
}, },
typeList: [], typeList: [],
rules: { rules: {
...@@ -263,12 +265,12 @@ export default { ...@@ -263,12 +265,12 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/getPageList", url: "audit/getPageAllList",
method: "post", method: "get",
authType: this.backToken authType: this.backToken
}, },
vm.$qs.stringify(param) // vm.$qs.stringify(param)
// param param
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
...@@ -297,14 +299,16 @@ export default { ...@@ -297,14 +299,16 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name name: _this.form.name,
status:_this.form.status,
type:"EXHIBITION_BOARD"
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
// 重置 // 重置
Reset(){ Reset(){
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = {} this.form = {type:"EXHIBITION_BOARD"}
this.Search() this.Search()
}, },
// // 获取当前查询参数 // // 获取当前查询参数
...@@ -328,16 +332,17 @@ export default { ...@@ -328,16 +332,17 @@ export default {
this.FormVisible1 = true; this.FormVisible1 = true;
this.type = true this.type = true
}, },
// 新建视频分类确认保存
permisSave() { // 请填写驳回原因视频分类确认保存
permisEdit() {
let _this = this; let _this = this;
_this.$refs.classForm.validate(valid => { _this.$refs.classForm.validate(valid => {
if (valid) { if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/save", method: "post", authType: this.backToken }, { url: "videoContentCat/update", method: "put", authType: this.backToken },
// _this.$qs.stringify(_this.classForm) _this.$qs.stringify(_this.classForm)
_this.classForm // _this.classForm
) )
.then( .then(
res => { res => {
...@@ -370,23 +375,60 @@ export default { ...@@ -370,23 +375,60 @@ export default {
} }
}); });
}, },
// 请填写驳回原因视频分类确认保存 // 请填写驳回原因关闭
permisEdit() { close() {
this.FormVisible = false;
// for (let key in this.classForm) {
// this.classForm[key] = null;
// }
// this.$refs["classForm"].resetFields();
// this.FormVisible = false;
// this.$refs["editForm"].resetFields();
},
// 新增关闭
close1() {
this.FormVisible1 = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
},
// 通过
adopt(row){
this.classForm.id= row.id
this.classForm.status = "APPROVED_FINAL"
this.classForm.remarks = ""
this.permisSave('classForm')
},
// 请填写驳回原因弹框
reject(row) {
this.type = false
$('.el-dialog__title').html('请填写驳回原因');
let _this=this;
_this.classForm.id= row.id
_this.classForm.status = "REFUSED"
_this.FormVisible1 = true;
},
// 驳回原因保存
permisSave() {
let _this = this; let _this = this;
_this.$refs.classForm.validate(valid => {
if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/update", method: "put", authType: this.backToken }, { url: "audit/updateAuditAllById",
_this.$qs.stringify(_this.classForm) headers:{'Content-Type': 'application/json'},
// _this.classForm method: "put",
authType: this.backToken,
},
// _this.$qs.stringify(_this.classForm)
_this.classForm
) )
.then( .then(
res => { res => {
if (res.data.resultCode == 200 || res.data.resultCode == 201) { if (res.data.resultCode == 200 || res.data.resultCode == 201) {
_this.$message({ _this.$message({
type: "success", type: "success",
message: '新建成功！' message: '操作成功！'
}); });
//跳回用户列表 //跳回用户列表
_this.onSearch(); _this.onSearch();
...@@ -409,50 +451,18 @@ export default { ...@@ -409,50 +451,18 @@ export default {
}); });
} }
); );
} // _this.$refs.classForm.validate(valid => {
}); // if (valid) {
},
// 请填写驳回原因关闭
close() {
this.FormVisible1 = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
// this.FormVisible = false;
// this.$refs["editform"].resetFields();
},
// 新增关闭
close1() {
this.FormVisible1 = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
},
// 通过
adopt(row){
this.$message({type: 'success', message: '审核通过!'});
},
// 请填写驳回原因弹框
reject(row) {
this.type = false
$('.el-dialog__title').html('请填写驳回原因');
let _this=this;
//成功之后清除数据
// for (let key in this.editform) {
// _this.editform[key]=null;
// } // }
// _this.editform= Object.assign({}, row); // });
_this.FormVisible1 = true;
// this.getAssetTypeInfo(row.id)
}, },
// 获取视频分类详情 // 获取视频分类详情
getAssetTypeInfo(id){ getAssetTypeInfo(id){
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/get/" + id, url: "videoContentCat/get/" + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, },
...@@ -467,12 +477,50 @@ export default { ...@@ -467,12 +477,50 @@ export default {
console.log(err); console.log(err);
}); });
}, },
openDetails() { openDetails(row) {
let _this = this; let _this = this;
_this.FormVisible = true; _this.FormVisible = true;
// $('.el-dialog__title').html('请填写驳回原因'); _this.getInfo(row.refItemId)
// let _this=this; $('.el-dialog__title').html( row.name +'展板详情');
// _this.FormVisible1 = true;
},
// 获取版权方详情
getInfo(id) {
let vm = this;
vm.$https(
{
url: "exhibitionBoard/get/" + id,
method: "get",
authType: this.backToken
}
// param
)
.then(res => {
let data = res.data.data;
// this.editForm = data
// this.ruleForm = data;
// this.ruleForm = {
// assetCopyrightOwnerId :data.assetCopyrightOwnerId,
// assetId:data.assetId,
// assetTypeId:data.assetTypeId,
// boardCopyrightOwnerId:data.boardCopyrightOwnerId,
// cover:data.cover,
// exhibitionBoardCatId:data.exhibitionBoardCatId,
// guideAudioUrl:data.guideAudioUrl,
// id:data.id,
// name:data.name,
// qrcodeUrl:data.qrcodeUrl,
// refMaterialUrl:data.refMaterialUrl,
// remarks:data.remarks,
// audioUrlList:data.audioUrlList,
// materialUrlList:data.materialUrlList
// }
})
.catch(function(err) {
console.log(err);
});
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
...@@ -485,7 +533,7 @@ export default { ...@@ -485,7 +533,7 @@ export default {
.then(() => { .then(() => {
_this.$https({ _this.$https({
method: 'delete', method: 'delete',
url: 'assetType/delete/'+ row.id, url: 'videoContentCat/delete/'+ row.id,
authType: this.backToken authType: this.backToken
}).then((res) => { }).then((res) => {
this.$message({type: 'success', message: '删除成功!'}); this.$message({type: 'success', message: '删除成功!'});
...@@ -500,15 +548,15 @@ export default { ...@@ -500,15 +548,15 @@ export default {
// // 保存请填写驳回原因信息 // // 保存请填写驳回原因信息
// submitForm() { // submitForm() {
// let _this = this; // let _this = this;
// _this.$refs.editform.validate(valid => { // _this.$refs.editForm.validate(valid => {
// if (valid) { // if (valid) {
// let searchObj = {}; // let searchObj = {};
// for (let key in _this.editform) { // for (let key in _this.editForm) {
// if (this.editform[key]) { // if (this.editForm[key]) {
// searchObj[key] = _this.editform[key]; // searchObj[key] = _this.editForm[key];
// } // }
// } // }
// let str = _this.editform.menuName; // let str = _this.editForm.menuName;
// let index = str.lastIndexOf("-"); // let index = str.lastIndexOf("-");
// str = str.substring(index + 1, str.length); // str = str.substring(index + 1, str.length);
// searchObj.menuName = str; // searchObj.menuName = str;
...@@ -530,7 +578,7 @@ export default { ...@@ -530,7 +578,7 @@ export default {
// }); // });
// _this.onSearch(); // _this.onSearch();
// _this.FormVisible = false; // _this.FormVisible = false;
// _this.$refs["editform"].resetFields(); // _this.$refs["editForm"].resetFields();
// } else { // } else {
// _this.$message({ // _this.$message({
// type: "error", // type: "error",
......
src/page/check/learn/details.vue
View file @ bdaa5854
...@@ -3,6 +3,21 @@ ...@@ -3,6 +3,21 @@
<div class="info-header">学习内容详情</div> <div class="info-header">学习内容详情</div>
<div class="info-container"> <div class="info-container">
<div class="info-wrapper"> <div class="info-wrapper">
<el-form
class="demo-form-inline"
:inline="true"
:model="formInline"
label-position="top"
>
<el-form-item label="学习内容名称" class="w50">
xxxxxxx
<!-- <el-input v-model="formInline.user" placeholder="审批人"></el-input> -->
</el-form-item>
<el-form-item label="学习内容宣传图" class="w50">
<img class="imgSize" src alt />
</el-form-item>
</el-form>
<el-collapse v-model="activeNames" @change="handleChange"> <el-collapse v-model="activeNames" @change="handleChange">
<el-collapse-item title="建党伟业" name="1"> <el-collapse-item title="建党伟业" name="1">
<el-form <el-form
...@@ -71,7 +86,46 @@ export default { ...@@ -71,7 +86,46 @@ export default {
} }
}; };
}, },
mounted(){
this.init()
},
methods: { methods: {
init() {
this.getInfo(this.$route.query.id);
},
// 获取版权方详情
getInfo(id) {
let vm = this;
vm.$https(
{
url: "learningContent/get/" + id,
method: "get",
authType: this.backToken
}
// param
)
.then(res => {
let data = res.data.data;
this.ruleForm = data;
console.log(this.ruleForm)
// this.ruleForm = {
// name :data.name,
// applicableScope:data.applicableScope,
// copyrightOwnerIdList:data.copyrightOwnerIdList,
// cover:data.cover,
// learningProjectId:data.learningProjectId,
// exhibitionBoardCatIdList:data.exhibitionBoardCatIdList,
// id:data.id,
// exhibitionBoardIdList:data.exhibitionBoardIdList,
// }
this.tableData = data.exhibitionBoardList
// this.multipleSelection = data.exhibitionBoardList
})
.catch(function(err) {
console.log(err);
});
},
close() { close() {
history.go(-1); history.go(-1);
}, },
......
src/page/check/learn/index.vue
View file @ bdaa5854
...@@ -11,6 +11,14 @@ ...@@ -11,6 +11,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item >
<el-select v-model="form.status" placeholder="请选择审核状态">
<el-option label="待初审" value="TBC"></el-option>
<el-option label="已驳回" value="REFUSED"></el-option>
<el-option label="待复审" value="TBCA"></el-option>
<el-option label="通过" value="APPROVED_FINAL"></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>
...@@ -36,49 +44,43 @@ ...@@ -36,49 +44,43 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<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="name"></el-table-column>
<el-table-column label="提交人" prop="copyrightOwnerName"></el-table-column> <el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column> <el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="remarks"></el-table-column> <el-table-column label="审核项" prop="operation"></el-table-column>
<el-table-column label="审核状态" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span>
<span v-else-if="scope.row.status === 'REFUSED'">已驳回</span>
<span v-else-if="scope.row.status === 'TBCA'">待复审</span>
<span v-else-if="scope.row.status === 'APPROVED_FINAL'">通过</span>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<!-- <el-button <el-tooltip content="详情" placement="top">
title="删除" <el-button circle @click="openDetails(scope.row)">
type="text" <i class="icon-table icon-detail"></i>
size="mini" </el-button>
@click="handleDelete(scope.row)" </el-tooltip>
>删除&nbsp;&nbsp;</el-button> </div>
<el-button
title="请填写驳回原因"
size="mini"
type="text"
@click="reject(scope.row)"
>请填写驳回原因&nbsp;&nbsp;</el-button> -->
<el-button title="查看详情" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button>
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核" header-align="center" align="center"> <el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<!-- <el-button <el-tooltip content="通过" placement="top">
title="删除" <el-button circle @click="adopt(scope.row)">
type="text" <i class="icon-table icon-enable"></i>
size="mini" </el-button>
@click="handleDelete(scope.row)" </el-tooltip>
>删除&nbsp;&nbsp;</el-button> --> <el-tooltip content="驳回" placement="top">
<el-button <el-button circle @click="reject(scope.row)">
size="mini" <i class="icon-table icon-disable"></i>
type="text" </el-button>
@click="reject(scope.row)" </el-tooltip>
>驳回&nbsp;&nbsp;</el-button> </div>
<el-button
size="mini"
type="text"
@click="adopt(scope.row)"
>通过&nbsp;&nbsp;</el-button>
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -113,8 +115,8 @@ ...@@ -113,8 +115,8 @@
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer btn-group"> <div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" v-show="type" type="primary" @click="permisSave">确定</el-button> <el-button size="mini" type="primary" @click="permisSave">确定</el-button>
<el-button size="mini" v-show="!type" type="primary" @click="permisEdit">确定</el-button> <!-- <el-button size="mini" v-show="!type" type="primary" @click="permisEdit">确定</el-button> -->
<el-button size="mini" @click="close1">取 消</el-button> <el-button size="mini" @click="close1">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -181,7 +183,8 @@ export default { ...@@ -181,7 +183,8 @@ export default {
FormVisible1: false, FormVisible1: false,
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
name: "" name: "",
type:"LEARNING_CONTENT"
}, },
editform: { editform: {
menuName: "", menuName: "",
...@@ -191,10 +194,9 @@ export default { ...@@ -191,10 +194,9 @@ export default {
id: "" id: ""
}, },
classForm: { classForm: {
menuName: "", id:"",
menuUrl: "", status:"",
parentId: "", remarks:""
sort: ""
}, },
typeList: [], typeList: [],
rules: { rules: {
...@@ -256,12 +258,12 @@ export default { ...@@ -256,12 +258,12 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/getPageList", url: "audit/getPageAllList",
method: "post", method: "get",
authType: this.backToken authType: this.backToken
}, },
vm.$qs.stringify(param) // vm.$qs.stringify(param)
// param param
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
...@@ -290,14 +292,16 @@ export default { ...@@ -290,14 +292,16 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name name: _this.form.name,
status:_this.form.status,
type:"LEARNING_CONTENT"
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
// 重置 // 重置
Reset(){ Reset(){
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = {} this.form = {type:'LEARNING_CONTENT'}
this.Search() this.Search()
}, },
// // 获取当前查询参数 // // 获取当前查询参数
...@@ -321,16 +325,16 @@ export default { ...@@ -321,16 +325,16 @@ export default {
this.FormVisible1 = true; this.FormVisible1 = true;
this.type = true this.type = true
}, },
// 新建视频分类确认保存 // 请填写驳回原因视频分类确认保存
permisSave() { permisEdit() {
let _this = this; let _this = this;
_this.$refs.classForm.validate(valid => { _this.$refs.classForm.validate(valid => {
if (valid) { if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/save", method: "post", authType: this.backToken }, { url: "videoContentCat/update", method: "put", authType: this.backToken },
// _this.$qs.stringify(_this.classForm) _this.$qs.stringify(_this.classForm)
_this.classForm // _this.classForm
) )
.then( .then(
res => { res => {
...@@ -363,23 +367,60 @@ export default { ...@@ -363,23 +367,60 @@ export default {
} }
}); });
}, },
// 请填写驳回原因视频分类确认保存 // 请填写驳回原因关闭
permisEdit() { close() {
this.FormVisible1 = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
// this.FormVisible = false;
// this.$refs["editform"].resetFields();
},
// 新增关闭
close1() {
this.FormVisible1 = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
},
// 通过
adopt(row){
this.classForm.id= row.id
this.classForm.status = "APPROVED_FINAL"
this.classForm.remarks = ""
this.permisSave('classForm')
},
// 请填写驳回原因弹框
reject(row) {
this.type = false
$('.el-dialog__title').html('请填写驳回原因');
let _this=this;
_this.classForm.id= row.id
_this.classForm.status = "REFUSED"
_this.FormVisible1 = true;
},
// 驳回原因保存
permisSave() {
let _this = this; let _this = this;
_this.$refs.classForm.validate(valid => {
if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/update", method: "put", authType: this.backToken }, { url: "audit/updateAuditAllById",
_this.$qs.stringify(_this.classForm) headers:{'Content-Type': 'application/json'},
// _this.classForm method: "put",
authType: this.backToken,
},
// _this.$qs.stringify(_this.classForm)
_this.classForm
) )
.then( .then(
res => { res => {
if (res.data.resultCode == 200 || res.data.resultCode == 201) { if (res.data.resultCode == 200 || res.data.resultCode == 201) {
_this.$message({ _this.$message({
type: "success", type: "success",
message: '新建成功！' message: '操作成功！'
}); });
//跳回用户列表 //跳回用户列表
_this.onSearch(); _this.onSearch();
...@@ -402,50 +443,18 @@ export default { ...@@ -402,50 +443,18 @@ export default {
}); });
} }
); );
} // _this.$refs.classForm.validate(valid => {
}); // if (valid) {
},
// 请填写驳回原因关闭
close() {
this.FormVisible1 = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
// this.FormVisible = false;
// this.$refs["editform"].resetFields();
},
// 新增关闭
close1() {
this.FormVisible1 = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
},
// 通过
adopt(row){
this.$message({type: 'success', message: '审核通过!'});
},
// 请填写驳回原因弹框
reject(row) {
this.type = false
$('.el-dialog__title').html('请填写驳回原因');
let _this=this;
//成功之后清除数据
// for (let key in this.editform) {
// _this.editform[key]=null;
// } // }
// _this.editform= Object.assign({}, row); // });
_this.FormVisible1 = true;
// this.getAssetTypeInfo(row.id)
}, },
// 获取视频分类详情 // 获取视频分类详情
getAssetTypeInfo(id){ getAssetTypeInfo(id){
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/get/" + id, url: "videoContentCat/get/" + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, },
...@@ -461,7 +470,7 @@ export default { ...@@ -461,7 +470,7 @@ export default {
}); });
}, },
openDetails(row) { openDetails(row) {
this.$router.push({ path: "checkLearnDetails", query: { id: row.id } }) this.$router.push({ path: "checkLearnDetails", query: { id: row.refItemId } })
// let _this = this; // let _this = this;
// _this.FormVisible = true; // _this.FormVisible = true;
// $('.el-dialog__title').html('请填写驳回原因'); // $('.el-dialog__title').html('请填写驳回原因');
...@@ -479,7 +488,7 @@ export default { ...@@ -479,7 +488,7 @@ export default {
.then(() => { .then(() => {
_this.$https({ _this.$https({
method: 'delete', method: 'delete',
url: 'assetType/delete/'+ row.id, url: 'videoContentCat/delete/'+ row.id,
authType: this.backToken authType: this.backToken
}).then((res) => { }).then((res) => {
this.$message({type: 'success', message: '删除成功!'}); this.$message({type: 'success', message: '删除成功!'});
......
src/page/check/video/index.vue
View file @ bdaa5854
...@@ -10,6 +10,14 @@ ...@@ -10,6 +10,14 @@
@keyup.enter.native="Search" @keyup.enter.native="Search"
clearable clearable
></el-input> ></el-input>
</el-form-item>
<el-form-item >
<el-select v-model="form.status" placeholder="请选择审核状态">
<el-option label="待初审" value="TBC"></el-option>
<el-option label="已驳回" value="REFUSED"></el-option>
<el-option label="待复审" value="TBCA"></el-option>
<el-option label="通过" value="APPROVED_FINAL"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<div class="btn-group"> <div class="btn-group">
...@@ -20,7 +28,7 @@ ...@@ -20,7 +28,7 @@
</el-form> </el-form>
<div class="page-tip"> <div class="page-tip">
<span class="page-tip-title">页面说明:</span> <span class="page-tip-title">页面说明:</span>
<span class="page-tips">可查看视频待审核的所有内容，可根据审核类别进行筛选</span> <span class="page-tips">可查看学习内容待审核的所有内容，可根据审核类别进行筛选</span>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
...@@ -37,9 +45,17 @@ ...@@ -37,9 +45,17 @@
> >
<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="name"></el-table-column>
<el-table-column label="提交人" prop="copyrightOwnerName"></el-table-column> <el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column> <el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="remarks"></el-table-column> <el-table-column label="审核项" prop="operation"></el-table-column>
<el-table-column label="审核状态" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span>
<span v-else-if="scope.row.status === 'REFUSED'">已驳回</span>
<span v-else-if="scope.row.status === 'TBCA'">待复审</span>
<span v-else-if="scope.row.status === 'APPROVED_FINAL'">通过</span>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <el-button-group>
...@@ -162,6 +178,9 @@ ...@@ -162,6 +178,9 @@
</template> </template>
<script> <script>
export default { export default {
components: {
},
data() { data() {
var checkIsNull = (rule, value, callback) => { var checkIsNull = (rule, value, callback) => {
if (value) { if (value) {
...@@ -181,7 +200,8 @@ export default { ...@@ -181,7 +200,8 @@ export default {
FormVisible1: false, FormVisible1: false,
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
name: "" name: "",
type:'VIDEO_CONTENT'
}, },
editform: { editform: {
menuName: "", menuName: "",
...@@ -256,12 +276,12 @@ export default { ...@@ -256,12 +276,12 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/getPageList", url: "audit/getPageAllList",
method: "post", method: "get",
authType: this.backToken authType: this.backToken
}, },
vm.$qs.stringify(param) // vm.$qs.stringify(param)
// param param
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
...@@ -290,14 +310,16 @@ export default { ...@@ -290,14 +310,16 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name name: _this.form.name,
status:_this.form.status,
type:'VIDEO_CONTENT'
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
// 重置 // 重置
Reset(){ Reset(){
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = {} this.form = {type:"VIDEO_CONTENT"}
this.Search() this.Search()
}, },
// // 获取当前查询参数 // // 获取当前查询参数
...@@ -328,7 +350,7 @@ export default { ...@@ -328,7 +350,7 @@ export default {
if (valid) { if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/save", method: "post", authType: this.backToken }, { url: "videoContentCat/save", method: "post", authType: this.backToken },
// _this.$qs.stringify(_this.classForm) // _this.$qs.stringify(_this.classForm)
_this.classForm _this.classForm
) )
...@@ -370,7 +392,7 @@ export default { ...@@ -370,7 +392,7 @@ export default {
if (valid) { if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/update", method: "put", authType: this.backToken }, { url: "videoContentCat/update", method: "put", authType: this.backToken },
_this.$qs.stringify(_this.classForm) _this.$qs.stringify(_this.classForm)
// _this.classForm // _this.classForm
) )
...@@ -445,7 +467,7 @@ export default { ...@@ -445,7 +467,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/get/" + id, url: "videoContentCat/get/" + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, },
...@@ -478,7 +500,7 @@ export default { ...@@ -478,7 +500,7 @@ export default {
.then(() => { .then(() => {
_this.$https({ _this.$https({
method: 'delete', method: 'delete',
url: 'assetType/delete/'+ row.id, url: 'videoContentCat/delete/'+ row.id,
authType: this.backToken authType: this.backToken
}).then((res) => { }).then((res) => {
this.$message({type: 'success', message: '删除成功!'}); this.$message({type: 'success', message: '删除成功!'});
......
src/page/content/components/audioPlay.vue
View file @ bdaa5854
<template>
<el-row style="background: #000;">
<audio ref="audio" :src="music_path" loop="loop">
<!-- <source src="" type="audio/wav">-->
<!-- <source src="" type="audio/mpeg">-->
<!-- <source src="http://sc1.111ttt.cn/2018/1/03/13/396131232171.mp3" type="audio/mpeg">-->
<!-- controls class="btn-audio"-->
<!--<source :src="recordUrl" type="audio/mpeg">-->
</audio>
<button type="button" @click="reloadYP">{{buttonText}}</button>
</el-row>
</template>
<style></style>
<script>
// import fngmp3 from "@/assets/mp3/fng.mp3";
export default {
data () {
return {
msg: 'vue模板页',
buttonText:'stop',
music_path: 'http://sc1.111ttt.cn/2018/1/03/13/396131229550.mp3',
}
},
mounted: function(){
this.reloadYP();
},
methods: {
reloadYP () {
this.$refs.audio.src = 'http://sc1.111ttt.cn/2018/1/03/13/396131232171.mp3';
//this.$refs.audio.src = fngmp3;
console.log(this.music_path);
console.log('hello');
// this.music_path = 'http://sc1.111ttt.cn/2018/1/03/13/396131232171.mp3';
if (this.is_play) {
this.$refs['audio'].pause();
this.is_play = false
this.buttonText = 'stopped'
} else {
this.$refs['audio'].play();
this.is_play = true
this.buttonText = 'starting'
}
},
}
}
</script>
src/page/content/components/dialog/addCopyright.vue
View file @ bdaa5854
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
width="468px" width="468px"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="close" :before-close="close"
> >
<div class="dialog-content"> <div class="dialog-content">
<el-form <el-form
...@@ -14,11 +15,8 @@ ...@@ -14,11 +15,8 @@
ref="ruleForm" ref="ruleForm"
label-width="140px" label-width="140px"
class="party-form form-inline" class="party-form form-inline"
label-position="top"
> >
<el-form-item
label="页面说明："
class="addTipMsg"
>可新建版权方信息。“*”为必填项。预设视频分类中没有合适的选项，可点击“新建视频分类”在弹框中新建分类</el-form-item>
<el-form-item label="版权方名称" prop="name"> <el-form-item label="版权方名称" prop="name">
<el-input v-model="ruleForm.name"></el-input> <el-input v-model="ruleForm.name"></el-input>
</el-form-item> </el-form-item>
...@@ -32,10 +30,6 @@ ...@@ -32,10 +30,6 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="addTip">
<span>若没有相应的视频分类，请点击</span>
<el-button type="text" @click="addVideoClass">新建视频分类</el-button>
</el-form-item>
<el-form-item class="selectH100" label="请选择预设视频分类"> <el-form-item class="selectH100" label="请选择预设视频分类">
<el-select <el-select
placeholder="请选择预设视频分类" placeholder="请选择预设视频分类"
...@@ -45,7 +39,7 @@ ...@@ -45,7 +39,7 @@
@change="getSelectDep" @change="getSelectDep"
> >
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox> <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
...@@ -64,17 +58,18 @@ ...@@ -64,17 +58,18 @@
export default { export default {
data() { data() {
return { return {
dialogVisible:true,
ruleForm: { ruleForm: {
assetTypeIdList: [], assetTypeIdList: [],
name: "", name: "",
ownerType: "ASSET" ownerType: "VIDEO_CONTENT"
}, },
ruleForm: { ruleForm: {
assetTypeIdList: [], assetTypeIdList: [],
name: "", name: "",
ownerType: "ASSET" ownerType: "VIDEO_CONTENT"
}, },
assetType: [ videoContentCat: [
{ {
value: "Beijing", value: "Beijing",
label: "北京" label: "北京"
...@@ -136,7 +131,7 @@ export default { ...@@ -136,7 +131,7 @@ export default {
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "assetType/save", url: "videoContentCat/save",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
...@@ -171,13 +166,13 @@ export default { ...@@ -171,13 +166,13 @@ export default {
getAssetTypeData() { getAssetTypeData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "assetType/getList", url: "videoContentCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.assetType = data; this.videoContentCat = data;
// this.value1[0]=data.expireDateEnd // this.value1[0]=data.expireDateEnd
//this.value1[1]=data.expireDateStart //this.value1[1]=data.expireDateStart
}) })
...@@ -186,7 +181,7 @@ export default { ...@@ -186,7 +181,7 @@ export default {
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(assetTypeIdList) {
if (assetTypeIdList.length === this.assetType.length) { if (assetTypeIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -196,7 +191,7 @@ export default { ...@@ -196,7 +191,7 @@ export default {
// debugger // debugger
this.ruleForm.assetTypeIdList = []; this.ruleForm.assetTypeIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.assetType.map(item => { this.videoContentCat.map(item => {
this.ruleForm.assetTypeIdList.push(item.id); this.ruleForm.assetTypeIdList.push(item.id);
}); });
} else { } else {
......
src/page/content/components/dialog/videoDialog.vue 0 → 100644
View file @ bdaa5854
<template>
<!--新增弹框-->
<el-dialog
custom-class="party-dialog"
title="视频详情"
width="80%"
:visible.sync="dialogVisible"
:before-close="close"
>
<div>
<!--
<video :src="videoSrc" :poster="videoImg" :autoplay="playStatus" height="421" width="700" :muted="muteStatus">
your browser does not support the video tag
</video>
<button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
<!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<video :preload="preload"
:poster="videoImg" :height="height" :width="width" align="center" :controls="controls" :autoplay="autoplay">
<source :src="videoSrc" type="video/mp4">
</video>
</div>
<!-- <div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="close">关闭</el-button>
</div> -->
</el-dialog>
</template>
<script>
export default {
data() {
return {
dialogVisible:true,
videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
playStatus: '',
muteStatus: '',
isMute: true,
isPlay: false,
width: '820', // 设置视频播放器的显示宽度（以像素为单位）
height: '500', // 设置视频播放器的显示高度（以像素为单位）
preload: 'auto', // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: ''
}
},
methods: {
// 新增关闭
close() {
this.dialogVisible = false;
},
}
};
</script>
<style>
</style>
\ No newline at end of file
src/page/content/components/mulClassify/mulDisplay.vue
View file @ bdaa5854
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
@change="getSelectDep" @change="getSelectDep"
> >
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox> <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</template> </template>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
export default { export default {
data() { data() {
return { return {
assetType: [], videoContentCat: [],
assetTypeIdList: [], assetTypeIdList: [],
checkedThing: false, checkedThing: false,
selfstyle: { selfstyle: {
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
} }
}, },
methods: { methods: {
// this.$refs.mulDisplay.assetType // 使用时父组件直接获取此值即可 // this.$refs.mulDisplay.videoContentCat // 使用时父组件直接获取此值即可
// 获取视频版权方 // 获取视频版权方
getAssetTypeData() { getAssetTypeData() {
let vm = this; let vm = this;
...@@ -42,11 +42,11 @@ export default { ...@@ -42,11 +42,11 @@ export default {
authType: this.backToken authType: this.backToken
}, },
// _this.$qs.stringify(_this.permisform) // _this.$qs.stringify(_this.permisform)
{copyrightOwnerType:'ASSET'} {copyrightOwnerType:'VIDEO_CONTENT'}
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.assetType = data; this.videoContentCat = data;
// this.value1[0]=data.expireDateEnd // this.value1[0]=data.expireDateEnd
//this.value1[1]=data.expireDateStart //this.value1[1]=data.expireDateStart
}) })
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(assetTypeIdList) {
if (assetTypeIdList.length === this.assetType.length) { if (assetTypeIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
// debugger // debugger
this.assetTypeIdList = []; this.assetTypeIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.assetType.map(item => { this.videoContentCat.map(item => {
this.assetTypeIdList.push(item.id); this.assetTypeIdList.push(item.id);
}); });
} else { } else {
......
src/page/content/components/mulClassify/mulVideo.vue
View file @ bdaa5854
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
@change="getSelectDep" @change="getSelectDep"
> >
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox> <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option v-for="item in assetType" :label="item.name" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in videoContentCat" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</template> </template>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
export default { export default {
data() { data() {
return { return {
assetType: [], videoContentCat: [],
assetTypeIdList: [], assetTypeIdList: [],
checkedThing: false, checkedThing: false,
selfstyle: { selfstyle: {
...@@ -26,18 +26,18 @@ export default { ...@@ -26,18 +26,18 @@ export default {
}; };
}, },
methods: { methods: {
// this.$refs.mulDisplay.assetType // 使用时父组件直接获取此值即可 // this.$refs.mulDisplay.videoContentCat // 使用时父组件直接获取此值即可
// 获取视频分类列表 // 获取视频分类列表
getAssetTypeData() { getAssetTypeData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "assetType/getList", url: "videoContentCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.assetType = data; this.videoContentCat = data;
// this.value1[0]=data.expireDateEnd // this.value1[0]=data.expireDateEnd
//this.value1[1]=data.expireDateStart //this.value1[1]=data.expireDateStart
}) })
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(assetTypeIdList) {
if (assetTypeIdList.length === this.assetType.length) { if (assetTypeIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -57,7 +57,7 @@ export default { ...@@ -57,7 +57,7 @@ export default {
// debugger // debugger
this.assetTypeIdList = []; this.assetTypeIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.assetType.map(item => { this.videoContentCat.map(item => {
this.assetTypeIdList.push(item.id); this.assetTypeIdList.push(item.id);
}); });
} else { } else {
......
src/page/content/components/uploadVue/uploadFile.vue
View file @ bdaa5854
...@@ -23,10 +23,12 @@ ...@@ -23,10 +23,12 @@
}, },
methods: { methods: {
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log(res) const data = res.data.fileList
console.log(res.url) let newArray = data.map((item) => {
this.$emit('videoList', res.urlList) return item.id;
})
this.$emit('videoList', newArray)
// console.log(newArray,'----idArray')
}, },
submitUpload() { submitUpload() {
this.$refs.upload.submit(); this.$refs.upload.submit();
......
src/page/content/components/uploadVue/uploadImg.vue
View file @ bdaa5854
...@@ -32,9 +32,11 @@ export default { ...@@ -32,9 +32,11 @@ export default {
methods: { methods: {
// 图片上传成功的返回值 // 图片上传成功的返回值
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log(res) console.log(res)
console.log(res.url) console.log(res.data.url)
this.$emit('imgUrl', res.url) this.$emit('imgUrl', res.data.url)
// console.log(data.fileList[0].url)
// this.imageUrl = URL.createObjectURL(file.raw); // this.imageUrl = URL.createObjectURL(file.raw);
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
......
src/page/content/components/uploadVue/uploadQrcode.vue
View file @ bdaa5854
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log(res) console.log(res)
console.log(res.url) console.log(res.url)
this.$emit('qrcodeUrl', res.url) this.$emit('qrcodeUrl', res.data.url)
// this.imageUrl = URL.createObjectURL(file.raw); // this.imageUrl = URL.createObjectURL(file.raw);
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
......
src/page/content/display/content/add-.vue
View file @ bdaa5854
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "asset/dddddgetPageList", url: "videoContent/dddddgetPageList",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
......
src/page/content/display/content/add.vue
View file @ bdaa5854
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
@change="getAssetType" @change="getAssetType"
> >
<el-option <el-option
v-for="item in assetType" v-for="item in videoContentCat"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
assetTypeId: "", assetTypeId: "",
videoUrlList: [] videoUrlList: []
}, },
assetType: [ videoContentCat: [
{ {
value: "Beijing", value: "Beijing",
label: "北京" label: "北京"
...@@ -314,7 +314,7 @@ export default { ...@@ -314,7 +314,7 @@ export default {
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "assetType/save", url: "videoContentCat/save",
method: "post", method: "post",
// headers: { // headers: {
// 'Content-Type': 'application/json' // 'Content-Type': 'application/json'
...@@ -406,7 +406,7 @@ export default { ...@@ -406,7 +406,7 @@ export default {
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, },
{ copyrightOwnerType: "ASSET" } { copyrightOwnerType: "VIDEO_CONTENT" }
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
...@@ -456,13 +456,13 @@ export default { ...@@ -456,13 +456,13 @@ export default {
getAssetTypeData() { getAssetTypeData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "assetType/getList", url: "videoContentCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.assetType = data; this.videoContentCat = data;
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
...@@ -472,7 +472,7 @@ export default { ...@@ -472,7 +472,7 @@ export default {
getVideoData() { getVideoData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "asset/getList", url: "videoContent/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) })
......
src/page/content/display/content/index.vue
View file @ bdaa5854
...@@ -53,7 +53,14 @@ ...@@ -53,7 +53,14 @@
<el-table-column label="关联视频名称" prop="createTime"></el-table-column> <el-table-column label="关联视频名称" prop="createTime"></el-table-column>
<el-table-column label="视频版权方" prop="expireDateEnd"></el-table-column> <el-table-column label="视频版权方" prop="expireDateEnd"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column> <el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus"></el-table-column> <el-table-column label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<span v-if="scope.row.auditStatus === 'TBC'">待初审</span>
<span v-else-if="scope.row.auditStatus === 'REFUSED'">已驳回</span>
<span v-else-if="scope.row.auditStatus === 'TBCA'">待复审</span>
<span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
</template>
</el-table-column>
<el-table-column label="是否上架" prop="createTime"></el-table-column> <el-table-column label="是否上架" prop="createTime"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="360"> <template slot-scope="scope" width="360">
...@@ -65,8 +72,8 @@ ...@@ -65,8 +72,8 @@
@click="openEdit(scope.row)" @click="openEdit(scope.row)"
>编辑&nbsp;&nbsp;</el-button> >编辑&nbsp;&nbsp;</el-button>
<el-button type="text" size="mini" @click="displayInfo(scope.row)">展板详情</el-button> <el-button type="text" size="mini" @click="displayInfo(scope.row)">展板详情</el-button>
<el-button type="text" size="mini" @click="handleDelete(scope.row)">下架&nbsp;&nbsp;</el-button> <el-button type="text" size="mini" @click="handlePublish(scope.row ,'False')">下架&nbsp;&nbsp;</el-button>
<el-button type="text" size="mini" @click="handleDelete(scope.row)">上架&nbsp;&nbsp;</el-button> <el-button type="text" size="mini" @click="handlePublish(scope.row,'True')">上架&nbsp;&nbsp;</el-button>
<el-button type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button> <el-button type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button>
</el-button-group> </el-button-group>
</template> </template>
...@@ -350,6 +357,30 @@ export default { ...@@ -350,6 +357,30 @@ export default {
}) })
.catch(() => {}); .catch(() => {});
}, },
// 上下架
handlePublish(row ,isPublish) {
let _this = this;
_this
.$https({
method: "put",
url: "exhibitionBoard/publish/" + row.id,
authType: this.backToken
},
_this.$qs.stringify({isPublish:isPublish}))
.then(
res => {
// this.$message({ type: "success", message: "删除成功!" });
alert("已提交审核！")
_this.Search();
},
error => {
this.$message({
type: "fail",
message: "失败!" + error.response.data
});
}
);
},
// 保存编辑信息 // 保存编辑信息
submitForm() { submitForm() {
let _this = this; let _this = this;
......
src/page/content/learn/content/add.vue
View file @ bdaa5854
<template> <template>
<div class="info"> <div class="info">
<!-- <audio-play></audio-play> -->
<video-dialog></video-dialog>
<div class="info-header">新建学习内容</div> <div class="info-header">新建学习内容</div>
<div class="info-container"> <div class="info-container">
<div class="info-wrapper"> <div class="info-wrapper">
...@@ -51,7 +53,7 @@ ...@@ -51,7 +53,7 @@
> >
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox> <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option <el-option
v-for="item in assetType" v-for="item in videoContentCat"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
...@@ -91,24 +93,65 @@ ...@@ -91,24 +93,65 @@
<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 show-overflow-tooltip label="版权方名称" prop="name"></el-table-column> <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="展板类别" prop="name"></el-table-column> <el-table-column show-overflow-tooltip label="展板类别" prop="assetCopyrightOwnerName"></el-table-column>
<el-table-column show-overflow-tooltip label="展板版权方" prop="name"></el-table-column> <el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
style="padding:0" style="padding:0"
@click="moveUpward(scope.row, scope.$index)" @click="videoPreview(scope.row)"
>视频预览</el-button> >视频预览</el-button>
<el-button <el-button
type="text" type="text"
style="padding:0" style="padding:0"
@click="moveDown(scope.row, scope.$index)" @click="displayPreview(scope.row)"
>展板预览</el-button> >展板预览</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!--新增弹框-->
<el-dialog
custom-class="party-dialog"
title="展板预览区"
width="468px"
:visible.sync="dialogVisible"
:before-close="closeDialog"
>
<div class="dialog-content">
<el-form
:model="classForm"
ref="classForm"
label-width="80px"
label-position="top"
:rules="rules"
id="ruleo"
class="party-form"
>
<el-form-item label="展板名称">
<el-input v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="版权方">
<el-input v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="展板分类">
<el-input v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="展板宣传图">
<img class="imgSize" :src="classForm.cover" alt="">
</el-form-item>
<el-form-item label="简介">
<el-input type="textarea" v-model="classForm.remarks"></el-input>
</el-form-item>
</el-form>
</div>
<!-- <div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="save('classForm')">确定</el-button>
<el-button size="mini" @click="close">取 消</el-button>
</div> -->
</el-dialog>
</div> </div>
</div> </div>
<div class="info-footer"> <div class="info-footer">
...@@ -124,15 +167,21 @@ ...@@ -124,15 +167,21 @@
<script> <script>
import uploadImg from '@/page/content/components/uploadVue/uploadImg' import uploadImg from '@/page/content/components/uploadVue/uploadImg'
import videoDialog from '@/page/content/components/dialog/videoDialog'
import audioPlay from '@/page/content/components/audioPlay'
export default { export default {
components:{ components:{
uploadImg uploadImg,
videoDialog,
audioPlay
}, },
data() { data() {
return { return {
dialogVisible: false,
classForm: {},
type: this.$route.query.type, type: this.$route.query.type,
learningProjectIdList:'', learningProjectIdList:'',
assetType: [], videoContentCat: [],
assetType2:[], assetType2:[],
checkedThing: false, checkedThing: false,
checkedThing2:false, checkedThing2:false,
...@@ -175,13 +224,26 @@ export default { ...@@ -175,13 +224,26 @@ export default {
this.init() this.init()
}, },
methods: { methods: {
// 视频预览
videoPreview(){
alert("视频")
},
// 展板预览
displayPreview(row) {
this.dialogVisible = true;
this.classForm =row
},
// 关闭弹窗
closeDialog(){
this.dialogVisible = false;
},
init() { init() {
if (this.$route.query.type === "Update") { if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id); this.getInfo(this.$route.query.id);
this.getLearnProject() this.getLearnProject()
this.getAssetTypeData() this.getAssetTypeData()
this.getAssetTypeData2() this.getAssetTypeData2()
this.getLearnContentBoard() // this.getLearnContentBoard()
} }
}, },
// 获取版权方详情 // 获取版权方详情
...@@ -199,22 +261,18 @@ export default { ...@@ -199,22 +261,18 @@ export default {
let data = res.data.data; let data = res.data.data;
this.ruleForm = data; this.ruleForm = data;
console.log(this.ruleForm) console.log(this.ruleForm)
// this.ruleForm = { this.ruleForm = {
// assetCopyrightOwnerId :data.assetCopyrightOwnerId, name :data.name,
// assetId:data.assetId, applicableScope:data.applicableScope,
// assetTypeId:data.assetTypeId, copyrightOwnerIdList:data.copyrightOwnerIdList,
// boardCopyrightOwnerId:data.boardCopyrightOwnerId, cover:data.cover,
// cover:data.cover, learningProjectId:data.learningProjectId,
// exhibitionBoardCatId:data.exhibitionBoardCatId, exhibitionBoardCatIdList:data.exhibitionBoardCatIdList,
// guideAudioUrl:data.guideAudioUrl, id:data.id,
// id:data.id, exhibitionBoardIdList:data.exhibitionBoardIdList,
// name:data.name, }
// qrcodeUrl:data.qrcodeUrl, this.tableData = data.exhibitionBoardList
// refMaterialUrl:data.refMaterialUrl, this.multipleSelection = data.exhibitionBoardList
// remarks:data.remarks,
// audioUrlList:data.audioUrlList,
// materialUrlList:data.materialUrlList
// }
}) })
.catch(function(err) { .catch(function(err) {
...@@ -233,8 +291,9 @@ export default { ...@@ -233,8 +291,9 @@ export default {
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.tableData = data console.log(data)
this.multipleSelection = data // this.tableData = data
// this.multipleSelection = data
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
...@@ -325,7 +384,7 @@ export default { ...@@ -325,7 +384,7 @@ export default {
this.ruleForm.cover = url this.ruleForm.cover = url
}, },
getSelectDep(exhibitionBoardCatIdList) { getSelectDep(exhibitionBoardCatIdList) {
if (exhibitionBoardCatIdList.length === this.assetType.length) { if (exhibitionBoardCatIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -374,7 +433,7 @@ export default { ...@@ -374,7 +433,7 @@ export default {
// debugger // debugger
this.ruleForm.exhibitionBoardCatIdList = []; this.ruleForm.exhibitionBoardCatIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.assetType.map(item => { this.videoContentCat.map(item => {
this.ruleForm.exhibitionBoardCatIdList.push(item.id); this.ruleForm.exhibitionBoardCatIdList.push(item.id);
}); });
} else { } else {
...@@ -402,7 +461,7 @@ export default { ...@@ -402,7 +461,7 @@ export default {
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.assetType = data; this.videoContentCat = data;
// this.value1[0]=data.expireDateEnd // this.value1[0]=data.expireDateEnd
//this.value1[1]=data.expireDateStart //this.value1[1]=data.expireDateStart
}) })
......
src/page/content/learn/content/details.vue
View file @ bdaa5854
...@@ -8,21 +8,30 @@ ...@@ -8,21 +8,30 @@
<el-form <el-form
class="demo-form-inline" class="demo-form-inline"
:inline="true" :inline="true"
:model="formInline" :model="checkForm"
label-position="top" label-position="top"
> >
<el-form-item label="审核层级" class="w100"> <el-form-item label="审核层级" class="w100">
<span class="w50 l-float"> <span class="w50 l-float">
<strong>初审</strong> 2021/02/02 <strong>初审</strong> {{checkForm.firstTime}}
</span> </span>
<span class="w50"> <span class="w50">
<strong>复审</strong> 2021/02/23 <strong>复审</strong> {{checkForm.secondTime}}
</span> </span>
</el-form-item> </el-form-item>
<el-form-item label="审核结果" class="w50">驳回</el-form-item> <el-form-item label="审核结果" class="w50">
<span v-if="checkForm.status === 'TBC'">待初审</span>
<span v-else-if="checkForm.status === 'TBCA'">待复审</span>
<span v-else-if="checkForm.status === 'REFUSED'">驳回</span>
<span v-else-if="checkForm.status === 'APPROVED_FINAL'">通过</span>
</el-form-item>
<el-form-item <el-form-item
label="驳回原因" label="驳回原因"
>各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给</el-form-item> class="w100"
>
{{checkForm.firstRemarks}}
{{checkForm.secondRemarks}}
</el-form-item>
</el-form> </el-form>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="学习内容" name="2"> <el-collapse-item title="学习内容" name="2">
...@@ -32,14 +41,14 @@ ...@@ -32,14 +41,14 @@
:model="formInline" :model="formInline"
label-position="top" label-position="top"
> >
<el-form-item label="学习内容名称" class="w50">xxxxxxx</el-form-item> <el-form-item label="学习内容名称" class="w50">{{ruleForm.name}}</el-form-item>
<el-form-item label="学习内容宣传图" class="w50"> <el-form-item label="学习内容宣传图" class="w50">
<img class="imgSize" src alt /> <img class="imgSize" :src="ruleForm.cover" alt />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-collapse-item> </el-collapse-item>
<el-collapse-item title="展板列表" name="3"> <el-collapse-item title="展板列表" name="3">
{{tableData}} <!-- {{tableData}} -->
<div class="party-table"> <div class="party-table">
<el-table <el-table
border border
...@@ -85,6 +94,15 @@ ...@@ -85,6 +94,15 @@
export default { export default {
data() { data() {
return { return {
checkForm:{
firstTime:"",
secondTime:"",
status:"",
},
ruleForm:{
},
tableData: [ tableData: [
{ {
id: "1", id: "1",
...@@ -99,14 +117,100 @@ export default { ...@@ -99,14 +117,100 @@ export default {
name: "3" name: "3"
} }
], ],
activeNames: ["1"], activeNames: ["1","2","3"],
formInline: { formInline: {
user: "", user: "",
region: "" region: ""
} }
}; };
}, },
mounted(){
this.init()
},
methods: { methods: {
init() {
this.getInfo(this.$route.query.id);
// this.getLearnContentBoard()
this.getCheckInfo(this.$route.query.id)
},
// 获取审核详情
getCheckInfo(id) {
let vm = this;
vm.$https(
{
url: "audit/getById",
method: "get",
authType: this.backToken
},
{id:id,
type:"LEARNING_CONTENT"}
// this.$qs.stringify({
// id:id,
// type:"LEARNING_CONTENT"
// })
)
.then(res => {
let data = res.data.data;
this.checkForm = data;
})
.catch(function(err) {
console.log(err);
});
},
// 获取学习内容详情
getInfo(id) {
let vm = this;
vm.$https(
{
url: "learningContent/get/" + id,
method: "get",
authType: this.backToken
}
// param
)
.then(res => {
let data = res.data.data;
this.ruleForm = data;
console.log(this.ruleForm)
// this.ruleForm = {
// name :data.name,
// applicableScope:data.applicableScope,
// copyrightOwnerIdList:data.copyrightOwnerIdList,
// cover:data.cover,
// learningProjectId:data.learningProjectId,
// exhibitionBoardCatIdList:data.exhibitionBoardCatIdList,
// id:data.id,
// exhibitionBoardIdList:data.exhibitionBoardIdList,
// }
this.tableData = data.exhibitionBoardList
// this.multipleSelection = data.exhibitionBoardList
})
.catch(function(err) {
console.log(err);
});
},
// 获取获取学习内容展板全部列表
getLearnContentBoard(){
let vm = this;
vm.$https({
url: "learningContentBoard/getList",
method: "get",
authType: this.backToken
},
{learningContentId:this.$route.query.id}
)
.then(res => {
let data = res.data.data;
console.log(data)
this.tableData = data
// this.multipleSelection = data
})
.catch(function(err) {
console.log(err);
});
},
close() { close() {
history.go(-1); history.go(-1);
}, },
......
src/page/content/learn/content/index.vue
View file @ bdaa5854
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
<div class="table-content"> <div class="table-content">
<div class="btn-group"> <div class="btn-group">
<el-button type="primary" @click="addPermis()">新建学习内容</el-button> <el-button type="primary" @click="addPermis()">新建学习内容</el-button>
<el-button type="primary" @click="learnDetails()">学习内容详情界面</el-button>
</div> </div>
<div class="party-table"> <div class="party-table">
<el-table <el-table
...@@ -51,17 +50,35 @@ ...@@ -51,17 +50,35 @@
<el-table-column label="创建时间" prop="createTime"></el-table-column> <el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column> <el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column> <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" width="240" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" >
<el-button-group> <div class="table-btn-group">
<el-button <el-tooltip content="修改" placement="top">
title="编辑" <el-button circle @click="openEdit(scope.row)">
size="mini" <i class="icon-table icon-edit"></i>
type="text" </el-button>
@click="openEdit(scope.row)" </el-tooltip>
>编辑&nbsp;&nbsp;</el-button> <el-tooltip content="详情" placement="top">
<el-button title="删除" type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button> <el-button circle @click="learnDetails(scope.row)">
</el-button-group> <i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip>
<el-tooltip content="启用" placement="top">
<el-button circle @click="handlePublish(scope.row,'True')">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="禁用" placement="top">
<el-button circle @click="handlePublish(scope.row,'False')">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
<!-- <el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip> -->
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -170,6 +187,30 @@ export default { ...@@ -170,6 +187,30 @@ export default {
} }
); );
}, },
// 上下架
handlePublish(row ,isPublish) {
let _this = this;
_this
.$https({
method: "put",
url: "learningContent/enable/" + row.id,
authType: this.backToken
},
_this.$qs.stringify({isPublish:isPublish}))
.then(
res => {
// this.$message({ type: "success", message: "删除成功!" });
alert("已提交审核！")
_this.Search();
},
error => {
this.$message({
type: "fail",
message: "失败!" + error.response.data
});
}
);
},
// 获得数据接口 // 获得数据接口
getTableData(param) { getTableData(param) {
let vm = this; let vm = this;
...@@ -240,8 +281,8 @@ export default { ...@@ -240,8 +281,8 @@ export default {
// this.FormVisible1 = true; // this.FormVisible1 = true;
}, },
// 学习内容详情 // 学习内容详情
learnDetails(){ learnDetails(row){
this.$router.push({ path: "learnContentDetails", query: { id: "111" } }); this.$router.push({ path: "learnContentDetails", query: { id: row.id } });
}, },
// 添加权限 // 添加权限
permisSave() { permisSave() {
......
src/page/content/learn/project/index.vue
View file @ bdaa5854
...@@ -51,7 +51,19 @@ ...@@ -51,7 +51,19 @@
<el-table-column label="备注" prop="remarks"></el-table-column> <el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<el-tooltip content="修改" placement="top">
<el-button circle @click="openEdit(scope.row)">
<i class="icon-table icon-edit"></i>
</el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip>
</div>
<!-- <el-button-group>
<el-button <el-button
title="删除" title="删除"
type="text" type="text"
...@@ -64,8 +76,7 @@ ...@@ -64,8 +76,7 @@
type="text" type="text"
@click="openEdit(scope.row)" @click="openEdit(scope.row)"
>编辑&nbsp;&nbsp;</el-button> >编辑&nbsp;&nbsp;</el-button>
<!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> --> </el-button-group> -->
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/page/content/video/classify/index.vue
View file @ bdaa5854
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
<div class="party-table"> <div class="party-table">
<el-table <el-table
border border
style="width: 100%;height:100%" height="100%" style="width: 100%;height:100%"
height="100%"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -51,21 +52,18 @@ ...@@ -51,21 +52,18 @@
<el-table-column label="备注" prop="remarks"></el-table-column> <el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<el-button <el-tooltip content="修改" placement="top">
title="删除" <el-button circle @click="openEdit(scope.row)">
type="text" <i class="icon-table icon-edit"></i>
size="mini" </el-button>
@click="handleDelete(scope.row)" </el-tooltip>
>删除&nbsp;&nbsp;</el-button> <el-tooltip content="删除" placement="top">
<el-button <el-button circle @click="handleDelete(scope.row)">
title="编辑" <i class="icon-table icon-del"></i>
size="mini" </el-button>
type="text" </el-tooltip>
@click="openEdit(scope.row)" </div>
>编辑&nbsp;&nbsp;</el-button>
<!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -83,7 +81,13 @@ ...@@ -83,7 +81,13 @@
</div> </div>
</div> </div>
<!--新增弹框--> <!--新增弹框-->
<el-dialog title="新建" custom-class="party-dialog" width="468px" :visible.sync="FormVisible1" :before-close="close1"> <el-dialog
title="新建"
custom-class="party-dialog"
width="468px"
:visible.sync="FormVisible1"
:before-close="close1"
>
<div class="dialog-content"> <div class="dialog-content">
<el-form <el-form
:model="classForm" :model="classForm"
...@@ -109,16 +113,25 @@ ...@@ -109,16 +113,25 @@
</div> </div>
</el-dialog> </el-dialog>
<!--编辑--> <!--编辑-->
<el-dialog custom-class="party-dialog" title="编辑" width="468px" :visible.sync="FormVisible" :before-close="close" > <el-dialog
custom-class="party-dialog"
title="编辑"
width="468px"
:visible.sync="FormVisible"
:before-close="close"
>
<div class="dialog-content"> <div class="dialog-content">
<el-form :model="editform" disabled class="party-form" ref="editform" label-width="80px" label-position="right" :rules="rules"> <el-form
:model="editform"
disabled
class="party-form"
ref="editform"
label-width="80px"
label-position="right"
:rules="rules"
>
<el-form-item label="审核层级：" :label-width="formLabelWidth"> <el-form-item label="审核层级：" :label-width="formLabelWidth">
<el-input <el-input size="small" v-model="editform.sort" auto-complete="off" clearable></el-input>
size="small"
v-model="editform.sort"
auto-complete="off"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="审核时间：" :label-width="formLabelWidth"> <el-form-item label="审核时间：" :label-width="formLabelWidth">
<el-input <el-input
...@@ -163,7 +176,7 @@ export default { ...@@ -163,7 +176,7 @@ export default {
} }
}; };
return { return {
type:true, type: true,
value1: "", value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 }, page: { currentPage: 1, pageSize: 10, total: 0 },
tableData: [], tableData: [],
...@@ -181,9 +194,9 @@ export default { ...@@ -181,9 +194,9 @@ export default {
id: "" id: ""
}, },
classForm: { classForm: {
id:"", id: "",
name:"", name: "",
remarks:"" remarks: ""
}, },
typeList: [], typeList: [],
rules: { rules: {
...@@ -245,7 +258,7 @@ export default { ...@@ -245,7 +258,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/getPageList", url: "videoContentCat/getPageList",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
...@@ -284,10 +297,10 @@ export default { ...@@ -284,10 +297,10 @@ export default {
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
// 重置 // 重置
Reset(){ Reset() {
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = {} this.form = {};
this.Search() this.Search();
}, },
// // 获取当前查询参数 // // 获取当前查询参数
getSearchQuery() { getSearchQuery() {
...@@ -306,9 +319,9 @@ export default { ...@@ -306,9 +319,9 @@ export default {
// 添加 // 添加
addPermis() { addPermis() {
// this.$router.push({ path: "videoContentAdd", query: { type: "add" } }); // this.$router.push({ path: "videoContentAdd", query: { type: "add" } });
$('.el-dialog__title').html('新建'); $(".el-dialog__title").html("新建");
this.FormVisible1 = true; this.FormVisible1 = true;
this.type = true this.type = true;
}, },
// 新建视频分类确认保存 // 新建视频分类确认保存
permisSave() { permisSave() {
...@@ -317,7 +330,11 @@ export default { ...@@ -317,7 +330,11 @@ export default {
if (valid) { if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/save", method: "post", authType: this.backToken }, {
url: "videoContentCat/save",
method: "post",
authType: this.backToken
},
_this.$qs.stringify(_this.classForm) _this.$qs.stringify(_this.classForm)
// _this.classForm // _this.classForm
) )
...@@ -326,7 +343,7 @@ export default { ...@@ -326,7 +343,7 @@ export default {
if (res.data.resultCode == 200 || res.data.resultCode == 201) { if (res.data.resultCode == 200 || res.data.resultCode == 201) {
_this.$message({ _this.$message({
type: "success", type: "success",
message: '新建成功！' message: "新建成功！"
}); });
//跳回用户列表 //跳回用户列表
_this.onSearch(); _this.onSearch();
...@@ -359,7 +376,11 @@ export default { ...@@ -359,7 +376,11 @@ export default {
if (valid) { if (valid) {
_this _this
.$https( .$https(
{ url: "assetType/update", method: "put", authType: this.backToken }, {
url: "videoContentCat/update",
method: "put",
authType: this.backToken
},
_this.$qs.stringify(_this.classForm) _this.$qs.stringify(_this.classForm)
// _this.classForm // _this.classForm
) )
...@@ -368,7 +389,7 @@ export default { ...@@ -368,7 +389,7 @@ export default {
if (res.data.resultCode == 200 || res.data.resultCode == 201) { if (res.data.resultCode == 200 || res.data.resultCode == 201) {
_this.$message({ _this.$message({
type: "success", type: "success",
message: '修改成功！' message: "修改成功！"
}); });
//跳回用户列表 //跳回用户列表
_this.onSearch(); _this.onSearch();
...@@ -414,35 +435,34 @@ export default { ...@@ -414,35 +435,34 @@ export default {
}, },
// 编辑弹框 // 编辑弹框
openEdit(row) { openEdit(row) {
this.type = false this.type = false;
$('.el-dialog__title').html('编辑'); $(".el-dialog__title").html("编辑");
let _this=this; let _this = this;
//成功之后清除数据 //成功之后清除数据
// for (let key in this.editform) { // for (let key in this.editform) {
// _this.editform[key]=null; // _this.editform[key]=null;
// } // }
// _this.editform= Object.assign({}, row); // _this.editform= Object.assign({}, row);
_this.FormVisible1 = true; _this.FormVisible1 = true;
this.getAssetTypeInfo(row.id) this.getAssetTypeInfo(row.id);
}, },
// 获取视频分类详情 // 获取视频分类详情
getAssetTypeInfo(id){ getAssetTypeInfo(id) {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/get/" + id, url: "videoContentCat/get/" + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, }
// param // param
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
// this.classForm = data // this.classForm = data
this.classForm.id =data.id this.classForm.id = data.id;
this.classForm.name =data.name this.classForm.name = data.name;
this.classForm.remarks = data.remarks this.classForm.remarks = data.remarks;
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
...@@ -461,17 +481,24 @@ export default { ...@@ -461,17 +481,24 @@ export default {
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
_this.$https({ _this
method: 'delete', .$https({
url: 'assetType/delete/'+ row.id, method: "delete",
url: "videoContentCat/delete/" + row.id,
authType: this.backToken authType: this.backToken
}).then((res) => { })
this.$message({type: 'success', message: '删除成功!'}); .then(
res => {
this.$message({ type: "success", message: "删除成功!" });
_this.Search(); _this.Search();
}, (error) => { },
this.$message({type: 'fail', message: "删除失败!" + error.response.data}); error => {
this.$message({
type: "fail",
message: "删除失败!" + error.response.data
});
} }
) );
}) })
.catch(() => {}); .catch(() => {});
}, },
...@@ -591,6 +618,6 @@ export default { ...@@ -591,6 +618,6 @@ export default {
// @import "../../../../style/common"; // @import "../../../../style/common";
// @import "../../style/list"; // @import "../../style/list";
@import "../../../../style/dialog.less"; @import "../../../../style/dialog.less";
@import '../../../../style/table.less'; @import "../../../../style/table.less";
@import '../../../../style/pagination.less'; @import "../../../../style/pagination.less";
</style> </style>
src/page/content/video/content/add.vue
View file @ bdaa5854
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
> >
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox> <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option <el-option
v-for="item in assetType" v-for="item in videoContentCat"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
@change="getAssetType" @change="getAssetType"
> >
<el-option <el-option
v-for="item in assetType" v-for="item in videoContentCat"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
...@@ -168,7 +168,7 @@ export default { ...@@ -168,7 +168,7 @@ export default {
thumbnail:"", thumbnail:"",
videoUrlList:[] videoUrlList:[]
}, },
assetType: [ videoContentCat: [
{ {
value: "Beijing", value: "Beijing",
label: "北京" label: "北京"
...@@ -254,7 +254,7 @@ export default { ...@@ -254,7 +254,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "asset/get/" + id, url: "videoContent/get/" + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
} }
...@@ -287,7 +287,7 @@ export default { ...@@ -287,7 +287,7 @@ export default {
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "assetType/save", url: "videoContentCat/save",
method: "post", method: "post",
// headers: { // headers: {
// 'Content-Type': 'application/json' // 'Content-Type': 'application/json'
...@@ -332,7 +332,7 @@ export default { ...@@ -332,7 +332,7 @@ export default {
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "/asset/save", url: "/videoContent/save",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
...@@ -359,7 +359,7 @@ export default { ...@@ -359,7 +359,7 @@ export default {
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "asset/update", url: "videoContent/update",
method: "put", method: "put",
authType: this.backToken authType: this.backToken
}, },
...@@ -390,7 +390,7 @@ export default { ...@@ -390,7 +390,7 @@ export default {
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, },
{copyrightOwnerType:'ASSET'}) {copyrightOwnerType:'VIDEO_CONTENT'})
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.copyrightOwner = data; this.copyrightOwner = data;
...@@ -403,20 +403,20 @@ export default { ...@@ -403,20 +403,20 @@ export default {
getAssetTypeData() { getAssetTypeData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "assetType/getList", url: "videoContentCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.assetType = data; this.videoContentCat = data;
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(assetTypeIdList) {
if (assetTypeIdList.length === this.assetType.length) { if (assetTypeIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -426,7 +426,7 @@ export default { ...@@ -426,7 +426,7 @@ export default {
// debugger // debugger
this.ruleForm.assetTypeIdList = []; this.ruleForm.assetTypeIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.assetType.map(item => { this.videoContentCat.map(item => {
this.ruleForm.assetTypeIdList.push(item.id); this.ruleForm.assetTypeIdList.push(item.id);
}); });
} else { } else {
......
src/page/content/video/content/index.vue
View file @ bdaa5854
...@@ -49,7 +49,14 @@ ...@@ -49,7 +49,14 @@
<el-table-column show-overflow-tooltip label="视频名称" prop="name"></el-table-column> <el-table-column show-overflow-tooltip label="视频名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方" prop="assetCopyrightOwnerName"></el-table-column> <el-table-column show-overflow-tooltip label="版权方" prop="assetCopyrightOwnerName"></el-table-column>
<el-table-column label="视频分类" prop="assetTypeName"></el-table-column> <el-table-column label="视频分类" prop="assetTypeName"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus"></el-table-column> <el-table-column label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<span v-if="scope.row.auditStatus === 'TBC'">待初审</span>
<span v-else-if="scope.row.auditStatus === 'REFUSED'">已驳回</span>
<span v-else-if="scope.row.auditStatus === 'TBCA'">待复审</span>
<span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <el-button-group>
...@@ -289,7 +296,7 @@ export default { ...@@ -289,7 +296,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "asset/getPageList", url: "videoContent/getPageList",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
...@@ -434,7 +441,7 @@ export default { ...@@ -434,7 +441,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "asset/get/" + id, url: "videoContent/get/" + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
} }
...@@ -460,7 +467,7 @@ export default { ...@@ -460,7 +467,7 @@ export default {
_this _this
.$https({ .$https({
method: "delete", method: "delete",
url: "asset/delete/" + row.id, url: "videoContent/delete/" + row.id,
authType: this.backToken authType: this.backToken
}) })
.then( .then(
......
src/page/content/video/copyright/add.vue
View file @ bdaa5854
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
> >
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox> <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option <el-option
v-for="item in assetType" v-for="item in videoContentCat"
:label="item.name" :label="item.name"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
...@@ -113,18 +113,18 @@ export default { ...@@ -113,18 +113,18 @@ export default {
return { return {
type: this.$route.query.type, type: this.$route.query.type,
dialogVisible: false, dialogVisible: false,
classForm: {},
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
name: "" name: ""
}, },
classForm: {},
value1: [], value1: [],
ruleForm: { ruleForm: {
assetTypeIdList: [], assetTypeIdList: [],
name: "", name: "",
ownerType: "ASSET" ownerType: "VIDEO_CONTENT"
}, },
assetType: [ videoContentCat: [
{ {
value: "Beijing", value: "Beijing",
label: "北京" label: "北京"
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
// this.assetType = data // this.videoContentCat = data
this.ruleForm = data; this.ruleForm = data;
this.value1 = [data.expireDateStart, data.expireDateEnd]; this.value1 = [data.expireDateStart, data.expireDateEnd];
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "assetType/save", url: "videoContentCat/save",
method: "post", method: "post",
// headers: { // headers: {
// 'Content-Type': 'application/json' // 'Content-Type': 'application/json'
...@@ -321,13 +321,13 @@ export default { ...@@ -321,13 +321,13 @@ export default {
getAssetTypeData() { getAssetTypeData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "assetType/getList", url: "videoContentCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.assetType = data; this.videoContentCat = data;
// this.value1[0]=data.expireDateEnd // this.value1[0]=data.expireDateEnd
//this.value1[1]=data.expireDateStart //this.value1[1]=data.expireDateStart
}) })
...@@ -336,7 +336,7 @@ export default { ...@@ -336,7 +336,7 @@ export default {
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(assetTypeIdList) {
if (assetTypeIdList.length === this.assetType.length) { if (assetTypeIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -346,7 +346,7 @@ export default { ...@@ -346,7 +346,7 @@ export default {
// debugger // debugger
this.ruleForm.assetTypeIdList = []; this.ruleForm.assetTypeIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.assetType.map(item => { this.videoContentCat.map(item => {
this.ruleForm.assetTypeIdList.push(item.id); this.ruleForm.assetTypeIdList.push(item.id);
}); });
} else { } else {
......
src/page/content/video/copyright/index.vue
View file @ bdaa5854
...@@ -52,15 +52,42 @@ ...@@ -52,15 +52,42 @@
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column> <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<el-tooltip content="修改" placement="top">
<el-button circle @click="openEdit(scope.row)">
<i class="icon-table icon-edit"></i>
</el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip>
<!-- <el-tooltip content="禁用" placement="top">
<el-button <el-button
title="编辑" circle
size="mini" :disabled="scope.row.status == 2 || scope.row.statusName == '待审核' "
type="text" @click="handleOperate(scope.row,'disable')">
@click="openEdit(scope.row)" <i class="icon-table icon-disable"></i>
>编辑&nbsp;&nbsp;</el-button> </el-button>
<el-button title="删除" type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button> </el-tooltip>
</el-button-group> <el-tooltip content="激活" placement="top">
<el-button
circle
:disabled="scope.row.status == 1"
@click="handleOperate(scope.row,'enable')">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="审核详情" placement="top">
<el-button
circle
@click="handleOperate(scope.row,'examine')">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip> -->
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -100,7 +127,7 @@ export default { ...@@ -100,7 +127,7 @@ export default {
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
nameOrCode: "", nameOrCode: "",
ownerType:'ASSET' ownerType:'VIDEO_CONTENT'
}, },
editform: { editform: {
menuName: "", menuName: "",
...@@ -206,7 +233,7 @@ export default { ...@@ -206,7 +233,7 @@ export default {
// 重置 // 重置
Reset(){ Reset(){
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = { ownerType:'ASSET'} this.form = { ownerType:'VIDEO_CONTENT'}
this.Search() this.Search()
}, },
Search() { Search() {
...@@ -216,7 +243,7 @@ export default { ...@@ -216,7 +243,7 @@ export default {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
nameOrCode: _this.form.nameOrCode, nameOrCode: _this.form.nameOrCode,
ownerType:'ASSET' ownerType:'VIDEO_CONTENT'
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
......
src/page/content/video/remit/index.vue
View file @ bdaa5854
...@@ -162,7 +162,7 @@ export default { ...@@ -162,7 +162,7 @@ export default {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "assetType/getPageList", url: "videoContentCat/getPageList",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
......
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