Merge branch 'master' into jiangwu

shuishen

2025-05-19 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8

 src/views/monitor/log/error.vue

@@ -52,16 +52,16 @@
        dialogType: 'drawer',
        column: [
          {
            label: '服务id',
            label: '服务名称',
            prop: 'serviceId',
            search: true,
            searchSpan:4,
            width: '120',
          },

          {
            label: '服务host',
            prop: 'serverHost',
            search: true,
            width: '150',
          },
          {
            label: '服务ip',
@@ -81,6 +81,15 @@
          {
            label: '请求接口',
            prop: 'requestUri',
            search: true,
            searchSpan:6,
          },
          {
            label: '操作人',
            prop: 'createBy',
            search: true,
            searchSpan:4,
            width: '120',
          },
          {
            label: '日志时间',
@@ -151,8 +160,12 @@
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      let values = {
        ...params,
        ...this.query,
      };
      this.loading = true;
      getErrorList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
      getErrorList(page.currentPage, page.pageSize, values).then(res => {
        const data = res.data.data;
        this.page.total = data.total;
        this.data = data.records;