From 185315213801d5033fc0629592df6c7cf9e12dac Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Fri, 11 Apr 2025 14:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8F=8A=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/log/index.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/log/index.vue b/frontend/src/views/log/index.vue
index 55a38bb..d2d476e 100644
--- a/frontend/src/views/log/index.vue
+++ b/frontend/src/views/log/index.vue
@@ -53,7 +53,7 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
   { type: 'selection', fixed: 'left', width: 70 },
   { type: 'index', fixed: 'left', width: 70, label: '序号' },
   {
-    prop: 'createBy',
+    prop: 'userName',
     label: '操作用户',
     search: { el: 'input' },
     minWidth: 100,
@@ -64,7 +64,7 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
     minWidth: 120,
   },
   {
-    prop: 'createTime',
+    prop: 'logTime',
     label: '记录时间',
     minWidth: 180,
     search: {
@@ -82,9 +82,11 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
     },
   },
   {
-    prop: 'remark',
     label: '事件描述',
-    minWidth: 400,
+    minWidth: 450,
+    render: (scope) => {
+      return (scope.row.userName + '在' + scope.row.logTime + '执行了' + scope.row.operateType +scope.row.operate + '操作，结果为' + scope.row.result + '。')
+    }
   },
   {
     prop: 'result',
@@ -97,7 +99,7 @@ const columns = reactive<ColumnProps<AuditLog.ReqAuditLogParams>[]>([
       minWidth: 100,
       render: scope => {
         return (
-           <el-tag type={scope.row.warn ? 'danger' : 'success'}>{scope.row.warn ? '告警' : '未告警'}</el-tag>
+           <el-tag type={scope.row.warn==1 ? 'danger' : 'success'}>{scope.row.warn==1 ? '已告警' : '未告警'}</el-tag>
         )
       },
   },