From 8d7721c95cc004e3af1493b6289ace05658bb967 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 一月 2024 21:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/monitor/log/operateLog.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
index b797733..e77e7d9 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/operateLog.vue
@@ -14,6 +14,11 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
+ <template slot="description" slot-scope="scope">
+ <avue-text-ellipsis :text="scope.row.description" :height="50">
+ <small slot="more">...</small>
+ </avue-text-ellipsis>
+ </template>
</avue-crud>
</basic-container>
</template>
@@ -40,7 +45,7 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
@@ -58,18 +63,18 @@
label: "鐢ㄦ埛鍚�",
prop: "userName",
search: true,
- width:'100'
+ width:'120'
},
{
label: "濮撳悕",
prop: "realName",
search: true,
- width:'100'
+ width:'120'
},
{
label: "鐢ㄦ埛ip",
prop: "ip",
- width:'100'
+ width:'130'
},
{
label: "妯″潡",
@@ -84,12 +89,15 @@
{
label: "鎿嶄綔缁撴灉",
prop: "operateResult",
- width:'100'
+ width:'110'
},
{
label: "鎻忚堪",
prop: "description",
- width:'300'
+ span: 24,
+ minRows: 20,
+ type: "textarea",
+ slot: true,
},
]
},
@@ -131,14 +139,6 @@
underscoreName(key) {
return key.replace(/([A-Z])/g, "_$1").toLowerCase();
},
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getUsualLogs(this.form.id).then(res => {
- this.form = res.data.data;
- });
- }
- done();
- },
currentChange(currentPage){
this.page.currentPage = currentPage;
},
@@ -159,7 +159,7 @@
}
this.loading = true;
listLogOperate(
- page.currentPage,
+ page.currentPage,
page.pageSize,
conditionMaps
).then(res => {
--
Gitblit v1.9.3