|
|
@@ -239,11 +239,14 @@ |
|
|
|
|
|
|
|
<Grid> |
|
|
|
<Grid.ColumnDefinitions> |
|
|
|
<ColumnDefinition Width="139*"/> |
|
|
|
<ColumnDefinition Width="641*"/> |
|
|
|
<ColumnDefinition Width="139*" /> |
|
|
|
<ColumnDefinition Width="641*" /> |
|
|
|
</Grid.ColumnDefinitions> |
|
|
|
<!--#region 实时报警信息--> |
|
|
|
<ItemsControl ItemsSource="{Binding AlarmInfos}" Visibility="{Binding CurrentDataVis}" Grid.ColumnSpan="2"> |
|
|
|
<ItemsControl |
|
|
|
Grid.ColumnSpan="2" |
|
|
|
ItemsSource="{Binding AlarmInfos}" |
|
|
|
Visibility="{Binding CurrentDataVis}"> |
|
|
|
<ItemsControl.ItemTemplate> |
|
|
|
<DataTemplate> |
|
|
|
<Grid x:Name="gr" Height="30"> |
|
|
@@ -309,7 +312,10 @@ |
|
|
|
<!--#endregion--> |
|
|
|
|
|
|
|
<!--#region 历史报警信息--> |
|
|
|
<ItemsControl ItemsSource="{Binding HistoryAlarm}" Visibility="{Binding HistoryDataVis}" Grid.ColumnSpan="2"> |
|
|
|
<ItemsControl |
|
|
|
Grid.ColumnSpan="2" |
|
|
|
ItemsSource="{Binding HistoryAlarm}" |
|
|
|
Visibility="{Binding HistoryDataVis}"> |
|
|
|
<ItemsControl.ItemTemplate> |
|
|
|
<DataTemplate> |
|
|
|
<Grid x:Name="gr" Height="30"> |
|
|
|