Commit 0bfde0c8 authored by xulili's avatar xulili

学习制作

parent 4529986f
...@@ -13,6 +13,7 @@ module.exports = { ...@@ -13,6 +13,7 @@ module.exports = {
proxyTable: { proxyTable: {
'/mall': { '/mall': {
target: "http://192.168.110.67/mall", target: "http://192.168.110.67/mall",
// target: "http://192.168.204.66:8088/mall",
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/mall': '/' // 重写接口 '^/mall': '/' // 重写接口
......
let statusOption = [
{ label: "活跃", value: 'ENABLE' },
{ label: "禁用", value: 'DISABLE' },
{ label: "待审核", value: 'TBC' },
]
export {
statusOption
}
\ No newline at end of file
...@@ -22,12 +22,20 @@ ...@@ -22,12 +22,20 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.isEdit" class="table-btn-group"> <div v-if="item.isEdit" class="table-btn-group">
<el-tooltip content="修改" placement="top"> <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> <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="handleOperate(scope.row, 'reset')"> <el-button
circle
:disabled="scope.row.statusName !== '活跃'"
@click="handleOperate(scope.row, 'reset')"
>
<i class="icon-table icon-reset"></i> <i class="icon-table icon-reset"></i>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
......
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
} }
}, },
// 翻页 // 翻页
handleChangeCurrent() { handleChangeCurrent(val) {
this.page._index = val; this.page._index = val;
this.getPageList(); this.getPageList();
}, },
......
...@@ -206,7 +206,7 @@ export default { ...@@ -206,7 +206,7 @@ export default {
}); });
}, },
// 翻页 // 翻页
handleChangeCurrent() { handleChangeCurrent(val) {
this.page._index = val; this.page._index = val;
this.getPageList(); this.getPageList();
}, },
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
v-model="form.userName" v-model="form.userName"
placeholder="请输入用户名" placeholder="请输入用户名"
suffix-icon="el-icon-search" suffix-icon="el-icon-search"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -59,6 +60,7 @@ import { partyPagination } from "@/components/index"; ...@@ -59,6 +60,7 @@ import { partyPagination } from "@/components/index";
import accountTable from "./components/accountTable"; import accountTable from "./components/accountTable";
import { addDialog, editDialog } from "./statisticalDialog/index"; import { addDialog, editDialog } from "./statisticalDialog/index";
import msgDialog from "./msgDialog.vue"; import msgDialog from "./msgDialog.vue";
import { statusOption } from "@/config/account";
export default { export default {
data() { data() {
return { return {
...@@ -67,11 +69,7 @@ export default { ...@@ -67,11 +69,7 @@ export default {
status: "", status: "",
type: 5, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号 type: 5, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 5. 统计账号
}, },
statusOption: [ statusOption: statusOption,
{ label: "活跃", value: 1 },
{ label: "禁用", value: 2 },
{ label: "待审核", value: 3 },
],
feildList: [ feildList: [
{ prop: "userName", label: "统计用户名" }, { prop: "userName", label: "统计用户名" },
{ prop: "orgName", label: "所属单位" }, { prop: "orgName", label: "所属单位" },
...@@ -270,7 +268,7 @@ export default { ...@@ -270,7 +268,7 @@ export default {
} }
}, },
// 翻页 // 翻页
handleChangeCurrent() { handleChangeCurrent(val) {
this.page._index = val; this.page._index = val;
this.getPageList(); this.getPageList();
}, },
......
...@@ -5,13 +5,18 @@ ...@@ -5,13 +5,18 @@
<el-form :inline="true" :model="form"> <el-form :inline="true" :model="form">
<el-form-item> <el-form-item>
<el-input <el-input
clearable
v-model="form.userName" v-model="form.userName"
placeholder="请输入运维人员姓名" placeholder="请输入运维人员姓名"
suffix-icon="el-icon-search" suffix-icon="el-icon-search"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select v-model="form.status" placeholder="请选择账号状态"> <el-select
v-model="form.status"
placeholder="请选择账号状态"
clearable
>
<el-option <el-option
v-for="(item, index) in statusOption" v-for="(item, index) in statusOption"
:key="index" :key="index"
...@@ -56,6 +61,7 @@ import { partyPagination } from "@/components/index"; ...@@ -56,6 +61,7 @@ import { partyPagination } from "@/components/index";
import accountTable from "./components/accountTable"; import accountTable from "./components/accountTable";
import { addDialog, editDialog } from "./stbDialog/index"; import { addDialog, editDialog } from "./stbDialog/index";
import msgDialog from "./msgDialog.vue"; import msgDialog from "./msgDialog.vue";
import { statusOption } from "@/config/account";
export default { export default {
data() { data() {
return { return {
...@@ -64,11 +70,7 @@ export default { ...@@ -64,11 +70,7 @@ export default {
status: "", status: "",
type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号 type: 4, //1.用户账号 2.平台单位单位管理员账号 3.机顶盒账号 4.运维账号
}, },
statusOption: [ statusOption: statusOption,
{ label: "活跃", value: 1 },
{ label: "禁用", value: 2 },
{ label: "待审核", value: 3 },
],
feildList: [ feildList: [
{ prop: "userName", label: "运维人员姓名" }, { prop: "userName", label: "运维人员姓名" },
{ prop: "orgName", label: "运维区域" }, { prop: "orgName", label: "运维区域" },
...@@ -258,7 +260,7 @@ export default { ...@@ -258,7 +260,7 @@ export default {
} }
}, },
// 翻页 // 翻页
handleChangeCurrent() { handleChangeCurrent(val) {
this.page._index = val; this.page._index = val;
this.getPageList(); this.getPageList();
}, },
......
...@@ -315,7 +315,7 @@ export default { ...@@ -315,7 +315,7 @@ export default {
} }
}, },
// 翻页 // 翻页
handleChangeCurrent() { handleChangeCurrent(val) {
this.page._index = val; this.page._index = val;
this.getPageList(); this.getPageList();
}, },
......
...@@ -131,8 +131,8 @@ export default { ...@@ -131,8 +131,8 @@ export default {
}, },
// 编辑 // 编辑
handleEdit() { handleEdit() {
this.$refs.editDialog.id = this.activeRow.id this.$refs.editDialog.id = this.activeRow.id;
this.$refs.editDialog.getDetailById() this.$refs.editDialog.getDetailById();
this.$refs.editDialog.dialogVisible = true; this.$refs.editDialog.dialogVisible = true;
}, },
// 重置密码 // 重置密码
...@@ -238,7 +238,7 @@ export default { ...@@ -238,7 +238,7 @@ export default {
} }
}, },
// 翻页 // 翻页
handleChangeCurrent() { handleChangeCurrent(val) {
this.page._index = val; this.page._index = val;
this.getPageList(); this.getPageList();
}, },
......
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
<el-dialog <el-dialog
custom-class="party-dialog" custom-class="party-dialog"
title="视频详情" title="视频详情"
width="80%" width="900px"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:before-close="close" :before-close="close"
> >
<div> <div>
<!-- <!--
...@@ -15,9 +14,16 @@ ...@@ -15,9 +14,16 @@
</video> </video>
<button @click="playClick" :class="{hide: isPlay}">点击播放</button> --> <button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
<!--class="video-js vjs-default-skin vjs-big-play-centered" --> <!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<video :preload="preload" <video
:poster="videoImg" :height="height" :width="width" align="center" :controls="controls" :autoplay="autoplay"> :preload="preload"
<source :src="videoSrc" type="video/mp4"> :poster="videoImg"
:height="height"
:width="width"
align="center"
:controls="controls"
:autoplay="autoplay"
>
<source :src="videoSrc" type="video/mp4" />
</video> </video>
</div> </div>
<!-- <div slot="footer" class="dialog-footer btn-group"> <!-- <div slot="footer" class="dialog-footer btn-group">
...@@ -30,29 +36,28 @@ ...@@ -30,29 +36,28 @@
export default { export default {
data() { data() {
return { return {
dialogVisible:false, 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: '', videoSrc: "",
muteStatus: '', videoImg: "",
playStatus: "",
muteStatus: "",
isMute: true, isMute: true,
isPlay: false, isPlay: false,
width: '820', // 设置视频播放器的显示宽度(以像素为单位) width: "820", // 设置视频播放器的显示宽度(以像素为单位)
height: '500', // 设置视频播放器的显示高度(以像素为单位) height: "500", // 设置视频播放器的显示高度(以像素为单位)
preload: 'auto', // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。 preload: "auto", // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件,启动视频播放的唯一方法是使用autoplay属性或通过Player API。 controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件,启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: '' autoplay: "",
} };
}, },
methods: { methods: {
// 新增关闭 // 新增关闭
close() { close() {
this.dialogVisible = false; this.dialogVisible = false;
}, },
},
}
}; };
</script> </script>
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
:on-remove="handleRemove" :on-remove="handleRemove"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:headers="headers" :headers="headers"
:file-list="fileList"
accept=""
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
...@@ -21,34 +23,53 @@ export default { ...@@ -21,34 +23,53 @@ export default {
data() { data() {
return { return {
dialogImageUrl: "", dialogImageUrl: "",
dialogVisible: false dialogVisible: false,
fileList: [
{
name: "",
url: "",
},
],
}; };
}, },
computed: { computed: {
headers() { headers() {
// return { 'token': this.backToken } return {
} Authorization: localStorage.getItem("backToken") || "",
};
},
}, },
methods: { methods: {
// 图片上传成功的返回值 // 图片上传成功的返回值
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
if (res.resultCode == 200) {
console.log(res) this.$emit("imgUrl", res.data.url);
console.log(res.data.url) this.imageUrl = res.data.url;
this.$emit('imgUrl', res.data.url) } else {
// console.log(data.fileList[0].url) this.$message.error(res.message);
// this.imageUrl = URL.createObjectURL(file.raw); }
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
console.log(file, fileList); this.$emit("imgUrl", "");
}, },
handlePictureCardPreview(file) { handlePictureCardPreview(file) {
this.dialogImageUrl = file.url; this.dialogImageUrl = file.url;
this.dialogVisible = true; this.dialogVisible = true;
} },
} showImg(cover) {
let file = {
name: "",
url: cover,
};
this.fileList = [file]
},
},
}; };
</script> </script>
<style> <style>
.avatar {
width: 100%;
height: 100%;
}
</style> </style>
...@@ -6,38 +6,44 @@ ...@@ -6,38 +6,44 @@
</video> </video>
<button @click="playClick" :class="{hide: isPlay}">点击播放</button> --> <button @click="playClick" :class="{hide: isPlay}">点击播放</button> -->
<!--class="video-js vjs-default-skin vjs-big-play-centered" --> <!--class="video-js vjs-default-skin vjs-big-play-centered" -->
<video :preload="preload" <video
:poster="videoImg" :height="height" :width="width" align="center" :controls="controls" :autoplay="autoplay"> :preload="preload"
<source :src="videoSrc" type="video/mp4"> :poster="videoImg"
:height="height"
:width="width"
align="center"
:controls="controls"
:autoplay="autoplay"
>
<source :src="videoSrc" type="video/mp4" />
</video> </video>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'Video', name: "Video",
data () { data() {
return { return {
videoSrc: 'https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4', videoSrc:
videoImg: 'https://sm.ms/image/ueRFCZfk2xTONGb', "https://video.pearvideo.com/mp4/short/20200209/cont-1650197-14888002-hd.mp4",
playStatus: '', videoImg: "https://sm.ms/image/ueRFCZfk2xTONGb",
muteStatus: '', playStatus: "",
muteStatus: "",
isMute: true, isMute: true,
isPlay: false, isPlay: false,
width: '820', // 设置视频播放器的显示宽度(以像素为单位) width: "820", // 设置视频播放器的显示宽度(以像素为单位)
height: '500', // 设置视频播放器的显示高度(以像素为单位) height: "500", // 设置视频播放器的显示高度(以像素为单位)
preload: 'auto', // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。 preload: "auto", // 建议浏览器是否应在<video>加载元素后立即开始下载视频数据。
controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件,启动视频播放的唯一方法是使用autoplay属性或通过Player API。 controls: true, // 确定播放器是否具有用户可以与之交互的控件。没有控件,启动视频播放的唯一方法是使用autoplay属性或通过Player API。
autoplay: '' autoplay: "",
} };
} },
// 自动播放属性,muted:静音播放 // 自动播放属性,muted:静音播放
// autoplay: 'muted', // autoplay: 'muted',
};
}
</script> </script>
<style scoped > <style scoped >
</style> </style>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
feildList:[ feildList:[
{prop:'userName',label:'运维账号'}, {prop:'userName',label:'运维账号'},
{prop:'area',label:'运维区域'}, {prop:'area',label:'运维区域'},
{prop:'operationIp',label:'操作Ip'}, {prop:'operationType',label:'操作类型'},
{prop:'createTime',label:'操作时间'} {prop:'createTime',label:'操作时间'}
], ],
list: [], list: [],
......
<template> <template>
<!-- 平台操作日志 --> <!-- 平台操作日志 -->
<div class="platform-log-wrapper height100"> <div class="platform-log-wrapper height100">
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form"> <el-form :inline="true" :model="form">
...@@ -14,20 +14,21 @@ ...@@ -14,20 +14,21 @@
<el-date-picker <el-date-picker
v-model="form.date" v-model="form.date"
type="daterange" type="daterange"
value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select <el-select v-model="form.operationType" placeholder="请选择操作类型">
v-model="form.operationType"
placeholder="请选择操作类型">
<el-option <el-option
v-for="(item,index) in operationTypeList" v-for="(item, index) in operationTypeList"
:key="index" :key="index"
:label="item" :label="item"
:value="item"> :value="item"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -40,7 +41,9 @@ ...@@ -40,7 +41,9 @@
</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 hasTabs"> <div class="table-content hasTabs">
...@@ -48,122 +51,122 @@ ...@@ -48,122 +51,122 @@
class="noAdd" class="noAdd"
:currentPage="page._index" :currentPage="page._index"
:feildList="feildList" :feildList="feildList"
:list="list"> :list="list"
>
</party-table> </party-table>
<party-pagination <party-pagination :page="page" @changePage="handleChangeCurrent" />
:page="page"
@changePage="handleChangeCurrent"
/>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { partyPagination,partyTable } from '@/components/index' import { partyPagination, partyTable } from "@/components/index";
import { getLogType } from '@/config/logOperationType.js' import { getLogType } from "@/config/logOperationType.js";
export default { export default {
data(){ data() {
return{ return {
form:{ form: {
nameOrCode:'', nameOrCode: "",
date:'', date: "",
operationType:'', operationType: "",
startDate:'', startDate: "",
endDate:'' endDate: "",
}, },
logType:1, //1.平台操作日志 2.用户操作日志 logType: 1, //1.平台操作日志 2.用户操作日志
operationTypeList:[], operationTypeList: [],
feildList:[ feildList: [
{prop:'operationTime',label:'操作时间'}, { prop: "operationTime", label: "操作时间" },
{prop:'operator',label:'操作者'}, { prop: "operator", label: "操作者" },
{prop:'operationType',label:'操作类型'}, { prop: "operationType", label: "操作类型" },
{prop:'operationObject',label:'操作对象'}, { prop: "operationObject", label: "操作对象" },
{prop:'operationIp',label:'操作Ip'}, { prop: "operationIp", label: "操作Ip" },
], ],
list: [], list: [],
page:{ page: {
_index:1, _index: 1,
_size:10, _size: 10,
total:0 total: 0,
} },
} };
}, },
components:{ partyTable, partyPagination}, components: { partyTable, partyPagination },
mounted(){ mounted() {
// 获取日志操作类型 // 获取日志操作类型
this.getOperationType() this.getOperationType();
// 获取机顶盒运维类表 // 获取机顶盒运维类表
this.getLog() this.getLog();
}, },
methods:{ methods: {
getOperationType(){ getOperationType() {
getLogType().then(res=>{ getLogType().then((res) => {
this.operationTypeList = res this.operationTypeList = res;
}) });
}, },
handleSubmit(){ handleSubmit() {
this.getLog() this.getLog();
}, },
handleReset(){ handleReset() {
for(let key in this.form){ for (let key in this.form) {
this.form[key] = "" this.form[key] = "";
} }
this.getLog() this.getLog();
}, },
getLog(){ getLog() {
let requestParams = {} let requestParams = {};
requestParams._index = this.page._index requestParams._index = this.page._index;
requestParams._size = this.page._size requestParams._size = this.page._size;
requestParams.type = this.logType requestParams.type = this.logType;
if(this.form.nameOrCode){ if (this.form.nameOrCode) {
requestParams.nameOrCode = this.form.nameOrCode requestParams.nameOrCode = this.form.nameOrCode;
} }
if(this.form.operationType){ if (this.form.operationType) {
requestParams.operationType = this.form.operationType requestParams.operationType = this.form.operationType;
} }
if(this.form.date){ if (this.form.date) {
requestParams.startDate = this.form.date[0] requestParams.startDate = this.form.date[0];
requestParams.endDate = this.form.date[1] requestParams.endDate = this.form.date[1];
} }
this.$https({ this.$https(
method:'get', {
url: 'sysLog/querySysLogList', method: "get",
url: "sysLog/querySysLogList",
authType: this.backToken, authType: this.backToken,
},requestParams).then(res=>{ },
if(res.status != 200){ requestParams
this.getResWithOutData() )
}else{ .then((res) => {
if(res.data.resultCode == 200){ if (res.status != 200) {
this.list = res.data.data.records this.getResWithOutData();
this.page._size = res.data.data.size } else {
this.page.total = res.data.data.total if (res.data.resultCode == 200) {
}else{ this.list = res.data.data.records;
this.getResWithOutData() this.page._size = res.data.data.size;
this.page.total = res.data.data.total;
} else {
this.getResWithOutData();
} }
} }
}).catch(err=>{
console.log(err)
}) })
.catch((err) => {
console.log(err);
});
}, },
// 页面返回值为空 // 页面返回值为空
getResWithOutData(){ getResWithOutData() {
this.list = [] this.list = [];
this.page = { this.page = {
_index:1, _index: 1,
_size:10, _size: 10,
total:0 total: 0,
} };
}, },
// 翻页 // 翻页
handleChangeCurrent(val){ handleChangeCurrent(val) {
this.page._index = val this.page._index = val;
this.getLog() this.getLog();
}
}, },
watch:{ },
watch: {},
} };
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
</style> </style>
\ No newline at end of file
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form"> <el-form :inline="true" :model="form">
<el-form-item> <el-form-item>
<el-select v-model="form.user" placeholder="请选择"> <el-select v-model="form.user" placeholder="请选择所属单位">
<el-option <el-option
v-model="form.organId" v-model="form.organId"
v-for="item in organList" v-for="item in organList"
:key="item.id" :key="item.id"
:label="item.orgName" :label="item.name"
:value="item.id"> :value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -19,8 +20,10 @@ ...@@ -19,8 +20,10 @@
v-model="form.date" v-model="form.date"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
value-format="yyyy-MM-dd"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -33,7 +36,9 @@ ...@@ -33,7 +36,9 @@
</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 hasTabs"> <div class="table-content hasTabs">
...@@ -41,116 +46,120 @@ ...@@ -41,116 +46,120 @@
class="noAdd" class="noAdd"
:currentPage="page._index" :currentPage="page._index"
:feildList="feildList" :feildList="feildList"
:list="list"> :list="list"
>
</party-table> </party-table>
<party-pagination <party-pagination :page="page" @changePage="handleChangeCurrent" />
:page="page"
@changePage="handleChangeCurrent"
/>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { partyPagination,partyTable } from '@/components/index' import { partyPagination, partyTable } from "@/components/index";
import { getOrgListWithOutPage } from "@/config/organ.js" import { getOrgListWithOutPage } from "@/config/organ.js";
export default { export default {
data(){ data() {
return{ return {
form:{ form: {
organId:'', organId: "",
date:'', date: "",
startDate:'', startDate: "",
endDate:'' endDate: "",
}, },
organList:[], organList: [],
feildList:[ feildList: [
{prop:'macAddr',label:'机顶盒Mac地址'}, { prop: "macAddr", label: "机顶盒Mac地址" },
{prop:'orgName',label:'所属单位'}, { prop: "orgName", label: "所属单位" },
{prop:'learnName',label:'学习内容'}, { prop: "learnName", label: "学习内容" },
{prop:'startTime',label:'开始时间'}, { prop: "startTime", label: "开始时间" },
{prop:'endTime',label:'结束时间'} { prop: "endTime", label: "结束时间" },
], ],
list: [], list: [],
page:{ page: {
_index:1, _index: 1,
_size:10, _size: 10,
total:0 total: 0,
} },
} };
}, },
components:{ partyTable, partyPagination}, components: { partyTable, partyPagination },
mounted(){ mounted() {
// 获取所属范围列表 // 获取所属范围列表
this.getOrgList() this.getOrgList();
// 获取机顶盒运维类表 // 获取机顶盒运维类表
this.getLog() this.getFirstPageList();
}, },
methods:{ methods: {
getOrgList(){ getOrgList() {
getOrgListWithOutPage().then(res=>{ getOrgListWithOutPage().then((res) => {
this.organList = res this.organList = res;
}) });
},
getFirstPageList() {
this.page._index = 1;
this.getPageList();
}, },
handleSubmit(){ handleSubmit() {
this.getLog() this.getPageList();
}, },
handleReset(){ handleReset() {
for(let key in this.form){ for (let key in this.form) {
this.form[key] = "" this.form[key] = "";
} }
this.getLog() this.getFirstPageList();
}, },
getLog(){ getPageList() {
let requestParams = {} let requestParams = {};
requestParams._index = this.page._index requestParams._index = this.page._index;
requestParams._size = this.page._size requestParams._size = this.page._size;
if(this.form.organId){ if (this.form.organId) {
requestParams.organId = this.form.organId requestParams.organId = this.form.organId;
} }
if(this.form.date){ if (this.form.date) {
requestParams.startDate = this.form.date[0] requestParams.startDate = this.form.date[0];
requestParams.endDate = this.form.date[1] requestParams.endDate = this.form.date[1];
} }
this.$https({ this.$https(
method:'get', {
url: 'sysLog/runLogList', method: "get",
url: "sysLog/runLogList",
authType: this.backToken, authType: this.backToken,
},requestParams).then(res=>{ },
if(res.status != 200){ requestParams
this.getResWithOutData() )
}else{ .then((res) => {
if(res.data.resultCode == 200){ if (res.status != 200) {
this.list = res.data.data.records this.getResWithOutData();
this.page._size = res.data.data.size } else {
this.page.total = res.data.data.total if (res.data.resultCode == 200) {
}else{ this.list = res.data.data.records;
this.getResWithOutData() this.page._size = res.data.data.size;
this.page.total = res.data.data.total;
} else {
this.getResWithOutData();
} }
} }
}).catch(err=>{
console.log(err)
}) })
.catch((err) => {
console.log(err);
});
}, },
// 页面返回值为空 // 页面返回值为空
getResWithOutData(){ getResWithOutData() {
this.list = [] this.list = [];
this.page = { this.page = {
_index:1, _index: 1,
_size:10, _size: 10,
total:0 total: 0,
} };
}, },
// 翻页 // 翻页
handleChangeCurrent(val){ handleChangeCurrent(val) {
this.page._index = val this.page._index = val;
this.getLog() this.getPageList();
}
}, },
watch:{ },
watch: {},
} };
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
</style> </style>
\ No newline at end of file
<template> <template>
<!-- 用户操作日志 --> <!-- 用户操作日志 -->
<div class="platform-log-wrapper height100"> <div class="platform-log-wrapper height100">
<div class="search-container"> <div class="search-container">
<el-form :inline="true" :model="form"> <el-form :inline="true" :model="form">
...@@ -8,26 +8,33 @@ ...@@ -8,26 +8,33 @@
v-model="form.nameOrCode" v-model="form.nameOrCode"
placeholder="请输入操作者" placeholder="请输入操作者"
suffix-icon="el-icon-search" suffix-icon="el-icon-search"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker <el-date-picker
v-model="form.date" v-model="form.date"
type="daterange" type="daterange"
value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
clearable
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select <el-select
clearable
v-model="form.operationType" v-model="form.operationType"
placeholder="请选择操作类型"> placeholder="请选择操作类型"
>
<el-option <el-option
v-for="(item,index) in operationTypeList" v-for="(item, index) in operationTypeList"
:key="index" :key="index"
:label="item" :label="item"
:value="item"> :value="item"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -40,7 +47,9 @@ ...@@ -40,7 +47,9 @@
</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 hasTabs"> <div class="table-content hasTabs">
...@@ -48,122 +57,126 @@ ...@@ -48,122 +57,126 @@
class="noAdd" class="noAdd"
:currentPage="page._index" :currentPage="page._index"
:feildList="feildList" :feildList="feildList"
:list="list"> :list="list"
>
</party-table> </party-table>
<party-pagination <party-pagination :page="page" @changePage="handleChangeCurrent" />
:page="page"
@changePage="handleChangeCurrent"
/>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { partyPagination,partyTable } from '@/components/index' import { partyPagination, partyTable } from "@/components/index";
import { getLogType } from '@/config/logOperationType.js' import { getLogType } from "@/config/logOperationType.js";
export default { export default {
data(){ data() {
return{ return {
form:{ form: {
nameOrCode:'', nameOrCode: "",
date:'', date: "",
operationType:'', operationType: "",
startDate:'', startDate: "",
endDate:'' endDate: "",
}, },
logType:2, //1.平台操作日志 2.用户操作日志 logType: 2, //1.平台操作日志 2.用户操作日志
operationTypeList:[], operationTypeList: [],
feildList:[ feildList: [
{prop:'operationTime',label:'操作时间'}, { prop: "operationTime", label: "操作时间" },
{prop:'operator',label:'操作者'}, { prop: "operator", label: "操作者" },
{prop:'operationType',label:'操作类型'}, { prop: "operationType", label: "操作类型" },
{prop:'operationObject',label:'操作对象'}, { prop: "operationObject", label: "操作对象" },
{prop:'operationIp',label:'操作Ip'}, { prop: "operationIp", label: "操作Ip" },
], ],
list: [], list: [],
page:{ page: {
_index:1, _index: 1,
_size:10, _size: 10,
total:0 total: 0,
} },
} };
}, },
components:{ partyTable, partyPagination}, components: { partyTable, partyPagination },
mounted(){ mounted() {
// 获取日志操作类型 // 获取日志操作类型
this.getOperationType() this.getOperationType();
// 获取机顶盒运维类表 // 获取机顶盒运维类表
this.getLog() this.getFirstPageList();
}, },
methods:{ methods: {
getOperationType(){ getFirstPageList() {
getLogType().then(res=>{ this.page._index = 1;
this.operationTypeList = res this.getPageList();
}) },
getOperationType() {
getLogType().then((res) => {
this.operationTypeList = res;
});
}, },
handleSubmit(){ handleSubmit() {
this.getLog() this.getPageList();
}, },
handleReset(){ handleReset() {
for(let key in this.form){ for (let key in this.form) {
this.form[key] = "" this.form[key] = "";
} }
this.getLog() this.getFirstPageList();
}, },
getLog(){ getPageList() {
let requestParams = {} let requestParams = {};
requestParams._index = this.page._index requestParams._index = this.page._index;
requestParams._size = this.page._size requestParams._size = this.page._size;
requestParams.type = this.logType requestParams.type = this.logType;
if(this.form.nameOrCode){ if (this.form.nameOrCode) {
requestParams.nameOrCode = this.form.nameOrCode requestParams.nameOrCode = this.form.nameOrCode;
} }
if(this.form.operationType){ if (this.form.operationType) {
requestParams.operationType = this.form.operationType requestParams.operationType = this.form.operationType;
} }
if(this.form.date){ if (this.form.date) {
requestParams.startDate = this.form.date[0] requestParams.startDate = this.form.date[0];
requestParams.endDate = this.form.date[1] requestParams.endDate = this.form.date[1];
} }
this.$https({ this.$https(
method:'get', {
url: 'sysLog/querySysLogList', method: "get",
url: "sysLog/querySysLogList",
authType: this.backToken, authType: this.backToken,
},requestParams).then(res=>{ },
if(res.status != 200){ requestParams
this.getResWithOutData() )
}else{ .then((res) => {
if(res.data.resultCode == 200){ if (res.status != 200) {
this.list = res.data.data.records this.getResWithOutData();
this.page._size = res.data.data.size } else {
this.page.total = res.data.data.total if (res.data.resultCode == 200) {
}else{ this.list = res.data.data.records;
this.getResWithOutData() this.page._size = res.data.data.size;
this.page.total = res.data.data.total;
} else {
this.getResWithOutData();
} }
} }
}).catch(err=>{
console.log(err)
}) })
.catch((err) => {
console.log(err);
});
}, },
// 页面返回值为空 // 页面返回值为空
getResWithOutData(){ getResWithOutData() {
this.list = [] this.list = [];
this.page = { this.page = {
_index:1, _index: 1,
_size:10, _size: 10,
total:0 total: 0,
} };
}, },
// 翻页 // 翻页
handleChangeCurrent(val){ handleChangeCurrent(val) {
this.page._index = val this.page._index = val;
this.getLog() this.getPageList();
}
}, },
watch:{ },
watch: {},
} };
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
</style> </style>
\ No newline at end of file
...@@ -356,11 +356,11 @@ const router = new Router({ ...@@ -356,11 +356,11 @@ const router = new Router({
// --学习 // --学习
{ {
path: '/learnProject', path: '/learnProject',
name: '学习项目制作', name: '学习项目管理',
component: () => import('@/page/content/learn/project/index'), component: () => import('@/page/content/learn/project/index'),
meta: { meta: {
showBreadcrumb: true, showBreadcrumb: true,
title: '学习项目制作', title: '学习项目管理',
} }
}, },
{ {
......
...@@ -389,7 +389,6 @@ ...@@ -389,7 +389,6 @@
} }
.info-wrapper { .info-wrapper {
height: 100%;
width: 640px; width: 640px;
margin: 0 auto; margin: 0 auto;
background: #fff; background: #fff;
...@@ -412,6 +411,7 @@ ...@@ -412,6 +411,7 @@
height: calc(100% - 156px); height: calc(100% - 156px);
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
padding: 20px 0;
} }
.info-footer { .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