Skip to content

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

Merge branch 'master' into dev_fbl

parents a78d1e58 5b4eb6a5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1594 additions and 1542 deletions
config/index.js
View file @ a7dfb8e4
......@@ -13,6 +13,7 @@ module.exports = {
proxyTable: {
'/mall': {
target: "http://192.168.110.67/mall",
// target: "http://192.168.204.66:8088/mall",
changeOrigin: true,
pathRewrite: {
'^/mall': '/' // 重写接口
......
src/components/end/login.vue
View file @ a7dfb8e4
......@@ -163,7 +163,7 @@ export default {
left: 50%;
margin-top: -50%;
margin-left: -50%;
width:100%;
width: 100%;
}
.page-title {
width: 100%;
......@@ -191,6 +191,7 @@ export default {
.icon-pwd {
background: url("~@/assets/login/pwd.png") no-repeat center/ 100%;
}
/deep/.el-form {
width: 100%;
text-align: center;
......@@ -213,6 +214,9 @@ export default {
padding-top: 12px;
}
}
.el-form-item__error {
left: calc(50% - 160px);
}
.el-button.login {
width: 320px;
height: 48px;
......
src/config/account.js 0 → 100644
View file @ a7dfb8e4
let statusOption = [
{ label: "活跃", value: 'ENABLE' },
{ label: "禁用", value: 'DISABLE' },
{ label: "待审核", value: 'TBC' },
]
export {
statusOption
}
\ No newline at end of file
src/page/accounts/components/accountTable.vue
View file @ a7dfb8e4
......@@ -22,12 +22,20 @@
<template slot-scope="scope">
<div v-if="item.isEdit" class="table-btn-group">
<el-tooltip content="修改" placement="top">
<el-button circle @click="handleOperate(scope.row, 'edit')">
<el-button
circle
:disabled="scope.row.statusName !== '活跃'"
@click="handleOperate(scope.row, 'edit')"
>
<i class="icon-table icon-edit"></i>
</el-button>
</el-tooltip>
<el-tooltip content="重置密码" placement="top">
<el-button circle @click="handleOperate(scope.row, 'reset')">
<el-button
circle
:disabled="scope.row.statusName !== '活跃'"
@click="handleOperate(scope.row, 'reset')"
>
<i class="icon-table icon-reset"></i>
</el-button>
</el-tooltip>
......
src/page/accounts/dbUnitAdmin.vue
View file @ a7dfb8e4
......@@ -128,7 +128,7 @@ export default {
}
},
// 翻页
handleChangeCurrent() {
handleChangeCurrent(val) {
this.page._index = val;
this.getPageList();
},
......
src/page/accounts/recheck.vue
View file @ a7dfb8e4
......@@ -206,7 +206,7 @@ export default {
});
},
// 翻页
handleChangeCurrent() {
handleChangeCurrent(val) {
this.page._index = val;
this.getPageList();
},
......
src/page/accounts/statistical.vue
View file @ a7dfb8e4
......@@ -8,6 +8,7 @@
v-model="form.userName"
placeholder="请输入用户名"
suffix-icon="el-icon-search"
clearable
></el-input>
</el-form-item>
<el-form-item>
......@@ -59,6 +60,7 @@ import { partyPagination } from "@/components/index";
import accountTable from "./components/accountTable";
import { addDialog, editDialog } from "./statisticalDialog/index";
import msgDialog from "./msgDialog.vue";
import { statusOption } from "@/config/account";
export default {
data() {
return {
......@@ -67,11 +69,7 @@ export default {
status: "",
type: 5, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号
},
statusOption: [
{ label: "活跃", value: 1 },
{ label: "禁用", value: 2 },
{ label: "待审核", value: 3 },
],
statusOption: statusOption,
feildList: [
{ prop: "userName", label: "统计用户名" },
{ prop: "orgName", label: "所属单位" },
......@@ -270,7 +268,7 @@ export default {
}
},
// 翻页
handleChangeCurrent() {
handleChangeCurrent(val) {
this.page._index = val;
this.getPageList();
},
......
src/page/accounts/stbAdmin.vue
View file @ a7dfb8e4
......@@ -5,13 +5,18 @@
<el-form :inline="true" :model="form">
<el-form-item>
<el-input
clearable
v-model="form.userName"
placeholder="请输入运维人员姓名"
suffix-icon="el-icon-search"
></el-input>
</el-form-item>
<el-form-item>
<el-select v-model="form.status" placeholder="请选择账号状态">
<el-select
v-model="form.status"
placeholder="请选择账号状态"
clearable
>
<el-option
v-for="(item, index) in statusOption"
:key="index"
......@@ -56,6 +61,7 @@ import { partyPagination } from "@/components/index";
import accountTable from "./components/accountTable";
import { addDialog, editDialog } from "./stbDialog/index";
import msgDialog from "./msgDialog.vue";
import { statusOption } from "@/config/account";
export default {
data() {
return {
......@@ -64,11 +70,7 @@ export default {
status: "",
type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
},
statusOption: [
{ label: "活跃", value: 1 },
{ label: "禁用", value: 2 },
{ label: "待审核", value: 3 },
],
statusOption: statusOption,
feildList: [
{ prop: "userName", label: "运维人员姓名" },
{ prop: "orgName", label: "运维区域" },
......@@ -258,7 +260,7 @@ export default {
}
},
// 翻页
handleChangeCurrent() {
handleChangeCurrent(val) {
this.page._index = val;
this.getPageList();
},
......
src/page/accounts/unitAdmin.vue
View file @ a7dfb8e4
......@@ -315,7 +315,7 @@ export default {
}
},
// 翻页
handleChangeCurrent() {
handleChangeCurrent(val) {
this.page._index = val;
this.getPageList();
},
......
src/page/accounts/users.vue
View file @ a7dfb8e4
......@@ -50,7 +50,7 @@ export default {
return {
form: {
userName: "",
type: 1, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号
type: 1, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号
},
feildList: [
{ prop: "userName", label: "平台用户名" },
......@@ -90,7 +90,7 @@ export default {
},
handleReset() {
this.form.userName = "";
this.getFirstPageList();
this.getFirstPageList();
},
getPageList() {
let requestParams = {};
......@@ -131,9 +131,9 @@ export default {
},
// 编辑
handleEdit() {
this.$refs.editDialog.id = this.activeRow.id
this.$refs.editDialog.getDetailById()
this.$refs.editDialog.dialogVisible = true;
this.$refs.editDialog.id = this.activeRow.id;
this.$refs.editDialog.getDetailById();
this.$refs.editDialog.dialogVisible = true;
},
// 重置密码
handleResetPwd() {
......@@ -238,7 +238,7 @@ export default {
}
},
// 翻页
handleChangeCurrent() {
handleChangeCurrent(val) {
this.page._index = val;
this.getPageList();
},
......
src/page/check/display/index.vue
View file @ a7dfb8e4
......@@ -65,7 +65,11 @@
<el-table-column label="展板名称" prop="name"></el-table-column>
<el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="operation"></el-table-column>
<el-table-column label="审核项" prop="operation">
<template slot-scope="scope">
<span class="input-item">{{keyMap[scope.row.operation]}}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span>
......@@ -89,12 +93,8 @@
</el-table-column>
<el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220">
<div class="table-btn-group">
<!-- <el-tooltip content="详情" placement="top">
<el-button circle @click="learnDetails(scope.row)">
<i class="icon-table icon-detail"></i>
</el-button>
</el-tooltip> -->
<!-- <div class="table-btn-group">
<el-tooltip content="通过" placement="top">
<el-button circle @click="adopt(scope.row)">
<i class="icon-table icon-enable"></i>
......@@ -105,6 +105,26 @@
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
</div> -->
<div class="table-btn-group">
<el-button
round
class="passed"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="adopt(scope.row)"
>通过</el-button>
<el-button
round
class="rejected"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="reject(scope.row)"
>驳回</el-button>
</div>
</template>
</el-table-column>
......@@ -237,7 +257,18 @@ export default {
}
}
};
const keyMap = {
ADD: "新增",
EDIT: "修改",
REMOVE: "删除",
DISABLE: "禁用",
ENABLE: "启用",
UPPER: "上架",
LOWER: "下架"
};
return {
keyMap: keyMap,
type: true,
value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 },
......
src/page/check/learn/details.vue
View file @ a7dfb8e4
......@@ -28,17 +28,17 @@
:model="formInline"
label-position="top"
>
<el-form-item label="展板宣传图">
<el-form-item label="展板宣传图" class="w100">
<img class="imgSize" :src="item.cover" alt />
</el-form-item>
<el-form-item label="展板版权方">
<el-form-item label="展板版权方" class="w50" >
<span>{{ item.boardCopyrightOwnerName }}</span>
</el-form-item>
<el-form-item label="展板名称" class="w50">
<el-form-item label="展板名称">
<span>{{ item.name }}</span>
</el-form-item>
<el-form-item label="展板简介">
<el-form-item label="展板简介" class="w100">
<span>{{ item.remarks }}</span>
</el-form-item>
<el-form-item label="展板视频" class="w100">
......
src/page/check/learn/index.vue
View file @ a7dfb8e4
......@@ -47,7 +47,11 @@
<el-table-column label="学习内容名称" prop="name"></el-table-column>
<el-table-column label="提交人" prop="userName"></el-table-column>
<el-table-column label="提交日期" prop="createTime"></el-table-column>
<el-table-column label="审核项" prop="operation"></el-table-column>
<el-table-column label="审核项" prop="operation">
<template slot-scope="scope">
<span class="input-item">{{keyMap[scope.row.operation]}}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === 'TBC'">待初审</span>
......@@ -69,7 +73,27 @@
</el-table-column>
<el-table-column label="审核" header-align="center" align="center">
<template slot-scope="scope" width="220">
<div class="table-btn-group">
<div class="table-btn-group">
<el-button
round
class="passed"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="adopt(scope.row)"
>通过</el-button>
<el-button
round
class="rejected"
:disabled="
scope.row.status === 'REFUSED' ||
scope.row.status === 'APPROVED_FINAL'
"
@click="reject(scope.row)"
>驳回</el-button>
</div>
<!-- <div class="table-btn-group">
<el-tooltip content="通过" placement="top">
<el-button circle @click="adopt(scope.row)">
<i class="icon-table icon-enable"></i>
......@@ -80,7 +104,7 @@
<i class="icon-table icon-disable"></i>
</el-button>
</el-tooltip>
</div>
</div> -->
</template>
</el-table-column>
</el-table>
......@@ -172,8 +196,18 @@ export default {
callback();
}
}
};
const keyMap = {
ADD: "新增",
EDIT: "修改",
REMOVE: "删除",
DISABLE: "禁用",
ENABLE: "启用",
UPPER: "上架",
LOWER: "下架"
};
return {
keyMap: keyMap,
type:true,
value1: "",
page: { currentPage: 1, pageSize: 10, total: 0 },
......
src/page/check/video/index.vue
View file @ a7dfb8e4
This diff is collapsed.
src/page/content/components/dialog/addCopyright.vue
View file @ a7dfb8e4
......@@ -148,11 +148,11 @@ export default {
_this.$qs.stringify(this.ruleForm)
)
.then(res => {
if(res.resultCode === "200"){
if(res.data.resultCode === "200"){
_this.$message({ type: "success", message: "新增成功!" });
_this.dialogVisible =false
}else{
_this.$message({ type: "error", message: res.message });
_this.$message({ type: "error", message: res.data.message });
}
......
src/page/content/components/dialog/videoDialog.vue
View file @ a7dfb8e4
......@@ -3,10 +3,9 @@
<el-dialog
custom-class="party-dialog"
title="视频详情"
width="80%"
width="900px"
:visible.sync="dialogVisible"
:before-close="close"
>
<div>
<!--
......@@ -15,9 +14,16 @@
</video>
<button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
<!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<video :preload="preload"
:poster="videoImg" :height="height" :width="width" align="center" :controls="controls" :autoplay="autoplay">
<source :src="videoSrc" type="video/mp4">
<video
:preload="preload"
:poster="videoImg"
:height="height"
:width="width"
align="center"
:controls="controls"
:autoplay="autoplay"
>
<source :src="videoSrc" type="video/mp4" />
</video>
</div>
<!-- <div slot="footer" class="dialog-footer btn-group">
......@@ -30,29 +36,28 @@
export default {
data() {
return {
dialogVisible:false,
videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
playStatus: '',
muteStatus: '',
dialogVisible: false,
// videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
// videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
videoSrc: "",
videoImg: "",
playStatus: "",
muteStatus: "",
isMute: true,
isPlay: false,
width: '820', // 设置视频播放器的显示宽度（以像素为单位）
height: '500', // 设置视频播放器的显示高度（以像素为单位）
preload: 'auto', // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
width: "820", // 设置视频播放器的显示宽度（以像素为单位）
height: "500", // 设置视频播放器的显示高度（以像素为单位）
preload: "auto", // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: ''
}
autoplay: "",
};
},
methods: {
// 新增关闭
close() {
this.dialogVisible = false;
},
}
},
};
</script>
......
src/page/content/components/uploadVue/uploadAudio.vue
View file @ a7dfb8e4
......@@ -79,9 +79,9 @@ export default {
this.filedata.append('file', file.file)
},
beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5;
const isLt5M = file.size / 1024 < 1;
if (!isLt5M) {
this.$message.error("上传文件大小不能超过 5MB!");
this.$message.error("上传文件大小不能超过 1GB!");
}
return isLt5M;
}
......
src/page/content/components/uploadVue/uploadDatum.vue
View file @ a7dfb8e4
......@@ -79,13 +79,13 @@ export default {
this.filedata.append("file", file.file);
},
beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5;
if (!isLt5M) {
this.$message.error("上传文件大小不能超过 5MB!");
const isLt10G = file.size / 1024 < 10;
if (!isLt10G) {
this.$message.error("上传文件大小不能超过 10GB!");
}
return isLt5M;
},
},
return isLt10G;
}
}
};
</script>
......
src/page/content/components/uploadVue/uploadFile.vue
View file @ a7dfb8e4
......@@ -76,11 +76,11 @@ export default {
this.filedata.append('file', file.file)
},
beforeAvatarUpload(file) {
const isLt5M = file.size / 1024 / 1024 < 5;
if (!isLt5M) {
this.$message.error("上传文件大小不能超过 5MB!");
const isLt10G = file.size / 1024 < 10;
if (!isLt10G) {
this.$message.error("上传文件大小不能超过 10GB!");
}
return isLt5M;
return isLt10G;
},
handleRequest(file) {
// let formData = new FormData();
......
src/page/content/components/uploadVue/uploadImg.vue
View file @ a7dfb8e4
......@@ -30,29 +30,53 @@ export default {
data() {
return {
dialogImageUrl: "",
dialogVisible: false
dialogVisible: false,
fileList: [
{
name: "",
url: "",
},
],
};
},
computed: {
computed: {
headers() {
return {Authorization: localStorage.getItem('backToken')}
}
return {
Authorization: localStorage.getItem("backToken") || "",
};
},
},
methods: {
// 图片上传成功的返回值
handleAvatarSuccess(res, file) {
this.$emit('imgUrl', res.data.url)
if (res.resultCode == 200) {
this.$emit("imgUrl", res.data.url);
this.imageUrl = res.data.url;
} else {
this.$message.error(res.message);
}
},
handleRemove(file, fileList) {
console.log(file, fileList);
this.$emit("imgUrl", "");
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
}
}
},
showImg(cover) {
let file = {
name: "",
url: cover,
};
this.fileList = [file]
},
},
};
</script>
<style>
.avatar {
width: 100%;
height: 100%;
}
</style>
src/page/content/components/uploadVue/uploadQrcode.vue
View file @ a7dfb8e4
......@@ -35,7 +35,8 @@ export default {
},
computed: {
headers() {
return {Authorization: localStorage.getItem('backToken')}
// return { 'token': this.backToken }
return {'Authorization':localStorage.getItem('backToken')}
}
},
methods: {
......
src/page/content/components/videoPlay.vue
View file @ a7dfb8e4
<template>
<div>
<!--
<div>
<!--
<video :src="videoSrc" :poster="videoImg" :autoplay="playStatus" height="421" width="700" :muted="muteStatus">
your browser does not support the video tag
</video>
<button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
<!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<video :preload="preload"
:poster="videoImg" :height="height" :width="width" align="center" :controls="controls" :autoplay="autoplay">
<source :src="videoSrc" type="video/mp4">
</video>
</div>
<!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<video
:preload="preload"
:poster="videoImg"
:height="height"
:width="width"
align="center"
:controls="controls"
:autoplay="autoplay"
>
<source :src="videoSrc" type="video/mp4" />
</video>
</div>
</template>
<script>
export default {
name: 'Video',
data () {
name: "Video",
data() {
return {
videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4',
videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb',
playStatus: '',
muteStatus: '',
videoSrc:
"https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4",
videoImg: "https://sm.ms/image/ueRFCZfk2xTONGb",
playStatus: "",
muteStatus: "",
isMute: true,
isPlay: false,
width: '820', // 设置视频播放器的显示宽度（以像素为单位）
height: '500', // 设置视频播放器的显示高度（以像素为单位）
preload: 'auto', // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
width: "820", // 设置视频播放器的显示宽度（以像素为单位）
height: "500", // 设置视频播放器的显示高度（以像素为单位）
preload: "auto", // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件，启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: ''
}
}
autoplay: "",
};
},
// 自动播放属性,muted:静音播放
// autoplay: 'muted',
}
};
</script>
<style scoped >
</style>
src/page/content/learn/content/add.vue
View file @ a7dfb8e4
This diff is collapsed.
src/page/content/learn/content/index.vue
View file @ a7dfb8e4
This diff is collapsed.
src/page/content/learn/project/index.vue
View file @ a7dfb8e4
This diff is collapsed.
src/page/content/video/classify/index.vue
View file @ a7dfb8e4
......@@ -302,7 +302,9 @@ export default {
// 重置
Reset() {
// this.$refs["form"].resetFields();
this.form = {};
this.value1 = []
this.Search();
},
// // 获取当前查询参数
......@@ -358,7 +360,7 @@ export default {
} else {
_this.$message({
type: "error",
message: res.data.msg
message: res.data.meessage
});
}
},
......@@ -404,7 +406,7 @@ export default {
} else {
_this.$message({
type: "error",
message: res.data.msg
message: res.data.message
});
}
},
......@@ -493,11 +495,17 @@ export default {
.then(
res => {
// this.$message({ type: "success", message: "删除成功!" });
this.msgInfo = {
type: "wait",
des: `申请已提交，待审核…`,
};
// this.msgInfo = {
// type: "wait",
// des: `申请已提交，待审核…`,
// };
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "删除视频分类申请已提交,待审核！" });
_this.Search();
}else{
this.$message({ type: "error", message: res.data.message });
}
},
error => {
this.$message({
......
src/page/content/video/content/add.vue
View file @ a7dfb8e4
......@@ -64,7 +64,7 @@
<span>若没有相应的视频分类，请点击</span>
<el-button type="text" @click="addVideoClass">新建视频分类</el-button>
</el-form-item>
<el-form-item label="请选择视频分类" prop="videoContentCatIdList">
<el-form-item label="请选择视频分类" >
<el-select
placeholder="请选择预设视频分类"
@focus="getVideoContentCatData"
......@@ -246,7 +246,7 @@ export default {
console.log(data)
console.log(this.ruleForm.videoContentCatId)
},
// 获取版权方详情
// 获取信息
getInfo(id) {
let vm = this;
vm.$https(
......@@ -287,9 +287,6 @@ export default {
{
url: "videoContentCat/save",
method: "post",
// headers: {
// 'Content-Type': 'application/json'
// },
authType: this.backToken
},
this.classForm
......@@ -328,8 +325,13 @@ export default {
},
this.$qs.stringify(this.ruleForm)
).then(res => {
this.$message({ type: "success", message: "新增成功!" });
history.go(-1);
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增视频申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
}).catch(function(err) {
console.log(err);
});
......@@ -351,7 +353,7 @@ export default {
},
this.$qs.stringify(this.ruleForm)
).then(res => {
this.$message({ type: "success", message: "修改成功!" });
this.$message({ type: "success", message: "修改视频申请已提交,待审核！" });
history.go(-1);
}).catch(function(err) {
console.log(err);
......
src/page/content/video/content/index.vue
View file @ a7dfb8e4
......@@ -528,12 +528,13 @@ export default {
})
.then(
res => {
this.msgInfo = {
type: "wait",
des: `申请已提交，待审核…`,
};
// this.$message({ type: "success", message: "删除成功!" });
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "删除视频申请已提交,待审核！" });
_this.Search();
}else{
this.$message({ type: "error", message: res.data.message });
}
},
error => {
this.$message({
......
src/page/content/video/copyright/add.vue
View file @ a7dfb8e4
......@@ -207,7 +207,7 @@ export default {
method: "post",
authType: this.backToken
},
this.$qs.stringify(this.ruleForm)
this.$qs.stringify(this.classForm)
// this.classForm
)
.then(res => {
......@@ -257,11 +257,11 @@ export default {
this.$qs.stringify(this.ruleForm)
)
.then(res => {
if(res.resultCode === "200"){
this.$message({ type: "success", message: "新增成功!" });
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "新增视频版权方申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.message });
this.$message({ type: "error", message: res.data.message });
}
......@@ -293,8 +293,12 @@ export default {
// this.ruleForm
)
.then(res => {
this.$message({ type: "success", message: "修改成功!" });
history.go(-1);
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "修改视频版权方申请已提交,待审核！" });
history.go(-1);
}else{
this.$message({ type: "error", message: res.data.message });
}
})
.catch(function(err) {
console.log(err);
......
src/page/content/video/copyright/index.vue
View file @ a7dfb8e4
......@@ -214,6 +214,7 @@ export default {
Reset() {
// this.$refs["form"].resetFields();
this.form = { ownerType: "VIDEO_CONTENT" };
this.value1 = []
this.Search();
},
Search() {
......@@ -336,12 +337,18 @@ export default {
})
.then(
res => {
// this.$message({ type: "success", message: "删除成功!" });
this.msgInfo = {
type: "wait",
des: `删除申请已提交，待审核…`,
};
if(res.data.resultCode === "200"){
this.$message({ type: "success", message: "删除视频版权方申请已提交,待审核！" });
_this.Search();
}else{
this.$message({ type: "error", message: res.data.message });
}
// this.$message({ type: "success", message: "删除成功!" });
// this.msgInfo = {
// type: "wait",
// des: `删除申请已提交，待审核…`,
// };
},
error => {
this.$message({
......
src/page/statistics/components/demand.vue
View file @ a7dfb8e4
......@@ -33,7 +33,7 @@ export default {
methods: {
getList() {
let curTime = getCurDate();
let frequencyDate = curTime.year + curTime.month;
let frequencyDate = curTime.year + curTime.month + curTime.date;
this.$https({
method: "post",
url: "tBoardStatistic/getInteractionFrequencyPageList?frequencyDate=" + frequencyDate,
......
src/page/statistics/components/interact.vue
View file @ a7dfb8e4
......@@ -24,13 +24,13 @@ export default {
},
components: {},
mounted() {
this.getList()
this.getList();
},
methods: {
getList() {
let curTime = getCurDate();
let playDate = curTime.year + curTime.month;
let _this = this
let playDate = curTime.year + curTime.month + curTime.date;
let _this = this;
this.$https({
method: "post",
url: "tBoardStatistic/getBoardTrendPageList?playDate=" + playDate,
......
src/page/statistics/interaction.vue
View file @ a7dfb8e4
......@@ -49,7 +49,7 @@ export default {
_this.$https({
method: "post",
url:
"tBoardStatistic/getInteractionFrequencyPageList?frequencyDate=" +
"tBoardStatistic/getInteractionPageList?frequencyDate=" +
frequencyDate,
authType: this.backToken,
})
......
src/page/statistics/tend.vue
View file @ a7dfb8e4
......@@ -77,7 +77,7 @@ export default {
.$https({
method: "post",
url:
"tBoardStatistic/getInteractionFrequencyPageList?frequencyDate=" +
"tBoardStatistic/getBoardPageList?frequencyDate=" +
frequencyDate,
authType: this.backToken,
})
......
src/page/system/log/devops.vue
View file @ a7dfb8e4
......@@ -60,7 +60,7 @@ export default {
feildList:[
{prop:'userName',label:'运维账号'},
{prop:'area',label:'运维区域'},
{prop:'operationIp',label:'操作Ip'},
{prop:'operationType',label:'操作类型'},
{prop:'createTime',label:'操作时间'}
],
list: [],
......
src/page/system/log/platformlog.vue
View file @ a7dfb8e4
This diff is collapsed.
src/page/system/log/settoplog.vue
View file @ a7dfb8e4
<template>
<!-- 机顶盒运维日志 -->
<div class="set-top-log-wrapper height100">
<div class="search-container">
<el-form :inline="true" :model="form">
<el-form-item>
<el-select v-model="form.user" placeholder="请选择">
<el-option
v-model="form.organId"
v-for="item in organList"
:key="item.id"
:label="item.orgName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="form.date"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<div class="btn-group">
<el-button type="primary" @click="handleSubmit">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</div>
</el-form-item>
</el-form>
<div class="page-tip">
<span class="page-tip-title">页面说明:</span>
<span class="page-tips">可查看所有账号在系统上的操作信息，可根据操作类型、操作时间段查询等方式对日志信息进行筛选</span>
</div>
</div>
<div class="table-content hasTabs">
<party-table
class="noAdd"
:currentPage="page._index"
:feildList="feildList"
:list="list">
</party-table>
<party-pagination
:page="page"
@changePage="handleChangeCurrent"
/>
<div class="search-container">
<el-form :inline="true" :model="form">
<el-form-item>
<el-select v-model="form.user" placeholder="请选择所属单位">
<el-option
v-model="form.organId"
v-for="item in organList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-date-picker
v-model="form.date"
type="daterange"
range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<div class="btn-group">
<el-button type="primary" @click="handleSubmit">查询</el-button>
<el-button @click="handleReset">重置</el-button>
</div>
</el-form-item>
</el-form>
<div class="page-tip">
<span class="page-tip-title">页面说明:</span>
<span class="page-tips"
>可查看所有账号在系统上的操作信息，可根据操作类型、操作时间段查询等方式对日志信息进行筛选</span
>
</div>
</div>
<div class="table-content hasTabs">
<party-table
class="noAdd"
:currentPage="page._index"
:feildList="feildList"
:list="list"
>
</party-table>
<party-pagination :page="page" @changePage="handleChangeCurrent" />
</div>
</div>
</template>
<script>
import { partyPagination,partyTable } from '@/components/index'
import { getOrgListWithOutPage } from "@/config/organ.js"
import { partyPagination, partyTable } from "@/components/index";
import { getOrgListWithOutPage } from "@/config/organ.js";
export default {
data(){
return{
form:{
organId:'',
date:'',
startDate:'',
endDate:''
},
organList:[],
feildList:[
{prop:'macAddr',label:'机顶盒Mac地址'},
{prop:'orgName',label:'所属单位'},
{prop:'learnName',label:'学习内容'},
{prop:'startTime',label:'开始时间'},
{prop:'endTime',label:'结束时间'}
],
list: [],
page:{
_index:1,
_size:10,
total:0
}
}
data() {
return {
form: {
organId: "",
date: "",
startDate: "",
endDate: "",
},
organList: [],
feildList: [
{ prop: "macAddr", label: "机顶盒Mac地址" },
{ prop: "orgName", label: "所属单位" },
{ prop: "learnName", label: "学习内容" },
{ prop: "startTime", label: "开始时间" },
{ prop: "endTime", label: "结束时间" },
],
list: [],
page: {
_index: 1,
_size: 10,
total: 0,
},
};
},
components: { partyTable, partyPagination },
mounted() {
// 获取所属范围列表
this.getOrgList();
// 获取机顶盒运维类表
this.getFirstPageList();
},
methods: {
getOrgList() {
getOrgListWithOutPage().then((res) => {
this.organList = res;
});
},
components:{ partyTable, partyPagination},
mounted(){
// 获取所属范围列表
this.getOrgList()
// 获取机顶盒运维类表
this.getLog()
getFirstPageList() {
this.page._index = 1;
this.getPageList();
},
methods:{
getOrgList(){
getOrgListWithOutPage().then(res=>{
this.organList = res
})
},
handleSubmit(){
this.getLog()
},
handleReset(){
for(let key in this.form){
this.form[key] = ""
}
this.getLog()
handleSubmit() {
this.getPageList();
},
handleReset() {
for (let key in this.form) {
this.form[key] = "";
}
this.getFirstPageList();
},
getPageList() {
let requestParams = {};
requestParams._index = this.page._index;
requestParams._size = this.page._size;
if (this.form.organId) {
requestParams.organId = this.form.organId;
}
if (this.form.date) {
requestParams.startDate = this.form.date[0];
requestParams.endDate = this.form.date[1];
}
this.$https(
{
method: "get",
url: "sysLog/runLogList",
authType: this.backToken,
},
getLog(){
let requestParams = {}
requestParams._index = this.page._index
requestParams._size = this.page._size
if(this.form.organId){
requestParams.organId = this.form.organId
}
if(this.form.date){
requestParams.startDate = this.form.date[0]
requestParams.endDate = this.form.date[1]
requestParams
)
.then((res) => {
if (res.status != 200) {
this.getResWithOutData();
} else {
if (res.data.resultCode == 200) {
this.list = res.data.data.records;
this.page._size = res.data.data.size;
this.page.total = res.data.data.total;
} else {
this.getResWithOutData();
}
this.$https({
method:'get',
url: 'sysLog/runLogList',
authType: this.backToken,
},requestParams).then(res=>{
if(res.status != 200){
this.getResWithOutData()
}else{
if(res.data.resultCode == 200){
this.list = res.data.data.records
this.page._size = res.data.data.size
this.page.total = res.data.data.total
}else{
this.getResWithOutData()
}
}
}).catch(err=>{
console.log(err)
})
},
// 页面返回值为空
getResWithOutData(){
this.list = []
this.page = {
_index:1,
_size:10,
total:0
}
},
// 翻页
handleChangeCurrent(val){
this.page._index = val
this.getLog()
}
}
})
.catch((err) => {
console.log(err);
});
},
watch:{
}
}
// 页面返回值为空
getResWithOutData() {
this.list = [];
this.page = {
_index: 1,
_size: 10,
total: 0,
};
},
// 翻页
handleChangeCurrent(val) {
this.page._index = val;
this.getPageList();
},
},
watch: {},
};
</script>
<style lang="less" scoped>
</style>
\ No newline at end of file
src/page/system/log/userlog.vue
View file @ a7dfb8e4
This diff is collapsed.
src/page/system/organ.vue
View file @ a7dfb8e4
......@@ -393,4 +393,4 @@ export default {
}
}
}
</style>
\ No newline at end of file
</style>
src/router/index.js
View file @ a7dfb8e4
......@@ -356,11 +356,11 @@ const router = new Router({
// --学习
{
path: '/learnProject',
name: '学习项目制作',
name: '学习项目管理',
component: () => import('@/page/content/learn/project/index'),
meta: {
showBreadcrumb: true,
title: '学习项目制作',
title: '学习项目管理',
}
},
{
......
src/style/global.less
View file @ a7dfb8e4
......@@ -389,7 +389,6 @@
}
.info-wrapper {
height: 100%;
width: 640px;
margin: 0 auto;
background: #fff;
......@@ -412,6 +411,7 @@
height: calc(100% - 156px);
overflow-y: auto;
overflow-x: hidden;
padding: 20px 0;
}
.info-footer {
......
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