0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#29936、29965

This commit is contained in:
haodd 2024-09-27 09:57:20 +08:00
parent 4628507e65
commit 29930066d5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue
View File

@ -15,7 +15,7 @@
<template v-if="column.dataIndex === 'sourceName'"> <template v-if="column.dataIndex === 'sourceName'">
<Ellipsis> <Ellipsis>
设备名称： 设备名称：
<span class="deviceId" @click="() => gotoDevice(text)">{{ <span class="deviceId" @click="() => gotoDevice(record.targetId)">{{
text text
}}</span></Ellipsis }}</span></Ellipsis
> >

4
src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
View File

@ -494,7 +494,7 @@ const onDelete = () => {
const getAlarmOptions = () => { const getAlarmOptions = () => {
const actionId = formModel.value.branches![props.branchName].then[props.thenName] 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 branchId = formModel.value.branches![props.branchName].branchId
const _id = formModel.value.id const _id = formModel.value.id
queryAlarmList({ queryAlarmList({
@ -528,7 +528,7 @@ const getAlarmOptions = () => {
} }
const subscribe = () => { const subscribe = () => {
const actionId = formModel.value.branches![props.branchName].then[props.thenName] 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 const _key = actionId || formModel.value.branches![props.branchName].branchId
EventEmitter.subscribe([`${_key}_alarm`], () => { EventEmitter.subscribe([`${_key}_alarm`], () => {
console.log('subscribe') console.log('subscribe')