Alarm

BPASmartClient.CustomResource/Pages/View/AlarmView.xaml

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