Commit 35b05ad6 authored by xulili's avatar xulili

学习内容

parents 0bfde0c8 3ff9b9fc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!--新增弹框--> <!--新增弹框-->
<el-dialog <el-dialog
custom-class="party-dialog" custom-class="party-dialog"
title="新建视频分类" title="新建视频版权方"
width="468px" width="468px"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="close" :before-close="close"
...@@ -20,22 +20,22 @@ ...@@ -20,22 +20,22 @@
<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>
<el-form-item label="版权方有效期" required> <el-form-item label="版权方有效期" prop="value1">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="value1" v-model="ruleForm.value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="selectH100" label="请选择预设视频分类"> <el-form-item class="selectH100" label="请选择预设视频分类" prop="videoContentCatIdList">
<el-select <el-select
placeholder="请选择预设视频分类" placeholder="请选择预设视频分类"
@focus="getAssetTypeData" @focus="getAssetTypeData"
multiple multiple
v-model="ruleForm.assetTypeIdList" v-model="ruleForm.videoContentCatIdList"
@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>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</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" type="primary" @click="save('classForm')">确定</el-button> <el-button size="mini" type="primary" @click="submitForm('ruleForm')">确定</el-button>
<el-button size="mini" @click="close">取 消</el-button> <el-button size="mini" @click="close">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -58,17 +58,14 @@ ...@@ -58,17 +58,14 @@
export default { export default {
data() { data() {
return { return {
dialogVisible:true, value1:[],
dialogVisible:false,
ruleForm: { ruleForm: {
assetTypeIdList: [], videoContentCatIdList: [],
name: "",
ownerType: "VIDEO_CONTENT"
},
ruleForm: {
assetTypeIdList: [],
name: "", name: "",
ownerType: "VIDEO_CONTENT" ownerType: "VIDEO_CONTENT"
}, },
videoContentCat: [ videoContentCat: [
{ {
value: "Beijing", value: "Beijing",
...@@ -91,61 +88,76 @@ export default { ...@@ -91,61 +88,76 @@ export default {
{ required: true, message: "请输入版权方名称", trigger: "blur" } { required: true, message: "请输入版权方名称", trigger: "blur" }
// { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" } // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
], ],
date1: [ videoContentCatIdList:[
{ {required: true, message: "请选择视频分类", trigger: "change" }
type: "date",
required: true,
message: "请选择日期",
trigger: "change"
}
],
date2: [
{
type: "date",
required: true,
message: "请选择时间",
trigger: "change"
}
], ],
type: [ value1:[
{ { required: true, message: "请填写版权方有效期", trigger: "change" }
type: "array", ]
required: true,
message: "请至少选择一个活动性质",
trigger: "change"
}
],
resource: [
{ required: true, message: "请选择活动资源", trigger: "change" }
],
desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
} }
}; };
}, },
methods: { methods: {
// 弹窗保存 // 弹窗保存
save(formName) { submitForm(formName) {
this.ruleForm.expireDateEnd = this.ruleForm.value1[1];
this.ruleForm.expireDateStart = this.ruleForm.value1[0];
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
this.ruleForm.expireDateEnd = this.value1[1];
this.ruleForm.expireDateStart = this.value1[0];
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "videoContentCat/save", url: "copyrightOwner/save",
method: "post",
authType: this.backToken
},
// this.ruleForm
this.$qs.stringify(this.ruleForm)
)
.then(res => {
if(res.resultCode === "200"){
this.$message({ type: "success", message: "新增成功!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.message });
}
})
.catch(function(err) {
console.log(err);
});
} else {
console.log("error submit!!");
return false;
}
});
},
save(formName) {
const _this = this
_this.ruleForm.expireDateEnd = this.ruleForm.value1[1];
_this.ruleForm.expireDateStart = this.ruleForm.value1[0];
this.$refs[formName].validate(valid => {
if (valid) {
this.$https(
{
url: "copyrightOwner/save",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
this.classForm // this.ruleForm
_this.$qs.stringify(this.ruleForm)
) )
.then(res => { .then(res => {
this.$message({ type: "success", message: "新增分类成功!" }); if(res.data.resultCode === "200"){
this.dialogVisible = false; _this.$message({ type: "success", message: "新增成功!" });
_this.dialogVisible =false
}else{
_this.$message({ type: "error", message: res.data.message });
}
}) })
.catch(function(err) { .catch(function(err) {
this.$message({
type: "fail",
message: "新增失败!" + err.response.data.msg
});
console.log(err); console.log(err);
}); });
} else { } else {
...@@ -157,10 +169,10 @@ export default { ...@@ -157,10 +169,10 @@ export default {
// 新增关闭 // 新增关闭
close() { close() {
this.dialogVisible = false; this.dialogVisible = false;
for (let key in this.classForm) { for (let key in this.ruleForm) {
this.classForm[key] = null; this.ruleForm[key] = null;
} }
this.$refs["classForm"].resetFields(); this.$refs["ruleForm"].resetFields();
}, },
// 获取视频分类列表 // 获取视频分类列表
getAssetTypeData() { getAssetTypeData() {
...@@ -180,8 +192,8 @@ export default { ...@@ -180,8 +192,8 @@ export default {
console.log(err); console.log(err);
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(videoContentCatIdList) {
if (assetTypeIdList.length === this.videoContentCat.length) { if (videoContentCatIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -189,13 +201,13 @@ export default { ...@@ -189,13 +201,13 @@ export default {
}, },
selectAllThing() { selectAllThing() {
// debugger // debugger
this.ruleForm.assetTypeIdList = []; this.ruleForm.videoContentCatIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.videoContentCat.map(item => { this.videoContentCat.map(item => {
this.ruleForm.assetTypeIdList.push(item.id); this.ruleForm.videoContentCatIdList.push(item.id);
}); });
} else { } else {
this.ruleForm.assetTypeIdList = []; this.ruleForm.videoContentCatIdList = [];
} }
} }
} }
......
<template>
<el-dialog
custom-class="party-dialog msg-dialog noHeader"
:visible.sync="dialogVisible"
width="500px"
>
<div class="dialog-content">
<img :src="getImgUrl()" alt="">
<p>{{msgInfo.des}}</p>
</div>
<div slot="footer" class="dialog-footer btn-group">
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</div>
</el-dialog>
</template>
<script>
export default {
data(){
return{
dialogVisible:false,
}
},
props:{
msgInfo:{
type: Object,
default:()=>{
return {
type:'',
des:''
}
}
}
},
mounted(){
},
methods:{
getImgUrl(){
switch (this.msgInfo.type) {
case "wait":
return require('@/assets/wait.png')
break;
case "success":
return require('@/assets/success.png')
break;
default:
break;
}
}
}
}
</script>
<style lang="less" scoped>
.party-dialog.msg-dialog{
.dialog-content{
img{
display: block;
width: 160px;
margin: 0 auto;
}
p{
font-size: 20px;
color: @font-color;
font-weight: bold;
margin-top: 20px;
text-align: center;
}
}
}
</style>
...@@ -76,9 +76,9 @@ export default { ...@@ -76,9 +76,9 @@ export default {
this.filedata.append('file', file.file) this.filedata.append('file', file.file)
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5; const isLt5M = file.size / 1024 < 1;
if (!isLt5M) { if (!isLt5M) {
this.$message.error("上传文件大小不能超过 5MB!"); this.$message.error("上传文件大小不能超过 1GB!");
} }
return isLt5M; return isLt5M;
} }
......
...@@ -69,18 +69,16 @@ export default { ...@@ -69,18 +69,16 @@ export default {
console.log(err); console.log(err);
_this.$message.error(err.msg || err.message); _this.$message.error(err.msg || err.message);
}); });
}, },
uploadFile(file) { uploadFile(file) {
this.filedata.append('file', file.file) this.filedata.append('file', file.file)
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5; const isLt10G = file.size / 1024 < 10;
if (!isLt5M) { if (!isLt10G) {
this.$message.error("上传文件大小不能超过 5MB!"); this.$message.error("上传文件大小不能超过 10GB!");
} }
return isLt5M; return isLt10G;
} }
} }
}; };
......
...@@ -76,11 +76,11 @@ export default { ...@@ -76,11 +76,11 @@ export default {
this.filedata.append('file', file.file) this.filedata.append('file', file.file)
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5; const isLt10G = file.size / 1024 < 10;
if (!isLt5M) { if (!isLt10G) {
this.$message.error("上传文件大小不能超过 5MB!"); this.$message.error("上传文件大小不能超过 10GB!");
} }
return isLt5M; return isLt10G;
}, },
handleRequest(file) { handleRequest(file) {
// let formData = new FormData(); // let formData = new FormData();
......
...@@ -27,6 +27,7 @@ export default { ...@@ -27,6 +27,7 @@ export default {
computed: { computed: {
headers() { headers() {
// return { 'token': this.backToken } // return { 'token': this.backToken }
return {'Authorization':localStorage.getItem('backToken')}
} }
}, },
methods: { methods: {
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
ref="classForm" ref="classForm"
label-width="80px" label-width="80px"
label-position="top" label-position="top"
:rules="rules" :rules="rule"
id="ruleo" id="ruleo"
class="party-form" class="party-form"
> >
...@@ -178,6 +178,11 @@ export default { ...@@ -178,6 +178,11 @@ export default {
}, },
typeList: [], typeList: [],
rule:{
name: [
{ required: true, message: "请输入展板分类名称", trigger: "blur" }
],
},
rules: { rules: {
sort: [ sort: [
{ required: true, message: "请输入顺序值", trigger: "change" }, { required: true, message: "请输入顺序值", trigger: "change" },
......
<template> <template>
<div class="listPage H100"> <div class="listPage H100">
<msg-dialogs ref="msgDialog" :msgInfo="msgInfo" />
<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="版权方名称">
...@@ -113,10 +114,16 @@ ...@@ -113,10 +114,16 @@
></el-pagination> ></el-pagination>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
// import accountTable from "@/page/accounts/components/accountTable";
import msgDialog from "@/page/content/components/msgDialog.vue";
export default { export default {
components: {
msgDialog
},
data() { data() {
var checkIsNull = (rule, value, callback) => { var checkIsNull = (rule, value, callback) => {
if (value) { if (value) {
...@@ -128,6 +135,7 @@ export default { ...@@ -128,6 +135,7 @@ export default {
} }
}; };
return { return {
msgInfo: {},
value1: "", value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 }, page: { currentPage: 1, pageSize: 10, total: 0 },
tableData: [], tableData: [],
...@@ -173,6 +181,7 @@ export default { ...@@ -173,6 +181,7 @@ export default {
name: "" name: ""
}; };
}, },
computed: {}, computed: {},
mounted() { mounted() {
this.onSearch(); this.onSearch();
...@@ -394,7 +403,7 @@ export default { ...@@ -394,7 +403,7 @@ export default {
res => { res => {
// this.$message({ type: "success", message: "删除成功!" }); // this.$message({ type: "success", message: "删除成功!" });
// alert("已提交审核!") // alert("已提交审核!")
this.msgInfo = { _this.msgInfo = {
type: "wait", type: "wait",
des: `申请已提交,待审核…`, des: `申请已提交,待审核…`,
}; };
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
ref="classForm" ref="classForm"
label-width="80px" label-width="80px"
label-position="top" label-position="top"
:rules="rules" :rules="rule"
id="ruleo" id="ruleo"
class="party-form" class="party-form"
> >
...@@ -197,6 +197,11 @@ export default { ...@@ -197,6 +197,11 @@ export default {
ownerType:'EXHIBITION_BOARD', ownerType:'EXHIBITION_BOARD',
}, },
typeList: [], typeList: [],
rule:{
name: [
{ required: true, message: "请输入展板分类名称", trigger: "blur" }
],
},
rules: { rules: {
sort: [ sort: [
{ required: true, message: "请输入顺序值", trigger: "change" }, { required: true, message: "请输入顺序值", trigger: "change" },
......
...@@ -218,6 +218,7 @@ export default { ...@@ -218,6 +218,7 @@ export default {
console.log(val); console.log(val);
}, },
moveUpward(row, index) { moveUpward(row, index) {
this.getSort(row.id,(this.tableData[index - 1]).id)
if (index > 0) { if (index > 0) {
let upData = this.tableData[index - 1]; let upData = this.tableData[index - 1];
this.tableData.splice(index - 1, 1); this.tableData.splice(index - 1, 1);
...@@ -230,6 +231,7 @@ export default { ...@@ -230,6 +231,7 @@ export default {
} }
}, },
moveDown(row, index) { moveDown(row, index) {
this.getSort(row.id,(this.tableData[index + 1]).id)
if (index + 1 == this.tableData.length) { if (index + 1 == this.tableData.length) {
this.$message({ this.$message({
message: "已经是最后一条,下移失败", message: "已经是最后一条,下移失败",
...@@ -240,7 +242,36 @@ export default { ...@@ -240,7 +242,36 @@ export default {
this.tableData.splice(index + 1, 1); this.tableData.splice(index + 1, 1);
this.tableData.splice(index, 0, downData); this.tableData.splice(index, 0, downData);
} }
} },
// 排序接口
getSort(sourceId,targetId){
let _this = this;
_this
.$https({
method: "put",
url: "learningContentBoard/sort",
authType: this.backToken
},
_this.$qs.stringify({
sourceId:sourceId,
targetId:targetId
}))
.then(
res => {
this.$message({
type: "success",
message: "成功!"
});
_this.Search();
},
error => {
this.$message({
type: "fail",
message: "失败!" + error.response.data
});
}
);
},
} }
}; };
</script> </script>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,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">
...@@ -111,6 +111,23 @@ ...@@ -111,6 +111,23 @@
<i class="icon-table icon-disable"></i> <i class="icon-table icon-disable"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-button
type="text"
style="padding:0"
:disabled="scope.$index == 0"
@click="moveUpward(scope.row, scope.$index)"
>上移</el-button>
<el-button
type="text"
style="padding:0"
:disabled="(scope.$index + 1) == tableData.length"
@click="moveDown(scope.row, scope.$index)"
>下移</el-button>
<!-- <el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -192,6 +209,64 @@ export default { ...@@ -192,6 +209,64 @@ export default {
}, },
components: {}, components: {},
methods: { methods: {
// 上移
moveUpward(row, index) {
this.getSort(row.id,(this.tableData[index - 1]).id)
if (index > 0) {
let upData = this.tableData[index - 1];
this.tableData.splice(index - 1, 1);
this.tableData.splice(index, 0, upData);
} else {
this.$message({
message: "已经是第一条,上移失败",
type: "warning"
});
}
},
// 下移
moveDown(row, index) {
this.getSort(row.id,(this.tableData[index + 1]).id)
if (index + 1 == this.tableData.length) {
this.$message({
message: "已经是最后一条,下移失败",
type: "warning"
});
} else {
let downData = this.tableData[index + 1];
this.tableData.splice(index + 1, 1);
this.tableData.splice(index, 0, downData);
}
},
// 排序接口
getSort(sourceId,targetId){
let _this = this;
_this
.$https({
method: "put",
url: "learningContent/sort",
authType: this.backToken
},
_this.$qs.stringify({
sourceId:sourceId,
targetId:targetId
}))
.then(
res => {
this.$message({
type: "success",
message: "成功!"
});
_this.Search();
},
error => {
this.$message({
type: "fail",
message: "失败!" + error.response.data
});
}
);
},
// 渲染父级权限 // 渲染父级权限
getPermis() { getPermis() {
let vm = this; let vm = this;
......
...@@ -103,11 +103,11 @@ ...@@ -103,11 +103,11 @@
ref="classForm" ref="classForm"
label-width="80px" label-width="80px"
label-position="top" label-position="top"
:rules="rules" :rules="rule"
id="ruleo" id="ruleo"
class="party-form" class="party-form"
> >
<el-form-item label="视频分类名称" prop="name"> <el-form-item label="学习项目名称" prop="name">
<el-input v-model="classForm.name"></el-input> <el-input v-model="classForm.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
...@@ -154,6 +154,11 @@ export default { ...@@ -154,6 +154,11 @@ export default {
remarks: "", remarks: "",
}, },
typeList: [], typeList: [],
rule:{
name: [
{ required: true, message: "请输入学习项目名称", trigger: "blur" }
],
},
rules: { rules: {
name: [ name: [
{ required: true, message: "请输入学习项目名称", trigger: "blur" }, { required: true, message: "请输入学习项目名称", trigger: "blur" },
......
...@@ -201,9 +201,9 @@ export default { ...@@ -201,9 +201,9 @@ export default {
}, },
typeList: [], typeList: [],
rules: { rules: {
sort: [ name: [
{ required: true, message: "请输入顺序值", trigger: "change" }, { required: true, message: "请输入分类名称", trigger: "change" },
{ pattern: /^(\d{1,5})?$/, message: "排序值为低于5位数的纯数字" } // { pattern: /^(\d{1,5})?$/, message: "排序值为低于5位数的纯数字" }
], ],
menuName: [ menuName: [
{ required: true, message: "请输入菜单名称", trigger: "change" }, { required: true, message: "请输入菜单名称", trigger: "change" },
...@@ -302,7 +302,9 @@ export default { ...@@ -302,7 +302,9 @@ export default {
// 重置 // 重置
Reset() { Reset() {
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = {}; this.form = {};
this.value1 = []
this.Search(); this.Search();
}, },
// // 获取当前查询参数 // // 获取当前查询参数
...@@ -358,7 +360,7 @@ export default { ...@@ -358,7 +360,7 @@ export default {
} else { } else {
_this.$message({ _this.$message({
type: "error", type: "error",
message: res.data.msg message: res.data.meessage
}); });
} }
}, },
...@@ -404,7 +406,7 @@ export default { ...@@ -404,7 +406,7 @@ export default {
} else { } else {
_this.$message({ _this.$message({
type: "error", type: "error",
message: res.data.msg message: res.data.message
}); });
} }
}, },
...@@ -493,11 +495,17 @@ export default { ...@@ -493,11 +495,17 @@ export default {
.then( .then(
res => { res => {
// this.$message({ type: "success", message: "删除成功!" }); // this.$message({ type: "success", message: "删除成功!" });
this.msgInfo = { // this.msgInfo = {
type: "wait", // type: "wait",
des: `申请已提交,待审核…`, // des: `申请已提交,待审核…`,
}; // };
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "删除视频分类申请已提交,待审核!" });
_this.Search(); _this.Search();
}else{
this.$message({ type: "error", message: res.data.message });
}
}, },
error => { error => {
this.$message({ this.$message({
......
...@@ -41,7 +41,12 @@ ...@@ -41,7 +41,12 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="请选择视频版权方"> <el-form-item class="addTip">
<add-copyright ref="addCopyright"></add-copyright>
<span>若没有相应的视频版权方,请点击</span>
<el-button type="text" @click="addVideoCopyright">新建视频版权方</el-button>
</el-form-item>
<el-form-item label="请选择视频版权方" prop="videoContentCopyrightOwnerId">
<el-select <el-select
placeholder="请选择视频版权方" placeholder="请选择视频版权方"
@focus="getVideoContentCopyrightData" @focus="getVideoContentCopyrightData"
...@@ -59,7 +64,7 @@ ...@@ -59,7 +64,7 @@
<span>若没有相应的视频分类,请点击</span> <span>若没有相应的视频分类,请点击</span>
<el-button type="text" @click="addVideoClass">新建视频分类</el-button> <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
</el-form-item> </el-form-item>
<el-form-item label="请选择预设视频分类"> <el-form-item label="请选择视频分类" >
<el-select <el-select
placeholder="请选择预设视频分类" placeholder="请选择预设视频分类"
@focus="getVideoContentCatData" @focus="getVideoContentCatData"
...@@ -74,10 +79,11 @@ ...@@ -74,10 +79,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="视频缩略图"> <el-form-item label="视频缩略图" required>
<upload-img @imgUrl="imgUrl"></upload-img> <upload-img @imgUrl="imgUrl"></upload-img>
</el-form-item> </el-form-item>
<el-form-item label="上传视频"> <el-form-item label="上传视频" required>
<p style="color:red">(支持上传多个视频及视频文件夹,视频语言支持汉语、蒙语、藏语、维吾尔语、英语,视频命名规定:视频名称+语言)</p>
<upload-file @videoList="videoList"></upload-file> <upload-file @videoList="videoList"></upload-file>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -95,7 +101,7 @@ ...@@ -95,7 +101,7 @@
ref="classForm" ref="classForm"
label-width="80px" label-width="80px"
label-position="top" label-position="top"
:rules="rules" :rules="rule"
id="ruleo" id="ruleo"
class="party-form" class="party-form"
> >
...@@ -164,6 +170,7 @@ export default { ...@@ -164,6 +170,7 @@ export default {
ruleForm: { ruleForm: {
name: "", name: "",
videoContentCopyrightOwnerId:"", videoContentCopyrightOwnerId:"",
videoContentCatIdList: "",
videoContentCatId: "", videoContentCatId: "",
thumbnail:"", thumbnail:"",
videoFileIdList:[] videoFileIdList:[]
...@@ -185,39 +192,29 @@ export default { ...@@ -185,39 +192,29 @@ export default {
width: "100%", width: "100%",
paddingRight: "10px" paddingRight: "10px"
}, },
rule:{
name: [
{ required: true, message: "请输入视频分类名称", trigger: "blur" }
],
},
rules: { rules: {
name: [ name: [
{ required: true, message: "请输入版权方名称", trigger: "blur" } { required: true, message: "请输入版权方名称", trigger: "blur" }
// { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" } // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
], ],
date1: [ videoContentCopyrightOwnerId:[
{ { required: true, message: "请选择视频版权方", trigger: "change" }
type: "date",
required: true,
message: "请选择日期",
trigger: "change"
}
], ],
date2: [ videoContentCatIdList:[
{ { required: true, message: "请选择视频分类", trigger: "change" }
type: "date",
required: true,
message: "请选择时间",
trigger: "change"
}
], ],
type: [ thumbnail:[
{ { required: true, message: "请上传视频缩略图", trigger: "change" }
type: "array",
required: true,
message: "请至少选择一个活动性质",
trigger: "change"
}
], ],
resource: [ videoUrlList:[
{ required: true, message: "请选择活动资源", trigger: "change" } { required: true, message: "请上传视频", trigger: "change" }
], ],
desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
} }
}; };
}, },
...@@ -272,7 +269,10 @@ export default { ...@@ -272,7 +269,10 @@ export default {
console.log(err); console.log(err);
}); });
}, },
// 新建展板分类
addVideoCopyright(){
this.$refs.addCopyright.dialogVisible = true
},
// 新建视频分类 // 新建视频分类
addVideoClass() { addVideoClass() {
this.dialogVisible = true; this.dialogVisible = true;
...@@ -287,9 +287,6 @@ export default { ...@@ -287,9 +287,6 @@ export default {
{ {
url: "videoContentCat/save", url: "videoContentCat/save",
method: "post", method: "post",
// headers: {
// 'Content-Type': 'application/json'
// },
authType: this.backToken authType: this.backToken
}, },
this.classForm this.classForm
...@@ -328,8 +325,13 @@ export default { ...@@ -328,8 +325,13 @@ export default {
}, },
this.$qs.stringify(this.ruleForm) this.$qs.stringify(this.ruleForm)
).then(res => { ).then(res => {
this.$message({ type: "success", message: "新增成功!" }); if(res.data.resultCode === "200"){
history.go(-1); this.$message({ type: "success", message: "新增视频申请已提交,待审核!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
}).catch(function(err) { }).catch(function(err) {
console.log(err); console.log(err);
}); });
...@@ -351,7 +353,7 @@ export default { ...@@ -351,7 +353,7 @@ export default {
}, },
this.$qs.stringify(this.ruleForm) this.$qs.stringify(this.ruleForm)
).then(res => { ).then(res => {
this.$message({ type: "success", message: "修改成功!" }); this.$message({ type: "success", message: "修改视频申请已提交,待审核!" });
history.go(-1); history.go(-1);
}).catch(function(err) { }).catch(function(err) {
console.log(err); console.log(err);
......
...@@ -2,16 +2,42 @@ ...@@ -2,16 +2,42 @@
<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.name" 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-select
placeholder="请选择视频版权方"
@focus="getAssetCopyrightData"
v-model="form.videoContentCopyrightOwnerId"
>
<el-option
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"
>
<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>
...@@ -208,6 +234,8 @@ export default { ...@@ -208,6 +234,8 @@ export default {
}; };
const keyMap ={'TBC':'待初审','REFUSED':'已驳回','TBCA':'待复审','APPROVED_FINAL':'通过'} const keyMap ={'TBC':'待初审','REFUSED':'已驳回','TBCA':'待复审','APPROVED_FINAL':'通过'}
return { return {
copyrightOwner:[],
videoContentCat:[],
keyMap:keyMap, keyMap:keyMap,
value1: "", value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 }, page: { currentPage: 1, pageSize: 10, total: 0 },
...@@ -255,6 +283,39 @@ export default { ...@@ -255,6 +283,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;
...@@ -324,7 +385,9 @@ export default { ...@@ -324,7 +385,9 @@ 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,
videoContentCatId:_this.form.videoContentCatId,
videoContentCopyrightOwnerId:_this.form.videoContentCopyrightOwnerId
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
...@@ -465,12 +528,13 @@ export default { ...@@ -465,12 +528,13 @@ export default {
}) })
.then( .then(
res => { res => {
this.msgInfo = { if(res.data.resultCode === "200"){
type: "wait", this.$message({ type: "success", message: "删除视频申请已提交,待审核!" });
des: `申请已提交,待审核…`,
};
// this.$message({ type: "success", message: "删除成功!" });
_this.Search(); _this.Search();
}else{
this.$message({ type: "error", message: res.data.message });
}
}, },
error => { error => {
this.$message({ this.$message({
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
<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>
<el-form-item label="版权方有效期" required> <el-form-item label="版权方有效期" prop="value1">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="value1" v-model="ruleForm.value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
<span>若没有相应的视频分类,请点击</span> <span>若没有相应的视频分类,请点击</span>
<el-button type="text" @click="addVideoClass">新建视频分类</el-button> <el-button type="text" @click="addVideoClass">新建视频分类</el-button>
</el-form-item> </el-form-item>
<el-form-item class="selectH100" label="请选择预设视频分类"> <el-form-item class="selectH100" label="请选择视频分类" prop="videoContentCatIdList">
<el-select <el-select
placeholder="请选择预设视频分类" placeholder="请选择预设视频分类"
@focus="getAssetTypeData" @focus="getAssetTypeData"
multiple multiple
v-model="ruleForm.assetTypeIdList" v-model="ruleForm.videoContentCatIdList"
@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>
...@@ -120,7 +120,7 @@ export default { ...@@ -120,7 +120,7 @@ export default {
}, },
value1: [], value1: [],
ruleForm: { ruleForm: {
assetTypeIdList: [], videoContentCatIdList: [],
name: "", name: "",
ownerType: "VIDEO_CONTENT" ownerType: "VIDEO_CONTENT"
}, },
...@@ -146,37 +146,23 @@ export default { ...@@ -146,37 +146,23 @@ export default {
{ required: true, message: "请输入版权方名称", trigger: "blur" } { required: true, message: "请输入版权方名称", trigger: "blur" }
// { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" } // { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
], ],
date1: [ videoContentCatIdList:[
{ {required: true, message: "请选择视频分类", trigger: "change" }
type: "date",
required: true,
message: "请选择日期",
trigger: "change"
}
], ],
date2: [ value1:[
{ { required: true, message: "请填写版权方有效期", trigger: "change" }
type: "date", ]
required: true,
message: "请选择时间",
trigger: "change"
}
],
type: [
{
type: "array",
required: true,
message: "请至少选择一个活动性质",
trigger: "change"
}
],
resource: [
{ required: true, message: "请选择活动资源", trigger: "change" }
],
desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }]
} }
}; };
}, },
watch:{
// 'ruleForm.value1'(newVal ,oldVal){
// // console.log(newVal,oldVal)
// this.ruleForm.expireDateEnd = this.ruleForm.value1[1];
// this.ruleForm.expireDateStart = this.ruleForm.value1[0];
// }
},
mounted() { mounted() {
this.init(); this.init();
}, },
...@@ -197,12 +183,8 @@ export default { ...@@ -197,12 +183,8 @@ export default {
}) })
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
// this.videoContentCat = data
this.ruleForm = data; this.ruleForm = data;
this.value1 = [data.expireDateStart, data.expireDateEnd]; this.ruleForm.value1 = [data.expireDateStart, data.expireDateEnd];
// this.ruleForm.assetTypeIdList[0] = data.expireDateStart
// this.ruleForm.assetTypeIdList[1] = data.expireDateEnd
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
...@@ -213,26 +195,30 @@ export default { ...@@ -213,26 +195,30 @@ export default {
addVideoClass() { addVideoClass() {
this.dialogVisible = true; this.dialogVisible = true;
}, },
// 弹窗保存 // 新建视频分类弹窗保存
save(formName) { save(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
this.ruleForm.expireDateEnd = this.value1[1]; this.classForm.expireDateEnd = this.value1[1];
this.ruleForm.expireDateStart = this.value1[0]; this.classForm.expireDateStart = this.value1[0];
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "videoContentCat/save", url: "videoContentCat/save",
method: "post", method: "post",
// headers: {
// 'Content-Type': 'application/json'
// },
authType: this.backToken authType: this.backToken
}, },
this.classForm this.$qs.stringify(this.classForm)
// this.classForm
) )
.then(res => { .then(res => {
this.$message({ type: "success", message: "新增分类成功!" }); console.log(res)
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false; this.dialogVisible = false;
}else{
this.$message({ type: "error", message: res.data.message });
}
}) })
.catch(function(err) { .catch(function(err) {
this.$message({ this.$message({
...@@ -258,8 +244,8 @@ export default { ...@@ -258,8 +244,8 @@ export default {
// 新增 // 新增
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
this.ruleForm.expireDateEnd = this.value1[1]; this.ruleForm.expireDateEnd = this.ruleForm.value1[1];
this.ruleForm.expireDateStart = this.value1[0]; this.ruleForm.expireDateStart = this.ruleForm.value1[0];
if (valid) { if (valid) {
this.$https( this.$https(
{ {
...@@ -271,8 +257,14 @@ export default { ...@@ -271,8 +257,14 @@ export default {
this.$qs.stringify(this.ruleForm) this.$qs.stringify(this.ruleForm)
) )
.then(res => { .then(res => {
this.$message({ type: "success", message: "新增成功!" }); if(res.data.resultCode === "200"){
history.go(-1); this.$message({ type: "success", message: "新增视频版权方申请已提交,待审核!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
...@@ -287,8 +279,8 @@ export default { ...@@ -287,8 +279,8 @@ export default {
updateForm(formName) { updateForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
this.ruleForm.id = this.$route.query.id; this.ruleForm.id = this.$route.query.id;
this.ruleForm.expireDateEnd = this.value1[1]; this.ruleForm.expireDateEnd = this.ruleForm.value1[1];
this.ruleForm.expireDateStart = this.value1[0]; this.ruleForm.expireDateStart = this.ruleForm.value1[0];
if (valid) { if (valid) {
this.$https( this.$https(
...@@ -301,8 +293,12 @@ export default { ...@@ -301,8 +293,12 @@ export default {
// this.ruleForm // this.ruleForm
) )
.then(res => { .then(res => {
this.$message({ type: "success", message: "修改成功!" }); if(res.data.resultCode === "200"){
history.go(-1); this.$message({ type: "success", message: "修改视频版权方申请已提交,待审核!" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
...@@ -335,8 +331,8 @@ export default { ...@@ -335,8 +331,8 @@ export default {
console.log(err); console.log(err);
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(videoContentCatIdList) {
if (assetTypeIdList.length === this.videoContentCat.length) { if (videoContentCatIdList.length === this.videoContentCat.length) {
this.checkedThing = true; this.checkedThing = true;
} else { } else {
this.checkedThing = false; this.checkedThing = false;
...@@ -344,13 +340,13 @@ export default { ...@@ -344,13 +340,13 @@ export default {
}, },
selectAllThing() { selectAllThing() {
// debugger // debugger
this.ruleForm.assetTypeIdList = []; this.ruleForm.videoContentCatIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.videoContentCat.map(item => { this.videoContentCat.map(item => {
this.ruleForm.assetTypeIdList.push(item.id); this.ruleForm.videoContentCatIdList.push(item.id);
}); });
} else { } else {
this.ruleForm.assetTypeIdList = []; this.ruleForm.videoContentCatIdList = [];
} }
} }
} }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,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">
...@@ -214,6 +214,7 @@ export default { ...@@ -214,6 +214,7 @@ export default {
Reset() { Reset() {
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = { ownerType: "VIDEO_CONTENT" }; this.form = { ownerType: "VIDEO_CONTENT" };
this.value1 = []
this.Search(); this.Search();
}, },
Search() { Search() {
...@@ -336,12 +337,18 @@ export default { ...@@ -336,12 +337,18 @@ export default {
}) })
.then( .then(
res => { res => {
// this.$message({ type: "success", message: "删除成功!" }); if(res.data.resultCode === "200"){
this.msgInfo = { this.$message({ type: "success", message: "删除视频版权方申请已提交,待审核!" });
type: "wait",
des: `删除申请已提交,待审核…`,
};
_this.Search(); _this.Search();
}else{
this.$message({ type: "error", message: res.data.message });
}
// this.$message({ type: "success", message: "删除成功!" });
// this.msgInfo = {
// type: "wait",
// des: `删除申请已提交,待审核…`,
// };
}, },
error => { error => {
this.$message({ this.$message({
......
...@@ -393,4 +393,4 @@ export default { ...@@ -393,4 +393,4 @@ export default {
} }
} }
} }
</style> </style>
\ No newline at end of file
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