Commit ed905580f48f780171fc4fae94dd844194edc951
Merge branch 'fix/DEFECT-1459' into 'main_dev'
fix: 修改告警记录列表别名显示 See merge request yunteng/thingskit-front!872
Showing
1 changed file
with
3 additions
and
1 deletions
| @@ -150,9 +150,11 @@ | @@ -150,9 +150,11 @@ | ||
| 150 | if (!data?.data) return; | 150 | if (!data?.data) return; |
| 151 | const tableList = ref<any>( | 151 | const tableList = ref<any>( |
| 152 | data?.data?.map((item) => { | 152 | data?.data?.map((item) => { |
| 153 | + const values = | ||
| 154 | + unref(getDesign).dataSource.filter((item1) => item1.id === item.entityId.id) || []; | ||
| 153 | return { | 155 | return { |
| 154 | time: item.createdTime, | 156 | time: item.createdTime, |
| 155 | - device: item.originatorName, | 157 | + device: values[0].deviceName || item.originatorName, |
| 156 | severity: item.severity, | 158 | severity: item.severity, |
| 157 | type: item.type, | 159 | type: item.type, |
| 158 | status: item.status, | 160 | status: item.status, |