Skip to content

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

merge

parents afa9bb2d 240f978f
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 178 deletions
src/components/end/login.vue
View file @ 70fca542
......@@ -99,6 +99,7 @@ export default {
localStorage.setItem("user", resData.user.userName);
localStorage.setItem("userId",resData.user.id)
localStorage.setItem("backToken", resData.token);
localStorage.setItem("roleList",resData.user.roleList)
localStorage.setItem(
"menuList",
JSON.stringify(resData.menuList)
......
src/config/loginOut.js
View file @ 70fca542
export function loginOut() {
const list = ['user', 'userId', 'backToken', 'menuList']
const list = ['user', 'userId','roleList', 'backToken', 'menuList']
list.forEach(v => {
localStorage.removeItem(v)
})
......
src/page/STB/appversion/components/addDialog.vue
View file @ 70fca542
......@@ -54,7 +54,7 @@
<div slot="footer" class="dialog-footer btn-group">
<el-button size="mini" @click="close">取 消</el-button>
<el-button size="mini" type="primary" @click="submitForm('formItem')">确定</el-button>
</div>
</el-dialog>
</template>
......@@ -63,7 +63,7 @@
export default {
data() {
return {
uploadUrl:'http://192.168.110.67/mall/file/upload/allType',
uploadUrl:'http://111.203.232.175:8088/mall/file/upload/allType',
formVisible: false,
headers:{Authorization: localStorage.getItem('backToken')},
formItem: {},
......@@ -89,7 +89,7 @@ export default {
this.$nextTick(() => {
this.$refs.formItem.clearValidate()
});
},
// 关闭
close() {
......@@ -174,4 +174,4 @@ export default {
}
}
</style>
\ No newline at end of file
</style>
src/page/STB/pageCustom/index.vue
View file @ 70fca542
......@@ -11,7 +11,7 @@
<div class="title">app目录界面设置</div>
<div class="btn-group">
<el-upload
action="http://192.168.110.67/mall/file/image/upload"
action="http://111.203.232.175:8088/mall/file/image/upload"
:on-success="uploadPageImg"
:before-upload="handleBeforeUpload"
:headers ="headers"
......@@ -43,7 +43,7 @@
<div class="title">app运行画面设置</div>
<div class="btn-group">
<el-upload
action="http://192.168.110.67/mall/file/image/upload"
action="http://111.203.232.175:8088/mall/file/image/upload"
:on-success="uploadRunImg"
:before-upload="handleBeforeUpload"
:headers ="headers"
......@@ -413,4 +413,4 @@ export default {
}
}
}
</style>
\ No newline at end of file
</style>
src/page/accounts/components/accountTable.vue
View file @ 70fca542
......@@ -71,6 +71,9 @@
<div v-else>
<span v-if="item.prop === 'roleList'">
{{ accoutRoleList(scope.row[item.prop]) }}
</span>
<span v-else-if="item.prop === 'exiredDate'">
{{ scope.row[item.prop] || '永久有效' }}
</span>
<span v-else>{{ scope.row[item.prop] }}</span>
</div>
......
src/page/accounts/stbAdmin.vue
View file @ 70fca542
......@@ -105,7 +105,7 @@ export default {
this.getPageList();
},
handleSubmit() {
this.getPageList();
this.getFirstPageList();
},
handleReset() {
this.form.userName = "";
......
src/page/accounts/unitAdmin.vue
View file @ 70fca542
......@@ -142,7 +142,7 @@ export default {
},
// 查询数据
handleSubmit() {
this.getPageList();
this.getFirstPageList();
},
// 重置查询
handleReset() {
......
src/page/accounts/unitAdminDialog/add.vue
View file @ 70fca542
......@@ -118,7 +118,7 @@ export default {
phone: "",
weChat: "",
email: "",
type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
},
rules: {
userName: [
......@@ -169,6 +169,7 @@ export default {
// 提交
handleSubmit() {
// 校验用户输入值
let _this = this;
this.$refs.form.validate((valid) => {
if (valid) {
let user = {};
......@@ -176,23 +177,19 @@ export default {
this.$message.error("请选择有效期");
return false;
}
if(this.form.telephone){
user.telephone = this.form.telephone;
}
if (!this.form.email) {
user.email = this.form.email;
}
if (!this.form.weChat) {
user.weChat = this.form.weChat;
}
if (!this.form.permanent) {
user.effectiveDate = this.form.date[0];
user.exiredDate = this.form.date[1];
}
}
user.telephone = this.form.telephone || "";
user.email = this.form.email || "";
user.weChat = this.form.weChat || "";
user.phone = this.form.phone;
user.permanent = this.form.permanent;
user.userName = this.form.userName;
user.orgId = this.form.orgId;
user.type = this.form.type;
user.phone = this.form.phone;
this.$https(
{
method: "post",
......
src/page/accounts/unitAdminDialog/edit.vue
View file @ 70fca542
......@@ -6,7 +6,7 @@
width="720px"
:before-close="handleClose"
>
<div class="dialog-content">
<div class="dialog-content">
<el-form
ref="form"
:model="form"
......@@ -92,7 +92,7 @@
import { getOrgListWithOutPage } from "@/config/organ";
export default {
data() {
var validateMobilePhone = (rule, value, callback) => {
var validateMobilePhone = (rule, value, callback) => {
if (value === "") {
callback(new Error("手机号不可为空"));
} else {
......@@ -109,9 +109,9 @@ export default {
dialogVisible: false,
organList: [],
rolesList: [],
id:'',
id: "",
form: {
id:'',
id: "",
userName: "",
telephone: "",
orgId: "",
......@@ -120,8 +120,8 @@ export default {
phone: "",
weChat: "",
email: "",
roleList:[],
type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
roleList: [],
type: 2, //1.用户账号 2.平台单位管理员账号 3.机顶盒账号 4.运维账号
},
rules: {
userName: [
......@@ -133,9 +133,14 @@ export default {
permanent: [
{ required: true, message: "请选择账号有效期", trigger: "change" },
],
roleList: [
{ type: 'array',required: true, message: "请选择账号类型", trigger: "change" },
]
roleList: [
{
type: "array",
required: true,
message: "请选择账号类型",
trigger: "change",
},
],
},
};
},
......@@ -150,81 +155,81 @@ export default {
});
},
// 根据id获取获取详情内容
getDetailById(){
let _this = this
this.$https(
{
method: "get",
url: "tUser/getById",
authType: this.backToken,
},
{id:_this.id}
)
.then((res) => {
if(res.status == 200 ){
if (res.data.resultCode == 200 ) {
let resData = res.data.data
for(let key in _this.form){
this.form[key] = resData[key]
}
if(!this.form.permanent){
this.form.date = [
resData.effectiveDate,
resData.exiredDate
]
}
} else {
_this.$message.error(res.data.message);
}
} else {
_this.$message.error(res.data);
}
})
.catch((err) => {
console.log(err);
});
getDetailById() {
let _this = this;
this.$https(
{
method: "get",
url: "tUser/getById",
authType: this.backToken,
},
{ id: _this.id }
)
.then((res) => {
if (res.status == 200) {
if (res.data.resultCode == 200) {
let resData = res.data.data;
for (let key in _this.form) {
this.form[key] = resData[key];
}
if (!this.form.permanent) {
this.form.date = [resData.effectiveDate, resData.exiredDate];
}
} else {
_this.$message.error(res.data.message);
}
} else {
_this.$message.error(res.data);
}
})
.catch((err) => {
console.log(err);
});
},
// 弹窗关闭
handleClose() {
this.$confirm("确认关闭？")
.then((_) => {
this.handleReset()
this.handleReset();
})
.catch((_) => {});
},
handleReset(){
this.dialogVisible = false
this.$refs.form.resetFields()
this.form = {
userName: "",
orgId: "",
permanent: true,
date: "",
roleList: [],
type: 2
}
handleReset() {
this.dialogVisible = false;
this.$refs.form.resetFields();
this.form = {
userName: "",
orgId: "",
permanent: true,
date: "",
roleList: [],
type: 2,
};
},
// 提交
handleSubmit() {
handleSubmit() {
// 校验用户输入值
let _this = this
let _this = this;
_this.$refs.form.validate((valid) => {
if (valid) {
let user = {};
if(!_this.form.permanent && !_this.form.date){
_this.$message.error('请选择有效期')
return false
}
if(!_this.form.permanent){
user.effectiveDate = _this.form.date[0];
user.exiredDate = _this.form.date[1];
let user = {};
if (!_this.form.permanent && !_this.form.date) {
_this.$message.error("请选择有效期");
return false;
}
if (!_this.form.permanent) {
user.effectiveDate = _this.form.date[0];
user.exiredDate = _this.form.date[1];
}
user.userName = _this.form.userName;
user.orgId = _this.form.orgId;
user.roleList = _this.form.roleList
user.permanent = _this.form.permanent;
user.id = _this.id
user.type = this.form.type
user.id = _this.id;
user.telephone = this.form.telephone || "";
user.email = this.form.email || "";
user.weChat = this.form.weChat || "";
user.phone = this.form.phone;
user.permanent = this.form.permanent;
user.userName = this.form.userName;
user.orgId = this.form.orgId;
user.type = this.form.type;
this.$https(
{
method: "put",
......@@ -234,22 +239,22 @@ export default {
user
)
.then((res) => {
if(res.status == 200 ){
if (res.data.resultCode == 200 ) {
this.$message({
type: "success",
message: res.data.message,
});
_this.dialogVisible = false
this.$emit('success',true)
if (res.status == 200) {
if (res.data.resultCode == 200) {
this.$message({
type: "success",
message: res.data.message,
});
_this.dialogVisible = false;
this.$emit("success", true);
} else {
this.$message.error(res.data.message);
this.$emit('success',false)
}
this.$message.error(res.data.message);
this.$emit("success", false);
}
} else {
this.$message.error(res.data);
this.$emit('success',false)
}
this.$message.error(res.data);
this.$emit("success", false);
}
})
.catch((err) => {
console.log(err);
......
src/page/accounts/users.vue
View file @ 70fca542
......@@ -5,6 +5,7 @@
<el-form :inline="true" :model="form">
<el-form-item>
<el-input
clearable
v-model="form.userName"
placeholder="请输入平台用户名"
suffix-icon="el-icon-search"
......@@ -36,8 +37,18 @@
/>
<party-pagination :page="page" @changePage="handleChangeCurrent" />
</div>
<add-dialog ref="addDialog" :organList="organList" :rolesList="rolesList" @success="getFirstPageList()" />
<edit-dialog ref="editDialog" :organList="organList" :rolesList="rolesList" @success="getFirstPageList()" />
<add-dialog
ref="addDialog"
:organList="organList"
:rolesList="rolesList"
@success="getFirstPageList()"
/>
<edit-dialog
ref="editDialog"
:organList="organList"
:rolesList="rolesList"
@success="getFirstPageList()"
/>
<msg-dialog ref="msgDilaog" :msgInfo="msgInfo" />
</div>
</template>
......@@ -71,8 +82,8 @@ export default {
},
activeRow: {},
msgInfo: {},
organList:[],
rolesList:[]
organList: [],
rolesList: [],
};
},
components: {
......@@ -88,7 +99,7 @@ export default {
this.getFirstPageList();
},
methods: {
// 获取机构列表
// 获取机构列表
getOrgList() {
getOrgListWithOutPage().then((res) => {
this.organList = res;
......@@ -105,7 +116,7 @@ export default {
this.getPageList();
},
handleSubmit() {
this.getPageList();
this.getFirstPageList();
},
handleReset() {
this.form.userName = "";
......@@ -144,7 +155,7 @@ export default {
console.log(err);
});
},
// 页面返回值为空
// 页面返回值为空
getResWithOutData() {
this.list = [];
this.page = {
......
src/page/content/components/uploadVue/uploadAudio.vue
View file @ 70fca542
......@@ -3,7 +3,7 @@
<!-- 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" -->
<!-- action="http://111.203.232.175:8088/mall/file/video/content/upload" -->
<el-upload
ref="upload"
:multiple="true"
......
src/page/content/components/uploadVue/uploadDatum.vue
View file @ 70fca542
......@@ -3,7 +3,7 @@
<!-- 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" -->
<!-- action="http://111.203.232.175:8088/mall/file/video/content/upload" -->
<el-upload
ref="upload"
:multiple="true"
......
src/page/content/components/uploadVue/uploadFile.vue
View file @ 70fca542
......@@ -3,7 +3,7 @@
<!-- 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" -->
<!-- action="http://111.203.232.175:8088/mall/file/video/content/upload" -->
<el-upload
ref="upload"
:multiple="true"
......@@ -64,7 +64,7 @@ export default {
// let newArray = data.map((item) => {
// return item.id;
// })
// this.$emit('videoList', newArray)
const data = resData.data.fileList;
......
src/page/content/components/uploadVue/uploadImg.vue
View file @ 70fca542
<template>
<div>
<el-upload
action="http://192.168.110.67/mall/file/image/upload"
action="http://111.203.232.175:8088/mall/file/image/upload"
list-type="picture-card"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove"
......
src/page/content/components/uploadVue/uploadQrcode.vue
View file @ 70fca542
<template>
<div>
<el-upload
action="http://192.168.110.67/mall/file/image/upload"
action="http://111.203.232.175:8088/mall/file/image/upload"
list-type="picture-card"
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove"
......@@ -65,4 +65,4 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
</style>
src/page/statistics/components/demand.vue
View file @ 70fca542
......@@ -33,7 +33,7 @@ export default {
methods: {
getList() {
let curTime = getCurDate();
let frequencyDate = curTime.year + curTime.month + curTime.date;
let frequencyDate = curTime.year + curTime.month;
this.$https({
method: "post",
url: "tBoardStatistic/getInteractionFrequencyPageList?frequencyDate=" + frequencyDate,
......@@ -132,7 +132,7 @@ export default {
type: "value",
name: "单位/次",
splitNumber: 5,
max: 100,
// max: 100,
axisLabel: {
textStyle: {
color: "#333333",
......
src/page/statistics/components/detail-table/rankTable.vue
View file @ 70fca542
......@@ -12,8 +12,8 @@
<img :src="getImg(index + 1)" alt="" v-if="index < 3" />
<p v-else>{{ index + 1 }}</p>
</span>
<span>{{ item.organName }}</span>
<span>{{ item.frequencyCnt }}</span>
<span>{{ item.playDate || item.organName }}</span>
<span>{{ item.playNumber || item.frequencyCnt}}</span>
</li>
</ul>
</div>
......@@ -28,8 +28,8 @@
<span>
{{ 6 + index }}
</span>
<span>{{ item.organName }}</span>
<span>{{ item.frequencyCnt }}</span>
<span>{{ item.playDate || item.organName }}</span>
<span>{{ item.playNumber || item.frequencyCnt}}</span>
</li>
</ul>
</div>
......
src/page/statistics/components/echarts/line.vue
View file @ 70fca542
......@@ -85,7 +85,7 @@ export default {
{
type: "value",
splitNumber: 5,
max: 100,
// max: 100,
axisLabel: {
textStyle: {
color: "#333333",
......
src/page/statistics/components/interact.vue
View file @ 70fca542
......@@ -29,7 +29,7 @@ export default {
methods: {
getList() {
let curTime = getCurDate();
let playDate = curTime.year + curTime.month + curTime.date;
let playDate = curTime.year + curTime.month;
let _this = this;
this.$https({
method: "post",
......@@ -120,7 +120,7 @@ export default {
{
type: "value",
splitNumber: 5,
max: 100,
// max: 100,
axisLabel: {
textStyle: {
color: "#333333",
......
src/page/statistics/interaction.vue
View file @ 70fca542
/* 互动频次 */
<template>
<div class="interaction-wrapper height100 overview-detail">
<div class="ecahrts-panel-box">
<div class="panel-box-header">
<span class="title">互动频次</span>
<div class="tip">
<span class="tip-title">页面说明:</span>
<span>
可查看当前系统各项数据统计情况。互动频次及点播趋势图展示部分数据，可进入互动统计及趋势分析详情页查看全部数据。</span
>
</div>
</div>
<div class="panel-box-content">
<bar :data="echartsData" ref="echarts" />
</div>
<div class="btn-group" v-if="isExport">
<el-button
class="export"
type="primary"
icon="el-icon-download"
@click="handleExport"
>导出文件</el-button
>
</div>
<div class="rank-panel-box">
<div class="panel-box-header">
<span class="title">互动频次排行</span>
<div id="bodyCanvas" :class="isExport?'':'export'">
<div class="ecahrts-panel-box">
<div class="panel-box-header">
<span class="title">互动频次</span>
<div class="tip">
<span class="tip-title">页面说明:</span>
<span>
可查看当前系统各项数据统计情况。互动频次及点播趋势图展示部分数据，可进入互动统计及趋势分析详情页查看全部数据。</span
>
</div>
</div>
<div class="panel-box-content">
<bar :data="echartsData" ref="echarts" />
</div>
</div>
<div class="panel-box-content">
<rank-table :tList="tList" :data="data" />
<div class="rank-panel-box">
<div class="panel-box-header">
<span class="title">互动频次排行</span>
</div>
<div class="panel-box-content">
<rank-table :tList="tList" :data="data" />
</div>
</div>
</div>
</div>
......@@ -35,24 +46,30 @@ export default {
tList: ["排名", "机构名称", "互动频次"],
echartsData: {},
data: [],
isExport:false
};
},
components: { bar, rankTable },
mounted() {
let roleList = localStorage.getItem('roleList')
if(roleList){
this.isExport = localStorage.getItem('roleList').includes('1')
}
this.getList();
},
methods: {
getList() {
let curTime = getCurDate();
let frequencyDate = curTime.year + curTime.month;
let _this = this
_this.$https({
method: "post",
url:
"tBoardStatistic/getInteractionPageList?frequencyDate=" +
frequencyDate,
authType: this.backToken,
})
let _this = this;
_this
.$https({
method: "post",
url:
"tBoardStatistic/getInteractionPageList?frequencyDate=" +
frequencyDate,
authType: this.backToken,
})
.then((res) => {
if (res.status == 200) {
if (res.data.resultCode == 200) {
......@@ -70,7 +87,7 @@ export default {
}
setTimeout(() => {
_this.init();
},100);
}, 100);
})
.catch((err) => {
_this.$message.error(err.message);
......@@ -80,10 +97,52 @@ export default {
},
init() {
this.$refs.echarts.init();
}
},
handleExport() {
let _this = this;
if (this.timer) {
return false;
}
this.timer = setTimeout(() => {
clearTimeout(_this.timer);
_this.timer = null;
}, 30000);
_this.getPdf("#bodyCanvas", "互动频次");
const loading = this.$loading({
lock: true,
text: "Loading",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
setTimeout(() => {
loading.close();
}, 2000);
},
},
};
</script>
<style>
<style lang="less" scoped>
.interaction-wrapper {
.btn-group {
margin-bottom: 20px;
height: 36px;
}
/deep/ .el-button.export {
width: 128px;
float: right;
.el-icon-download {
font-size: 18px;
font-weight: bold;
}
}
#bodyCanvas {
height: calc(100% - 56px);
&.export{
height: 100%;
}
}
.ul-wrapper {
background-color: @party-white;
}
}
</style>
\ No newline at end of file
src/page/statistics/tend.vue
View file @ 70fca542
/* 点播趋势图 */
<template>
<div class="trend-wrapper height100 overview-detail">
<div class="btn-group">
<div class="btn-group" v-if="isExport">
<el-button
class="export"
type="primary"
......@@ -10,7 +10,7 @@
>导出文件</el-button
>
</div>
<div id="bodyCanvas">
<div id="bodyCanvas" :class="isExport?'':'export'">
<div class="ecahrts-panel-box">
<div class="panel-box-header">
<span class="title">趋势图</span>
......@@ -48,8 +48,6 @@
<script>
import { trendLine, rankTable } from "./components";
import { getCurDate } from "@/utils/util.time";
import htmlCanvas from "@/utils/htmlCanvas";
import JsPDF from "jspdf";
export default {
data() {
return {
......@@ -61,13 +59,18 @@ export default {
options: [
{ label: "年", value: "1" },
{ label: "月", value: "2" },
{ label: "日", value: "3" },
// { label: "日", value: "3" },
],
timer: null,
isExport: false,
};
},
components: { trendLine, rankTable },
mounted() {
let roleList = localStorage.getItem("roleList");
if (roleList) {
this.isExport = localStorage.getItem("roleList").includes("1");
}
this.handleChange("1");
},
methods: {
......@@ -77,15 +80,14 @@ export default {
.$https({
method: "post",
url:
"tBoardStatistic/getBoardPageList?frequencyDate=" +
frequencyDate,
"tBoardStatistic/getBoardTrendPageList?playDate=" + frequencyDate,
authType: this.backToken,
})
.then((res) => {
if (res.status == 200) {
if (res.data.resultCode == 200) {
_this.echartsData = {};
_this.echartsData.xAxisData = res.data.data.organList;
_this.echartsData.xAxisData = res.data.data.dateList;
_this.echartsData.yAxisData = res.data.data.cntList;
_this.data = res.data.data.page.records;
} else {
......@@ -182,6 +184,9 @@ export default {
}
#bodyCanvas {
height: calc(100% - 56px);
&.export {
height: 100%;
}
}
.ul-wrapper {
background-color: @party-white;
......
src/page/system/changePwd.vue
View file @ 70fca542
......@@ -11,6 +11,9 @@
label-position="top"
class="party-form"
>
<el-form-item label="当前账号">
<span>{{ userName }}</span>
</el-form-item>
<el-form-item label="请输入当前密码" prop="oldPassWord">
<el-input
v-model="form.oldPassWord"
......@@ -66,6 +69,7 @@ export default {
}
};
return {
userName: localStorage.getItem("user"),
form: {
oldPassWord: "",
password: "",
......@@ -92,6 +96,7 @@ export default {
password: "",
checkPass: "",
};
this.$router.go(-1)
},
handleSubmit() {
let _this = this;
......
src/page/system/log/devops.vue
View file @ 70fca542
......@@ -84,7 +84,7 @@ export default {
},
getFirstPageList() {
this.page._index = 1;
this.getPageList();
this.getFirstPageList();
},
handleReset() {
for (let key in this.form) {
......
src/page/system/log/platformlog.vue
View file @ 70fca542
......@@ -5,6 +5,7 @@
<el-form :inline="true" :model="form">
<el-form-item>
<el-input
clearable
v-model="form.nameOrCode"
placeholder="请输入操作者"
suffix-icon="el-icon-search"
......@@ -78,7 +79,7 @@ export default {
{ prop: "operator", label: "操作者" },
{ prop: "operationType", label: "操作类型" },
{ prop: "operationObject", label: "操作对象" },
{ prop: "operationIp", label: "操作Ip" },
{ prop: "operationIp", label: "设备Ip" },
],
list: [],
page: {
......@@ -93,7 +94,7 @@ export default {
// 获取日志操作类型
this.getOperationType();
// 获取机顶盒运维类表
this.getLog();
this.getFirstPageList();
},
methods: {
getOperationType() {
......@@ -102,15 +103,20 @@ export default {
});
},
handleSubmit() {
this.getLog();
this.getFirstPageList();
},
getFirstPageList() {
this.page._index = 1;
this.getPageList();
},
handleReset() {
for (let key in this.form) {
this.form[key] = "";
}
this.getLog();
this.getFirstPageList();
},
getLog() {
getPageList() {
let requestParams = {};
requestParams._index = this.page._index;
requestParams._size = this.page._size;
......@@ -162,7 +168,7 @@ export default {
// 翻页
handleChangeCurrent(val) {
this.page._index = val;
this.getLog();
this.getPageList();
},
},
watch: {},
......
src/page/system/log/settoplog.vue
View file @ 70fca542
......@@ -4,9 +4,12 @@
<div class="search-container">
<el-form :inline="true" :model="form">
<el-form-item>
<el-select v-model="form.user" placeholder="请选择所属单位">
<el-select
clearable
v-model="form.organId"
placeholder="请选择所属单位"
>
<el-option
v-model="form.organId"
v-for="item in organList"
:key="item.id"
:label="item.name"
......@@ -17,6 +20,7 @@
</el-form-item>
<el-form-item>
<el-date-picker
clearable
v-model="form.date"
type="daterange"
range-separator="至"
......@@ -99,7 +103,7 @@ export default {
this.getPageList();
},
handleSubmit() {
this.getPageList();
this.getFirstPageList();
},
handleReset() {
for (let key in this.form) {
......
src/page/system/log/userlog.vue
View file @ 70fca542
......@@ -84,7 +84,7 @@ export default {
{ prop: "operator", label: "操作者" },
{ prop: "operationType", label: "操作类型" },
{ prop: "operationObject", label: "操作对象" },
{ prop: "operationIp", label: "操作Ip" },
{ prop: "operationIp", label: "设备Ip" },
],
list: [],
page: {
......@@ -112,7 +112,7 @@ export default {
});
},
handleSubmit() {
this.getPageList();
this.getFirstPageList();
},
handleReset() {
for (let key in this.form) {
......
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