Merge remote-tracking branch 'origin/master'

linwe

2024-05-17 eecdd394d009683339305f7840a392298e9ad15b

Merge remote-tracking branch 'origin/master'

 src/api/logs.js

@@ -1,10 +1,11 @@
import request from '@/router/axios';

export const getUsualList = (current, size) => {
export const getUsualList = (current, size,params) => {
  return request({
    url: '/api/blade-log/usual/list',
    method: 'get',
    params: {
      ...params,
      current,
      size
    }
@@ -23,11 +24,12 @@
  })
}

export const getErrorList = (current, size) => {
export const getErrorList = (current, size,params) => {
  return request({
    url: '/api/blade-log/error/list',
    method: 'get',
    params: {
      ...params,
      current,
      size
    }

 src/views/monitor/log/usual.vue

@@ -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",
                    },
                    {