Commit f6166f66 authored by xulili's avatar xulili

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

parents 9ee3e7c7 4c96e116
......@@ -37,6 +37,7 @@
<el-form-item label="展板名称" class="w50">
<span>{{ item.name }}</span>
</el-form-item>
<el-form-item label="展板简介">
<span>{{ item.remarks }}</span>
</el-form-item>
......
fefe
\ No newline at end of file
......@@ -58,32 +58,31 @@
</el-table-column>
<el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-button-group>
<!-- <el-button
title="删除"
type="text"
size="mini"
@click="handleDelete(scope.row)"
>删除&nbsp;&nbsp;</el-button>
<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>
<div class="table-btn-group">
<el-tooltip content="详情" placement="top">
<el-button circle @click="openDetails(scope.row)">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-button-group>
<!-- <el-button
title="删除"
type="text"
size="mini"
@click="handleDelete(scope.row)"
>删除&nbsp;&nbsp;</el-button> -->
<div class="table-btn-group">
<el-tooltip content="通过" placement="top">
<el-button circle @click="adopt(scope.row)">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="驳回" placement="top">
<el-button circle @click="reject(scope.row)">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
</div>
<!-- <el-button-group>
<el-button
size="mini"
type="text"
......@@ -94,7 +93,7 @@
type="text"
@click="adopt(scope.row)"
>通过&nbsp;&nbsp;</el-button>
</el-button-group>
</el-button-group> -->
</template>
</el-table-column>
</el-table>
......@@ -129,49 +128,28 @@
</el-form>
</div>
<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" v-show="!type" type="primary" @click="permisEdit">确定</el-button>
<el-button size="mini" type="primary" @click="permisSave">确定</el-button>
<el-button size="mini" @click="close1">取 消</el-button>
</div>
</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="80%" :visible.sync="FormVisible" :before-close="close" >
<div class="dialog-content">
<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-input
size="small"
v-model="editform.sort"
auto-complete="off"
clearable
></el-input>
</el-form-item>
<el-form-item label="审核时间:" :label-width="formLabelWidth">
<el-input
size="small"
v-model="editform.menuName"
auto-complete="off"
clearable
onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"
></el-input>
</el-form-item>
<el-form-item label="审核结果:" :label-width="formLabelWidth">
<el-input
size="small"
v-model="editform.menuUrl"
auto-complete="off"
clearable
onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"
></el-input>
</el-form-item>
<el-form-item label="驳回原因:" :label-width="formLabelWidth">
<el-input type="textarea" v-model="editform.desc"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="submitForm('editform')">确定</el-button>
<el-button size="mini" @click="close">取 消</el-button>
<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> -->
</div>
</el-dialog>
</div>
......@@ -192,6 +170,19 @@ export default {
}
};
return {
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: '100%', // 设置视频播放器的显示宽度(以像素为单位)
height: '100%', // 设置视频播放器的显示高度(以像素为单位)
preload: 'auto', // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件,启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: '',
//--
type:true,
value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 },
......@@ -343,16 +334,17 @@ export default {
this.FormVisible1 = true;
this.type = true
},
// 新建视频分类确认保存
permisSave() {
// 请填写驳回原因视频分类确认保存
permisEdit() {
let _this = this;
_this.$refs.classForm.validate(valid => {
if (valid) {
_this
.$https(
{ url: "videoContentCat/save", method: "post", authType: this.backToken },
// _this.$qs.stringify(_this.classForm)
_this.classForm
{ url: "videoContentCat/update", method: "put", authType: this.backToken },
_this.$qs.stringify(_this.classForm)
// _this.classForm
)
.then(
res => {
......@@ -385,23 +377,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;
_this.$refs.classForm.validate(valid => {
if (valid) {
_this
.$https(
{ url: "videoContentCat/update", method: "put", authType: this.backToken },
_this.$qs.stringify(_this.classForm)
// _this.classForm
{ url: "audit/updateAuditAllById",
headers:{'Content-Type': 'application/json'},
method: "put",
authType: this.backToken,
},
// _this.$qs.stringify(_this.classForm)
_this.classForm
)
.then(
res => {
if (res.data.resultCode == 200 || res.data.resultCode == 201) {
_this.$message({
type: "success",
message: '新建成功!'
message: '操作成功!'
});
//跳回用户列表
_this.onSearch();
......@@ -424,43 +453,11 @@ export default {
});
}
);
}
});
},
// 请填写驳回原因关闭
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.$refs.classForm.validate(valid => {
// if (valid) {
// }
// _this.editform= Object.assign({}, row);
_this.FormVisible1 = true;
// this.getAssetTypeInfo(row.id)
// });
},
// 获取视频分类详情
getAssetTypeInfo(id){
......
......@@ -30,7 +30,7 @@
export default {
data() {
return {
dialogVisible:true,
dialogVisible:false,
videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
playStatus: '',
......
<template>
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/audio/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">(支持上传多个视频及视频文件夹,视频语言支持汉语、蒙语、藏语、维吾尔语、英语,视频命名规定:视频名称+语言)</div>
</el-upload>
</template>
<script>
export default {
data() {
return {
fileList: []
};
},
methods: {
handleAvatarSuccess(res, file) {
console.log(res)
console.log(res.data.fileList)
const data = res.data.fileList
let newArray = data.map((item) => {
return item.id;
})
this.$emit('audioList', newArray)
},
submitUpload() {
this.$refs.upload.submit();
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
}
}
}
</script>
<style>
</style>
\ No newline at end of file
<template>
<div>
<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
<!-- :show-file-list="false" -->
<!-- :file-list="fileList" -->
<!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/audio/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:multiple="true"
:http-request="uploadFile"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
action
:auto-upload="false"
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">(支持上传多个视频及视频文件夹,视频语言支持汉语、蒙语、藏语、维吾尔语、英语,视频命名规定:视频名称+语言)</div>
</el-upload>
</div>
</template>
<script>
export default {
export default {
data() {
return {
fileList: []
filedata:[],
fileArr: [],
fileList:[],
// fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
};
},
methods: {
handleAvatarSuccess(res, file) {
console.log(res)
console.log(res.url)
this.$emit('audioList', res.urlList)
submitUpload() { // 导入
let tempData = this.filedata
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法,多个文件调用多次
let _this = this;
_this
.$https(
{
method: "post",
url: "file/audio/upload",
authType: this.backToken
},
submitUpload() {
this.$refs.upload.submit();
this.filedata
)
.then(res => {
let resData = res.data;
console.log(res)
if (resData.resultCode == "200") {
// alert("上传成功");
console.log(resData.data.fileList)
const data = resData.data.fileList
console.log(data)
let newArray = data.map((item) => {
return item.id;
})
this.$emit('audioList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
},
handleRemove(file, fileList) {
console.log(file, fileList);
uploadFile(file) {
this.filedata.append('file', file.file)
},
handlePreview(file) {
console.log(file);
beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5;
if (!isLt5M) {
this.$message.error("上传文件大小不能超过 5MB!");
}
return isLt5M;
}
}
};
</script>
<style>
.fileUpload {
width: 148px;
height: 148px;
line-height: 148px;
margin: 0 auto;
border: 1px dashed #c0ccda;
font-size: 24px;
font: #ccc;
}
</style>
<template>
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/datum/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">(支持上传多个视频及视频文件夹,视频语言支持汉语、蒙语、藏语、维吾尔语、英语,视频命名规定:视频名称+语言)</div>
</el-upload>
</template>
<script>
export default {
data() {
return {
fileList: []
};
},
methods: {
handleAvatarSuccess(res, file) {
console.log(res)
// console.log(res.url)
const data = res.data.fileList
let newArray = data.map((item) => {
return item.id;
})
this.$emit('datumList', newArray)
},
submitUpload() {
this.$refs.upload.submit();
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
}
}
}
</script>
<style>
</style>
\ No newline at end of file
<template>
<div>
<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
<!-- :show-file-list="false" -->
<!-- :file-list="fileList" -->
<!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/datum/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:multiple="true"
:http-request="uploadFile"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
action
:auto-upload="false"
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">(支持上传多个视频及视频文件夹,视频语言支持汉语、蒙语、藏语、维吾尔语、英语,视频命名规定:视频名称+语言)</div>
</el-upload>
</div>
</template>
<script>
export default {
export default {
data() {
return {
fileList: []
filedata:[],
fileArr: [],
fileList:[],
// fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
};
},
methods: {
handleAvatarSuccess(res, file) {
console.log(res)
console.log(res.url)
this.$emit('datumList', res.urlList)
submitUpload() { // 导入
let tempData = this.filedata
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法,多个文件调用多次
let _this = this;
_this
.$https(
{
method: "post",
url: "file/datum/upload",
authType: this.backToken
},
submitUpload() {
this.$refs.upload.submit();
this.filedata
)
.then(res => {
let resData = res.data;
console.log(res)
if (resData.resultCode == "200") {
// alert("上传成功");
console.log(resData.data.fileList)
const data = resData.data.fileList
console.log(data)
let newArray = data.map((item) => {
return item.id;
})
this.$emit('datumList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
},
handleRemove(file, fileList) {
console.log(file, fileList);
uploadFile(file) {
this.filedata.append('file', file.file)
},
handlePreview(file) {
console.log(file);
beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5;
if (!isLt5M) {
this.$message.error("上传文件大小不能超过 5MB!");
}
return isLt5M;
}
}
};
</script>
<style>
.fileUpload {
width: 148px;
height: 148px;
line-height: 148px;
margin: 0 auto;
border: 1px dashed #c0ccda;
font-size: 24px;
font: #ccc;
}
</style>
<template>
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/video/content/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">(支持上传多个视频及视频文件夹,视频语言支持汉语、蒙语、藏语、维吾尔语、英语,视频命名规定:视频名称+语言)</div>
</el-upload>
</template>
<script>
export default {
data() {
return {
fileList: []
};
},
methods: {
handleAvatarSuccess(res, file) {
const data = res.data.fileList
let newArray = data.map((item) => {
return item.id;
})
this.$emit('videoList', newArray)
// console.log(newArray,'----idArray')
},
submitUpload() {
this.$refs.upload.submit();
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
}
}
}
</script>
<style>
</style>
\ No newline at end of file
<template>
<div>
<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
<!-- :show-file-list="false" -->
<!-- :file-list="fileList" -->
<!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/video/content/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:multiple="true"
:http-request="uploadFile"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
action
:auto-upload="false"
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">(支持上传多个视频及视频文件夹,视频语言支持汉语、蒙语、藏语、维吾尔语、英语,视频命名规定:视频名称+语言)</div>
</el-upload>
</div>
</template>
<script>
export default {
export default {
data() {
return {
fileList: []
filedata:[],
fileArr: [],
fileList:[],
// fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
};
},
methods: {
handleAvatarSuccess(res, file) {
const data = res.data.fileList
submitUpload() { // 导入
let tempData = this.filedata
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法,多个文件调用多次
let _this = this;
_this
.$https(
{
method: "post",
url: "file/video/content/upload",
authType: this.backToken
},
this.filedata
)
.then(res => {
let resData = res.data;
console.log(res)
if (resData.resultCode == "200") {
// alert("上传成功");
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)
// console.log(newArray,'----idArray')
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
},
submitUpload() {
this.$refs.upload.submit();
uploadFile(file) {
this.filedata.append('file', file.file)
},
handleRemove(file, fileList) {
console.log(file, fileList);
beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5;
if (!isLt5M) {
this.$message.error("上传文件大小不能超过 5MB!");
}
return isLt5M;
},
handlePreview(file) {
console.log(file);
handleRequest(file) {
// let formData = new FormData();
// this.fileArr.push(file.file)
// console.log(this.fileArr,'文件数组')
// formData.append("file", this.fileArr);
let formData = new FormData();
if (Array.isArray(file)) {
file.forEach(item => {
formData.append("file", item.file);
});
} else {
formData.append("file", file.file);
}
let _this = this;
_this
.$https(
{
method: "post",
url: "file/video/content/upload",
authType: this.backToken
},
formData
)
.then(res => {
let resData = res.data;
if (resData.resultCode == 200) {
alert("上传成功");
// _this.getOrgTree();
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
}
}
};
</script>
<style>
.fileUpload {
width: 148px;
height: 148px;
line-height: 148px;
margin: 0 auto;
border: 1px dashed #c0ccda;
font-size: 24px;
font: #ccc;
}
</style>
......@@ -33,7 +33,8 @@ export default {
// 图片上传成功的返回值
handleAvatarSuccess(res, file) {
console.log(res)
console.log(res.url)
// console.log(res.url)
console.log(res.data.url)
this.$emit('qrcodeUrl', res.data.url)
// this.imageUrl = URL.createObjectURL(file.raw);
},
......
......@@ -13,6 +13,7 @@
</el-form-item>
<el-form-item label="版权方有效期">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="value1"
type="daterange"
range-separator="至"
......@@ -29,7 +30,7 @@
</el-form>
<div class="page-tip">
<span class="page-tip-title">页面说明:</span>
<span class="page-tips">可通过创建时间、展板分类名称模糊搜索快速筛选展板分类信息,可对展板分类信息进行修改、删除。可新建展板分类。</span>
<span class="page-tips">可通过创建时间、展板分类名称模糊搜索快速筛选展板分类信息,可对展板分类信息进行修改、删除。可新增视频分类。</span>
</div>
</div>
<div class="table-content">
......@@ -45,27 +46,24 @@
@selection-change="handleSelectionChange"
>
<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="copyrightOwnerName"></el-table-column>
<el-table-column label="展板分类名称" prop="name"></el-table-column>
<el-table-column label="版权方" prop="copyrightOwnerNames"></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="操作" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-button-group>
<el-button
title="删除"
type="text"
size="mini"
@click="handleDelete(scope.row)"
>删除&nbsp;&nbsp;</el-button>
<el-button
title="编辑"
size="mini"
type="text"
@click="openEdit(scope.row)"
>编辑&nbsp;&nbsp;</el-button>
<!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
</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>
</template>
</el-table-column>
</el-table>
......@@ -273,7 +271,9 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
nameOrCode: _this.form.nameOrCode
nameOrCode: _this.form.nameOrCode,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
};
this.getTableData(searchObj);
},
......
......@@ -74,7 +74,7 @@
<el-form-item label="请选择视频版权方" class="w50">
<el-select
placeholder="请选择视频版权方"
@focus="getAssetCopyrightData"
@focus="getVideoContentCopyrightData"
v-model="ruleForm.videoContentCopyrightOwnerId"
>
<el-option
......@@ -114,12 +114,11 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item class="w50" prop="audioUrlList"></el-form-item>
<el-form-item class="w50" prop="audioIdList"></el-form-item>
<el-form-item label="导览音频" class="w50">
<!-- <upload-img @imgUrl="imgUrl"></upload-img> -->
<upload-audio @audioList="audioList"></upload-audio>
</el-form-item>
<el-form-item label="参考资料" class prop="materialUrlList">
<el-form-item label="参考资料" class prop="datumIdList">
<upload-datum @datumList="datumList"></upload-datum>
</el-form-item>
</el-form>
......@@ -163,7 +162,6 @@ export default {
boardCopyrightOwnerId:[],
exhibitionBoardCatId:[],
videoContentId:[],
type: this.$route.query.type,
dialogVisible: false,
formLabelWidth: "100px",
form: {
......@@ -176,7 +174,8 @@ export default {
boardCopyrightOwnerId:"",
videoContentCopyrightOwnerId: "",
videoContentCatId: "",
videoUrlList: []
audioIdList: [],
datumIdList: []
},
videoContentCat: [
{
......@@ -226,10 +225,10 @@ export default {
},
methods: {
audioList(list){
this.ruleForm.audioUrlList = list;
this.ruleForm.audioIdList = list;
},
datumList(list){
this.ruleForm.materialUrlList = list;
this.ruleForm.datumIdList = list;
},
// 视频版权方名称id
videoCopyright(idlist) {
......@@ -243,10 +242,6 @@ export default {
// 二维码
qrcodeUrl(url){
this.ruleForm.qrcodeUrl = url
},
// 视频列表地址
videoList(list) {
this.ruleForm.videoUrlList = list;
},
getVideoContentCat(data) {
console.log(data);
......@@ -256,7 +251,7 @@ export default {
if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id);
this.getVideoContentCatData();
this.getAssetCopyrightData();
this.getVideoContentCopyrightData();
this.getExhibitionBoardCatId();
this.getBoardCopyrightOwnerId();
this.getVideoData();
......@@ -272,8 +267,7 @@ export default {
authType: this.backToken
}
// param
)
.then(res => {
).then(res => {
let data = res.data.data;
// this.ruleForm = data;
console.log(this.ruleForm)
......@@ -284,24 +278,17 @@ export default {
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
// videoUrlList:data.videoUrlList
// 字段对不上
audioIdList:data.audioIdList,
datumIdList:data.datumIdList
}
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
},
// 新建视频分类
addVideoClass() {
this.dialogVisible = true;
......@@ -309,8 +296,8 @@ export default {
// 弹窗保存
save(formName) {
this.$refs[formName].validate(valid => {
this.ruleForm.expireDateEnd = this.value1[1];
this.ruleForm.expireDateStart = this.value1[0];
this.ruleForm.expireDateEnd = this.value1[1];
if (valid) {
this.$https(
{
......@@ -322,12 +309,10 @@ export default {
authType: this.backToken
},
this.classForm
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false;
})
.catch(function(err) {
}).catch(function(err) {
this.$message({
type: "fail",
message: "新增失败!" + err.response.data.msg
......@@ -343,22 +328,19 @@ export default {
// 新增
submitForm(formName) {
this.$refs[formName].validate(valid => {
console.log(this.ruleForm)
if (valid) {
this.$https(
{
url: "/exhibitionBoard/save",
url: "exhibitionBoard/save",
method: "post",
authType: this.backToken
},
// this.ruleForm
this.$qs.stringify(this.ruleForm)
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "新增成功!" });
history.go(-1);
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
} else {
......@@ -378,13 +360,10 @@ export default {
authType: this.backToken
},
this.$qs.stringify(this.ruleForm)
// this.ruleForm
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "修改成功!" });
history.go(-1);
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
} else {
......@@ -398,7 +377,7 @@ export default {
history.go(-1);
},
// 获取视频版权方
getAssetCopyrightData() {
getVideoContentCopyrightData() {
let vm = this;
vm.$https(
{
......@@ -409,8 +388,7 @@ export default {
{ copyrightOwnerType: "VIDEO_CONTENT" }
)
.then(res => {
let data = res.data.data;
this.copyrightOwner = data;
this.copyrightOwner = res.data.data;
})
.catch(function(err) {
console.log(err);
......@@ -419,20 +397,15 @@ export default {
// 获取展板版权方
getBoardCopyrightOwnerId() {
let vm = this;
vm.$https(
{
vm.$https({
url: "copyrightOwner/getList",
method: "get",
authType: this.backToken
},
{ copyrightOwnerType: "EXHIBITION_BOARD" }
)
.then(res => {
let data = res.data.data;
this.boardCopyrightOwnerId = data;
console.log(this.boardCopyrightOwnerId)
})
.catch(function(err) {
).then(res => {
this.boardCopyrightOwnerId = res.data.data;
}).catch(function(err) {
console.log(err);
});
},
......@@ -443,12 +416,9 @@ export default {
url: "exhibitionBoardCat/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.exhibitionBoardCatId = data;
})
.catch(function(err) {
}).then(res => {
this.exhibitionBoardCatId = res.data.data;
}).catch(function(err) {
console.log(err);
});
},
......@@ -459,12 +429,9 @@ export default {
url: "videoContentCat/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.videoContentCat = data;
})
.catch(function(err) {
}).then(res => {
this.videoContentCat = res.data.data;
}).catch(function(err) {
console.log(err);
});
},
......@@ -475,16 +442,12 @@ export default {
url: "videoContent/getList",
method: "get",
authType: this.backToken
})
.then(res => {
let data = res.data.data;
this.videoContentId = data;
})
.catch(function(err) {
}).then(res => {
this.videoContentId = res.data.data;
}).catch(function(err) {
console.log(err);
});
},
close() {
history.go(-1);
},
......
<template>
<div class="info">
<div class="info-header">学习内容详情</div>
<div class="info info-board">
<div class="info-header">展板内容详情</div>
<div class="page-tip">
<span class="tip-title">页面说明:</span>
<span
>可查看某块展板包含的所有文字及文件信息,视频及文档材料可下载到本地观看。</span
>
</div>
<div class="info-container">
<div class="info-wrapper">
<el-collapse v-model="activeNames" @change="handleChange">
<el-collapse v-model="activeNames">
<el-collapse-item title="审核意见" name="1">
<el-form
class="demo-form-inline"
:inline="true"
:model="formInline"
:model="reviewData"
label-position="top"
>
<el-form-item label="审核层级" class="w100">
<span class="w50 l-float">
<strong>初审</strong> 2021/02/02
<strong>初审</strong>{{ reviewData.firstTime }}
</span>
<span class="w50">
<strong>复审</strong> 2021/02/23
<strong>复审</strong>{{ reviewData.secondTime }}
</span>
</el-form-item>
<el-form-item label="审核结果" class="w50">驳回</el-form-item>
<el-form-item label="审核结果" class="w50">{{
keyMap[reviewData.status]
}}</el-form-item>
<el-form-item
label="驳回原因"
>各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给
</el-form-item>
v-if="reviewData.status === 'REFUSED'"
>{{
reviewData.firstRemarks || reviewData.secondRemarks
}}</el-form-item
>
</el-form>
</el-collapse-item>
<el-collapse-item title="展板基本信息" name="2">
<el-form
class="demo-form-inline"
:inline="true"
:model="formInline"
:model="contentData"
label-position="top"
>
<el-form-item label="版权方" class="w50">xxxxxxx</el-form-item>
<el-form-item label="创建时间" >2021/02/23</el-form-item>
<el-form-item label="展板分类" class="w50">反腐类</el-form-item>
<el-form-item label="上架情况" >已上架</el-form-item>
<el-form-item label="审核情况" class="w50">已审核</el-form-item>
<el-form-item label="版权方" class="w50">{{
contentData.boardCopyrightOwnerName
}}</el-form-item>
<el-form-item label="创建时间">{{
contentData.createTime
}}</el-form-item>
<el-form-item label="展板分类" class="w50">{{
contentData.createTime
}}</el-form-item>
<el-form-item label="上架情况">{{
contentData.published ? "已上架" : "未上架"
}}</el-form-item>
<el-form-item label="审核情况" class="w50">{{
keyMap[contentData.auditStatus]
}}</el-form-item>
<el-form-item label="展板图片" class="w50">
<img class="imgSize" src alt />
</el-form-item>
<el-form-item
label="展板简介"
>各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给各区域为夫妻房我发给
<img class="imgSize" :src="contentData.cover" />
</el-form-item>
<el-form-item label="展板简介">{{
contentData.remarks
}}</el-form-item>
</el-form>
</el-collapse-item>
<el-collapse-item title="展板影音信息" name="3">
<el-form
class="demo-form-inline"
:inline="true"
:model="formInline"
:model="contentData"
label-position="top"
>
<el-form-item label="展板视频" class="w100">
<div>
<img class="iconImg" src alt />
<span>xxx.mp4</span>
<img class="iconImg" src alt />
<span>xxx.mp4</span>
<div v-if="contentData.videoList.length">
<span
class="file-box"
v-for="(s, i) in contentData.videoList"
:key="i"
>
<video
controls
width="100%"
height="100%"
poster="images/applets/video.png"
>
<source :src="s.fileUrl" />
</video>
<span>{{ s.fileName }}</span>
</span>
</div>
<div v-else>暂无数据</div>
</el-form-item>
<el-form-item label="展板音频">
<div>
<img class="iconImg" src alt />
<span>xxx.mp3</span>
<div v-if="contentData.audioList.length">
<span
class="file-box"
v-for="(s, i) in contentData.audioList"
:key="i"
>
<audio
controls
width="100%"
height="100%"
poster="images/applets/audio.png"
>
<source :src="s.fileUrl" />
</audio>
<span>{{ s.fileName }}</span>
</span>
</div>
<div v-else>暂无数据</div>
</el-form-item>
<el-form-item label="展板图片" class="w100">
<img class="imgSize" src alt />
<img class="imgSize" src alt />
<img class="imgSize" src alt />
<img class="imgSize" src alt />
<div v-if="contentData.imagesList.length">
<span
class="file-box"
v-for="(s, i) in contentData.imagesList"
:key="i"
>
<img class="imgSize" :src="s.fileUrl" alt />
<span>{{ s.fileName }}</span>
</span>
</div>
<div v-else>暂无数据</div>
</el-form-item>
<el-form-item label="展板文档">
<div>
<img class="iconImg" src alt />
<span>xxx.pdf</span>
<el-form-item label="展板文档(可点击查看或下载查看)" class="w100">
<div v-if="contentData.dirList.length">
<span
class="dir-box"
v-for="(s, i) in contentData.dirList"
:key="i"
@click="reviewFile(s)"
>
<img
v-if="s.fileExtName === 'pdf'"
src="@/assets/pdf-icon.png"
alt=""
/>
<img
v-if="s.fileExtName === 'pptx'"
src="@/assets/ppt-icon.png"
alt=""
/>
<img
v-if="s.fileExtName === 'docx'"
src="@/assets/doc-icon.png"
alt=""
/>
<img
v-if="s.fileExtName === 'mp4'"
src="@/assets/video-icon.png"
alt=""
/>
<img
v-if="s.fileExtName === 'mp3'"
src="@/assets/audio-icon.png"
alt=""
/>
<img
v-if="s.fileExtName === 'xls'"
src="@/assets/excel-icon.png"
alt=""
/>
<span><a target="_blank" :href="s.fileUrl">{{ s.fileName }}</a></span>
</span>
</div>
<div v-else>暂无数据</div>
</el-form-item>
</el-form>
</el-collapse-item>
......@@ -89,7 +178,13 @@
<div class="info-footer">
<div class="btn-group">
<!-- 确定、取消 -->
<el-button size="mini" type="primary" class="btn_form_search" @click="close">关闭</el-button>
<el-button
size="mini"
type="primary"
class="btn_form_search"
@click="close"
>关闭</el-button
>
</div>
</div>
</div>
......@@ -98,62 +193,152 @@
<script>
export default {
data() {
const keyMap = {
TBC: "待初审",
REFUSED: "已驳回",
TBCA: "待复审",
APPROVED_FINAL: "通过",
};
return {
tableData: [
{
id: "1",
name: "1"
id: "",
activeNames: ["1", "2", "3"],
keyMap: keyMap,
contentData: {},
reviewData: {},
};
},
{
id: "2",
name: "2"
mounted() {
this.id = this.$route.query.id;
this.getReviewById();
this.getContentById();
},
{
id: "3",
name: "3"
methods: {
getContentById() {
let vm = this;
vm.$https({
url: "exhibitionBoard/get/" + this.id,
method: "get",
authType: this.backToken,
})
.then((res) => {
if (res.data.resultCode === "200") {
vm.contentData = res.data.data;
vm.contentData.imagesList = [];
vm.contentData.dirList = [];
vm.contentData.datumList.forEach((item) => {
if (item.fileType === "IMAGE") {
vm.contentData.imagesList.push(item);
} else {
vm.contentData.dirList.push(item);
}
],
activeNames: ["1","2","3"],
formInline: {
user: "",
region: ""
});
} else {
this.$message.error(res.data.message);
}
})
.catch(function (err) {
console.log(err);
});
},
getReviewById() {
let vm = this;
const param = {
id: this.id,
type: "EXHIBITION_BOARD",
};
vm.$https(
{
url: "audit/getById",
method: "get",
authType: this.backToken,
},
param
)
.then((res) => {
if (res.data.resultCode === "200") {
vm.reviewData = res.data.data || {};
} else {
this.$message.error(res.data.message);
}
})
.catch(function (err) {
console.log(err);
});
},
reviewFile() {
console.log("点击预览。。。");
// const _this = this;
// this.$confirm("确定要下载该文件?", "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning",
// center: true,
// })
// .then(() => {
// this.updateVersion(row);
// })
// .catch(() => {
// this.$message("已取消");
// });
},
methods: {
close() {
history.go(-1);
this.$router.go(-1);
},
handleChange(val) {
console.log(val);
},
moveUpward(row, index) {
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"
});
};
</script>
<style lang="less" scoped>
.info-board {
.file-box {
display: inline-block;
width: 180px;
height: 180px;
margin: 0 10px;
}
},
moveDown(row, index) {
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);
/deep/.el-collapse-item__wrap {
padding: 16px;
}
/deep/.el-collapse-item__header {
position: relative;
padding-left: 20px;
font-size: 18px;
color: #333;
&::before {
content: "";
position: absolute;
top: 14px;
left: 0px;
width: 4px;
height: 18px;
background: #000;
}
}
};
</script>
<style lang="less">
.page-tip {
width: 640px;
background: #f7f5f2;
border-radius: 8px;
padding: 16px 20px;
margin: 20px auto;
font-size: 14px;
color: #333333;
.tip-title {
font-weight: 700;
margin-right: 5px;
}
}
.dir-box {
display: block;
width: 100%;
height: 96px;
img {
width: 96px;
height: 96px;
vertical-align: middle;
}
span {
margin-left: 10px;
line-height: 96px;
}
}
}
</style>
\ No newline at end of file
......@@ -13,6 +13,7 @@
</el-form-item>
<el-form-item label="版权方有效期">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="value1"
type="daterange"
range-separator="至"
......@@ -29,7 +30,7 @@
</el-form>
<div class="page-tip">
<span class="page-tip-title">页面说明:</span>
<span class="page-tips">展示所有单位的互动频次统计图及统计表格</span>
<span class="page-tips">可通过展板名称、创建时间对展板信息进行快速检索。可对展板进行上架、下架、删除、修改及查看展板详情等操作。其中已上架的展板不能被删除。</span>
</div>
</div>
<div class="table-content">
......@@ -48,10 +49,10 @@
<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="boardCopyrightOwnerName"></el-table-column>
<el-table-column label="展板分类" prop="createTime"></el-table-column>
<el-table-column label="展板分类" prop="exhibitionBoardCatName"></el-table-column>
<el-table-column show-overflow-tooltip label="展板简介" prop="remarks"></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="videoContentName"></el-table-column>
<el-table-column label="视频版权方" prop="videoContentCopyrightOwnerName"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus">
<template slot-scope="scope">
......@@ -61,21 +62,41 @@
<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="操作" header-align="center" align="center">
<template slot-scope="scope" width="360">
<el-button-group>
<el-button
title="编辑"
size="mini"
type="text"
@click="openEdit(scope.row)"
>编辑&nbsp;&nbsp;</el-button>
<el-button type="text" size="mini" @click="displayInfo(scope.row)">展板详情</el-button>
<el-button type="text" size="mini" @click="handlePublish(scope.row ,'False')">下架&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-group>
<el-table-column label="是否上架" prop="published">
<template slot-scope="scope">
<span v-if="scope.row.published"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="操作" width="280" header-align="center" align="center">
<template slot-scope="scope" >
<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="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>
<el-tooltip content="详情" placement="top">
<el-button circle @click="displayInfo(scope.row)">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
......@@ -229,7 +250,9 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
nameOrCode: _this.form.nameOrCode
nameOrCode: _this.form.nameOrCode,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
};
this.getTableData(searchObj);
},
......@@ -370,7 +393,11 @@ export default {
.then(
res => {
// this.$message({ type: "success", message: "删除成功!" });
alert("已提交审核!")
// alert("已提交审核!")
this.msgInfo = {
type: "wait",
des: `申请已提交,待审核…`,
};
_this.Search();
},
error => {
......
......@@ -6,13 +6,14 @@
<el-input
size="mini"
placeholder="请输入版权方名称"
v-model="form.name"
v-model="form.nameOrCode"
@keyup.enter.native="Search"
clearable
></el-input>
</el-form-item>
<el-form-item label="版权方有效期">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="value1"
type="daterange"
range-separator="至"
......@@ -29,12 +30,12 @@
</el-form>
<div class="page-tip">
<span class="page-tip-title">页面说明:</span>
<span class="page-tips">通过创建时间、视频分类名称模糊搜索快速筛选视频分类信息,可对视频分类信息进行修改、删除。可新建视频分类。</span>
<span class="page-tips">对展板版权方信息进行筛选、修改及删除。可新建版权方信息</span>
</div>
</div>
<div class="table-content">
<div class="btn-group">
<el-button type="primary" @click="addPermis()">新建视频分类</el-button>
<el-button type="primary" @click="addPermis()">新建版权方</el-button>
</div>
<div class="party-table">
<el-table
......@@ -45,27 +46,27 @@
@selection-change="handleSelectionChange"
>
<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="copyrightOwnerName"></el-table-column>
<el-table-column label="版权方名称" prop="name"></el-table-column>
<el-table-column label="展板分类" prop="videoContentCatNames"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="版权方有效期" prop="expireDateEnd" width="200">
<template slot-scope="scope">{{scope.row.expireDateStart}}{{scope.row.expireDateEnd}}</template>
</el-table-column>
<el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-button-group>
<el-button
title="删除"
type="text"
size="mini"
@click="handleDelete(scope.row)"
>删除&nbsp;&nbsp;</el-button>
<el-button
title="编辑"
size="mini"
type="text"
@click="openEdit(scope.row)"
>编辑&nbsp;&nbsp;</el-button>
<!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
</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>
</template>
</el-table-column>
</el-table>
......@@ -289,7 +290,10 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
name: _this.form.name
nameOrCode: _this.form.nameOrCode,
ownerType:'EXHIBITION_BOARD',
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
};
this.getTableData(searchObj);
},
......@@ -305,7 +309,7 @@ export default {
let searchObj = {
_index: _this.page.currentPage,
_size: _this.page.pageSize,
ownerType:'EXHIBITION_BOARD'
};
for (let key in _this.form) {
if (_this.form[key]) {
......
<template>
<div class="info">
<!-- <audio-play></audio-play> -->
<!-- <video-dialog></video-dialog> -->
<video-dialog ref="videoDialog"></video-dialog>
<div class="info-header">新建学习内容</div>
<div class="info-container">
<div class="info-wrapper">
......@@ -224,8 +224,12 @@ export default {
},
methods: {
// 视频预览
videoPreview(){
alert("视频")
videoPreview(row){
// alert("视频")
// console.log(row,'222')
this.$refs.videoDialog.dialogVisible = true
this.$refs.videoDialog.videoImg = row.cover
this.$refs.videoDialog.videoSrc = row.videoList[0].fileUrl
},
// 展板预览
displayPreview(row) {
......
......@@ -2,17 +2,18 @@
<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-item >
<el-input
size="mini"
placeholder="请输入版权方名称"
placeholder="请输入学习内容名称"
v-model="form.name"
@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"
type="daterange"
range-separator="至"
......@@ -45,10 +46,24 @@
@selection-change="handleSelectionChange"
>
<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="videoContentCatNames"></el-table-column>
<el-table-column show-overflow-tooltip label="学习内容名称" prop="name"></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=""></el-table-column>
<el-table-column show-overflow-tooltip label="所含展板数量" prop="exhibitionBoardCount"></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="published">
<template slot-scope="scope">
<span v-if="scope.row.published"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" width="240" header-align="center" align="center">
<template slot-scope="scope" >
......@@ -200,7 +215,11 @@ export default {
.then(
res => {
// this.$message({ type: "success", message: "删除成功!" });
alert("已提交审核!")
// alert("已提交审核!")
this.msgInfo = {
type: "wait",
des: `申请已提交,待审核…`,
};
_this.Search();
},
error => {
......@@ -256,7 +275,9 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
name: _this.form.name
name: _this.form.name,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
};
this.getTableData(searchObj);
},
......
......@@ -2,17 +2,18 @@
<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-item >
<el-input
size="mini"
placeholder="请输入版权方名称"
placeholder="请输入学习项目名称"
v-model="form.name"
@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"
type="daterange"
range-separator="至"
......@@ -45,9 +46,9 @@
@selection-change="handleSelectionChange"
>
<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="copyrightOwnerName"></el-table-column>
<el-table-column label="学习项目名称" prop="name"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="相关学习内容" prop="learningContentNames"></el-table-column>
<el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220">
......@@ -290,7 +291,9 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
name: _this.form.name
name: _this.form.name,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
};
this.getTableData(searchObj);
},
......
......@@ -13,6 +13,7 @@
</el-form-item>
<el-form-item label="版权方有效期">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="value1"
type="daterange"
range-separator="至"
......@@ -292,7 +293,9 @@ export default {
let searchObj = {
_index: 1,
_size: _this.page.pageSize,
name: _this.form.name
name: _this.form.name,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
};
this.getTableData(searchObj);
},
......@@ -489,7 +492,11 @@ export default {
})
.then(
res => {
this.$message({ type: "success", message: "删除成功!" });
// this.$message({ type: "success", message: "删除成功!" });
this.msgInfo = {
type: "wait",
des: `申请已提交,待审核…`,
};
_this.Search();
},
error => {
......
......@@ -27,9 +27,9 @@
<el-form-item class="selectH100" label="请选择预设视频分类">
<el-select
placeholder="请选择预设视频分类"
@focus="getAssetTypeData"
@focus="getVideoContentCatData"
multiple
v-model="ruleForm.assetTypeIdList"
v-model="ruleForm.videoContentCatIdList"
@change="getSelectDep"
>
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
......@@ -44,7 +44,7 @@
<el-form-item label="请选择视频版权方">
<el-select
placeholder="请选择视频版权方"
@focus="getAssetCopyrightData"
@focus="getVideoContentCopyrightData"
v-model="ruleForm.videoContentCopyrightOwnerId"
>
<el-option
......@@ -62,9 +62,9 @@
<el-form-item label="请选择预设视频分类">
<el-select
placeholder="请选择预设视频分类"
@focus="getAssetTypeData"
v-model="ruleForm.assetTypeId"
@change="getAssetType"
@focus="getVideoContentCatData"
v-model="ruleForm.videoContentCatId"
@change="getVideoContentCat"
>
<el-option
v-for="item in videoContentCat"
......@@ -164,9 +164,9 @@ export default {
ruleForm: {
name: "",
videoContentCopyrightOwnerId:"",
assetTypeId: "",
videoContentCatId: "",
thumbnail:"",
videoUrlList:[]
videoFileIdList:[]
},
videoContentCat: [
{
......@@ -236,18 +236,18 @@ export default {
},
// 视频列表地址
videoList(list){
this.ruleForm.videoUrlList = list
this.ruleForm.videoFileIdList = list
},
init() {
if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id);
this.getAssetTypeData()
this.getAssetCopyrightData()
this.getVideoContentCatData()
this.getVideoContentCopyrightData()
}
},
getAssetType(data){
getVideoContentCat(data){
console.log(data)
console.log(this.ruleForm.assetTypeId)
console.log(this.ruleForm.videoContentCatId)
},
// 获取版权方详情
getInfo(id) {
......@@ -259,18 +259,16 @@ export default {
authType: this.backToken
}
// param
)
.then(res => {
).then(res => {
let data = res.data.data;
// this.ruleForm = data;
this.ruleForm.id = data.id
this.ruleForm.name = data.name
this.ruleForm.videoContentCopyrightOwnerId = data.videoContentCopyrightOwnerId
this.ruleForm.assetTypeId = data.assetTypeId
this.ruleForm.videoContentCatId = data.videoContentCatId
this.ruleForm.thumbnail = data.thumbnail
this.ruleForm.videoUrlList = data.videoUrlList
})
.catch(function(err) {
this.ruleForm.videoFileIdList = data.videoFileIdList
}).catch(function(err) {
console.log(err);
});
},
......@@ -295,17 +293,14 @@ export default {
authType: this.backToken
},
this.classForm
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false;
})
.catch(function(err) {
}).catch(function(err) {
this.$message({
type: "fail",
message: "新增失败!" + err.response.data.msg
});
console.log(err);
});
} else {
console.log("error submit!!");
......@@ -324,26 +319,18 @@ export default {
// 新增
submitForm(formName) {
this.$refs[formName].validate(valid => {
// this.ruleForm.videoContentCopyrightOwnerId = ["1373225989501456385"]
// this.ruleForm.assetTypeIdList = []
// this.ruleForm.videoUrlList = [
// "http://111.203.232.175:8085/group1/M00/00/39/wKhuVWBgIvaANgtZAAAAAAAAAAA947.mp4"
// ]
if (valid) {
this.$https(
{
url: "/videoContent/save",
url: "videoContent/save",
method: "post",
authType: this.backToken
},
// this.ruleForm
this.$qs.stringify(this.ruleForm)
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "新增成功!" });
history.go(-1);
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
} else {
......@@ -355,7 +342,6 @@ export default {
// 修改版权方
updateForm(formName) {
this.$refs[formName].validate(valid => {
if (valid) {
this.$https(
{
......@@ -364,13 +350,10 @@ export default {
authType: this.backToken
},
this.$qs.stringify(this.ruleForm)
// this.ruleForm
)
.then(res => {
).then(res => {
this.$message({ type: "success", message: "修改成功!" });
history.go(-1);
})
.catch(function(err) {
}).catch(function(err) {
console.log(err);
});
} else {
......@@ -383,7 +366,7 @@ export default {
this.$refs[formName].resetFields();
history.go(-1);
},
getAssetCopyrightData(){
getVideoContentCopyrightData() {
let vm = this;
vm.$https({
url: "copyrightOwner/getList",
......@@ -400,37 +383,30 @@ export default {
});
},
// 获取视频分类列表
getAssetTypeData() {
getVideoContentCatData() {
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) {
}).then(res => {
this.videoContentCat = res.data.data;
}).catch(function(err) {
console.log(err);
});
},
getSelectDep(assetTypeIdList) {
if (assetTypeIdList.length === this.videoContentCat.length) {
this.checkedThing = true;
} else {
this.checkedThing = false;
}
getSelectDep(videoContentCatIdList) {
this.checkedThing = videoContentCatIdList.length === this.videoContentCat.length;
},
selectAllThing() {
// debugger
this.ruleForm.assetTypeIdList = [];
this.ruleForm.videoContentCatIdList = [];
if (this.checkedThing) {
this.videoContentCat.map(item => {
this.ruleForm.assetTypeIdList.push(item.id);
this.ruleForm.videoContentCatIdList.push(item.id);
});
} else {
this.ruleForm.assetTypeIdList = [];
this.ruleForm.videoContentCatIdList = [];
}
}
}
......
......@@ -11,15 +11,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="版权方有效期">
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<div class="btn-group">
<el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button>
......@@ -59,19 +51,33 @@
</el-table-column>
<el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220">
<el-button-group>
<el-button
type="text"
size="mini"
@click="handleDelete(scope.row)"
>删除&nbsp;&nbsp;</el-button>
<el-button
size="mini"
type="text"
@click="openEdit(scope.row)"
>编辑&nbsp;&nbsp;</el-button>
<el-button size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button>
</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="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>
<el-tooltip content="详情" placement="top">
<el-button circle @click="openDetails(scope.row)">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip>
</div>
</template>
</el-table-column>
</el-table>
......@@ -153,7 +159,7 @@
<!--查看详情-->
<el-dialog
custom-class="party-dialog"
title="查看详情"
title="审核详情"
width="468px"
:visible.sync="FormVisible"
:before-close="close"
......@@ -165,37 +171,25 @@
class="party-form"
ref="editform"
label-width="80px"
label-position="right"
label-position="top"
:rules="rules"
>
<el-form-item label="审核层级:" :label-width="formLabelWidth">
<el-input size="small" v-model="editform.sort" auto-complete="off" clearable></el-input>
<el-form-item label="初审时间:" :label-width="formLabelWidth">
<span class="input-item">{{editform.firstTime}}</span>
</el-form-item>
<el-form-item label="审核时间:" :label-width="formLabelWidth">
<el-input
size="small"
v-model="editform.menuName"
auto-complete="off"
clearable
onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"
></el-input>
<el-form-item label="复审时间:" :label-width="formLabelWidth">
<span class="input-item">{{editform.secondTime}}</span>
</el-form-item>
<el-form-item label="审核结果:" :label-width="formLabelWidth">
<el-input
size="small"
v-model="editform.menuUrl"
auto-complete="off"
clearable
onkeyup="this.value=this.value.replace(/^ +| +$/g,'')"
></el-input>
<span class="input-item">{{keyMap[editform.status]}}</span>
</el-form-item>
<el-form-item label="驳回原因:" :label-width="formLabelWidth">
<el-input type="textarea" v-model="editform.desc"></el-input>
<el-form-item label="驳回原因:" :label-width="formLabelWidth" v-if="editform.status==='REFUSED'">
<span class="input-item">{{editform.firstRemarks || editform.secondRemarks}}</span>
</el-form-item>
</el-form>
</div>
<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="close">确定</el-button>
<el-button size="mini" @click="close">取 消</el-button>
</div>
</el-dialog>
......@@ -213,7 +207,9 @@ export default {
}
}
};
const keyMap ={'TBC':'待初审','REFUSED':'已驳回','TBCA':'待复审','APPROVED_FINAL':'通过'}
return {
keyMap:keyMap,
value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 },
tableData: [],
......@@ -223,13 +219,7 @@ export default {
form: {
name: ""
},
editform: {
menuName: "",
menuUrl: "",
parentId: "",
sort: "",
id: ""
},
editform: {},
permisform: {
menuName: "",
menuUrl: "",
......@@ -417,7 +407,7 @@ export default {
openEdit(row) {
this.$router.push({
path: "videoContentUpdate",
query: { type: "Update" ,id:row.id }
query: { type: "Update", id: row.id }
});
// alert('编辑')
// $('.el-dialog__title').html('编辑');
......@@ -439,17 +429,21 @@ export default {
// 获取视频分类详情
getAssetInfo(id) {
let vm = this;
const param ={
id:id,
type:'VIDEO_CONTENT'
}
vm.$https(
{
url: "videoContent/get/" + id,
url: "audit/getById",
method: "get",
authType: this.backToken
}
// param
},
param
)
.then(res => {
let data = res.data.data;
this.editform = data;
this.editform = data || {};
})
.catch(function(err) {
console.log(err);
......@@ -472,7 +466,11 @@ export default {
})
.then(
res => {
this.$message({ type: "success", message: "删除成功!" });
this.msgInfo = {
type: "wait",
des: `申请已提交,待审核…`,
};
// this.$message({ type: "success", message: "删除成功!" });
_this.Search();
},
error => {
......@@ -485,57 +483,6 @@ export default {
})
.catch(() => {});
},
// 保存编辑信息
submitForm() {
let _this = this;
_this.$refs.editform.validate(valid => {
if (valid) {
let searchObj = {};
for (let key in _this.editform) {
if (this.editform[key]) {
searchObj[key] = _this.editform[key];
}
}
let str = _this.editform.menuName;
let index = str.lastIndexOf("-");
str = str.substring(index + 1, str.length);
searchObj.menuName = str;
_this
.$https(
{
url: "menu/edit",
method: "put",
authType: this.backToken
},
_this.$qs.stringify(searchObj)
)
.then(
res => {
if (res.data.status == 200 || res.data.status == 201) {
_this.$message({
type: "success",
message: res.data.message
});
_this.onSearch();
_this.FormVisible = false;
_this.$refs["editform"].resetFields();
} else {
_this.$message({
type: "error",
message: res.data.message
});
}
},
error => {
_this.$message({
type: "error",
message: error
});
}
);
}
});
},
// 批量操作
handleSelectionChange(selection) {
......@@ -574,7 +521,7 @@ export default {
})
.then(
res => {
if (res.data.status == 201 || res.data.status == 200) {
if (res.data.status === 201 || res.data.status === 200) {
this.$message({
type: "success",
message: "删除成功!"
......@@ -604,4 +551,11 @@ export default {
@import "../../../../style/table.less";
@import "../../../../style/pagination.less";
@import "../../../../style/dialog.less";
.listPage {
.input-item {
font-size: 16px;
color:#333;
}
}
</style>
......@@ -13,6 +13,7 @@
</el-form-item>
<el-form-item label="版权方有效期">
<el-date-picker
value-format="yyyy-MM-dd"
v-model="value1"
type="daterange"
range-separator="至"
......@@ -39,7 +40,8 @@
<div class="party-table">
<el-table
border
style="width: 100%;height:100%" height="100%"
style="width: 100%;height:100%"
height="100%"
ref="multipleTable"
:data="tableData"
@selection-change="handleSelectionChange"
......@@ -48,7 +50,9 @@
<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>
<el-table-column label="版权方有效期" prop="expireDateEnd"></el-table-column>
<el-table-column label="版权方有效期" prop="expireDateEnd" width="200">
<template slot-scope="scope">{{scope.row.expireDateStart}}{{scope.row.expireDateEnd}}</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220">
......@@ -63,30 +67,6 @@
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip>
<!-- <el-tooltip content="禁用" placement="top">
<el-button
circle
:disabled="scope.row.status == 2 || scope.row.statusName == '待审核' "
@click="handleOperate(scope.row,'disable')">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
<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>
</el-table-column>
......@@ -127,7 +107,7 @@ export default {
formLabelWidth: "100px",
form: {
nameOrCode: "",
ownerType:'VIDEO_CONTENT'
ownerType: "VIDEO_CONTENT"
},
editform: {
menuName: "",
......@@ -231,10 +211,10 @@ export default {
_this.getTableData(param);
},
// 重置
Reset(){
Reset() {
// this.$refs["form"].resetFields();
this.form = { ownerType:'VIDEO_CONTENT'}
this.Search()
this.form = { ownerType: "VIDEO_CONTENT" };
this.Search();
},
Search() {
let _this = this;
......@@ -243,7 +223,9 @@ export default {
_index: 1,
_size: _this.page.pageSize,
nameOrCode: _this.form.nameOrCode,
ownerType:'VIDEO_CONTENT'
ownerType: "VIDEO_CONTENT",
startDate: this.value1 ? this.value1[0] : "",
endDate: this.value1 ? this.value1[1] : ""
};
this.getTableData(searchObj);
},
......@@ -325,7 +307,7 @@ export default {
openEdit(row) {
this.$router.push({
path: "videoCopyrightUpdate",
query: { type: "Update" ,id :row.id}
query: { type: "Update", id: row.id }
});
// alert('编辑')
// $('.el-dialog__title').html('编辑');
......@@ -346,17 +328,28 @@ export default {
type: "warning"
})
.then(() => {
_this.$https({
method: 'delete',
url: 'copyrightOwner/delete/'+ row.id,
_this
.$https({
method: "delete",
url: "copyrightOwner/delete/" + row.id,
authType: this.backToken
}).then((res) => {
this.$message({type: 'success', message: '删除成功!'});
})
.then(
res => {
// this.$message({ type: "success", message: "删除成功!" });
this.msgInfo = {
type: "wait",
des: `删除申请已提交,待审核…`,
};
_this.Search();
}, (error) => {
this.$message({type: 'fail', message: "删除失败!" + error.response.data});
},
error => {
this.$message({
type: "fail",
message: "删除失败!" + error.response.data
});
}
)
);
})
.catch(() => {});
},
......@@ -424,6 +417,6 @@ export default {
<style lang="less">
// @import "../../../../style/common";
// @import "../../style/list";
@import '../../../../style/table.less';
@import '../../../../style/pagination.less';
@import "../../../../style/table.less";
@import "../../../../style/pagination.less";
</style>
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