From aa4ca7f747ca6be14b7ffc71ac84966be1e3689f Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期五, 13 十二月 2024 12:10:05 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test
---
src/views/project/yw/systemManage/accessLog/AccessLog.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/views/project/yw/systemManage/accessLog/AccessLog.vue b/src/views/project/yw/systemManage/accessLog/AccessLog.vue
index 5695fbe..fac3ad1 100644
--- a/src/views/project/yw/systemManage/accessLog/AccessLog.vue
+++ b/src/views/project/yw/systemManage/accessLog/AccessLog.vue
@@ -24,12 +24,15 @@
:data="tableData"
highlight-current-row
>
- <el-table-column prop="time" label="鏃堕棿" width="185" fixed="left" show-overflow-tooltip> </el-table-column>
- <el-table-column label="鎻忚堪" prop="note" show-overflow-tooltip> </el-table-column>
+ <el-table-column label="鐢ㄦ埛" prop="user" width="120" fixed="left" show-overflow-tooltip> </el-table-column>
+ <el-table-column prop="time" label="鏃堕棿" width="185" show-overflow-tooltip> </el-table-column>
+ <el-table-column label="鎿嶄綔绫诲瀷" prop="type" width="170" show-overflow-tooltip> </el-table-column>
- <el-table-column label="鐢ㄦ埛" prop="user" width="120" show-overflow-tooltip> </el-table-column>
- <el-table-column label="绫诲瀷" prop="type" width="170" show-overflow-tooltip> </el-table-column>
- <el-table-column label="IP 鍦板潃" prop="client_ip" width="170" show-overflow-tooltip> </el-table-column>
+
+ <el-table-column label="鏉ユ簮" prop="from" width="120" show-overflow-tooltip> </el-table-column>
+
+ <el-table-column label="IP鍦板潃" prop="client_ip" width="170" show-overflow-tooltip> </el-table-column>
+ <el-table-column label="鎻忚堪" prop="note" show-overflow-tooltip> </el-table-column>
</el-table>
</div>
@@ -41,7 +44,6 @@
import { debounce, getItemMap } from '/@/utils/util';
import { onMounted, ref } from 'vue';
-
import * as userApi from '/@/api/auth/user';
@@ -73,7 +75,7 @@
const res = await getOperateLog({
start_time: queryParams.value.timeRange[0],
end_time: queryParams.value.timeRange[1],
-
+
type: queryParams.value.type,
user: queryParams.value.user,
});
@@ -170,7 +172,7 @@
roleList.value = res?.values ?? [];
};
onMounted(async () => {
- nextTick(() => {
+ nextTick(() => {
handleQueryTable();
});
});
--
Gitblit v1.9.3