From 67cc1463320874211a09fee5c1b3b1fecf6d5a7c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 10 十一月 2023 13:40:57 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 src/views/intelligentPatrol/studyJudge/tablePage.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/intelligentPatrol/studyJudge/tablePage.vue b/src/views/intelligentPatrol/studyJudge/tablePage.vue
index 7b782bc..2febc11 100644
--- a/src/views/intelligentPatrol/studyJudge/tablePage.vue
+++ b/src/views/intelligentPatrol/studyJudge/tablePage.vue
@@ -61,7 +61,7 @@
       </el-table-column>
       <el-table-column prop="eventSource" label="浜嬩欢绫诲瀷" min-width="8">
         <template slot-scope="scope">
-          <span>{{ scope.row.algoName }}</span>
+          <span>{{ scope.row.alarmName }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15">

--
Gitblit v1.8.0