From eca2a43d145f50089bdce11063149af2e48fbc7e Mon Sep 17 00:00:00 2001
From: denglihong2007 <98096191+denglihong2007@users.noreply.github.com>
Date: Sat, 7 Jun 2025 09:46:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B9=E5=96=84=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Ankang/ExitScreenView.xaml          | 23 +++++-------
 .../Views/Beijing/ArrivalScreenView.xaml      |  9 +++--
 .../Views/BeijingNan/PrimaryScreenView.xaml   | 23 ++++++------
 .../BeijingNan/TicketCheckScreenView.xaml     |  7 ++--
 .../Views/BeijingXi/PrimaryScreenView.xaml    | 37 ++++++++++---------
 .../PrimaryTicketCheckScreenView.xaml         |  1 +
 .../ChengduDong/SecondaryScreenView.xaml      | 23 +++++++-----
 .../DaqingDong/ConcourseBridgeScreenView.xaml |  9 +++--
 .../Views/DezhouDong/PrimaryScreenView.xaml   | 16 ++++----
 .../SecondaryScreenView.xaml                  | 22 ++++++-----
 .../Views/Guangyuan/PrimaryScreenView.xaml    | 22 +++++++----
 .../Views/Harbin/PrimaryScreenView.xaml       | 32 +++++++++-------
 .../Views/Jinanxi/SmallScreenView.xaml        | 16 ++++----
 .../Views/Niuzhou/PrimaryScreenView.xaml      | 11 +++---
 .../Views/Shanghai/OutsideScreenView.xaml     | 10 ++---
 .../Views/Zibo/PrimaryScreenView.xaml         | 23 +++++++-----
 .../Views/Zibo/SecondaryScreenView.xaml       |  4 +-
 .../Views/Zibo/TicketCheckScreenView.xaml     | 22 ++++++-----
 18 files changed, 169 insertions(+), 141 deletions(-)

diff --git a/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml b/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml
index c50fe2b..43fe68b 100644
--- a/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml
@@ -57,17 +57,12 @@
         </Style>
     </views:BaseScreenView.Resources>
     <StackPanel Orientation="Vertical">
-        <views:BaseDataGrid ItemsSource="{Binding ScreenA, Mode=OneWay}" 
-              
-               
-                RowHeight="30"
-              RowStyle="{StaticResource CommonRowStyle}"
-              AlternationCount="2"  >
+        <views:BaseDataGrid ItemsSource="{Binding ScreenA}" RowHeight="30" RowStyle="{StaticResource CommonRowStyle}" AlternationCount="2"  >
             <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="145">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}" Margin="0,0,0,1">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}" Margin="0,0,0,1">
                                 <TextBlock Text="车  次" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
@@ -80,7 +75,7 @@
                 <DataGridTextColumn Binding="{Binding Origin}" MinWidth="145">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}" Margin="0,0,0,1">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}" Margin="0,0,0,1">
                                 <TextBlock Text="始发站" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
@@ -93,7 +88,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="145">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}" Margin="0,0,0,1">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}" Margin="0,0,0,1">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
@@ -106,19 +101,21 @@
                 <DataGridTextColumn Binding="{Binding ArrivalTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="145">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}" Margin="0,0,0,1">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}" Margin="0,0,0,1">
                                 <TextBlock Text="到  点" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
                 <DataGridTextColumn Binding="{Binding Platform}" MinWidth="145">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}" Margin="0,0,0,1">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}" Margin="0,0,0,1">
                                 <TextBlock Text="站  台" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
@@ -138,7 +135,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}" Margin="0,0,0,1">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}" Margin="0,0,0,1">
                                 <TextBlock Text="状  态" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
diff --git a/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml b/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml
index 3655d10..fc95107 100644
--- a/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Beijing/ArrivalScreenView.xaml
@@ -54,10 +54,10 @@
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Origin}">
+                    <DataGridTextColumn Binding="{Binding Origin}" MinWidth="110">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <TextBlock Text="始发站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="110"/>
+                                <TextBlock Text="始发站" Padding="2" TextAlignment="Center" Background="Black" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"/>
                             </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                         <DataGridTextColumn.ElementStyle>
@@ -68,10 +68,10 @@
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Terminal}">
+                    <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="110">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <TextBlock Text="终到站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" Width="110"/>
+                                <TextBlock Text="终到站" Padding="2" TextAlignment="Center" Background="Black" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"/>
                             </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                         <DataGridTextColumn.ElementStyle>
@@ -93,6 +93,7 @@
                                 <Setter Property="Foreground" Value="White"/>
                                 <Setter Property="VerticalAlignment" Value="Center"/>
                                 <Setter Property="TextAlignment" Value="Center"/>
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml
index a7c140b..0fb40ed 100644
--- a/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/BeijingNan/PrimaryScreenView.xaml
@@ -10,6 +10,7 @@
         xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared">
     <views:BaseScreenView.Resources>
         <converters1:ListToStringConverter x:Key="ListToStringConverter" Separator="" />
+        <converters1:EmptyToVisibilityConverter x:Key="EmptyToVisibilityConverter" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
         <converters:TrainStateConverter x:Key="TrainStateConverter" WaitingText="正在候车"/>
         <converters:TrainStateColorConverter x:Key="TrainStateColorConverter" DisplayMode="Alternating_Row_Colors" CheckingTicketsColor="#1f5b54">
@@ -63,17 +64,13 @@
         </Style>
     </views:BaseScreenView.Resources>
     <StackPanel Orientation="Horizontal">
-        <views:BaseDataGrid ItemsSource="{Binding ScreenA, Mode=OneWay}" 
-              
-                FontFamily="DengXian"
-                RowHeight="28"
-              RowStyle="{StaticResource CommonRowStyle}" FontWeight="SemiBold" FontSize="20"
-              AlternationCount="2"  >
+        <views:BaseDataGrid ItemsSource="{Binding ScreenA, Mode=OneWay}" FontFamily="DengXian" RowHeight="28"
+              RowStyle="{StaticResource CommonRowStyle}" FontWeight="SemiBold" FontSize="20" AlternationCount="2">
             <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="110">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,3" FontSize="27"/>
                                 <Border Height="2" Background="#5172af" Margin="0,0,0,0"/>
                                 <TextBlock Text="Train" Style="{StaticResource CommonHeaderStyle}" FontSize="20" Padding="0,3,0,2"/>
@@ -88,7 +85,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal, Converter={StaticResource TextSpacingConverter}}" MinWidth="130">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,3" FontSize="27"/>
                                 <Border Height="2" Background="#5172af" Margin="0,0,0,0"/>
                                 <TextBlock Text="To" Style="{StaticResource CommonHeaderStyle}" FontSize="20" Padding="0,3,0,2"/>
@@ -103,7 +100,7 @@
                 <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="110">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,3" FontSize="27"/>
                                 <Border Height="2" Background="#5172af" Margin="0,0,0,0"/>
                                 <TextBlock Text="Departs" Style="{StaticResource CommonHeaderStyle}" FontSize="20" Padding="0,3,0,2"/>
@@ -111,14 +108,16 @@
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
                 
                 <DataGridTextColumn Binding="{Binding TicketChecks, Converter={StaticResource ListToStringConverter}}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="检票口" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,3" FontSize="27"/>
                                 <Border Height="2" Background="#5172af" Margin="0,0,0,0"/>
                                 <TextBlock Text="Gate" Style="{StaticResource CommonHeaderStyle}" FontSize="20" Padding="0,3,0,2"/>
@@ -140,7 +139,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="状态" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,3" FontSize="27"/>
                                 <Border Height="2" Background="#5172af" Margin="0,0,0,0"/>
                                 <TextBlock Text="Status" Style="{StaticResource CommonHeaderStyle}" FontSize="20" Padding="0,3,0,2"/>
diff --git a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml
index 27dd4bd..b11797e 100644
--- a/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/BeijingNan/TicketCheckScreenView.xaml
@@ -40,10 +40,10 @@
                     </Style>
                 </DataGridTextColumn.ElementStyle>
             </DataGridTextColumn>
-            <DataGridTextColumn Binding="{Binding Terminal}">
+            <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="120">
                 <DataGridTextColumn.HeaderTemplate>
                     <DataTemplate>
-                        <TextBlock Text="终到站" FontSize="18" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#0036DF" Width="120"/>
+                        <TextBlock Text="终到站" FontSize="18" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#0036DF" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"/>
                     </DataTemplate>
                 </DataGridTextColumn.HeaderTemplate>
                 <DataGridTextColumn.ElementStyle>
@@ -64,7 +64,8 @@
                     <Style TargetType="TextBlock">
                         <Setter Property="Foreground" Value="White"/>
                         <Setter Property="VerticalAlignment" Value="Center"/>
-                        <Setter Property="TextAlignment" Value="Center"/>
+                        <Setter Property="TextAlignment" Value="Center"/>
+                        <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                     </Style>
                 </DataGridTextColumn.ElementStyle>
             </DataGridTextColumn>
diff --git a/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml
index 67180b8..3f44de3 100644
--- a/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml
@@ -10,6 +10,7 @@
         xmlns:converters1="clr-namespace:CRSim.Shared.Converters;assembly=CRSim.Shared">
     <views:BaseScreenView.Resources>
         <converters1:ListToStringConverter x:Key="ListToStringConverter" Separator="" />
+        <converters1:EmptyToVisibilityConverter x:Key="EmptyToVisibilityConverter" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
         <converters:TrainStateConverter x:Key="TrainStateConverter" WaitingText="正在候车"/>
         <converters:TrainStateColorConverter x:Key="TrainStateColorConverter" WaitingColor="#CDDBFF"/>
@@ -60,7 +61,7 @@
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="50">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Train" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
@@ -74,7 +75,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal, Converter={StaticResource TextSpacingConverter}}" MinWidth="70">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="To" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
@@ -88,21 +89,23 @@
                 <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="40">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Time" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
                 
                 <DataGridTextColumn Binding="{Binding WaitingArea}" MinWidth="45">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="候车室" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Check in" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
@@ -123,7 +126,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="状态" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Status" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
@@ -145,17 +148,13 @@
                 </DataGridTextColumn>
             </DataGrid.Columns>
         </views:BaseDataGrid>
-        <views:BaseDataGrid ItemsSource="{Binding ScreenB, Mode=OneWay}" 
-              
-                FontFamily="DengXian"
-                RowHeight="28"
-              RowStyle="{StaticResource CommonRowStyle}" FontWeight="SemiBold"
-              AlternationCount="2"  >
+        <views:BaseDataGrid ItemsSource="{Binding ScreenB}" FontFamily="DengXian" RowHeight="28"
+              RowStyle="{StaticResource CommonRowStyle}" FontWeight="SemiBold" AlternationCount="2"  >
             <DataGrid.Columns>
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="50">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Train" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
@@ -169,7 +168,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal, Converter={StaticResource TextSpacingConverter}}" MinWidth="70">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="To" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
@@ -183,21 +182,23 @@
                 <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="40">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Time" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>                    
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
 
                 <DataGridTextColumn Binding="{Binding WaitingArea}" MinWidth="45">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="候车室" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Check in" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
@@ -218,7 +219,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="状态" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0"/>
                                 <TextBlock Text="Status" Style="{StaticResource CommonHeaderStyle}" FontSize="10" Padding="0,0,0,2"/>
                             </StackPanel>
diff --git a/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml
index 046f2ac..f680144 100644
--- a/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml
@@ -63,6 +63,7 @@
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             <Setter Property="Foreground" Value="White"/>
                             <Setter Property="VerticalAlignment" Value="Center"/>
                             <Setter Property="TextAlignment" Value="Center"/>
diff --git a/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml
index ece418b..197be74 100644
--- a/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml
@@ -16,6 +16,7 @@
             <Setter Property="BorderThickness" Value="0"/>
         </Style>
         <converters1:ListToStringConverter x:Key="ListToStringConverter" Separator="" />
+        <converters1:EmptyToVisibilityConverter x:Key="EmptyToVisibilityConverter" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringTimeConverter" Format="yyyy-MM-dd HH:mm:ss" />
         <converters:TrainStateConverter x:Key="TrainStateConverter" />
@@ -28,7 +29,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" HorizontalAlignment="Stretch" Padding="5"
                                        Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -56,7 +57,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" HorizontalAlignment="Stretch" Padding="5"
                                        Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -84,7 +85,7 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" HorizontalAlignment="Stretch" Padding="5"
                                        Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -106,6 +107,7 @@
                                 <Setter Property="TextAlignment" Value="Center" />
                                 <Setter Property="HorizontalAlignment" Value="Center"/>
                                 <Setter Property="VerticalAlignment" Value="Center"/>
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
 
@@ -113,7 +115,7 @@
                     <DataGridTextColumn Binding="{Binding TicketChecks, Converter={StaticResource ListToStringConverter}}" MinWidth="150">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="检票口" HorizontalAlignment="Stretch" Padding="5"
                                                Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -148,7 +150,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状态" HorizontalAlignment="Stretch" Padding="5"
                                                Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -212,7 +214,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" HorizontalAlignment="Stretch" Padding="5"
                                        Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -240,7 +242,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" HorizontalAlignment="Stretch" Padding="5"
                                        Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -268,7 +270,7 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" HorizontalAlignment="Stretch" Padding="5"
                                        Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -288,6 +290,7 @@
                             <Style TargetType="TextBlock">
                                 <Setter Property="Foreground" Value="White"/>
                                 <Setter Property="TextAlignment" Value="Center" />
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                                 <Setter Property="HorizontalAlignment" Value="Center"/>
                                 <Setter Property="VerticalAlignment" Value="Center"/>
                             </Style>
@@ -297,7 +300,7 @@
                     <DataGridTextColumn Binding="{Binding TicketChecks, Converter={StaticResource ListToStringConverter}}" MinWidth="150">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="检票口" HorizontalAlignment="Stretch" Padding="5"
                                                Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -332,7 +335,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状态" HorizontalAlignment="Stretch" Padding="5"
                                                Foreground="White" TextAlignment="Center">
                                         <TextBlock.Background>
diff --git a/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml b/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml
index e0e9b71..cf6b9d3 100644
--- a/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/DaqingDong/ConcourseBridgeScreenView.xaml
@@ -73,10 +73,10 @@
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Origin}">
+                    <DataGridTextColumn Binding="{Binding Origin}" MinWidth="140">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <TextBlock Text="始发站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#201921" Foreground="#ff1111" Width="140"/>
+                                <TextBlock Text="始发站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#201921" Foreground="#ff1111" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"/>
                             </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                         <DataGridTextColumn.ElementStyle>
@@ -86,10 +86,10 @@
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Binding="{Binding Terminal}">
+                    <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="140">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <TextBlock Text="终到站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#201921" Foreground="#ff1111" Width="140"/>
+                                <TextBlock Text="终到站" Padding="2" HorizontalAlignment="Stretch" TextAlignment="Center" Background="#201921" Foreground="#ff1111" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"/>
                             </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                         <DataGridTextColumn.ElementStyle>
@@ -122,6 +122,7 @@
                             <Style TargetType="TextBlock">
                                 <Setter Property="VerticalAlignment" Value="Center"/>
                                 <Setter Property="TextAlignment" Value="Center"/>
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
diff --git a/CRSim.ScreenSimulator/Views/DezhouDong/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/DezhouDong/PrimaryScreenView.xaml
index bb95a69..682ced4 100644
--- a/CRSim.ScreenSimulator/Views/DezhouDong/PrimaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/DezhouDong/PrimaryScreenView.xaml
@@ -63,7 +63,7 @@
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="70">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
@@ -76,7 +76,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="90">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
@@ -89,7 +89,7 @@
                 <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="45">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
@@ -104,7 +104,7 @@
                 <DataGridTextColumn Binding="{Binding TicketChecks, Converter={StaticResource ListToStringConverter}}" MinWidth="45">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="检票口" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
@@ -117,7 +117,7 @@
                 <DataGridTextColumn Binding="{Binding Platform}" MinWidth="45">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="站台" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
@@ -130,7 +130,7 @@
                 <DataGridTextColumn Binding="{Binding Landmark,Converter={StaticResource LandmarkToStringConverter}}" MinWidth="45">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="地标" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
@@ -145,7 +145,7 @@
                 <DataGridTextColumn Binding="{Binding Length,Converter={StaticResource NumberToStringConverter}}" MinWidth="55">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车厢" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
@@ -167,7 +167,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="状态" Style="{StaticResource CommonHeaderStyle}" Padding="0,6,0,0" Height="30"/>
                             </StackPanel>
                         </DataTemplate>
diff --git a/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml
index f5e4680..591e85e 100644
--- a/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml
@@ -98,7 +98,7 @@
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" FontSize="18" Padding="0,2,0,0" FontFamily="微软雅黑"/>
                             </StackPanel>
                         </DataTemplate>
@@ -111,7 +111,7 @@
                 <DataGridTextColumn Binding="{Binding Origin}" MinWidth="115">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="始发站" Style="{StaticResource CommonHeaderStyle}" FontSize="18" Padding="0,2,0,0" FontFamily="微软雅黑"/>
                             </StackPanel>
                         </DataTemplate>
@@ -124,7 +124,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="115">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" FontSize="18" Padding="0,2,0,0" FontFamily="微软雅黑"/>
                             </StackPanel>
                         </DataTemplate>
@@ -138,33 +138,37 @@
                 <DataGridTextColumn Binding="{Binding ArrivalTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="到点" Style="{StaticResource CommonHeaderStyle}" FontSize="18" Padding="0,2,0,0" FontFamily="微软雅黑"/>
                             </StackPanel>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
 
                 <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" FontSize="18" Padding="0,2,0,0" FontFamily="微软雅黑"/>
                             </StackPanel>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
 
                 <DataGridTextColumn Binding="{Binding TicketChecks,Converter={StaticResource ListToStringConverter}}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="检票口" Style="{StaticResource CommonHeaderStyle}" FontSize="18" Padding="0,2,0,0" FontFamily="微软雅黑"/>
                             </StackPanel>
                         </DataTemplate>
@@ -184,7 +188,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="状态" Style="{StaticResource CommonHeaderStyle}" FontSize="18" Padding="0,2,0,0" FontFamily="微软雅黑"/>
                             </StackPanel>
                         </DataTemplate>
diff --git a/CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml
index 7155916..2e1bc80 100644
--- a/CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml
@@ -18,6 +18,7 @@
             <Setter Property="BorderThickness" Value="0"/>
         </Style>
         <converters1:ListToStringConverter x:Key="ListToStringConverter" Separator="" />
+        <converters1:EmptyToVisibilityConverter x:Key="EmptyToVisibilityConverter" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringTimeConverter" Format="HH:mm:ss" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringDateConverter" Format="yyyy/MM/dd" />
@@ -29,7 +30,7 @@
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="55">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <TextBlock Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                            <TextBlock Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        Text="车次" HorizontalAlignment="Stretch" Padding="3" 
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
@@ -39,7 +40,7 @@
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="始发站" HorizontalAlignment="Stretch" Padding="3" 
-                                       Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                                       Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
@@ -48,7 +49,7 @@
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="终到站" HorizontalAlignment="Stretch" Padding="3" 
-                                       Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                                       Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
@@ -57,16 +58,21 @@
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="开点" HorizontalAlignment="Stretch" Padding="3"
-                                       Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                                       Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
                 <DataGridTextColumn Binding="{Binding WaitingArea}" MinWidth="80">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="候车区" HorizontalAlignment="Stretch" Padding="3" 
-                                       Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                                       Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
@@ -75,7 +81,7 @@
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="检票口" HorizontalAlignment="Stretch" Padding="3" 
-                                       Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                                       Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
@@ -84,7 +90,7 @@
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="站台" HorizontalAlignment="Stretch" Padding="3"
-                                       Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                                       Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
@@ -100,7 +106,7 @@
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <TextBlock Text="状态" HorizontalAlignment="Stretch" Padding="3" 
-                                       Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}"
+                                       Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}"
                                        TextAlignment="Center" FontSize="20" Background="Black"/>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
diff --git a/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml
index 2e52571..8f37539 100644
--- a/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml
@@ -63,7 +63,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="60">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="Train" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -77,7 +77,7 @@
                     <DataGridTextColumn Binding="{Binding Origin}" MinWidth="110">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="始发站" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="From" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -108,7 +108,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="110">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="To" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -122,21 +122,23 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="60">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="Depart" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                         <DataGridTextColumn.ElementStyle>
-                            <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                            <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                            </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
 
                     <DataGridTextColumn Binding="{Binding TicketChecks,Converter={StaticResource ListToStringConverter}}" MinWidth="72">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="检票口" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="Check" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -157,7 +159,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状 态" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="State" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -184,7 +186,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="60">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="Train" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -198,7 +200,7 @@
                     <DataGridTextColumn Binding="{Binding Origin}" MinWidth="110">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="始发站" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="From" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -229,7 +231,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="110">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="To" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -243,21 +245,23 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="60">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="Depart" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                         <DataGridTextColumn.ElementStyle>
-                            <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                            <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                            </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
 
                     <DataGridTextColumn Binding="{Binding TicketChecks,Converter={StaticResource ListToStringConverter}}" MinWidth="72">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="检票口" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="Check" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
@@ -278,7 +282,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状 态" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0"/>
                                     <TextBlock Text="State" Style="{StaticResource CommonHeaderStyle}" FontSize="17" Padding="0,3"/>
                                 </StackPanel>
diff --git a/CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml b/CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml
index 1c1e6cd..28b8e24 100644
--- a/CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml
@@ -103,7 +103,7 @@
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车  次" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0" FontFamily="楷体"/>
                             </StackPanel>
                         </DataTemplate>
@@ -116,7 +116,7 @@
                 <DataGridTextColumn Binding="{Binding Origin}" MinWidth="115">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="始发站" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0" FontFamily="楷体"/>
                             </StackPanel>
                         </DataTemplate>
@@ -129,7 +129,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal}" Width="115">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0" FontFamily="楷体"/>
                             </StackPanel>
                         </DataTemplate>
@@ -142,20 +142,22 @@
                 <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="开  点" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0" FontFamily="楷体"/>
                             </StackPanel>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                        <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                        </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
 
                 <DataGridTextColumn Binding="{Binding TicketChecks,Converter={StaticResource ListToStringConverter}}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="检票口" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0" FontFamily="楷体"/>
                             </StackPanel>
                         </DataTemplate>
@@ -175,7 +177,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="状  态" Style="{StaticResource CommonHeaderStyle}" FontSize="24" Padding="0,2,0,0" FontFamily="楷体"/>
                             </StackPanel>
                         </DataTemplate>
diff --git a/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml
index 1d4390f..59f0011 100644
--- a/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Niuzhou/PrimaryScreenView.xaml
@@ -54,7 +54,7 @@
                 <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="130">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="车次" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
@@ -67,7 +67,7 @@
                 <DataGridTextColumn Binding="{Binding TicketChecks,Converter={StaticResource ListToStringConverter}}" MinWidth="100">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="检票口" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
@@ -80,13 +80,14 @@
                 <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="120">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="开点" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                            <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                         </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
@@ -100,7 +101,7 @@
                     </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="状 态" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
@@ -122,7 +123,7 @@
                 <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="140">
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
-                            <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                            <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                 <TextBlock Text="终到站" Style="{StaticResource CommonHeaderStyle}" FontSize="22" Padding="0,2,0,0"/>
                             </StackPanel>
                         </DataTemplate>
diff --git a/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml b/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml
index 56c68f7..15d9329 100644
--- a/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml
@@ -26,7 +26,7 @@
             <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="55">
                 <DataGridTextColumn.HeaderTemplate>
                     <DataTemplate>
-                        <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                        <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                             <TextBlock Text="车次" HorizontalAlignment="Stretch" TextAlignment="Left" Background="Black" FontSize="20"/>
                             <TextBlock Text="Train No" HorizontalAlignment="Stretch" TextAlignment="Left" Background="Black" FontSize="10"/>
                         </StackPanel>
@@ -52,7 +52,7 @@
             <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="70">
                 <DataGridTextColumn.HeaderTemplate>
                     <DataTemplate>
-                        <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                        <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                             <TextBlock Text="开点" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" FontSize="20"/>
                             <TextBlock Text="Departure Time" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" FontSize="10"/>
                         </StackPanel>
@@ -85,7 +85,7 @@
             <DataGridTextColumn Binding="{Binding Terminal}" Width="100">
                 <DataGridTextColumn.HeaderTemplate>
                     <DataTemplate>
-                        <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                        <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                             <TextBlock Text="终到站" HorizontalAlignment="Stretch" TextAlignment="Left" Background="Black" FontSize="20"/>
                             <TextBlock Text="  Terminal" HorizontalAlignment="Stretch" TextAlignment="Left" Background="Black" FontSize="10"/>
                         </StackPanel>
@@ -111,7 +111,7 @@
             <DataGridTextColumn Binding="{Binding WaitingArea}" MinWidth="65">
                 <DataGridTextColumn.HeaderTemplate>
                     <DataTemplate>
-                        <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                        <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                             <TextBlock Text="候车厅" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" FontSize="20"/>
                             <TextBlock Text="Waiting Room" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" FontSize="10"/>
                         </StackPanel>
@@ -144,7 +144,7 @@
                 </DataGridTextColumn.Binding>
                 <DataGridTextColumn.HeaderTemplate>
                     <DataTemplate>
-                        <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                        <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                             <TextBlock Text="当前状态" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" FontSize="20"/>
                             <TextBlock Text="Status" HorizontalAlignment="Stretch" TextAlignment="Center" Background="Black" FontSize="10"/>
                         </StackPanel>
diff --git a/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml
index 72fdee1..55b179c 100644
--- a/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml
@@ -17,6 +17,7 @@
             <Setter Property="BorderThickness" Value="0"/>
         </Style>
         <converters1:ListToStringConverter x:Key="ListToStringConverter" Separator="" />
+        <converters1:EmptyToVisibilityConverter x:Key="EmptyToVisibilityConverter" />
         <converters1:DateTimeToStringConverter x:Key="DateTimeToStringConverter" Format="HH:mm" />
         <converters:TrainStateConverter x:Key="TrainStateConverter" />
         <converters:TrainStateColorConverter x:Key="TrainStateColorConverter" WaitingColor="white" CheckingTicketsColor="#1ce048" StopCheckingTicketsColor="#df0122"/>
@@ -29,7 +30,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="80">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -51,7 +52,7 @@
                     <DataGridTextColumn Binding="{Binding Origin}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="始发站" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -73,7 +74,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -95,7 +96,7 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -111,6 +112,7 @@
                                 <Setter Property="TextAlignment" Value="Center" />
                                 <Setter Property="HorizontalAlignment" Value="Center"/>
                                 <Setter Property="VerticalAlignment" Value="Center"/>
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
 
@@ -125,7 +127,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状态" HorizontalAlignment="Stretch" Padding="10"
                                                Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -184,7 +186,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="80">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -206,7 +208,7 @@
                     <DataGridTextColumn Binding="{Binding Origin}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="始发站" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -228,7 +230,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -250,7 +252,7 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="100">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" HorizontalAlignment="Stretch" Padding="10"
                                        Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -266,6 +268,7 @@
                                 <Setter Property="TextAlignment" Value="Center" />
                                 <Setter Property="HorizontalAlignment" Value="Center"/>
                                 <Setter Property="VerticalAlignment" Value="Center"/>
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
 
@@ -280,7 +283,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状态" HorizontalAlignment="Stretch" Padding="10"
                                                Foreground="#cfcfcf" TextAlignment="Center">
                                         <TextBlock.Background>
diff --git a/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml
index 665ea7b..5e30e66 100644
--- a/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml
@@ -95,7 +95,9 @@
                             </DataTemplate>
                         </DataGridTextColumn.HeaderTemplate>
                         <DataGridTextColumn.ElementStyle>
-                            <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}"/>
+                            <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
+                            </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
 
diff --git a/CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml
index a473401..d817288 100644
--- a/CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml
+++ b/CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml
@@ -33,7 +33,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="80">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -55,7 +55,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="90">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -77,7 +77,7 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="90">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -93,13 +93,14 @@
                                 <Setter Property="TextAlignment" Value="Center" />
                                 <Setter Property="HorizontalAlignment" Value="Center"/>
                                 <Setter Property="VerticalAlignment" Value="Center"/>
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Binding="{Binding Platform}"  MinWidth="60">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="站台" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -128,7 +129,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状态" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                                Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -223,7 +224,7 @@
                     <DataGridTextColumn Binding="{Binding TrainNumber}" MinWidth="80">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical" Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="车次" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -245,7 +246,7 @@
                     <DataGridTextColumn Binding="{Binding Terminal}" MinWidth="90">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="终到站" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -267,7 +268,7 @@
                     <DataGridTextColumn Binding="{Binding DepartureTime, Converter={StaticResource DateTimeToStringConverter}}" MinWidth="90">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="开点" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -283,13 +284,14 @@
                                 <Setter Property="TextAlignment" Value="Center" />
                                 <Setter Property="HorizontalAlignment" Value="Center"/>
                                 <Setter Property="VerticalAlignment" Value="Center"/>
+                                <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                             </Style>
                         </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Binding="{Binding Platform}"  MinWidth="60">
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="站台" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                        Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>
@@ -318,7 +320,7 @@
                         </DataGridTextColumn.Binding>
                         <DataGridTextColumn.HeaderTemplate>
                             <DataTemplate>
-                                <StackPanel Orientation="Vertical"  Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}">
+                                <StackPanel Orientation="Vertical"  Width="{Binding RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}, Path=ActualWidth}">
                                     <TextBlock Text="状态" HorizontalAlignment="Stretch" Padding="1" FontWeight="Black" Height="28"
                                                Foreground="#ffffff" TextAlignment="Center">
                                         <TextBlock.Background>