|
@@ -46,14 +46,14 @@ namespace BPASmartClient.ViewModel |
|
|
{ |
|
|
{ |
|
|
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => |
|
|
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => |
|
|
{ |
|
|
{ |
|
|
LogDataGrid.Insert(0,new LogModel { message = s,type = "一般日志" }); |
|
|
|
|
|
|
|
|
LogDataGrid.Insert(0,new LogModel { message = s,type = "Info" }); |
|
|
})); |
|
|
})); |
|
|
}); |
|
|
}); |
|
|
MessageLog.GetInstance.ExInfoNotify = new Action<string>((s) => |
|
|
MessageLog.GetInstance.ExInfoNotify = new Action<string>((s) => |
|
|
{ |
|
|
{ |
|
|
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => |
|
|
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => |
|
|
{ |
|
|
{ |
|
|
LogDataGrid.Insert(0,new LogModel { message = s,type = "错误日志" }); |
|
|
|
|
|
|
|
|
LogDataGrid.Insert(0,new LogModel { message = s,type = "Error" }); |
|
|
})); |
|
|
})); |
|
|
}); |
|
|
}); |
|
|
ExcelCommand = new RelayCommand(() => |
|
|
ExcelCommand = new RelayCommand(() => |
|
@@ -220,7 +220,7 @@ namespace BPASmartClient.ViewModel |
|
|
if (_type == value) |
|
|
if (_type == value) |
|
|
return; |
|
|
return; |
|
|
_type = value; |
|
|
_type = value; |
|
|
if(_type== "错误日志") foreground = new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#ed0032")); |
|
|
|
|
|
|
|
|
if(_type== "Error") foreground = new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#ed0032")); |
|
|
|
|
|
|
|
|
OnPropertyChanged("type"); |
|
|
OnPropertyChanged("type"); |
|
|
} |
|
|
} |
|
|