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[]>([ { 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[]>([ minWidth: 120, }, { - prop: 'createTime', + prop: 'logTime', label: '记录时间', minWidth: 180, search: { @@ -82,9 +82,11 @@ const columns = reactive[]>([ }, }, { - 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[]>([ minWidth: 100, render: scope => { return ( - {scope.row.warn ? '告警' : '未告警'} + {scope.row.warn==1 ? '已告警' : '未告警'} ) }, },