Commit ec9e739db7d3b1146871b1fbd22e845ef4a07580
Merge branch 'fix/DEFECT-1459' into 'main_dev'
fix: 修改告警记录别名显示 See merge request yunteng/thingskit-scada!125
Showing
1 changed file
with
2 additions
and
2 deletions
| @@ -228,7 +228,7 @@ AlarmListComponent.createAlarmItem = function (record) { | @@ -228,7 +228,7 @@ AlarmListComponent.createAlarmItem = function (record) { | ||
| 228 | } | 228 | } |
| 229 | 229 | ||
| 230 | return (record || []).map(item => { | 230 | return (record || []).map(item => { |
| 231 | - var { alias, deviceName, status, startTs } = item || {} | 231 | + var { alias, deviceName, status, startTs,deviceAlias } = item || {} |
| 232 | 232 | ||
| 233 | var stateStyle = { | 233 | var stateStyle = { |
| 234 | CLEARED_UNACK: 'color: #cf1322;background: #fff1f0;border-color: #ffa39e;', | 234 | CLEARED_UNACK: 'color: #cf1322;background: #fff1f0;border-color: #ffa39e;', |
| @@ -248,7 +248,7 @@ AlarmListComponent.createAlarmItem = function (record) { | @@ -248,7 +248,7 @@ AlarmListComponent.createAlarmItem = function (record) { | ||
| 248 | <div class="alarm-list-item" style="height: ${itemHeight}px; box-sizing: border-box; display: flex; flex-direction: column; justify-content: center; border-bottom: 1px solid black; text-align: left; min-width: 280px; width: 100%;"> | 248 | <div class="alarm-list-item" style="height: ${itemHeight}px; box-sizing: border-box; display: flex; flex-direction: column; justify-content: center; border-bottom: 1px solid black; text-align: left; min-width: 280px; width: 100%;"> |
| 249 | <div style="padding: 0 10px;"> | 249 | <div style="padding: 0 10px;"> |
| 250 | <span style="margin-right: 5px;">设备:</span> | 250 | <span style="margin-right: 5px;">设备:</span> |
| 251 | - <span>${alias || deviceName}</span> | 251 | + <span>${deviceAlias || deviceName}</span> |
| 252 | </div> | 252 | </div> |
| 253 | <div style="padding: 5px 10px;"> | 253 | <div style="padding: 5px 10px;"> |
| 254 | <span style="margin-right: 5px;">时间:</span> | 254 | <span style="margin-right: 5px;">时间:</span> |