Skip to content

N
national_museum_vod
Commit b719beb4 authored by qzhxx's avatar qzhxx
Browse files
Options

‘修改

parent e752bc0a
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 161 deletions
package.json
View file @ b719beb4
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
"element-ui": "^2.7.2", "element-ui": "^2.7.2",
"file-saver": "^2.0.0-rc.3", "file-saver": "^2.0.0-rc.3",
"html2canvas": "^1.0.0-rc.7", "html2canvas": "^1.0.0-rc.7",
"js-base64": "^3.6.0",
"jspdf": "^2.3.1", "jspdf": "^2.3.1",
"moment": "^2.22.2", "moment": "^2.22.2",
"qrcode.vue": "^1.6.1", "qrcode.vue": "^1.6.1",
......
src/page/accounts/components/checkTable.vue
View file @ b719beb4
...@@ -20,8 +20,20 @@ ...@@ -20,8 +20,20 @@
:width="item.width" :width="item.width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.isEdit" class="table-btn-group"> <div v-if="item.isEdit">
<el-button <div v-if="((scope.row.one)&&(scope.row.two))" class="table-btn-group">
<el-button round class="passed" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="handleOperate(scope.row, 'pass')">通过</el-button>
<el-button round class="rejected" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="handleOperate(scope.row, 'reject')">驳回</el-button>
</div>
<div v-else-if="((scope.row.one === true)&&(scope.row.two === false))" class="table-btn-group">
<el-button round class="passed" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="handleOperate(scope.row, 'pass')">通过</el-button>
<el-button round class="rejected" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="handleOperate(scope.row, 'reject')">驳回</el-button>
</div>
<div v-else-if="((scope.row.one === false)&&(scope.row.two === true))" class="table-btn-group">
<el-button round class="passed" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="handleOperate(scope.row, 'pass')">通过</el-button>
<el-button round class="rejected" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="handleOperate(scope.row, 'reject')">驳回</el-button>
</div>
<!-- <el-button
round round
class="passed" class="passed"
:disabled=" :disabled="
...@@ -44,7 +56,7 @@ ...@@ -44,7 +56,7 @@
@click="handleOperate(scope.row, 'reject')" @click="handleOperate(scope.row, 'reject')"
> >
驳回 驳回
</el-button> </el-button> -->
</div> </div>
<div v-else> <div v-else>
<span v-if="item.prop === 'status'"> <span v-if="item.prop === 'status'">
......
src/page/check/display/index.vue
View file @ b719beb4
...@@ -80,41 +80,20 @@ ...@@ -80,41 +80,20 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核" width="220" header-align="center" align="center"> <el-table-column label="审核" width="220" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <div class="table-btn-group"> <!-- 管理员、初审员、复审员 -->
<div v-if="((scope.row.one)&&(scope.row.two))" class="table-btn-group">
<el-tooltip content="通过" placement="top"> <el-button round class="passed" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
<el-button circle @click="adopt(scope.row)"> <el-button round class="rejected" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
<i class="icon-table icon-enable"></i> </div>
</el-button> <div v-else-if="((scope.row.one === true)&&(scope.row.two === false))" class="table-btn-group">
</el-tooltip> <el-button round class="passed" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
<el-tooltip content="驳回" placement="top"> <el-button round class="rejected" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
<el-button circle @click="reject(scope.row)"> </div>
<i class="icon-table icon-disable"></i> <div v-else-if="((scope.row.one === false)&&(scope.row.two === true))" class="table-btn-group">
</el-button> <el-button round class="passed" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
</el-tooltip> <el-button round class="rejected" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
</div>-->
<div class="table-btn-group">
<el-button
round
class="passed"
:disabled="
!scope.row.two||
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="adopt(scope.row)"
>通过</el-button>
<el-button
round
class="rejected"
:disabled="
!scope.row.two||
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>
...@@ -201,7 +180,7 @@ ...@@ -201,7 +180,7 @@
<el-form-item label="展板视频" :label-width="formLabelWidth"> <el-form-item label="展板视频" :label-width="formLabelWidth">
<div class="video-box" @contextmenu.prevent> <div class="video-box" @contextmenu.prevent>
<div class="video-item" v-for="(item, index) in editForm.videoList" :key="index"> <div class="video-item" v-for="(item, index) in editForm.videoList" :key="index">
<video :src="item.fileUrl" controls controlsList='nodownload noremote footbar' /> <video :poster="item.thumbnail" :src="item.fileUrl" controls controlsList='nodownload noremote footbar' />
<span>{{ item.fileName }}</span> <span>{{ item.fileName }}</span>
</div> </div>
</div> </div>
...@@ -223,6 +202,7 @@ ...@@ -223,6 +202,7 @@
</div> </div>
</template> </template>
<script> <script>
let Base64 = require('js-base64').Base64
export default { export default {
data() { data() {
var checkIsNull = (rule, value, callback) => { var checkIsNull = (rule, value, callback) => {
...@@ -546,43 +526,21 @@ export default { ...@@ -546,43 +526,21 @@ export default {
openDetails(row) { openDetails(row) {
let _this = this; let _this = this;
_this.FormVisible = true; _this.FormVisible = true;
// _this.getInfo(row.refItemId); if(row.operation === 'EDIT'){
if(row.operation === 'EDIT'){
// 参照后台更改文档审核记录的"operation"为"EDIT"时，调用的详情接口 // 参照后台更改文档审核记录的"operation"为"EDIT"时，调用的详情接口
this.getIsEditInfo(row.id) this.getInfo(row.id,"exhibitionBoard/getAudit/")
}else{ }else{
this.getInfo(row.refItemId); this.getInfo(row.refItemId,"exhibitionBoard/get/");
} }
$(".el-dialog__title").html(row.name + "展板详情"); $(".el-dialog__title").html(row.name + "展板详情");
}, },
// 获取版权方详情EDIT下
getIsEditInfo(auditId) {
let vm = this;
vm.$https(
{
url: "exhibitionBoard/getAudit/" + auditId,
method: "get",
authType: this.backToken
}
// param
)
.then(res => {
let resData = res.data.data;
this.editForm = resData;
})
.catch(function(err) {
console.log(err);
});
},
// 获取版权方详情 // 获取版权方详情
getInfo(id) { getInfo(id,url) {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "exhibitionBoard/get/" + id, url: url + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
} }
...@@ -590,7 +548,15 @@ export default { ...@@ -590,7 +548,15 @@ export default {
) )
.then(res => { .then(res => {
let resData = res.data.data; let resData = res.data.data;
const videos = res.data.data.videoList
for(var i=0;i<videos.length;i++){
videos[i].fileUrl = Base64.decode(videos[i].intro)
}
this.editForm = resData; this.editForm = resData;
this.editForm.videoList = videos
}) })
.catch(function(err) { .catch(function(err) {
......
src/page/check/learn/details.vue
View file @ b719beb4
...@@ -42,14 +42,23 @@ ...@@ -42,14 +42,23 @@
<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">
<div class="video-box" @contextmenu.prevent> <div class="video-box" >
<div <div
@contextmenu.prevent
class="video-item" class="video-item"
v-for="(vi, index) in item.videoList" v-for="vi in item.videoList"
:key="index" :key="vi.id"
> >
<video :src="vi.fileUrl" controlsList='nodownload noremote footbar' /> <video
<span>{{ vi.fileName }}</span> :poster="vi.thumbnail"
controls controlsList='nodownload noremote footbar'
>
<source :src="vi.fileUrl" />
</video>
<span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span>&nbsp;{{ vi.fileName }}</span>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -85,6 +94,7 @@ ...@@ -85,6 +94,7 @@
</template> </template>
<script> <script>
let Base64 = require('js-base64').Base64
export default { export default {
data() { data() {
return { return {
...@@ -118,7 +128,15 @@ export default { ...@@ -118,7 +128,15 @@ export default {
.then((res) => { .then((res) => {
let data = res.data.data; let data = res.data.data;
vm.formInline = data; vm.formInline = data;
console.log(this.ruleForm); const boardList = data.exhibitionBoardList
for(var i=0;i<boardList.length;i++){
for(var j=0;j<boardList[i].videoList.length;j++){
boardList[i].videoList[j].fileUrl = Base64.decode(boardList[i].videoList[j].intro)
}
}
// console.log(boardList)
vm.formInline.exhibitionBoardList = boardList
// console.log(this.formInline.exhibitionBoardList[0].videoList);
}) })
.catch(function (err) { .catch(function (err) {
console.log(err); console.log(err);
...@@ -139,16 +157,18 @@ export default { ...@@ -139,16 +157,18 @@ export default {
width: 100%; width: 100%;
.video-item { .video-item {
width: 100%; width: 100%;
} video {
video { width: 300px;
width: 100%;
height: 200px; height: 200px;
} }
}
} }
audio:focus { audio:focus {
outline: none; outline: none;
} }
.audio-item{ .audio-item{
padding-bottom:10px;
display: flex; display: flex;
align-items: center; align-items: center;
span{ span{
......
src/page/check/learn/index.vue
View file @ b719beb4
...@@ -83,40 +83,20 @@ ...@@ -83,40 +83,20 @@
</el-table-column> </el-table-column>
<el-table-column label="审核" width="220" header-align="center" align="center"> <el-table-column label="审核" width="220" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="table-btn-group"> <!-- 管理员、初审员、复审员 -->
<el-button <div v-if="((scope.row.one)&&(scope.row.two))" class="table-btn-group">
round <el-button round class="passed" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
class="passed" <el-button round class="rejected" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
:disabled="
!scope.row.two||
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="adopt(scope.row)"
>通过</el-button>
<el-button
round
class="rejected"
:disabled="
!scope.row.two||
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="reject(scope.row)"
>驳回</el-button>
</div> </div>
<!-- <div class="table-btn-group"> <div v-else-if="((scope.row.one === true)&&(scope.row.two === false))" class="table-btn-group">
<el-tooltip content="通过" placement="top"> <el-button round class="passed" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
<el-button circle @click="adopt(scope.row)"> <el-button round class="rejected" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
<i class="icon-table icon-enable"></i> </div>
</el-button> <div v-else-if="((scope.row.one === false)&&(scope.row.two === true))" class="table-btn-group">
</el-tooltip> <el-button round class="passed" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
<el-tooltip content="驳回" placement="top"> <el-button round class="rejected" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
<el-button circle @click="reject(scope.row)"> </div>
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
</div> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/page/check/video/index.vue
View file @ b719beb4
<template> /* <template>
<div class="listPage H100"> <div class="listPage H100">
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form" ref="form" onsubmit="return false;"> <el-form :inline="true" :model="form" ref="form" onsubmit="return false;">
...@@ -81,27 +81,18 @@ ...@@ -81,27 +81,18 @@
</el-table-column> </el-table-column>
<el-table-column label="审核" width="220" header-align="center" align="center"> <el-table-column label="审核" width="220" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="table-btn-group"> <!-- 管理员、初审员、复审员 -->
<el-button <div v-if="((scope.row.one)&&(scope.row.two))" class="table-btn-group">
round <el-button round class="passed" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
class="passed" <el-button round class="rejected" :disabled="scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
:disabled=" </div>
!scope.row.two|| <div v-else-if="((scope.row.one === true)&&(scope.row.two === false))" class="table-btn-group">
scope.row.status === 'REFUSED' || <el-button round class="passed" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
scope.row.status === 'APPROVED_FINAL' <el-button round class="rejected" :disabled="scope.row.status === 'TBCA'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
" </div>
@click="adopt(scope.row)" <div v-else-if="((scope.row.one === false)&&(scope.row.two === true))" class="table-btn-group">
>通过</el-button> <el-button round class="passed" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="adopt(scope.row)">通过</el-button>
<el-button <el-button round class="rejected" :disabled="scope.row.status === 'TBC'||scope.row.status === 'REFUSED' ||scope.row.status === 'APPROVED_FINAL'" @click="reject(scope.row)">驳回</el-button>
round
class="rejected"
:disabled="
!scope.row.two||
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>
...@@ -156,7 +147,7 @@ ...@@ -156,7 +147,7 @@
<!-- @contextmenu.prevent.capture --> <!-- @contextmenu.prevent.capture -->
<div class="dialog-content" @contextmenu.prevent> <div class="dialog-content" @contextmenu.prevent>
<span <div
v-for="(item, index) in videoList" v-for="(item, index) in videoList"
:key="index"> :key="index">
...@@ -169,12 +160,11 @@ ...@@ -169,12 +160,11 @@
controls controlsList='nodownload noremote footbar' controls controlsList='nodownload noremote footbar'
> >
<source :src="item.fileUrl" /> <source :src="item.fileUrl" />
<!-- <source :src="videoSrc" /> --> <!-- <source :src="videoSrc" /> -->
</video> </video>
<span>&nbsp;&nbsp;&nbsp;&nbsp; </span> <span>{{ item.fileName }}</span>
</span> <br>
</div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -182,6 +172,7 @@ ...@@ -182,6 +172,7 @@
<script> <script>
import axios from 'axios' import axios from 'axios'
let Base64 = require('js-base64').Base64
export default { export default {
components: {}, components: {},
data() { data() {
...@@ -522,47 +513,34 @@ export default { ...@@ -522,47 +513,34 @@ export default {
openDetails(row) { openDetails(row) {
if(row.operation === 'EDIT'){ if(row.operation === 'EDIT'){
// 参照后台更改文档审核记录的"operation"为"EDIT"时，调用的详情接口 // 参照后台更改文档审核记录的"operation"为"EDIT"时，调用的详情接口
this.getIsEditInfo(row.id) this.getInfo(row.id,"videoContent/getAudit/")
}else{ }else{
this.getInfo(row.refItemId); this.getInfo(row.refItemId,"videoContent/get/");
} }
}, },
getIsEditInfo(auditId){
let vm = this;
vm.$https(
{
url: "videoContent/getAudit/" + auditId,
method: "get",
authType: this.backToken
}
// param
)
.then(res => {
let data = res.data.data;
this.videoList = res.data.data.videoFileList
const arr = this.videoList
vm.FormVisible = true;
})
.catch(function(err) {
console.log(err);
});
},
// 获取详情视频 // 获取详情视频
getInfo(id) { getInfo(id,url) {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "videoContent/get/" + id, url: url + id,
method: "get", method: "get",
authType: this.backToken authType: this.backToken
} }
// param // param
) )
.then(res => { .then(res => {
let data = res.data.data; const videos = res.data.data.videoFileList
this.videoList = res.data.data.videoFileList for(var i=0;i<videos.length;i++){
const arr = this.videoList videos[i].fileUrl = Base64.decode(videos[i].intro)
}
this.videoList = videos
// this.videoList = res.data.data.videoFileList
// console.log(this.videoList[0].fileUrl,'视频地址 fileUrl')
// console.log(Base64.decode(this.videoList[0].intro),'解密地址')
// console.log(this.videoList[0].intro,'加密地址 intro')
vm.FormVisible = true; vm.FormVisible = true;
}) })
.catch(function(err) { .catch(function(err) {
...@@ -686,3 +664,4 @@ export default { ...@@ -686,3 +664,4 @@ export default {
@import "../../../style/table.less"; @import "../../../style/table.less";
@import "../../../style/pagination.less"; @import "../../../style/pagination.less";
</style> </style>
*/
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment