diff --git a/BPASmartClient.Business/Plugin/DeviceMgr.cs b/BPASmartClient.Business/Plugin/DeviceMgr.cs
index 045e0770..7c05e85d 100644
--- a/BPASmartClient.Business/Plugin/DeviceMgr.cs
+++ b/BPASmartClient.Business/Plugin/DeviceMgr.cs
@@ -80,9 +80,10 @@ namespace BPASmartClient.Business
                     try
                     {
                         int PushType = i;//0:主料   1：辅料
-                        var jsondata = new { device.DeviceId, PushType };
-                        string header = $"[{InternetInfo.StockServer}/stock/GetItemInfo]_[{DateTime.Now.Ticks}]".AESEncrypt();
-                        string url = $"{InternetInfo.StockServer}/stock/GetItemInfo";
+                        int clientId = device.DeviceId;
+                        var jsondata = new { clientId, PushType };
+                        string header = $"[/stock/GetItemInfo]_[{DateTime.Now.Ticks}]".AESEncrypt();
+                        string url = $"{InternetInfo.StockServer}GetItemInfo";
                         result = APIHelper.GetInstance.HttpRequest(url, header, jsondata, RequestType.POST);
 
                         if (PushType == 1)
@@ -96,12 +97,17 @@ namespace BPASmartClient.Business
                         }
                         else if (PushType == 0)
                         {
+                            var apiData = JsonConvert.DeserializeObject<OrderMaterialDelivery>(result);
                             EventBus.EventBus.GetInstance().Publish(new MaterialDeliveryEvent()
                             {
                                 Id = device.DeviceId,
-                                orderMaterialDelivery = JsonConvert.DeserializeObject<OrderMaterialDelivery>(result)
+                                orderMaterialDelivery = apiData
                             });
                             MessageLog.GetInstance.Show("接收到物料信息");
+                            apiData?.BatchingInfo?.ForEach(x =>
+                            {
+                                MessageLog.GetInstance.Show($"物料ID:=[{x.BatchingId}]，{x.BatchingLoc}号位置：{x.BatchingCount}");
+                            });
                         }
                     }
                     catch (Exception ex)
@@ -114,6 +120,8 @@ namespace BPASmartClient.Business
             });
         }
 
+
+
         public void StopService()
         {
             this.devices.ForEach(device => device.Stop());
diff --git a/BPASmartClient.Business/TopicDefine.cs b/BPASmartClient.Business/TopicDefine.cs
index fe3db646..38fa60d0 100644
--- a/BPASmartClient.Business/TopicDefine.cs
+++ b/BPASmartClient.Business/TopicDefine.cs
@@ -29,8 +29,11 @@ namespace BPASmartClient.Business
             PushHeartbeatTopics = new Dictionary<DeviceClientType, string>();
             foreach (var device in devices)
             {
-                SubscribTopics.Add(TOPIC.GetInstance.GetOrderPushTopic(device.DeviceType, Plugin.GetInstance().GetPlugin<ConfigMgr>().ClientId));
-                SubscribTopics.Add(TOPIC.GetInstance.GetBusinessTopic(device.DeviceType, Plugin.GetInstance().GetPlugin<ConfigMgr>().ClientId));
+                //SubscribTopics.Add(TOPIC.GetInstance.GetOrderPushTopic(device.DeviceType, Plugin.GetInstance().GetPlugin<ConfigMgr>().ClientId));
+                //SubscribTopics.Add(TOPIC.GetInstance.GetBusinessTopic(device.DeviceType, Plugin.GetInstance().GetPlugin<ConfigMgr>().ClientId));
+
+                SubscribTopics.Add(TOPIC.GetInstance.GetOrderPushTopic(device.DeviceType, device.DeviceId));
+                SubscribTopics.Add(TOPIC.GetInstance.GetBusinessTopic(device.DeviceType, device.DeviceId));
 
                 PushHeartbeatTopics.Add(device.DeviceType, TOPIC.GetInstance.GetHeatbeatTopic(device.DeviceType));
             }
diff --git a/BPASmartClient.CustomResource/Themes/GenricStyle.xaml b/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
index 0e24600d..e9d1161a 100644
--- a/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
@@ -1,252 +1,459 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
-                    xmlns:Themes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic" 
-                    xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing"
-                    xmlns:hc="https://handyorg.github.io/handycontrol"
-                    xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
-                    >
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+    xmlns:Themes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
+    xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls">
     <!--<ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
         <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
     </ResourceDictionary.MergedDictionaries>-->
     <!--#region Color-->
-    <SolidColorBrush x:Key="foreground" Color="#FFA2C2E8"/>
+    <SolidColorBrush x:Key="foreground" Color="#FFA2C2E8" />
     <!--#endregion-->
 
-    <!--#region ScrollBar -->
-    <LinearGradientBrush x:Key="VerticalScrollBarBackground" EndPoint="1,0" StartPoint="0,0">
-        <GradientStop Color="#E1E1E1" Offset="0"/>
-        <GradientStop Color="#EDEDED" Offset="0.20"/>
-        <GradientStop Color="#EDEDED" Offset="0.80"/>
-        <GradientStop Color="#E3E3E3" Offset="1"/>
+    <!--#region ScrollBar-->
+    <LinearGradientBrush x:Key="VerticalScrollBarBackground" StartPoint="0,0" EndPoint="1,0">
+        <GradientStop Offset="0" Color="#E1E1E1" />
+        <GradientStop Offset="0.20" Color="#EDEDED" />
+        <GradientStop Offset="0.80" Color="#EDEDED" />
+        <GradientStop Offset="1" Color="#E3E3E3" />
     </LinearGradientBrush>
 
-    <SolidColorBrush x:Key="Menu.Static.Background" Color="#FFF0F0F0"/>
+    <SolidColorBrush x:Key="Menu.Static.Background" Color="#FFF0F0F0" />
     <Style TargetType="{x:Type Menu}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}"/>
-        <Setter Property="FontSize" Value="16"/>
-        <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}"/>
-        <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}"/>
-        <Setter Property="HorizontalAlignment" Value="Left"/>
-        <Setter Property="VerticalAlignment" Value="Top"/>
-        <Setter Property="Margin" Value="10,10,0,0"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}" />
+        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}" />
+        <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="Margin" Value="10,10,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Menu}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    <Border
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="true">
+                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
     <Style TargetType="{x:Type DatePickerTextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DatePickerTextBox}">
                     <Grid>
                         <Grid.Resources>
-                            <SolidColorBrush x:Key="WatermarkBrush" Color="#FFAAAAAA"/>
+                            <SolidColorBrush x:Key="WatermarkBrush" Color="#FFAAAAAA" />
                         </Grid.Resources>
+                        <Border
+                            x:Name="Border"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="1"
+                            Opacity="1">
+                            <Grid
+                                x:Name="WatermarkContent"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                <Border x:Name="ContentElement" BorderThickness="1" />
+                                <Border x:Name="watermark_decorator" BorderThickness="1">
+                                    <ContentControl
+                                        x:Name="PART_Watermark"
+                                        Padding="2"
+                                        Focusable="False"
+                                        IsHitTestVisible="False"
+                                        Opacity="0" />
+                                </Border>
+                                <ScrollViewer
+                                    x:Name="PART_ContentHost"
+                                    Margin="0"
+                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+                                <Border
+                                    x:Name="FocusVisual"
+                                    BorderBrush="#FF45D6FA"
+                                    CornerRadius="1"
+                                    IsHitTestVisible="False"
+                                    Opacity="0" />
+                            </Grid>
+                        </Border>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0"/>
-                                    <VisualTransition GeneratedDuration="0:0:0.1" To="MouseOver"/>
+                                    <VisualTransition GeneratedDuration="0" />
+                                    <VisualTransition GeneratedDuration="0:0:0.1" To="MouseOver" />
                                 </VisualStateGroup.Transitions>
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver"/>
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver" />
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="WatermarkStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0"/>
+                                    <VisualTransition GeneratedDuration="0" />
                                 </VisualStateGroup.Transitions>
-                                <VisualState x:Name="Unwatermarked"/>
+                                <VisualState x:Name="Unwatermarked" />
                                 <VisualState x:Name="Watermarked">
                                     <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Watermark" Storyboard.TargetProperty="Opacity" To="1"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ContentElement"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0" />
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="PART_Watermark"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="FocusStates">
                                 <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0"/>
+                                    <VisualTransition GeneratedDuration="0" />
                                 </VisualStateGroup.Transitions>
-                                <VisualState x:Name="Unfocused"/>
+                                <VisualState x:Name="Unfocused" />
                                 <VisualState x:Name="Focused">
                                     <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity" To="1"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisual"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Opacity="1" Padding="{TemplateBinding Padding}" HorizontalAlignment="Center" VerticalAlignment="Center">
-                            <Grid x:Name="WatermarkContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                                <Border x:Name="ContentElement" BorderThickness="1"/>
-                                <Border x:Name="watermark_decorator" BorderThickness="1">
-                                    <ContentControl x:Name="PART_Watermark" Focusable="False" IsHitTestVisible="False" Opacity="0" Padding="2"/>
-                                </Border>
-                                <ScrollViewer x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                                <Border x:Name="FocusVisual" BorderBrush="#FF45D6FA" CornerRadius="1" IsHitTestVisible="False" Opacity="0"/>
-                            </Grid>
-                        </Border>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
     <Style TargetType="{x:Type DatePicker}">
-        <Setter Property="Foreground" Value="#a2c2e8 "/>
-        <Setter Property="IsTodayHighlighted" Value="True"/>
-        <Setter Property="SelectedDateFormat" Value="Short"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Padding" Value="2"/>
-        <Setter Property="BorderBrush" Value="#08335f"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Foreground" Value="#a2c2e8 " />
+        <Setter Property="IsTodayHighlighted" Value="True" />
+        <Setter Property="SelectedDateFormat" Value="Short" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="2" />
+        <Setter Property="BorderBrush" Value="#08335f" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DatePicker}">
-                    <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="{TemplateBinding Padding}">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_DisabledVisual" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Grid x:Name="PART_Root" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <Border
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid
+                            x:Name="PART_Root"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                             <Grid.Resources>
-                                <SolidColorBrush x:Key="DisabledBrush" Color="#A5FFFFFF"/>
+                                <SolidColorBrush x:Key="DisabledBrush" Color="#A5FFFFFF" />
                                 <ControlTemplate x:Key="DropDownButtonTemplate" TargetType="{x:Type Button}">
                                     <Grid>
                                         <VisualStateManager.VisualStateGroups>
                                             <VisualStateGroup x:Name="CommonStates">
                                                 <VisualStateGroup.Transitions>
-                                                    <VisualTransition GeneratedDuration="0"/>
-                                                    <VisualTransition GeneratedDuration="0:0:0.1" To="MouseOver"/>
-                                                    <VisualTransition GeneratedDuration="0:0:0.1" To="Pressed"/>
+                                                    <VisualTransition GeneratedDuration="0" />
+                                                    <VisualTransition GeneratedDuration="0:0:0.1" To="MouseOver" />
+                                                    <VisualTransition GeneratedDuration="0:0:0.1" To="Pressed" />
                                                 </VisualStateGroup.Transitions>
-                                                <VisualState x:Name="Normal"/>
+                                                <VisualState x:Name="Normal" />
                                                 <VisualState x:Name="MouseOver">
                                                     <Storyboard>
-                                                        <ColorAnimation Duration="0" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="#FF448DCA"/>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF"/>
+                                                        <ColorAnimation
+                                                            Storyboard.TargetName="Background"
+                                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                            To="#FF448DCA"
+                                                            Duration="0" />
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="BackgroundGradient"
+                                                            Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#7FFFFFFF" />
                                                         </ColorAnimationUsingKeyFrames>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF"/>
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="BackgroundGradient"
+                                                            Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#CCFFFFFF" />
                                                         </ColorAnimationUsingKeyFrames>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF"/>
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="BackgroundGradient"
+                                                            Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#F2FFFFFF" />
                                                         </ColorAnimationUsingKeyFrames>
                                                     </Storyboard>
                                                 </VisualState>
                                                 <VisualState x:Name="Pressed">
                                                     <Storyboard>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#FF448DCA"/>
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="Background"
+                                                            Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#FF448DCA" />
                                                         </ColorAnimationUsingKeyFrames>
-                                                        <DoubleAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="Highlight" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                                            <SplineDoubleKeyFrame KeyTime="0" Value="1"/>
+                                                        <DoubleAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="Highlight"
+                                                            Storyboard.TargetProperty="(UIElement.Opacity)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineDoubleKeyFrame KeyTime="0" Value="1" />
                                                         </DoubleAnimationUsingKeyFrames>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF"/>
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="BackgroundGradient"
+                                                            Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#EAFFFFFF" />
                                                         </ColorAnimationUsingKeyFrames>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF"/>
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="BackgroundGradient"
+                                                            Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#C6FFFFFF" />
                                                         </ColorAnimationUsingKeyFrames>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF"/>
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="BackgroundGradient"
+                                                            Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[3].(GradientStop.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#6BFFFFFF" />
                                                         </ColorAnimationUsingKeyFrames>
-                                                        <ColorAnimationUsingKeyFrames BeginTime="0" Duration="00:00:00.001" Storyboard.TargetName="BackgroundGradient" Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                                            <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF"/>
+                                                        <ColorAnimationUsingKeyFrames
+                                                            BeginTime="0"
+                                                            Storyboard.TargetName="BackgroundGradient"
+                                                            Storyboard.TargetProperty="(Border.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)"
+                                                            Duration="00:00:00.001">
+                                                            <SplineColorKeyFrame KeyTime="0" Value="#F4FFFFFF" />
                                                         </ColorAnimationUsingKeyFrames>
                                                     </Storyboard>
                                                 </VisualState>
-                                                <VisualState x:Name="Disabled"/>
+                                                <VisualState x:Name="Disabled" />
                                             </VisualStateGroup>
                                         </VisualStateManager.VisualStateGroups>
-                                        <Grid Background="#11FFFFFF" FlowDirection="LeftToRight" HorizontalAlignment="Center" Height="18" Margin="0" VerticalAlignment="Center" Width="19">
+                                        <Grid
+                                            Width="19"
+                                            Height="18"
+                                            Margin="0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Background="#11FFFFFF"
+                                            FlowDirection="LeftToRight">
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="20*"/>
-                                                <ColumnDefinition Width="20*"/>
-                                                <ColumnDefinition Width="20*"/>
-                                                <ColumnDefinition Width="20*"/>
+                                                <ColumnDefinition Width="20*" />
+                                                <ColumnDefinition Width="20*" />
+                                                <ColumnDefinition Width="20*" />
+                                                <ColumnDefinition Width="20*" />
                                             </Grid.ColumnDefinitions>
                                             <Grid.RowDefinitions>
-                                                <RowDefinition Height="23*"/>
-                                                <RowDefinition Height="19*"/>
-                                                <RowDefinition Height="19*"/>
-                                                <RowDefinition Height="19*"/>
+                                                <RowDefinition Height="23*" />
+                                                <RowDefinition Height="19*" />
+                                                <RowDefinition Height="19*" />
+                                                <RowDefinition Height="19*" />
                                             </Grid.RowDefinitions>
-                                            <Border Visibility="Hidden" x:Name="Highlight" BorderThickness="1" BorderBrush="#FF45D6FA" CornerRadius="0,0,1,1" Grid.ColumnSpan="4" Margin="-1" Opacity="0" Grid.RowSpan="4" Grid.Row="0"/>
-                                            <Border Visibility="Hidden" x:Name="Background" Background="#FF1F3B53" BorderThickness="1" BorderBrush="#FFFFFFFF" CornerRadius=".5" Grid.ColumnSpan="4" Margin="0,-1,0,0" Opacity="1" Grid.RowSpan="3" Grid.Row="1"/>
-                                            <Border  Visibility="Hidden" x:Name="BackgroundGradient" BorderThickness="1" BorderBrush="#BF000000" CornerRadius=".5" Grid.ColumnSpan="4" Margin="0,-1,0,0" Opacity="1" Grid.RowSpan="3" Grid.Row="1">
+                                            <Border
+                                                x:Name="Highlight"
+                                                Grid.Row="0"
+                                                Grid.RowSpan="4"
+                                                Grid.ColumnSpan="4"
+                                                Margin="-1"
+                                                BorderBrush="#FF45D6FA"
+                                                BorderThickness="1"
+                                                CornerRadius="0,0,1,1"
+                                                Opacity="0"
+                                                Visibility="Hidden" />
+                                            <Border
+                                                x:Name="Background"
+                                                Grid.Row="1"
+                                                Grid.RowSpan="3"
+                                                Grid.ColumnSpan="4"
+                                                Margin="0,-1,0,0"
+                                                Background="#FF1F3B53"
+                                                BorderBrush="#FFFFFFFF"
+                                                BorderThickness="1"
+                                                CornerRadius=".5"
+                                                Opacity="1"
+                                                Visibility="Hidden" />
+                                            <Border
+                                                x:Name="BackgroundGradient"
+                                                Grid.Row="1"
+                                                Grid.RowSpan="3"
+                                                Grid.ColumnSpan="4"
+                                                Margin="0,-1,0,0"
+                                                BorderBrush="#BF000000"
+                                                BorderThickness="1"
+                                                CornerRadius=".5"
+                                                Opacity="1"
+                                                Visibility="Hidden">
                                                 <Border.Background>
-                                                    <LinearGradientBrush EndPoint=".7,1" StartPoint=".7,0">
-                                                        <GradientStop Color="#FFFFFFFF" Offset="0"/>
-                                                        <GradientStop Color="#F9FFFFFF" Offset="0.375"/>
-                                                        <GradientStop Color="#E5FFFFFF" Offset="0.625"/>
-                                                        <GradientStop Color="#C6FFFFFF" Offset="1"/>
+                                                    <LinearGradientBrush StartPoint=".7,0" EndPoint=".7,1">
+                                                        <GradientStop Offset="0" Color="#FFFFFFFF" />
+                                                        <GradientStop Offset="0.375" Color="#F9FFFFFF" />
+                                                        <GradientStop Offset="0.625" Color="#E5FFFFFF" />
+                                                        <GradientStop Offset="1" Color="#C6FFFFFF" />
                                                     </LinearGradientBrush>
                                                 </Border.Background>
                                             </Border>
-                                            <Rectangle Visibility="Hidden" Grid.ColumnSpan="4" Grid.RowSpan="1" StrokeThickness="1">
+                                            <Rectangle
+                                                Grid.RowSpan="1"
+                                                Grid.ColumnSpan="4"
+                                                StrokeThickness="1"
+                                                Visibility="Hidden">
                                                 <Rectangle.Fill>
-                                                    <LinearGradientBrush EndPoint="0.3,-1.1" StartPoint="0.46,1.6">
-                                                        <GradientStop Color="#FF4084BD"/>
-                                                        <GradientStop Color="#FFAFCFEA" Offset="1"/>
+                                                    <LinearGradientBrush StartPoint="0.46,1.6" EndPoint="0.3,-1.1">
+                                                        <GradientStop Color="#FF4084BD" />
+                                                        <GradientStop Offset="1" Color="#FFAFCFEA" />
                                                     </LinearGradientBrush>
                                                 </Rectangle.Fill>
                                                 <Rectangle.Stroke>
-                                                    <LinearGradientBrush EndPoint="0.48,-1" StartPoint="0.48,1.25">
-                                                        <GradientStop Color="#FF494949"/>
-                                                        <GradientStop Color="#FF9F9F9F" Offset="1"/>
+                                                    <LinearGradientBrush StartPoint="0.48,1.25" EndPoint="0.48,-1">
+                                                        <GradientStop Color="#FF494949" />
+                                                        <GradientStop Offset="1" Color="#FF9F9F9F" />
                                                     </LinearGradientBrush>
                                                 </Rectangle.Stroke>
                                             </Rectangle>
-                                            <Path Visibility="Hidden" Grid.ColumnSpan="4" Grid.Column="0" Data="M11.426758,8.4305077 L11.749023,8.4305077 L11.749023,16.331387 L10.674805,16.331387 L10.674805,10.299648 L9.0742188,11.298672 L9.0742188,10.294277 C9.4788408,10.090176 9.9094238,9.8090878 10.365967,9.4510155 C10.82251,9.0929432 11.176106,8.7527733 11.426758,8.4305077 z M14.65086,8.4305077 L18.566387,8.4305077 L18.566387,9.3435936 L15.671368,9.3435936 L15.671368,11.255703 C15.936341,11.058764 16.27293,10.960293 16.681133,10.960293 C17.411602,10.960293 17.969301,11.178717 18.354229,11.615566 C18.739157,12.052416 18.931622,12.673672 18.931622,13.479336 C18.931622,15.452317 18.052553,16.438808 16.294415,16.438808 C15.560365,16.438808 14.951641,16.234707 14.468243,15.826504 L14.881817,14.929531 C15.368796,15.326992 15.837872,15.525723 16.289043,15.525723 C17.298809,15.525723 17.803692,14.895514 17.803692,13.635098 C17.803692,12.460618 17.305971,11.873379 16.310528,11.873379 C15.83071,11.873379 15.399232,12.079271 15.016094,12.491055 L14.65086,12.238613 z" Fill="#FF2F2F2F" HorizontalAlignment="Center" Margin="4,3,4,3" RenderTransformOrigin="0.5,0.5" Grid.RowSpan="3" Grid.Row="1" Stretch="Fill" VerticalAlignment="Center"/>
-                                            <Ellipse Visibility="Hidden" Grid.ColumnSpan="4" Fill="#FFFFFFFF" HorizontalAlignment="Center" Height="3" StrokeThickness="0" VerticalAlignment="Center" Width="3"/>
-                                            <Border Visibility="Hidden" x:Name="DisabledVisual" BorderThickness="1" BorderBrush="#B2FFFFFF" CornerRadius="0,0,.5,.5" Grid.ColumnSpan="4" Opacity="0" Grid.RowSpan="4" Grid.Row="0"/>
-                                            <Image Source="/BPASmartClient.CustomResource;component/Image/日历.png" Grid.Column="0" Grid.ColumnSpan="10" Grid.RowSpan="10"></Image>
+                                            <Path
+                                                Grid.Row="1"
+                                                Grid.RowSpan="3"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="4"
+                                                Margin="4,3,4,3"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Data="M11.426758,8.4305077 L11.749023,8.4305077 L11.749023,16.331387 L10.674805,16.331387 L10.674805,10.299648 L9.0742188,11.298672 L9.0742188,10.294277 C9.4788408,10.090176 9.9094238,9.8090878 10.365967,9.4510155 C10.82251,9.0929432 11.176106,8.7527733 11.426758,8.4305077 z M14.65086,8.4305077 L18.566387,8.4305077 L18.566387,9.3435936 L15.671368,9.3435936 L15.671368,11.255703 C15.936341,11.058764 16.27293,10.960293 16.681133,10.960293 C17.411602,10.960293 17.969301,11.178717 18.354229,11.615566 C18.739157,12.052416 18.931622,12.673672 18.931622,13.479336 C18.931622,15.452317 18.052553,16.438808 16.294415,16.438808 C15.560365,16.438808 14.951641,16.234707 14.468243,15.826504 L14.881817,14.929531 C15.368796,15.326992 15.837872,15.525723 16.289043,15.525723 C17.298809,15.525723 17.803692,14.895514 17.803692,13.635098 C17.803692,12.460618 17.305971,11.873379 16.310528,11.873379 C15.83071,11.873379 15.399232,12.079271 15.016094,12.491055 L14.65086,12.238613 z"
+                                                Fill="#FF2F2F2F"
+                                                RenderTransformOrigin="0.5,0.5"
+                                                Stretch="Fill"
+                                                Visibility="Hidden" />
+                                            <Ellipse
+                                                Grid.ColumnSpan="4"
+                                                Width="3"
+                                                Height="3"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Fill="#FFFFFFFF"
+                                                StrokeThickness="0"
+                                                Visibility="Hidden" />
+                                            <Border
+                                                x:Name="DisabledVisual"
+                                                Grid.Row="0"
+                                                Grid.RowSpan="4"
+                                                Grid.ColumnSpan="4"
+                                                BorderBrush="#B2FFFFFF"
+                                                BorderThickness="1"
+                                                CornerRadius="0,0,.5,.5"
+                                                Opacity="0"
+                                                Visibility="Hidden" />
+                                            <Image
+                                                Grid.RowSpan="10"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="10"
+                                                Source="/BPASmartClient.CustomResource;component/Image/日历.png" />
 
                                         </Grid>
                                     </Grid>
                                 </ControlTemplate>
                             </Grid.Resources>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <Button x:Name="PART_Button" Grid.Column="1" Focusable="False" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Left" Margin="3,0,3,0" Grid.Row="0" Template="{StaticResource DropDownButtonTemplate}" VerticalAlignment="Top" Width="20"/>
-                            <DatePickerTextBox x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="Stretch" Grid.Row="0" VerticalContentAlignment="Stretch"/>
-                            <Grid x:Name="PART_DisabledVisual"  Grid.ColumnSpan="2" Grid.Column="0" IsHitTestVisible="False" Opacity="0" Grid.Row="0">
+                            <Button
+                                x:Name="PART_Button"
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Width="20"
+                                Margin="3,0,3,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Top"
+                                Focusable="False"
+                                Foreground="{TemplateBinding Foreground}"
+                                Template="{StaticResource DropDownButtonTemplate}" />
+                            <DatePickerTextBox
+                                x:Name="PART_TextBox"
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                HorizontalContentAlignment="Stretch"
+                                VerticalContentAlignment="Stretch"
+                                Focusable="{TemplateBinding Focusable}" />
+                            <Grid
+                                x:Name="PART_DisabledVisual"
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                Grid.ColumnSpan="2"
+                                IsHitTestVisible="False"
+                                Opacity="0">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
-                                <Rectangle Grid.Column="0" RadiusX="1" RadiusY="1" Grid.Row="0"/>
-                                <Rectangle Grid.Column="1" Fill="#A5FFFFFF" Height="18" Margin="3,0,3,0" RadiusX="1" RadiusY="1" Grid.Row="0" Width="19"/>
-
-                                <Popup x:Name="PART_Popup" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_TextBox}" StaysOpen="False"/>
+                                <Rectangle
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    RadiusX="1"
+                                    RadiusY="1" />
+                                <Rectangle
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Width="19"
+                                    Height="18"
+                                    Margin="3,0,3,0"
+                                    Fill="#A5FFFFFF"
+                                    RadiusX="1"
+                                    RadiusY="1" />
+
+                                <Popup
+                                    x:Name="PART_Popup"
+                                    AllowsTransparency="True"
+                                    Placement="Bottom"
+                                    PlacementTarget="{Binding ElementName=PART_TextBox}"
+                                    StaysOpen="False" />
                             </Grid>
                         </Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="PART_DisabledVisual"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
                     </Border>
                     <ControlTemplate.Triggers>
                         <DataTrigger Binding="{Binding Source={x:Static SystemParameters.HighContrast}}" Value="false">
-                            <Setter Property="Foreground" TargetName="PART_TextBox" Value="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <Setter TargetName="PART_TextBox" Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource TemplatedParent}}" />
                         </DataTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -254,97 +461,119 @@
         </Setter>
     </Style>
     <Style x:Key="arrowPath" TargetType="Path">
-        <Setter Property="Data" Value="M5.5555,8.4319998 L0.5,0.5 L10.611,0.5 z"></Setter>
-        <Setter Property="Fill" Value="Gray"></Setter>
-        <Setter Property="Stretch" Value="Fill"></Setter>
-        <Setter Property="StrokeThickness" Value="1"></Setter>
-        <Setter Property="Stroke" Value="Black"></Setter>
-        <Setter Property="Width" Value="8"></Setter>
-        <Setter Property="Height" Value="5"></Setter>
-        <Setter Property="SnapsToDevicePixels" Value="True"></Setter>
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Data" Value="M5.5555,8.4319998 L0.5,0.5 L10.611,0.5 z" />
+        <Setter Property="Fill" Value="Gray" />
+        <Setter Property="Stretch" Value="Fill" />
+        <Setter Property="StrokeThickness" Value="1" />
+        <Setter Property="Stroke" Value="Black" />
+        <Setter Property="Width" Value="8" />
+        <Setter Property="Height" Value="5" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Cursor" Value="Hand" />
     </Style>
 
     <Style x:Key="UpScrollBarButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Image Source="Image/Scroll_↑.png" Width="8" Height="5"  ></Image>
+                    <Image
+                        Width="8"
+                        Height="5"
+                        Source="Image/Scroll_↑.png" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <Style x:Key="DownScrollBarButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Image Source="Image/Scroll_↓.png" Width="8" Height="5"></Image>
+                    <Image
+                        Width="8"
+                        Height="5"
+                        Source="Image/Scroll_↓.png" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <Style x:Key="LeftScrollBarButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Image Source="Image/Scroll_←.png" Width="5" Height="8"></Image>
+                    <Image
+                        Width="5"
+                        Height="8"
+                        Source="Image/Scroll_←.png" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <Style x:Key="RightScrollBarButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Cursor" Value="Hand"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Image Source="Image/Scroll_→.png" Width="5" Height="8"></Image>
+                    <Image
+                        Width="5"
+                        Height="8"
+                        Source="Image/Scroll_→.png" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <Style x:Key="VerticalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    <Rectangle
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Fill="{TemplateBinding Background}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border  x:Name="bd1"  Background="#00c2f4"  SnapsToDevicePixels="true" Opacity="1" Cursor="Hand" CornerRadius="3" Margin="2,2,2,2"></Border>
+                    <Border
+                        x:Name="bd1"
+                        Margin="2,2,2,2"
+                        Background="#00c2f4"
+                        CornerRadius="3"
+                        Cursor="Hand"
+                        Opacity="1"
+                        SnapsToDevicePixels="true" />
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="bd1" Property="Margin" Value="-1,-1,-1,-1"></Setter>
+                            <Setter TargetName="bd1" Property="Margin" Value="-1,-1,-1,-1" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -352,22 +581,25 @@
         </Setter>
     </Style>
 
-    <LinearGradientBrush x:Key="HorizontalScrollBarBackground" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#E1E1E1" Offset="0"/>
-        <GradientStop Color="#EDEDED" Offset="0.20"/>
-        <GradientStop Color="#EDEDED" Offset="0.80"/>
-        <GradientStop Color="#E3E3E3" Offset="1"/>
+    <LinearGradientBrush x:Key="HorizontalScrollBarBackground" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Offset="0" Color="#E1E1E1" />
+        <GradientStop Offset="0.20" Color="#EDEDED" />
+        <GradientStop Offset="0.80" Color="#EDEDED" />
+        <GradientStop Offset="1" Color="#E3E3E3" />
     </LinearGradientBrush>
 
     <Style x:Key="HorizontalScrollBarPageButton" TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="IsTabStop" Value="false"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
+                    <Rectangle
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Fill="{TemplateBinding Background}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -376,38 +608,56 @@
     <Style TargetType="{x:Type ScrollBar}">
         <Setter Property="Background">
             <Setter.Value>
-                <ImageBrush Opacity="0.2"  ImageSource="/BPASmartClient.CustomResource;component/Image/表格标题背景2.png"></ImageBrush>
+                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/表格标题背景2.png" Opacity="0.2" />
             </Setter.Value>
         </Setter>
-        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="false"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="Opacity" Value="1"/>
-        <Setter Property="MinWidth" Value="3"/>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Opacity" Value="1" />
+        <Setter Property="MinWidth" Value="3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollBar}">
-                    <Border CornerRadius="2" Background="{TemplateBinding Background}" Opacity="{TemplateBinding Opacity}" Width="10" Margin="0,0,0,0">
-                        <Grid x:Name="Bg" SnapsToDevicePixels="true" >
+                    <Border
+                        Width="10"
+                        Margin="0,0,0,0"
+                        Background="{TemplateBinding Background}"
+                        CornerRadius="2"
+                        Opacity="{TemplateBinding Opacity}">
+                        <Grid x:Name="Bg" SnapsToDevicePixels="true">
                             <Grid.RowDefinitions>
-                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}"/>
+                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
+                                <RowDefinition Height="*" />
+                                <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
                             </Grid.RowDefinitions>
-                            <RepeatButton Command="{x:Static ScrollBar.LineUpCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Style="{StaticResource UpScrollBarButton}" Themes:ScrollChrome.ScrollGlyph="UpArrow"/>
-                            <Track x:Name="PART_Track" IsDirectionReversed="true"  IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="1">
+                            <RepeatButton
+                                Themes:ScrollChrome.ScrollGlyph="UpArrow"
+                                Command="{x:Static ScrollBar.LineUpCommand}"
+                                IsEnabled="{TemplateBinding IsMouseOver}"
+                                Style="{StaticResource UpScrollBarButton}" />
+                            <Track
+                                x:Name="PART_Track"
+                                Grid.Row="1"
+                                IsDirectionReversed="true"
+                                IsEnabled="{TemplateBinding IsMouseOver}">
                                 <Track.DecreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
                                 </Track.DecreaseRepeatButton>
 
                                 <Track.IncreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}"/>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
                                 </Track.IncreaseRepeatButton>
                                 <Track.Thumb>
-                                    <Thumb Style="{StaticResource ScrollBarThumb}" Themes:ScrollChrome.ScrollGlyph="VerticalGripper"/>
+                                    <Thumb Themes:ScrollChrome.ScrollGlyph="VerticalGripper" Style="{StaticResource ScrollBarThumb}" />
                                 </Track.Thumb>
                             </Track>
-                            <RepeatButton Command="{x:Static ScrollBar.LineDownCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Grid.Row="2" Style="{StaticResource DownScrollBarButton}" Themes:ScrollChrome.ScrollGlyph="DownArrow"/>
+                            <RepeatButton
+                                Grid.Row="2"
+                                Themes:ScrollChrome.ScrollGlyph="DownArrow"
+                                Command="{x:Static ScrollBar.LineDownCommand}"
+                                IsEnabled="{TemplateBinding IsMouseOver}"
+                                Style="{StaticResource DownScrollBarButton}" />
                         </Grid>
                     </Border>
 
@@ -420,26 +670,46 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ScrollBar}">
-                            <Border CornerRadius="2" Background="{TemplateBinding Background}" Opacity="{TemplateBinding Opacity}" Height="10" Margin="0,0,0,0">
-                                <Grid x:Name="Bg" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" >
+                            <Border
+                                Height="10"
+                                Margin="0,0,0,0"
+                                Background="{TemplateBinding Background}"
+                                CornerRadius="2"
+                                Opacity="{TemplateBinding Opacity}">
+                                <Grid
+                                    x:Name="Bg"
+                                    Background="{TemplateBinding Background}"
+                                    SnapsToDevicePixels="true">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}"/>
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
                                     </Grid.ColumnDefinitions>
-                                    <RepeatButton Command="{x:Static ScrollBar.LineLeftCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Style="{StaticResource LeftScrollBarButton}" Themes:ScrollChrome.ScrollGlyph="LeftArrow"/>
-                                    <Track x:Name="PART_Track" Grid.Column="1" IsEnabled="{TemplateBinding IsMouseOver}">
+                                    <RepeatButton
+                                        Themes:ScrollChrome.ScrollGlyph="LeftArrow"
+                                        Command="{x:Static ScrollBar.LineLeftCommand}"
+                                        IsEnabled="{TemplateBinding IsMouseOver}"
+                                        Style="{StaticResource LeftScrollBarButton}" />
+                                    <Track
+                                        x:Name="PART_Track"
+                                        Grid.Column="1"
+                                        IsEnabled="{TemplateBinding IsMouseOver}">
                                         <Track.DecreaseRepeatButton>
-                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource HorizontalScrollBarPageButton}"/>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource HorizontalScrollBarPageButton}" />
                                         </Track.DecreaseRepeatButton>
                                         <Track.IncreaseRepeatButton>
-                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource HorizontalScrollBarPageButton}"/>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource HorizontalScrollBarPageButton}" />
                                         </Track.IncreaseRepeatButton>
                                         <Track.Thumb>
-                                            <Thumb Style="{StaticResource ScrollBarThumb}" Themes:ScrollChrome.ScrollGlyph="HorizontalGripper"/>
+                                            <Thumb Themes:ScrollChrome.ScrollGlyph="HorizontalGripper" Style="{StaticResource ScrollBarThumb}" />
                                         </Track.Thumb>
                                     </Track>
-                                    <RepeatButton Grid.Column="2" Command="{x:Static ScrollBar.LineRightCommand}" IsEnabled="{TemplateBinding IsMouseOver}" Style="{StaticResource RightScrollBarButton}" Themes:ScrollChrome.ScrollGlyph="RightArrow"/>
+                                    <RepeatButton
+                                        Grid.Column="2"
+                                        Themes:ScrollChrome.ScrollGlyph="RightArrow"
+                                        Command="{x:Static ScrollBar.LineRightCommand}"
+                                        IsEnabled="{TemplateBinding IsMouseOver}"
+                                        Style="{StaticResource RightScrollBarButton}" />
                                 </Grid>
                             </Border>
 
@@ -455,67 +725,97 @@
     <!--#region DataGrid-->
 
     <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Width" Value="1"/>
-        <Setter Property="Background" Value="#175c86"/>
-        <Setter Property="Cursor" Value="SizeWE"/>
-        <Setter Property="Margin" Value="0,0,0,0"/>
+        <Setter Property="Width" Value="1" />
+        <Setter Property="Background" Value="#175c86" />
+        <Setter Property="Cursor" Value="SizeWE" />
+        <Setter Property="Margin" Value="0,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border Width="{TemplateBinding Width}" Margin="{TemplateBinding Margin}"  Background="{TemplateBinding Background}" Opacity="0.4"/>
+                    <Border
+                        Width="{TemplateBinding Width}"
+                        Margin="{TemplateBinding Margin}"
+                        Background="{TemplateBinding Background}"
+                        Opacity="0.4" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
     <Style TargetType="{x:Type DataGridColumnHeader}">
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Background" >
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Background">
             <Setter.Value>
-                <ImageBrush Opacity="0.2"  ImageSource="/BPASmartClient.CustomResource;component/Image/表格标题背景2.png"></ImageBrush>
+                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/表格标题背景2.png" Opacity="0.2" />
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderThickness" Value="0"></Setter>
-        <Setter Property="Foreground" Value="#00c2f4"></Setter>
-        <Setter Property="FontSize" Value="14"></Setter>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Foreground" Value="#00c2f4" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
                     <Grid>
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"  Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <Border
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
-                        <GridSplitter Background="#FF0BAE3F" HorizontalAlignment="Right" BorderBrush="#FFBD2A2A"  ></GridSplitter>
-                        <Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right"  Style="{StaticResource ColumnHeaderGripperStyle}" Background="#FF175C86"/>
+                        <GridSplitter
+                            HorizontalAlignment="Right"
+                            Background="#FF0BAE3F"
+                            BorderBrush="#FFBD2A2A" />
+                        <Thumb
+                            x:Name="PART_RightHeaderGripper"
+                            HorizontalAlignment="Right"
+                            Background="#FF175C86"
+                            Style="{StaticResource ColumnHeaderGripperStyle}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="DataGridColumnHeader"  TargetType="{x:Type DataGridColumnHeader}">
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Height" Value="30"/>
-        <Setter Property="Background" >
+    <Style x:Key="DataGridColumnHeader" TargetType="{x:Type DataGridColumnHeader}">
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Height" Value="30" />
+        <Setter Property="Background">
             <Setter.Value>
-                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/表头背景.png"></ImageBrush>
+                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/表头背景.png" />
             </Setter.Value>
         </Setter>
-        <Setter Property="BorderThickness" Value="0"></Setter>
-        <Setter Property="Foreground" Value="White"></Setter>
-        <Setter Property="FontSize" Value="10"></Setter>
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="FontSize" Value="10" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
                     <Grid>
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"  Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <Border
+                            Padding="{TemplateBinding Padding}"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
 
-                        <Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right"  Style="{StaticResource ColumnHeaderGripperStyle}"/>
+                        <Thumb
+                            x:Name="PART_RightHeaderGripper"
+                            HorizontalAlignment="Right"
+                            Style="{StaticResource ColumnHeaderGripperStyle}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -523,24 +823,50 @@
     </Style>
 
     <Style TargetType="{x:Type DataGridRow}">
-        <Setter Property="Background"  Value="Transparent"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="SnapsToDevicePixels" Value="true"/>
-        <Setter Property="Foreground" Value="#abf4ff"></Setter>
-        <Setter Property="FontSize" Value="12"></Setter>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="SnapsToDevicePixels" Value="true" />
+        <Setter Property="Foreground" Value="#abf4ff" />
+        <Setter Property="FontSize" Value="12" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridRow}">
-                    <Border x:Name="DGR_Border" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                    <Border
+                        x:Name="DGR_Border"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="True">
+                        <SelectiveScrollingGrid x:Name="selectiveScrollingGrid">
+                            <SelectiveScrollingGrid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </SelectiveScrollingGrid.ColumnDefinitions>
+                            <SelectiveScrollingGrid.RowDefinitions>
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
+                            </SelectiveScrollingGrid.RowDefinitions>
+                            <DataGridCellsPresenter
+                                Grid.Column="1"
+                                ItemsPanel="{TemplateBinding ItemsPanel}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <DataGridDetailsPresenter
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                                Visibility="{TemplateBinding DetailsVisibility}" />
+                            <DataGridRowHeader
+                                Grid.RowSpan="2"
+                                SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical"
+                                Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
+                        </SelectiveScrollingGrid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="Normal" />
                                 <VisualState x:Name="MouseOver">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="DGR_Border">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background)">
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
-                                                    <SolidColorBrush Color="#230077BC"/>
+                                                    <SolidColorBrush Color="#230077BC" />
                                                 </DiscreteObjectKeyFrame.Value>
                                             </DiscreteObjectKeyFrame>
                                         </ObjectAnimationUsingKeyFrames>
@@ -548,10 +874,10 @@
                                 </VisualState>
                                 <VisualState x:Name="Normal_Selected">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background)" Storyboard.TargetName="DGR_Border">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background)">
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
-                                                    <SolidColorBrush Color="#3D0077BC"/>
+                                                    <SolidColorBrush Color="#3D0077BC" />
                                                 </DiscreteObjectKeyFrame.Value>
                                             </DiscreteObjectKeyFrame>
                                         </ObjectAnimationUsingKeyFrames>
@@ -559,24 +885,11 @@
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="ValidationStates">
-                                <VisualState x:Name="Valid"/>
-                                <VisualState x:Name="InvalidFocused"/>
-                                <VisualState x:Name="InvalidUnfocused"/>
+                                <VisualState x:Name="Valid" />
+                                <VisualState x:Name="InvalidFocused" />
+                                <VisualState x:Name="InvalidUnfocused" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <SelectiveScrollingGrid x:Name="selectiveScrollingGrid">
-                            <SelectiveScrollingGrid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </SelectiveScrollingGrid.ColumnDefinitions>
-                            <SelectiveScrollingGrid.RowDefinitions>
-                                <RowDefinition Height="*"/>
-                                <RowDefinition Height="Auto"/>
-                            </SelectiveScrollingGrid.RowDefinitions>
-                            <DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                            <DataGridDetailsPresenter Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Visibility="{TemplateBinding DetailsVisibility}"/>
-                            <DataGridRowHeader Grid.RowSpan="2" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
-                        </SelectiveScrollingGrid>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -584,14 +897,18 @@
     </Style>
 
     <Style TargetType="{x:Type DataGridCell}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridCell}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                    <Border
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="True">
+                        <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
@@ -599,27 +916,27 @@
         <Style.Triggers>
             <Trigger Property="IsSelected" Value="True">
                 <!--<Setter Property="Background" Value="#FF2281EC"/>-->
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
                 <!--<Setter Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>-->
             </Trigger>
             <!--<Trigger Property="IsKeyboardFocusWithin" Value="True">
                 <Setter Property="BorderBrush" Value="{DynamicResource {x:Static DataGrid.FocusBorderBrushKey}}"/>
             </Trigger>-->
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
             </Trigger>
         </Style.Triggers>
     </Style>
 
     <Style TargetType="{x:Type DataGrid}">
-        <Setter Property="AutoGenerateColumns" Value="False"/>
-        <Setter Property="Background" Value="Transparent"></Setter>
-        <Setter Property="CanUserAddRows" Value="False"/>
-        <Setter Property="CanUserDeleteRows" Value="False"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="HeadersVisibility" Value="Column"/>
-        <Setter Property="GridLinesVisibility" Value="None"/>
-        <Setter Property="SelectionMode" Value="Single"/>
+        <Setter Property="AutoGenerateColumns" Value="False" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="CanUserAddRows" Value="False" />
+        <Setter Property="CanUserDeleteRows" Value="False" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HeadersVisibility" Value="Column" />
+        <Setter Property="GridLinesVisibility" Value="None" />
+        <Setter Property="SelectionMode" Value="Single" />
         <!--<Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="DataGrid">
@@ -687,8 +1004,8 @@
 
     <!--#endregion-->
 
-    <!--#region ListBox -->
-    <SolidColorBrush x:Key="ListBorder" Color="#828790"/>
+    <!--#region ListBox-->
+    <SolidColorBrush x:Key="ListBorder" Color="#828790" />
 
     <Style TargetType="{x:Type ListBox}">
         <!--<Setter Property="Background"  >
@@ -696,38 +1013,47 @@
                 <ImageBrush ImageSource="Images/Pop_bg.png" Stretch="Fill" />
             </Setter.Value>
         </Setter>-->
-        <Setter Property="Background"  Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="{StaticResource ListBorder}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Padding" Value="10"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{StaticResource ListBorder}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="10" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
 
     </Style>
     <!--#endregion-->
 
-    <!--#region ListBoxItem -->
+    <!--#region ListBoxItem-->
     <Style x:Key="baseListBoxItemStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="Padding" Value="2,0,0,0"/>
-        <Setter Property="Foreground" Value="#FF90C390"></Setter>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="Foreground" Value="#FF90C390" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                        <ContentPresenter  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <Border
+                        x:Name="Bd"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="true">
+                        <ContentPresenter
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Background" TargetName="Bd" Value="#230077BC"/>
-                            <Setter Property="Opacity" TargetName="Bd" Value="0.8"/>
-                            <Setter Property="Foreground" Value="Snow"/>
+                            <Setter TargetName="Bd" Property="Background" Value="#230077BC" />
+                            <Setter TargetName="Bd" Property="Opacity" Value="0.8" />
+                            <Setter Property="Foreground" Value="Snow" />
                         </Trigger>
                         <!--<MultiTrigger>
                             <MultiTrigger.Conditions>
@@ -755,24 +1081,33 @@
     </Style>
 
     <Style x:Key="baseListBoxItemStyle1" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="Padding" Value="2,0,0,0"/>
-        <Setter Property="Foreground" Value="#FF90C390"></Setter>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="Foreground" Value="#FF90C390" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                        <ContentPresenter  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <Border
+                        x:Name="Bd"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="true">
+                        <ContentPresenter
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsSelected" Value="True"/>
-                                <Condition Property="Selector.IsSelectionActive" Value="True"/>
+                                <Condition Property="IsSelected" Value="True" />
+                                <Condition Property="Selector.IsSelectionActive" Value="True" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Opacity" TargetName="Bd" Value="0.6"/>
+                            <Setter TargetName="Bd" Property="Opacity" Value="0.6" />
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -780,43 +1115,44 @@
         </Setter>
     </Style>
 
-    <Style BasedOn="{StaticResource baseListBoxItemStyle}" TargetType="{x:Type ListBoxItem}">
-
-    </Style>
+    <Style BasedOn="{StaticResource baseListBoxItemStyle}" TargetType="{x:Type ListBoxItem}" />
 
-    <Style x:Key="ListBoxItemStyle1" BasedOn="{StaticResource baseListBoxItemStyle}" TargetType="{x:Type ListBoxItem}" >
+    <Style
+        x:Key="ListBoxItemStyle1"
+        BasedOn="{StaticResource baseListBoxItemStyle}"
+        TargetType="{x:Type ListBoxItem}">
         <Style.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding DataContext.IsNotDeal,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}" Value="false"/>
-                    <Condition Binding="{Binding IsDeal}" Value="0"/>
+                    <Condition Binding="{Binding DataContext.IsNotDeal, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}}" Value="false" />
+                    <Condition Binding="{Binding IsDeal}" Value="0" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Visibility"   Value="Collapsed"/>
+                <Setter Property="Visibility" Value="Collapsed" />
             </MultiDataTrigger>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding DataContext.IsRecive,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}" Value="false"/>
-                    <Condition Binding="{Binding IsDeal}" Value="1"/>
+                    <Condition Binding="{Binding DataContext.IsRecive, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}}" Value="false" />
+                    <Condition Binding="{Binding IsDeal}" Value="1" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Visibility"   Value="Collapsed"/>
+                <Setter Property="Visibility" Value="Collapsed" />
             </MultiDataTrigger>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding DataContext.IsRefuse,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ListBox}}" Value="false"/>
-                    <Condition Binding="{Binding IsDeal}" Value="2"/>
+                    <Condition Binding="{Binding DataContext.IsRefuse, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBox}}" Value="false" />
+                    <Condition Binding="{Binding IsDeal}" Value="2" />
                 </MultiDataTrigger.Conditions>
-                <Setter Property="Visibility"   Value="Collapsed"/>
+                <Setter Property="Visibility" Value="Collapsed" />
             </MultiDataTrigger>
         </Style.Triggers>
     </Style>
     <!--#endregion-->
 
-    <!--#region TabControl -->
+    <!--#region TabControl-->
     <Style x:Key="borderTab4_No" TargetType="Border">
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -836,65 +1172,92 @@
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle StrokeDashArray="1 2" StrokeThickness="1" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" Margin="4,4,4,2"/>
+                    <Rectangle
+                        Margin="4,4,4,2"
+                        SnapsToDevicePixels="true"
+                        Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="1" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style  TargetType="{x:Type TabControl}">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Style TargetType="{x:Type TabControl}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
-                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                    <Grid
+                        ClipToBounds="true"
+                        KeyboardNavigation.TabNavigation="Local"
+                        SnapsToDevicePixels="true">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition x:Name="ColumnDefinition0"/>
-                            <ColumnDefinition x:Name="ColumnDefinition1" Width="0"/>
+                            <ColumnDefinition x:Name="ColumnDefinition0" />
+                            <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition x:Name="RowDefinition0" Height="Auto"/>
-                            <RowDefinition x:Name="RowDefinition1" Height="*"/>
+                            <RowDefinition x:Name="RowDefinition0" Height="Auto" />
+                            <RowDefinition x:Name="RowDefinition1" Height="*" />
                         </Grid.RowDefinitions>
-                        <TabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="2,2,2,0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
-                        <Border x:Name="ContentPanel" BorderThickness="{TemplateBinding BorderThickness}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local" BorderBrush="{x:Null}">
-                            <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        <TabPanel
+                            x:Name="HeaderPanel"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="2,2,2,0"
+                            Panel.ZIndex="1"
+                            IsItemsHost="true"
+                            KeyboardNavigation.TabIndex="1" />
+                        <Border
+                            x:Name="ContentPanel"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            BorderBrush="{x:Null}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            KeyboardNavigation.DirectionalNavigation="Contained"
+                            KeyboardNavigation.TabIndex="2"
+                            KeyboardNavigation.TabNavigation="Local">
+                            <ContentPresenter
+                                x:Name="PART_SelectedContentHost"
+                                Margin="{TemplateBinding Padding}"
+                                ContentSource="SelectedContent"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="TabStripPlacement" Value="Bottom">
-                            <Setter Property="Grid.Row" TargetName="HeaderPanel" Value="1"/>
-                            <Setter Property="Grid.Row" TargetName="ContentPanel" Value="0"/>
-                            <Setter Property="Height" TargetName="RowDefinition0" Value="*"/>
-                            <Setter Property="Height" TargetName="RowDefinition1" Value="Auto"/>
-                            <Setter Property="Margin" TargetName="HeaderPanel" Value="2,0,2,2"/>
+                            <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="1" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+                            <Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
+                            <Setter TargetName="HeaderPanel" Property="Margin" Value="2,0,2,2" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Left">
-                            <Setter Property="Grid.Row" TargetName="HeaderPanel" Value="0"/>
-                            <Setter Property="Grid.Row" TargetName="ContentPanel" Value="0"/>
-                            <Setter Property="Grid.Column" TargetName="HeaderPanel" Value="0"/>
-                            <Setter Property="Grid.Column" TargetName="ContentPanel" Value="1"/>
-                            <Setter Property="Width" TargetName="ColumnDefinition0" Value="Auto"/>
-                            <Setter Property="Width" TargetName="ColumnDefinition1" Value="*"/>
-                            <Setter Property="Height" TargetName="RowDefinition0" Value="*"/>
-                            <Setter Property="Height" TargetName="RowDefinition1" Value="0"/>
-                            <Setter Property="Margin" TargetName="HeaderPanel" Value="2,2,0,2"/>
+                            <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="HeaderPanel" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
+                            <Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
+                            <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+                            <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+                            <Setter TargetName="HeaderPanel" Property="Margin" Value="2,2,0,2" />
                         </Trigger>
                         <Trigger Property="TabStripPlacement" Value="Right">
-                            <Setter Property="Grid.Row" TargetName="HeaderPanel" Value="0"/>
-                            <Setter Property="Grid.Row" TargetName="ContentPanel" Value="0"/>
-                            <Setter Property="Grid.Column" TargetName="HeaderPanel" Value="1"/>
-                            <Setter Property="Grid.Column" TargetName="ContentPanel" Value="0"/>
-                            <Setter Property="Width" TargetName="ColumnDefinition0" Value="*"/>
-                            <Setter Property="Width" TargetName="ColumnDefinition1" Value="Auto"/>
-                            <Setter Property="Height" TargetName="RowDefinition0" Value="*"/>
-                            <Setter Property="Height" TargetName="RowDefinition1" Value="0"/>
-                            <Setter Property="Margin" TargetName="HeaderPanel" Value="0,2,2,2"/>
+                            <Setter TargetName="HeaderPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="HeaderPanel" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
+                            <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
+                            <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+                            <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+                            <Setter TargetName="HeaderPanel" Property="Margin" Value="0,2,2,2" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -903,44 +1266,57 @@
     </Style>
 
     <Style TargetType="{x:Type TabItem}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource TabItemFocusVisual}"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource TabItemFocusVisual}" />
         <Setter Property="Foreground">
             <Setter.Value>
                 #A5FFFFFF
             </Setter.Value>
         </Setter>
-        <Setter Property="Padding" Value="6,1,6,1"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        <Setter Property="Cursor" Value="Hand"></Setter>
+        <Setter Property="Padding" Value="6,1,6,1" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Border x:Name="Bd" BorderThickness="1" Padding="{TemplateBinding Padding}" Height="35"  Margin="5" CornerRadius="2">
-                        <ContentPresenter x:Name="Content" Cursor="Hand"  ContentSource="Header" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    <Border
+                        x:Name="Bd"
+                        Height="35"
+                        Margin="5"
+                        Padding="{TemplateBinding Padding}"
+                        BorderThickness="1"
+                        CornerRadius="2">
+                        <ContentPresenter
+                            x:Name="Content"
+                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                            ContentSource="Header"
+                            Cursor="Hand"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected"  Value="true">
-                            <Setter Property="Foreground" Value="#8f723c"/>
-                            <Setter Property="Background" TargetName="Bd">
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Foreground" Value="#8f723c" />
+                            <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png"  />
+                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
-                        <Trigger Property="IsSelected"  Value="False">
-                            <Setter Property="Foreground" Value="White"/>
-                            <Setter Property="Background" TargetName="Bd">
+                        <Trigger Property="IsSelected" Value="False">
+                            <Setter Property="Foreground" Value="White" />
+                            <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
                                     <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Foreground" Value="#8f723c"/>
-                            <Setter Property="Background" TargetName="Bd">
+                            <Setter Property="Foreground" Value="#8f723c" />
+                            <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png"  />
+                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
@@ -950,30 +1326,43 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type TabItem}" x:Key="TabItem样式1">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource TabItemFocusVisual}"/>
-        <Setter Property="Foreground" Value="#A5FFFFFF"/>
-        <Setter Property="Padding" Value="6,1,6,1"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+    <Style x:Key="TabItem样式1" TargetType="{x:Type TabItem}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource TabItemFocusVisual}" />
+        <Setter Property="Foreground" Value="#A5FFFFFF" />
+        <Setter Property="Padding" Value="6,1,6,1" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Border x:Name="Bd" BorderThickness="1" Padding="{TemplateBinding Padding}" Height="60"  Margin="2" CornerRadius="2">
-                        <ContentPresenter x:Name="Content" Cursor="Hand"  ContentSource="Header" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    <Border
+                        x:Name="Bd"
+                        Height="60"
+                        Margin="2"
+                        Padding="{TemplateBinding Padding}"
+                        BorderThickness="1"
+                        CornerRadius="2">
+                        <ContentPresenter
+                            x:Name="Content"
+                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                            ContentSource="Header"
+                            Cursor="Hand"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected"  Value="true">
-                            <Setter Property="Foreground" Value="#8f723c"/>
-                            <Setter Property="Background" TargetName="Bd">
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Foreground" Value="#8f723c" />
+                            <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab3_Select.png"  />
+                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab3_Select.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
-                        <Trigger Property="IsSelected"  Value="False">
-                            <Setter Property="Foreground" Value="#134278"/>
-                            <Setter Property="Background" TargetName="Bd">
+                        <Trigger Property="IsSelected" Value="False">
+                            <Setter Property="Foreground" Value="#134278" />
+                            <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
                                     <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab3_No.png" />
                                 </Setter.Value>
@@ -985,34 +1374,47 @@
         </Setter>
     </Style>
 
-    <Style TargetType="{x:Type TabItem}" x:Key="TabItem样式2">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource TabItemFocusVisual}"/>
+    <Style x:Key="TabItem样式2" TargetType="{x:Type TabItem}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource TabItemFocusVisual}" />
         <Setter Property="Foreground">
             <Setter.Value>
                 #A5FFFFFF
             </Setter.Value>
         </Setter>
-        <Setter Property="Padding" Value="6,1,6,1"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="6,1,6,1" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Border x:Name="Bd" BorderThickness="1" Padding="{TemplateBinding Padding}" Height="60"  Margin="2" CornerRadius="2">
-                        <ContentPresenter x:Name="Content" Cursor="Hand"  ContentSource="Header" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+                    <Border
+                        x:Name="Bd"
+                        Height="60"
+                        Margin="2"
+                        Padding="{TemplateBinding Padding}"
+                        BorderThickness="1"
+                        CornerRadius="2">
+                        <ContentPresenter
+                            x:Name="Content"
+                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                            ContentSource="Header"
+                            Cursor="Hand"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected"  Value="true">
-                            <Setter Property="Foreground" Value="#8f723c"/>
-                            <Setter Property="Background" TargetName="Bd">
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Foreground" Value="#8f723c" />
+                            <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab_SelectBJ.png"  />
+                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab_SelectBJ.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
-                        <Trigger Property="IsSelected"  Value="False">
-                            <Setter Property="Foreground" Value="#134278"/>
-                            <Setter Property="Background" TargetName="Bd">
+                        <Trigger Property="IsSelected" Value="False">
+                            <Setter Property="Foreground" Value="#134278" />
+                            <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
                                     <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab_NoBJ.png" />
                                 </Setter.Value>
@@ -1026,7 +1428,7 @@
     <!--#endregion-->
 
     <!--#region ProgressBar圆形统计图-->
-    <local:Style3DashConverter x:Key="Style3Dash"/>
+    <local:Style3DashConverter x:Key="Style3Dash" />
     <local:Style3ArcConverter x:Key="Style3Arc" />
     <Style x:Key="CircleProgressBar3" TargetType="{x:Type ProgressBar}">
         <Setter Property="Width" Value="100" />
@@ -1035,29 +1437,39 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
                     <Grid>
-                        <Rectangle Fill="#ef426f" Visibility="Collapsed" RadiusX="5" RadiusY="5"/>
-                        <Ellipse Stroke="#FF2470FF" 
-                       StrokeThickness="10"
-                       Width="80"
-                       Height="80"/>
-                        <Ellipse Width="80" Height="80" StrokeThickness="10" Stroke="#FF0198FF" 
-                       RenderTransformOrigin="0.5,0.5" 
-                       StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Rectangle
+                            Fill="#ef426f"
+                            RadiusX="5"
+                            RadiusY="5"
+                            Visibility="Collapsed" />
+                        <Ellipse
+                            Width="80"
+                            Height="80"
+                            Stroke="#FF2470FF"
+                            StrokeThickness="10" />
+                        <Ellipse
+                            Width="80"
+                            Height="80"
+                            RenderTransformOrigin="0.5,0.5"
+                            Stroke="#FF0198FF"
+                            StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}"
+                            StrokeThickness="10">
                             <Ellipse.RenderTransform>
                                 <RotateTransform Angle="-90" />
                             </Ellipse.RenderTransform>
                             <Ellipse.StrokeDashArray>
                                 <MultiBinding Converter="{StaticResource Style3Arc}">
-                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Value" />
+                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
                                     <Binding Path="StrokeThickness" RelativeSource="{RelativeSource Self}" />
                                 </MultiBinding>
                             </Ellipse.StrokeDashArray>
                         </Ellipse>
-                        <TextBlock HorizontalAlignment="Center"
-                                       FontSize="20"
-                         VerticalAlignment="Center"
-                         Foreground="#01acff"
-                         Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}"/>
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="20"
+                            Foreground="#01acff"
+                            Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -1070,29 +1482,39 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
                     <Grid>
-                        <Rectangle Fill="#ef426f" Visibility="Collapsed" RadiusX="5" RadiusY="5"/>
-                        <Ellipse Stroke="#7F15806C" 
-                       StrokeThickness="10"
-                       Width="80"
-                       Height="80"/>
-                        <Ellipse Width="80" Height="80" StrokeThickness="10" Stroke="#CC19910D" 
-                       RenderTransformOrigin="0.5,0.5" 
-                       StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Rectangle
+                            Fill="#ef426f"
+                            RadiusX="5"
+                            RadiusY="5"
+                            Visibility="Collapsed" />
+                        <Ellipse
+                            Width="80"
+                            Height="80"
+                            Stroke="#7F15806C"
+                            StrokeThickness="10" />
+                        <Ellipse
+                            Width="80"
+                            Height="80"
+                            RenderTransformOrigin="0.5,0.5"
+                            Stroke="#CC19910D"
+                            StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}"
+                            StrokeThickness="10">
                             <Ellipse.RenderTransform>
                                 <RotateTransform Angle="-90" />
                             </Ellipse.RenderTransform>
                             <Ellipse.StrokeDashArray>
                                 <MultiBinding Converter="{StaticResource Style3Arc}">
-                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Value" />
+                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
                                     <Binding Path="StrokeThickness" RelativeSource="{RelativeSource Self}" />
                                 </MultiBinding>
                             </Ellipse.StrokeDashArray>
                         </Ellipse>
-                        <TextBlock HorizontalAlignment="Center"
-                                       FontSize="20"
-                         VerticalAlignment="Center"
-                         Foreground="#CC19910D"
-                         Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}"/>
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="20"
+                            Foreground="#CC19910D"
+                            Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -1105,29 +1527,39 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
                     <Grid>
-                        <Rectangle Fill="#ef426f" Visibility="Collapsed" RadiusX="5" RadiusY="5"/>
-                        <Ellipse Stroke="#CC3E0B0B" 
-                       StrokeThickness="10"
-                       Width="80"
-                       Height="80"/>
-                        <Ellipse Width="80" Height="80" StrokeThickness="10" Stroke="#CCAC1919" 
-                       RenderTransformOrigin="0.5,0.5" 
-                       StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Rectangle
+                            Fill="#ef426f"
+                            RadiusX="5"
+                            RadiusY="5"
+                            Visibility="Collapsed" />
+                        <Ellipse
+                            Width="80"
+                            Height="80"
+                            Stroke="#CC3E0B0B"
+                            StrokeThickness="10" />
+                        <Ellipse
+                            Width="80"
+                            Height="80"
+                            RenderTransformOrigin="0.5,0.5"
+                            Stroke="#CCAC1919"
+                            StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}"
+                            StrokeThickness="10">
                             <Ellipse.RenderTransform>
                                 <RotateTransform Angle="-90" />
                             </Ellipse.RenderTransform>
                             <Ellipse.StrokeDashArray>
                                 <MultiBinding Converter="{StaticResource Style3Arc}">
-                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Value" />
+                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
                                     <Binding Path="StrokeThickness" RelativeSource="{RelativeSource Self}" />
                                 </MultiBinding>
                             </Ellipse.StrokeDashArray>
                         </Ellipse>
-                        <TextBlock HorizontalAlignment="Center"
-                                       FontSize="20"
-                         VerticalAlignment="Center"
-                         Foreground="#CCAC1919"
-                         Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}"/>
+                        <TextBlock
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="20"
+                            Foreground="#CCAC1919"
+                            Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -1150,17 +1582,17 @@
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                     <Grid>
                         <Border
-                                x:Name="border2"
+                            x:Name="border2"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="{TemplateBinding Background}">
+                            <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Background="{TemplateBinding Background}">
-                            <ContentPresenter
-                                    Margin="{TemplateBinding Padding}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    RecognizesAccessKey="True"
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
                     </Grid>
 
@@ -1172,9 +1604,9 @@
                             <Setter TargetName="border2" Property="Background" Value="{StaticResource ResourceKey=leftImage}" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="false">
-                            <Setter TargetName="border2" Property="Background"  >
+                            <Setter TargetName="border2" Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形样式.png"  />
+                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形样式.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
@@ -1187,9 +1619,9 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="border2" Property="Background" >
+                                <Setter TargetName="border2" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png"  />
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                                     </Setter.Value>
                                 </Setter>
                             </MultiTrigger.Setters>
@@ -1212,34 +1644,34 @@
                 <ControlTemplate TargetType="{x:Type Expander}">
                     <DockPanel Cursor="Hand">
                         <ToggleButton
-                                x:Name="HeaderSite"
-                                Height="60"
-                                MinWidth="0"
-                                MinHeight="0"
-                                Margin="1"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Content="{TemplateBinding Header}"
-                                ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-                                DockPanel.Dock="Top"
-                                FontFamily="{TemplateBinding FontFamily}"
-                                FontSize="{TemplateBinding FontSize}"
-                                FontStretch="{TemplateBinding FontStretch}"
-                                FontStyle="{TemplateBinding FontStyle}"
-                                FontWeight="{TemplateBinding FontWeight}"
-                                Foreground="{TemplateBinding Foreground}"
-                                IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                Style="{StaticResource ToggleButtonStyle}" />
+                            x:Name="HeaderSite"
+                            Height="60"
+                            MinWidth="0"
+                            MinHeight="0"
+                            Margin="1"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                            DockPanel.Dock="Top"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontStretch="{TemplateBinding FontStretch}"
+                            FontStyle="{TemplateBinding FontStyle}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}"
+                            IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Style="{StaticResource ToggleButtonStyle}" />
                         <ContentPresenter
-                                x:Name="ExpandSite"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                DockPanel.Dock="Left"
-                                Focusable="false"
-                                Visibility="Collapsed" />
+                            x:Name="ExpandSite"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            DockPanel.Dock="Left"
+                            Focusable="false"
+                            Visibility="Collapsed" />
                     </DockPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsExpanded" Value="true">
@@ -1257,7 +1689,7 @@
         <Setter Property="Margin" Value="5,10,1,0" />
         <Setter Property="Width" Value="160" />
         <Setter Property="Height" Value="30" />
-        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="FontFamily" Value="粗体" />
         <Setter Property="Foreground" Value="#DDD" />
@@ -1271,21 +1703,21 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
                     <Grid
-                            x:Name="templateRoot"
-                            Background="Transparent"
-                            SnapsToDevicePixels="True">
+                        x:Name="templateRoot"
+                        Background="Transparent"
+                        SnapsToDevicePixels="True">
                         <Border x:Name="border2" />
                         <ContentPresenter
-                                x:Name="contentPresenter"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Content="{TemplateBinding Content}"
-                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Focusable="False"
-                                RecognizesAccessKey="True"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            x:Name="contentPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Focusable="False"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -1297,11 +1729,11 @@
                                             <Setter.Value>
                                                 <ControlTemplate>
                                                     <Rectangle
-                                                            Margin="14,0,0,0"
-                                                            SnapsToDevicePixels="True"
-                                                            Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
-                                                            StrokeDashArray="1 2"
-                                                            StrokeThickness="1" />
+                                                        Margin="14,0,0,0"
+                                                        SnapsToDevicePixels="True"
+                                                        Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                                        StrokeDashArray="1 2"
+                                                        StrokeThickness="1" />
                                                 </ControlTemplate>
                                             </Setter.Value>
                                         </Setter>
@@ -1314,14 +1746,13 @@
 
                         <Trigger Property="IsChecked" Value="true">
                             <Setter Property="Foreground" Value="White" />
-                            <Setter TargetName="border2" Property="Background" Value="{StaticResource ResourceKey=leftImageSub}">
-                            </Setter>
+                            <Setter TargetName="border2" Property="Background" Value="{StaticResource ResourceKey=leftImageSub}" />
                         </Trigger>
 
                         <Trigger Property="IsChecked" Value="false">
                             <Setter TargetName="border2" Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形样式.png"  />
+                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形样式.png" />
                                 </Setter.Value>
                             </Setter>
                             <Setter Property="Foreground" Value="#4B8EC4" />
@@ -1333,9 +1764,9 @@
                                 <Condition Property="IsMouseOver" Value="True" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="border2" Property="Background" >
+                                <Setter TargetName="border2" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/leftImageSub.png"  />
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/leftImageSub.png" />
                                     </Setter.Value>
                                 </Setter>
                             </MultiTrigger.Setters>
@@ -1350,28 +1781,27 @@
     <!--#endregion-->
 
     <!--#region ContextMenu-->
-    <!--自定义ContextMenu的外观样式-->
+    <!--  自定义ContextMenu的外观样式  -->
     <Style TargetType="{x:Type ContextMenu}">
-        <Setter Property="SnapsToDevicePixels" Value="True"/>
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Grid.IsSharedSizeScope" Value="True"/>
-        <Setter Property ="Focusable" Value="False"/>
-        <Setter Property="HasDropShadow" Value="True"/>
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Grid.IsSharedSizeScope" Value="True" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HasDropShadow" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ContextMenu}">
-                    <Border 
-                      Name="Border"
-                      Background="#6EA0B0"
-                      BorderBrush="#888888"
-                      BorderThickness="1" >
-                        <StackPanel IsItemsHost="True"
-                        KeyboardNavigation.DirectionalNavigation="Cycle"/>
+                    <Border
+                        Name="Border"
+                        Background="#6EA0B0"
+                        BorderBrush="#888888"
+                        BorderThickness="1">
+                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasDropShadow" Value="true">
-                            <Setter TargetName="Border" Property="Padding" Value="0,3,0,3"/>
-                            <Setter TargetName="Border" Property="CornerRadius" Value="4"/>
+                            <Setter TargetName="Border" Property="Padding" Value="0,3,0,3" />
+                            <Setter TargetName="Border" Property="CornerRadius" Value="4" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1379,16 +1809,16 @@
         </Setter>
     </Style>
 
-    <!--自定义菜单项之间的分隔符的样式-->
+    <!--  自定义菜单项之间的分隔符的样式  -->
     <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
-        <Setter Property="Height" Value="1"/>
-        <Setter Property="Margin" Value="0,4,0,4"/>
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,4,0,4" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border >
+                    <Border>
                         <Border.Background>
-                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png"  />
+                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png" />
                         </Border.Background>
                     </Border>
                 </ControlTemplate>
@@ -1397,14 +1827,14 @@
     </Style>
 
     <Style x:Key="Separator1" TargetType="{x:Type Separator}">
-        <Setter Property="Height" Value="1"/>
-        <Setter Property="Margin" Value="0,4,0,4"/>
+        <Setter Property="Height" Value="1" />
+        <Setter Property="Margin" Value="0,4,0,4" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Separator}">
-                    <Border >
+                    <Border>
                         <Border.Background>
-                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png"  />
+                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png" />
                         </Border.Background>
                     </Border>
                 </ControlTemplate>
@@ -1412,51 +1842,50 @@
         </Setter>
     </Style>
 
-    <!-- TopLevelHeader -->
-    <ControlTemplate  x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
-        <Border Name="Border"  Cursor="Hand" >
+    <!--  TopLevelHeader  -->
+    <ControlTemplate x:Key="{x:Static MenuItem.TopLevelHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
+        <Border Name="Border" Cursor="Hand">
             <Grid Margin="30,10,30,5">
-                <ContentPresenter 
-                ContentSource="Header"
-                RecognizesAccessKey="True" 
+                <ContentPresenter
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Center"/>
-                <Popup 
-                Name="Popup" VerticalOffset="10" HorizontalOffset="-30" 
-                Placement="Bottom"
-                IsOpen="{TemplateBinding IsSubmenuOpen}"
-                AllowsTransparency="True" 
-                Focusable="False"
-                PopupAnimation="Slide"
-                    >
-                    <Border 
-                  Name="SubmenuBorder"
-                  SnapsToDevicePixels="True"
-                  Background="#7F0E4E8D"
-                  BorderBrush="Transparent"
-                  BorderThickness="1" >
-                        <StackPanel  
-                    IsItemsHost="True" 
-                    KeyboardNavigation.DirectionalNavigation="Cycle" />
+                    VerticalAlignment="Center"
+                    ContentSource="Header"
+                    RecognizesAccessKey="True" />
+                <Popup
+                    Name="Popup"
+                    AllowsTransparency="True"
+                    Focusable="False"
+                    HorizontalOffset="-30"
+                    IsOpen="{TemplateBinding IsSubmenuOpen}"
+                    Placement="Bottom"
+                    PopupAnimation="Slide"
+                    VerticalOffset="10">
+                    <Border
+                        Name="SubmenuBorder"
+                        Background="#7F0E4E8D"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        SnapsToDevicePixels="True">
+                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                     </Border>
                 </Popup>
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsSuspendingPopupAnimation" Value="true">
-                <Setter TargetName="Popup" Property="PopupAnimation" Value="None"/>
+                <Setter TargetName="Popup" Property="PopupAnimation" Value="None" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="true">
                 <Setter TargetName="Border" Property="Background">
                     <Setter.Value>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png"  />
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="#8f723c"/>
-                <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="Foreground" Value="#8f723c" />
+                <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
                 <Setter TargetName="SubmenuBorder" Property="Background">
                     <Setter.Value>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png"  />
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png" />
                     </Setter.Value>
                 </Setter>
             </Trigger>
@@ -1466,129 +1895,132 @@
                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="White"/>
-                <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="Foreground" Value="White" />
+                <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
                 <Setter TargetName="SubmenuBorder" Property="Background">
                     <Setter.Value>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png"  />
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png" />
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="True">
-                <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="0"/>
-                <Setter TargetName="SubmenuBorder" Property="Padding" Value="5"/>
+                <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="0" />
+                <Setter TargetName="SubmenuBorder" Property="Padding" Value="5" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="#ffffffff"/>
+                <Setter Property="Foreground" Value="#ffffffff" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <!-- TopLevelItem -->
-    <ControlTemplate 
-      x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}" 
-      TargetType="{x:Type MenuItem}">
+    <!--  TopLevelItem  -->
+    <ControlTemplate x:Key="{x:Static MenuItem.TopLevelItemTemplateKey}" TargetType="{x:Type MenuItem}">
         <Border Name="Border" Margin="30,0,0,0">
             <Grid>
-                <ContentPresenter 
-                ContentSource="Header"
-                RecognizesAccessKey="True" 
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"/>
+                <ContentPresenter
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    ContentSource="Header"
+                    RecognizesAccessKey="True" />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsHighlighted" Value="true">
                 <Setter TargetName="Border" Property="Background">
                     <Setter.Value>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/leftImage.png"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/leftImage.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter TargetName="Border" Property="BorderBrush" Value="Transparent"/>
+                <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Foreground" Value="#ffffffff"/>
+                <Setter Property="Foreground" Value="#ffffffff" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <!-- SubmenuItem 自定义菜单项的外观样式-->
-    <ControlTemplate 
-   x:Key="{x:Static MenuItem.SubmenuItemTemplateKey}" 
-   TargetType="{x:Type MenuItem}">
-        <Border Name="Border" Margin="5" Cursor="Hand">
+    <!--  SubmenuItem 自定义菜单项的外观样式  -->
+    <ControlTemplate x:Key="{x:Static MenuItem.SubmenuItemTemplateKey}" TargetType="{x:Type MenuItem}">
+        <Border
+            Name="Border"
+            Margin="5"
+            Cursor="Hand">
             <Grid Margin="5">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" SharedSizeGroup="Icon"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Icon" />
                     <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut"/>
-                    <ColumnDefinition Width="13"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
+                    <ColumnDefinition Width="13" />
                 </Grid.ColumnDefinitions>
-                <ContentPresenter 
-                Name="Icon"
-                Margin="6,2,6,2"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                ContentSource="Icon"/>
-                <Border 
-                Name="Check"  
-                Width="13" Height="13" 
-                Visibility="Hidden"
-                Margin="6,0,6,0" 
-                Background="#331068A3"
-                BorderThickness="1"
-                BorderBrush="#331068A3">
-                    <Path 
-                  Name="CheckMark"
-                  Width="7" Height="7" 
-                  Visibility="Visible" 
-                  SnapsToDevicePixels="False" 
-                  Stroke="#331068A3"
-                  StrokeThickness="1"
-                  Data="M 0 0 L 7 7 M 0 7 L 7 0" />
+                <ContentPresenter
+                    Name="Icon"
+                    Margin="6,2,6,2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    ContentSource="Icon" />
+                <Border
+                    Name="Check"
+                    Width="13"
+                    Height="13"
+                    Margin="6,0,6,0"
+                    Background="#331068A3"
+                    BorderBrush="#331068A3"
+                    BorderThickness="1"
+                    Visibility="Hidden">
+                    <Path
+                        Name="CheckMark"
+                        Width="7"
+                        Height="7"
+                        Data="M 0 0 L 7 7 M 0 7 L 7 0"
+                        SnapsToDevicePixels="False"
+                        Stroke="#331068A3"
+                        StrokeThickness="1"
+                        Visibility="Visible" />
                 </Border>
-                <ContentPresenter 
-                Name="HeaderHost"
-                Grid.Column="1"
-                ContentSource="Header"
-                RecognizesAccessKey="True"/>
-                <TextBlock x:Name="InputGestureText" Cursor="Hand"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Bottom"
-                Grid.Column="2"
-                Background="Transparent"
-                Text="{TemplateBinding InputGestureText}"
-                Margin="5,2,0,-5"
-                DockPanel.Dock="Right" />
+                <ContentPresenter
+                    Name="HeaderHost"
+                    Grid.Column="1"
+                    ContentSource="Header"
+                    RecognizesAccessKey="True" />
+                <TextBlock
+                    x:Name="InputGestureText"
+                    Grid.Column="2"
+                    Margin="5,2,0,-5"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Bottom"
+                    Background="Transparent"
+                    Cursor="Hand"
+                    DockPanel.Dock="Right"
+                    Text="{TemplateBinding InputGestureText}" />
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Visibility" Value="Hidden"/>
+                <Setter TargetName="Icon" Property="Visibility" Value="Hidden" />
             </Trigger>
             <Trigger Property="IsChecked" Value="true">
-                <Setter TargetName="CheckMark" Property="Visibility" Value="Visible"/>
+                <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
             </Trigger>
             <Trigger Property="IsCheckable" Value="true">
-                <Setter TargetName="Check" Property="Visibility" Value="Hidden"/>
-                <Setter TargetName="Icon" Property="Visibility" Value="Hidden"/>
+                <Setter TargetName="Check" Property="Visibility" Value="Hidden" />
+                <Setter TargetName="Icon" Property="Visibility" Value="Hidden" />
             </Trigger>
-            <!--选中菜单项时的高亮颜色的trigger设置-->
+            <!--  选中菜单项时的高亮颜色的trigger设置  -->
             <Trigger Property="IsHighlighted" Value="true">
                 <Setter TargetName="Border" Property="Background">
                     <Setter.Value>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="#8f723c"/>
+                <Setter Property="Foreground" Value="#8f723c" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="false">
                 <Setter TargetName="Border" Property="Background">
                     <Setter.Value>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="White"/>
+                <Setter Property="Foreground" Value="White" />
             </Trigger>
             <!--<Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Foreground" Value="Yellow"/>
@@ -1596,64 +2028,61 @@
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <!-- SubmenuHeader -->
+    <!--  SubmenuHeader  -->
 
-    <ControlTemplate 
-    x:Key="{x:Static MenuItem.SubmenuHeaderTemplateKey}" 
-    TargetType="{x:Type MenuItem}">
-        <Border Name="Border" >
+    <ControlTemplate x:Key="{x:Static MenuItem.SubmenuHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
+        <Border Name="Border">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" SharedSizeGroup="Icon"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Icon" />
                     <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut"/>
-                    <ColumnDefinition Width="13"/>
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
+                    <ColumnDefinition Width="13" />
                 </Grid.ColumnDefinitions>
-                <ContentPresenter 
-                Name="Icon"
-                Margin="6,0,6,0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                ContentSource="Icon"/>
-                <ContentPresenter 
-                Name="HeaderHost"
-                Grid.Column="1"
-                ContentSource="Header"
-                RecognizesAccessKey="True"/>
-                <TextBlock x:Name="InputGestureText"
-                Grid.Column="2"
-                Text="{TemplateBinding InputGestureText}"
-                Margin="5,2,2,2"
-                DockPanel.Dock="Right"/>
-                <Path 
-                Grid.Column="3"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Data="M 0 0 L 0 7 L 4 3.5 Z" 
-                Fill="#331068A3" />
-                <Popup 
-                Name="Popup"
-                Placement="Left"
-                HorizontalOffset="-4" 
-                IsOpen="{TemplateBinding IsSubmenuOpen}"
-                AllowsTransparency="True" 
-                Focusable="False"
-                PopupAnimation="Slide">
-                    <Border 
-                  Name="SubmenuBorder"
-                  SnapsToDevicePixels="True"
-                  BorderBrush="Transparent"
-                  BorderThickness="1" >
-                        <StackPanel  
-                      IsItemsHost="True" 
-                      KeyboardNavigation.DirectionalNavigation="Cycle" />
+                <ContentPresenter
+                    Name="Icon"
+                    Margin="6,0,6,0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch"
+                    ContentSource="Icon" />
+                <ContentPresenter
+                    Name="HeaderHost"
+                    Grid.Column="1"
+                    ContentSource="Header"
+                    RecognizesAccessKey="True" />
+                <TextBlock
+                    x:Name="InputGestureText"
+                    Grid.Column="2"
+                    Margin="5,2,2,2"
+                    DockPanel.Dock="Right"
+                    Text="{TemplateBinding InputGestureText}" />
+                <Path
+                    Grid.Column="3"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Data="M 0 0 L 0 7 L 4 3.5 Z"
+                    Fill="#331068A3" />
+                <Popup
+                    Name="Popup"
+                    AllowsTransparency="True"
+                    Focusable="False"
+                    HorizontalOffset="-4"
+                    IsOpen="{TemplateBinding IsSubmenuOpen}"
+                    Placement="Left"
+                    PopupAnimation="Slide">
+                    <Border
+                        Name="SubmenuBorder"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        SnapsToDevicePixels="True">
+                        <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                     </Border>
                 </Popup>
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="Icon" Value="{x:Null}">
-                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="true">
                 <Setter TargetName="Border" Property="Background">
@@ -1665,93 +2094,110 @@
             <Trigger Property="IsHighlighted" Value="false">
                 <Setter TargetName="Border" Property="Background">
                     <Setter.Value>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png"  />
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                     </Setter.Value>
                 </Setter>
             </Trigger>
             <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="True">
-                <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="4"/>
-                <Setter TargetName="SubmenuBorder" Property="Padding" Value="0,3,0,3"/>
+                <Setter TargetName="SubmenuBorder" Property="CornerRadius" Value="4" />
+                <Setter TargetName="SubmenuBorder" Property="Padding" Value="0,3,0,3" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="#ffffffff"/>
+                <Setter Property="Foreground" Value="#ffffffff" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
-    <!-- MenuItem Style -->
+    <!--  MenuItem Style  -->
 
     <Style x:Key="{x:Type MenuItem}" TargetType="{x:Type MenuItem}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="OverridesDefaultStyle" Value="True" />
         <Style.Triggers>
             <Trigger Property="Role" Value="TopLevelHeader">
-                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelHeaderTemplateKey}}"/>
-                <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelHeaderTemplateKey}}" />
+                <Setter Property="Grid.IsSharedSizeScope" Value="true" />
             </Trigger>
             <Trigger Property="Role" Value="TopLevelItem">
-                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelItemTemplateKey}}"/>
+                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.TopLevelItemTemplateKey}}" />
             </Trigger>
             <!--<Trigger Property="Role" Value="SubmenuHeader">
                 <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuHeaderTemplateKey}}"/>
             </Trigger>-->
             <Trigger Property="Role" Value="SubmenuItem">
-                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuItemTemplateKey}}"/>
+                <Setter Property="Template" Value="{StaticResource {x:Static MenuItem.SubmenuItemTemplateKey}}" />
             </Trigger>
         </Style.Triggers>
     </Style>
     <!--#endregion-->
 
-    <!--#region RadioButton -->
+    <!--#region RadioButton-->
     <Style x:Key="CheckRadioFocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle Margin="14,0,0,0" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                    <Rectangle
+                        Margin="14,0,0,0"
+                        SnapsToDevicePixels="true"
+                        Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="1" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style  TargetType="{x:Type RadioButton}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource CheckRadioFocusVisual}"/>
-        <Setter Property="Foreground" Value="{DynamicResource foreground}"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Background" >
+    <Style TargetType="{x:Type RadioButton}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource CheckRadioFocusVisual}" />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background">
             <Setter.Value>
-                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/btn_normal.png"/>
+                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/btn_normal.png" />
             </Setter.Value>
         </Setter>
-        <Setter Property="Padding" Value="2,0,0,0"/>
+        <Setter Property="Padding" Value="2,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <BulletDecorator Background="Transparent" VerticalAlignment="Center">
+                    <BulletDecorator VerticalAlignment="Center" Background="Transparent">
                         <BulletDecorator.Bullet>
-                            <Grid  >
-                                <Ellipse x:Name="Border"  Fill="{TemplateBinding Background}" Height="10" Width="10">
-                                </Ellipse>
-                                <Ellipse x:Name="Dot" Height="5" Visibility="Hidden" Width="5" Fill="#ff8a03"/>
+                            <Grid>
+                                <Ellipse
+                                    x:Name="Border"
+                                    Width="10"
+                                    Height="10"
+                                    Fill="{TemplateBinding Background}" />
+                                <Ellipse
+                                    x:Name="Dot"
+                                    Width="5"
+                                    Height="5"
+                                    Fill="#ff8a03"
+                                    Visibility="Hidden" />
                             </Grid>
 
                         </BulletDecorator.Bullet>
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <ContentPresenter
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            RecognizesAccessKey="True" />
                     </BulletDecorator>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="true">
-                            <Setter Property="Visibility" TargetName="Dot" Value="Visible"/>
+                            <Setter TargetName="Dot" Property="Visibility" Value="Visible" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="False">
-                            <Setter Property="Visibility" TargetName="Dot" Value="Collapsed"/>
+                            <Setter TargetName="Dot" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
-                            <Setter Property="Visibility" TargetName="Dot" Value="Collapsed"/>
+                            <Setter TargetName="Dot" Property="Visibility" Value="Collapsed" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="true">
-                            <Setter Property="Fill" TargetName="Border" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                            <Setter TargetName="Border" Property="Fill" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Fill" TargetName="Border" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-                            <Setter Property="Fill" TargetName="Dot" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter TargetName="Border" Property="Fill" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                            <Setter TargetName="Dot" Property="Fill" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1760,20 +2206,25 @@
     </Style>
     <!--#endregion-->
 
-    <!--#region CheckBox -->
+    <!--#region CheckBox-->
     <Style TargetType="{x:Type CheckBox}">
-        <Setter Property="Foreground" Value="{DynamicResource foreground}"/>
-        <Setter Property="Background" Value="#FFF4F4F4"/>
-        <Setter Property="BorderBrush" Value="#FF8E8F8F"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+        <Setter Property="Background" Value="#FFF4F4F4" />
+        <Setter Property="BorderBrush" Value="#FF8E8F8F" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="FocusVisualStyle">
             <Setter.Value>
                 <Style>
                     <Setter Property="Control.Template">
                         <Setter.Value>
                             <ControlTemplate>
-                                <Rectangle Margin="1" SnapsToDevicePixels="True" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                                <Rectangle
+                                    Margin="1"
+                                    SnapsToDevicePixels="True"
+                                    Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                    StrokeDashArray="1 2"
+                                    StrokeThickness="1" />
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>
@@ -1783,10 +2234,24 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
-                    <StackPanel Background="Transparent" SnapsToDevicePixels="True" Orientation="Horizontal">
-                        <Image x:Name="image1" Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" Width="12" Height="14"></Image>
+                    <StackPanel
+                        Background="Transparent"
+                        Orientation="Horizontal"
+                        SnapsToDevicePixels="True">
+                        <Image
+                            x:Name="image1"
+                            Width="12"
+                            Height="14"
+                            Source="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
 
-                        <ContentPresenter  Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        <ContentPresenter
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </StackPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="HasContent" Value="True">
@@ -1796,23 +2261,28 @@
                                         <Setter Property="Control.Template">
                                             <Setter.Value>
                                                 <ControlTemplate>
-                                                    <Rectangle Margin="14,0,0,0" SnapsToDevicePixels="True" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                                                    <Rectangle
+                                                        Margin="14,0,0,0"
+                                                        SnapsToDevicePixels="True"
+                                                        Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                                                        StrokeDashArray="1 2"
+                                                        StrokeThickness="1" />
                                                 </ControlTemplate>
                                             </Setter.Value>
                                         </Setter>
                                     </Style>
                                 </Setter.Value>
                             </Setter>
-                            <Setter Property="Padding" Value="4,0,0,0"/>
+                            <Setter Property="Padding" Value="4,0,0,0" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="true">
-                            <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_Checked.png"/>
+                            <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_Checked.png" />
                         </Trigger>
                         <Trigger Property="IsChecked" Value="{x:Null}">
-                            <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png"/>
+                            <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/Cb_HalfChecked.png" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1821,31 +2291,35 @@
     </Style>
     <!--#endregion-->
 
-    <!--#region TextBox -->
+    <!--#region TextBox-->
     <Style TargetType="{x:Type TextBox}">
-        <Setter Property="BorderBrush" Value="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="1"/>
-        <Setter Property="Foreground" Value="{DynamicResource foreground}"/>
-        <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Height" Value="24"/>
-
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="BorderBrush" Value="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Height" Value="24" />
+
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Themes1:ClassicBorderDecorator x:Name="Bd" BorderThickness="1" BorderStyle="None" BorderBrush="#08335f">
-                        <ScrollViewer x:Name="PART_ContentHost"/>
+                    <Themes1:ClassicBorderDecorator
+                        x:Name="Bd"
+                        BorderBrush="#08335f"
+                        BorderStyle="None"
+                        BorderThickness="1">
+                        <ScrollViewer x:Name="PART_ContentHost" />
                     </Themes1:ClassicBorderDecorator>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1854,47 +2328,65 @@
         <Style.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
-                    <Condition Property="IsSelectionActive" Value="false"/>
+                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true" />
+                    <Condition Property="IsSelectionActive" Value="false" />
                 </MultiTrigger.Conditions>
-                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
+                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
             </MultiTrigger>
         </Style.Triggers>
     </Style>
 
     <!--#endregion-->
 
-    <!--#region ComboBox -->
+    <!--#region ComboBox-->
     <Style x:Key="ComboBoxFocusVisual">
         <Setter Property="Control.Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Rectangle StrokeDashArray="1 2" StrokeThickness="1" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" SnapsToDevicePixels="true" Margin="4,4,21,4"/>
+                    <Rectangle
+                        Margin="4,4,21,4"
+                        SnapsToDevicePixels="true"
+                        Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="1" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
     <Geometry x:Key="DownArrowGeometry">M 0 0 L 3.5 4 L 7 0 Z</Geometry>
     <Style x:Key="ComboBoxTransparentButtonStyle" TargetType="{x:Type ToggleButton}">
-        <Setter Property="MinWidth" Value="0"/>
-        <Setter Property="MinHeight" Value="0"/>
-        <Setter Property="Width" Value="Auto"/>
-        <Setter Property="Height" Value="Auto"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="BorderBrush" Value="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}"/>
-        <Setter Property="BorderThickness" Value="2"/>
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="Width" Value="Auto" />
+        <Setter Property="Height" Value="Auto" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="BorderBrush" Value="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}" />
+        <Setter Property="BorderThickness" Value="2" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <DockPanel Background="{TemplateBinding Background}" LastChildFill="false" SnapsToDevicePixels="true">
-                        <Themes1:ClassicBorderDecorator x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" BorderStyle="None"  DockPanel.Dock="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                            <Path Data="{StaticResource DownArrowGeometry}" Fill="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                    <DockPanel
+                        Background="{TemplateBinding Background}"
+                        LastChildFill="false"
+                        SnapsToDevicePixels="true">
+                        <Themes1:ClassicBorderDecorator
+                            x:Name="Border"
+                            Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderStyle="None"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            DockPanel.Dock="Right">
+                            <Path
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Data="{StaticResource DownArrowGeometry}"
+                                Fill="{TemplateBinding Foreground}" />
                         </Themes1:ClassicBorderDecorator>
                     </DockPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="true">
-                            <Setter Property="BorderStyle" TargetName="Border" Value="AltPressed"/>
+                            <Setter TargetName="Border" Property="BorderStyle" Value="AltPressed" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -1902,120 +2394,205 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" />
             </Trigger>
         </Style.Triggers>
     </Style>
     <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="MinWidth" Value="0"/>
-        <Setter Property="Foreground" Value="{DynamicResource foreground}"/>
-        <Setter Property="MinHeight" Value="0"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    <ScrollViewer
+                        x:Name="PART_ContentHost"
+                        Background="Transparent"
+                        Focusable="false"
+                        HorizontalScrollBarVisibility="Hidden"
+                        VerticalScrollBarVisibility="Hidden" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
     <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
-        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+        <Border
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            SnapsToDevicePixels="true">
             <Grid>
-                <Themes1:ClassicBorderDecorator x:Name="Border" BorderBrush="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}" BorderThickness="2" BorderStyle="None">
-                    <Popup x:Name="PART_Popup" AllowsTransparency="true" Focusable="False" IsOpen="{TemplateBinding IsDropDownOpen}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                        <Themes1:SystemDropShadowChrome x:Name="Shdw" Color="Transparent" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=Border}">
-                            <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" >
+                <Themes1:ClassicBorderDecorator
+                    x:Name="Border"
+                    BorderBrush="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}"
+                    BorderStyle="None"
+                    BorderThickness="2">
+                    <Popup
+                        x:Name="PART_Popup"
+                        AllowsTransparency="true"
+                        Focusable="False"
+                        IsOpen="{TemplateBinding IsDropDownOpen}"
+                        Placement="Bottom"
+                        PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                        <Themes1:SystemDropShadowChrome
+                            x:Name="Shdw"
+                            MinWidth="{Binding ActualWidth, ElementName=Border}"
+                            MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                            Color="Transparent">
+                            <Border
+                                x:Name="DropDownBorder"
+                                BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                BorderThickness="1">
                                 <Border.Background>
-                                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png" Stretch="Fill" Opacity="0.5"/>
+                                    <ImageBrush
+                                        ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png"
+                                        Opacity="0.5"
+                                        Stretch="Fill" />
                                 </Border.Background>
                                 <ScrollViewer x:Name="DropDownScrollViewer">
                                     <Grid RenderOptions.ClearTypeHint="Enabled">
-                                        <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                            <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+                                        <Canvas
+                                            Width="0"
+                                            Height="0"
+                                            HorizontalAlignment="Left"
+                                            VerticalAlignment="Top">
+                                            <Rectangle
+                                                x:Name="OpaqueRect"
+                                                Width="{Binding ActualWidth, ElementName=DropDownBorder}"
+                                                Height="{Binding ActualHeight, ElementName=DropDownBorder}"
+                                                Fill="{Binding Background, ElementName=DropDownBorder}" />
                                         </Canvas>
-                                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                        <ItemsPresenter
+                                            x:Name="ItemsPresenter"
+                                            KeyboardNavigation.DirectionalNavigation="Contained"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                     </Grid>
                                 </ScrollViewer>
                             </Border>
                         </Themes1:SystemDropShadowChrome>
                     </Popup>
                 </Themes1:ClassicBorderDecorator>
-                <ToggleButton ClickMode="Press" Focusable="false" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"  MinWidth="0" MinHeight="0" Style="{StaticResource ComboBoxTransparentButtonStyle}" Width="Auto"/>
+                <ToggleButton
+                    Width="Auto"
+                    MinWidth="0"
+                    MinHeight="0"
+                    ClickMode="Press"
+                    Focusable="false"
+                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
                 <DockPanel>
-                    <FrameworkElement DockPanel.Dock="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
-                    <TextBox x:Name="PART_EditableTextBox"  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                    <FrameworkElement Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" DockPanel.Dock="Right" />
+                    <TextBox
+                        x:Name="PART_EditableTextBox"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{StaticResource ComboBoxEditableTextBox}" />
                 </DockPanel>
 
             </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="HasItems" Value="false">
-                <Setter Property="MinHeight" TargetName="DropDownBorder" Value="95"/>
+                <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
             </Trigger>
-            <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
-                <Setter Property="Margin" TargetName="Shdw" Value="0,0,5,5"/>
-                <Setter Property="Color" TargetName="Shdw" Value="#71000000"/>
+            <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsGrouping" Value="true"/>
-                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                    <Condition Property="IsGrouping" Value="true" />
+                    <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
                 </MultiTrigger.Conditions>
-                <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
             </MultiTrigger>
-            <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
-                <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
-                <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+            <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false">
+                <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
+                <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
     <Style x:Key="BaseComboBoxStyle" TargetType="{x:Type ComboBox}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}"/>
-        <Setter Property="Foreground" Value="White"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="#08335f"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Margin" Value="0,0,0,0"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="Height" Value="24"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="IsTextSearchCaseSensitive" Value="true"/>
-        <Setter Property="IsEditable" Value="true"/>
-        <Setter Property="StaysOpenOnEdit" Value="true"/>
+        <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="#08335f" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Height" Value="24" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="IsTextSearchCaseSensitive" Value="true" />
+        <Setter Property="IsEditable" Value="true" />
+        <Setter Property="StaysOpenOnEdit" Value="true" />
 
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
 
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                    <Border
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="true">
                         <Grid>
-                            <Themes1:ClassicBorderDecorator x:Name="Border" BorderBrush="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}" BorderThickness="2" BorderStyle="None">
-                                <Popup x:Name="PART_Popup" AllowsTransparency="true" Focusable="False" IsOpen="{TemplateBinding IsDropDownOpen}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                                    <Themes1:SystemDropShadowChrome x:Name="Shdw" Color="Transparent" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=Border}">
-                                        <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1"  >
+                            <Themes1:ClassicBorderDecorator
+                                x:Name="Border"
+                                BorderBrush="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}"
+                                BorderStyle="None"
+                                BorderThickness="2">
+                                <Popup
+                                    x:Name="PART_Popup"
+                                    AllowsTransparency="true"
+                                    Focusable="False"
+                                    IsOpen="{TemplateBinding IsDropDownOpen}"
+                                    Placement="Bottom"
+                                    PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                                    <Themes1:SystemDropShadowChrome
+                                        x:Name="Shdw"
+                                        MinWidth="{Binding ActualWidth, ElementName=Border}"
+                                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                        Color="Transparent">
+                                        <Border
+                                            x:Name="DropDownBorder"
+                                            BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                            BorderThickness="1">
                                             <Border.Background>
-                                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png"/>
+                                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/内部背景.png" />
                                             </Border.Background>
                                             <ScrollViewer x:Name="DropDownScrollViewer">
                                                 <Grid RenderOptions.ClearTypeHint="Enabled">
-                                                    <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                                        <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+                                                    <Canvas
+                                                        Width="0"
+                                                        Height="0"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Top">
+                                                        <Rectangle
+                                                            x:Name="OpaqueRect"
+                                                            Width="{Binding ActualWidth, ElementName=DropDownBorder}"
+                                                            Height="{Binding ActualHeight, ElementName=DropDownBorder}"
+                                                            Fill="{Binding Background, ElementName=DropDownBorder}" />
                                                     </Canvas>
-                                                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                                    <ItemsPresenter
+                                                        x:Name="ItemsPresenter"
+                                                        KeyboardNavigation.DirectionalNavigation="Contained"
+                                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                                 </Grid>
                                             </ScrollViewer>
                                         </Border>
@@ -2023,46 +2600,62 @@
                                 </Popup>
                             </Themes1:ClassicBorderDecorator>
                             <DockPanel Margin="2">
-                                <FrameworkElement DockPanel.Dock="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+                                <FrameworkElement Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" DockPanel.Dock="Right" />
                                 <Border x:Name="SelectedItemBorder" Margin="{TemplateBinding Padding}">
-                                    <ContentPresenter ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,1,1,1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                    <ContentPresenter
+                                        Margin="1,1,1,1"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                 </Border>
                             </DockPanel>
-                            <ToggleButton ClickMode="Press" Focusable="false" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="2" MinWidth="0" MinHeight="0" Style="{StaticResource ComboBoxTransparentButtonStyle}" Width="Auto"/>
+                            <ToggleButton
+                                Width="Auto"
+                                MinWidth="0"
+                                MinHeight="0"
+                                Margin="2"
+                                ClickMode="Press"
+                                Focusable="false"
+                                IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ComboBoxTransparentButtonStyle}" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <!--<Condition Property="IsSelectionBoxHighlighted" Value="true"/>-->
-                                <Condition Property="IsDropDownOpen" Value="false"/>
+                                <Condition Property="IsDropDownOpen" Value="false" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
                         </MultiTrigger>
                         <!--<Trigger Property="IsSelectionBoxHighlighted" Value="true">
                             <Setter Property="Background" TargetName="SelectedItemBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
                         </Trigger>-->
                         <Trigger Property="HasItems" Value="false">
-                            <Setter Property="MinHeight" TargetName="DropDownBorder" Value="95"/>
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
                         </Trigger>
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
-                                <Condition Property="IsGrouping" Value="true"/>
-                                <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                                <Condition Property="IsGrouping" Value="true" />
+                                <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
                         </MultiTrigger>
-                        <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
-                            <Setter Property="Margin" TargetName="Shdw" Value="0,0,5,5"/>
-                            <Setter Property="Color" TargetName="Shdw" Value="#71000000"/>
+                        <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                            <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
                         </Trigger>
-                        <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
-                            <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
-                            <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                        <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false">
+                            <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
+                            <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -2070,29 +2663,38 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsEditable" Value="true">
-                <Setter Property="IsTabStop" Value="false"/>
-                <Setter Property="Padding" Value="1"/>
-                <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}"/>
+                <Setter Property="IsTabStop" Value="false" />
+                <Setter Property="Padding" Value="1" />
+                <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
             </Trigger>
         </Style.Triggers>
 
     </Style>
-    <Style TargetType="ComboBox" BasedOn="{StaticResource BaseComboBoxStyle}"></Style>
+    <Style BasedOn="{StaticResource BaseComboBoxStyle}" TargetType="ComboBox" />
     <!--#endregion-->
 
-    <!--#region ColorCommboxStyle -->
-    <ObjectDataProvider ObjectInstance="{x:Type Colors}"  MethodName="GetProperties" x:Key="colorPropertieOdp"></ObjectDataProvider>
-    <Style x:Key="ColorCommboxStyle" TargetType="ComboBox" BasedOn="{StaticResource BaseComboBoxStyle}">
-        <Setter Property="IsTextSearchCaseSensitive" Value="False"/>
-        <Setter Property="IsEditable" Value="False"/>
-        <Setter Property="StaysOpenOnEdit" Value="False"/>
-        <Setter Property="ItemsSource" Value="{Binding Source={StaticResource colorPropertieOdp}}"></Setter>
+    <!--#region ColorCommboxStyle-->
+    <ObjectDataProvider
+        x:Key="colorPropertieOdp"
+        MethodName="GetProperties"
+        ObjectInstance="{x:Type Colors}" />
+    <Style
+        x:Key="ColorCommboxStyle"
+        BasedOn="{StaticResource BaseComboBoxStyle}"
+        TargetType="ComboBox">
+        <Setter Property="IsTextSearchCaseSensitive" Value="False" />
+        <Setter Property="IsEditable" Value="False" />
+        <Setter Property="StaysOpenOnEdit" Value="False" />
+        <Setter Property="ItemsSource" Value="{Binding Source={StaticResource colorPropertieOdp}}" />
         <Setter Property="ItemTemplate">
             <Setter.Value>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
-                        <Rectangle Fill="{Binding Name}" Width="40" Height="10"></Rectangle>
-                        <TextBlock Text="{Binding Name}"></TextBlock>
+                        <Rectangle
+                            Width="40"
+                            Height="10"
+                            Fill="{Binding Name}" />
+                        <TextBlock Text="{Binding Name}" />
                     </StackPanel>
                 </DataTemplate>
             </Setter.Value>
diff --git a/BPASmartClient.CustomResource/Themes/MyStyle.xaml b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
index acb3308f..9416dc1c 100644
--- a/BPASmartClient.CustomResource/Themes/MyStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
@@ -1,51 +1,70 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
 
-                    >
 
 
 
 
+    <ImageBrush x:Key="imageBJ" ImageSource="/BPASmartClient.CustomResource;component/Image/图层1.png" />
+
+    <ImageBrush x:Key="image1" ImageSource="/BPASmartClient.CustomResource;component/Image/shape.png" />
+    <ImageBrush x:Key="image2" ImageSource="/BPASmartClient.CustomResource;component/Image/shape1.png" />
 
-    <ImageBrush x:Key="imageBJ" ImageSource="/BPASmartClient.CustomResource;component/Image/图层1.png"/>
 
-    <ImageBrush x:Key="image1" ImageSource="/BPASmartClient.CustomResource;component/Image/shape.png"/>
-    <ImageBrush x:Key="image2" ImageSource="/BPASmartClient.CustomResource;component/Image/shape1.png"/>
-    
-    
     <!--#region Color-->
-    <SolidColorBrush x:Key="foreground" Color="#FFA2C2E8"/>
+    <SolidColorBrush x:Key="foreground" Color="#FFA2C2E8" />
     <!--#endregion-->
-    
+
     <!--#region ToggleButton-->
     <Style x:Key="StatusBtnStyle告警" TargetType="ToggleButton">
         <Style.Setters>
-            <Setter Property="Width"  Value="36"></Setter>
-            <Setter Property="Height" Value="32"></Setter>
-            <Setter Property="Cursor" Value="Hand"></Setter>
-            <Setter Property="IsChecked" Value="{Binding IsCheck,Mode=TwoWay}"></Setter>
+            <Setter Property="Width" Value="36" />
+            <Setter Property="Height" Value="32" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="IsChecked" Value="{Binding IsCheck, Mode=TwoWay}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ToggleButton">
                         <Grid Cursor="Hand">
-                            <Border x:Name="bd1" Cursor="Hand" Visibility="Collapsed" Width="25" Height="13" HorizontalAlignment="Right" Panel.ZIndex="100" VerticalAlignment="Top" Margin="0,-5,-5,0" CornerRadius="3" Background="#33FF0000" >
-                                <TextBlock Text="{Binding ListNum}"  Foreground="#FF2AA7D3" HorizontalAlignment="Center"></TextBlock>
+                            <Border
+                                x:Name="bd1"
+                                Width="25"
+                                Height="13"
+                                Margin="0,-5,-5,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                Panel.ZIndex="100"
+                                Background="#33FF0000"
+                                CornerRadius="3"
+                                Cursor="Hand"
+                                Visibility="Collapsed">
+                                <TextBlock
+                                    HorizontalAlignment="Center"
+                                    Foreground="#FF2AA7D3"
+                                    Text="{Binding ListNum}" />
                             </Border>
-                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="/BPASmartClient.CustomResource;component/Image/告警.png" Panel.ZIndex="0" Stretch="UniformToFill" ></Image>
+                            <Image
+                                x:Name="image1"
+                                Width="{TemplateBinding Width}"
+                                Height="{TemplateBinding Height}"
+                                Panel.ZIndex="0"
+                                Source="/BPASmartClient.CustomResource;component/Image/告警.png"
+                                Stretch="UniformToFill" />
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="true">
-                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png"></Setter>
+                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png" />
                             </Trigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsCheck}" Value="true"></Condition>
-                                    <Condition Binding="{Binding IsAlarm}" Value="true"></Condition>
+                                    <Condition Binding="{Binding IsCheck}" Value="true" />
+                                    <Condition Binding="{Binding IsAlarm}" Value="true" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
-                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png"></Setter>
-                                    <Setter TargetName="bd1" Property="Visibility" Value="Visible"></Setter>
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png" />
+                                    <Setter TargetName="bd1" Property="Visibility" Value="Visible" />
                                 </MultiDataTrigger.Setters>
                             </MultiDataTrigger>
                         </ControlTemplate.Triggers>
@@ -57,27 +76,32 @@
 
     <Style x:Key="StatusBtnStyle网络连接状态" TargetType="ToggleButton">
         <Style.Setters>
-            <Setter Property="Width"  Value="20"></Setter>
-            <Setter Property="Height" Value="25"></Setter>
-            <Setter Property="Cursor" Value="Hand"></Setter>
-            <Setter Property="IsChecked" Value="{Binding IsCheck,Mode=TwoWay}"></Setter>
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Height" Value="25" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="IsChecked" Value="{Binding IsCheck, Mode=TwoWay}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ToggleButton">
                         <Grid Cursor="Hand">
-                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="/BPASmartClient.CustomResource;component/Image/告警/Wifi_NO.ico" Panel.ZIndex="0" ></Image>
+                            <Image
+                                x:Name="image1"
+                                Width="{TemplateBinding Width}"
+                                Height="{TemplateBinding Height}"
+                                Panel.ZIndex="0"
+                                Source="/BPASmartClient.CustomResource;component/Image/告警/Wifi_NO.ico" />
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="true">
-                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.ico"></Setter>
+                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.ico" />
                             </Trigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
-                                    <Condition Binding="{Binding IsCheck}" Value="true"></Condition>
-                                    <Condition Binding="{Binding IsAlarm}" Value="true"></Condition>
+                                    <Condition Binding="{Binding IsCheck}" Value="true" />
+                                    <Condition Binding="{Binding IsAlarm}" Value="true" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
-                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.ico"></Setter>
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.ico" />
                                 </MultiDataTrigger.Setters>
                             </MultiDataTrigger>
                         </ControlTemplate.Triggers>
@@ -87,140 +111,140 @@
         </Style.Setters>
     </Style>
     <!--#endregion-->
-    
-    <!--#region Image -->
+
+    <!--#region Image-->
     <Style x:Key="imagetop_L" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Height" Value="80"></Setter>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/Top_L.png"/>
+            <Setter Property="Height" Value="80" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/Top_L.png" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="imagetop_Title" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Width" Value="250"></Setter>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/黑菠萝智慧餐饮管理系统.png"/>
+            <Setter Property="Width" Value="250" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/黑菠萝智慧餐饮管理系统.png" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="imagetop_矩形" TargetType="Image">
         <Style.Setters>
-        
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/顶部矩形.png"/>
+
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部切图/顶部矩形.png" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="imagetop" TargetType="Image">
         <Style.Setters>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/topTitle.png"/>
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/topTitle.png" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="imagetop1" TargetType="Image">
         <Style.Setters>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部.png"/>
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="image营销额" TargetType="Image">
         <Style.Setters>
-            <Setter Property="VerticalAlignment" Value="Bottom"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/营销额.png"/>
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/营销额.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="imagetitletext" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Height"  Value="20"></Setter>
-            <Setter Property="VerticalAlignment" Value="Center"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/titletext.png"/>
+            <Setter Property="Height" Value="20" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/titletext.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="image圆角矩形" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Height"  Value="33"></Setter>
-            <Setter Property="VerticalAlignment" Value="Center"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/圆角矩形 4.png"/>
+            <Setter Property="Height" Value="33" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/圆角矩形 4.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="image黑菠萝科技" TargetType="Image">
         <Style.Setters>
-            <Setter Property="HorizontalAlignment" Value="Center"></Setter>
-            <Setter Property="Height" Value="24"></Setter>
-            <Setter Property="Width" Value="70"></Setter>
-            <Setter Property="VerticalAlignment" Value="Bottom"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/黑菠萝科技.png"/>
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="Height" Value="24" />
+            <Setter Property="Width" Value="70" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/黑菠萝科技.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="MainBJ" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/背景图片.png"/>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/背景图片.png" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="TitleImage" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/hbl.ico"></Setter>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/hbl.ico" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="timeImage" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Width" Value="20"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/日期1.png"></Setter>
+            <Setter Property="Width" Value="20" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/日期1.png" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="image文字" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/文字.png"/>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/文字.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="image底部科技背景" TargetType="Image">
         <Style.Setters>
-            <Setter Property="VerticalAlignment" Value="Bottom"></Setter>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/底部背景.png"/>
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/底部背景.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="image个人信息" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/个人信息.png"/>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/个人信息.png" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="image维护" TargetType="Image">
         <Style.Setters>
-            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/维护.png"/>
+            <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/维护.png" />
         </Style.Setters>
     </Style>
 
     <Style x:Key="image标题其他" TargetType="Image">
-        <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部矩形.png"></Setter>
-        <Setter Property="Height" Value="12"></Setter>
+        <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/顶部矩形.png" />
+        <Setter Property="Height" Value="12" />
     </Style>
-    
+
     <Style x:Key="image告警" TargetType="Image">
-        <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警.png"></Setter>
-        <Setter Property="Height" Value="24"></Setter>
+        <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警.png" />
+        <Setter Property="Height" Value="24" />
     </Style>
-    
+
     <Style x:Key="image有告警" TargetType="Image">
 
-        <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png"></Setter>
-        <Setter Property="Height" Value="30"></Setter>
+        <Setter Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png" />
+        <Setter Property="Height" Value="30" />
 
     </Style>
     <!--#endregion-->
@@ -230,17 +254,17 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/窗体背景.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/窗体背景.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="button_no" TargetType="Border">
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Button_No.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Button_No.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -252,23 +276,23 @@
 
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Button_Select.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Button_Select.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
     </Style>
-    
-    
+
+
     <Style x:Key="bordertopL" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Height" Value="80"></Setter>
-            <Setter Property="Width" Value="300"></Setter>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
+            <Setter Property="Height" Value="80" />
+            <Setter Property="Width" Value="300" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
 
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Top_L.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/Top_L.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -276,11 +300,11 @@
 
     <Style x:Key="border阴影边框" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Height" Value="50"></Setter>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
+            <Setter Property="Height" Value="50" />
+            <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/阴影边框.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/阴影边框.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -290,7 +314,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/边角.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/边角.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -300,7 +324,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/顶部矩形.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/顶部矩形.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -308,10 +332,10 @@
 
     <Style x:Key="bordertopTitle" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Height" Value="100"></Setter>
+            <Setter Property="Height" Value="100" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/topTitle.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/topTitle.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -321,7 +345,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/tittle.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/tittle.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -331,7 +355,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景1.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景1.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -341,7 +365,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景2.png" Stretch="Uniform"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景2.png" Stretch="Uniform" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -351,7 +375,13 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景3.png" Stretch="Fill"  Opacity="1" Viewbox="0,0,1,1" TileMode="FlipX" ViewboxUnits="RelativeToBoundingBox"/>
+                    <ImageBrush
+                        ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景3.png"
+                        Opacity="1"
+                        Stretch="Fill"
+                        TileMode="FlipX"
+                        Viewbox="0,0,1,1"
+                        ViewboxUnits="RelativeToBoundingBox" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -361,7 +391,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景4.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景4.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -371,7 +401,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景5.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景5.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -381,7 +411,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景6.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景6.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -391,7 +421,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景7.png" Stretch="None"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/窗体背景7.png" Stretch="None" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -399,10 +429,10 @@
 
     <Style x:Key="border圆角矩形" TargetType="Border">
         <Style.Setters>
-            <Setter Property="BorderThickness" Value="3"></Setter>
+            <Setter Property="BorderThickness" Value="3" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/圆角矩形.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/圆角矩形.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -410,10 +440,10 @@
 
     <Style x:Key="border不规则矩形" TargetType="Border">
         <Style.Setters>
-            <Setter Property="BorderThickness" Value="0.5"></Setter>
+            <Setter Property="BorderThickness" Value="0.5" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不规则矩形.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不规则矩形.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -421,10 +451,10 @@
 
     <Style x:Key="border矩形" TargetType="Border">
         <Style.Setters>
-            <Setter Property="BorderThickness" Value="0.5"></Setter>
+            <Setter Property="BorderThickness" Value="0.5" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -434,15 +464,15 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部背景.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部背景.png" />
                 </Setter.Value>
             </Setter>
             <Setter Property="BorderBrush">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png"></ImageBrush>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png" />
                 </Setter.Value>
             </Setter>
-            <Setter Property="BorderThickness" Value="0,0,0,1"></Setter>
+            <Setter Property="BorderThickness" Value="0,0,0,1" />
         </Style.Setters>
     </Style>
 
@@ -450,7 +480,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/标题背景.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/标题背景.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -460,7 +490,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -470,7 +500,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/窗体背景2.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/窗体背景2.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -480,7 +510,7 @@
         <Style.Setters>
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -488,13 +518,13 @@
 
     <Style x:Key="border竖线" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Width" Value="1"></Setter>
-            <Setter Property="Height" Value="40"></Setter>
-            <Setter Property="BorderThickness" Value="0"></Setter>
-            <Setter Property="Margin" Value="5"></Setter>
+            <Setter Property="Width" Value="1" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Margin" Value="5" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/竖线.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/竖线.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -502,16 +532,16 @@
 
     <Style x:Key="border内部" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Width" Value="320"></Setter>
+            <Setter Property="Width" Value="320" />
 
-            <Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
-            <Setter Property="VerticalAlignment"  Value="Stretch"></Setter>
-            <Setter Property="BorderThickness" Value="0"></Setter>
-            <Setter Property="Margin" Value="5"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Margin" Value="5" />
 
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/内部.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/内部.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -519,15 +549,15 @@
 
     <Style x:Key="border矩形2" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Margin" Value="0,0,10,0"></Setter>
-            <Setter Property="VerticalAlignment"  Value="Top"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-            <Setter Property="Width" Value="92"></Setter>
-            <Setter Property="Height" Value="46"></Setter>
-            <Setter Property="BorderThickness" Value="0"></Setter>
+            <Setter Property="Margin" Value="0,0,10,0" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Width" Value="92" />
+            <Setter Property="Height" Value="46" />
+            <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形1.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/矩形1.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -535,13 +565,13 @@
 
     <Style x:Key="border矢量智能对象" TargetType="Border">
         <Style.Setters>
-            <Setter Property="Width" Value="1"></Setter>
-            <Setter Property="Height" Value="40"></Setter>
-            <Setter Property="BorderThickness" Value="0"></Setter>
-            <Setter Property="Margin" Value="5"></Setter>
+            <Setter Property="Width" Value="1" />
+            <Setter Property="Height" Value="40" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Margin" Value="5" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景矢量/矢量智能对象.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/背景矢量/矢量智能对象.png" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -562,7 +592,7 @@
 
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/边框效果2.png" Stretch="Fill"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/边框效果2.png" Stretch="Fill" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -570,13 +600,13 @@
 
     <Style x:Key="border右下" TargetType="Border">
         <Style.Setters>
-            <Setter Property="HorizontalAlignment" Value="Right"></Setter>
-            <Setter Property="VerticalAlignment" Value="Bottom"></Setter>
-            <Setter Property="Height" Value="23"></Setter>
-            <Setter Property="Width" Value="22"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="Height" Value="23" />
+            <Setter Property="Width" Value="22" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/右下.png" Stretch="None"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/右下.png" Stretch="None" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -584,13 +614,13 @@
 
     <Style x:Key="border左下" TargetType="Border">
         <Style.Setters>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-            <Setter Property="VerticalAlignment" Value="Bottom"></Setter>
-            <Setter Property="Height" Value="22"></Setter>
-            <Setter Property="Width" Value="23"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Bottom" />
+            <Setter Property="Height" Value="22" />
+            <Setter Property="Width" Value="23" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/左下.png" Stretch="None"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/左下.png" Stretch="None" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -598,13 +628,13 @@
 
     <Style x:Key="border左上" TargetType="Border">
         <Style.Setters>
-            <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="Height" Value="22"></Setter>
-            <Setter Property="Width" Value="23"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Height" Value="22" />
+            <Setter Property="Width" Value="23" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/左边.png" Stretch="None"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/左边.png" Stretch="None" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -612,13 +642,13 @@
 
     <Style x:Key="border右上" TargetType="Border">
         <Style.Setters>
-            <Setter Property="HorizontalAlignment" Value="Right"></Setter>
-            <Setter Property="VerticalAlignment" Value="Top"></Setter>
-            <Setter Property="Height" Value="23"></Setter>
-            <Setter Property="Width" Value="22"></Setter>
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Height" Value="23" />
+            <Setter Property="Width" Value="22" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/右上.png" Stretch="None"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/From/右上.png" Stretch="None" />
                 </Setter.Value>
             </Setter>
         </Style.Setters>
@@ -635,9 +665,9 @@
                 <ControlTemplate TargetType="Button">
                     <Border Name="TitleBarBr" Background="Transparent">
                         <ContentPresenter
-                                Margin="{TemplateBinding Margin}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            Margin="{TemplateBinding Margin}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="true">
@@ -651,12 +681,12 @@
 
     <Style x:Key="CommonBtnStyle退出按钮" TargetType="Button">
         <Style.Setters>
-            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-            <Setter Property="HorizontalContentAlignment"  Value="Center"></Setter>
-            <Setter Property="Cursor" Value="Hand"></Setter>
-            <Setter Property="Width" Value="65"></Setter>
-            <Setter Property="Height" Value="24"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Right"></Setter>
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Width" Value="65" />
+            <Setter Property="Height" Value="24" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
@@ -672,15 +702,28 @@
                         </ControlTemplate.Resources>-->
                         <Border x:Name="BD" CornerRadius="2">
                             <Border.Background>
-                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/退出按钮.png"/>
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/退出按钮.png" />
                             </Border.Background>
+                            <StackPanel
+                                Margin="5"
+                                HorizontalAlignment="Center"
+                                Orientation="Horizontal">
+                                <Image Width="16" Source="/BPASmartClient.CustomResource;component/Image/退出.png" />
+                                <TextBlock
+                                    x:Name="textBlock"
+                                    Margin="5,0,0,0"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Foreground="#A5FFFFFF"
+                                    Text="{TemplateBinding Content}" />
+                            </StackPanel>
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal"/>
+                                    <VisualState x:Name="Normal" />
                                     <VisualState x:Name="MouseOver">
                                         <Storyboard>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="textBlock">
-                                                <EasingColorKeyFrame KeyTime="0" Value="White"/>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="textBlock" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
+                                                <EasingColorKeyFrame KeyTime="0" Value="White" />
                                             </ColorAnimationUsingKeyFrames>
                                             <!--<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)" Storyboard.TargetName="BD">
                                                 <EasingColorKeyFrame KeyTime="0" Value="#FF135EC2"/>
@@ -693,15 +736,10 @@
                                             </ColorAnimationUsingKeyFrames>-->
                                         </Storyboard>
                                     </VisualState>
-                                    <VisualState x:Name="Pressed"/>
-                                    <VisualState x:Name="Disabled"/>
+                                    <VisualState x:Name="Pressed" />
+                                    <VisualState x:Name="Disabled" />
                                 </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
-                            <StackPanel HorizontalAlignment="Center" Margin="5" Orientation="Horizontal">
-                                <Image Source="/BPASmartClient.CustomResource;component/Image/退出.png" Width="16" ></Image>
-                                <TextBlock Margin="5,0,0,0" x:Name="textBlock"  Text="{TemplateBinding Content}"  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="#A5FFFFFF" />
-                            </StackPanel>
-
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -711,38 +749,46 @@
 
     <Style x:Key="CommonBtnStyle返回按钮" TargetType="Button">
         <Style.Setters>
-            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-            <Setter Property="HorizontalContentAlignment"  Value="Center"></Setter>
-            <Setter Property="Cursor" Value="Hand"></Setter>
-            <Setter Property="Width" Value="65"></Setter>
-            <Setter Property="Height" Value="24"></Setter>
-            <Setter Property="HorizontalAlignment" Value="Right"></Setter>
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Width" Value="65" />
+            <Setter Property="Height" Value="24" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border x:Name="BD" CornerRadius="2">
                             <Border.Background>
-                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab_NoWZBJ.png"/>
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab_NoWZBJ.png" />
                             </Border.Background>
+                            <StackPanel
+                                Margin="5"
+                                HorizontalAlignment="Center"
+                                Orientation="Horizontal">
+                                <Image Width="16" Source="/BPASmartClient.CustomResource;component/Image/退出.png" />
+                                <TextBlock
+                                    x:Name="textBlock"
+                                    Margin="5,0,0,0"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Foreground="#A5FFFFFF"
+                                    Text="{TemplateBinding Content}" />
+                            </StackPanel>
                             <VisualStateManager.VisualStateGroups>
                                 <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal"/>
+                                    <VisualState x:Name="Normal" />
                                     <VisualState x:Name="MouseOver">
                                         <Storyboard>
-                                            <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="textBlock">
-                                                <EasingColorKeyFrame KeyTime="0" Value="White"/>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetName="textBlock" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
+                                                <EasingColorKeyFrame KeyTime="0" Value="White" />
                                             </ColorAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
-                                    <VisualState x:Name="Pressed"/>
-                                    <VisualState x:Name="Disabled"/>
+                                    <VisualState x:Name="Pressed" />
+                                    <VisualState x:Name="Disabled" />
                                 </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
-                            <StackPanel HorizontalAlignment="Center" Margin="5" Orientation="Horizontal">
-                                <Image Source="/BPASmartClient.CustomResource;component/Image/退出.png" Width="16" ></Image>
-                                <TextBlock Margin="5,0,0,0" x:Name="textBlock"  Text="{TemplateBinding Content}"  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="#A5FFFFFF" />
-                            </StackPanel>
-
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
@@ -752,26 +798,37 @@
 
     <Style x:Key="CommonBtn_1" TargetType="Button">
         <Style.Setters>
-            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-            <Setter Property="Cursor" Value="Hand"></Setter>
-            <Setter Property="Foreground" Value="{DynamicResource foreground}"></Setter>
-            <Setter Property="Width" Value="65"></Setter>
-            <Setter Property="Height" Value="24"></Setter>
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+            <Setter Property="Width" Value="65" />
+            <Setter Property="Height" Value="24" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <ControlTemplate.Resources>
                             <Storyboard x:Key="OnMouseEnter1">
-                                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)" Storyboard.TargetName="BD">
-                                    <EasingColorKeyFrame KeyTime="0:0:0.1" Value="#FF139DDB"/>
+                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="BD" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                                    <EasingColorKeyFrame KeyTime="0:0:0.1" Value="#FF139DDB" />
                                 </ColorAnimationUsingKeyFrames>
-                                <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)" Storyboard.TargetName="BD">
-                                    <EasingColorKeyFrame KeyTime="0:0:0.1" Value="#FF135EC2"/>
+                                <ColorAnimationUsingKeyFrames Storyboard.TargetName="BD" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                                    <EasingColorKeyFrame KeyTime="0:0:0.1" Value="#FF135EC2" />
                                 </ColorAnimationUsingKeyFrames>
                             </Storyboard>
                         </ControlTemplate.Resources>
-                        <Border x:Name="BD"  CornerRadius="12" BorderThickness="1" BorderBrush="#05408a" Background="Transparent">
-                            <TextBlock x:Name="textBlock" FontSize="12" Text="{TemplateBinding Content}"  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource foreground}" />
+                        <Border
+                            x:Name="BD"
+                            Background="Transparent"
+                            BorderBrush="#05408a"
+                            BorderThickness="1"
+                            CornerRadius="12">
+                            <TextBlock
+                                x:Name="textBlock"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                FontSize="12"
+                                Foreground="{DynamicResource foreground}"
+                                Text="{TemplateBinding Content}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="true">
@@ -787,33 +844,41 @@
             </Setter>
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="CommonBtn_返回" TargetType="Button">
         <Style.Setters>
-            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-            <Setter Property="Cursor" Value="Hand"></Setter>
-            <Setter Property="Foreground" Value="{DynamicResource foreground}"></Setter>
-            <Setter Property="Width" Value="68"></Setter>
-            <Setter Property="Height" Value="25"></Setter>
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+            <Setter Property="Width" Value="68" />
+            <Setter Property="Height" Value="25" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border x:Name="BD" Cursor="Hand">
-                            <StackPanel Orientation="Horizontal"  HorizontalAlignment="Right" Margin="5,0,10,0">
+                            <StackPanel
+                                Margin="5,0,10,0"
+                                HorizontalAlignment="Right"
+                                Orientation="Horizontal">
                                 <Border Width="16" Margin="5">
                                     <Border.Background>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮图标.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮图标.png" />
                                     </Border.Background>
                                 </Border>
-                                <TextBlock x:Name="textBlock" VerticalAlignment="Center" FontSize="14" Text="{TemplateBinding Content}" Foreground="#4fade8" />
-                                <!--Text="{TemplateBinding Content}"-->
+                                <TextBlock
+                                    x:Name="textBlock"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Foreground="#4fade8"
+                                    Text="{TemplateBinding Content}" />
+                                <!--  Text="{TemplateBinding Content}"  -->
                             </StackPanel>
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="true">
                                 <Setter TargetName="BD" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png" />
                                     </Setter.Value>
                                 </Setter>
                                 <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
@@ -821,7 +886,7 @@
                             <Trigger Property="IsMouseOver" Value="False">
                                 <Setter TargetName="BD" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png" />
                                     </Setter.Value>
                                 </Setter>
                                 <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
@@ -829,7 +894,7 @@
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="BD" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
                                     </Setter.Value>
                                 </Setter>
                                 <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
@@ -843,11 +908,11 @@
 
     <Style TargetType="Button">
         <Style.Setters>
-            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-            <Setter Property="Cursor" Value="Hand"></Setter>
-            <Setter Property="Foreground" Value="{DynamicResource foreground}"></Setter>
-            <Setter Property="Width" Value="69"></Setter>
-            <Setter Property="Height" Value="25"></Setter>
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Cursor" Value="Hand" />
+            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+            <Setter Property="Width" Value="69" />
+            <Setter Property="Height" Value="25" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
@@ -862,13 +927,19 @@
                             </Storyboard>
                         </ControlTemplate.Resources>-->
                         <Border x:Name="BD" Cursor="Hand">
-                            <TextBlock x:Name="textBlock" FontSize="12" Text="{TemplateBinding Content}"  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource foreground}" />
+                            <TextBlock
+                                x:Name="textBlock"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                FontSize="12"
+                                Foreground="{DynamicResource foreground}"
+                                Text="{TemplateBinding Content}" />
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="true">
                                 <Setter TargetName="BD" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
                                     </Setter.Value>
                                 </Setter>
                                 <Setter TargetName="textBlock" Property="Foreground" Value="White" />
@@ -876,7 +947,7 @@
                             <Trigger Property="IsMouseOver" Value="False">
                                 <Setter TargetName="BD" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOff.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOff.png" />
                                     </Setter.Value>
                                 </Setter>
                                 <Setter TargetName="textBlock" Property="Foreground" Value="#FFD7DCE0" />
@@ -884,7 +955,7 @@
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="BD" Property="Background">
                                     <Setter.Value>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
                                     </Setter.Value>
                                 </Setter>
                                 <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
@@ -898,45 +969,65 @@
     <!--#endregion-->
 
     <!--#region TextBox-->
-    <Style x:Key="TextBoxStyle人员" BasedOn="{x:Null}" TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#A4EBF7"/>
+    <Style
+        x:Key="TextBoxStyle人员"
+        BasedOn="{x:Null}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Foreground" Value="#A4EBF7" />
         <Setter Property="Background">
             <Setter.Value>
-                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/搜索框.png"/>
+                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/搜索框.png" />
             </Setter.Value>
         </Setter>
-        <Setter Property="FontSize" Value="14"></Setter>
-        <Setter Property="TextWrapping" Value="NoWrap"></Setter>
-        <Setter Property="BorderBrush" Value="Transparent"></Setter>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="1"/>
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-        <Setter Property="VerticalAlignment"  Value="Center"></Setter>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Height" Value="35"></Setter>
-        <Setter Property="Width" Value="auto"></Setter>
-        <Setter Property="MinWidth" Value="200"></Setter>
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="Height" Value="35" />
+        <Setter Property="Width" Value="auto" />
+        <Setter Property="MinWidth" Value="200" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
-                    <Themes:ListBoxChrome x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" RenderMouseOver="{TemplateBinding IsMouseOver}" RenderFocused="{TemplateBinding IsKeyboardFocusWithin}" SnapsToDevicePixels="true">
+                    <Themes:ListBoxChrome
+                        x:Name="Bd"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        RenderFocused="{TemplateBinding IsKeyboardFocusWithin}"
+                        RenderMouseOver="{TemplateBinding IsMouseOver}"
+                        SnapsToDevicePixels="true">
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto"/>
-                                <ColumnDefinition/>
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <Image Margin="20,0,0,0" Tag="Search" Source="Image/搜索按钮.png" Cursor="Hand" Width="20" Height="Auto" HorizontalAlignment="Right" ></Image>
-                            <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center"/>
+                            <Image
+                                Width="20"
+                                Height="Auto"
+                                Margin="20,0,0,0"
+                                HorizontalAlignment="Right"
+                                Cursor="Hand"
+                                Source="Image/搜索按钮.png"
+                                Tag="Search" />
+                            <ScrollViewer
+                                x:Name="PART_ContentHost"
+                                VerticalAlignment="Center"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             <!--<local:ButtonEx Grid.Column="1" ButtonType="Icon" Icon="Images/search.png" Cursor="Hand" Margin="3" Width="{Binding ElementName=PART_ContentHost, Path=Height}" Height="{Binding ElementName=PART_ContentHost, Path=Height}" Click="Button_SearchMBK_Click"/>-->
                         </Grid>
                     </Themes:ListBoxChrome>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -945,48 +1036,56 @@
         <Style.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
-                    <Condition Property="IsSelectionActive" Value="false"/>
+                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true" />
+                    <Condition Property="IsSelectionActive" Value="false" />
                 </MultiTrigger.Conditions>
-                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
+                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
             </MultiTrigger>
         </Style.Triggers>
     </Style>
-    
-    <Style x:Key="TextBoxStyle搜索框" BasedOn="{x:Null}" TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#A4EBF7"/>
-        <Setter Property="FontSize" Value="14"></Setter>
-        <Setter Property="TextWrapping" Value="NoWrap"></Setter>
-        <Setter Property="BorderBrush" Value="Transparent"></Setter>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Margin"  Value="10,0,0,0"/>
-        <Setter Property="AllowDrop" Value="true"/>
+
+    <Style
+        x:Key="TextBoxStyle搜索框"
+        BasedOn="{x:Null}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="Foreground" Value="#A4EBF7" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="TextWrapping" Value="NoWrap" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Margin" Value="10,0,0,0" />
+        <Setter Property="AllowDrop" Value="true" />
         <Setter Property="CaretBrush" Value="Aqua" />
         <Setter Property="Padding" Value="1" />
-        <Setter Property="HorizontalAlignment" Value="Left"></Setter>
-        <Setter Property="VerticalAlignment"  Value="Center"></Setter>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Height" Value="40"></Setter>
-        <Setter Property="Width" Value="135"></Setter>
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Width" Value="135" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Border x:Name="Bd" VerticalAlignment="Center">
                         <Border.Background>
-                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/搜索框.png"/>
+                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/搜索框.png" />
                         </Border.Background>
 
-                        <Grid >
+                        <Grid>
                             <ScrollViewer
                                 x:Name="PART_ContentHost"
                                 VerticalAlignment="Center"
                                 HorizontalScrollBarVisibility="Hidden"
                                 VerticalScrollBarVisibility="Hidden" />
 
-                            <Image Source="/BPASmartClient.CustomResource;component/Image/搜索按钮.png" HorizontalAlignment="Left" Margin="10,3,3,3" Stretch="Uniform" Width="20"></Image>
+                            <Image
+                                Width="20"
+                                Margin="10,3,3,3"
+                                HorizontalAlignment="Left"
+                                Source="/BPASmartClient.CustomResource;component/Image/搜索按钮.png"
+                                Stretch="Uniform" />
                         </Grid>
 
                     </Border>
@@ -1011,10 +1110,10 @@
         <Style.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
-                    <Condition Property="IsSelectionActive" Value="false"/>
+                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true" />
+                    <Condition Property="IsSelectionActive" Value="false" />
                 </MultiTrigger.Conditions>
-                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
+                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
             </MultiTrigger>
         </Style.Triggers>
     </Style>
@@ -1026,7 +1125,7 @@
         <GradientStop Offset="0.07" Color="#E2E3EA" />
         <GradientStop Offset="1" Color="#E3E9EF" />
     </LinearGradientBrush>
-    
+
     <Style
         x:Key="UserNameTextBoxStyle"
         BasedOn="{x:Null}"
@@ -1172,52 +1271,80 @@
     <!--#region TextBlock-->
     <Style TargetType="TextBlock">
         <Style.Setters>
-            <Setter Property="Foreground" Value="#a2c2e8"/>
-            <Setter Property="HorizontalAlignment"  Value="Left"/>
-            <Setter Property="VerticalAlignment"  Value="Center"/>
-            <Setter Property="FontSize"  Value="20"/>
+            <Setter Property="Foreground" Value="#a2c2e8" />
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontSize" Value="20" />
         </Style.Setters>
     </Style>
-    
+
     <Style x:Key="Title" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="18"></Setter>
-        <Setter Property="Foreground" Value="#FF58C7EE"></Setter>
-        <Setter Property="VerticalAlignment" Value="Center"></Setter>
-        <Setter Property="HorizontalAlignment"  Value="Center"></Setter>
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="#FF58C7EE" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
     </Style>
     <!--#endregion-->
-    
+
     <!--#region GroupBox-->
-    <BorderGapMaskConverter x:Key="BorderGapMaskConverter"/>
-    
-    <Style  TargetType="{x:Type GroupBox}">
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="#FF68D8FE"/>
+    <BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
+
+    <Style TargetType="{x:Type GroupBox}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="#FF68D8FE" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
                     <Grid SnapsToDevicePixels="true">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="6"/>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="6"/>
+                            <ColumnDefinition Width="6" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="6" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="6"/>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="6" />
                         </Grid.RowDefinitions>
-                        <Rectangle Grid.ColumnSpan="4" Grid.RowSpan="2" />
-                        <Border   BorderThickness="0" Grid.ColumnSpan="4"  CornerRadius="0" Grid.Row="2" Grid.RowSpan="2" Margin="0,0,0,0">
-                        </Border>
-                        <Image Source="/BPASmartClient.CustomResource;component/Image/表格/矩形2609.png" Margin="0,5,0,0"  Grid.Column="1"  Grid.Row="0" Grid.RowSpan="2" Height="4" HorizontalAlignment="Left"></Image>
-                        <Border x:Name="Header" Margin="30,0,0,0" Grid.Column="1" Height="30" Padding="3,1,3,0" Grid.Row="0" Grid.RowSpan="2">
-                            <ContentPresenter ContentSource="Header" VerticalAlignment="Center" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        <Rectangle Grid.RowSpan="2" Grid.ColumnSpan="4" />
+                        <Border
+                            Grid.Row="2"
+                            Grid.RowSpan="2"
+                            Grid.ColumnSpan="4"
+                            Margin="0,0,0,0"
+                            BorderThickness="0"
+                            CornerRadius="0" />
+                        <Image
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Grid.Column="1"
+                            Height="4"
+                            Margin="0,5,0,0"
+                            HorizontalAlignment="Left"
+                            Source="/BPASmartClient.CustomResource;component/Image/表格/矩形2609.png" />
+                        <Border
+                            x:Name="Header"
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Grid.Column="1"
+                            Height="30"
+                            Margin="30,0,0,0"
+                            Padding="3,1,3,0">
+                            <ContentPresenter
+                                VerticalAlignment="Center"
+                                ContentSource="Header"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </Border>
-                        <ContentPresenter Grid.ColumnSpan="2" Grid.Column="1" Margin="{TemplateBinding Padding}" Grid.Row="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        <ContentPresenter
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            Margin="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
@@ -1225,14 +1352,17 @@
     </Style>
     <!--#endregion-->
 
-    <!--空MenuHeader-->
+    <!--  空MenuHeader  -->
     <Style x:Key="MenuItem_NonStyle" TargetType="{x:Type MenuItem}">
         <Setter Property="Height" Value="Auto" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type MenuItem}">
                     <Grid Margin="1">
-                        <ContentPresenter x:Name="Presenter" ContentSource="Header" Margin="{TemplateBinding Padding}" />
+                        <ContentPresenter
+                            x:Name="Presenter"
+                            Margin="{TemplateBinding Padding}"
+                            ContentSource="Header" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/BPASmartClient.Http/APIHelper.cs b/BPASmartClient.Http/APIHelper.cs
index 118aec3d..ae51dca4 100644
--- a/BPASmartClient.Http/APIHelper.cs
+++ b/BPASmartClient.Http/APIHelper.cs
@@ -8,6 +8,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Newtonsoft.Json;
+using System.Net.Http;
+
 namespace BPASmartClient.Http
 {
     public class APIHelper
@@ -17,6 +19,13 @@ namespace BPASmartClient.Http
         public static APIHelper GetInstance => _Instance ?? (_Instance = new APIHelper());
         private APIHelper() { }
 
+        /// <summary>
+        /// POST 数据请求
+        /// </summary>
+        /// <param name="url">地址</param>
+        /// <param name="data">参数数据</param>
+        /// <param name="head">请求头</param>
+        /// <returns></returns>
         public string PostData(string url, string data, string head)
         {
             byte[] b = Encoding.UTF8.GetBytes(data);//把字符串转换为二进制
diff --git a/BPASmartClient.MORKSM.BK.PLC/MorksMachine.cs b/BPASmartClient.MORKSM.BK.PLC/MorksMachine.cs
index 3fd7d3e3..61b0f388 100644
--- a/BPASmartClient.MORKSM.BK.PLC/MorksMachine.cs
+++ b/BPASmartClient.MORKSM.BK.PLC/MorksMachine.cs
@@ -18,6 +18,7 @@ namespace BPASmartClient.MORKSM.BK.PLC
 
         public override void Init()
         {
+            modbusTcp.ModbusTcpConnect(IpAddress, Port);
             //读取数据
             EventBus.EventBus.GetInstance().Subscribe<ReadModel>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
             {
@@ -63,7 +64,7 @@ namespace BPASmartClient.MORKSM.BK.PLC
 
         public override void Start()
         {
-            modbusTcp.ModbusTcpConnect(IpAddress, Port);
+
         }
 
         public override void Stop()
diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs
index a3192839..1b6b007b 100644
--- a/BPASmartClient.Modbus/ModbusTcp.cs
+++ b/BPASmartClient.Modbus/ModbusTcp.cs
@@ -195,7 +195,7 @@ namespace BPASmartClient.Modbus
             }
             catch (Exception ex)
             {
-                MessageLog.GetInstance.ShowEx(ex.ToString());
+                MessageLog.GetInstance.ShowEx($"读取地址：【{startAddress}】,读取类型：【{readType}】出错，{ex.ToString()}");
                 if (ex.InnerException is SocketException)
                 {
                     tcpClient = null;
diff --git a/BPASmartClient.MorkS/Control.cs b/BPASmartClient.MorkS/Control.cs
index 4ec8ee1b..7ddb8ee9 100644
--- a/BPASmartClient.MorkS/Control.cs
+++ b/BPASmartClient.MorkS/Control.cs
@@ -36,7 +36,24 @@ namespace BPASmartClient.MorkS
             DataParse();
             ReadPLCData();
             Main();
-            //初始化中
+
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                if (RTrig.GetInstance("ResetProgram").Start(Initing))
+                {
+                    ThreadManage.GetInstance().StopTask("MainTask", new Action(() =>
+                    {
+                        ThreadManage.GetInstance().StopTask("ReadPLCData", new Action(() =>
+                        {
+                            mORKS = null;
+                            mORKS = new GVL_MORKS();
+                            ReadPLCData();
+                            Main();
+                        }));
+                    }));
+                }
+                Thread.Sleep(10);
+            }), "ResetProgram");
         }
 
         public override void Stop()
@@ -63,6 +80,7 @@ namespace BPASmartClient.MorkS
                 if (@event is RecipeBomEvent recipe)
                 {
                     recipeBoms = recipe.recipeBoms;
+                    WriteRecipeBoms();
                 }
             });
         }
@@ -135,24 +153,24 @@ namespace BPASmartClient.MorkS
                     }
                 }));
 
-                ReadData("M550.0", 20, new Action<bool[]>((bools) =>
-                {
-                    //alarm.MachineLeftLowTemperature = bools[0];
-                    //alarm.MachineRightLowTemperature = bools[1];
-                    //alarm.Supply1_LossBowl = bools[2];
-                    //alarm.Supply2_LossBowl = bools[3];
-                    //alarm.Supply1_ErrorOutBowl = bools[4];
-                    //alarm.Supply2_ErrorOutBowl = bools[5];
-                    //alarm.PushBowlCylinderError = bools[6];
-                    //alarm.NoodleMacCommunicateError = bools[7];
-                    //alarm.DosingMacCommunicateError = bools[8];
-                    //alarm.RobotMacCommunicateError = bools[9];
-                    //alarm.RobotInitError = bools[11];
-                    //alarm.RobotUrgentStop = bools[12];
-                    //alarm.RobotNotInRemoteMode = bools[13];
-                    //alarm.RobotNotInReady = bools[14];
-                    //alarm.RobotSelfInException = bools[15];
-                }));
+                //ReadData("M550.0", 20, new Action<bool[]>((bools) =>
+                //{
+                //    //alarm.MachineLeftLowTemperature = bools[0];
+                //    //alarm.MachineRightLowTemperature = bools[1];
+                //    //alarm.Supply1_LossBowl = bools[2];
+                //    //alarm.Supply2_LossBowl = bools[3];
+                //    //alarm.Supply1_ErrorOutBowl = bools[4];
+                //    //alarm.Supply2_ErrorOutBowl = bools[5];
+                //    //alarm.PushBowlCylinderError = bools[6];
+                //    //alarm.NoodleMacCommunicateError = bools[7];
+                //    //alarm.DosingMacCommunicateError = bools[8];
+                //    //alarm.RobotMacCommunicateError = bools[9];
+                //    //alarm.RobotInitError = bools[11];
+                //    //alarm.RobotUrgentStop = bools[12];
+                //    //alarm.RobotNotInRemoteMode = bools[13];
+                //    //alarm.RobotNotInReady = bools[14];
+                //    //alarm.RobotSelfInException = bools[15];
+                //}));
 
                 EventBus.EventBus.GetInstance().Publish(new ReadModel() { Id = DeviceId, Address = "VW372", Length = 1 }, (o) =>
                 {
@@ -185,6 +203,7 @@ namespace BPASmartClient.MorkS
                  if (@event == null) return;
                  if (@event is DoOrderEvent order)
                  {
+                     if (order.MorkOrder.GoodBatchings == null) return;
                      OrderCount++;
                      MessageLog.GetInstance.Show($"接收到{OrderCount}次订单");
                      foreach (var item in order.MorkOrder.GoodBatchings)
diff --git a/BPASmartClient/DeviceInfo.xml b/BPASmartClient/DeviceInfo.xml
index a432a1db..e8b39e7b 100644
--- a/BPASmartClient/DeviceInfo.xml
+++ b/BPASmartClient/DeviceInfo.xml
@@ -24,18 +24,18 @@
       <Peripheral Module="BPASmartClient.MORKSM.BK.PLC.MorksMachine">
         <Parameters>
           <IpAddress>127.0.0.1</IpAddress>
-          <Port>1</Port>
+          <Port>502</Port>
         </Parameters>
       </Peripheral>
 
-      <Peripheral Module="BPASmartClient.MORKSM.BK.PLC.MorksMachine">
+      <!--<Peripheral Module="BPASmartClient.MORKSM.BK.PLC.MorksMachine">
         <Parameters>
           <IpAddress>127.0.10.1</IpAddress>
           <Port>11</Port>
         </Parameters>
-      </Peripheral>
+      </Peripheral>-->
 
-     <Peripheral Module="BPASmartClient.KLMCoffee.CoffeeMachine">
+      <Peripheral Module="BPASmartClient.KLMCoffee.CoffeeMachine">
         <Parameters>
           <PortName>COM8</PortName>
           <BaudRate>38400</BaudRate>
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index 2a31f8eb..1ac85a2d 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -1,135 +1,261 @@
-<Window x:Class="BPASmartClient.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BPASmartClient"
-        xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
-        xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-        Title="MainWindow" Width="1600"
-        Height="900"
-        AllowsTransparency="True"
-        Background="{x:Null}"
-        Topmost="False"
-        WindowStartupLocation="CenterScreen"
-        WindowStyle="None"
-        mc:Ignorable="d">
+<Window
+    x:Class="BPASmartClient.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
+    Title="MainWindow"
+    Width="1600"
+    Height="900"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    Topmost="False"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml"/>
-                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml"/>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
     <Window.DataContext>
-        <vm:MainViewModel></vm:MainViewModel>
+        <vm:MainViewModel />
     </Window.DataContext>
-    
-    <Border Style="{DynamicResource border主窗体背景}" x:Name="br" >
+
+    <Border x:Name="br" Style="{DynamicResource border主窗体背景}">
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="60"/>
-                <RowDefinition/>
+                <RowDefinition Height="60" />
+                <RowDefinition />
             </Grid.RowDefinitions>
 
-            <!--标题-->
+            <!--  标题  -->
             <Grid Grid.Row="0">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="300"></ColumnDefinition>
-                    <ColumnDefinition ></ColumnDefinition>
+                    <ColumnDefinition Width="300" />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <Border Grid.ColumnSpan="2" Style="{DynamicResource bordertop矩形}"></Border>
-                <Border Style="{DynamicResource bordertopL}"></Border>
-                <Image Margin="10,0,0,0" VerticalAlignment="Center" Style="{DynamicResource imagetop_Title}" ></Image>
+                <Border Grid.ColumnSpan="2" Style="{DynamicResource bordertop矩形}" />
+                <Border Style="{DynamicResource bordertopL}" />
+                <Image
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Center"
+                    Style="{DynamicResource imagetop_Title}" />
                 <Grid Grid.Column="1">
-                    <Menu >
-                        <MenuItem Header="状态监视"  >
-                            <MenuItem Header="日志监视" FontSize="12" Click="MenuItem_Click"  Tag="LogView" />
-                            <Separator/>
-                            <MenuItem Header="订单监视" FontSize="12" Click="MenuItem_Click"  Tag="RealTimeDataControl" />
-                            <Separator/>
-                            <MenuItem Header="设备监视" FontSize="12" Click="MenuItem_Click"  Tag="RealTimeDataControl"  />
-                            <Separator/>
-                            <MenuItem Header="告警监视" FontSize="12" Click="MenuItem_Click"  Tag="RealTimeDataControl" />
-                            <Separator/>
-                            <MenuItem Header="IOT监视" FontSize="12" Click="MenuItem_Click"  Tag="RealTimeDataControl" />
+                    <Menu>
+                        <MenuItem Header="状态监视">
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="日志监视"
+                                Tag="LogView" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="订单监视"
+                                Tag="OrderStatusView" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="设备监视"
+                                Tag="RealTimeDataControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="告警监视"
+                                Tag="RealTimeDataControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="IOT监视"
+                                Tag="RealTimeDataControl" />
                         </MenuItem>
                         <MenuItem Header="综合查询">
-                            <MenuItem Header="告警查询"  FontSize="12" Click="MenuItem_Click"  Tag="HistoryFaultControl"/>
-                            <Separator/>
-                            <MenuItem Header="日志查询" FontSize="12" Click="MenuItem_Click"  Tag="MaintenanceNotificationControl"/>
-                            <Separator/>
-                            <MenuItem Header="维护查询" FontSize="12" Click="MenuItem_Click"  Tag="WorkorderManagementControl"/>
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="告警查询"
+                                Tag="HistoryFaultControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="日志查询"
+                                Tag="MaintenanceNotificationControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="维护查询"
+                                Tag="WorkorderManagementControl" />
                         </MenuItem>
                         <MenuItem Header="功能列表">
-                            <MenuItem Header="加盟商管理" FontSize="12" Click="MenuItem_Click"  Tag="OnOffControl"/>
-                            <Separator/>
-                            <MenuItem Header="功能列表2" FontSize="12" Click="MenuItem_Click"  Tag="SystemParameterControl" />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="加盟商管理"
+                                Tag="OnOffControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="功能列表2"
+                                Tag="SystemParameterControl" />
                         </MenuItem>
                         <MenuItem Header="参数配置">
-                            <MenuItem Header="参数设置" FontSize="12" Click="MenuItem_Click"  Tag="OnOffControl"/>
-                            <Separator/>
-                            <MenuItem Header="系统设置" FontSize="12" Click="MenuItem_Click"  Tag="SystemParameterControl" />
-                            <Separator/>
-                            <MenuItem Header="退出程序" FontSize="12"  Click="MenuItem_Click"  Tag="RealTimevideoControl"/>
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="参数设置"
+                                Tag="OnOffControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="系统设置"
+                                Tag="SystemParameterControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="退出程序"
+                                Tag="RealTimevideoControl" />
                         </MenuItem>
                         <MenuItem Header="系统帮助">
-                            <MenuItem Header="版本更新历史" FontSize="12" Click="MenuItem_Click"  Tag="OnOffControl"/>
-                            <Separator/>
-                            <MenuItem Header="帮助文档" FontSize="12" Click="MenuItem_Click"  Tag="SystemParameterControl" />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="版本更新历史"
+                                Tag="OnOffControl" />
+                            <Separator />
+                            <MenuItem
+                                Click="MenuItem_Click"
+                                FontSize="12"
+                                Header="帮助文档"
+                                Tag="SystemParameterControl" />
                         </MenuItem>
                     </Menu>
                 </Grid>
 
-                <StackPanel Grid.Column="4" Orientation="Horizontal" HorizontalAlignment="Right" Height="50" VerticalAlignment="Top">
+                <StackPanel
+                    Grid.Column="4"
+                    Height="50"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Orientation="Horizontal">
                     <Border Style="{DynamicResource border竖线}" />
-                    <StackPanel  Margin="5" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                    <StackPanel
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
                         <TextBlock FontSize="12">网</TextBlock>
                         <TextBlock FontSize="12">络</TextBlock>
                     </StackPanel>
-                    <ToggleButton Margin="5" VerticalAlignment="Center"  ToolTip="网络连接状态" HorizontalAlignment="Center" Style="{DynamicResource StatusBtnStyle网络连接状态}" DataContext="{Binding GaoJingMessage}"  Cursor="Hand"/>
+                    <ToggleButton
+                        Margin="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Cursor="Hand"
+                        DataContext="{Binding GaoJingMessage}"
+                        Style="{DynamicResource StatusBtnStyle网络连接状态}"
+                        ToolTip="网络连接状态" />
                     <Border Style="{DynamicResource border竖线}" />
-                    <ToggleButton VerticalAlignment="Center"  ToolTip="告警消息" HorizontalAlignment="Center" Style="{DynamicResource StatusBtnStyle告警}" DataContext="{Binding GaoJingMessage}"  Cursor="Hand"/>
+                    <ToggleButton
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Cursor="Hand"
+                        DataContext="{Binding GaoJingMessage}"
+                        Style="{DynamicResource StatusBtnStyle告警}"
+                        ToolTip="告警消息" />
                     <Border Style="{DynamicResource border竖线}" />
-                    <Grid Margin="10,0,10,0"  VerticalAlignment="Center" >
+                    <Grid Margin="10,0,10,0" VerticalAlignment="Center">
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="30"/>
-                            <RowDefinition/>
+                            <RowDefinition Height="30" />
+                            <RowDefinition />
                         </Grid.RowDefinitions>
-                        <StackPanel Orientation="Horizontal" Grid.Row="0">
-                            <TextBlock x:Name="time"  FontSize="16" Text="18:00:00"/>
-                            <Image Style="{DynamicResource timeImage}" Margin="10,0,0,0"/>
+                        <StackPanel Grid.Row="0" Orientation="Horizontal">
+                            <TextBlock
+                                x:Name="time"
+                                FontSize="16"
+                                Text="18:00:00" />
+                            <Image Margin="10,0,0,0" Style="{DynamicResource timeImage}" />
                         </StackPanel>
-                        <StackPanel Grid.Row="1"  Orientation="Horizontal">
-                            <TextBlock x:Name="dateRL"  FontSize="10"  >星期一</TextBlock>
-                            <TextBlock x:Name="date" Margin="10,0,0,0" FontSize="10" >2021-11-13</TextBlock>
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock x:Name="dateRL" FontSize="10">星期一</TextBlock>
+                            <TextBlock
+                                x:Name="date"
+                                Margin="10,0,0,0"
+                                FontSize="10">
+                                2021-11-13
+                            </TextBlock>
                         </StackPanel>
                     </Grid>
                     <Border Style="{DynamicResource border竖线}" />
-                    <Button x:Name="ButClose" Grid.Column="4" Margin="10,0,20,0" Style="{DynamicResource CommonBtnStyle退出按钮}"  VerticalAlignment="Center"  ToolTip="退出程序"  Cursor="Hand"  Content="退出"/>
+                    <Button
+                        x:Name="ButClose"
+                        Grid.Column="4"
+                        Margin="10,0,20,0"
+                        VerticalAlignment="Center"
+                        Content="退出"
+                        Cursor="Hand"
+                        Style="{DynamicResource CommonBtnStyle退出按钮}"
+                        ToolTip="退出程序" />
                 </StackPanel>
             </Grid>
 
-            <!--底部窗体-->
+            <!--  底部窗体  -->
             <Grid Grid.Row="1" Margin="10">
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="45"/>
-                    <RowDefinition/>
+                    <RowDefinition Height="45" />
+                    <RowDefinition />
                 </Grid.RowDefinitions>
-                <!--顶部装饰-->
-                <Border Grid.Row="0" Style="{DynamicResource border右下}" Grid.RowSpan="2" />
-                <Border Grid.Row="0" Style="{DynamicResource border左下}" Grid.RowSpan="2"  />
-                <Border Grid.Row="0" Style="{DynamicResource border右上}" Grid.RowSpan="2"  />
-                <Border Grid.Row="0" Style="{DynamicResource border左上}" Grid.RowSpan="2"  />
+                <!--  顶部装饰  -->
+                <Border
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Style="{DynamicResource border右下}" />
+                <Border
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Style="{DynamicResource border左下}" />
+                <Border
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Style="{DynamicResource border右上}" />
+                <Border
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Style="{DynamicResource border左上}" />
                 <Grid Margin="10">
-                    <Border Style="{DynamicResource borderFromTitle}" Width="600"></Border>
-                    <Button Grid.Row="0" Content="返回" Style="{DynamicResource CommonBtn_返回}" HorizontalAlignment="Left"   VerticalAlignment="Top" Click="Button_Click"/>
-                    <TextBlock x:Name="Title" HorizontalAlignment="Center" FontSize="16" Foreground="#feffff">日志监控界面</TextBlock>
+                    <Border Width="600" Style="{DynamicResource borderFromTitle}" />
+                    <Button
+                        Grid.Row="0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Top"
+                        Click="Button_Click"
+                        Content="返回"
+                        Style="{DynamicResource CommonBtn_返回}" />
+                    <TextBlock
+                        x:Name="Title"
+                        HorizontalAlignment="Center"
+                        FontSize="16"
+                        Foreground="#feffff">
+                        日志监控界面
+                    </TextBlock>
                 </Grid>
                 <!--#region 底部窗体栏-->
 
-                <ContentControl Grid.Row="1"  x:Name="contentRegion"/>
+                <ContentControl x:Name="contentRegion" Grid.Row="1" />
                 <!--#endregion-->
                 <!--<Button Grid.Row="2" Content="返回" Style="{DynamicResource CommonBtn_返回}" HorizontalAlignment="Left"   VerticalAlignment="Top" Click="Button_Click"/>