Merge branch 'dev'

wanshenmean

8 天以前 83743fe4641fcfad9effc2b6104c8dedefcbdcb5

 Code/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue

@@ -45,36 +45,36 @@
    const searchFormOptions = ref([
      [
        { title: "请求地址", field: "url", type: "like" },
        { title: "用户IP", field: "userIP", type: "like" },
        { title: "服务器IP", field: "serviceIP", type: "like" },
        { title: "请求参数", field: "requestParam", type: "like" },
        { title: "响应参数", field: "responseParam", type: "like" },
      ],
      [
        { title: "开始时间", field: "beginDate", type: "datetime" },
        {
          dataKey: "restatus",
          data: [],
          title: "响应状态",
          field: "success",
          type: "selectList",
        },
        {
          dataKey: "roles",
          data: [],
          title: "角色ID",
          field: "role_Id",
          type: "select",
        },
        // {
        //   dataKey: "restatus",
        //   data: [],
        //   title: "响应状态",
        //   field: "success",
        //   type: "selectList",
        // },
        // {
        //   dataKey: "roles",
        //   data: [],
        //   title: "角色ID",
        //   field: "role_Id",
        //   type: "select",
        // },
      ],
      [
        {
          dataKey: "log",
          data: [],
          title: "日志类型",
          field: "logType",
          colSize: 12,
          type: "checkbox",
        },
      ],
      // [
      //   {
      //     dataKey: "log",
      //     data: [],
      //     title: "日志类型",
      //     field: "logType",
      //     colSize: 12,
      //     type: "checkbox",
      //   },
      // ],
    ]);
    const columns = ref([
      {
@@ -91,7 +91,7 @@
        field: "beginDate",
        title: "开始时间",
        type: "datetime",
        width: 140,
        width: 120,
        align: "left",
        sortable: true,
      },
@@ -99,51 +99,51 @@
        field: "userName",
        title: "用户名称",
        type: "string",
        width: 90,
        width: 60,
        align: "left",
      },
      {
        field: "url",
        title: "请求地址",
        type: "string",
        width: 110,
        width: 150,
        align: "left",
      },
      {
        field: "logType",
        title: "日志类型",
        type: "string",
        bind: { key: "log", data: [] },
        width: 80,
        align: "left",
      },
      {
        field: "success",
        title: "响应状态",
        type: "int",
        bind: { key: "restatus", data: [] },
        width: 80,
        align: "left",
      },
      // {
      //   field: "logType",
      //   title: "日志类型",
      //   type: "string",
      //   bind: { key: "log", data: [] },
      //   width: 80,
      //   align: "left",
      // },
      // {
      //   field: "success",
      //   title: "响应状态",
      //   type: "int",
      //   bind: { key: "restatus", data: [] },
      //   width: 80,
      //   align: "left",
      // },
      {
        field: "elapsedTime",
        title: "时长",
        type: "int",
        width: 60,
        width: 50,
        align: "left",
      },
      {
        field: "requestParameter",
        field: "requestParam",
        title: "请求参数",
        type: "string",
        width: 70,
        width: 120,
        align: "left",
      },
      {
        field: "responseParameter",
        field: "responseParam",
        title: "响应参数",
        type: "string",
        width: 70,
        width: 120,
        align: "left",
      },
      {