Skip to content

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

优化

parent c9174ccb
Show whitespace changes
Inline Side-by-side
Showing with 301 additions and 21 deletions
src/config/httpServer.js
View file @ e26256ac
......@@ -100,7 +100,7 @@ const httpServer = (opts, data, file, timeout) => {
// loadingInstance.close();
// }, 10000)
axios(httpDefaultOpts).then((res) => {
console.log(res)
// console.log(res)
if(res.data){
loadingInstance.close();
// clearTimeout(markIndex)
......
src/page/content/components/dialog/addCopyright.vue
View file @ e26256ac
......@@ -18,7 +18,7 @@
label-position="top"
>
<el-form-item label="版权方名称" prop="name">
<el-input v-model="ruleForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="版权方有效期" prop="value1">
<el-date-picker
......
src/page/content/components/uploadVue/uploadAudio.vue
View file @ e26256ac
......@@ -28,6 +28,7 @@ export default {
},
data() {
return {
fullscreenLoading: false,
loading:false,
filedata: [],
fileArr: [],
......@@ -38,7 +39,13 @@ export default {
},
methods: {
submitUpload() {
this.loading = true
const loading = this.$loading({
lock: true,
text: '上传中，请稍候。。。',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
// this.loading = true
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法，多个文件调用多次
let _this = this;
......@@ -54,7 +61,8 @@ export default {
.then(res => {
let resData = res.data;
console.log(res)
this.loading = false
loading.close();
// this.loading = false
if (resData.resultCode == "200") {
_this.$message.success('上传成功！')
const data = resData.data.fileList
......
src/page/content/components/uploadVue/uploadDatum.vue
View file @ e26256ac
......@@ -33,6 +33,7 @@ export default {
},
data() {
return {
fullscreenLoading: false,
loading:false,
filedata: [],
fileArr: [],
......@@ -42,7 +43,13 @@ export default {
},
methods: {
submitUpload() {
this.loading = true
const loading = this.$loading({
lock: true,
text: '上传中，请稍候。。。',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
// this.loading = true
this.filedata = new FormData(); // 用FormData存放上传文件
this.$refs.upload.submit(); // 会循环调用uploadFile方法，多个文件调用多次
......@@ -57,9 +64,10 @@ export default {
this.filedata
)
.then((res) => {
this.loading = false
// this.loading = false
let resData = res.data;
if (resData.resultCode == "200") {
loading.close();
_this.$message.success('上传成功！')
const data = resData.data.fileList;
let newArray = data.map((item) => item.id);
......
src/page/content/components/uploadVue/uploadFile copy.vue 0 → 100644
View file @ e26256ac
<template>
<div>
<el-upload
ref="upload"
accept=".mp4,.flv,.mpeg,.mpg"
:multiple="true"
:http-request="uploadFile"
:file-list="fileList"
action
:auto-upload="false"
:before-upload="beforeAvatarUpload"
>
<i class="el-icon-plus fileUpload"></i>
</el-upload>
<el-button style="margin-left: 10px;" size="small" type="success" v-loading="loading" @click="submitUpload">上传到服务器</el-button>
</div>
</template>
<script>
export default {
props:{
fileList:{
type:Array,
default:[]
},
},
data() {
return {
fullscreenLoading: false,
loading:false,
filedata:[],
fileArr: [],
fileList:[],
// fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
};
},
methods: {
openFullScreen2() {
const loading = this.$loading({
lock: true,
text: '上传中，请稍候。。。',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
},
submitUpload() { // 导入
// this.openFullScreen2()
const loading = this.$loading({
lock: true,
text: '上传中，请稍候。。。',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
// this.loading = true
let tempData = this.filedata
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法，多个文件调用多次
let _this = this;
_this
.$https(
{
method: "post",
url: "file/video/content/upload",
authType: this.backToken
},
this.filedata
)
.then(res => {
let resData = res.data;
console.log(res)
// this.loading = false
if (resData.resultCode == "200") {
loading.close();
_this.$message.success('上传成功！')
const data = resData.data.fileList;
let newArray = data.map((item) => item.id);
let editArray =[]
if(this.fileList.length){
editArray = this.fileList.map(item=>item.id)
}
this.$emit("videoList", [...newArray,...editArray]);
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
},
uploadFile(file) {
this.filedata.append('file', file.file)
},
beforeAvatarUpload(file) {
const isLt10G = file.size / 1024 / 1024 / 1024 < 10;
if (!isLt10G) {
this.$message.error("上传文件大小不能超过 10GB!");
}
return isLt10G;
}
}
};
</script>
<style>
.el-upload .fileUpload {
width: 148px;
height: 148px;
line-height: 148px!important;
margin: 0 auto;
border: 1px dashed #c0ccda;
font-size: 24px;
font: #ccc;
}
</style>
src/page/content/components/uploadVue/uploadFile.vue
View file @ e26256ac
......@@ -73,10 +73,10 @@ export default {
.then(res => {
let resData = res.data;
console.log(res)
loading.close();
// this.loading = false
if (resData.resultCode == "200") {
loading.close();
_this.$message.success('上传成功！')
const data = resData.data.fileList;
let newArray = data.map((item) => item.id);
......@@ -98,6 +98,7 @@ export default {
},
uploadFile(file) {
console.log(file)
this.filedata.append('file', file.file)
},
beforeAvatarUpload(file) {
......
src/page/content/components/uploadVue/uploadFolder.vue 0 → 100644
View file @ e26256ac
<template>
<form enctype="multipart/form-data">
选择多个文件：
<input type="file" name="files" multiple="multiple" @change="getFiles($event)"/>
<br />选择文件夹，遍历该文件夹下所有文件：
<input @change="getFiles($event)" type="file" name="files" webkitdirectory mozdirectory />
<br />
<a @click.stop="upload">上传</a>
</form>
<!-- <div>
{{files}}
选择多个文件：
<input @change="getFiles($event)" type="file" multiple="multiple" />
<br />选择文件夹，遍历该文件夹下所有文件：
<input @change="getFiles($event)" type="file" webkitdirectory mozdirectory />
<br />
<button @click.stop="upload">上传</button>
</div> -->
</template>
<script>
import axios from "axios";
export default {
name: "UploadFileVue",
data() {
return {
files: []
};
},
computed: {
headers() {
return {
Authorization: localStorage.getItem("backToken") || ""
};
}
},
methods: {
getFiles: function(event) {
console.log(event)
var files = event.target.files;
for (var i = 0; i < files.length; i++) {
this.files.push(files[i]);
}
console.log(this.files,'--')
},
upload: function() {
console.log(this.files);
// alert("111")
var formData = new FormData();
for (var i = 0; i < this.files.length; i++) {
formData.append("file", this.files[i]);
}
console.log(formData)
let _this = this;
_this
.$https(
{
method: "post",
url: "file/video/content/upload",
authType: this.backToken
},
formData
)
.then(res => {
let resData = res.data;
console.log(res);
// this.loading = false
if (resData.resultCode == "200") {
_this.$message.success("上传成功！");
// const data = resData.data.fileList;
// let newArray = data.map((item) => item.id);
// let editArray =[]
// if(this.fileList.length){
// editArray = this.fileList.map(item=>item.id)
// }
// this.$emit("videoList", [...newArray,...editArray]);
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
// axios({
// method: "post",
// url: "http://111.203.232.175:8088/mall/file/video/content/upload",
// data: {
// formData
// },
// headers: {
// Authorization: localStorage.getItem("backToken") || ""
// },
// responseType: "blob"
// }).then(res => {
// console.log(res);
// alert('文件夹上传成功！')
// });
// this.$axios.post("http://111.203.232.175:8088/mall/file/video/content/upload", formData, {
// headers: {
// // 'Content-Type': 'multipart/form-data',
// Authorization: localStorage.getItem("backToken") || "",
// }
// }).then(function(response) {
// console.log(respose)
// // 请求成功
// }, function(err) {
// })
}
}
};
</script>
<style>
</style>
\ No newline at end of file
src/page/content/display/classify/index.vue
View file @ e26256ac
......@@ -110,7 +110,7 @@
class="party-form"
>
<el-form-item label="展板分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="classForm.remarks"></el-input>
......
src/page/content/display/content/add.vue
View file @ e26256ac
......@@ -18,8 +18,16 @@
:inline="true"
label-position="top"
>
<!-- <el-form-item label="多文件上传测试" >
<div style="color:red;">
（可支持word、PDF、ppt、视频类型文件及图片上传）
</div>
<upload-folder ></upload-folder>
</el-form-item> -->
<el-form-item label="展板名称" prop="name" class="w100">
<el-input v-model="ruleForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="展板版权方" class="w50" prop="boardCopyrightOwnerId">
......@@ -153,6 +161,7 @@ import uploadDatum from "@/page/content/components/uploadVue/uploadDatum";
import uploadAudio from "@/page/content/components/uploadVue/uploadAudio";
import mulDisplay from "@/page/content/components/mulClassify/mulDisplay";
import addCopyright from "@/page/content/components/dialog/addCopyright";
import uploadFolder from "@/page/content/components/uploadVue/uploadFolder";
export default {
components: {
uploadImg,
......@@ -161,7 +170,8 @@ export default {
uploadAudio,
mulDisplay,
addCopyright,
uploadQrcode
uploadQrcode,
uploadFolder
},
data() {
return {
......
src/page/content/display/content/index.vue
View file @ e26256ac
......@@ -3,6 +3,7 @@
<msg-dialog ref="msgDialog" :msgInfo="msgInfo" />
<div class="search-container">
<el-form :inline="true" :model="form" onsubmit="return false;">
<el-form-item >
<el-input
placeholder="请输入展板名称"
......
src/page/content/display/copyright/add.vue
View file @ e26256ac
......@@ -17,7 +17,7 @@
label-position="top"
>
<el-form-item label="版权方名称" prop="name" class="w50">
<el-input v-model="ruleForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="版权方有效期" prop="value1">
<el-date-picker
......@@ -75,7 +75,7 @@
class="party-form"
>
<el-form-item label="展板分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="classForm.remarks"></el-input>
......
src/page/content/display/copyright/index.vue
View file @ e26256ac
......@@ -120,7 +120,7 @@
class="party-form"
>
<el-form-item label="版权方名称" prop="name">
<el-input v-model="classForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="版权方有效期" prop="valueDate">
<el-date-picker
......
src/page/content/video/classify/index.vue
View file @ e26256ac
......@@ -101,7 +101,7 @@
class="party-form"
>
<el-form-item label="视频分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="classForm.remarks"></el-input>
......
src/page/content/video/content/add.vue
View file @ e26256ac
......@@ -16,8 +16,14 @@
:inline="true"
label-position="top"
>
<!-- <el-form-item label="多文件上传测试" >
<div style="color:red;">
（可支持word、PDF、ppt、视频类型文件及图片上传）
</div>
<upload-folder ></upload-folder>
</el-form-item> -->
<el-form-item label="视频名称" prop="name" class="w100">
<el-input v-model="ruleForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="请选择视频版权方" prop="videoContentCopyrightOwnerId">
......@@ -95,7 +101,7 @@
class="party-form"
>
<el-form-item label="视频分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注" class="w100" prop="remarks">
<el-input type="textarea" v-model="classForm.remarks"></el-input>
......@@ -137,13 +143,15 @@ import uploadFile from '@/page/content/components/uploadVue/uploadFile'
import uploadDatum from '@/page/content/components/uploadVue/uploadDatum'
import mulDisplay from '@/page/content/components/mulClassify/mulDisplay'
import addCopyright from '@/page/content/components/dialog/addCopyright'
import uploadFolder from "@/page/content/components/uploadVue/uploadFolder";
export default {
components:{
uploadImg,
uploadFile,
uploadDatum,
mulDisplay,
addCopyright
addCopyright,
uploadFolder
},
data() {
return {
......
src/page/content/video/copyright/add.vue
View file @ e26256ac
......@@ -17,7 +17,7 @@
label-position="top"
>
<el-form-item label="版权方名称" prop="name" class="w50">
<el-input v-model="ruleForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="版权方有效期" prop="value1">
<el-date-picker
......@@ -74,7 +74,7 @@
class="party-form"
>
<el-form-item label="视频分类名称" prop="name">
<el-input v-model="classForm.name"></el-input>
<el-input oninput="value = value.trim()" v-model="classForm.name"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input type="textarea" v-model="classForm.remarks"></el-input>
......
src/page/content/video/remit/index.vue
View file @ e26256ac
......@@ -54,7 +54,7 @@
</div>
<div class="table-content">
<div class="btn-group">
<el-button type="primary" @click="downloadCipher()">导出加密秘钥</el-button>
<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>
......
src/router/index.js
View file @ e26256ac
......@@ -11,6 +11,7 @@ import { accoutsRoute } from './accout'
import { STBoxRoute } from './STBox'
import { learnRoute } from './learn'
const router = new Router({
// mode:'history',
routes: [
{
path: '/',
......
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