From dda3b113262c8f976340c50de6c481e7c784ff46 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Thu, 25 Sep 2025 10:41:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentAlarmRecord/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/equipmentAlarmRecord/index.vue b/src/views/equipmentAlarmRecord/index.vue
index 2321232..1ec3ad3 100644
--- a/src/views/equipmentAlarmRecord/index.vue
+++ b/src/views/equipmentAlarmRecord/index.vue
@@ -335,7 +335,7 @@ onUnmounted(() => {
 }
 
 .custom-alarm-card {
-  height: 270px;
+  min-height: 270px;
   display: flex;
   flex-direction: column;
   box-shadow: 0px 0px 6px 0px rgba(0, 27, 74, 0.1);
@@ -379,7 +379,7 @@ onUnmounted(() => {
 .deviceName {
   color: rgba(56, 64, 79, 1);
   font-family: Microsoft YaHei;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: 700;
 }
 

From cf05f857bd7d62cafdaa0e6b92d63102b7445241 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Thu, 25 Sep 2025 10:58:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=B4=E6=A0=8F?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA>=E7=AC=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fys-equipment/fenceAccessRecord/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/fys-equipment/fenceAccessRecord/index.vue b/src/views/fys-equipment/fenceAccessRecord/index.vue
index add4a91..2ab505b 100644
--- a/src/views/fys-equipment/fenceAccessRecord/index.vue
+++ b/src/views/fys-equipment/fenceAccessRecord/index.vue
@@ -5,7 +5,7 @@
         <div class="button-row">
           <!-- <el-button type="primary" @click.stop="ShowEdit(null)"
             ><el-icon><Plus /></el-icon>新增</el-button -->
-          >
+   
           <el-button type="primary" @click.stop="Export()" plain
             ><el-icon><Download /></el-icon>导出</el-button
           >