修改TM界面

2024-03-25 13:55:03 +08:00 · 2024-03-25 13:55:03 +08:00 · 79505e8393
parent 83d6f18305
commit 79505e8393
1 changed files with 64 additions and 56 deletions
--- a/SicUI/Models/Maintenances/TM/TMView.xaml
+++ b/SicUI/Models/Maintenances/TM/TMView.xaml
@ -11,17 +11,17 @@
    xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
    xmlns:industrialcontrol="clr-namespace:MECF.Framework.UI.Client.IndustrialControl;assembly=MECF.Framework.UI.Client"
+    xmlns:lex="http://wpflocalizeextension.codeplex.com"
    xmlns:m2c4parts="clr-namespace:SicUI.Controls.M2C4Parts"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    xmlns:unitControls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.UnitControls;assembly=MECF.Framework.UI.Client"
-    xmlns:lex="http://wpflocalizeextension.codeplex.com"
    d:Background="#91b0cd"
    d:DesignHeight="800"
    d:DesignWidth="1920"
-    mc:Ignorable="d"
    lex:LocalizeDictionary.DesignCulture="en"
    lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
-    lex:ResxLocalizationProvider.DefaultDictionary="lang_common">
+    lex:ResxLocalizationProvider.DefaultDictionary="lang_common"
+    mc:Ignorable="d">
    <UserControl.Resources>
        <Color x:Key="EdgeColorWhite">DimGray</Color>
        <Color x:Key="CenterColorWhite">LightGray</Color>
@ -89,8 +89,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -173,8 +173,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -220,16 +220,16 @@
                                </Button>

                                <TextBlock
-                                    lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                    Width="100"
                                    HorizontalAlignment="Left"
                                    VerticalAlignment="Center"
+                                    lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                    FontFamily="Arial"
                                    FontSize="12"
                                    Foreground="{DynamicResource FG_Black}"
                                    TextAlignment="Left"
-                                    TextWrapping="Wrap" >
-                                    <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding PM1PurgeLoop, StringFormat=0.00 ,Mode=OneWay}" FontSize="12"/>
+                                    TextWrapping="Wrap">
+                                    <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding PM1PurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                                </TextBlock>
                            </StackPanel>
                        </Grid>
@ -242,8 +242,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -306,8 +306,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -498,8 +498,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -582,8 +582,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -629,16 +629,16 @@
                                </Button>

                                <TextBlock
-                                    lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                    Width="100"
                                    HorizontalAlignment="Left"
                                    VerticalAlignment="Center"
+                                    lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                    FontFamily="Arial"
                                    FontSize="12"
                                    Foreground="{DynamicResource FG_Black}"
                                    TextAlignment="Left"
                                    TextWrapping="Wrap">
-                                    <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding PM2PurgeLoop, StringFormat=0.00,Mode=OneWay}" FontSize="12"/>
+                                    <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding PM2PurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                                </TextBlock>
                            </StackPanel>

@ -652,8 +652,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -716,8 +716,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -911,8 +911,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -996,9 +996,9 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            Margin="0,7,0,0"
                            VerticalAlignment="Top"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1043,16 +1043,16 @@
                            </Button>

                            <TextBlock
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Width="100"
                                HorizontalAlignment="Left"
                                VerticalAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                FontFamily="Arial"
                                FontSize="12"
                                Foreground="{DynamicResource FG_Black}"
                                TextAlignment="Left"
                                TextWrapping="Wrap">
-                                <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding UnLoadPurgeLoop, StringFormat=0.00,Mode=OneWay}" FontSize="12"/>
+                                <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding UnLoadPurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                            </TextBlock>

                        </StackPanel>
@ -1151,8 +1151,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1210,8 +1210,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1242,10 +1242,10 @@
                        BorderThickness="1,0,1,1">
                        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                            <Label
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Margin="15,0"
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Background="{DynamicResource Table_BG_Title}"
                                BorderBrush="{DynamicResource Table_BD}"
                                Content="{lex:Loc ID_TXT_CoolingTime}"
@ -1272,8 +1272,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1288,8 +1288,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1370,8 +1370,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1455,9 +1455,9 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            Margin="0,7,0,0"
                            VerticalAlignment="Top"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1502,16 +1502,16 @@
                            </Button>

                            <TextBlock
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Width="100"
                                HorizontalAlignment="Left"
                                VerticalAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                FontFamily="Arial"
                                FontSize="12"
                                Foreground="{DynamicResource FG_Black}"
                                TextAlignment="Left"
                                TextWrapping="Wrap">
-                                <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding LLPurgeLoop, StringFormat=0.00,Mode=OneWay}" FontSize="12"/>
+                                <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding LLPurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                            </TextBlock>

                        </StackPanel>
@ -1610,8 +1610,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1668,8 +1668,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -1684,8 +1684,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -2041,16 +2041,18 @@
                        </industrialcontrol:PipeLine.RenderTransform>
                    </industrialcontrol:PipeLine>
                    <industrialcontrol:PipeLine
-                        Canvas.Left="112"
-                        Canvas.Top="175"
+                        Canvas.Left="73"
+                        Canvas.Top="189"
                        Width="125"
                        Height="8"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                        LeftDirection="Right"
                        MoveSpeed="{Binding V78MoveSpeed2}"
                        RightDirection="None"
-                        Visibility="Visible" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                        Visibility="Visible" />
                    <industrialcontrol:PipeLine
                        Canvas.Left="81"
                        Canvas.Top="-115"
@ -2150,30 +2152,34 @@
                    <industrialcontrol:PipeLine
                        Canvas.Left="631"
                        Canvas.Top="-73"
-                        Width="279"
+                        Width="234"
                        Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                        LeftDirection="None"
                        MoveSpeed="{Binding V77MoveSpeed2}"
                        RightDirection="None"
-                        Visibility="Visible" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        Visibility="Visible">
                        <industrialcontrol:PipeLine.RenderTransform>
                            <RotateTransform Angle="180" />
                        </industrialcontrol:PipeLine.RenderTransform>
                    </industrialcontrol:PipeLine>

                    <industrialcontrol:PipeLine
-                        Canvas.Left="352"
+                        Canvas.Left="397"
                        Canvas.Top="-81"
                        Width="178"
                        Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                        LeftDirection="Right"
                        MoveSpeed="{Binding V77MoveSpeed2}"
                        RightDirection="None"
-                        Visibility="{Binding TMN2BallastValveData.Feedback, Converter={StaticResource bool2VisibilityConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        Visibility="{Binding TMN2BallastValveData.Feedback, Converter={StaticResource bool2VisibilityConverter}}">
                        <industrialcontrol:PipeLine.RenderTransform>
                            <TransformGroup>
                                <RotateTransform Angle="90" />
@ -2759,6 +2765,8 @@

                </Canvas>

+
+
                <Label
                    Canvas.Left="329"
                    Canvas.Top="738"
@ -2825,8 +2833,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -2909,8 +2917,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -2955,16 +2963,16 @@
                            </Button>

                            <TextBlock
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Width="100"
                                HorizontalAlignment="Left"
                                VerticalAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                FontFamily="Arial"
                                FontSize="12"
                                Foreground="{DynamicResource FG_Black}"
                                TextAlignment="Left"
                                TextWrapping="Wrap">
-                                <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding TMPurgeLoop, StringFormat=0.00 ,Mode=OneWay}" FontSize="12"/>
+                                <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding TMPurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                            </TextBlock>
                        </StackPanel>

@ -3062,8 +3070,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3140,8 +3148,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3251,10 +3259,10 @@
                                </i:Interaction.Triggers>
                            </Button>
                            <Button
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Width="120"
                                Height="25"
                                Margin="50,0"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Content="{lex:Loc ID_BTN_ServoPressure_Content}"
                                IsEnabled="{Binding IsTMEnableManualOperation}">
                                <i:Interaction.Triggers>
@ -3319,8 +3327,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3404,8 +3412,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3530,8 +3538,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3562,9 +3570,9 @@
                        BorderThickness="1,0,1,1">
                        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                            <Label
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Background="{DynamicResource Table_BG_Title}"
                                BorderBrush="{DynamicResource Table_BD}"
                                Content="{lex:Loc ID_TXT_RemainTime}"
@ -3590,8 +3598,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3622,9 +3630,9 @@
                        BorderThickness="1,0,1,1">
                        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                            <Label
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Background="{DynamicResource Table_BG_Title}"
                                BorderBrush="{DynamicResource Table_BD}"
                                Content="{lex:Loc ID_TXT_RemainTime}"
@ -3650,8 +3658,8 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="1,0,1,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3682,9 +3690,9 @@
                        BorderThickness="1,0,1,1">
                        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                            <Label
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                Background="{DynamicResource Table_BG_Title}"
                                BorderBrush="{DynamicResource Table_BD}"
                                Content="{lex:Loc ID_TXT_RemainTime}"
@ -3911,9 +3919,9 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"
@ -3994,9 +4002,9 @@
                        BorderBrush="{DynamicResource Table_BD}"
                        BorderThickness="0,0,0,1">
                        <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            HorizontalAlignment="Center"
                            VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                            FontFamily="Arial"
                            FontSize="12"
                            Foreground="{DynamicResource FG_Black}"