From 70ab453d942ff0fdcb10dd11a432fe150e133435 Mon Sep 17 00:00:00 2001
From: Ironsp <1522278303@qq.com>
Date: Tue, 23 Jun 2026 11:10:16 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E5=8F=8C=E7=94=B5?=
 =?UTF-8?q?=E6=B1=A0=E7=94=B5=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equipmentList/list.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/equipmentList/list.vue b/src/views/equipmentList/list.vue
index e1c6936..1bf72a0 100644
--- a/src/views/equipmentList/list.vue
+++ b/src/views/equipmentList/list.vue
@@ -65,9 +65,12 @@
             <el-tag v-else>{{ scope.row.status ?? '-' }}</el-tag>
           </template> -->
         </el-table-column>
-        <el-table-column label="电池电量" align="center" prop="batteryLevel">
+        <el-table-column label="电池电量" align="center" prop="batteryLevel1">
           <template #default="scope">
-            <el-tag v-if="scope.row.batteryLevel">{{ scope.row.batteryLevel + '%' }}</el-tag>
+            <el-tag v-if="scope.row.batteryLevel1">{{ scope.row.batteryLevel1 + '%' }}</el-tag>
+            <el-tag v-if="scope.row.batteryLevel2" :style="scope.row.batteryLevel1 && scope.row.batteryLevel2 ? 'margin-left: 3px' : ''">
+              {{ scope.row.batteryLevel2 + '%' }}
+            </el-tag>
             <el-tag v-else type="info"> 未获取 </el-tag>
           </template>
         </el-table-column>