From 686ec04e5ea19d8930b40bfa1c823e900d7b7d6c Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 30 十一月 2023 10:56:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/monitor/log/usual.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 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..1bb5eb4 100644
--- a/Source/UBCS-WEB/src/views/monitor/log/usual.vue
+++ b/Source/UBCS-WEB/src/views/monitor/log/usual.vue
@@ -37,6 +37,7 @@
         option: {
           height: 'auto',
           calcHeight: 30,
+          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