Skip to content

N
national_museum_vod
Commit b0a16dfc authored by xulili's avatar xulili
Browse files
Options

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

parents 578822db 31fee1a1
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 25 deletions
src/page/check/display/index.vue
View file @ b0a16dfc
......@@ -199,7 +199,7 @@
<el-form-item label="展板视频" :label-width="formLabelWidth">
<div class="video-box">
<div class="video-item" v-for="(item, index) in editForm.videoList" :key="index">
<video :src="item.fileUrl" controls />
<video :src="item.fileUrl" controls controlsList='nodownload noremote footbar' />
<span>{{ item.fileName }}</span>
</div>
</div>
......
src/page/check/video/index.vue
View file @ b0a16dfc
......@@ -163,7 +163,7 @@
:height="height"
:width="width"
align="center"
:controls="controls"
controls controlsList='nodownload noremote footbar'
>
<source :src="item.fileUrl" />
</video>
......
src/page/content/components/dialog/videoDialog.vue
View file @ b0a16dfc
......@@ -14,7 +14,7 @@
:height="height"
:width="width"
align="center"
:controls="controls"
controls controlsList='nodownload noremote footbar'
>
<source :src="item.fileUrl" />
</video>
......
src/page/content/components/uploadVue/uploadImg.vue
View file @ b0a16dfc
......@@ -60,6 +60,7 @@ export default {
handleRemove(file, fileList) {
this.$emit("imgUrl", "");
this.imageUrl=""
this.fileList=[]
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
......
src/page/content/components/uploadVue/uploadQrcode.vue
View file @ b0a16dfc
......@@ -70,6 +70,7 @@ export default {
console.log(file, fileList);
this.$emit("qrcodeUrl", "");
this.imageUrl=""
this.fileList=[]
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
......
src/page/content/display/classify/index.vue
View file @ b0a16dfc
......@@ -230,12 +230,13 @@ export default {
.then(
(res) => {
if (res.data.resultCode === '200') {
_this.$message.success("新建成功！");
//跳回用户列表
_this.onSearch();
_this.close()
} else {
_this.$message.error(res.data.msg);
_this.$message.error(res.data.message);
}
},
(error) => {
......@@ -270,7 +271,7 @@ export default {
_this.onSearch();
_this.close()
} else {
_this.$message.error(res.data.msg);
_this.$message.error(res.data.message);
}
},
(error) => {
......
src/page/content/display/content/index.vue
View file @ b0a16dfc
......@@ -94,22 +94,22 @@
<template slot-scope="scope" >
<div class="table-btn-group">
<el-tooltip content="修改" placement="top">
<el-button circle :disabled="scope.row.published" @click="openEdit(scope.row)">
<el-button circle :disabled="(scope.row.published)||(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" @click="openEdit(scope.row)">
<i class="icon-table icon-edit"></i>
</el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button circle :disabled="scope.row.published" @click="handleDelete(scope.row)">
<el-button circle :disabled="(scope.row.published)||(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip>
<el-tooltip content="上架" placement="top">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
<el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" v-show="!scope.row.published" @click="handlePublish(scope.row,true)">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="下架" placement="top">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="scope.row.published" @click="handlePublish(scope.row,false)">
<el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" v-show="scope.row.published" @click="handlePublish(scope.row,false)">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
......
src/page/content/display/copyright/add.vue
View file @ b0a16dfc
......@@ -30,7 +30,7 @@
></el-date-picker>
</el-form-item>
<el-form-item class="w50" label="请选择展板分类" prop="boardCatIdList">
<el-form-item class="w50" label="请选择预设展板分类" prop="boardCatIdList">
<el-select
placeholder="请选择预设展板分类"
@focus="getAssetTypeData"
......
src/page/content/learn/content/index.vue
View file @ b0a16dfc
......@@ -129,7 +129,7 @@
</el-button>
</el-tooltip> -->
<el-tooltip content="修改" placement="top">
<el-button circle @click="openEdit(scope.row)">
<el-button :disabled="(scope.row.published)||(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="openEdit(scope.row)">
<i class="icon-table icon-edit"></i>
</el-button>
</el-tooltip>
......@@ -139,12 +139,12 @@
</el-button>
</el-tooltip>
<el-tooltip content="启用" placement="top">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
<el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" v-show="!scope.row.published" @click="handlePublish(scope.row, 'True')">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="禁用" placement="top">
<el-button circle :disabled="(scope.row.auditStatus !== 'APPROVED_FINAL')||(scope.row.auditStatus === 'REFUSED')" v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
<el-button circle :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" v-show="scope.row.published" @click="handlePublish(scope.row, 'False')">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
......
src/page/content/learn/project/index.vue
View file @ b0a16dfc
......@@ -281,7 +281,7 @@ export default {
)
.then(
(res) => {
if (res.data.resultCode == 200 || res.data.resultCode == 201) {
if (res.data.resultCode === "200" || res.data.resultCode === "201") {
_this.$message({
type: "success",
message: res.data.message,
......@@ -296,7 +296,7 @@ export default {
} else {
_this.$message({
type: "error",
message: res.data.msg,
message: res.data.message,
});
}
},
......
src/page/content/video/content/index.vue
View file @ b0a16dfc
......@@ -84,8 +84,8 @@
<el-table-column label="操作" header-align="center" width="220" align="center">
<template slot-scope="scope" >
<div class="table-btn-group">
<el-tooltip content="修改" placement="top">
<el-button circle @click="openEdit(scope.row)">
<el-tooltip content="修改" placement="top">
<el-button :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="openEdit(scope.row)">
<i class="icon-table icon-edit"></i>
</el-button>
</el-tooltip>
......@@ -99,8 +99,8 @@
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>-->
<el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<el-tooltip content="删除" placement="top">
<el-button :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip>
......
src/page/content/video/remit/index.vue
View file @ b0a16dfc
......@@ -54,6 +54,7 @@
</div>
<div class="table-content">
<div class="btn-group">
<el-button type="primary" @click="downloadCipher()">导出加密秘钥</el-button>
<el-button type="primary" @click="multipleRemitGet()">汇出</el-button>
<!-- <el-button type="primary" @click="multipleRemit()">汇出</el-button> -->
</div>
......@@ -79,7 +80,6 @@
</div>
<div class="partyt-pagination">
<el-pagination
background
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.pageSize"
......@@ -104,6 +104,7 @@ export default {
}
};
return {
nowDate: "", // 当前日期
fullscreenLoading: false,
copyrightOwner:[],
videoContentCat:[],
......@@ -160,6 +161,21 @@ export default {
},
components: {},
methods: {
formatDate() {
let date = new Date();
let year = date.getFullYear(); // 年
let month = date.getMonth() + 1; // 月
let day = date.getDate(); // 日
let week = date.getDay(); // 星期
let weekArr = [ "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" ];
let hour = date.getHours(); // 时
hour = hour < 10 ? "0" + hour : hour; // 如果只有一位，则前面补零
let minute = date.getMinutes(); // 分
minute = minute < 10 ? "0" + minute : minute; // 如果只有一位，则前面补零
let second = date.getSeconds(); // 秒
second = second < 10 ? "0" + second : second; // 如果只有一位，则前面补零
this.nowDate = `${year}${month}${day}}`;
},
// 获取展板分类列表
getAssetCopyrightData(){
let vm = this;
......@@ -348,6 +364,7 @@ export default {
}
},
openFullScreen2() {
this.formatDate()
const loading = this.$loading({
lock: true,
text: '下载中，请稍候。。。',
......@@ -358,18 +375,54 @@ export default {
// loading.close();
// }, 2000);
},
// get测试
multipleRemitGet() {
// this.openFullScreen2()
const loading = this.$loading({
// 导出机顶盒文件加密秘钥
downloadCipher(){
const loading = this.$loading({
lock: true,
text: '下载中，请稍候。。。',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
axios({
method: "get",
url: 'http://111.203.232.175:8088/mall/asset/downloadCipher',
params: {
// idList:str
},
headers: {
"Authorization": localStorage.getItem("backToken") || "",
},
responseType: "blob",
}).then(res => {
console.log(res)
loading.close();
let blobUrl = window.URL.createObjectURL(res.data);
const aElement = document.createElement("a");
aElement.href = blobUrl;
// aElement.download = res.data.fileName;
aElement.download = '密钥.zip';
aElement.click();
window.URL.revokeObjectURL(blobUrl);
})
},
// get测试
multipleRemitGet() {
let _this = this;
let str = _this.getMultipleSelect();
if(str){
const loading = this.$loading({
lock: true,
text: '下载中，请稍候。。。',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
axios({
method: "get",
url: 'http://111.203.232.175:8088/mall/asset/download',
......@@ -382,14 +435,24 @@ export default {
},
responseType: "blob",
}).then(res => {
console.log(res)
loading.close();
let blobUrl = window.URL.createObjectURL(res.data);
const aElement = document.createElement("a");
aElement.href = blobUrl;
aElement.download = 'aaaa.zip';
// aElement.download = res.data.fileName;
aElement.download = _this.nowDate + '视频集.zip';
aElement.click();
window.URL.revokeObjectURL(blobUrl);
})
}else{
this.$message({
type: "info",
message: "请至少选择一个选项！"
});
}
// let _this = this;
// let str = _this.getMultipleSelect();
......
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