Skip to content

N
national_museum_vod
Commit 6a6224b6 authored by 乐宝呗666's avatar 乐宝呗666
Browse files
Options

Merge branch 'master' into dev_fbl

parents 43510351 f6166f66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1503 additions and 1022 deletions
src/page/check/learn/details.vue
View file @ 6a6224b6
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
<el-form-item label="展板名称" class="w50"> <el-form-item label="展板名称" class="w50">
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</el-form-item> </el-form-item>
<el-form-item label="展板简介"> <el-form-item label="展板简介">
<span>{{ item.remarks }}</span> <span>{{ item.remarks }}</span>
</el-form-item> </el-form-item>
......
src/page/check/video/details.vue deleted 100644 → 0
View file @ 43510351
fefe
\ No newline at end of file
src/page/check/video/index.vue
View file @ 6a6224b6
This diff is collapsed.
src/page/content/components/dialog/videoDialog.vue
View file @ 6a6224b6
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
export default { export default {
data() { data() {
return { return {
dialogVisible:true, dialogVisible:false,
videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4', videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb', videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
playStatus: '', playStatus: '',
......
src/page/content/components/uploadVue/uploadAudio--.vue 0 → 100644
View file @ 6a6224b6
<template>
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/audio/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
</el-upload>
</template>
<script>
export default {
data() {
return {
fileList: []
};
},
methods: {
handleAvatarSuccess(res, file) {
console.log(res)
console.log(res.data.fileList)
const data = res.data.fileList
let newArray = data.map((item) => {
return item.id;
})
this.$emit('audioList', newArray)
},
submitUpload() {
this.$refs.upload.submit();
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
}
}
}
</script>
<style>
</style>
\ No newline at end of file
src/page/content/components/uploadVue/uploadAudio.vue
View file @ 6a6224b6
<template> <template>
<div>
<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
<!-- :show-file-list="false" -->
<!-- :file-list="fileList" -->
<!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
<el-upload <el-upload
class="upload-demo" ref="upload"
ref="upload" :multiple="true"
action="http://192.168.110.67/mall/file/audio/upload" :http-request="uploadFile"
:on-preview="handlePreview" :file-list="fileList"
:on-remove="handleRemove" action
:file-list="fileList" :auto-upload="false"
:on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"
:auto-upload="false"> >
<el-button slot="trigger" size="small" type="primary">选取文件</el-button> <i class="el-icon-plus fileUpload"></i>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div> </el-upload>
</el-upload> <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
</div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
fileList: [] 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: {
submitUpload() { // 导入
let tempData = this.filedata
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法，多个文件调用多次
let _this = this;
_this
.$https(
{
method: "post",
url: "file/audio/upload",
authType: this.backToken
},
this.filedata
)
.then(res => {
let resData = res.data;
console.log(res)
if (resData.resultCode == "200") {
// alert("上传成功");
console.log(resData.data.fileList)
const data = resData.data.fileList
console.log(data)
let newArray = data.map((item) => {
return item.id;
})
this.$emit('audioList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
}, },
methods: { uploadFile(file) {
handleAvatarSuccess(res, file) { this.filedata.append('file', file.file)
console.log(res)
console.log(res.url)
this.$emit('audioList', res.urlList)
}, },
submitUpload() { beforeAvatarUpload(file) {
this.$refs.upload.submit(); const isLt5M = file.size / 1024 / 1024 < 5;
}, if (!isLt5M) {
handleRemove(file, fileList) { this.$message.error("上传文件大小不能超过 5MB!");
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
} }
return isLt5M;
} }
} }
};
</script> </script>
<style> <style>
.fileUpload {
</style> width: 148px;
\ No newline at end of file height: 148px;
line-height: 148px;
margin: 0 auto;
border: 1px dashed #c0ccda;
font-size: 24px;
font: #ccc;
}
</style>
src/page/content/components/uploadVue/uploadDatum--.vue 0 → 100644
View file @ 6a6224b6
<template>
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/datum/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
</el-upload>
</template>
<script>
export default {
data() {
return {
fileList: []
};
},
methods: {
handleAvatarSuccess(res, file) {
console.log(res)
// console.log(res.url)
const data = res.data.fileList
let newArray = data.map((item) => {
return item.id;
})
this.$emit('datumList', newArray)
},
submitUpload() {
this.$refs.upload.submit();
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
}
}
}
</script>
<style>
</style>
\ No newline at end of file
src/page/content/components/uploadVue/uploadDatum.vue
View file @ 6a6224b6
<template> <template>
<div>
<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
<!-- :show-file-list="false" -->
<!-- :file-list="fileList" -->
<!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
<el-upload <el-upload
class="upload-demo" ref="upload"
ref="upload" :multiple="true"
action="http://192.168.110.67/mall/file/datum/upload" :http-request="uploadFile"
:on-preview="handlePreview" :file-list="fileList"
:on-remove="handleRemove" action
:file-list="fileList" :auto-upload="false"
:on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"
:auto-upload="false"> >
<el-button slot="trigger" size="small" type="primary">选取文件</el-button> <i class="el-icon-plus fileUpload"></i>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div> </el-upload>
</el-upload> <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
</div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
fileList: [] 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: {
submitUpload() { // 导入
let tempData = this.filedata
this.filedata = new FormData() // 用FormData存放上传文件
this.$refs.upload.submit() // 会循环调用uploadFile方法，多个文件调用多次
let _this = this;
_this
.$https(
{
method: "post",
url: "file/datum/upload",
authType: this.backToken
},
this.filedata
)
.then(res => {
let resData = res.data;
console.log(res)
if (resData.resultCode == "200") {
// alert("上传成功");
console.log(resData.data.fileList)
const data = resData.data.fileList
console.log(data)
let newArray = data.map((item) => {
return item.id;
})
this.$emit('datumList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
}, },
methods: { uploadFile(file) {
handleAvatarSuccess(res, file) { this.filedata.append('file', file.file)
console.log(res)
console.log(res.url)
this.$emit('datumList', res.urlList)
}, },
submitUpload() { beforeAvatarUpload(file) {
this.$refs.upload.submit(); const isLt5M = file.size / 1024 / 1024 < 5;
}, if (!isLt5M) {
handleRemove(file, fileList) { this.$message.error("上传文件大小不能超过 5MB!");
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
} }
return isLt5M;
} }
} }
};
</script> </script>
<style> <style>
.fileUpload {
</style> width: 148px;
\ No newline at end of file height: 148px;
line-height: 148px;
margin: 0 auto;
border: 1px dashed #c0ccda;
font-size: 24px;
font: #ccc;
}
</style>
src/page/content/components/uploadVue/uploadFile--.vue 0 → 100644
View file @ 6a6224b6
<template>
<el-upload
class="upload-demo"
ref="upload"
action="http://192.168.110.67/mall/file/video/content/upload"
:on-preview="handlePreview"
:on-remove="handleRemove"
:file-list="fileList"
:on-success="handleAvatarSuccess"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div>
</el-upload>
</template>
<script>
export default {
data() {
return {
fileList: []
};
},
methods: {
handleAvatarSuccess(res, file) {
const data = res.data.fileList
let newArray = data.map((item) => {
return item.id;
})
this.$emit('videoList', newArray)
// console.log(newArray,'----idArray')
},
submitUpload() {
this.$refs.upload.submit();
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
}
}
}
</script>
<style>
</style>
\ No newline at end of file
src/page/content/components/uploadVue/uploadFile.vue
View file @ 6a6224b6
<template> <template>
<div>
<!-- accept="application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" -->
<!-- :show-file-list="false" -->
<!-- :file-list="fileList" -->
<!-- action="http://192.168.110.67/mall/file/video/content/upload" -->
<el-upload <el-upload
class="upload-demo" ref="upload"
ref="upload" :multiple="true"
action="http://192.168.110.67/mall/file/video/content/upload" :http-request="uploadFile"
:on-preview="handlePreview" :file-list="fileList"
:on-remove="handleRemove" action
:file-list="fileList" :auto-upload="false"
:on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload"
:auto-upload="false"> >
<el-button slot="trigger" size="small" type="primary">选取文件</el-button> <i class="el-icon-plus fileUpload"></i>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
<div slot="tip" class="el-upload__tip">（支持上传多个视频及视频文件夹，视频语言支持汉语、蒙语、藏语、维吾尔语、英语，视频命名规定：视频名称+语言）</div> </el-upload>
</el-upload> <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
</div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
fileList: [] 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: {
submitUpload() { // 导入
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)
if (resData.resultCode == "200") {
// alert("上传成功");
console.log(resData.data.fileList)
const data = resData.data.fileList
console.log(data)
let newArray = data.map((item) => {
return item.id;
})
this.$emit('videoList', newArray)
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
}, },
methods: { uploadFile(file) {
handleAvatarSuccess(res, file) { this.filedata.append('file', file.file)
const data = res.data.fileList
let newArray = data.map((item) => {
return item.id;
})
this.$emit('videoList', newArray)
// console.log(newArray,'----idArray')
}, },
submitUpload() { beforeAvatarUpload(file) {
this.$refs.upload.submit(); const isLt5M = file.size / 1024 / 1024 < 5;
}, if (!isLt5M) {
handleRemove(file, fileList) { this.$message.error("上传文件大小不能超过 5MB!");
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
} }
return isLt5M;
},
handleRequest(file) {
// let formData = new FormData();
// this.fileArr.push(file.file)
// console.log(this.fileArr,'文件数组')
// formData.append("file", this.fileArr);
let formData = new FormData();
if (Array.isArray(file)) {
file.forEach(item => {
formData.append("file", item.file);
});
} else {
formData.append("file", file.file);
}
let _this = this;
_this
.$https(
{
method: "post",
url: "file/video/content/upload",
authType: this.backToken
},
formData
)
.then(res => {
let resData = res.data;
if (resData.resultCode == 200) {
alert("上传成功");
// _this.getOrgTree();
} else {
_this.$message.error(resData.msg || resData.message);
}
})
.catch(err => {
console.log(err);
_this.$message.error(err.msg || err.message);
});
} }
} }
};
</script> </script>
<style> <style>
.fileUpload {
</style> width: 148px;
\ No newline at end of file height: 148px;
line-height: 148px;
margin: 0 auto;
border: 1px dashed #c0ccda;
font-size: 24px;
font: #ccc;
}
</style>
src/page/content/components/uploadVue/uploadImg.vue
View file @ 6a6224b6
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
methods: { methods: {
// 图片上传成功的返回值 // 图片上传成功的返回值
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log(res) console.log(res)
console.log(res.data.url) console.log(res.data.url)
this.$emit('imgUrl', res.data.url) this.$emit('imgUrl', res.data.url)
...@@ -51,4 +51,4 @@ export default { ...@@ -51,4 +51,4 @@ export default {
</script> </script>
<style> <style>
</style> </style>
\ No newline at end of file
src/page/content/components/uploadVue/uploadQrcode.vue
View file @ 6a6224b6
...@@ -33,7 +33,8 @@ export default { ...@@ -33,7 +33,8 @@ export default {
// 图片上传成功的返回值 // 图片上传成功的返回值
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log(res) console.log(res)
console.log(res.url) // console.log(res.url)
console.log(res.data.url)
this.$emit('qrcodeUrl', res.data.url) this.$emit('qrcodeUrl', res.data.url)
// this.imageUrl = URL.createObjectURL(file.raw); // this.imageUrl = URL.createObjectURL(file.raw);
}, },
......
src/page/content/display/classify/index.vue
View file @ 6a6224b6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item label="版权方有效期">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="value1" v-model="value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
</el-form> </el-form>
<div class="page-tip"> <div class="page-tip">
<span class="page-tip-title">页面说明:</span> <span class="page-tip-title">页面说明:</span>
<span class="page-tips">可通过创建时间、展板分类名称模糊搜索快速筛选展板分类信息，可对展板分类信息进行修改、删除。可新建展板分类。</span> <span class="page-tips">可通过创建时间、展板分类名称模糊搜索快速筛选展板分类信息，可对展板分类信息进行修改、删除。可新增视频分类。</span>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
...@@ -45,27 +46,24 @@ ...@@ -45,27 +46,24 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="index" width="120" label="序号"></el-table-column> <el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column label="展板分类" prop="name"></el-table-column> <el-table-column label="展板分类名称" prop="name"></el-table-column>
<el-table-column label="版权方" prop="copyrightOwnerName"></el-table-column> <el-table-column label="版权方" prop="copyrightOwnerNames"></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="remarks"></el-table-column> <el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<el-button <el-tooltip content="修改" placement="top">
title="删除" <el-button circle @click="openEdit(scope.row)">
type="text" <i class="icon-table icon-edit"></i>
size="mini" </el-button>
@click="handleDelete(scope.row)" </el-tooltip>
>删除&nbsp;&nbsp;</el-button> <el-tooltip content="删除" placement="top">
<el-button <el-button circle @click="handleDelete(scope.row)">
title="编辑" <i class="icon-table icon-del"></i>
size="mini" </el-button>
type="text" </el-tooltip>
@click="openEdit(scope.row)" </div>
>编辑&nbsp;&nbsp;</el-button>
<!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -273,7 +271,9 @@ export default { ...@@ -273,7 +271,9 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
nameOrCode: _this.form.nameOrCode nameOrCode: _this.form.nameOrCode,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
......
src/page/content/display/content/add.vue
View file @ 6a6224b6
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<el-form-item label="请选择视频版权方" class="w50"> <el-form-item label="请选择视频版权方" class="w50">
<el-select <el-select
placeholder="请选择视频版权方" placeholder="请选择视频版权方"
@focus="getAssetCopyrightData" @focus="getVideoContentCopyrightData"
v-model="ruleForm.videoContentCopyrightOwnerId" v-model="ruleForm.videoContentCopyrightOwnerId"
> >
<el-option <el-option
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
placeholder="请选择视频" placeholder="请选择视频"
@focus="getVideoData" @focus="getVideoData"
v-model="ruleForm.videoContentId" v-model="ruleForm.videoContentId"
> >
<el-option <el-option
v-for="item in videoContentId" v-for="item in videoContentId"
:label="item.name" :label="item.name"
...@@ -114,12 +114,11 @@ ...@@ -114,12 +114,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="w50" prop="audioUrlList"></el-form-item> <el-form-item class="w50" prop="audioIdList"></el-form-item>
<el-form-item label="导览音频" class="w50"> <el-form-item label="导览音频" class="w50">
<!-- <upload-img @imgUrl="imgUrl"></upload-img> -->
<upload-audio @audioList="audioList"></upload-audio> <upload-audio @audioList="audioList"></upload-audio>
</el-form-item> </el-form-item>
<el-form-item label="参考资料" class prop="materialUrlList"> <el-form-item label="参考资料" class prop="datumIdList">
<upload-datum @datumList="datumList"></upload-datum> <upload-datum @datumList="datumList"></upload-datum>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -163,7 +162,6 @@ export default { ...@@ -163,7 +162,6 @@ export default {
boardCopyrightOwnerId:[], boardCopyrightOwnerId:[],
exhibitionBoardCatId:[], exhibitionBoardCatId:[],
videoContentId:[], videoContentId:[],
type: this.$route.query.type,
dialogVisible: false, dialogVisible: false,
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
...@@ -176,7 +174,8 @@ export default { ...@@ -176,7 +174,8 @@ export default {
boardCopyrightOwnerId:"", boardCopyrightOwnerId:"",
videoContentCopyrightOwnerId: "", videoContentCopyrightOwnerId: "",
videoContentCatId: "", videoContentCatId: "",
videoUrlList: [] audioIdList: [],
datumIdList: []
}, },
videoContentCat: [ videoContentCat: [
{ {
...@@ -225,12 +224,12 @@ export default { ...@@ -225,12 +224,12 @@ export default {
this.init() this.init()
}, },
methods: { methods: {
audioList(list){ audioList(list){
this.ruleForm.audioUrlList = list; this.ruleForm.audioIdList = list;
}, },
datumList(list){ datumList(list){
this.ruleForm.materialUrlList = list; this.ruleForm.datumIdList = list;
}, },
// 视频版权方名称id // 视频版权方名称id
videoCopyright(idlist) { videoCopyright(idlist) {
this.ruleForm.videoContentCopyrightOwnerId = idlist; this.ruleForm.videoContentCopyrightOwnerId = idlist;
...@@ -244,11 +243,7 @@ export default { ...@@ -244,11 +243,7 @@ export default {
qrcodeUrl(url){ qrcodeUrl(url){
this.ruleForm.qrcodeUrl = url this.ruleForm.qrcodeUrl = url
}, },
// 视频列表地址 getVideoContentCat(data) {
videoList(list) {
this.ruleForm.videoUrlList = list;
},
getVideoContentCat(data) {
console.log(data); console.log(data);
console.log(this.ruleForm.videoContentCatId); console.log(this.ruleForm.videoContentCatId);
}, },
...@@ -256,7 +251,7 @@ export default { ...@@ -256,7 +251,7 @@ export default {
if (this.$route.query.type === "Update") { if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id); this.getInfo(this.$route.query.id);
this.getVideoContentCatData(); this.getVideoContentCatData();
this.getAssetCopyrightData(); this.getVideoContentCopyrightData();
this.getExhibitionBoardCatId(); this.getExhibitionBoardCatId();
this.getBoardCopyrightOwnerId(); this.getBoardCopyrightOwnerId();
this.getVideoData(); this.getVideoData();
...@@ -272,8 +267,7 @@ export default { ...@@ -272,8 +267,7 @@ export default {
authType: this.backToken authType: this.backToken
} }
// param // param
) ).then(res => {
.then(res => {
let data = res.data.data; let data = res.data.data;
// this.ruleForm = data; // this.ruleForm = data;
console.log(this.ruleForm) console.log(this.ruleForm)
...@@ -284,24 +278,17 @@ export default { ...@@ -284,24 +278,17 @@ export default {
boardCopyrightOwnerId:data.boardCopyrightOwnerId, boardCopyrightOwnerId:data.boardCopyrightOwnerId,
cover:data.cover, cover:data.cover,
exhibitionBoardCatId:data.exhibitionBoardCatId, exhibitionBoardCatId:data.exhibitionBoardCatId,
guideAudioUrl:data.guideAudioUrl,
id:data.id, id:data.id,
name:data.name, name:data.name,
qrcodeUrl:data.qrcodeUrl, qrcodeUrl:data.qrcodeUrl,
refMaterialUrl:data.refMaterialUrl,
remarks:data.remarks, remarks:data.remarks,
audioUrlList:data.audioUrlList, audioIdList:data.audioIdList,
materialUrlList:data.materialUrlList datumIdList:data.datumIdList
// videoUrlList:data.videoUrlList
// 字段对不上
} }
}).catch(function(err) {
})
.catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
// 新建视频分类 // 新建视频分类
addVideoClass() { addVideoClass() {
this.dialogVisible = true; this.dialogVisible = true;
...@@ -309,8 +296,8 @@ export default { ...@@ -309,8 +296,8 @@ export default {
// 弹窗保存 // 弹窗保存
save(formName) { save(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
this.ruleForm.expireDateEnd = this.value1[1];
this.ruleForm.expireDateStart = this.value1[0]; this.ruleForm.expireDateStart = this.value1[0];
this.ruleForm.expireDateEnd = this.value1[1];
if (valid) { if (valid) {
this.$https( this.$https(
{ {
...@@ -322,18 +309,16 @@ export default { ...@@ -322,18 +309,16 @@ export default {
authType: this.backToken authType: this.backToken
}, },
this.classForm this.classForm
) ).then(res => {
.then(res => {
this.$message({ type: "success", message: "新增分类成功!" }); this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false; this.dialogVisible = false;
}) }).catch(function(err) {
.catch(function(err) {
this.$message({ this.$message({
type: "fail", type: "fail",
message: "新增失败!" + err.response.data.msg message: "新增失败!" + err.response.data.msg
}); });
console.log(err); console.log(err);
}); });
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -343,24 +328,21 @@ export default { ...@@ -343,24 +328,21 @@ export default {
// 新增 // 新增
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
console.log(this.ruleForm)
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "/exhibitionBoard/save", url: "exhibitionBoard/save",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
// this.ruleForm // this.ruleForm
this.$qs.stringify(this.ruleForm) this.$qs.stringify(this.ruleForm)
) ).then(res => {
.then(res => {
this.$message({ type: "success", message: "新增成功!" }); this.$message({ type: "success", message: "新增成功!" });
history.go(-1); history.go(-1);
}) }).catch(function(err) {
.catch(function(err) {
console.log(err); console.log(err);
}); });
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -378,15 +360,12 @@ export default { ...@@ -378,15 +360,12 @@ export default {
authType: this.backToken authType: this.backToken
}, },
this.$qs.stringify(this.ruleForm) this.$qs.stringify(this.ruleForm)
// this.ruleForm ).then(res => {
)
.then(res => {
this.$message({ type: "success", message: "修改成功!" }); this.$message({ type: "success", message: "修改成功!" });
history.go(-1); history.go(-1);
}) }).catch(function(err) {
.catch(function(err) {
console.log(err); console.log(err);
}); });
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -398,7 +377,7 @@ export default { ...@@ -398,7 +377,7 @@ export default {
history.go(-1); history.go(-1);
}, },
// 获取视频版权方 // 获取视频版权方
getAssetCopyrightData() { getVideoContentCopyrightData() {
let vm = this; let vm = this;
vm.$https( vm.$https(
{ {
...@@ -409,8 +388,7 @@ export default { ...@@ -409,8 +388,7 @@ export default {
{ copyrightOwnerType: "VIDEO_CONTENT" } { copyrightOwnerType: "VIDEO_CONTENT" }
) )
.then(res => { .then(res => {
let data = res.data.data; this.copyrightOwner = res.data.data;
this.copyrightOwner = data;
}) })
.catch(function(err) { .catch(function(err) {
console.log(err); console.log(err);
...@@ -419,22 +397,17 @@ export default { ...@@ -419,22 +397,17 @@ export default {
// 获取展板版权方 // 获取展板版权方
getBoardCopyrightOwnerId() { getBoardCopyrightOwnerId() {
let vm = this; let vm = this;
vm.$https( vm.$https({
{
url: "copyrightOwner/getList", url: "copyrightOwner/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}, },
{ copyrightOwnerType: "EXHIBITION_BOARD" } { copyrightOwnerType: "EXHIBITION_BOARD" }
) ).then(res => {
.then(res => { this.boardCopyrightOwnerId = res.data.data;
let data = res.data.data; }).catch(function(err) {
this.boardCopyrightOwnerId = data;
console.log(this.boardCopyrightOwnerId)
})
.catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
//获取展板分类 //获取展板分类
getExhibitionBoardCatId(){ getExhibitionBoardCatId(){
...@@ -443,14 +416,11 @@ export default { ...@@ -443,14 +416,11 @@ export default {
url: "exhibitionBoardCat/getList", url: "exhibitionBoardCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) }).then(res => {
.then(res => { this.exhibitionBoardCatId = res.data.data;
let data = res.data.data; }).catch(function(err) {
this.exhibitionBoardCatId = data;
})
.catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
// 获取视频分类列表 // 获取视频分类列表
getVideoContentCatData() { getVideoContentCatData() {
...@@ -459,14 +429,11 @@ export default { ...@@ -459,14 +429,11 @@ export default {
url: "videoContentCat/getList", url: "videoContentCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) }).then(res => {
.then(res => { this.videoContentCat = res.data.data;
let data = res.data.data; }).catch(function(err) {
this.videoContentCat = data;
})
.catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
// 获取视频列表 // 获取视频列表
getVideoData() { getVideoData() {
...@@ -475,16 +442,12 @@ export default { ...@@ -475,16 +442,12 @@ export default {
url: "videoContent/getList", url: "videoContent/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) }).then(res => {
.then(res => { this.videoContentId = res.data.data;
let data = res.data.data; }).catch(function(err) {
this.videoContentId = data;
})
.catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
close() { close() {
history.go(-1); history.go(-1);
}, },
......
src/page/content/display/content/index.vue
View file @ 6a6224b6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item label="版权方有效期">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="value1" v-model="value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
</el-form> </el-form>
<div class="page-tip"> <div class="page-tip">
<span class="page-tip-title">页面说明:</span> <span class="page-tip-title">页面说明:</span>
<span class="page-tips">展示所有单位的互动频次统计图及统计表格</span> <span class="page-tips">可通过展板名称、创建时间对展板信息进行快速检索。可对展板进行上架、下架、删除、修改及查看展板详情等操作。其中已上架的展板不能被删除。</span>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
...@@ -48,10 +49,10 @@ ...@@ -48,10 +49,10 @@
<el-table-column type="index" width="120" label="序号"></el-table-column> <el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="展板名称" prop="name"></el-table-column> <el-table-column show-overflow-tooltip label="展板名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column> <el-table-column show-overflow-tooltip label="展板版权方" prop="boardCopyrightOwnerName"></el-table-column>
<el-table-column label="展板分类" prop="createTime"></el-table-column> <el-table-column label="展板分类" prop="exhibitionBoardCatName"></el-table-column>
<el-table-column show-overflow-tooltip label="展板简介" prop="remarks"></el-table-column> <el-table-column show-overflow-tooltip label="展板简介" prop="remarks"></el-table-column>
<el-table-column label="关联视频名称" prop="createTime"></el-table-column> <el-table-column label="关联视频名称" prop="videoContentName"></el-table-column>
<el-table-column label="视频版权方" prop="expireDateEnd"></el-table-column> <el-table-column label="视频版权方" prop="videoContentCopyrightOwnerName"></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="auditStatus"> <el-table-column label="审核状态" prop="auditStatus">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -61,21 +62,41 @@ ...@@ -61,21 +62,41 @@
<span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span> <span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否上架" prop="createTime"></el-table-column> <el-table-column label="是否上架" prop="published">
<el-table-column label="操作" header-align="center" align="center"> <template slot-scope="scope">
<template slot-scope="scope" width="360"> <span v-if="scope.row.published">是</span>
<el-button-group> <span v-else>否</span>
<el-button </template>
title="编辑" </el-table-column>
size="mini" <el-table-column label="操作" width="280" header-align="center" align="center">
type="text" <template slot-scope="scope" >
@click="openEdit(scope.row)" <div class="table-btn-group">
>编辑&nbsp;&nbsp;</el-button> <el-tooltip content="修改" placement="top">
<el-button type="text" size="mini" @click="displayInfo(scope.row)">展板详情</el-button> <el-button circle @click="openEdit(scope.row)">
<el-button type="text" size="mini" @click="handlePublish(scope.row ,'False')">下架&nbsp;&nbsp;</el-button> <i class="icon-table icon-edit"></i>
<el-button type="text" size="mini" @click="handlePublish(scope.row,'True')">上架&nbsp;&nbsp;</el-button> </el-button>
<el-button type="text" size="mini" @click="handleDelete(scope.row)">删除</el-button> </el-tooltip>
</el-button-group> <el-tooltip content="上架" placement="top">
<el-button circle @click="handlePublish(scope.row,'True')">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="下架" placement="top">
<el-button circle @click="handlePublish(scope.row,'False')">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip>
<el-tooltip content="详情" placement="top">
<el-button circle @click="displayInfo(scope.row)">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -229,7 +250,9 @@ export default { ...@@ -229,7 +250,9 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
nameOrCode: _this.form.nameOrCode nameOrCode: _this.form.nameOrCode,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
...@@ -370,7 +393,11 @@ export default { ...@@ -370,7 +393,11 @@ export default {
.then( .then(
res => { res => {
// this.$message({ type: "success", message: "删除成功!" }); // this.$message({ type: "success", message: "删除成功!" });
alert("已提交审核！") // alert("已提交审核！")
this.msgInfo = {
type: "wait",
des: `申请已提交，待审核…`,
};
_this.Search(); _this.Search();
}, },
error => { error => {
......
src/page/content/display/copyright/index.vue
View file @ 6a6224b6
...@@ -3,16 +3,17 @@ ...@@ -3,16 +3,17 @@
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;"> <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
<el-form-item label="版权方名称"> <el-form-item label="版权方名称">
<el-input <el-input
size="mini" size="mini"
placeholder="请输入版权方名称" placeholder="请输入版权方名称"
v-model="form.name" v-model="form.nameOrCode"
@keyup.enter.native="Search" @keyup.enter.native="Search"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item label="版权方有效期">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="value1" v-model="value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -29,12 +30,12 @@ ...@@ -29,12 +30,12 @@
</el-form> </el-form>
<div class="page-tip"> <div class="page-tip">
<span class="page-tip-title">页面说明:</span> <span class="page-tip-title">页面说明:</span>
<span class="page-tips">可通过创建时间、视频分类名称模糊搜索快速筛选视频分类信息，可对视频分类信息进行修改、删除。可新建视频分类。</span> <span class="page-tips">可对展板版权方信息进行筛选、修改及删除。可新建版权方信息</span>
</div> </div>
</div> </div>
<div class="table-content"> <div class="table-content">
<div class="btn-group"> <div class="btn-group">
<el-button type="primary" @click="addPermis()">新建视频分类</el-button> <el-button type="primary" @click="addPermis()">新建版权方</el-button>
</div> </div>
<div class="party-table"> <div class="party-table">
<el-table <el-table
...@@ -45,27 +46,27 @@ ...@@ -45,27 +46,27 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="index" width="120" label="序号"></el-table-column> <el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column label="视频分类" prop="name"></el-table-column> <el-table-column label="版权方名称" prop="name"></el-table-column>
<el-table-column label="版权方" prop="copyrightOwnerName"></el-table-column> <el-table-column label="展板分类" prop="videoContentCatNames"></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="expireDateEnd" width="200">
<template slot-scope="scope">{{scope.row.expireDateStart}} 至 {{scope.row.expireDateEnd}}</template>
</el-table-column>
<el-table-column label="备注" prop="remarks"></el-table-column> <el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<el-button <el-tooltip content="修改" placement="top">
title="删除" <el-button circle @click="openEdit(scope.row)">
type="text" <i class="icon-table icon-edit"></i>
size="mini" </el-button>
@click="handleDelete(scope.row)" </el-tooltip>
>删除&nbsp;&nbsp;</el-button> <el-tooltip content="删除" placement="top">
<el-button <el-button circle @click="handleDelete(scope.row)">
title="编辑" <i class="icon-table icon-del"></i>
size="mini" </el-button>
type="text" </el-tooltip>
@click="openEdit(scope.row)" </div>
>编辑&nbsp;&nbsp;</el-button>
<!-- <el-button title="编辑" size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> -->
</el-button-group>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -289,7 +290,10 @@ export default { ...@@ -289,7 +290,10 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name nameOrCode: _this.form.nameOrCode,
ownerType:'EXHIBITION_BOARD',
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
...@@ -305,7 +309,7 @@ export default { ...@@ -305,7 +309,7 @@ export default {
let searchObj = { let searchObj = {
_index: _this.page.currentPage, _index: _this.page.currentPage,
_size: _this.page.pageSize, _size: _this.page.pageSize,
ownerType:'EXHIBITION_BOARD'
}; };
for (let key in _this.form) { for (let key in _this.form) {
if (_this.form[key]) { if (_this.form[key]) {
......
src/page/content/learn/content/add.vue
View file @ 6a6224b6
<template> <template>
<div class="info"> <div class="info">
<!-- <audio-play></audio-play> --> <!-- <audio-play></audio-play> -->
<!-- <video-dialog></video-dialog> --> <video-dialog ref="videoDialog"></video-dialog>
<div class="info-header">新建学习内容</div> <div class="info-header">新建学习内容</div>
<div class="info-container"> <div class="info-container">
<div class="info-wrapper"> <div class="info-wrapper">
...@@ -224,8 +224,12 @@ export default { ...@@ -224,8 +224,12 @@ export default {
}, },
methods: { methods: {
// 视频预览 // 视频预览
videoPreview(){ videoPreview(row){
alert("视频") // alert("视频")
// console.log(row,'222')
this.$refs.videoDialog.dialogVisible = true
this.$refs.videoDialog.videoImg = row.cover
this.$refs.videoDialog.videoSrc = row.videoList[0].fileUrl
}, },
// 展板预览 // 展板预览
displayPreview(row) { displayPreview(row) {
......
src/page/content/learn/content/index.vue
View file @ 6a6224b6
...@@ -2,17 +2,18 @@ ...@@ -2,17 +2,18 @@
<div class="listPage H100"> <div class="listPage H100">
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form" class="search-form" onsubmit="return false;"> <el-form :inline="true" :model="form" class="search-form" onsubmit="return false;">
<el-form-item label="版权方名称"> <el-form-item >
<el-input <el-input
size="mini" size="mini"
placeholder="请输入版权方名称" placeholder="请输入学习内容名称"
v-model="form.name" v-model="form.name"
@keyup.enter.native="Search" @keyup.enter.native="Search"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item >
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="value1" v-model="value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -45,10 +46,24 @@ ...@@ -45,10 +46,24 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="index" width="120" label="序号"></el-table-column> <el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column> <el-table-column show-overflow-tooltip label="学习内容名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></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="expireDateEnd"></el-table-column> <el-table-column label="创建者" prop=""></el-table-column>
<el-table-column show-overflow-tooltip label="所含展板数量" prop="exhibitionBoardCount"></el-table-column>
<el-table-column label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<span v-if="scope.row.auditStatus === 'TBC'">待初审</span>
<span v-else-if="scope.row.auditStatus === 'REFUSED'">已驳回</span>
<span v-else-if="scope.row.auditStatus === 'TBCA'">待复审</span>
<span v-else-if="scope.row.auditStatus === 'APPROVED_FINAL'">通过</span>
</template>
</el-table-column>
<el-table-column label="使用状态" prop="published">
<template slot-scope="scope">
<span v-if="scope.row.published">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column> <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" width="240" header-align="center" align="center"> <el-table-column label="操作" width="240" header-align="center" align="center">
<template slot-scope="scope" > <template slot-scope="scope" >
...@@ -200,7 +215,11 @@ export default { ...@@ -200,7 +215,11 @@ export default {
.then( .then(
res => { res => {
// this.$message({ type: "success", message: "删除成功!" }); // this.$message({ type: "success", message: "删除成功!" });
alert("已提交审核！") // alert("已提交审核！")
this.msgInfo = {
type: "wait",
des: `申请已提交，待审核…`,
};
_this.Search(); _this.Search();
}, },
error => { error => {
...@@ -256,7 +275,9 @@ export default { ...@@ -256,7 +275,9 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name name: _this.form.name,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
......
src/page/content/learn/project/index.vue
View file @ 6a6224b6
...@@ -2,17 +2,18 @@ ...@@ -2,17 +2,18 @@
<div class="listPage H100"> <div class="listPage H100">
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;"> <el-form :inline="true" :model="form" ref="form" class="search-form" onsubmit="return false;">
<el-form-item label="版权方名称"> <el-form-item >
<el-input <el-input
size="mini" size="mini"
placeholder="请输入版权方名称" placeholder="请输入学习项目名称"
v-model="form.name" v-model="form.name"
@keyup.enter.native="Search" @keyup.enter.native="Search"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item >
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="value1" v-model="value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -45,9 +46,9 @@ ...@@ -45,9 +46,9 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="index" width="120" label="序号"></el-table-column> <el-table-column type="index" width="120" label="序号"></el-table-column>
<el-table-column label="视频分类" prop="name"></el-table-column> <el-table-column label="学习项目名称" prop="name"></el-table-column>
<el-table-column label="版权方" prop="copyrightOwnerName"></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="learningContentNames"></el-table-column>
<el-table-column label="备注" prop="remarks"></el-table-column> <el-table-column label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
...@@ -290,7 +291,9 @@ export default { ...@@ -290,7 +291,9 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name name: _this.form.name,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
......
src/page/content/video/classify/index.vue
View file @ 6a6224b6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item label="版权方有效期">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="value1" v-model="value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -292,7 +293,9 @@ export default { ...@@ -292,7 +293,9 @@ export default {
let searchObj = { let searchObj = {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
name: _this.form.name name: _this.form.name,
startDate:this.value1?this.value1[0]:"",
endDate:this.value1?this.value1[1]:"",
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
...@@ -489,7 +492,11 @@ export default { ...@@ -489,7 +492,11 @@ export default {
}) })
.then( .then(
res => { res => {
this.$message({ type: "success", message: "删除成功!" }); // this.$message({ type: "success", message: "删除成功!" });
this.msgInfo = {
type: "wait",
des: `申请已提交，待审核…`,
};
_this.Search(); _this.Search();
}, },
error => { error => {
......
src/page/content/video/content/add.vue
View file @ 6a6224b6
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
<el-form-item class="selectH100" label="请选择预设视频分类"> <el-form-item class="selectH100" label="请选择预设视频分类">
<el-select <el-select
placeholder="请选择预设视频分类" placeholder="请选择预设视频分类"
@focus="getAssetTypeData" @focus="getVideoContentCatData"
multiple multiple
v-model="ruleForm.assetTypeIdList" v-model="ruleForm.videoContentCatIdList"
@change="getSelectDep" @change="getSelectDep"
> >
<el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox> <el-checkbox :style="selfstyle" v-model="checkedThing" @change="selectAllThing">全选</el-checkbox>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<el-form-item label="请选择视频版权方"> <el-form-item label="请选择视频版权方">
<el-select <el-select
placeholder="请选择视频版权方" placeholder="请选择视频版权方"
@focus="getAssetCopyrightData" @focus="getVideoContentCopyrightData"
v-model="ruleForm.videoContentCopyrightOwnerId" v-model="ruleForm.videoContentCopyrightOwnerId"
> >
<el-option <el-option
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
<el-form-item label="请选择预设视频分类"> <el-form-item label="请选择预设视频分类">
<el-select <el-select
placeholder="请选择预设视频分类" placeholder="请选择预设视频分类"
@focus="getAssetTypeData" @focus="getVideoContentCatData"
v-model="ruleForm.assetTypeId" v-model="ruleForm.videoContentCatId"
@change="getAssetType" @change="getVideoContentCat"
> >
<el-option <el-option
v-for="item in videoContentCat" v-for="item in videoContentCat"
...@@ -143,7 +143,7 @@ import uploadDatum from '@/page/content/components/uploadVue/uploadDatum' ...@@ -143,7 +143,7 @@ import uploadDatum from '@/page/content/components/uploadVue/uploadDatum'
import mulDisplay from '@/page/content/components/mulClassify/mulDisplay' import mulDisplay from '@/page/content/components/mulClassify/mulDisplay'
import addCopyright from '@/page/content/components/dialog/addCopyright' import addCopyright from '@/page/content/components/dialog/addCopyright'
export default { export default {
components:{ components:{
uploadImg, uploadImg,
uploadFile, uploadFile,
uploadDatum, uploadDatum,
...@@ -164,9 +164,9 @@ export default { ...@@ -164,9 +164,9 @@ export default {
ruleForm: { ruleForm: {
name: "", name: "",
videoContentCopyrightOwnerId:"", videoContentCopyrightOwnerId:"",
assetTypeId: "", videoContentCatId: "",
thumbnail:"", thumbnail:"",
videoUrlList:[] videoFileIdList:[]
}, },
videoContentCat: [ videoContentCat: [
{ {
...@@ -236,18 +236,18 @@ export default { ...@@ -236,18 +236,18 @@ export default {
}, },
// 视频列表地址 // 视频列表地址
videoList(list){ videoList(list){
this.ruleForm.videoUrlList = list this.ruleForm.videoFileIdList = list
}, },
init() { init() {
if (this.$route.query.type === "Update") { if (this.$route.query.type === "Update") {
this.getInfo(this.$route.query.id); this.getInfo(this.$route.query.id);
this.getAssetTypeData() this.getVideoContentCatData()
this.getAssetCopyrightData() this.getVideoContentCopyrightData()
} }
}, },
getAssetType(data){ getVideoContentCat(data){
console.log(data) console.log(data)
console.log(this.ruleForm.assetTypeId) console.log(this.ruleForm.videoContentCatId)
}, },
// 获取版权方详情 // 获取版权方详情
getInfo(id) { getInfo(id) {
...@@ -259,20 +259,18 @@ export default { ...@@ -259,20 +259,18 @@ export default {
authType: this.backToken authType: this.backToken
} }
// param // param
) ).then(res => {
.then(res => {
let data = res.data.data; let data = res.data.data;
// this.ruleForm = data; // this.ruleForm = data;
this.ruleForm.id = data.id this.ruleForm.id = data.id
this.ruleForm.name = data.name this.ruleForm.name = data.name
this.ruleForm.videoContentCopyrightOwnerId = data.videoContentCopyrightOwnerId this.ruleForm.videoContentCopyrightOwnerId = data.videoContentCopyrightOwnerId
this.ruleForm.assetTypeId = data.assetTypeId this.ruleForm.videoContentCatId = data.videoContentCatId
this.ruleForm.thumbnail = data.thumbnail this.ruleForm.thumbnail = data.thumbnail
this.ruleForm.videoUrlList = data.videoUrlList this.ruleForm.videoFileIdList = data.videoFileIdList
}) }).catch(function(err) {
.catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
// 新建视频分类 // 新建视频分类
...@@ -295,18 +293,15 @@ export default { ...@@ -295,18 +293,15 @@ export default {
authType: this.backToken authType: this.backToken
}, },
this.classForm this.classForm
) ).then(res => {
.then(res => {
this.$message({ type: "success", message: "新增分类成功!" }); this.$message({ type: "success", message: "新增分类成功!" });
this.dialogVisible = false; this.dialogVisible = false;
}) }).catch(function(err) {
.catch(function(err) {
this.$message({ this.$message({
type: "fail", type: "fail",
message: "新增失败!" + err.response.data.msg message: "新增失败!" + err.response.data.msg
}); });
console.log(err); });
});
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -324,28 +319,20 @@ export default { ...@@ -324,28 +319,20 @@ export default {
// 新增 // 新增
submitForm(formName) { submitForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
// this.ruleForm.videoContentCopyrightOwnerId = ["1373225989501456385"]
// this.ruleForm.assetTypeIdList = []
// this.ruleForm.videoUrlList = [
// "http://111.203.232.175:8085/group1/M00/00/39/wKhuVWBgIvaANgtZAAAAAAAAAAA947.mp4"
// ]
if (valid) { if (valid) {
this.$https( this.$https(
{ {
url: "/videoContent/save", url: "videoContent/save",
method: "post", method: "post",
authType: this.backToken authType: this.backToken
}, },
// this.ruleForm
this.$qs.stringify(this.ruleForm) this.$qs.stringify(this.ruleForm)
) ).then(res => {
.then(res => {
this.$message({ type: "success", message: "新增成功!" }); this.$message({ type: "success", message: "新增成功!" });
history.go(-1); history.go(-1);
}) }).catch(function(err) {
.catch(function(err) {
console.log(err); console.log(err);
}); });
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -355,7 +342,6 @@ export default { ...@@ -355,7 +342,6 @@ export default {
// 修改版权方 // 修改版权方
updateForm(formName) { updateForm(formName) {
this.$refs[formName].validate(valid => { this.$refs[formName].validate(valid => {
if (valid) { if (valid) {
this.$https( this.$https(
{ {
...@@ -364,15 +350,12 @@ export default { ...@@ -364,15 +350,12 @@ export default {
authType: this.backToken authType: this.backToken
}, },
this.$qs.stringify(this.ruleForm) this.$qs.stringify(this.ruleForm)
// this.ruleForm ).then(res => {
)
.then(res => {
this.$message({ type: "success", message: "修改成功!" }); this.$message({ type: "success", message: "修改成功!" });
history.go(-1); history.go(-1);
}) }).catch(function(err) {
.catch(function(err) {
console.log(err); console.log(err);
}); });
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -383,8 +366,8 @@ export default { ...@@ -383,8 +366,8 @@ export default {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
history.go(-1); history.go(-1);
}, },
getAssetCopyrightData(){ getVideoContentCopyrightData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "copyrightOwner/getList", url: "copyrightOwner/getList",
method: "get", method: "get",
...@@ -400,37 +383,30 @@ export default { ...@@ -400,37 +383,30 @@ export default {
}); });
}, },
// 获取视频分类列表 // 获取视频分类列表
getAssetTypeData() { getVideoContentCatData() {
let vm = this; let vm = this;
vm.$https({ vm.$https({
url: "videoContentCat/getList", url: "videoContentCat/getList",
method: "get", method: "get",
authType: this.backToken authType: this.backToken
}) }).then(res => {
.then(res => { this.videoContentCat = res.data.data;
let data = res.data.data; }).catch(function(err) {
this.videoContentCat = data;
})
.catch(function(err) {
console.log(err); console.log(err);
}); });
}, },
getSelectDep(assetTypeIdList) { getSelectDep(videoContentCatIdList) {
if (assetTypeIdList.length === this.videoContentCat.length) { this.checkedThing = videoContentCatIdList.length === this.videoContentCat.length;
this.checkedThing = true;
} else {
this.checkedThing = false;
}
}, },
selectAllThing() { selectAllThing() {
// debugger // debugger
this.ruleForm.assetTypeIdList = []; this.ruleForm.videoContentCatIdList = [];
if (this.checkedThing) { if (this.checkedThing) {
this.videoContentCat.map(item => { this.videoContentCat.map(item => {
this.ruleForm.assetTypeIdList.push(item.id); this.ruleForm.videoContentCatIdList.push(item.id);
}); });
} else { } else {
this.ruleForm.assetTypeIdList = []; this.ruleForm.videoContentCatIdList = [];
} }
} }
} }
......
src/page/content/video/content/index.vue
View file @ 6a6224b6
...@@ -11,15 +11,7 @@ ...@@ -11,15 +11,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期">
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<div class="btn-group"> <div class="btn-group">
<el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button> <el-button size="mini" type="primary" class="btn_form_search" @click="Search">查询</el-button>
...@@ -59,19 +51,33 @@ ...@@ -59,19 +51,33 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<el-button-group> <div class="table-btn-group">
<el-button <el-tooltip content="修改" placement="top">
type="text" <el-button circle @click="openEdit(scope.row)">
size="mini" <i class="icon-table icon-edit"></i>
@click="handleDelete(scope.row)" </el-button>
>删除&nbsp;&nbsp;</el-button> </el-tooltip>
<el-button <!-- <el-tooltip content="启用" placement="top">
size="mini" <el-button circle @click="handlePublish(scope.row,'True')">
type="text" <i class="icon-table icon-enable"></i>
@click="openEdit(scope.row)" </el-button>
>编辑&nbsp;&nbsp;</el-button> </el-tooltip>
<el-button size="mini" type="text" @click="openDetails(scope.row)">查看详情</el-button> <el-tooltip content="禁用" placement="top">
</el-button-group> <el-button circle @click="handlePublish(scope.row,'False')">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>-->
<el-tooltip content="删除" placement="top">
<el-button circle @click="handleDelete(scope.row)">
<i class="icon-table icon-del"></i>
</el-button>
</el-tooltip>
<el-tooltip content="详情" placement="top">
<el-button circle @click="openDetails(scope.row)">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -401,7 +407,7 @@ export default { ...@@ -401,7 +407,7 @@ export default {
openEdit(row) { openEdit(row) {
this.$router.push({ this.$router.push({
path: "videoContentUpdate", path: "videoContentUpdate",
query: { type: "Update" ,id:row.id } query: { type: "Update", id: row.id }
}); });
// alert('编辑') // alert('编辑')
// $('.el-dialog__title').html('编辑'); // $('.el-dialog__title').html('编辑');
...@@ -460,7 +466,11 @@ export default { ...@@ -460,7 +466,11 @@ export default {
}) })
.then( .then(
res => { res => {
this.$message({ type: "success", message: "删除成功!" }); this.msgInfo = {
type: "wait",
des: `申请已提交，待审核…`,
};
// this.$message({ type: "success", message: "删除成功!" });
_this.Search(); _this.Search();
}, },
error => { error => {
...@@ -511,7 +521,7 @@ export default { ...@@ -511,7 +521,7 @@ export default {
}) })
.then( .then(
res => { res => {
if (res.data.status == 201 || res.data.status == 200) { if (res.data.status === 201 || res.data.status === 200) {
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功!" message: "删除成功!"
......
src/page/content/video/copyright/index.vue
View file @ 6a6224b6
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</el-form-item> </el-form-item>
<el-form-item label="版权方有效期"> <el-form-item label="版权方有效期">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="value1" v-model="value1"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
...@@ -39,7 +40,8 @@ ...@@ -39,7 +40,8 @@
<div class="party-table"> <div class="party-table">
<el-table <el-table
border border
style="width: 100%;height:100%" height="100%" style="width: 100%;height:100%"
height="100%"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -48,51 +50,29 @@ ...@@ -48,51 +50,29 @@
<el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column> <el-table-column show-overflow-tooltip label="版权方名称" prop="name"></el-table-column>
<el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></el-table-column> <el-table-column show-overflow-tooltip label="视频分类" prop="videoContentCatNames"></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="expireDateEnd"></el-table-column> <el-table-column label="版权方有效期" prop="expireDateEnd" width="200">
<template slot-scope="scope">{{scope.row.expireDateStart}} 至 {{scope.row.expireDateEnd}}</template>
</el-table-column>
<el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column> <el-table-column show-overflow-tooltip label="备注" prop="remarks"></el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope" width="220"> <template slot-scope="scope" width="220">
<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 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="handleDelete(scope.row)"> <el-button 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>
</div>
<!-- <el-tooltip content="禁用" placement="top">
<el-button
circle
:disabled="scope.row.status == 2 || scope.row.statusName == '待审核' "
@click="handleOperate(scope.row,'disable')">
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="激活" placement="top">
<el-button
circle
:disabled="scope.row.status == 1"
@click="handleOperate(scope.row,'enable')">
<i class="icon-table icon-enable"></i>
</el-button>
</el-tooltip>
<el-tooltip content="审核详情" placement="top">
<el-button
circle
@click="handleOperate(scope.row,'examine')">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip> -->
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="partyt-pagination"> <div class="partyt-pagination">
<el-pagination <el-pagination
small small
background background
...@@ -102,7 +82,7 @@ ...@@ -102,7 +82,7 @@
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
:total="page.total" :total="page.total"
></el-pagination> ></el-pagination>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -127,7 +107,7 @@ export default { ...@@ -127,7 +107,7 @@ export default {
formLabelWidth: "100px", formLabelWidth: "100px",
form: { form: {
nameOrCode: "", nameOrCode: "",
ownerType:'VIDEO_CONTENT' ownerType: "VIDEO_CONTENT"
}, },
editform: { editform: {
menuName: "", menuName: "",
...@@ -231,10 +211,10 @@ export default { ...@@ -231,10 +211,10 @@ export default {
_this.getTableData(param); _this.getTableData(param);
}, },
// 重置 // 重置
Reset(){ Reset() {
// this.$refs["form"].resetFields(); // this.$refs["form"].resetFields();
this.form = { ownerType:'VIDEO_CONTENT'} this.form = { ownerType: "VIDEO_CONTENT" };
this.Search() this.Search();
}, },
Search() { Search() {
let _this = this; let _this = this;
...@@ -243,7 +223,9 @@ export default { ...@@ -243,7 +223,9 @@ export default {
_index: 1, _index: 1,
_size: _this.page.pageSize, _size: _this.page.pageSize,
nameOrCode: _this.form.nameOrCode, nameOrCode: _this.form.nameOrCode,
ownerType:'VIDEO_CONTENT' ownerType: "VIDEO_CONTENT",
startDate: this.value1 ? this.value1[0] : "",
endDate: this.value1 ? this.value1[1] : ""
}; };
this.getTableData(searchObj); this.getTableData(searchObj);
}, },
...@@ -325,7 +307,7 @@ export default { ...@@ -325,7 +307,7 @@ export default {
openEdit(row) { openEdit(row) {
this.$router.push({ this.$router.push({
path: "videoCopyrightUpdate", path: "videoCopyrightUpdate",
query: { type: "Update" ,id :row.id} query: { type: "Update", id: row.id }
}); });
// alert('编辑') // alert('编辑')
// $('.el-dialog__title').html('编辑'); // $('.el-dialog__title').html('编辑');
...@@ -346,17 +328,28 @@ export default { ...@@ -346,17 +328,28 @@ export default {
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
_this.$https({ _this
method: 'delete', .$https({
url: 'copyrightOwner/delete/'+ row.id, method: "delete",
authType: this.backToken url: "copyrightOwner/delete/" + row.id,
}).then((res) => { authType: this.backToken
this.$message({type: 'success', message: '删除成功!'}); })
_this.Search(); .then(
}, (error) => { res => {
this.$message({type: 'fail', message: "删除失败!" + error.response.data}); // this.$message({ type: "success", message: "删除成功!" });
} this.msgInfo = {
) type: "wait",
des: `删除申请已提交，待审核…`,
};
_this.Search();
},
error => {
this.$message({
type: "fail",
message: "删除失败!" + error.response.data
});
}
);
}) })
.catch(() => {}); .catch(() => {});
}, },
...@@ -424,6 +417,6 @@ export default { ...@@ -424,6 +417,6 @@ export default {
<style lang="less"> <style lang="less">
// @import "../../../../style/common"; // @import "../../../../style/common";
// @import "../../style/list"; // @import "../../style/list";
@import '../../../../style/table.less'; @import "../../../../style/table.less";
@import '../../../../style/pagination.less'; @import "../../../../style/pagination.less";
</style> </style>
src/page/statistics/components/areas.vue
View file @ 6a6224b6
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
</ul> </ul>
</div> </div>
<div id="area2"></div> <div id="area2"></div>
<div id="area3">></div> <div id="area3"></div>
<div id="area4"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -42,9 +43,6 @@ export default { ...@@ -42,9 +43,6 @@ export default {
}, },
mounted() { mounted() {
this.getList(); this.getList();
this.$nextTick((v) => {
this.initScroll();
});
}, },
methods: { methods: {
initScroll() { initScroll() {
...@@ -53,8 +51,10 @@ export default { ...@@ -53,8 +51,10 @@ export default {
this.con1 = document.getElementById("area1"); this.con1 = document.getElementById("area1");
let con2 = document.getElementById("area2"); let con2 = document.getElementById("area2");
let con3 = document.getElementById("area3"); let con3 = document.getElementById("area3");
let con4 = document.getElementById("area4");
con2.innerHTML = this.con1.innerHTML; con2.innerHTML = this.con1.innerHTML;
con3.innerHTML = this.con1.innerHTML; con3.innerHTML = this.con1.innerHTML;
con4.innerHTML = this.con1.innerHTML;
this.timer = setInterval(_this.scrollUp, _this.speed); this.timer = setInterval(_this.scrollUp, _this.speed);
}, },
scrollUp() { scrollUp() {
...@@ -65,6 +65,7 @@ export default { ...@@ -65,6 +65,7 @@ export default {
} }
}, },
getList() { getList() {
let _this = this;
let requestparams = {}; let requestparams = {};
requestparams._index = 1; requestparams._index = 1;
requestparams._size = 10; requestparams._size = 10;
...@@ -80,6 +81,9 @@ export default { ...@@ -80,6 +81,9 @@ export default {
if (res.status == 200) { if (res.status == 200) {
if (res.data.resultCode == 200) { if (res.data.resultCode == 200) {
this.list = res.data.data.records; this.list = res.data.data.records;
this.$nextTick(()=>{
_this.initScroll();
})
} else { } else {
this.list = []; this.list = [];
} }
......
src/page/statistics/overview.vue
View file @ 6a6224b6
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
} }
}, },
components:{demand, interaction , areas, top10, mapDiv, borderNums}, components:{demand, interact , areas, top10, mapDiv, borderNums},
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
src/page/system/changePwd.vue
View file @ 6a6224b6
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
</div> </div>
</template> </template>
<script> <script>
import { loginOut } from "@/config/loginOut.js";
export default { export default {
data() { data() {
var validatePass = (rule, value, callback) => { var validatePass = (rule, value, callback) => {
if (value === "") { if (value === "") {
callback(new Error("请输入密码")); callback(new Error("请输入密码"));
} else { } else {
this.$refs.ruleForm.validateField("password");
callback(); callback();
} }
}; };
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
}, },
handleSubmit() { handleSubmit() {
let _this = this; let _this = this;
this.$refs.validate((valid) => { this.$refs.form.validate((valid) => {
if (valid) { if (valid) {
let requestParams = {}; let requestParams = {};
requestParams.oldPassWord = _this.form.oldPassWord; requestParams.oldPassWord = _this.form.oldPassWord;
...@@ -105,6 +105,7 @@ export default { ...@@ -105,6 +105,7 @@ export default {
{ {
method: "put", method: "put",
url: "tUser/editPwd", url: "tUser/editPwd",
authType: this.backToken,
}, },
requestParams requestParams
) )
...@@ -117,7 +118,7 @@ export default { ...@@ -117,7 +118,7 @@ export default {
type: "success", type: "success",
message: res.data.message, message: res.data.message,
}); });
_this.redirectLogin() _this.redirectLogin();
} else { } else {
_this.$message.error(res.data.message); _this.$message.error(res.data.message);
} }
...@@ -132,10 +133,10 @@ export default { ...@@ -132,10 +133,10 @@ export default {
} }
}); });
}, },
redirectLogin(){ redirectLogin() {
this.$router.push('./login') loginOut();
this.$router.push("./login");
} },
}, },
}; };
</script> </script>
......
src/style/global.less
View file @ 6a6224b6
This diff is collapsed.
src/style/pagination.less
View file @ 6a6224b6
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
} }
.el-pager{ .el-pager{
padding-left: 20px; padding-left: 20px;
li:hover {
color: @party-btn-color;
}
li.number{ li.number{
width: 40px; width: 40px;
height: 40px; height: 40px;
......
src/style/table.less
View file @ 6a6224b6
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
.el-button{ .el-button{
border: none; border: none;
padding: 0; padding: 0;
&.is-circle{
padding: 0;
background-color: transparent;
}
} }
} }
.icon-table{ .icon-table{
......
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