From 29930066d5c2b79a3e13dd1dc12f04560b60c31e Mon Sep 17 00:00:00 2001
From: haodd <1903289197@qq.com>
Date: Fri, 27 Sep 2024 09:57:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#29936=E3=80=8129965?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rule-engine/Alarm/Log/TabComponent/components/Log.vue     | 2 +-
 .../Scene/Save/action/ListItem/FilterCondition.vue            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue b/src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue
index e611c4d6..c634cde8 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue
@@ -15,7 +15,7 @@
             <template v-if="column.dataIndex === 'sourceName'">
                 <Ellipsis>
                     设备名称：
-                    <span class="deviceId" @click="() => gotoDevice(text)">{{
+                    <span class="deviceId" @click="() => gotoDevice(record.targetId)">{{
                         text
                     }}</span></Ellipsis
                 >
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
index 4f49613d..799b74a5 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
@@ -494,7 +494,7 @@ const onDelete = () => {
 
 const getAlarmOptions = () => {
   const actionId = formModel.value.branches![props.branchName].then[props.thenName]
-    .actions[props.name].actionId
+    .actions[props.actionName].actionId
   const branchId = formModel.value.branches![props.branchName].branchId
   const _id = formModel.value.id
   queryAlarmList({
@@ -528,7 +528,7 @@ const getAlarmOptions = () => {
 }
 const subscribe = () => {
   const actionId = formModel.value.branches![props.branchName].then[props.thenName]
-    .actions[props.name].actionId
+    .actions[props.actionName].actionId
   const _key = actionId || formModel.value.branches![props.branchName].branchId
   EventEmitter.subscribe([`${_key}_alarm`], () => {
     console.log('subscribe')