From afae558d8eb1832769b6621d0d9c30103f7fdd89 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期五, 18 四月 2025 16:48:43 +0800
Subject: [PATCH] Merge pull request #70 from zhitan-cloud/wt_from_develop1.0

---
 zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue b/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue
index 1ff3b79..57a7400 100644
--- a/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue
+++ b/zhitan-vue/src/views/alarmmanage/alarmrecord/alarmRecord.vue
@@ -70,7 +70,7 @@
                 show-overflow-tooltip
                 :formatter="(row, column) => formatterLabel(energyTypeList, row.energyId)"
               />
-              <el-table-column label="棰勮鍊�" prop="energyType" align="center" show-overflow-tooltip />
+              <el-table-column label="棰勮鍊�" prop="limitingValue" align="center" show-overflow-tooltip />
               <el-table-column label="鎶ヨ鍊�" prop="alarmValue" align="center" show-overflow-tooltip />
               <el-table-column label="鎶ヨ鏃堕棿" prop="alarmBeginTime" align="center" show-overflow-tooltip />
             </el-table>

--
Gitblit v1.9.3