Skip to content

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

Merge branch 'master' into dev_fbl

parents af6166cc bbd8c2ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 560 additions and 1007 deletions
src/page/check/display/index.vue
View file @ 7bdf2e34
......@@ -5,12 +5,10 @@
:inline="true"
:model="form"
ref="form"
class="search-form"
onsubmit="return false;"
>
<el-form-item label="">
<el-input
size="mini"
placeholder="请输入视频名称、提交人"
v-model="form.name"
@keyup.enter.native="Search"
......@@ -28,13 +26,11 @@
<el-form-item>
<div class="btn-group">
<el-button
size="mini"
type="primary"
class="btn_form_search"
@click="Search"
>查询</el-button
>
<el-button size="mini" class="btn_form_search" @click="Reset"
<el-button @click="Reset"
>重置</el-button
>
</div>
......@@ -57,11 +53,11 @@
:data="tableData"
@selection-change="handleSelectionChange"
>
<el-table-column
type="index"
width="120"
label="序号"
></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="展板名称" prop="name"></el-table-column>
<el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column>
......@@ -183,7 +179,7 @@
<el-form
:model="editForm"
disabled
class="party-form"
class="party-form demo-form-inline"
ref="editForm"
label-width="80px"
label-position="top"
......@@ -208,6 +204,9 @@
<el-form-item label="宣传图" :label-width="formLabelWidth">
<img class="imgSize" :src="editForm.cover" alt="" />
</el-form-item>
<el-form-item label="二维码" :label-width="formLabelWidth">
<img class="imgSize" :src="editForm.qrcodeUrl" alt="" />
</el-form-item>
<el-form-item label="简介" :label-width="formLabelWidth">
<el-input type="textarea" v-model="editForm.remarks"></el-input>
</el-form-item>
......
src/page/check/learn/index.vue
View file @ 7bdf2e34
<template>
<div class="listPage H100">
<div class="search-container">
<el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
<el-form :inline="true" :model="form" ref="form" onsubmit="return false;">
<el-form-item label="">
<el-input
size="mini"
placeholder="请输入学习内容名称、提交人"
v-model="form.name"
@keyup.enter.native="Search"
......@@ -21,8 +20,8 @@
</el-form-item>
<el-form-item>
<div class="btn-group">
<el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button>
<el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
<el-button type="primary" @click="Search">查询</el-button>
<el-button @click="Reset">重置</el-button>
</div>
</el-form-item>
</el-form>
......@@ -43,7 +42,11 @@
:data="tableData"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="学习内容名称" prop="name"></el-table-column>
<el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column>
......
src/page/check/video/index.vue
View file @ 7bdf2e34
<template>
<div class="listPage H100">
<div class="search-container">
<el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
<el-form :inline="true" :model="form" ref="form" onsubmit="return false;">
<el-form-item label>
<el-input
size="mini"
placeholder="请输入视频名称、提交人"
v-model="form.name"
@keyup.enter.native="Search"
......@@ -21,8 +20,8 @@
</el-form-item>
<el-form-item>
<div class="btn-group">
<el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button>
<el-button size="mini" class="btn_form_search" @click="Reset">重置</el-button>
<el-button type="primary" @click="Search">查询</el-button>
<el-button @click="Reset">重置</el-button>
</div>
</el-form-item>
</el-form>
......@@ -41,7 +40,11 @@
:data="tableData"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="视频名称" prop="name"></el-table-column>
<el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column>
......
src/page/content/components/uploadVue/uploadAudio.vue
View file @ 7bdf2e34
......@@ -12,7 +12,7 @@
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" v-loading="loading" @click="submitUpload">上传到服务器</el-button>
</div>
</template>
......@@ -27,6 +27,7 @@ export default {
},
data() {
return {
loading:false,
filedata: [],
fileArr: [],
};
......@@ -36,6 +37,7 @@ export default {
},
methods: {
submitUpload() {
this.loading = true
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法，多个文件调用多次
let _this = this;
......@@ -51,8 +53,9 @@ export default {
.then(res => {
let resData = res.data;
console.log(res)
this.loading = false
if (resData.resultCode == "200") {
_this.$message.success('上传成功！')
const data = resData.data.fileList
let newArray = data.map((item) => item.id)
let editArray =[]
......
src/page/content/components/uploadVue/uploadDatum.vue
View file @ 7bdf2e34
......@@ -15,6 +15,7 @@
style="margin-left: 10px"
size="small"
type="success"
v-loading="loading"
@click="submitUpload"
>上传到服务器</el-button
>
......@@ -31,6 +32,7 @@ export default {
},
data() {
return {
loading:false,
filedata: [],
fileArr: [],
};
......@@ -39,6 +41,7 @@ export default {
},
methods: {
submitUpload() {
this.loading = true
this.filedata = new FormData(); // 用FormData存放上传文件
this.$refs.upload.submit(); // 会循环调用uploadFile方法，多个文件调用多次
......@@ -53,8 +56,10 @@ export default {
this.filedata
)
.then((res) => {
this.loading = false
let resData = res.data;
if (resData.resultCode == "200") {
_this.$message.success('上传成功！')
const data = resData.data.fileList;
let newArray = data.map((item) => item.id);
let editArray =[]
......
src/page/content/components/uploadVue/uploadFile.vue
View file @ 7bdf2e34
......@@ -13,7 +13,7 @@
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" v-loading="loading" @click="submitUpload">上传到服务器</el-button>
</div>
</template>
......@@ -28,6 +28,7 @@ export default {
},
data() {
return {
loading:false,
filedata:[],
fileArr: [],
fileList:[],
......@@ -36,6 +37,7 @@ export default {
},
methods: {
submitUpload() { // 导入
this.loading = true
let tempData = this.filedata
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法，多个文件调用多次
......@@ -53,17 +55,10 @@ export default {
.then(res => {
let resData = res.data;
console.log(res)
this.loading = false
if (resData.resultCode == "200") {
// console.log(resData.data.fileList)
// const data = resData.data.fileList
// console.log(data)
// let newArray = data.map((item) => {
// return item.id;
// })
// this.$emit('videoList', newArray)
_this.$message.success('上传成功！')
const data = resData.data.fileList;
let newArray = data.map((item) => item.id);
let editArray =[]
......
src/page/content/display/classify/index.vue
View file @ 7bdf2e34
......@@ -7,7 +7,7 @@
ref="form"
onsubmit="return false;"
>
<el-form-item label="分类名称">
<el-form-item >
<el-input
placeholder="请输入分类名称"
v-model="form.nameOrCode"
......@@ -15,7 +15,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="版权方有效期">
<el-form-item>
<el-date-picker
value-format="yyyy-MM-dd"
v-model="form.dateRange"
......
src/page/content/display/content/add-----.vue deleted 100644 → 0
View file @ af6166cc
<template>
<div class="addFormBox">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="140px" class="addForm" label-position="top">
<el-form-item
label="页面说明："
class="addTipMsg"
>可新建版权方信息。创建展板内容，“*”为必填项，音频资料支持汉语、蒙语、藏语、维吾尔语、英语五种言音频上传，参考资料支持多文件上传。</el-form-item>
<div class="addTitle">展板基本信息</div>
<el-form-item label="展板名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="展板版权方">
<el-select v-model="ruleForm.desc" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="展板分类">
<el-select v-model="ruleForm.desc" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="展板图片">
</el-form-item>
<el-form-item label="展板二维码">
</el-form-item>
<el-form-item label="展板介绍">
<el-input type="textarea" v-model="ruleForm.desc"></el-input>
</el-form-item>
<div class="addTitle">展板影音信息</div>
<el-form-item label="视频版权方">
<el-select v-model="ruleForm.desc" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="视频类别">
<el-select v-model="ruleForm.desc" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="视频">
<el-select v-model="ruleForm.desc" placeholder="请选择">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="导览音频">
</el-form-item>
<el-form-item label="参考资料">
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
<el-button @click="resetForm('ruleForm')">取消</el-button>
</el-form-item>
</el-form>
<!--新增弹框-->
<el-dialog
custom-class="party-dialog"
title="新建视频分类"
width="468px"
:visible.sync="dialogVisible"
:before-close="close"
>
<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="视频分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="classForm.desc"></el-input>
</el-form-item>
</el-form>
</div>
<div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="save">确定</el-button>
<el-button size="mini" @click="close">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
options: [
{
value: "选项1",
label: "黄金糕"
},
{
value: "选项2",
label: "双皮奶"
},
{
value: "选项3",
label: "蚵仔煎"
},
{
value: "选项4",
label: "龙须面"
},
{
value: "选项5",
label: "北京烤鸭"
}
],
dialogVisible: false,
formLabelWidth: "100px",
form: {
name: ""
},
classForm: {
menuName: "",
menuUrl: "",
parentId: "",
sort: ""
},
value1: "",
ruleForm: {
name: "",
region: "",
date1: "",
date2: "",
delivery: false,
type: [],
resource: "",
desc: ""
},
departments: [
{
value: "Beijing",
label: "北京"
},
{
value: "Shanghai",
label: "上海"
},
{
value: "Nanjing",
label: "南京"
},
{
value: "Chengdu",
label: "成都"
},
{
value: "Shenzhen",
label: "深圳"
},
{
value: "Guangzhou",
label: "广州"
}
],
checkedThing: false,
department: [],
selfstyle: {
textAlign: "right",
width: "100%",
paddingRight: "10px"
},
rules: {
name: [
{ required: true, message: "请输入版权方名称", trigger: "blur" },
{ min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" }
],
region: [
{ required: true, message: "请选择活动区域", trigger: "change" }
],
date1: [
{
type: "date",
required: true,
message: "请选择日期",
trigger: "change"
}
],
date2: [
{
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" }]
}
};
},
methods: {
// 新建视频分类
addVideoClass() {
this.dialogVisible = true;
},
save() {
this.dialogVisible = false;
},
// 新增关闭
close() {
this.dialogVisible = false;
for (let key in this.classForm) {
this.classForm[key] = null;
}
this.$refs["classForm"].resetFields();
},
submitForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
alert("submit!");
} else {
console.log("error submit!!");
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
history.go(-1);
},
getSelectDep(department) {
// debugger
if (department.length === this.departments.length) {
this.checkedThing = true;
} else {
this.checkedThing = false;
}
},
selectAllThing() {
// debugger
this.department = [];
if (this.checkedThing) {
this.departments.map(item => {
this.department.push(item.label);
});
} else {
this.department = [];
}
}
}
};
</script>
<style lang="less">
@import "../../style/add";
@import "../../../../style/dialog";
</style>
\ No newline at end of file
src/page/content/display/content/add-.vue deleted 100644 → 0
View file @ af6166cc
<template>
<el-form :model="dealForm" >
<el-form-item
prop="uploadFile"
label="上传文件">
<el-upload
ref="fileUpload"
:auto-upload="false"
:limit="3"
:on-change="fileOnChange"
:before-upload="fileBeforeUpload"
:before-remove="fileBeforeRemove"
size="mini"
class="upload-file"
action="/"
multiple>
<el-button
class="upload-button"
size="small"
type="primary">请选择文件</el-button>
<!--<div
slot="tip"
class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
</el-upload>
</el-form-item>
<el-form-item
prop="uploadImg"
label="上传图片">
<!--:on-remove="imgRemoveList"-->
<el-upload
ref="imgUpload"
:auto-upload="false"
:limit="3"
:on-change="imgOnChange"
:before-upload="imgBeforeUpload"
:before-remove="imgBeforeRemove"
size="mini"
class="upload-img"
action="/"
accept=".jpg,.jpeg,.png"
list-type="picture-card"
multiple>
<!--<i class="el-icon-plus"/>-->
<i class="icon-tupian"/>
<!--<div class="el-upload__text">将文件拖到此处</div>-->
<div
slot="tip"
class="el-upload__tip">只能上传jpg/png文件，大小不超过20M</div>
</el-upload>
</el-form-item>
<el-button @click="saveDealEvent">提交</el-button>
</el-form>
</template>
<script>
export default {
data() {
let validateLicense = (rule, value, callback) => {
if (!(this.imgSizeIsSatisfy.length === 0)) {
callback(new Error('上传图片大小不能超过 5MB!'));
} else {
callback();
}
};
let fileValidate = (rule, value, callback) => {
if (!(this.fileSizeIsSatisfy.length === 0)) {
callback(new Error('上传图片大小不能超过 10MB!'));
} else {
callback();
}
};
return {
dealForm: {
solutions: '111',
dealStatus: 'ww',
dealFunction: 'qq'
},
dealFormRules: {
uploadImg: [{ validator: validateLicense }],
uploadFile: [{ validator: fileValidate }]
},
uploadFile: [],
uploadImg: [],
imgSizeIsSatisfy: [],
fileSizeIsSatisfy: []
};
},
methods: {
imgBeforeUpload(file) {
this.uploadImg.push(file);
return false;
// 返回false，停止上传
},
fileBeforeUpload(file) {
this.uploadFile.push(file);
return false;
},
saveDealEvent() {
// this.$refs.dealForm.validate(valid => {
// if (valid) {
this.$confirm('确认提交吗？', '提示', {})
.then(() => {
// 创建一个formData对象
const formData = new FormData();
// 把表单双向绑定的数据添加到formData对象里面
Object.keys(this.dealForm).forEach(key => {
formData.append(key, this.dealForm[key]);
});
console.log(formData)
// 添加eventId到formData对象里面
// formData.append('eventId', this.evtId);
// 手动上传文件列表
this.$refs.fileUpload.submit();
this.$refs.imgUpload.submit();
// 把要上传的文件添加到formData对象里面
for (let i = 0; i < this.uploadFile.length; i++) {
formData.append('fileFiles', this.uploadFile[i]);
}
for (let i = 0; i < this.uploadImg.length; i++) {
formData.append('imgFiles', this.uploadImg[i]);
}
console.log(formData,'formData')
let vm = this;
vm.$https(
{
url: "videoContent/dddddgetPageList",
method: "post",
authType: this.backToken
},
// vm.$qs.stringify(this.dealForm)
vm.$qs.stringify(formData)
// param
)
.then(res => {
})
.catch(function(err) {
console.log(err);
});
// // 提交表单
// saveDealEvent(formData).then(res => {
// // 提交后置空
// this.dealForm = {};
// this.uploadFile = [];
// this.uploadImg = [];
// this.$refs['dealForm'].resetFields();
// this.$message({
// message: '提交成功',
// type: 'success'
// });
// });
})
.catch(e => {
console.log(e);
});
// }
// });
},
imgOnChange(file, fileList) {
console.log(file,'eeeee')
this.dealForm.imgFile =file
this.imgSizeIsSatisfy.push(file.name);
this.$refs.dealForm.validateField('uploadImg');
const isLt2M = file.size / 1024 / 1024 < 5;
// if (!isLt2M) {
// this.imgSizeIsSatisfy.push(file.name);
// this.$refs.dealForm.validateField('uploadImg');
// }
},
imgBeforeRemove(file) {
if (!(this.imgSizeIsSatisfy.indexOf(file.name) === -1)) {
let temp = this.imgSizeIsSatisfy.indexOf(file.name);
this.imgSizeIsSatisfy.splice(temp, 1);
this.$refs.dealForm.validateField('uploadImg');
}
},
fileOnChange(file, fileList) {
const isLt2M = file.size / 1024 / 1024 < 10;
if (!isLt2M) {
this.fileSizeIsSatisfy.push(file.name);
this.$refs.dealForm.validateField('uploadFile');
}
},
fileBeforeRemove(file) {
if (!(this.fileSizeIsSatisfy.indexOf(file.name) === -1)) {
let temp = this.fileSizeIsSatisfy.indexOf(file.name);
this.fileSizeIsSatisfy.splice(temp, 1);
this.$refs.dealForm.validateField('uploadFile');
}
}
}
}
</script>
<style>
</style>
\ No newline at end of file
src/page/content/display/content/add.vue
View file @ 7bdf2e34
......@@ -26,6 +26,8 @@
<el-select
placeholder="请选择展板版权方"
v-model="ruleForm.boardCopyrightOwnerId"
clearable
@change="clearBoardCat"
>
<el-option
v-for="item in boardCopyrightOwnerId"
......@@ -39,6 +41,8 @@
<el-select
placeholder="请选择展板分类"
v-model="ruleForm.exhibitionBoardCatId"
@focus="getExhibitionBoardCatId"
clearable
>
<el-option
v-for="item in exhibitionBoardCatId"
......@@ -73,7 +77,8 @@
<el-select
placeholder="请选择视频版权方"
v-model="ruleForm.videoContentCopyrightOwnerId"
@change="clearVideo"
@change="clearVideoCat"
clearable
>
<el-option
v-for="item in copyrightOwner"
......@@ -87,7 +92,9 @@
<el-select
placeholder="请选择视频分类"
v-model="ruleForm.videoContentCatId"
@focus="getVideoContentCatData"
@change="clearVideo"
clearable
>
<el-option
v-for="item in videoContentCat"
......@@ -102,6 +109,7 @@
@focus="getVideoData"
placeholder="请选择视频"
v-model="ruleForm.videoContentId"
clearable
>
<el-option
v-for="item in videoContentId"
......@@ -167,6 +175,7 @@ export default {
formLabelWidth: "100px",
ruleForm: {
name: "",
exhibitionBoardCatId:'',
boardCopyrightOwnerId:"",
videoContentCopyrightOwnerId: "",
videoContentCatId: "",
......@@ -209,15 +218,24 @@ export default {
},
methods: {
init() {
this.getVideoContentCatData();
// this.getVideoContentCatData();
this.getVideoContentCopyrightData();
this.getExhibitionBoardCatId();
// this.getExhibitionBoardCatId();
this.getBoardCopyrightOwnerId();
// this.getVideoData();
if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id);
}
},
// 更换展板版权方，展板分类清空
clearBoardCat(){
this.ruleForm.exhibitionBoardCatId = ''
},
// 更换视频版权方，视频分类清空
clearVideoCat(){
this.ruleForm.videoContentCatId = ''
this.ruleForm.videoContentId = ''
},
// 获取版权方详情
getInfo(id) {
let vm = this;
......@@ -351,29 +369,41 @@ export default {
},
//获取展板分类
getExhibitionBoardCatId(){
let vm = this;
vm.$https({
let vm = this;
if(this.ruleForm.boardCopyrightOwnerId){
vm.$https({
url: "exhibitionBoardCat/getList",
method: "get",
method: "post",
authType: this.backToken
}).then(res => {
this.exhibitionBoardCatId = res.data.data;
},this.$qs.stringify({copyrightOwnerId:this.ruleForm.boardCopyrightOwnerId})).then(res => {
this.exhibitionBoardCatId = res.data.data
}).catch(function(err) {
console.log(err);
});
console.log(err);
});
}else{
this.$message.warning("请先选择展板版权方！")
}
},
// 获取视频分类列表
getVideoContentCatData() {
let vm = this;
vm.$https({
if(this.ruleForm.videoContentCopyrightOwnerId){
vm.$https({
url: "videoContentCat/getList",
method: "get",
authType: this.backToken
}).then(res => {
},{copyrightOwnerId:this.ruleForm.videoContentCopyrightOwnerId}).then(res => {
this.videoContentCat = res.data.data;
}).catch(function(err) {
console.log(err);
});
}else{
this.$message.warning("请先选择视频版权方！")
}
},
// 视频版权方或视频分类发生变化时，重置视频的值
clearVideo(){
......@@ -385,7 +415,7 @@ export default {
videoContentCatId:this.ruleForm.videoContentCatId,
videoContentCopyrightOwnerId:this.ruleForm.videoContentCopyrightOwnerId
}
if((this.ruleForm.videoContentCatId.length>0)&&(this.ruleForm.videoContentCopyrightOwnerId.length>0)){
if((this.ruleForm.videoContentCatId)&&(this.ruleForm.videoContentCopyrightOwnerId)){
let vm = this;
vm.$https({
url: "videoContent/getList",
......@@ -398,6 +428,7 @@ export default {
console.log(err);
});
}else{
this.$message.warning("请先选择视频版权方和视频分类！")
this.videoContentId = []
}
......
src/page/content/display/content/details.vue
View file @ 7bdf2e34
......@@ -62,7 +62,10 @@
<el-form-item label="展板图片" class="w50">
<img class="imgSize" :src="contentData.cover" />
</el-form-item>
<el-form-item label="展板简介">{{
<el-form-item label="展板二维码" class="">
<img class="imgSize" :src="contentData.qrcodeUrl" />
</el-form-item>
<el-form-item label="展板简介" class="w100">{{
contentData.remarks
}}</el-form-item>
</el-form>
......
src/page/content/display/content/index.vue
View file @ 7bdf2e34
......@@ -3,7 +3,7 @@
<msg-dialog ref="msgDialog" :msgInfo="msgInfo" />
<div class="search-container">
<el-form :inline="true" :model="form" onsubmit="return false;">
<el-form-item label="展板名称">
<el-form-item >
<el-input
placeholder="请输入展板名称"
v-model="form.nameOrCode"
......@@ -11,7 +11,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="版权方有效期">
<el-form-item >
<el-date-picker
value-format="yyyy-MM-dd"
v-model="form.dateRange"
......@@ -21,7 +21,7 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="展板版权方">
<el-form-item >
<el-select v-model="form.boardCopyrightOwnerId" placeholder="请选择展板版权方">
<el-option
v-for="item in copyRightList"
......@@ -31,7 +31,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="展板分类">
<el-form-item >
<el-select v-model="form.exhibitionBoardCatId" placeholder="请选择展板分类">
<el-option
v-for="item in classifyList"
......@@ -179,7 +179,7 @@ export default {
vm.$https(
{
url: "exhibitionBoardCat/getList",
method: "get",
method: "post",
authType: this.backToken,
})
.then((res) => {
......
src/page/content/display/copyright/add.vue 0 → 100644
View file @ 7bdf2e34
This diff is collapsed.
src/page/content/display/copyright/index---.vue deleted 100644 → 0
View file @ af6166cc
This diff is collapsed.
src/page/content/display/copyright/index.vue
View file @ 7bdf2e34
......@@ -7,7 +7,7 @@
ref="form"
onsubmit="return false;"
>
<el-form-item label="版权方名称">
<el-form-item >
<el-input
placeholder="请输入版权方名称"
v-model="form.nameOrCode"
......@@ -15,7 +15,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="版权方有效期">
<el-form-item >
<el-date-picker
value-format="yyyy-MM-dd"
v-model="form.dateRange"
......@@ -67,7 +67,7 @@
<el-table-column label="版权方名称" prop="name"></el-table-column>
<el-table-column
label="展板分类"
prop="videoContentCatNames"
prop="boardCatNames"
></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column
......@@ -228,12 +228,13 @@ export default {
},
// 添加
addPermis() {
this.FormVisible = true;
this.type = true;
this.classForm = {
ownerType: "EXHIBITION_BOARD",
valueDate: [],
}
this.$router.push({ path: "displayCopyrightAdd", query: { type: "add" } });
// this.FormVisible = true;
// this.type = true;
// this.classForm = {
// ownerType: "EXHIBITION_BOARD",
// valueDate: [],
// }
},
// 新建视频分类确认保存
permisSave() {
......@@ -328,11 +329,15 @@ export default {
},
// 编辑弹框
openEdit(row) {
this.type = false;
this.FormVisible = true;
this.classForm = JSON.parse(JSON.stringify(row));
this.classForm.valueDate =[row.expireDateStart,row.expireDateEnd]
this.classForm = {...this.classForm}
this.$router.push({
path: "displayCopyrightUpdate",
query: { type: "Update", id: row.id }
});
// this.type = false;
// this.FormVisible = true;
// this.classForm = JSON.parse(JSON.stringify(row));
// this.classForm.valueDate =[row.expireDateStart,row.expireDateEnd]
// this.classForm = {...this.classForm}
},
// 删除
handleDelete(row) {
......
src/page/content/learn/content/add.vue
View file @ 7bdf2e34
......@@ -37,38 +37,40 @@
<el-form-item label="学习内容宣传图" prop="cover" class="w100">
<upload-img ref="uploadImg" @imgUrl="imgUrl"></upload-img>
</el-form-item>
<el-form-item class="w50" label="展板类别" prop="exhibitionBoardCatIdList">
<el-form-item label="展板版权方" class="w50" prop="copyrightOwnerIdList">
<el-select
placeholder="请选择展板类别"
placeholder="请选择版权方"
multiple
v-model="ruleForm.exhibitionBoardCatIdList"
@change="getSelectDep"
v-model="ruleForm.copyrightOwnerIdList"
@change="getSelectDep2"
>
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-checkbox :style="selfstyle" v-model="checkedThing2" @change="selectAllThing2">全选</el-checkbox>
<el-option
v-for="item in videoContentCat"
v-for="item in assetType2"
:label="item.name"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="版权方" prop="copyrightOwnerIdList">
<el-form-item label="展板类别" prop="exhibitionBoardCatIdList">
<el-select
placeholder="请选择版权方"
placeholder="请选择展板类别"
multiple
v-model="ruleForm.copyrightOwnerIdList"
@change="getSelectDep2"
v-model="ruleForm.exhibitionBoardCatIdList"
@focus="getAssetTypeData"
@change="getSelectDep"
>
<el-checkbox :style="selfstyle" v-model="checkedThing2" @change="selectAllThing2">全选</el-checkbox>
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
<el-option
v-for="item in assetType2"
v-for="item in videoContentCat"
:label="item.name"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="展板备选清单" class="w100" prop="exhibitionBoardIdList">
<div class="party-table">
<el-table
......@@ -80,7 +82,8 @@
:data="tableData"
>
<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="exhibitionBoardCatName"></el-table-column>
<el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
......@@ -284,7 +287,7 @@ export default {
},
init() {
this.getLearnProject();
this.getAssetTypeData();
// this.getAssetTypeData();
this.getAssetTypeData2();
if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id);
......@@ -347,9 +350,9 @@ export default {
let vm = this;
vm.$https({
url: "exhibitionBoardCat/getList",
method: "get",
method: "post",
authType: this.backToken
})
},{copyrightOwnerId:this.ruleForm.exhibitionBoardCatIdList.toString})
.then(res => {
let data = res.data.data;
vm.videoContentCat = data;
......@@ -499,8 +502,8 @@ export default {
// 筛选展板备选清单选项条件
getTableParam(){
const param = {
boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList,
exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList
boardCopyrightOwnerIdList: this.ruleForm.copyrightOwnerIdList.toString(),
exhibitionBoardCatIdList: this.ruleForm.exhibitionBoardCatIdList.toString()
};
if((param.boardCopyrightOwnerIdList.length>0)&&(param.exhibitionBoardCatIdList.length>0)){
this.getTableData(param);
......
src/page/content/learn/content/details.vue
View file @ 7bdf2e34
......@@ -57,7 +57,11 @@
ref="multipleTable"
:data="tableData"
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
......
src/page/content/learn/content/index.vue
View file @ 7bdf2e34
......@@ -48,11 +48,11 @@
ref="multipleTable"
:data="tableData"
>
<el-table-column
type="index"
width="120"
label="序号"
></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
label="学习内容名称"
......
src/page/content/learn/project/index.vue
View file @ 7bdf2e34
......@@ -48,11 +48,11 @@
ref="multipleTable"
:data="tableData"
>
<el-table-column
type="index"
width="120"
label="序号"
></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="学习项目名称" prop="name"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column
......
src/page/content/video/classify/index.vue
View file @ 7bdf2e34
<template>
<div class="listPage H100">
<div class="search-container">
<el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
<el-form-item label="版权方名称">
<el-form :inline="true" :model="form" ref="form" onsubmit="return false;">
<el-form-item>
<el-input
size="mini"
placeholder="请输入版权方名称"
v-model="form.name"
placeholder="请输入视频分类名称"
v-model="form.nameOrCode"
@keyup.enter.native="Search"
clearable
></el-input>
</el-form-item>
<el-form-item label="版权方有效期">
<el-form-item>
<el-date-picker
value-format="yyyy-MM-dd"
v-model="value1"
......@@ -46,7 +45,11 @@
:data="tableData"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</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="createTime"></el-table-column>
......@@ -291,7 +294,7 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
name: _this.form.name,
nameOrCode: _this.form.nameOrCode,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
};
......
src/page/content/video/content/index.vue
View file @ 7bdf2e34
......@@ -65,7 +65,11 @@
:data="tableData"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="视频名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方" prop="videoContentCopyrightOwnerName"></el-table-column>
<el-table-column label="视频分类" prop="videoContentCatName"></el-table-column>
......
src/page/content/video/copyright/add.vue
View file @ 7bdf2e34
<template>
<div class="info">
<div class="info-header">新建版权方</div>
<div class="info-header">{{ type === 'Update'?'修改':'新建'}}视频版权方</div>
<div class="info-container">
<div class="info-wrapper">
<div class="pageTips">
......
src/page/content/video/copyright/index.vue
View file @ 7bdf2e34
<template>
<div class="listPage H100">
<div class="search-container">
<el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
<el-form-item label="版权方名称">
<el-form :inline="true" :model="form" onsubmit="return false;">
<el-form-item >
<el-input
size="mini"
placeholder="请输入版权方名称"
v-model="form.nameOrCode"
@keyup.enter.native="Search"
clearable
></el-input>
</el-form-item>
<el-form-item label="版权方有效期">
<el-form-item >
<el-date-picker
value-format="yyyy-MM-dd"
v-model="value1"
......@@ -46,7 +45,11 @@
:data="tableData"
@selection-change="handleSelectionChange"
>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
......
src/page/content/video/remit/index.vue
View file @ 7bdf2e34
......@@ -66,9 +66,13 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column label="视频名称" prop="videoContentCopyrightOwnerName"></el-table-column>
<el-table-column label="版权方" prop="exhibitionBoardName"></el-table-column>
<el-table-column type="index" width="120" label="序号">
<template slot-scope="scope">
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="视频名称" prop="fileName"></el-table-column>
<el-table-column label="版权方" prop="videoContentCopyrightOwnerName"></el-table-column>
<el-table-column label="视频类别" prop="videoContentCatName"></el-table-column>
</el-table>
</div>
......
src/router/index.js
View file @ 7bdf2e34
......@@ -308,6 +308,24 @@ const router = new Router({
title: '展板版权方管理',
}
},
{
path: '/displayCopyrightAdd',
name: '新建展板版权方',
component: () => import('@/page/content/display/copyright/Add'),
meta: {
showBreadcrumb: true,
title: '新建展板版权方',
}
},
{
path: '/displayCopyrightUpdate',
name: '修改展板版权方',
component: () => import('@/page/content/display/copyright/Add'),
meta: {
showBreadcrumb: true,
title: '修改展板版权方',
}
},
{
path: '/displayClassify',
name: '展板分类管理',
......
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