[UI.Client]

优化AlarmViewModel中的一些变量名。
This commit is contained in:
DESKTOP-1N1NK8A\auvkk 2023-05-09 15:06:06 +08:00
parent ad0ca9c42c
commit 86ec049999
1 changed files with 12 additions and 11 deletions

View File

@ -21,20 +21,21 @@ namespace MECF.Framework.UI.Client.CenterViews.Alarms.Alarm
protected override void InvokeBeforeUpdateProperty(Dictionary<string, object> data)
{
if (data.ContainsKey("System.LiveAlarmEvent"))
UpdateAlarmEvent((List<EventItem>)data["System.LiveAlarmEvent"]);
if (data.TryGetValue("System.LiveAlarmEvent", out var value))
UpdateAlarmEvent((List<EventItem>)value);
}
public void UpdateAlarmEvent(List<EventItem> evItems)
public void UpdateAlarmEvent(List<EventItem> alarmsFromRt)
{
var alarmEvents = new List<AlarmItem>();
foreach (EventItem item in evItems)
foreach (var item in alarmsFromRt)
{
var it = new AlarmItem()
var alarmItem = new AlarmItem()
{
Type = item.Level == EventLevel.Alarm ? "Alarm" : (item.Level == EventLevel.Information ? "Info" : "Warning"),
Source = item.Source,
OccuringTime = item.OccuringTime.ToString(),//item.OccuringTime.ToString("HH:mm:ss"),
OccuringTime = item.OccuringTime.ToString("HH:mm:ss"),
Description = item.Description,
EventEnum = item.EventEnum,
EventId = item.Id,
@ -43,11 +44,11 @@ namespace MECF.Framework.UI.Client.CenterViews.Alarms.Alarm
};
switch (item.Level)
{
case EventLevel.Alarm: it.TextColor = Brushes.Red; break;
case EventLevel.Warning: it.TextColor = Brushes.Yellow; break;
default: it.TextColor = Brushes.White; break;
case EventLevel.Alarm: alarmItem.TextColor = Brushes.Red; break;
case EventLevel.Warning: alarmItem.TextColor = Brushes.Yellow; break;
default: alarmItem.TextColor = Brushes.White; break;
}
alarmEvents.Add(it);
alarmEvents.Add(alarmItem);
}
if (AlarmEvents == null || (alarmEvents.Count != AlarmEvents.Count))
{
@ -71,7 +72,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Alarms.Alarm
AlarmEvents = alarmEvents;
}
NotifyOfPropertyChange("AlarmEvents");
NotifyOfPropertyChange(nameof(AlarmEvents));
}
}
}