From cc53ee4d294f4cbb8119dea431f9774f698ae5e1 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Thu, 25 Sep 2025 15:30:51 +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=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A0=E5=9B=BE=E7=89=87=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentAlarmRecord/index.vue        | 10 +++++++++-
 src/views/equipmentManagement/devices/index.vue |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/equipmentAlarmRecord/index.vue b/src/views/equipmentAlarmRecord/index.vue
index 1ec3ad3..424228c 100644
--- a/src/views/equipmentAlarmRecord/index.vue
+++ b/src/views/equipmentAlarmRecord/index.vue
@@ -62,7 +62,7 @@
 
     <el-card shadow="never">
       <div v-if="isListView" key="card">
-        <el-row :gutter="20">
+        <el-row :gutter="20" v-if="alarmList.length > 0">
           <el-col :span="6" v-for="(item, index) in alarmList" :key="index">
             <el-card class="custom-alarm-card">
               <div class="card-header">
@@ -113,6 +113,14 @@
             </el-card>
           </el-col>
         </el-row>
+        <el-row :gutter="20" v-else>
+          <!-- 使用flex容器实现垂直居中布局 -->
+          <div
+            style="display: flex; flex-direction: column; align-items: center; justify-content: center; text-align: center; width: 100%;">
+            <img src="@/assets/images/noData.png" alt="暂无数据" style="max-width: 150px; margin-bottom: 16px;">
+            <div style="color: #999; font-size: 14px;">暂无数据</div>
+          </div>
+        </el-row>
       </div>
       <div v-else key="list">
         <el-table v-loading="loading" border :data="alarmList">
diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index e124bf5..0cf81b0 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -56,7 +56,7 @@
             </el-col>
 
             <el-col :span="1.5">
-              <el-button v-hasPermi="['equipment:devices:export']" type="warning" :disabled="multiple" plain
+              <el-button v-hasPermi="['equipment:devices:export']" type="warning"  plain
                 icon="Download" @click="handleExport">导出</el-button>
             </el-col>
             <el-col :span="1.5">

From 76c3a7c8bf5b4ee630869f7a32869490962a88af Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Thu, 25 Sep 2025 15:32:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/equipmentAlarmRecord/index.vue b/src/views/equipmentAlarmRecord/index.vue
index 424228c..9e5b971 100644
--- a/src/views/equipmentAlarmRecord/index.vue
+++ b/src/views/equipmentAlarmRecord/index.vue
@@ -131,7 +131,7 @@
               <div>{{ scope.row.deviceImei }} {{ scope.row.deviceMac }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="报警地点" align="center" prop="location" />
+          <el-table-column label="报警地点" align="center" prop="location"  show-overflow-tooltip/>
           <el-table-column label="报警事项" align="center" prop="deviceAction">
             <template #default="scope">
               <el-tag type="danger" v-if="scope.row.deviceAction == 0">强制报警</el-tag>