Merge branch 'fix/DEFECT-1459' into 'main_dev'

fix: 修改告警记录别名显示

See merge request yunteng/thingskit-scada!125

@@ -228,7 +228,7 @@ AlarmListComponent.createAlarmItem = function (record) {
 	}
 
 	return (record || []).map(item => {
-		var { alias, deviceName, status, startTs } = item || {}
+		var { alias, deviceName, status, startTs,deviceAlias } = item || {}
 
 		var stateStyle = {
 			CLEARED_UNACK: 'color: #cf1322;background: #fff1f0;border-color: #ffa39e;',
@@ -248,7 +248,7 @@ AlarmListComponent.createAlarmItem = function (record) {
 	<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%;">
 		<div style="padding: 0 10px;">
 			<span style="margin-right: 5px;">设备:</span>
-			<span>${alias || deviceName}</span>
+			<span>${deviceAlias || deviceName}</span>
 		</div>
 		<div style="padding: 5px 10px;">
 			<span style="margin-right: 5px;">时间:</span>