From 7d1d87a1ac5943ff6b27be738f191ae82e95895b Mon Sep 17 00:00:00 2001
From: dtsz <314942997@qq.com>
Date: Tue, 21 Mar 2023 20:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E9=87=8D?=
=?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/infra/apiErrorLog/index.ts | 4 +-
.../infra/apiErrorLog/apiErrorLog.data.ts | 76 -----
src/views/infra/apiErrorLog/detail.vue | 76 +++++
src/views/infra/apiErrorLog/index.vue | 311 +++++++++++++-----
4 files changed, 305 insertions(+), 162 deletions(-)
delete mode 100644 src/views/infra/apiErrorLog/apiErrorLog.data.ts
create mode 100644 src/views/infra/apiErrorLog/detail.vue
diff --git a/src/api/infra/apiErrorLog/index.ts b/src/api/infra/apiErrorLog/index.ts
index 06515c36..779cfd61 100644
--- a/src/api/infra/apiErrorLog/index.ts
+++ b/src/api/infra/apiErrorLog/index.ts
@@ -46,7 +46,7 @@ export interface ApiErrorLogExportReqVO {
}
// 查询列表API 访问日志
-export const getApiErrorLogPageApi = (params: ApiErrorLogPageReqVO) => {
+export const getApiErrorLogPageApi = (params: PageParam) => {
return request.get({ url: '/infra/api-error-log/page', params })
}
@@ -58,7 +58,7 @@ export const updateApiErrorLogPageApi = (id: number, processStatus: number) => {
}
// 导出API 访问日志
-export const exportApiErrorLogApi = (params: ApiErrorLogExportReqVO) => {
+export const exportApiErrorLogApi = (params) => {
return request.download({
url: '/infra/api-error-log/export-excel',
params
diff --git a/src/views/infra/apiErrorLog/apiErrorLog.data.ts b/src/views/infra/apiErrorLog/apiErrorLog.data.ts
deleted file mode 100644
index a539c167..00000000
--- a/src/views/infra/apiErrorLog/apiErrorLog.data.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
-
-// CrudSchema
-const crudSchemas = reactive<VxeCrudSchema>({
- primaryKey: 'id',
- primaryType: 'id',
- primaryTitle: '日志编号',
- action: true,
- actionWidth: '300',
- columns: [
- {
- title: '链路追踪',
- field: 'traceId',
- isTable: false
- },
- {
- title: '用户编号',
- field: 'userId',
- isSearch: true
- },
- {
- title: '用户类型',
- field: 'userType',
- dictType: DICT_TYPE.USER_TYPE,
- isSearch: true
- },
- {
- title: '应用名',
- field: 'applicationName',
- isSearch: true
- },
- {
- title: '请求方法名',
- field: 'requestMethod'
- },
- {
- title: '请求地址',
- field: 'requestUrl',
- isSearch: true
- },
- {
- title: '异常发生时间',
- field: 'exceptionTime',
- formatter: 'formatDate',
- search: {
- show: true,
- itemRender: {
- name: 'XDataTimePicker'
- }
- }
- },
- {
- title: '异常名',
- field: 'exceptionName'
- },
- {
- title: '处理状态',
- field: 'processStatus',
- dictType: DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS,
- dictClass: 'number',
- isSearch: true
- },
- {
- title: '处理人',
- field: 'processUserId',
- isTable: false
- },
- {
- title: '处理时间',
- field: 'processTime',
- formatter: 'formatDate',
- isTable: false
- }
- ]
-})
-export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/src/views/infra/apiErrorLog/detail.vue b/src/views/infra/apiErrorLog/detail.vue
new file mode 100644
index 00000000..9ede0f1b
--- /dev/null
+++ b/src/views/infra/apiErrorLog/detail.vue
@@ -0,0 +1,76 @@
+<template>
+ <Dialog title="详情" v-model="modelVisible" :scroll="true" :max-height="500" width="800">
+ <el-descriptions border :column="1">
+ <el-descriptions-item label="日志主键" min-width="120">
+ {{ detailData.id }}
+ </el-descriptions-item>
+ <el-descriptions-item label="链路追踪">
+ {{ detailData.traceId }}
+ </el-descriptions-item>
+ <el-descriptions-item label="应用名">
+ {{ detailData.applicationName }}
+ </el-descriptions-item>
+ <el-descriptions-item label="用户信息">
+ {{ detailData.userId }} |
+ <dict-tag :type="DICT_TYPE.USER_TYPE" :value="detailData.userType" />
+ | {{ detailData.userIp }} | {{ detailData.userAgent }}
+ </el-descriptions-item>
+ <el-descriptions-item label="请求信息">
+ {{ detailData.requestMethod }} | {{ detailData.requestUrl }}
+ </el-descriptions-item>
+ <el-descriptions-item label="请求参数">
+ {{ detailData.requestParams }}
+ </el-descriptions-item>
+ <el-descriptions-item label="异常时间">
+ {{ formatDate(detailData.exceptionTime, 'YYYY-MM-DD HH:mm:ss') }}
+ </el-descriptions-item>
+ <el-descriptions-item label="异常名">
+ {{ detailData.exceptionName }}
+ </el-descriptions-item>
+ <el-descriptions-item label="异常名" v-if="detailData.exceptionStackTrace">
+ <el-input
+ type="textarea"
+ :readonly="true"
+ :autosize="{ maxRows: 20 }"
+ v-model="detailData.exceptionStackTrace"
+ />
+ </el-descriptions-item>
+ <el-descriptions-item label="处理状态">
+ <dict-tag
+ :type="DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS"
+ :value="detailData.processStatus"
+ />
+ </el-descriptions-item>
+ <el-descriptions-item label="处理人" v-if="detailData.processUserId">
+ {{ detailData.processUserId }}
+ </el-descriptions-item>
+ <el-descriptions-item label="处理时间" v-if="detailData.processTime">
+ {{ formatDate(detailData.processTime, 'YYYY-MM-DD HH:mm:ss') }}
+ </el-descriptions-item>
+ </el-descriptions>
+ </Dialog>
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+import * as ApiErrorLog from '@/api/infra/apiErrorLog'
+
+const modelVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const openModal = async (data: ApiErrorLog.ApiErrorLogVO) => {
+ modelVisible.value = true
+ // 设置数据
+ detailLoading.value = true
+ try {
+ detailData.value = data
+ } finally {
+ detailLoading.value = false
+ }
+}
+
+defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗
+</script>
diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue
index 4193351a..664546cb 100644
--- a/src/views/infra/apiErrorLog/index.vue
+++ b/src/views/infra/apiErrorLog/index.vue
@@ -1,99 +1,242 @@
<template>
- <ContentWrap>
- <!-- 列表 -->
- <XTable @register="registerTable">
- <!-- 操作：导出 -->
- <template #toolbar_buttons>
- <XButton
- type="warning"
- preIcon="ep:download"
- :title="t('action.export')"
- @click="exportList('错误数据.xls')"
+ <content-wrap>
+ <!-- 搜索工作栏 -->
+ <el-form
+ class="-mb-15px"
+ :model="queryParams"
+ ref="queryFormRef"
+ :inline="true"
+ label-width="68px"
+ >
+ <el-form-item label="用户编号" prop="userId">
+ <el-input
+ v-model="queryParams.userId"
+ placeholder="请输入用户编号"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
/>
- </template>
- <template #duration_default="{ row }">
- <span>{{ row.duration + 'ms' }}</span>
- </template>
- <template #resultCode_default="{ row }">
- <span>{{ row.resultCode === 0 ? '成功' : '失败(' + row.resultMsg + ')' }}</span>
- </template>
- <template #actionbtns_default="{ row }">
- <!-- 操作：详情 -->
- <XTextButton
- preIcon="ep:view"
- :title="t('action.detail')"
- v-hasPermi="['infra:api-access-log:query']"
- @click="handleDetail(row)"
+ </el-form-item>
+ <el-form-item label="用户类型" prop="userType">
+ <el-select
+ v-model="queryParams.userType"
+ placeholder="请选择用户类型"
+ clearable
+ class="!w-240px"
+ >
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.USER_TYPE)"
+ :key="parseInt(dict.value)"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="应用名" prop="applicationName">
+ <el-input
+ v-model="queryParams.applicationName"
+ placeholder="请输入应用名"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
/>
- <XTextButton
- preIcon="ep:cpu"
- title="已处理"
- v-if="row.processStatus === InfraApiErrorLogProcessStatusEnum.INIT"
- v-hasPermi="['infra:api-error-log:update-status']"
- @click="handleProcessClick(row, InfraApiErrorLogProcessStatusEnum.DONE, '已处理')"
+ </el-form-item>
+ <el-form-item label="异常时间" prop="exceptionTime">
+ <el-date-picker
+ v-model="queryParams.exceptionTime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="daterange"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+ class="!w-240px"
/>
- <XTextButton
- preIcon="ep:mute-notification"
- title="已忽略"
- v-if="row.processStatus === InfraApiErrorLogProcessStatusEnum.INIT"
- v-hasPermi="['infra:api-error-log:update-status']"
- @click="handleProcessClick(row, InfraApiErrorLogProcessStatusEnum.IGNORE, '已忽略')"
- />
- </template>
- </XTable>
- </ContentWrap>
- <XModal v-model="dialogVisible" :title="dialogTitle">
- <!-- 对话框(详情) -->
- <Descriptions :schema="allSchemas.detailSchema" :data="detailData" />
- <!-- 操作按钮 -->
- <template #footer>
- <XButton :title="t('dialog.close')" @click="dialogVisible = false" />
- </template>
- </XModal>
+ </el-form-item>
+ <el-form-item label="处理状态" prop="processStatus">
+ <el-select v-model="queryParams.processStatus" placeholder="请选择处理状态" clearable>
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS)"
+ :key="parseInt(dict.value)"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+ <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+ <el-button
+ type="success"
+ plain
+ @click="handleExport"
+ :loading="exportLoading"
+ v-hasPermi="['infra:api-error-log:export']"
+ >
+ <Icon icon="ep:download" class="mr-5px" /> 导出
+ </el-button>
+ </el-form-item>
+ </el-form>
+ </content-wrap>
+ <!-- 列表 -->
+ <content-wrap>
+ <el-table v-loading="loading" :data="list">
+ <el-table-column label="日志编号" align="center" prop="id" />
+ <el-table-column label="用户编号" align="center" prop="userId" />
+ <el-table-column label="用户类型" align="center" prop="userType">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+ </template>
+ </el-table-column>
+ <el-table-column label="应用名" align="center" prop="applicationName" />
+ <el-table-column label="请求方法名" align="center" prop="requestMethod" />
+ <el-table-column label="请求地址" align="center" prop="requestUrl" width="250" />
+ <el-table-column label="异常发生时间" align="center" prop="exceptionTime" width="180">
+ <template #default="scope">
+ <span>{{ scope.row.exceptionTime }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="异常名" align="center" prop="exceptionName" width="250" />
+ <el-table-column label="处理状态" align="center" prop="processStatus">
+ <template #default="scope">
+ <dict-tag
+ :type="DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS"
+ :value="scope.row.processStatus"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="操作" align="center">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ @click="openModal(scope.row)"
+ v-hasPermi="['infra:api-access-log:query']"
+ >
+ 详细
+ </el-button>
+ <el-button
+ link
+ type="primary"
+ v-if="scope.row.processStatus === InfraApiErrorLogProcessStatusEnum.INIT"
+ @click="
+ handleProcessClick(InfraApiErrorLogProcessStatusEnum.DONE, '已处理', scope.row.id)
+ "
+ v-hasPermi="['infra:api-error-log:update-status']"
+ >
+ 已处理
+ </el-button>
+ <el-button
+ link
+ type="primary"
+ icon="el-icon-check"
+ v-if="scope.row.processStatus === InfraApiErrorLogProcessStatusEnum.INIT"
+ @click="
+ handleProcessClick(InfraApiErrorLogProcessStatusEnum.IGNORE, '已忽略', scope.row.id)
+ "
+ v-hasPermi="['infra:api-error-log:update-status']"
+ >
+ 已忽略
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <!-- 分页组件 -->
+ <Pagination
+ :total="total"
+ v-model:page="queryParams.pageNo"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </content-wrap>
+
+ <!-- 表单弹窗：详情 -->
+ <api-error-log-detail ref="modalRef" />
</template>
+
<script setup lang="ts" name="ApiErrorLog">
-import { allSchemas } from './apiErrorLog.data'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import download from '@/utils/download'
import * as ApiErrorLogApi from '@/api/infra/apiErrorLog'
+import ApiErrorLogDetail from './detail.vue'
import { InfraApiErrorLogProcessStatusEnum } from '@/utils/constants'
+const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const message = useMessage()
-
-// ========== 列表相关 ==========
-const [registerTable, { reload, exportList }] = useXTable({
- allSchemas: allSchemas,
- getListApi: ApiErrorLogApi.getApiErrorLogPageApi,
- exportListApi: ApiErrorLogApi.exportApiErrorLogApi
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ userId: null,
+ userType: null,
+ applicationName: null,
+ requestUrl: null,
+ processStatus: null,
+ exceptionTime: []
})
-// ========== 详情相关 ==========
-const detailData = ref() // 详情 Ref
-const dialogVisible = ref(false) // 是否显示弹出层
-const dialogTitle = ref('') // 弹出层标题
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
-// 详情操作
-const handleDetail = (row: ApiErrorLogApi.ApiErrorLogVO) => {
- // 设置数据
- detailData.value = row
- dialogTitle.value = t('action.detail')
- dialogVisible.value = true
+/** 查询参数列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await ApiErrorLogApi.getApiErrorLogPageApi(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } finally {
+ loading.value = false
+ }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ queryParams.pageNo = 1
+ getList()
}
-// 异常处理操作
-const handleProcessClick = (
- row: ApiErrorLogApi.ApiErrorLogVO,
- processSttatus: number,
- type: string
-) => {
- message
- .confirm('确认标记为' + type + '?', t('common.reminder'))
- .then(async () => {
- await ApiErrorLogApi.updateApiErrorLogPageApi(row.id, processSttatus)
- message.success(t('common.updateSuccess'))
- })
- .finally(async () => {
- // 刷新列表
- await reload()
- })
- .catch(() => {})
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
}
+
+/** 详情操作 */
+const modalRef = ref()
+const openModal = (data: ApiErrorLogApi.ApiErrorLogVO) => {
+ modalRef.value.openModal(data)
+}
+
+/** 处理已处理 / 已忽略的操作 **/
+const handleProcessClick = async (processStatus: number, type: string, id: number) => {
+ try {
+ // 操作的二次确认
+ await message.confirm('确认标记为' + type + '?')
+ // 执行操作
+ await ApiErrorLogApi.updateApiErrorLogPageApi(id, processStatus)
+ await message.success(type)
+ // 刷新列表
+ await getList()
+ } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+ try {
+ // 导出的二次确认
+ await message.exportConfirm()
+ // 发起导出
+ exportLoading.value = true
+ const data = await ApiErrorLogApi.exportApiErrorLogApi(queryParams)
+ download.excel(data, '操作日志.xls')
+ } catch {
+ } finally {
+ exportLoading.value = false
+ }
+}
+
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
</script>