NXX
2 years ago
1 changed files with 6 additions and 2 deletions
Unified View
Diff Options
+ 6
- 2
BPASmartClient.CustomResource/Pages/View/AlarmView.xaml
View File
| @@ -238,8 +238,12 @@ | |||||
| VerticalScrollBarVisibility="Hidden"> | VerticalScrollBarVisibility="Hidden"> | ||||
| <Grid> | <Grid> | ||||
| <Grid.ColumnDefinitions> | |||||
| <ColumnDefinition Width="139*"/> | |||||
| <ColumnDefinition Width="641*"/> | |||||
| </Grid.ColumnDefinitions> | |||||
| <!--#region 实时报警信息--> | <!--#region 实时报警信息--> | ||||
| <ItemsControl ItemsSource="{Binding AlarmInfos}" Visibility="{Binding CurrentDataVis}"> | |||||
| <ItemsControl ItemsSource="{Binding AlarmInfos}" Visibility="{Binding CurrentDataVis}" Grid.ColumnSpan="2"> | |||||
| <ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| <Grid x:Name="gr" Height="30"> | <Grid x:Name="gr" Height="30"> | ||||
| @@ -305,7 +309,7 @@ | |||||
| <!--#endregion--> | <!--#endregion--> | ||||
| <!--#region 历史报警信息--> | <!--#region 历史报警信息--> | ||||
| <ItemsControl ItemsSource="{Binding HistoryAlarm}" Visibility="{Binding HistoryDataVis}"> | |||||
| <ItemsControl ItemsSource="{Binding HistoryAlarm}" Visibility="{Binding HistoryDataVis}" Grid.ColumnSpan="2"> | |||||
| <ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| <Grid x:Name="gr" Height="30"> | <Grid x:Name="gr" Height="30"> | ||||