Commit 0f7094d0 authored by qzhxx's avatar qzhxx

审核更改

parent e8f27e3c
...@@ -19,7 +19,18 @@ module.exports = { ...@@ -19,7 +19,18 @@ module.exports = {
pathRewrite: { pathRewrite: {
'^/mall': '/' // 重写接口 '^/mall': '/' // 重写接口
} }
},
'/aa': {
target: "http://111.203.232.175:8085",
// target: "http://192.168.110.67/mall",
// target: "http://192.168.204.66:8088/mall",
changeOrigin: true,
pathRewrite: {
'^/aa': '/' // 重写接口
}
} }
}, },
// Various Dev Server settings // Various Dev Server settings
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span> <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="展板名称" prop="name"></el-table-column> <el-table-column label="展板名称" prop="content"></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 label="审核项" prop="operation">
...@@ -544,9 +544,37 @@ export default { ...@@ -544,9 +544,37 @@ export default {
openDetails(row) { openDetails(row) {
let _this = this; let _this = this;
_this.FormVisible = true; _this.FormVisible = true;
_this.getInfo(row.refItemId); // _this.getInfo(row.refItemId);
$(".el-dialog__title").html(row.name + "展板详情");
if(row.operation === 'EDIT'){
// 参照后台更改文档审核记录的"operation"为"EDIT"时,调用的详情接口
this.getIsEditInfo(row.id)
}else{
this.getInfo(row.refItemId);
}
$(".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) {
let vm = this; let vm = this;
...@@ -561,24 +589,7 @@ export default { ...@@ -561,24 +589,7 @@ export default {
.then(res => { .then(res => {
let resData = res.data.data; let resData = res.data.data;
this.editForm = resData; this.editForm = resData;
// this.ruleForm = data;
// this.ruleForm = {
// videoContentCopyrightOwnerId :data.videoContentCopyrightOwnerId,
// assetId:data.assetId,
// assetTypeId:data.assetTypeId,
// 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
// }
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
......
...@@ -97,14 +97,19 @@ export default { ...@@ -97,14 +97,19 @@ export default {
}, },
methods: { methods: {
init() { init() {
this.getInfo(this.$route.query.id); if(this.$route.query.id){
this.getInfo(this.$route.query.id,'learningContent/get/');
}else if(this.$route.query.auditId){
this.getInfo(this.$route.query.auditId,'learningContent/getAudit/');
}
}, },
// 获取版权方详情 // 获取版权方详情
getInfo(id) { getInfo(id,url) {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
url: "learningContent/get/" + id, url: url + id,
method: "get", method: "get",
authType: this.backToken, authType: this.backToken,
} }
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span> <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="学习内容名称" prop="name"></el-table-column> <el-table-column label="学习内容名称" prop="content"></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 label="审核项" prop="operation">
...@@ -512,7 +512,14 @@ export default { ...@@ -512,7 +512,14 @@ export default {
}); });
}, },
openDetails(row) { openDetails(row) {
this.$router.push({ path: "checkLearnDetails", query: { id: row.refItemId } }) if(row.operation === 'EDIT'){
// 参照后台更改文档审核记录的"operation"为"EDIT"时,调用的详情接口
// this.getIsEditInfo(row.id)
this.$router.push({ path: "checkLearnDetails", query: { auditId: row.id } })
}else{
this.$router.push({ path: "checkLearnDetails", query: { id: row.refItemId } })
}
// let _this = this; // let _this = this;
// _this.FormVisible = true; // _this.FormVisible = true;
// $('.el-dialog__title').html('请填写驳回原因'); // $('.el-dialog__title').html('请填写驳回原因');
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span> <span>{{ (page.currentPage - 1) * 10 + scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="视频名称" prop="name"></el-table-column> <el-table-column label="视频名称" prop="content"></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 label="审核项" prop="operation">
...@@ -167,6 +167,9 @@ ...@@ -167,6 +167,9 @@
controls controlsList='nodownload noremote footbar' controls controlsList='nodownload noremote footbar'
> >
<source :src="item.fileUrl" /> <source :src="item.fileUrl" />
<!-- <source :src="videoSrc" /> -->
</video> </video>
<span>&nbsp;&nbsp;&nbsp;&nbsp; </span> <span>&nbsp;&nbsp;&nbsp;&nbsp; </span>
</span> </span>
...@@ -176,7 +179,7 @@ ...@@ -176,7 +179,7 @@
</template> </template>
<script> <script>
import axios from 'axios'
export default { export default {
components: {}, components: {},
data() { data() {
...@@ -264,6 +267,7 @@ export default { ...@@ -264,6 +267,7 @@ export default {
}, },
computed: {}, computed: {},
mounted() { mounted() {
// this.getBolb()
this.onSearch(); this.onSearch();
// this.getPermis(); // this.getPermis();
}, },
...@@ -334,6 +338,7 @@ export default { ...@@ -334,6 +338,7 @@ export default {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name, name: _this.form.name,
// content:_this.form.content,
status: _this.form.status, status: _this.form.status,
type: "VIDEO_CONTENT" type: "VIDEO_CONTENT"
}; };
...@@ -513,9 +518,34 @@ export default { ...@@ -513,9 +518,34 @@ export default {
}, },
// 详情 // 详情
openDetails(row) { openDetails(row) {
this.getInfo(row.refItemId); if(row.operation === 'EDIT'){
// 参照后台更改文档审核记录的"operation"为"EDIT"时,调用的详情接口
this.getIsEditInfo(row.id)
}else{
this.getInfo(row.refItemId);
}
}, },
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) {
let vm = this; let vm = this;
...@@ -529,18 +559,34 @@ export default { ...@@ -529,18 +559,34 @@ export default {
) )
.then(res => { .then(res => {
let data = res.data.data; let data = res.data.data;
console.log(res.data.data.videoFileList[0].fileUrl);
this.videoList = res.data.data.videoFileList this.videoList = res.data.data.videoFileList
console.log(this.videoSrc); const arr = this.videoList
vm.FormVisible = true; vm.FormVisible = true;
// this.videoSrc = res.data.data.videoFileList[0].fileUrl;
// this.videoImg = data.thumbnail;
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
getBolb(){
const _this =this
axios({
method: "get",
url: `/aa/group1/M00/00/54/wKhuVWCBObuAUSIQA6Mwb1hO1jk035.mp4`,
responseType: "blob",
}).then(res => {
debugger;
var blob = res.data;
console.log(window.URL.createObjectURL(blob), '加密的视频地址')
_this.videoSrc = window.URL.createObjectURL(blob)
// video.onload = function(e) {
// window.URL.revokeObjectURL(video.src);
// };
// var src = window.URL.createObjectURL(blob);
// addSrc(video, src); // video为视频播放元素
})
},
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
let _this = this; let _this = this;
......
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