From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/monitor/log/usual.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/monitor/log/usual.vue b/Source/UBCS-WEB/src/views/monitor/log/usual.vue
index 329f77b..a2bd6d1 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/usual.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/usual.vue
@@ -36,7 +36,8 @@
},
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
+ columnBtn:false,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -116,7 +117,7 @@
...mapGetters(["permission"]),
permissionList() {
return {
- viewBtn: this.vaildData(this.permission.log_usual_view, false)
+ viewBtn: this.vaildData(this.permission.log_usual.log_usual_view, false)
};
}
},
--
Gitblit v1.9.3