Commit ef5cba33 authored by qzhxx's avatar qzhxx

修改

parent a14ca8c6
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<el-form-item label="展板视频" :label-width="formLabelWidth"> <el-form-item label="展板视频" :label-width="formLabelWidth">
<div class="video-box"> <div class="video-box">
<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 /> <video :src="item.fileUrl" controls controlsList='nodownload noremote footbar' />
<span>{{ item.fileName }}</span> <span>{{ item.fileName }}</span>
</div> </div>
</div> </div>
......
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
:height="height" :height="height"
:width="width" :width="width"
align="center" align="center"
:controls="controls" controls controlsList='nodownload noremote footbar'
> >
<source :src="item.fileUrl" /> <source :src="item.fileUrl" />
</video> </video>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
:height="height" :height="height"
:width="width" :width="width"
align="center" align="center"
:controls="controls" controls controlsList='nodownload noremote footbar'
> >
<source :src="item.fileUrl" /> <source :src="item.fileUrl" />
</video> </video>
......
...@@ -60,6 +60,7 @@ export default { ...@@ -60,6 +60,7 @@ export default {
handleRemove(file, fileList) { handleRemove(file, fileList) {
this.$emit("imgUrl", ""); this.$emit("imgUrl", "");
this.imageUrl="" this.imageUrl=""
this.fileList=[]
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
this.dialogImageUrl = file.url; this.dialogImageUrl = file.url;
......
...@@ -70,6 +70,7 @@ export default { ...@@ -70,6 +70,7 @@ export default {
console.log(file, fileList); console.log(file, fileList);
this.$emit("qrcodeUrl", ""); this.$emit("qrcodeUrl", "");
this.imageUrl="" this.imageUrl=""
this.fileList=[]
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
this.dialogImageUrl = file.url; this.dialogImageUrl = file.url;
......
...@@ -230,12 +230,13 @@ export default { ...@@ -230,12 +230,13 @@ export default {
.then( .then(
(res) => { (res) => {
if (res.data.resultCode === '200') { if (res.data.resultCode === '200') {
_this.$message.success("新建成功!"); _this.$message.success("新建成功!");
//跳回用户列表 //跳回用户列表
_this.onSearch(); _this.onSearch();
_this.close() _this.close()
} else { } else {
_this.$message.error(res.data.msg); _this.$message.error(res.data.message);
} }
}, },
(error) => { (error) => {
...@@ -270,7 +271,7 @@ export default { ...@@ -270,7 +271,7 @@ export default {
_this.onSearch(); _this.onSearch();
_this.close() _this.close()
} else { } else {
_this.$message.error(res.data.msg); _this.$message.error(res.data.message);
} }
}, },
(error) => { (error) => {
......
...@@ -94,22 +94,22 @@ ...@@ -94,22 +94,22 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div class="table-btn-group"> <div class="table-btn-group">
<el-tooltip content="修改" placement="top"> <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> <i class="icon-table icon-edit"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="删除" placement="top"> <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> <i class="icon-table icon-del"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="上架" placement="top"> <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> <i class="icon-table icon-enable"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="下架" placement="top"> <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> <i class="icon-table icon-disable"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="w50" label="请选择展板分类" prop="boardCatIdList"> <el-form-item class="w50" label="请选择预设展板分类" prop="boardCatIdList">
<el-select <el-select
placeholder="请选择预设展板分类" placeholder="请选择预设展板分类"
@focus="getAssetTypeData" @focus="getAssetTypeData"
......
...@@ -129,22 +129,22 @@ ...@@ -129,22 +129,22 @@
</el-button> </el-button>
</el-tooltip> --> </el-tooltip> -->
<el-tooltip content="修改" placement="top"> <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> <i class="icon-table icon-edit"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="详情" placement="top"> <el-tooltip content="详情" placement="top">
<el-button circle @click="learnDetails(scope.row)"> <el-button :disabled="(scope.row.published)||(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="learnDetails(scope.row)">
<i class="icon-table icon-detail"></i> <i class="icon-table icon-detail"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="启用" placement="top"> <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> <i class="icon-table icon-enable"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip content="禁用" placement="top"> <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> <i class="icon-table icon-disable"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
......
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
<el-table-column label="操作" header-align="center" width="220" align="center"> <el-table-column label="操作" header-align="center" width="220" align="center">
<template slot-scope="scope" > <template slot-scope="scope" >
<div class="table-btn-group"> <div class="table-btn-group">
<el-tooltip content="修改" placement="top"> <el-tooltip content="修改" placement="top">
<el-button circle @click="openEdit(scope.row)"> <el-button :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="openEdit(scope.row)">
<i class="icon-table icon-edit"></i> <i class="icon-table icon-edit"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
<i class="icon-table icon-disable"></i> <i class="icon-table icon-disable"></i>
</el-button> </el-button>
</el-tooltip>--> </el-tooltip>-->
<el-tooltip content="删除" placement="top"> <el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)"> <el-button :disabled="(scope.row.auditStatus === 'TBC')||(scope.row.auditStatus === 'TBCA')" circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i> <i class="icon-table icon-del"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
......
...@@ -104,6 +104,7 @@ export default { ...@@ -104,6 +104,7 @@ export default {
} }
}; };
return { return {
nowDate: "", // 当前日期
fullscreenLoading: false, fullscreenLoading: false,
copyrightOwner:[], copyrightOwner:[],
videoContentCat:[], videoContentCat:[],
...@@ -160,6 +161,21 @@ export default { ...@@ -160,6 +161,21 @@ export default {
}, },
components: {}, components: {},
methods: { 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(){ getAssetCopyrightData(){
let vm = this; let vm = this;
...@@ -348,6 +364,7 @@ export default { ...@@ -348,6 +364,7 @@ export default {
} }
}, },
openFullScreen2() { openFullScreen2() {
this.formatDate()
const loading = this.$loading({ const loading = this.$loading({
lock: true, lock: true,
text: '下载中,请稍候。。。', text: '下载中,请稍候。。。',
...@@ -360,16 +377,18 @@ export default { ...@@ -360,16 +377,18 @@ export default {
}, },
// get测试 // get测试
multipleRemitGet() { multipleRemitGet() {
// this.openFullScreen2()
const loading = this.$loading({ let _this = this;
let str = _this.getMultipleSelect();
if(str){
const loading = this.$loading({
lock: true, lock: true,
text: '下载中,请稍候。。。', text: '下载中,请稍候。。。',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)' background: 'rgba(0, 0, 0, 0.7)'
}); });
let _this = this;
let str = _this.getMultipleSelect();
axios({ axios({
method: "get", method: "get",
url: 'http://111.203.232.175:8088/mall/asset/download', url: 'http://111.203.232.175:8088/mall/asset/download',
...@@ -382,14 +401,24 @@ export default { ...@@ -382,14 +401,24 @@ export default {
}, },
responseType: "blob", responseType: "blob",
}).then(res => { }).then(res => {
console.log(res)
loading.close(); loading.close();
let blobUrl = window.URL.createObjectURL(res.data); let blobUrl = window.URL.createObjectURL(res.data);
const aElement = document.createElement("a"); const aElement = document.createElement("a");
aElement.href = blobUrl; aElement.href = blobUrl;
aElement.download = 'aaaa.zip'; // aElement.download = res.data.fileName;
aElement.download = _this.nowDate + '视频集.zip';
aElement.click(); aElement.click();
window.URL.revokeObjectURL(blobUrl); window.URL.revokeObjectURL(blobUrl);
}) })
}else{
this.$message({
type: "info",
message: "请至少选择一个选项!"
});
}
// let _this = this; // let _this = this;
// let str = _this.getMultipleSelect(); // 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