From eecdd394d009683339305f7840a392298e9ad15b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 17 May 2024 18:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/monitor/log/usual.vue | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index 6daff13..e222de7 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -13,7 +13,7 @@
import { mapGetters } from "vuex"
export default {
- data () {
+ data() {
return {
form: {},
selectionList: [],
@@ -29,8 +29,7 @@
searchLabelWidth: 72,
searchShow: true,
searchMenuSpan: 3,
- menuWidth: 210,
-
+ menuWidth: 120,
height: 'auto',
calcHeight: 30,
tip: false,
@@ -42,6 +41,17 @@
delBtn: false,
dialogType: 'drawer',
column: [
+ {
+ label: "操作名称",
+ searchSpan: 4,
+ search: true,
+ prop: "logId"
+ },
+ {
+ label:"操作人",
+ prop:"createBy",
+ width:120,
+ },
{
label: "服务id",
prop: "serviceId",
@@ -58,28 +68,26 @@
},
{
label: "服务ip",
- prop: "serverIp"
+ prop: "serverIp",
+ width:140,
},
{
label: "软件环境",
prop: "env",
- width: '80'
+ width: '80',
+ align:"center"
},
- {
- label: "日志级别",
- prop: "logLevel"
- },
- {
- label: "日志id",
- prop: "logId"
- },
+ // {
+ // label: "日志级别",
+ // prop: "logLevel"
+ // },
{
label: "请求接口",
prop: "requestUri"
},
{
width: 144,
- label: "日志时间",
+ label: "操作时间",
prop: "createTime",
},
{
@@ -111,24 +119,24 @@
},
computed: {
...mapGetters(["permission"]),
- permissionList () {
+ permissionList() {
return {
viewBtn: this.vaildData(this.permission.log_usual_view, false)
}
}
},
methods: {
- searchReset () {
+ searchReset() {
this.query = {}
this.onLoad(this.page)
},
- searchChange (params, done) {
+ searchChange(params, done) {
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
done()
},
- beforeOpen (done, type) {
+ beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getUsualLogs(this.form.id).then(res => {
this.form = res.data.data
@@ -136,16 +144,16 @@
}
done()
},
- currentChange (currentPage) {
+ currentChange(currentPage) {
this.page.currentPage = currentPage
},
- sizeChange (pageSize) {
+ sizeChange(pageSize) {
this.page.pageSize = pageSize
},
- refreshChange () {
+ refreshChange() {
this.onLoad(this.page, this.query)
},
- onLoad (page, params = {}) {
+ onLoad(page, params = {}) {
this.loading = true
getUsualList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data
--
Gitblit v1.9.3