From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/monitor/log/usual.vue |    4 ++--
 1 files changed, 2 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 a467237..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,7 @@
         },
         option: {
           height: 'auto',
-          calcHeight: 30,
+          calcHeight: 20,
           columnBtn:false,
           tip: false,
           searchShow: true,
@@ -117,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