diff --git a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs index a7a02ce..21c0f26 100644 --- a/SlnMesnac.WPF/ViewModel/IndexViewModel.cs +++ b/SlnMesnac.WPF/ViewModel/IndexViewModel.cs @@ -65,13 +65,10 @@ namespace SlnMesnac.WPF.ViewModel AxisX = new ObservableCollection { "8", "12", "16", "20" }; - - - RefreshLogMessage($"1#站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发站台任务下发"); - ScanItems = new ObservableCollection(); } + #region 参数定义 /// /// 条码信息 /// @@ -152,9 +149,11 @@ namespace SlnMesnac.WPF.ViewModel get => _scanItems; set => SetProperty(ref _scanItems, value); } + #endregion private void RefreshScanInfo() { + //数据刷新 tagScanBusiness.RefreshTagScanInfoEvent += info => { @@ -170,6 +169,12 @@ namespace SlnMesnac.WPF.ViewModel TagAmount++; }); }; + + //报警信息刷新 + tagScanBusiness.RefreshDeviceAlarmMessageEvent += msg => + { + RefreshLogMessage(msg); + }; }