diff --git a/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj b/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj index 2531233..093abe2 100644 --- a/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj +++ b/MECF.Framework.UI.Core/MECF.Framework.UI.Core.csproj @@ -445,6 +445,7 @@ + MonitorView.xaml diff --git a/MECF.Framework.UI.Core/View/Common/AlarmItem.cs b/MECF.Framework.UI.Core/View/Common/AlarmItem.cs new file mode 100644 index 0000000..554f627 --- /dev/null +++ b/MECF.Framework.UI.Core/View/Common/AlarmItem.cs @@ -0,0 +1,80 @@ +using System.Windows.Media; +using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robot; + +namespace Aitex.Core.UI.View.Common +{ + /// + /// 应用于UI端显示的报警信息对象。 + /// + public class AlarmItem + { + #region Properties + + /// + /// 设置或返回报警发生的时间。 + /// + public string OccuringTime { get; set; } + + /// + /// 设置或返回报警描述。 + /// + public string Description { get; set; } + + /// + /// 设置或返回报警信息文本显示的颜色。 + /// + public Brush TextColor { get; set; } + + /// + /// 设置或返回报警类型。 + /// + /// 可用的报警类型请参考枚举。 + /// + /// + public string Type { get; set; } + + /// + /// 设置或返回报警编号。 + /// + public int EventId { get; set; } + + /// + /// 设置或返回报警名称。 + /// + public string EventEnum { get; set; } + + /// + /// 设置或返回报警的详细解释。 + /// + public string Explaination { get; set; } + + /// + /// 设置或返回报警的处理方法描述。 + /// + public string Solution { get; set; } + + /// + /// 设置或返回报警来源。 + /// + public string Source { get; set; } + + #endregion + + #region Methods + + /// + /// 判断当前报警信息是否和指定的报警信息相同。 + /// + /// + /// + public bool IsEqualTo(AlarmItem item) + { + return item.OccuringTime == OccuringTime && + item.Description == Description && + item.Type == Type; + } + + #endregion + + } +} diff --git a/MECF.Framework.UI.Core/View/Common/MonitorViewModel.cs b/MECF.Framework.UI.Core/View/Common/MonitorViewModel.cs index 97cf492..900438f 100644 --- a/MECF.Framework.UI.Core/View/Common/MonitorViewModel.cs +++ b/MECF.Framework.UI.Core/View/Common/MonitorViewModel.cs @@ -1,32 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using System.Collections.Generic; using System.Windows.Media; using Aitex.Core.RT.Event; using Aitex.Core.UI.MVVM; namespace Aitex.Core.UI.View.Common { - public class AlarmItem - { - public string OccuringTime { get; set; } - public string Description { get; set; } - public Brush TextColor { get; set; } - public string Type { get; set; } - public bool IsEqualTo(AlarmItem item) - { - return item.OccuringTime == OccuringTime && - item.Description == Description && - item.Type == Type; - } - public int EventId { get; set; } - public string EventEnum { get; set; } - public string Explaination { get; set; } - public string Solution { get; set; } - public string Source { get; set; } - } - public class MonitorViewModel : ViewModelBase { public List AlarmEvents { get; set; }