Commit 6782c18a authored by qzhxx's avatar qzhxx

‘审核

parent 03b2e22c
...@@ -65,7 +65,11 @@ ...@@ -65,7 +65,11 @@
<el-table-column label="展板名称" prop="name"></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="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column> <el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="operation"></el-table-column> <el-table-column label="审核项" prop="operation">
<template slot-scope="scope">
<span class="input-item">{{keyMap[scope.row.operation]}}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status"> <el-table-column label="审核状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span> <span v-if="scope.row.status === 'TBC'">待初审</span>
...@@ -89,12 +93,8 @@ ...@@ -89,12 +93,8 @@
</el-table-column> </el-table-column>
<el-table-column label="审核" header-align="center" align="center"> <el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<div class="table-btn-group"> <!-- <div class="table-btn-group">
<!-- <el-tooltip content="详情" placement="top">
<el-button circle @click="learnDetails(scope.row)">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip> -->
<el-tooltip content="通过" placement="top"> <el-tooltip content="通过" placement="top">
<el-button circle @click="adopt(scope.row)"> <el-button circle @click="adopt(scope.row)">
<i class="icon-table icon-enable"></i> <i class="icon-table icon-enable"></i>
...@@ -105,6 +105,26 @@ ...@@ -105,6 +105,26 @@
<i class="icon-table icon-disable"></i> <i class="icon-table icon-disable"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</div> -->
<div class="table-btn-group">
<el-button
round
class="passed"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="adopt(scope.row)"
>通过</el-button>
<el-button
round
class="rejected"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="reject(scope.row)"
>驳回</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -237,7 +257,18 @@ export default { ...@@ -237,7 +257,18 @@ export default {
} }
} }
}; };
const keyMap = {
ADD: "新增",
EDIT: "修改",
REMOVE: "删除",
DISABLE: "禁用",
ENABLE: "启用",
UPPER: "上架",
LOWER: "下架"
};
return { return {
keyMap: keyMap,
type: true, type: true,
value1: "", value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 }, page: { currentPage: 1, pageSize: 10, total: 0 },
......
...@@ -28,17 +28,17 @@ ...@@ -28,17 +28,17 @@
:model="formInline" :model="formInline"
label-position="top" label-position="top"
> >
<el-form-item label="展板宣传图"> <el-form-item label="展板宣传图" class="w100">
<img class="imgSize" :src="item.cover" alt /> <img class="imgSize" :src="item.cover" alt />
</el-form-item> </el-form-item>
<el-form-item label="展板版权方"> <el-form-item label="展板版权方" class="w50" >
<span>{{ item.boardCopyrightOwnerName }}</span> <span>{{ item.boardCopyrightOwnerName }}</span>
</el-form-item> </el-form-item>
<el-form-item label="展板名称" class="w50"> <el-form-item label="展板名称">
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</el-form-item> </el-form-item>
<el-form-item label="展板简介"> <el-form-item label="展板简介" class="w100">
<span>{{ item.remarks }}</span> <span>{{ item.remarks }}</span>
</el-form-item> </el-form-item>
<el-form-item label="展板视频" class="w100"> <el-form-item label="展板视频" class="w100">
......
...@@ -47,7 +47,11 @@ ...@@ -47,7 +47,11 @@
<el-table-column label="学习内容名称" prop="name"></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="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column> <el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="operation"></el-table-column> <el-table-column label="审核项" prop="operation">
<template slot-scope="scope">
<span class="input-item">{{keyMap[scope.row.operation]}}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status"> <el-table-column label="审核状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span> <span v-if="scope.row.status === 'TBC'">待初审</span>
...@@ -70,6 +74,26 @@ ...@@ -70,6 +74,26 @@
<el-table-column label="审核" header-align="center" align="center"> <el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<div class="table-btn-group"> <div class="table-btn-group">
<el-button
round
class="passed"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="adopt(scope.row)"
>通过</el-button>
<el-button
round
class="rejected"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="reject(scope.row)"
>驳回</el-button>
</div>
<!-- <div class="table-btn-group">
<el-tooltip content="通过" placement="top"> <el-tooltip content="通过" placement="top">
<el-button circle @click="adopt(scope.row)"> <el-button circle @click="adopt(scope.row)">
<i class="icon-table icon-enable"></i> <i class="icon-table icon-enable"></i>
...@@ -80,7 +104,7 @@ ...@@ -80,7 +104,7 @@
<i class="icon-table icon-disable"></i> <i class="icon-table icon-disable"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</div> </div> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -172,8 +196,18 @@ export default { ...@@ -172,8 +196,18 @@ export default {
callback(); callback();
} }
} }
};
const keyMap = {
ADD: "新增",
EDIT: "修改",
REMOVE: "删除",
DISABLE: "禁用",
ENABLE: "启用",
UPPER: "上架",
LOWER: "下架"
}; };
return { return {
keyMap: keyMap,
type:true, type:true,
value1: "", value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 }, page: { currentPage: 1, pageSize: 10, total: 0 },
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="listPage H100"> <div class="listPage H100">
<div class="search-container"> <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" class="search-form" onsubmit="return false;">
<el-form-item label=""> <el-form-item label>
<el-input <el-input
size="mini" size="mini"
placeholder="请输入视频名称、提交人" placeholder="请输入视频名称、提交人"
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item > <el-form-item>
<el-select v-model="form.status" placeholder="请选择审核状态"> <el-select v-model="form.status" placeholder="请选择审核状态">
<el-option label="待初审" value="TBC"></el-option> <el-option label="待初审" value="TBC"></el-option>
<el-option label="已驳回" value="REFUSED"></el-option> <el-option label="已驳回" value="REFUSED"></el-option>
...@@ -32,13 +32,11 @@ ...@@ -32,13 +32,11 @@
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
<!-- <div class="btn-group">
<el-button type="primary" @click="addPermis()">新建视频分类</el-button>
</div> -->
<div class="party-table"> <div class="party-table">
<el-table <el-table
border border
style="width: 100%;height:100%" height="100%" style="width: 100%;height:100%"
height="100%"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -47,7 +45,11 @@ ...@@ -47,7 +45,11 @@
<el-table-column label="视频名称" prop="name"></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="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column> <el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="operation"></el-table-column> <el-table-column label="审核项" prop="operation">
<template slot-scope="scope">
<span class="input-item">{{keyMap[scope.row.operation]}}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status"> <el-table-column label="审核状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span> <span v-if="scope.row.status === 'TBC'">待初审</span>
...@@ -70,30 +72,25 @@ ...@@ -70,30 +72,25 @@
<el-table-column label="审核" header-align="center" align="center"> <el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<div class="table-btn-group"> <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 <el-button
size="mini" round
type="text" class="passed"
@click="reject(scope.row)" :disabled="
>驳回&nbsp;&nbsp;</el-button> scope.row.status === 'REFUSED' ||
<el-button scope.row.status === 'APPROVED_FINAL'
size="mini" "
type="text"
@click="adopt(scope.row)" @click="adopt(scope.row)"
>通过&nbsp;&nbsp;</el-button> >通过</el-button>
</el-button-group> --> <el-button
round
class="rejected"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="reject(scope.row)"
>驳回</el-button>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -111,7 +108,13 @@ ...@@ -111,7 +108,13 @@
</div> </div>
</div> </div>
<!--新增弹框--> <!--新增弹框-->
<el-dialog title="新建" custom-class="party-dialog" width="468px" :visible.sync="FormVisible1" :before-close="close1"> <el-dialog
title="新建"
custom-class="party-dialog"
width="468px"
:visible.sync="FormVisible1"
:before-close="close1"
>
<div class="dialog-content"> <div class="dialog-content">
<el-form <el-form
:model="classForm" :model="classForm"
...@@ -133,32 +136,34 @@ ...@@ -133,32 +136,34 @@
</div> </div>
</el-dialog> </el-dialog>
<!--请填写驳回原因--> <!--请填写驳回原因-->
<el-dialog custom-class="party-dialog" title="视频详情" width="80%" :visible.sync="FormVisible" :before-close="close" > <el-dialog
custom-class="party-dialog"
title="视频详情"
height="600px"
width="800px"
:visible.sync="FormVisible"
:before-close="close"
>
<div class="dialog-content"> <div class="dialog-content">
<div> <div>
<!-- <video
<video :src="videoSrc" :poster="videoImg" :autoplay="playStatus" height="421" width="700" :muted="muteStatus"> :preload="preload"
your browser does not support the video tag :poster="videoImg"
</video> :height="height"
<button @click="playClick" :class="{hide: isPlay}">点击播放</button> --> :width="width"
<!--class="video-js vjs-default-skin vjs-big-play-centered" --> align="center"
<video :preload="preload" :controls="controls"
:poster="videoImg" :height="height" :width="width" align="center" :controls="controls" :autoplay="autoplay"> >
<source :src="videoSrc" type="video/mp4"> <source :src="videoSrc" />
</video> </video>
</div> </div>
<!-- <div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" type="primary" @click="close">关闭</el-button>
</div> -->
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
components: { components: {},
},
data() { data() {
var checkIsNull = (rule, value, callback) => { var checkIsNull = (rule, value, callback) => {
if (value) { if (value) {
...@@ -169,21 +174,32 @@ export default { ...@@ -169,21 +174,32 @@ export default {
} }
} }
}; };
const keyMap = {
ADD: "新增",
EDIT: "修改",
REMOVE: "删除",
DISABLE: "禁用",
ENABLE: "启用",
UPPER: "上架",
LOWER: "下架"
};
return { return {
videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4', videoSrc: "",
videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb', videoSrc:
playStatus: '', "https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4",
muteStatus: '', videoImg: "https://sm.ms/image/ueRFCZfk2xTONGb",
playStatus: "",
muteStatus: "",
isMute: true, isMute: true,
isPlay: false, isPlay: false,
width: '100%', // 设置视频播放器的显示宽度(以像素为单位) width: "100%", // 设置视频播放器的显示宽度(以像素为单位)
height: '100%', // 设置视频播放器的显示高度(以像素为单位) height: "100%", // 设置视频播放器的显示高度(以像素为单位)
preload: 'auto', // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。 preload: "auto", // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件,启动视频播放的唯一方法是使用autoplay属性或通过Player API。 controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件,启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: '', autoplay: "",
//-- //--
type:true, keyMap: keyMap,
type: true,
value1: "", value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 }, page: { currentPage: 1, pageSize: 10, total: 0 },
tableData: [], tableData: [],
...@@ -192,7 +208,7 @@ export default { ...@@ -192,7 +208,7 @@ export default {
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
name: "", name: "",
type:'VIDEO_CONTENT' type: "VIDEO_CONTENT"
}, },
editform: { editform: {
menuName: "", menuName: "",
...@@ -302,16 +318,16 @@ export default { ...@@ -302,16 +318,16 @@ export default {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name, name: _this.form.name,
status:_this.form.status, status: _this.form.status,
type:'VIDEO_CONTENT' type: "VIDEO_CONTENT"
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
// 重置 // 重置
Reset(){ Reset() {
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = {type:"VIDEO_CONTENT"} this.form = { type: "VIDEO_CONTENT" };
this.Search() this.Search();
}, },
// // 获取当前查询参数 // // 获取当前查询参数
getSearchQuery() { getSearchQuery() {
...@@ -330,9 +346,9 @@ export default { ...@@ -330,9 +346,9 @@ export default {
// 添加 // 添加
addPermis() { addPermis() {
// this.$router.push({ path: "videoContentAdd", query: { type: "add" } }); // this.$router.push({ path: "videoContentAdd", query: { type: "add" } });
$('.el-dialog__title').html('新建'); $(".el-dialog__title").html("新建");
this.FormVisible1 = true; this.FormVisible1 = true;
this.type = true this.type = true;
}, },
// 请填写驳回原因视频分类确认保存 // 请填写驳回原因视频分类确认保存
...@@ -342,7 +358,11 @@ export default { ...@@ -342,7 +358,11 @@ export default {
if (valid) { if (valid) {
_this _this
.$https( .$https(
{ url: "videoContentCat/update", method: "put", authType: this.backToken }, {
url: "videoContentCat/update",
method: "put",
authType: this.backToken
},
_this.$qs.stringify(_this.classForm) _this.$qs.stringify(_this.classForm)
// _this.classForm // _this.classForm
) )
...@@ -351,7 +371,7 @@ export default { ...@@ -351,7 +371,7 @@ export default {
if (res.data.resultCode == 200 || res.data.resultCode == 201) { if (res.data.resultCode == 200 || res.data.resultCode == 201) {
_this.$message({ _this.$message({
type: "success", type: "success",
message: '新建成功!' message: "新建成功!"
}); });
//跳回用户列表 //跳回用户列表
_this.onSearch(); _this.onSearch();
...@@ -396,19 +416,19 @@ export default { ...@@ -396,19 +416,19 @@ export default {
this.$refs["classForm"].resetFields(); this.$refs["classForm"].resetFields();
}, },
// 通过 // 通过
adopt(row){ adopt(row) {
this.classForm.id= row.id this.classForm.id = row.id;
this.classForm.status = "APPROVED_FINAL" this.classForm.status = "APPROVED_FINAL";
this.classForm.remarks = "" this.classForm.remarks = "";
this.permisSave('classForm') this.permisSave("classForm");
}, },
// 请填写驳回原因弹框 // 请填写驳回原因弹框
reject(row) { reject(row) {
this.type = false this.type = false;
$('.el-dialog__title').html('请填写驳回原因'); $(".el-dialog__title").html("请填写驳回原因");
let _this=this; let _this = this;
_this.classForm.id= row.id _this.classForm.id = row.id;
_this.classForm.status = "REFUSED" _this.classForm.status = "REFUSED";
_this.FormVisible1 = true; _this.FormVisible1 = true;
}, },
// 驳回原因保存 // 驳回原因保存
...@@ -416,11 +436,11 @@ export default { ...@@ -416,11 +436,11 @@ export default {
let _this = this; let _this = this;
_this _this
.$https( .$https(
{ url: "audit/updateAuditAllById", {
headers:{'Content-Type': 'application/json'}, url: "audit/updateAuditAllById",
headers: { "Content-Type": "application/json" },
method: "put", method: "put",
authType: this.backToken, authType: this.backToken
}, },
// _this.$qs.stringify(_this.classForm) // _this.$qs.stringify(_this.classForm)
_this.classForm _this.classForm
...@@ -430,7 +450,7 @@ export default { ...@@ -430,7 +450,7 @@ export default {
if (res.data.resultCode == 200 || res.data.resultCode == 201) { if (res.data.resultCode == 200 || res.data.resultCode == 201) {
_this.$message({ _this.$message({
type: "success", type: "success",
message: '操作成功!' message: "操作成功!"
}); });
//跳回用户列表 //跳回用户列表
_this.onSearch(); _this.onSearch();
...@@ -460,31 +480,51 @@ export default { ...@@ -460,31 +480,51 @@ export default {
// }); // });
}, },
// 获取视频分类详情 // 获取视频分类详情
getAssetTypeInfo(id){ getAssetTypeInfo(id) {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "videoContentCat/get/" + id, url: "videoContentCat/get/" + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, }
// param // param
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
this.classForm = data this.classForm = data;
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
openDetails() { // 详情
let _this = this; openDetails(row) {
_this.FormVisible = true; this.getInfo(row.refItemId);
// $('.el-dialog__title').html('请填写驳回原因'); },
// let _this=this;
// _this.FormVisible1 = true; // 获取详情视频
getInfo(id) {
let vm = this;
vm.$https(
{
url: "videoContent/get/" + id,
method: "get",
authType: this.backToken
}
// param
)
.then(res => {
let data = res.data.data;
console.log(res.data.data.videoFileList[0].fileUrl);
this.videoSrc = res.data.data.videoFileList[0].fileUrl;
console.log(this.videoSrc);
vm.FormVisible = true;
this.videoImg = data.thumbnail;
})
.catch(function(err) {
console.log(err);
});
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
...@@ -495,72 +535,27 @@ export default { ...@@ -495,72 +535,27 @@ export default {
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
_this.$https({ _this
method: 'delete', .$https({
url: 'videoContentCat/delete/'+ row.id, method: "delete",
url: "videoContentCat/delete/" + row.id,
authType: this.backToken authType: this.backToken
}).then((res) => { })
this.$message({type: 'success', message: '删除成功!'}); .then(
res => {
this.$message({ type: "success", message: "删除成功!" });
_this.Search(); _this.Search();
}, (error) => { },
this.$message({type: 'fail', message: "删除失败!" + error.response.data}); error => {
this.$message({
type: "fail",
message: "删除失败!" + error.response.data
});
} }
) );
}) })
.catch(() => {}); .catch(() => {});
}, },
// // 保存请填写驳回原因信息
// 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) { handleSelectionChange(selection) {
let _this = this; let _this = this;
...@@ -625,6 +620,6 @@ export default { ...@@ -625,6 +620,6 @@ export default {
// @import "../../../../style/common"; // @import "../../../../style/common";
// @import "../../style/list"; // @import "../../style/list";
@import "../../../style/dialog.less"; @import "../../../style/dialog.less";
@import '../../../style/table.less'; @import "../../../style/table.less";
@import '../../../style/pagination.less'; @import "../../../style/pagination.less";
</style> </style>
...@@ -246,7 +246,7 @@ export default { ...@@ -246,7 +246,7 @@ export default {
console.log(data) console.log(data)
console.log(this.ruleForm.videoContentCatId) console.log(this.ruleForm.videoContentCatId)
}, },
// 获取版权方详情 // 获取信息
getInfo(id) { getInfo(id) {
let vm = this; let vm = this;
vm.$https( vm.$https(
......
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