diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
index d2e72496..a29b2e0c 100644
--- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
+++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj
@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <None Remove="Fonts\iconfont.ttf" />
+    <None Remove="Fonts\Quartz Regular.ttf" />
     <None Remove="Image\bg.png" />
     <None Remove="Image\btn_close.png" />
     <None Remove="Image\btn_normal.png" />
@@ -89,6 +90,7 @@
     <None Remove="Image\告警\预警f44b4b.png" />
     <None Remove="Image\图层1.png" />
     <None Remove="Image\圆形.png" />
+    <None Remove="Image\圆角矩形 30 拷贝.png" />
     <None Remove="Image\圆角矩形 4.png" />
     <None Remove="Image\圆角矩形.png" />
     <None Remove="Image\底部背景.png" />
@@ -183,6 +185,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Fonts\Quartz Regular.ttf" />
     <Resource Include="Image\btn_close.png" />
     <Resource Include="Image\ComboBoxPopSelect.png" />
     <Resource Include="Image\ComboBoxSelect.png" />
@@ -203,6 +206,7 @@
     <Resource Include="Image\界面2.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Image\圆角矩形 30 拷贝.png" />
     <Resource Include="Image\背景2.png" />
     <Resource Include="Image\边角.png" />
   </ItemGroup>
diff --git a/BPASmartClient.CustomResource/Fonts/Quartz Regular.ttf b/BPASmartClient.CustomResource/Fonts/Quartz Regular.ttf
new file mode 100644
index 00000000..46560922
Binary files /dev/null and b/BPASmartClient.CustomResource/Fonts/Quartz Regular.ttf differ
diff --git a/BPASmartClient.CustomResource/Image/圆角矩形 30 拷贝.png b/BPASmartClient.CustomResource/Image/圆角矩形 30 拷贝.png
new file mode 100644
index 00000000..a0a49ad1
Binary files /dev/null and b/BPASmartClient.CustomResource/Image/圆角矩形 30 拷贝.png differ
diff --git a/BPASmartClient.CustomResource/Themes/GenricStyle.xaml b/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
index c033fdb0..6f3f53a9 100644
--- a/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
@@ -6,22 +6,280 @@
     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="#a2c2e8" />
+    <SolidColorBrush x:Key="borderBrush" Color="#FF074B92" />
+    <SolidColorBrush x:Key="Titleforeground" Color="#FF07D7FF" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderColor" Color="#00c2f4"/>
+    <SolidColorBrush x:Key="LabelColor" Color="#FF00EEF3"/>
+    <SolidColorBrush x:Key="MainTitleforeground" Color="#feffff"/>
+    <SolidColorBrush x:Key="ButtonSelectForeground" Color="#4fade8"/>
+    <SolidColorBrush x:Key="ButtonUnSelectForeground" Color="#3afdff"/>
+    <SolidColorBrush x:Key="MeunSelectForeground" Color="#8f723c"/>
+    <SolidColorBrush x:Key="MeunUnSelectForeground" Color="White"/>
+
+    <!--<SolidColorBrush x:Key="foreground" Color="Red" />
+    <SolidColorBrush x:Key="borderBrush" Color="Red" />
+    <SolidColorBrush x:Key="Titleforeground" Color="Red" />
+    <SolidColorBrush x:Key="LabelColor" Color="Red" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderColor" Color="Red"/>
+    <SolidColorBrush x:Key="MainTitleforeground" Color="Red"/>
+    <SolidColorBrush x:Key="ButtonSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="ButtonUnSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="MeunSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="MeunUnSelectForeground" Color="Red"/>-->
     <!--#endregion-->
 
     <!--#region ScrollBar-->
+    <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <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" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Rectangle
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        Fill="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="{x:Type ScrollBar}">
+        <Setter Property="Background">
+            <Setter.Value>
+                <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="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <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}}" />
+                            </Grid.RowDefinitions>
+                            <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}" />
+                                </Track.DecreaseRepeatButton>
+
+                                <Track.IncreaseRepeatButton>
+                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
+                                </Track.IncreaseRepeatButton>
+                                <Track.Thumb>
+                                    <Thumb Themes:ScrollChrome.ScrollGlyph="VerticalGripper" Style="{StaticResource ScrollBarThumb}" />
+                                </Track.Thumb>
+                            </Track>
+                            <RepeatButton
+                                Grid.Row="2"
+                                Themes:ScrollChrome.ScrollGlyph="DownArrow"
+                                Command="{x:Static ScrollBar.LineDownCommand}"
+                                IsEnabled="{TemplateBinding IsMouseOver}"
+                                Style="{StaticResource DownScrollBarButton}" />
+                        </Grid>
+                    </Border>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ScrollBar}">
+                            <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}}" />
+                                    </Grid.ColumnDefinitions>
+                                    <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}" />
+                                        </Track.DecreaseRepeatButton>
+                                        <Track.IncreaseRepeatButton>
+                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource HorizontalScrollBarPageButton}" />
+                                        </Track.IncreaseRepeatButton>
+                                        <Track.Thumb>
+                                            <Thumb Themes:ScrollChrome.ScrollGlyph="HorizontalGripper" Style="{StaticResource ScrollBarThumb}" />
+                                        </Track.Thumb>
+                                    </Track>
+                                    <RepeatButton
+                                        Grid.Column="2"
+                                        Themes:ScrollChrome.ScrollGlyph="RightArrow"
+                                        Command="{x:Static ScrollBar.LineRightCommand}"
+                                        IsEnabled="{TemplateBinding IsMouseOver}"
+                                        Style="{StaticResource RightScrollBarButton}" />
+                                </Grid>
+                            </Border>
+
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
     <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>
+    <!--#endregion-->
 
+    <!--#region Menu-->
     <SolidColorBrush x:Key="Menu.Static.Background" Color="#FFF0F0F0" />
     <SolidColorBrush x:Key="Expander.Static.Circle.Stroke" Color="#FF333333" />
     <SolidColorBrush x:Key="Expander.Static.Circle.Fill" Color="#FFFFFFFF" />
@@ -126,57 +384,6 @@
     <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3" />
     <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="#FF7EB4EA" />
     <SolidColorBrush x:Key="TextBox.Focus.Border" Color="#FF569DE5" />
-    <Style TargetType="{x:Type PasswordBox}">
-        <Setter Property="PasswordChar" Value="●" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-        <Setter Property="BorderBrush" Value="{StaticResource TextBox.Static.Border}" />
-        <Setter Property="Foreground" Value="#FF02C9FD" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-        <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="CaretBrush" Value="White" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type PasswordBox}">
-                    <Border
-                        x:Name="border"
-                        BorderBrush="#FF08335F"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        SnapsToDevicePixels="True">
-                        <ScrollViewer
-                            x:Name="PART_ContentHost"
-                            Focusable="false"
-                            HorizontalScrollBarVisibility="Hidden"
-                            VerticalScrollBarVisibility="Hidden" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="border" Property="Opacity" Value="0.56" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource TextBox.MouseOver.Border}" />
-                        </Trigger>
-                        <Trigger Property="IsKeyboardFocused" Value="true">
-                            <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource TextBox.Focus.Border}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <MultiTrigger>
-                <MultiTrigger.Conditions>
-                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true" />
-                    <Condition Property="IsSelectionActive" Value="false" />
-                </MultiTrigger.Conditions>
-                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
-            </MultiTrigger>
-        </Style.Triggers>
-    </Style>
     <Style x:Key="ExpanderUpHeaderStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
             <Setter.Value>
@@ -489,6 +696,84 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <!--#endregion-->
+
+    <!--#region PasswordBox-->
+    <Style TargetType="{x:Type PasswordBox}">
+        <!--✹✬✮✭✱✷✸❆❊☯☧☬♆➵➶➷➸➻➼➫➬➩➪➭➯➱➽⊙◎▧▨◐◑▒◊▣●♒☺❤☻✿☢-->
+        <Setter Property="PasswordChar" Value="❤" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{StaticResource TextBox.Static.Border}" />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+        <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="CaretBrush" Value="White" />
+        <Setter Property="Height" Value="24" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type PasswordBox}">
+                    <Border
+                        x:Name="border"
+                        BorderBrush="{DynamicResource borderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="True">
+                        <ScrollViewer
+                            x:Name="PART_ContentHost"
+                            Focusable="false"
+                            HorizontalScrollBarVisibility="Hidden"
+                            VerticalScrollBarVisibility="Hidden" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter TargetName="border" Property="Opacity" Value="0.56" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <!--<Setter TargetName="border" Property="BorderBrush" Value="{StaticResource TextBox.MouseOver.Border}" />-->
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="true">
+                            <!--<Setter TargetName="border" Property="BorderBrush" Value="{StaticResource TextBox.Focus.Border}" />-->
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true" />
+                    <Condition Property="IsSelectionActive" Value="false" />
+                </MultiTrigger.Conditions>
+                <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
+            </MultiTrigger>
+        </Style.Triggers>
+    </Style>
+<!--#endregion-->
+    
+    <!--#region DatePicker-->
+    <Style x:Key="DatePickerCalendarStyle_1" TargetType="{x:Type Calendar}">
+        <Setter Property="Foreground" Value="{DynamicResource foreground}"/>
+        <Setter Property="CalendarButtonStyle" Value="{DynamicResource ButtonStyle_Calendar}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource DayButtonStyle_Calendar}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Calendar}">
+                    <StackPanel x:Name="PART_Root" HorizontalAlignment="Center">
+                        <CalendarItem Template="{DynamicResource CalendarItemTemplate1}" x:Name="PART_CalendarItem" BorderThickness="{TemplateBinding BorderThickness}" Style="{TemplateBinding CalendarItemStyle}" BorderBrush="#FF051532">
+                            <CalendarItem.Background>
+                                <ImageBrush/>
+                            </CalendarItem.Background>
+                        </CalendarItem>
+                    </StackPanel>
+                </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}}" />
@@ -587,15 +872,17 @@
         </Setter>
     </Style>
     <Style TargetType="{x:Type DatePicker}">
-        <Setter Property="Foreground" Value="#a2c2e8 " />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
         <Setter Property="IsTodayHighlighted" Value="True" />
         <Setter Property="SelectedDateFormat" Value="Short" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="2" />
         <Setter Property="Height" Value="24" />
-        <Setter Property="BorderBrush" Value="#08335f" />
+        <Setter Property="CalendarStyle" Value="{DynamicResource DatePickerCalendarStyle_1}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource borderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="FontFamily" Value="../Fonts/#Quartz M"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DatePicker}">
@@ -914,259 +1201,313 @@
         <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="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <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="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <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" />
+    <Style x:Key="DayButtonStyle_Calendar" TargetType="CalendarDayButton">
+        <Setter Property="Background" Value="#063172" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="FontSize" Value="12" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Image
-                        Width="5"
-                        Height="8"
-                        Source="Image/Scroll_←.png" />
+                <ControlTemplate TargetType="{x:Type CalendarDayButton}">
+                    <Grid x:Name="Grid" Margin="0">
+                        <Border
+                            x:Name="Bg"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="1" />
+                        <ContentPresenter
+                            x:Name="NormalText"
+                            Margin="5,2,5,2"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <!--  不在当月的日期  -->
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter TargetName="Grid" Property="Opacity" Value="0.4" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Foreground" Value="Lime" />
+                            <Setter Property="Background">
+                                <Setter.Value>
+                                    <RadialGradientBrush>
+                                        <GradientStop Color="#04214e"/>
+                                        <GradientStop Color="#3051a6" Offset="0.9"/>
+                                    </RadialGradientBrush>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="BorderBrush" Value="#0765f7"/>
+                        </Trigger>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter Property="Foreground" Value="White" />
+                            <Setter Property="Background">
+                                <Setter.Value>
+                                    <RadialGradientBrush>
+                                        <GradientStop Color="#04214e"/>
+                                        <GradientStop Color="#3051a6" Offset="0.9"/>
+                                    </RadialGradientBrush>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="BorderBrush" Value="#0765f7"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Foreground" Value="Yellow" />
+                            <Setter Property="Background">
+                                <Setter.Value>
+                                    <RadialGradientBrush>
+                                        <GradientStop Color="#04214e"/>
+                                        <GradientStop Color="#3051a6" Offset="0.9"/>
+                                    </RadialGradientBrush>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="BorderBrush" Value="#0765f7"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </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" />
+    <Style x:Key="ButtonStyle_Calendar" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource Titleforeground}" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Image
-                        Width="5"
-                        Height="8"
-                        Source="Image/Scroll_→.png" />
+                <ControlTemplate TargetType="Button">
+                    <Border
+                        Name="TitleBarBr"
+                        Background="Transparent"
+                        BorderBrush="#0a60e6"
+                        BorderThickness="0.5"
+                        Margin="5"
+                        CornerRadius="4">
+                        <ContentPresenter
+                            Margin="{TemplateBinding Margin}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="False">
+                            <Setter TargetName="TitleBarBr" Property="Background" >
+                                <Setter.Value>
+                                    <RadialGradientBrush>
+                                        <GradientStop Color="#04214e"/>
+                                        <GradientStop Color="#023051A6" Offset="0.9"/>
+                                    </RadialGradientBrush>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="TitleBarBr" Property="BorderThickness" Value="0.7"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="False">
+                            <Setter TargetName="TitleBarBr" Property="Background" Value="Transparent"/>
+                            <Setter TargetName="TitleBarBr" Property="BorderThickness" Value="0"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </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="Template">
+    <ControlTemplate x:Key="CalendarItemTemplate1" TargetType="{x:Type CalendarItem}">
+        <ControlTemplate.Resources>
+            <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+                <TextBlock Foreground="{DynamicResource foreground}" FontFamily="Verdana" FontWeight="Normal" FontSize="14" HorizontalAlignment="Center" Margin="0,6,0,6" Text="{Binding}" VerticalAlignment="Center"/>
+            </DataTemplate>
+        </ControlTemplate.Resources>
+        <Grid x:Name="PART_Root">
+            <Grid.Resources>
+                <SolidColorBrush x:Key="DisabledColor" Color="#A5FFFFFF"/>
+            </Grid.Resources>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal"/>
+                    <VisualState x:Name="Disabled">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0" Storyboard.TargetName="PART_DisabledVisual" To="1" Storyboard.TargetProperty="Opacity"/>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="1">
+                <Border BorderThickness="1,1,1,1" CornerRadius="1,1,1,1" BorderBrush="#FF00499D" Background="#FF04214E">
+                    <Grid>
+                        <Grid.Resources>
+                            <ControlTemplate x:Key="PreviousButtonTemplate" TargetType="{x:Type Button}">
+                                <Grid Cursor="Hand">
+                                    <VisualStateManager.VisualStateGroups>
+                                        <VisualStateGroup x:Name="CommonStates">
+                                            <VisualState x:Name="Normal"/>
+                                            <VisualState x:Name="MouseOver"/>
+                                            <VisualState x:Name="Disabled"/>
+                                        </VisualStateGroup>
+                                    </VisualStateManager.VisualStateGroups>
+                                    <Rectangle Opacity="1" Stretch="Fill"/>
+                                    <Grid>
+                                        <Path x:Name="path" Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" Fill="#FF1473E6" HorizontalAlignment="Left" Height="10" Margin="14,-6,0,0" Stretch="Fill" VerticalAlignment="Center" Width="6"/>
+                                    </Grid>
+                                </Grid>
+                            </ControlTemplate>
+                            <ControlTemplate x:Key="NextButtonTemplate" TargetType="{x:Type Button}">
+                                <Grid Cursor="Hand">
+                                    <VisualStateManager.VisualStateGroups>
+                                        <VisualStateGroup x:Name="CommonStates">
+                                            <VisualState x:Name="Normal"/>
+                                            <VisualState x:Name="MouseOver"/>
+                                            <VisualState x:Name="Disabled"/>
+                                        </VisualStateGroup>
+                                    </VisualStateManager.VisualStateGroups>
+                                    <Rectangle Opacity="1" Stretch="Fill"/>
+                                    <Grid>
+                                        <Path x:Name="path" Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" Fill="#FF1473E6" HorizontalAlignment="Right" Height="10" Margin="0,-6,14,0" Stretch="Fill" VerticalAlignment="Center" Width="6"/>
+                                    </Grid>
+                                </Grid>
+                            </ControlTemplate>
+                            <ControlTemplate x:Key="HeaderButtonTemplate" TargetType="{x:Type Button}">
+                                <Grid Cursor="Hand">
+                                    <VisualStateManager.VisualStateGroups>
+                                        <VisualStateGroup x:Name="CommonStates">
+                                            <VisualState x:Name="Normal"/>
+                                            <VisualState x:Name="MouseOver">
+                                                <Storyboard>
+                                                    <ColorAnimation Duration="0" Storyboard.TargetName="buttonContent" To="#FF73A9D8" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)"/>
+                                                </Storyboard>
+                                            </VisualState>
+                                            <VisualState x:Name="Disabled">
+                                                <Storyboard>
+                                                    <DoubleAnimation Duration="0" Storyboard.TargetName="buttonContent" To=".5" Storyboard.TargetProperty="Opacity"/>
+                                                </Storyboard>
+                                            </VisualState>
+                                        </VisualStateGroup>
+                                    </VisualStateManager.VisualStateGroups>
+                                    <ContentPresenter x:Name="buttonContent" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" TextElement.Foreground="{DynamicResource Titleforeground}" TextElement.FontSize="14" TextElement.FontWeight="Normal"  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                </Grid>
+                            </ControlTemplate>
+                        </Grid.Resources>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Button x:Name="PART_PreviousButton" Grid.Column="0" Focusable="False" HorizontalAlignment="Left" Height="20" Grid.Row="0" Template="{StaticResource PreviousButtonTemplate}" Width="28" />
+                        <Button x:Name="PART_HeaderButton" Grid.Column="1" Focusable="False" FontWeight="Bold" FontSize="10.5" HorizontalAlignment="Center" Grid.Row="0" Template="{StaticResource HeaderButtonTemplate}" VerticalAlignment="Center"  Cursor="Hand"/>
+                        <Button x:Name="PART_NextButton" Grid.Column="2" Focusable="False" HorizontalAlignment="Right" Height="20" Grid.Row="0" Template="{StaticResource NextButtonTemplate}" Width="28"/>
+                        <Grid  x:Name="PART_MonthView" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="6,-1,6,6" Grid.Row="1" Visibility="Visible">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                        </Grid>
+                        <Grid x:Name="PART_YearView" Grid.ColumnSpan="3" HorizontalAlignment="Center" Margin="6,-3,7,6" Grid.Row="1" Visibility="Hidden">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                        </Grid>
+                    </Grid>
+                </Border>
+            </Border>
+            <Rectangle x:Name="PART_DisabledVisual" Fill="{StaticResource DisabledColor}" Opacity="0" RadiusX="2" RadiusY="2" Stroke="{StaticResource DisabledColor}" Stretch="Fill" StrokeThickness="1" Visibility="Collapsed"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Visibility" TargetName="PART_DisabledVisual" Value="Visible"/>
+            </Trigger>
+            <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
+                <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden"/>
+                <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Decade">
+                <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden"/>
+                <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible"/>
+            </DataTrigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style TargetType="{x:Type Calendar}">
+        <Setter Property="Foreground" Value="{DynamicResource foreground}"/>
+        <Setter Property="CalendarButtonStyle" Value="{DynamicResource ButtonStyle_Calendar}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{DynamicResource DayButtonStyle_Calendar}" />
+        <Setter Property="FontFamily" Value="../Fonts/#Quartz M"/>
+        <Setter Property="Background">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Rectangle
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Fill="{TemplateBinding Background}" />
-                </ControlTemplate>
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                    <GradientStop Color="#FFE4EAF0" Offset="0"/>
+                    <GradientStop Color="#FFECF0F4" Offset="0.16"/>
+                    <GradientStop Color="#FFFCFCFD" Offset="0.16"/>
+                    <GradientStop Color="#FFFFFFFF" Offset="1"/>
+                </LinearGradientBrush>
             </Setter.Value>
         </Setter>
-    </Style>
-
-    <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
-        <Setter Property="OverridesDefaultStyle" Value="true" />
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Template">
+        <Setter Property="BorderBrush">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <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" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                    <GradientStop Color="#FFA3AEB9" Offset="0"/>
+                    <GradientStop Color="#FF8399A9" Offset="0.375"/>
+                    <GradientStop Color="#FF718597" Offset="0.375"/>
+                    <GradientStop Color="#FF617584" Offset="1"/>
+                </LinearGradientBrush>
             </Setter.Value>
         </Setter>
-    </Style>
-
-    <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="BorderThickness" Value="1"/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Rectangle
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Fill="{TemplateBinding Background}" />
+                <ControlTemplate TargetType="{x:Type Calendar}">
+                    <StackPanel x:Name="PART_Root" HorizontalAlignment="Center">
+                        <CalendarItem Template="{DynamicResource CalendarItemTemplate1}" x:Name="PART_CalendarItem" BorderThickness="{TemplateBinding BorderThickness}" Style="{TemplateBinding CalendarItemStyle}" BorderBrush="#FF051532" Cursor="Hand">
+                            <CalendarItem.Background>
+                                <ImageBrush/>
+                            </CalendarItem.Background>
+                        </CalendarItem>
+                    </StackPanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
+    <!--#endregion-->
 
-    <Style TargetType="{x:Type ScrollBar}">
-        <Setter Property="Background">
-            <Setter.Value>
-                <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" />
+    <!--#region DataGrid-->
+    <Style TargetType="{x:Type GridSplitter}">
+        <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 ScrollBar}">
+                <ControlTemplate TargetType="{x:Type Thumb}">
                     <Border
-                        Width="10"
-                        Margin="0,0,0,0"
+                        Width="{TemplateBinding Width}"
+                        Margin="{TemplateBinding Margin}"
                         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}}" />
-                            </Grid.RowDefinitions>
-                            <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}" />
-                                </Track.DecreaseRepeatButton>
-
-                                <Track.IncreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource VerticalScrollBarPageButton}" />
-                                </Track.IncreaseRepeatButton>
-                                <Track.Thumb>
-                                    <Thumb Themes:ScrollChrome.ScrollGlyph="VerticalGripper" Style="{StaticResource ScrollBarThumb}" />
-                                </Track.Thumb>
-                            </Track>
-                            <RepeatButton
-                                Grid.Row="2"
-                                Themes:ScrollChrome.ScrollGlyph="DownArrow"
-                                Command="{x:Static ScrollBar.LineDownCommand}"
-                                IsEnabled="{TemplateBinding IsMouseOver}"
-                                Style="{StaticResource DownScrollBarButton}" />
-                        </Grid>
-                    </Border>
-
+                        Opacity="0.4" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Style.Triggers>
-            <Trigger Property="Orientation" Value="Horizontal">
-
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ScrollBar}">
-                            <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}}" />
-                                    </Grid.ColumnDefinitions>
-                                    <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}" />
-                                        </Track.DecreaseRepeatButton>
-                                        <Track.IncreaseRepeatButton>
-                                            <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource HorizontalScrollBarPageButton}" />
-                                        </Track.IncreaseRepeatButton>
-                                        <Track.Thumb>
-                                            <Thumb Themes:ScrollChrome.ScrollGlyph="HorizontalGripper" Style="{StaticResource ScrollBarThumb}" />
-                                        </Track.Thumb>
-                                    </Track>
-                                    <RepeatButton
-                                        Grid.Column="2"
-                                        Themes:ScrollChrome.ScrollGlyph="RightArrow"
-                                        Command="{x:Static ScrollBar.LineRightCommand}"
-                                        IsEnabled="{TemplateBinding IsMouseOver}"
-                                        Style="{StaticResource RightScrollBarButton}" />
-                                </Grid>
-                            </Border>
-
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Trigger>
-        </Style.Triggers>
     </Style>
 
-    <!--#endregion-->
-
-    <!--#region DataGrid-->
-
     <Style x:Key="ColumnHeaderGripperStyle" TargetType="{x:Type Thumb}">
         <Setter Property="Width" Value="1" />
         <Setter Property="Background" Value="#175c86" />
@@ -1197,7 +1538,7 @@
             </Setter.Value>
         </Setter>
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="Foreground" Value="#00c2f4" />
+        <Setter Property="Foreground" Value="{DynamicResource DataGridColumnHeaderColor}" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="Template">
             <Setter.Value>
@@ -1744,7 +2085,7 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="true">
-                            <Setter Property="Foreground" Value="#8f723c" />
+                            <Setter Property="Foreground" Value="{DynamicResource MeunSelectForeground}" />
                             <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
                                     <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
@@ -1752,7 +2093,7 @@
                             </Setter>
                         </Trigger>
                         <Trigger Property="IsSelected" Value="False">
-                            <Setter Property="Foreground" Value="White" />
+                            <Setter Property="Foreground" Value="{DynamicResource MeunUnSelectForeground}" />
                             <Setter TargetName="Bd" Property="Background">
                                 <Setter.Value>
                                     <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
@@ -1875,31 +2216,115 @@
     <!--#endregion-->
 
     <!--#region ProgressBar圆形统计图-->
+    
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形蓝.Text" Color="#FF0089E6" />
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形蓝.UnSelect"  Color="#330089E6"/>
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形蓝.Select"  Color="#FF0089E6"/>
+    <LinearGradientBrush x:Key="ProgressBar.Progress.动画蓝" EndPoint="0,0" StartPoint="1,0">
+        <GradientStop Color="#00000000" Offset="0"/>
+        <GradientStop Color="#4C57B9FB" Offset="0.4"/>
+        <GradientStop Color="#FF57B9FB" Offset="0.6"/>
+        <GradientStop Color="#4C57B9FB" Offset="0.8"/>
+        <GradientStop Color="#00000000" Offset="1"/>
+    </LinearGradientBrush>
+    
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形绿.Text" Color="#FF00DC00" />
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形绿.UnSelect"  Color="#3300DC00"/>
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形绿.Select"  Color="#FF00DC00"/>
+    <LinearGradientBrush x:Key="ProgressBar.Progress.动画绿" EndPoint="0,0" StartPoint="1,0">
+        <GradientStop Color="#00000000" Offset="0"/>
+        <GradientStop Color="#4C72F972" Offset="0.4"/>
+        <GradientStop Color="#FF72F972" Offset="0.6"/>
+        <GradientStop Color="#4C72F972" Offset="0.8"/>
+        <GradientStop Color="#00000000" Offset="1"/>
+    </LinearGradientBrush>
+    
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形红.Text" Color="#FFF10000" />
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形红.UnSelect"  Color="#33F10000"/>
+    <SolidColorBrush x:Key="ProgressBar.Progress.圆形红.Select"  Color="#FFF10000"/>
+    <LinearGradientBrush x:Key="ProgressBar.Progress.动画红" EndPoint="0,0" StartPoint="1,0">
+        <GradientStop Color="#00000000" Offset="0"/>
+        <GradientStop Color="#4CFF5858" Offset="0.4"/>
+        <GradientStop Color="#FFFF5858" Offset="0.6"/>
+        <GradientStop Color="#4CFF5858" Offset="0.8"/>
+        <GradientStop Color="#00000000" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="ProgressBar.动画" EndPoint="0,0" StartPoint="1,0">
+        <GradientStop Color="#00000000" Offset="0"/>
+        <GradientStop Color="#6F06F11F" Offset="0.4"/>
+        <GradientStop Color="LightBlue" Offset="0.6"/>
+        <GradientStop Color="#6F06F11F" Offset="0.8"/>
+        <GradientStop Color="#00000000" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="ProgressBar.Progress"  EndPoint="1,0" StartPoint="0,0">
+        <GradientStop  Color="#4F05CE10" Offset="0" />
+        <GradientStop  Color="#6F06F11F" Offset="1" />
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="ProgressBar.Background" Color="#072a56"/>
+    <SolidColorBrush x:Key="ProgressBar.Border" Color="#072a56"/>
+    
+    
     <local:Style3DashConverter x:Key="Style3Dash" />
     <local:Style3ArcConverter x:Key="Style3Arc" />
-    <Style x:Key="CircleProgressBar3" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="CircleProgressBar蓝" TargetType="{x:Type ProgressBar}">
         <Setter Property="Width" Value="100" />
         <Setter Property="Height" Value="100" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="maindh" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="ell动画">
+                                <EasingDoubleKeyFrame KeyTime="0" Value="-90"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="90"/>
+                            </DoubleAnimationUsingKeyFrames>
+                          
+                        </Storyboard>
+                    </ControlTemplate.Resources>
                     <Grid>
                         <Rectangle
                             Fill="#ef426f"
                             RadiusX="5"
                             RadiusY="5"
                             Visibility="Collapsed" />
+                        <Ellipse
+                            Width="80" x:Name="ell动画"
+                            Height="80"
+                            RenderTransformOrigin="0.5,0.5"
+                            Stroke="{DynamicResource ProgressBar.Progress.动画蓝}"
+                            StrokeDashCap="Flat"
+                            StrokeThickness="10">
+                            <Ellipse.RenderTransform>
+                                <TransformGroup>
+                                    <!--旋转变换-->
+                                    <RotateTransform Angle="-90"/>
+                                    <!--缩放变换-->
+                                    <ScaleTransform ScaleY="1" ScaleX="1"/>
+                                    <!--倾斜变换-->
+                                    <SkewTransform AngleY="0" AngleX="0"/>
+                                    <!--移动变换-->
+                                    <TranslateTransform X="0" Y="0"/>
+                                </TransformGroup>
+                            </Ellipse.RenderTransform>
+                            <Ellipse.StrokeDashArray>
+                                <MultiBinding Converter="{StaticResource Style3Arc}">
+                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="StrokeThickness" RelativeSource="{RelativeSource Self}" />
+                                </MultiBinding>
+                            </Ellipse.StrokeDashArray>
+                        </Ellipse>
                         <Ellipse
                             Width="80"
                             Height="80"
-                            Stroke="#FF2470FF"
+                            Stroke="{DynamicResource ProgressBar.Progress.圆形蓝.UnSelect}"
                             StrokeThickness="10" />
                         <Ellipse
                             Width="80"
                             Height="80"
                             RenderTransformOrigin="0.5,0.5"
-                            Stroke="#FF0198FF"
-                            StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}"
+                            Stroke="{DynamicResource ProgressBar.Progress.圆形蓝.Select}"
+                            StrokeDashCap="Flat"
                             StrokeThickness="10">
                             <Ellipse.RenderTransform>
                                 <RotateTransform Angle="-90" />
@@ -1911,40 +2336,83 @@
                                 </MultiBinding>
                             </Ellipse.StrokeDashArray>
                         </Ellipse>
+                        
                         <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="20"
-                            Foreground="#01acff"
+                            FontFamily="../Fonts/#Quartz M"
+                            Foreground="{DynamicResource ProgressBar.Progress.圆形蓝.Text}"
                             Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" />
                     </Grid>
+                    <ControlTemplate.Triggers>
+                        <EventTrigger RoutedEvent="Loaded">
+                            <BeginStoryboard Storyboard="{StaticResource maindh}"/>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="CircleProgressBar5" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="CircleProgressBar绿" TargetType="{x:Type ProgressBar}">
         <Setter Property="Width" Value="100" />
         <Setter Property="Height" Value="100" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="maindh" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="ell动画">
+                                <EasingDoubleKeyFrame KeyTime="0" Value="-90"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="90"/>
+                            </DoubleAnimationUsingKeyFrames>
+
+                        </Storyboard>
+                    </ControlTemplate.Resources>
                     <Grid>
                         <Rectangle
                             Fill="#ef426f"
                             RadiusX="5"
                             RadiusY="5"
                             Visibility="Collapsed" />
+                        <Ellipse
+                            Width="80" x:Name="ell动画"
+                            Height="80"
+                            RenderTransformOrigin="0.5,0.5"
+                            Stroke="{DynamicResource ProgressBar.Progress.动画绿}"
+                            StrokeDashCap="Flat"
+                            StrokeThickness="10">
+                            <Ellipse.RenderTransform>
+                                <TransformGroup>
+                                    <!--旋转变换-->
+                                    <RotateTransform Angle="-90"/>
+                                    <!--缩放变换-->
+                                    <ScaleTransform ScaleY="1" ScaleX="1"/>
+                                    <!--倾斜变换-->
+                                    <SkewTransform AngleY="0" AngleX="0"/>
+                                    <!--移动变换-->
+                                    <TranslateTransform X="0" Y="0"/>
+                                </TransformGroup>
+                            </Ellipse.RenderTransform>
+                            <Ellipse.StrokeDashArray>
+                                <MultiBinding Converter="{StaticResource Style3Arc}">
+                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="StrokeThickness" RelativeSource="{RelativeSource Self}" />
+                                </MultiBinding>
+                            </Ellipse.StrokeDashArray>
+                        </Ellipse>
                         <Ellipse
                             Width="80"
                             Height="80"
-                            Stroke="#7F15806C"
+                            Stroke="{DynamicResource ProgressBar.Progress.圆形绿.UnSelect}"
                             StrokeThickness="10" />
                         <Ellipse
                             Width="80"
                             Height="80"
                             RenderTransformOrigin="0.5,0.5"
-                            Stroke="#CC19910D"
-                            StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}"
+                            Stroke="{DynamicResource ProgressBar.Progress.圆形绿.Select}"
+                            StrokeDashCap="Flat"
                             StrokeThickness="10">
                             <Ellipse.RenderTransform>
                                 <RotateTransform Angle="-90" />
@@ -1960,36 +2428,78 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="20"
-                            Foreground="#CC19910D"
+                            FontFamily="../Fonts/#Quartz M"
+                            Foreground="{DynamicResource ProgressBar.Progress.圆形绿.Text}"
                             Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" />
                     </Grid>
+                    <ControlTemplate.Triggers>
+                        <EventTrigger RoutedEvent="Loaded">
+                            <BeginStoryboard Storyboard="{StaticResource maindh}"/>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="CircleProgressBar4" TargetType="{x:Type ProgressBar}">
+    <Style x:Key="CircleProgressBar红" TargetType="{x:Type ProgressBar}">
         <Setter Property="Width" Value="100" />
         <Setter Property="Height" Value="100" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ProgressBar}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="maindh" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="ell动画">
+                                <EasingDoubleKeyFrame KeyTime="0" Value="-90"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="90"/>
+                            </DoubleAnimationUsingKeyFrames>
+
+                        </Storyboard>
+                    </ControlTemplate.Resources>
                     <Grid>
                         <Rectangle
                             Fill="#ef426f"
                             RadiusX="5"
                             RadiusY="5"
                             Visibility="Collapsed" />
+                        <Ellipse
+                            Width="80" x:Name="ell动画"
+                            Height="80"
+                            RenderTransformOrigin="0.5,0.5"
+                            Stroke="{DynamicResource ProgressBar.Progress.动画红}"
+                            StrokeDashCap="Flat"
+                            StrokeThickness="10">
+                            <Ellipse.RenderTransform>
+                                <TransformGroup>
+                                    <!--旋转变换-->
+                                    <RotateTransform Angle="-90"/>
+                                    <!--缩放变换-->
+                                    <ScaleTransform ScaleY="1" ScaleX="1"/>
+                                    <!--倾斜变换-->
+                                    <SkewTransform AngleY="0" AngleX="0"/>
+                                    <!--移动变换-->
+                                    <TranslateTransform X="0" Y="0"/>
+                                </TransformGroup>
+                            </Ellipse.RenderTransform>
+                            <Ellipse.StrokeDashArray>
+                                <MultiBinding Converter="{StaticResource Style3Arc}">
+                                    <Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="StrokeThickness" RelativeSource="{RelativeSource Self}" />
+                                </MultiBinding>
+                            </Ellipse.StrokeDashArray>
+                        </Ellipse>
                         <Ellipse
                             Width="80"
                             Height="80"
-                            Stroke="#CC3E0B0B"
+                            Stroke="{DynamicResource ProgressBar.Progress.圆形红.UnSelect}"
                             StrokeThickness="10" />
                         <Ellipse
                             Width="80"
                             Height="80"
                             RenderTransformOrigin="0.5,0.5"
-                            Stroke="#CCAC1919"
-                            StrokeDashCap="{Binding Value, Converter={StaticResource Style3Dash}, RelativeSource={RelativeSource TemplatedParent}}"
+                            Stroke="{DynamicResource ProgressBar.Progress.圆形红.Select}"
+                            StrokeDashCap="Flat"
                             StrokeThickness="10">
                             <Ellipse.RenderTransform>
                                 <RotateTransform Angle="-90" />
@@ -2005,9 +2515,129 @@
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             FontSize="20"
-                            Foreground="#CCAC1919"
+                            FontFamily="../Fonts/#Quartz M"
+                            Foreground="{DynamicResource ProgressBar.Progress.圆形红.Text}"
                             Text="{Binding Value, RelativeSource={RelativeSource TemplatedParent}, StringFormat=\{0\}%}" />
                     </Grid>
+                    <ControlTemplate.Triggers>
+                        <EventTrigger RoutedEvent="Loaded">
+                            <BeginStoryboard Storyboard="{StaticResource maindh}"/>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    
+    <Style  TargetType="{x:Type ProgressBar}">
+        <Setter Property="Foreground" Value="{StaticResource ProgressBar.Progress}"/>
+        <Setter Property="Background" Value="{StaticResource ProgressBar.Background}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource ProgressBar.Border}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Height" Value="16"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ProgressBar}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="maindh" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="dh">
+                                <EasingDoubleKeyFrame KeyTime="0" Value="0.25"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25"/>
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25"/>
+                            </DoubleAnimationUsingKeyFrames>
+                            <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="dh">
+                                <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5"/>
+                                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5"/>
+                                <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5"/>
+                            </PointAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid x:Name="TemplateRoot">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Determinate">
+                                    
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate">
+                                    <Storyboard RepeatBehavior="Forever">
+                                        <DoubleAnimationUsingKeyFrames 
+                                            Storyboard.TargetName="Animation" 
+                                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
+                                            <EasingDoubleKeyFrame KeyTime="0" Value="0.25"/>
+                                            <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25"/>
+                                            <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25"/>
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <PointAnimationUsingKeyFrames 
+                                            Storyboard.TargetName="Animation" 
+                                            Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)">
+                                            <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5"/>
+                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5"/>
+                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5"/>
+                                        </PointAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Opacity="0.3" BorderThickness="{TemplateBinding BorderThickness}"/>
+                        <Rectangle x:Name="PART_Track"/>
+                        <Grid x:Name="PART_Indicator" ClipToBounds="true" HorizontalAlignment="Left">
+                            <Rectangle x:Name="dh" Fill="{DynamicResource ProgressBar.动画}">
+                                <Rectangle.RenderTransform>
+                                    <TransformGroup>
+                                        <!--缩放变换-->
+                                        <ScaleTransform ScaleY="1" ScaleX="1"/>
+                                        <!--倾斜变换-->
+                                        <SkewTransform AngleY="0" AngleX="-45"/>
+                                        <!--旋转变换-->
+                                        <RotateTransform Angle="0"/>
+                                        <!--移动变换-->
+                                        <TranslateTransform X="0" Y="0"/>
+                                    </TransformGroup>
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                            <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}" Visibility="Collapsed"/>
+                            <Rectangle x:Name="Animation" Fill="{DynamicResource ProgressBar.动画}" RenderTransformOrigin="0.5,0.5">
+                                <Rectangle.RenderTransform>
+                                    <TransformGroup>
+                                        <!--缩放变换-->
+                                        <ScaleTransform ScaleY="1" ScaleX="1"/>
+                                        <!--倾斜变换-->
+                                        <SkewTransform AngleY="0" AngleX="-45"/>
+                                        <!--旋转变换-->
+                                        <RotateTransform Angle="0"/>
+                                        <!--移动变换-->
+                                        <TranslateTransform X="0" Y="0"/>
+                                    </TransformGroup>
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                        </Grid>
+                        <TextBlock x:Name="textBlock" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Value,StringFormat={}百分比: {0} %}" FontSize="12" FontFamily="../Fonts/#Quartz M" Visibility="Visible" Foreground="{DynamicResource Titleforeground}"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                                <Setter.Value>
+                                    <RotateTransform Angle="90"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsIndeterminate" Value="true">
+                            <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed"/>
+                            <Setter Property="Visibility" TargetName="dh" Value="Collapsed"/>
+                            <Setter Property="Visibility" TargetName="Animation" Value="Visible"/>
+                        </Trigger>
+                        <Trigger Property="IsIndeterminate" Value="False">
+                            <Setter Property="Visibility" TargetName="Indicator" Value="Visible"/>
+                            <Setter Property="Visibility" TargetName="dh" Value="Visible"/>
+                            <Setter Property="Visibility" TargetName="Animation" Value="Collapsed"/>
+
+                        </Trigger>
+                        <EventTrigger RoutedEvent="Loaded">
+                            <BeginStoryboard Storyboard="{StaticResource maindh}"/>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -2328,7 +2958,7 @@
                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="#8f723c" />
+                <Setter Property="Foreground" Value="{DynamicResource MeunSelectForeground}" />
                 <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
                 <Setter TargetName="SubmenuBorder" Property="Background">
                     <Setter.Value>
@@ -2342,7 +2972,7 @@
                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="White" />
+                <Setter Property="Foreground" Value="{DynamicResource MeunUnSelectForeground}" />
                 <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
                 <Setter TargetName="SubmenuBorder" Property="Background">
                     <Setter.Value>
@@ -2459,7 +3089,7 @@
                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_Select.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="#8f723c" />
+                <Setter Property="Foreground" Value="{DynamicResource MeunSelectForeground}" />
             </Trigger>
             <Trigger Property="IsHighlighted" Value="false">
                 <Setter TargetName="Border" Property="Background">
@@ -2467,7 +3097,7 @@
                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/窗体样式/Tab/Tab4_No.png" />
                     </Setter.Value>
                 </Setter>
-                <Setter Property="Foreground" Value="White" />
+                <Setter Property="Foreground" Value="{DynamicResource MeunUnSelectForeground}" />
             </Trigger>
             <!--<Trigger Property="IsEnabled" Value="false">
                 <Setter Property="Foreground" Value="Yellow"/>
@@ -2656,9 +3286,6 @@
     <!--#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 Property="FocusVisualStyle">
             <Setter.Value>
@@ -2764,7 +3391,7 @@
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Themes1:ClassicBorderDecorator
                         x:Name="Bd"
-                        BorderBrush="#08335f"
+                        BorderBrush="{DynamicResource borderBrush}"
                         BorderStyle="None"
                         BorderThickness="1">
                         <ScrollViewer x:Name="PART_ContentHost" />
@@ -2946,7 +3573,7 @@
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                         IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                        Style="{StaticResource ComboBoxEditableTextBox}" />
+                        Style="{StaticResource ComboBoxEditableTextBox}" CaretBrush="White" />
                 </DockPanel>
 
             </Grid>
@@ -2978,9 +3605,9 @@
     </ControlTemplate>
     <Style x:Key="BaseComboBoxStyle" TargetType="{x:Type ComboBox}">
         <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}" />
-        <Setter Property="Foreground" Value="White" />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderBrush" Value="#08335f" />
+        <Setter Property="BorderBrush" Value="{DynamicResource borderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Margin" Value="0,0,0,0" />
         <Setter Property="Padding" Value="0" />
@@ -2994,7 +3621,6 @@
         <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}">
@@ -3053,7 +3679,7 @@
                                 </Popup>
                             </Themes1:ClassicBorderDecorator>
                             <DockPanel Margin="2">
-                                <FrameworkElement Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" DockPanel.Dock="Right" />
+                                <FrameworkElement Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" DockPanel.Dock="Right"  />
                                 <Border x:Name="SelectedItemBorder" Margin="{TemplateBinding Padding}">
                                     <ContentPresenter
                                         Margin="1,1,1,1"
@@ -3155,5 +3781,4 @@
     </Style>
     <!--#endregion-->
 
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BPASmartClient.CustomResource/Themes/MyStyle.xaml b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
index a6ed93e7..2fe1b462 100644
--- a/BPASmartClient.CustomResource/Themes/MyStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
@@ -3,18 +3,33 @@
     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" />
+    <!--#region Color-->
+    <SolidColorBrush x:Key="foreground" Color="#a2c2e8" />
+    <SolidColorBrush x:Key="borderBrush" Color="#FF074B92" />
+    <SolidColorBrush x:Key="Titleforeground" Color="#FF07D7FF" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderColor" Color="#00c2f4"/>
+    <SolidColorBrush x:Key="LabelColor" Color="#FF00EEF3"/>
+    <SolidColorBrush x:Key="MainTitleforeground" Color="#feffff"/>
+    <SolidColorBrush x:Key="ButtonSelectForeground" Color="#4fade8"/>
+    <SolidColorBrush x:Key="ButtonUnSelectForeground" Color="#3afdff"/>
+    <SolidColorBrush x:Key="MeunSelectForeground" Color="#8f723c"/>
+    <SolidColorBrush x:Key="MeunUnSelectForeground" Color="White"/>
+
+    <!--<SolidColorBrush x:Key="foreground" Color="Red" />
+    <SolidColorBrush x:Key="borderBrush" Color="Red" />
+    <SolidColorBrush x:Key="Titleforeground" Color="Red" />
+    <SolidColorBrush x:Key="LabelColor" Color="Red" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderColor" Color="Red"/>
+    <SolidColorBrush x:Key="MainTitleforeground" Color="Red"/>
+    <SolidColorBrush x:Key="ButtonSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="ButtonUnSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="MeunSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="MeunUnSelectForeground" Color="Red"/>-->
+    <!--#endregion-->
 
     <!--#region Label-->
     <Style TargetType="{x:Type Label}">
-        <Setter Property="Foreground" Value="#FF00EEF3" />
+        <Setter Property="Foreground" Value="{DynamicResource LabelColor}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="5" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -46,10 +61,6 @@
     </Style>
     <!--#endregion-->
 
-    <!--#region Color-->
-    <SolidColorBrush x:Key="foreground" Color="#FFA2C2E8" />
-    <!--#endregion-->
-
     <!--#region ToggleButton-->
     <Style x:Key="StatusBtnStyle告警" TargetType="ToggleButton">
         <Style.Setters>
@@ -158,6 +169,10 @@
     <!--#endregion-->
 
     <!--#region Image-->
+    <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" />
+    
     <Style TargetType="Image">
         <Style.Setters>
             <Setter Property="UseLayoutRounding" Value="True" />
@@ -353,7 +368,6 @@
         </Style.Setters>
     </Style>
 
-
     <Style x:Key="button_select" TargetType="Border">
         <Style.Setters>
 
@@ -365,7 +379,6 @@
         </Style.Setters>
     </Style>
 
-
     <Style x:Key="bordertopL" TargetType="Border">
         <Style.Setters>
             <Setter Property="Height" Value="80" />
@@ -962,13 +975,13 @@
         <Style.Setters>
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
             <Setter Property="Height" Value="25" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border x:Name="BD" Cursor="Hand">
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Cursor="Hand">
                                 <!--<Border Width="16" Margin="5">
                                     <Border.Background>
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮图标.png" />
@@ -979,7 +992,7 @@
                                     Margin="10,0,10,0"
                                     VerticalAlignment="Center"
                                     FontSize="14"
-                                    Foreground="#4fade8"
+                                    Foreground="{DynamicResource ButtonSelectForeground}"
                                     Text="{TemplateBinding Content}" />
                                 <!--  Text="{TemplateBinding Content}"  -->
                             </StackPanel>
@@ -991,7 +1004,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -999,7 +1012,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -1007,7 +1020,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonUnSelectForeground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -1020,7 +1033,7 @@
         <Style.Setters>
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
             <Setter Property="Width" Value="68" />
             <Setter Property="Height" Value="25" />
             <Setter Property="Template">
@@ -1040,7 +1053,7 @@
                                     x:Name="textBlock"
                                     VerticalAlignment="Center"
                                     FontSize="14"
-                                    Foreground="#4fade8"
+                                    Foreground="{DynamicResource ButtonSelectForeground}"
                                     Text="{TemplateBinding Content}" />
                                 <!--  Text="{TemplateBinding Content}"  -->
                             </StackPanel>
@@ -1052,7 +1065,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -1060,7 +1073,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -1068,7 +1081,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonUnSelectForeground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -1640,7 +1653,7 @@
     <!--#region TextBlock-->
     <Style TargetType="TextBlock">
         <Style.Setters>
-            <Setter Property="Foreground" Value="#a2c2e8" />
+            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="FontSize" Value="20" />
@@ -1653,15 +1666,22 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
     </Style>
+
+    <Style x:Key="数码管Text" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="../Fonts/#Quartz M"></Setter>
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+        <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" />
+        <Setter Property="Foreground" Value="{DynamicResource Titleforeground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
@@ -1721,7 +1741,7 @@
     </Style>
     <!--#endregion-->
 
-    <!--  空MenuHeader  -->
+    <!--#region 空MenuHeader-->
     <Style x:Key="MenuItem_NonStyle" TargetType="{x:Type MenuItem}">
         <Setter Property="Height" Value="Auto" />
         <Setter Property="Template">
@@ -1737,4 +1757,6 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <!--#endregion-->
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml b/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml
index e456a4c7..b30d09af 100644
--- a/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml
+++ b/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml
@@ -22,14 +22,14 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal">
-            <TextBlock x:Name="time" FontSize="16">14:48:30</TextBlock>
+            <TextBlock x:Name="time" FontSize="16" FontFamily="../Fonts/#Quartz M">14:48:30</TextBlock>
             <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="dateRL" FontSize="10" FontFamily="../Fonts/#Quartz M">星期一</TextBlock>
 
             <TextBlock
-                x:Name="date"
+                x:Name="date" FontFamily="../Fonts/#Quartz M"
                 Margin="10,0,0,0"
                 FontSize="10">
                 2021-11-13
diff --git a/BPASmartClient.CustomResource/UserControls/Style3ArcConverter.cs b/BPASmartClient.CustomResource/UserControls/Style3ArcConverter.cs
index 820667d6..0481aa25 100644
--- a/BPASmartClient.CustomResource/UserControls/Style3ArcConverter.cs
+++ b/BPASmartClient.CustomResource/UserControls/Style3ArcConverter.cs
@@ -46,7 +46,7 @@ namespace BPASmartClient.CustomResource.UserControls
             }
             else
             {
-                return PenLineCap.Round;
+                return PenLineCap.Flat;
             }
 
         }
diff --git a/BPASmartClient.MorkT.Lebai.JC/Control_MORKJC2.cs b/BPASmartClient.MorkT.Lebai.JC/Control_MORKJC2.cs
index 2a18b52a..885f5031 100644
--- a/BPASmartClient.MorkT.Lebai.JC/Control_MORKJC2.cs
+++ b/BPASmartClient.MorkT.Lebai.JC/Control_MORKJC2.cs
@@ -32,17 +32,10 @@ namespace BPASmartClient.MorkTLebaiJC
      */
     public class Control_MORKJC2 : BaseDevice
     {
-        //private CoffeEndCook coffeEndCook = new CoffeEndCook();//模拟咖啡制作成功
-        //咖啡机主控程序
-        //private CoffeeMachine coffeeMachine;
         //物料存放位置
         private Dictionary<string, PolymerBatching> batchings = new Dictionary<string, PolymerBatching>();
         //容器位置
         private string holderLoc;
-        /// <summary>
-        /// 获取乐百机器人的数据
-        /// </summary>
-        //SignalResult lebai = new SignalResult();
         //主料位置
         private string mainMaterialLoc;
         //子订单ID
@@ -64,49 +57,9 @@ namespace BPASmartClient.MorkTLebaiJC
         ConcurrentQueue<MorkOrderPush> morkOrderPushes = new ConcurrentQueue<MorkOrderPush>();
         public void Init()
         {
-            //ActionManage.GetInstance.Register(new Action<object>((s) =>
-            //{
-            //    if (s is DrCoffeeDrinksCode cf)
-            //    {
-            //        DoCoffee();
-            //    }
-            //    else if (s is Dictionary<string, string> ms)
-            //    {
-            //        if (ms.ContainsKey("Button"))
-            //        {
-            //            switch (ms["Button"])
-            //            {
-            //                case "启动示教":
-            //                    JuicerModel.GetInstance.StartTeachMode();
-            //                    break;
-            //                case "停止示教":
-            //                    JuicerModel.GetInstance.EndtTeachMode();
-            //                    break;
-            //                case "启动机器人":
-            //                    JuicerModel.GetInstance.StartRobot();
-            //                    break;
-            //                case "急停":
-            //                    JuicerModel.GetInstance.EStopRobot();
-            //                    break;
-            //                default:
-            //                    break;
-            //            }
-            //        }
-            //    }
-            //}), "SimCoffee");
-
             //构建所有商品物料信息
             batchings = PolymerBatching.BuildAll();
-
-            EventBus.EventBus.GetInstance().Subscribe<DRCoffee_CoffeEndCookEvent>(DeviceId, CoffeEndCookHandle);
-
-            System.Configuration.Configuration config = System.Configuration.ConfigurationManager.OpenExeConfiguration(System.Configuration.ConfigurationUserLevel.None);
-            //一系列外围基础配置
-            var com_Coffee = config.AppSettings.Settings["COM_Coffee"].Value;
-            var baud_Coffee = config.AppSettings.Settings["BAUD_Coffee"].Value;
-            //咖啡机创建
-            //coffeeMachine = new CoffeeMachine(com_Coffee, (BaudRates)Enum.Parse(typeof(BaudRates), baud_Coffee));
-
+            EventBus.EventBus.GetInstance().Subscribe<DRCoffee_CoffeEndCookEvent>(DeviceId, DRCoffee_CoffeEndCookEventHandle);
             Main();
             ReadData();
             ThreadManage.GetInstance().StartLong(new Action(() =>
@@ -116,7 +69,7 @@ namespace BPASmartClient.MorkTLebaiJC
                     working = true;
                     if (morkOrderPushes.TryDequeue(out MorkOrderPush order))
                     {
-                        MessageLog.GetInstance.Show($"开始制作订单[{order.SortNum}]");
+                        DeviceProcessLogShow($"开始制作订单[{order.SortNum}]");
                         //商品类型
                         GOODS_TYPE currentGoodsType = GOODS_TYPE.NEITHER;
                         //子订单ID
@@ -134,7 +87,6 @@ namespace BPASmartClient.MorkTLebaiJC
                                         holderLoc = res.BatchingLoc;
                                         break;
                                     case BATCHING_CLASS.MAIN_MATERIAL:
-                                        // mainMaterialLoc ="1";
                                         mainMaterialLoc = res.BatchingLoc;
                                         //验证商品是咖啡还是冰淇淋
                                         if (ValidateGoodsByBatching(res.BatchingLoc) != GOODS_TYPE.NEITHER)
@@ -164,7 +116,7 @@ namespace BPASmartClient.MorkTLebaiJC
                                 DoWater();
                                 break;
                             case GOODS_TYPE.NEITHER:
-                                MessageLog.GetInstance.Show("未知的商品类型");
+                                DeviceProcessLogShow("未知的商品类型");
                                 break;
                         }
                     }
@@ -177,27 +129,12 @@ namespace BPASmartClient.MorkTLebaiJC
 
         public void Main()
         {
-            //咖啡机开启主线程
-            //coffeeMachine.Start();
             //开始心跳刷新，根据咖啡机及冰淇淋机来判断
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
-                //GeneralConfig.Healthy =
-                //         JuicerModel.GetInstance.IsConnected &&
-                //         MorkCStatus.GetInstance().CanDo &&
-                //         JuicerHelper.GetInstance.IsOpen &&
-                //         MCUSerialHelper.GetInstance.IsOpen;
-                //GeneralConfig.Healthy = true;
+                IsHealth = GetStatus<bool>("JuicerIsConnected");
                 Thread.Sleep(100);
             }), "MORK-IC心跳刷新");
-            //ThreadManage.GetInstance.Start(new Action(() =>
-            //{
-            //    while (!JuicerModel.GetInstance.IsConnected)
-            //    {
-            //        Thread.Sleep(10);
-            //    }
-            //    //Sence(JuicerModel.SENCE_欢迎);
-            //}), "MORK-JC欢迎");
         }
 
         private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
@@ -267,13 +204,12 @@ namespace BPASmartClient.MorkTLebaiJC
         /// </summary>
         private void DoCoffee()
         {
-
             #region 接咖啡流程
             are.Reset();
             while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
             {
                 if (!outCupCheck)
-                    MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                    DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                 outCupCheck = true;
             }
             outCupCheck = false;
@@ -281,7 +217,7 @@ namespace BPASmartClient.MorkTLebaiJC
             int resultTakeCup = takeCup();
             if (resultTakeCup == 1)
             {
-                MessageLog.GetInstance.Show("咖啡杯取杯完成");
+                DeviceProcessLogShow("咖啡杯取杯完成");
                 new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                 Sence(JuicerModel.JUICE2_接咖啡);
                 Wait();
@@ -293,14 +229,14 @@ namespace BPASmartClient.MorkTLebaiJC
                 while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
                 {
                     if (!outCupCheck)
-                        MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                        DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                     outCupCheck = true;
                 }
                 outCupCheck = false;
                 while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
                 {
                     if (!outCupCheck)
-                        MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                        DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                     outCupCheck = true;
                 }
                 outCupCheck = false;
@@ -308,8 +244,7 @@ namespace BPASmartClient.MorkTLebaiJC
                 Sence(JuicerModel.JUICE2_放咖啡杯);
                 Wait();
                 OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-                MessageLog.GetInstance.Show("咖啡制作完成");
-
+                DeviceProcessLogShow("咖啡制作完成");
             }
             else
             {
@@ -326,7 +261,7 @@ namespace BPASmartClient.MorkTLebaiJC
             while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
             {
                 if (!outCupCheck)
-                    MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                    DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                 outCupCheck = true;
             }
             outCupCheck = false;
@@ -334,7 +269,7 @@ namespace BPASmartClient.MorkTLebaiJC
             int resultTakeCup = takeCup();
             if (resultTakeCup == 1)
             {
-                MessageLog.GetInstance.Show("取茶杯完成");
+                DeviceProcessLogShow("取茶杯完成");
                 new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                 Sence(JuicerModel.JUICE2_接茶叶);
                 Wait();
@@ -368,7 +303,7 @@ namespace BPASmartClient.MorkTLebaiJC
                 while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
                 {
                     if (!outCupCheck)
-                        MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                        DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                     outCupCheck = true;
                 }
                 outCupCheck = false;
@@ -378,7 +313,7 @@ namespace BPASmartClient.MorkTLebaiJC
 
 
                 OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-                MessageLog.GetInstance.Show("茶水制作完成");
+                DeviceProcessLogShow("茶水制作完成");
 
             }
             else
@@ -397,7 +332,7 @@ namespace BPASmartClient.MorkTLebaiJC
             while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
             {
                 if (!outCupCheck)
-                    MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                    DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                 outCupCheck = true;
             }
             outCupCheck = false;
@@ -425,7 +360,7 @@ namespace BPASmartClient.MorkTLebaiJC
                 while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
                 {
                     if (!outCupCheck)
-                        MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                        DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                     outCupCheck = true;
                 }
                 outCupCheck = false;
@@ -434,7 +369,7 @@ namespace BPASmartClient.MorkTLebaiJC
                 Sence(JuicerModel.JUICE2_放水杯);
                 Wait();
                 OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-                MessageLog.GetInstance.Show("纯净水制作完成");
+                DeviceProcessLogShow("纯净水制作完成");
 
             }
             else
@@ -457,7 +392,7 @@ namespace BPASmartClient.MorkTLebaiJC
             while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
             {
                 if (!outCupCheck)
-                    MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                    DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                 outCupCheck = true;
             }
             OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
@@ -575,7 +510,7 @@ namespace BPASmartClient.MorkTLebaiJC
                     while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
                     {
                         if (!outCupCheck)
-                            MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                            DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                         outCupCheck = true;
                     }
                     outCupCheck = false;
@@ -584,7 +519,7 @@ namespace BPASmartClient.MorkTLebaiJC
                     Wait();
 
                     OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-                    MessageLog.GetInstance.Show("果汁制作完成");
+                    DeviceProcessLogShow("果汁制作完成");
 
                 }
                 ////模拟果汁
@@ -592,7 +527,7 @@ namespace BPASmartClient.MorkTLebaiJC
                 //while (GetStatus<bool>("RobotValue1"))//判断放杯位置是否有物品
                 //{
                 //    if (!outCupCheck)
-                //        MessageLog.GetInstance.ShowEx("成品处有纸杯存在，请取走！！");
+                //        DeviceProcessLogShow("成品处有纸杯存在，请取走！！");
                 //    outCupCheck = true;
                 //}
                 //outCupCheck = false;
@@ -601,7 +536,7 @@ namespace BPASmartClient.MorkTLebaiJC
                 //Wait();
 
                 //OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-                //MessageLog.GetInstance.Show("果汁制作完成");
+                //DeviceProcessLogShow("果汁制作完成");
             }
             else
             {
@@ -625,22 +560,16 @@ namespace BPASmartClient.MorkTLebaiJC
         {
             try
             {
-
                 nCnt = 0;
                 new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                 Sence(JuicerModel.JUICE2_初始位);
                 Wait();
-
-
                 new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                 Sence(JuicerModel.JUICE2_取纸杯);
                 Wait();
-
-
                 new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                 Sence(JuicerModel.JUICE2_纸杯检测);
                 Wait();
-
                 nCnt++;
                 Thread.Sleep(2000);
                 while (checkCnt < 3)
@@ -663,7 +592,7 @@ namespace BPASmartClient.MorkTLebaiJC
                     if (nCnt > 3)
                     {
                         nCnt = 0;
-                        MessageLog.GetInstance.ShowEx("三次取杯失败，回原点");
+                        DeviceProcessLogShow("三次取杯失败，回原点");
                         new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                         Sence(JuicerModel.JUICE2_检测位回原点);
                         Wait();
@@ -671,8 +600,6 @@ namespace BPASmartClient.MorkTLebaiJC
                     }
                     else
                     {
-
-
                         nCnt++;
                         new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                         Sence(JuicerModel.JUICE2_二次取杯);
@@ -694,20 +621,17 @@ namespace BPASmartClient.MorkTLebaiJC
                             {
                                 checkCnt = 0;
                                 return 1;
-
                             }
                             checkCnt++;
                         }
-
                     }
                     Thread.Sleep(1000);
                 }
             }
             catch (Exception ex)
             {
-                MessageLog.GetInstance.Show(ex.ToString());
+                DeviceProcessLogShow(ex.ToString());
             }
-
             return 1;
         }
         /// <summary>
@@ -736,7 +660,7 @@ namespace BPASmartClient.MorkTLebaiJC
             }
             catch (Exception ex)
             {
-                MessageLog.GetInstance.Show(ex.ToString());
+                DeviceProcessLogShow(ex.ToString());
                 return 0;
             }
         }
@@ -754,12 +678,12 @@ namespace BPASmartClient.MorkTLebaiJC
                     Thread.Sleep(100);
                     if (DateTime.Now.Subtract(delayTimeOut).TotalSeconds >= 1) return 2;
                 }
-                MessageLog.GetInstance.Show("放杯位有杯子未取走，等待取走，最多等待60s，即跳出流程");
+                DeviceProcessLogShow("放杯位有杯子未取走，等待取走，最多等待60s，即跳出流程");
                 return 1;
             }
             catch (Exception ex)
             {
-                MessageLog.GetInstance.Show(ex.ToString());
+                DeviceProcessLogShow(ex.ToString());
                 return 0;
             }
         }
@@ -823,7 +747,10 @@ namespace BPASmartClient.MorkTLebaiJC
         //        }
         //    }
         //}
-
+        private void DRCoffee_CoffeEndCookEventHandle(IEvent @event, EventCallBackHandle callBack)
+        {
+            are.Set();
+        }
         public override void DoMain()
         {
         }
@@ -844,7 +771,6 @@ namespace BPASmartClient.MorkTLebaiJC
         public override void ResetProgram()
         {
         }
-
         public override void SimOrder()
         {
         }
diff --git a/BPASmartClient.MorkTJuicer/BPASmartClient.MorkTJuicer.csproj b/BPASmartClient.MorkTJuicer/BPASmartClient.MorkTJuicer.csproj
new file mode 100644
index 00000000..5ca62444
--- /dev/null
+++ b/BPASmartClient.MorkTJuicer/BPASmartClient.MorkTJuicer.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/BPASmartClient.MorkTJuicer/Control_MORKJC.cs b/BPASmartClient.MorkTJuicer/Control_MORKJC.cs
new file mode 100644
index 00000000..e672cab0
--- /dev/null
+++ b/BPASmartClient.MorkTJuicer/Control_MORKJC.cs
@@ -0,0 +1,317 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Threading;
+using System.Collections.Concurrent;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using BPASmartClient.Device;
+using BPA.Message.Enum;
+using BPA.Message;
+using BPASmartClient.Helper;
+using BPASmartClient.Model.咖啡机.Enum;
+using BPASmartClient.Model;
+using BPASmartClient.EventBus;
+using static BPASmartClient.EventBus.EventBus;
+using BPASmartClient.Model.PLC;
+using BPASmartClient.Model.单片机;
+
+namespace BPASmartClient.MorkTJuicer
+{
+    /*
+     * 冰淇淋咖啡机组合套装
+     * 物料位置：
+     * 1：冰淇料
+     * 2：冰淇淋杯
+     * 5：咖啡
+     * 6：咖啡杯
+     * 9: 茶
+     * 10: 茶杯
+     */
+    public class Control_MORKJC : BaseDevice
+    {
+        GVL_MORKJC mORKD = new GVL_MORKJC();
+        //物料存放位置
+        private Dictionary<string, PolymerBatching> batchings = new Dictionary<string, PolymerBatching>();
+        //容器位置
+        private string holderLoc;
+        //主料位置
+        private string mainMaterialLoc;
+        //子订单ID
+        private string subOrderId;
+
+        private bool enableFunny = false;
+        private DateTime lastRecvdOrder = DateTime.Now;
+        private bool working = false;
+        /// <summary>
+        /// 果汁机做法，true:热饮，false:冷饮
+        /// </summary>
+        private bool GuMake = false;
+
+        private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
+        {
+            EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+        }
+
+        //private SerialPortClient commProxy;
+        public void ConnectOk()
+        {
+
+        }
+        ConcurrentQueue<MorkOrderPush> morkOrderPushes = new ConcurrentQueue<MorkOrderPush>();
+        public void Init()
+        {
+            //构建所有商品物料信息
+            batchings = PolymerBatching.BuildAll();
+            Main();
+            ReadData();
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                while (morkOrderPushes.Count > 0)
+                {
+                    while (enableFunny) { Thread.Sleep(10); }
+                    DeviceProcessLogShow("当前非自嗨模式，允许开工");
+                    working = true;
+                    if (morkOrderPushes.TryDequeue(out MorkOrderPush order))
+                    {
+                        DeviceProcessLogShow($"开始制作订单[{order.SortNum}]");
+                        //商品类型
+                        GOODS_TYPE currentGoodsType = GOODS_TYPE.NEITHER;
+                        //子订单ID
+                        subOrderId = order.SuborderId;
+                        //遍历物料
+                        foreach (var item in order.GoodBatchings)
+                        {
+                            var res = Json<BatchingInfoPar>.Data.orderMaterialDelivery.BatchingInfo.FirstOrDefault(p => p.BatchingId == item.BatchingId);
+                            if (res != null)
+                            {
+                                //获取主料和容器位置
+                                switch (batchings[res.BatchingLoc].BatchingClass)
+                                {
+                                    case BATCHING_CLASS.HOLDER:
+                                        holderLoc = res.BatchingLoc;
+                                        break;
+                                    case BATCHING_CLASS.MAIN_MATERIAL:
+                                        // mainMaterialLoc ="1";
+                                        mainMaterialLoc = res.BatchingLoc;
+                                        //验证商品是咖啡还是冰淇淋
+                                        if (ValidateGoodsByBatching(res.BatchingLoc) != GOODS_TYPE.NEITHER)
+                                        {
+                                            //获取当前物料所属商品类型
+                                            currentGoodsType = ValidateGoodsByBatching(res.BatchingLoc);
+                                        }
+                                        break;
+                                }
+                            }
+                        }
+                        //根据商品类型执行具体制作流程
+                        switch (currentGoodsType)
+                        {
+                            case GOODS_TYPE.JUICE:
+                                GuMake = order.MakeID == "2";
+                                DoJuicer();
+                                break;
+                            case GOODS_TYPE.NEITHER:
+                                DeviceProcessLogShow("未知的商品类型");
+                                break;
+                        }
+                    }
+                    working = false;
+                    lastRecvdOrder = DateTime.Now;
+                }
+                Thread.Sleep(1000);
+            }), "订单制作");
+        }
+
+        public void Main()
+        {
+            //开始心跳刷新，根据咖啡机及冰淇淋机来判断
+            //ThreadManage.GetInstance().StartLong(new Action(() =>
+            //{
+            //    Thread.Sleep(100);
+            //}), "MORK-IC心跳刷新");
+        }
+
+        public void DataParse<T>(T order)
+        {
+            if (order is MorkOrderPush morkOrderPush)
+            {
+                morkOrderPushes.Enqueue(morkOrderPush);
+            }
+        }
+
+        /// <summary>
+        ///  
+        /// </summary>
+        /// <param name="batchingLoc">物料位置</param>
+        private GOODS_TYPE ValidateGoodsByBatching(string batchingLoc)
+        {
+            if (batchings.ContainsKey(batchingLoc))
+                return batchings[batchingLoc].GoodsType;
+            return GOODS_TYPE.NEITHER;
+        }
+
+        private AutoResetEvent are = new AutoResetEvent(false);
+
+        private T GetStatus<T>(string key)
+        {
+            if (peripheralStatus.ContainsKey(key))
+            {
+                if (peripheralStatus[key] != null)
+                {
+                    return (T)(peripheralStatus[key]);
+                }
+            }
+            return default;
+        }
+
+        private void Wait(int value)
+        {
+            while (!((GetStatus<int>("Get_RobotAO1") == value) && GetStatus<int>("GetProgramStatus") == 0))//判断文件是否已经执行结束 且 文件末端变量值==文件名
+            {
+                Thread.Sleep(5);
+            }
+        }
+        int[] devStatusBy = new int[2] { 0, 0 };
+        /// <summary>
+        /// 果汁机控制信号
+        /// </summary>
+        private byte JuicerNum;
+        /// <summary>
+        /// 做果汁
+        /// </summary>
+        private void DoJuicer()
+        {
+            #region 接果汁流程
+            OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
+            try
+            {
+                int JuicerNum1 = int.Parse(mainMaterialLoc);
+                switch (JuicerNum1)
+                {
+                    case 52:
+                        if (GuMake)
+                        {
+                            JuicerNum = 0x00;
+                        }
+                        else
+                        {
+                            JuicerNum = 0x01;
+                        }
+                        break;
+                    case 53:
+                        if (GuMake)
+                        {
+                            JuicerNum = 0x02;
+                        }
+                        else
+                        {
+                            JuicerNum = 0x03;
+                        }
+                        break;
+                    case 54:
+                        if (GuMake)
+                        {
+                            JuicerNum = 0x04;
+                        }
+                        else
+                        {
+                            JuicerNum = 0x05;
+                        }
+                        break;
+                    case 55:
+                        if (GuMake)
+                        {
+                            JuicerNum = 0x06;
+                        }
+                        else
+                        {
+                            JuicerNum = 0x07;
+                        }
+                        break;
+                    default:
+                        JuicerNum = 0x00;
+                        break;
+                }
+                var devStatus = GetStatus<int[]>("GetDeviceStatus");
+                var devStatus1 = Convert.ToString(devStatus[0], 2);
+                var devStatus2 = devStatus[1];
+
+                if (devStatus1.IndexOf("0") == 1 && devStatus2 == 0)
+                {
+                    new WriteJuicer() { Value = JuicerNum }.Publish();
+
+                    Thread.Sleep(100);
+                    devStatusBy = GetStatus<int[]>("GetDeviceStatus");
+                    while (!(devStatusBy[1] == 0))
+                    {
+                        Thread.Sleep(100);
+                        devStatusBy = GetStatus<int[]>("GetDeviceStatus");
+                        while (devStatusBy.Length != 2)
+                        {
+                            Thread.Sleep(100);
+                            devStatusBy = GetStatus<int[]>("GetDeviceStatus");
+                        }
+                    }
+                    devStatusBy = GetStatus<int[]>("GetDeviceStatus");
+                    Thread.Sleep(5000);
+                    OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
+                }
+            }
+            catch (Exception ex)
+            {
+                DeviceProcessLogShow("获取果汁机状态失败");
+            }
+            #endregion
+        }
+
+        public override DeviceClientType DeviceType => throw new NotImplementedException();
+
+
+        private T McuRead<T>(string tagName, object par)
+        {
+            new ReadMcu() { DeviceId = DeviceId, TagName = tagName, ReadPar = par };
+            if (peripheralStatus.ContainsKey(tagName))
+            {
+                if (peripheralStatus[tagName] != null)
+                {
+                    return (T)peripheralStatus[tagName];
+                }
+            }
+            return default;
+        }
+
+        public void SimOrder<T>(T simOrder)
+        {
+
+        }
+        public override void DoMain()
+        {
+
+        }
+
+        public override void Stop()
+        {
+
+        }
+
+        public override void ReadData()
+        {
+
+        }
+
+        public override void MainTask()
+        {
+
+        }
+
+        public override void ResetProgram()
+        {
+
+        }
+        public override void SimOrder()
+        {
+        }
+    }
+}
diff --git a/BPASmartClient.MorkTJuicer/GVL_MORKJC.cs b/BPASmartClient.MorkTJuicer/GVL_MORKJC.cs
new file mode 100644
index 00000000..34ab7669
--- /dev/null
+++ b/BPASmartClient.MorkTJuicer/GVL_MORKJC.cs
@@ -0,0 +1,8 @@
+using BPASmartClient.Device;
+
+namespace BPASmartClient.MorkTJuicer
+{
+    public class GVL_MORKJC : IStatus
+    {
+    }
+}
diff --git a/BPASmartClient.MorkTJuicer/PolymerBatching.cs b/BPASmartClient.MorkTJuicer/PolymerBatching.cs
new file mode 100644
index 00000000..95f11f0f
--- /dev/null
+++ b/BPASmartClient.MorkTJuicer/PolymerBatching.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkTJuicer
+{
+    internal enum GOODS_TYPE
+    {
+        /// <summary>
+        /// 未知
+        /// </summary>
+        NEITHER,
+        /// <summary>
+        /// 果汁
+        /// </summary>
+        JUICE
+    }
+
+    internal enum BATCHING_CLASS
+    {
+        HOLDER,
+        MAIN_MATERIAL,
+    }
+
+    internal class PolymerBatching
+    {
+        internal const string Juicer_MAIN_BATCHIN1_LOC = "52";
+        internal const string Juicer_MAIN_BATCHIN2_LOC = "53";
+        internal const string Juicer_MAIN_BATCHIN3_LOC = "54";
+        internal const string Juicer_MAIN_BATCHIN4_LOC = "55";
+        internal const string COFFEE_HOLDER_LOC = "30";
+        internal const string TEA_HOLDER_LOC = "51";
+        public static Dictionary<string, GOODS_TYPE> GOODS_TYPES = new Dictionary<string, GOODS_TYPE>() {
+            {Juicer_MAIN_BATCHIN1_LOC,GOODS_TYPE.JUICE},
+            {Juicer_MAIN_BATCHIN2_LOC,GOODS_TYPE.JUICE},
+            {Juicer_MAIN_BATCHIN3_LOC,GOODS_TYPE.JUICE},
+            {Juicer_MAIN_BATCHIN4_LOC,GOODS_TYPE.JUICE},
+        };
+
+        public GOODS_TYPE GoodsType { get; set; }
+        public BATCHING_CLASS BatchingClass { get; set; }
+        private string loc;
+
+        public string Loc
+        {
+            get { return loc; }
+            set
+            {
+                loc = value;
+                if (GOODS_TYPES.ContainsKey(loc))
+                    GoodsType = GOODS_TYPES[loc];
+                switch (loc)
+                {
+                    case COFFEE_HOLDER_LOC:
+                    case TEA_HOLDER_LOC:
+                        BatchingClass = BATCHING_CLASS.HOLDER;
+                        break;
+                    default:
+                        BatchingClass = BATCHING_CLASS.MAIN_MATERIAL;
+                        break;
+                }
+            }
+        }
+
+        internal static Dictionary<string, PolymerBatching> BuildAll()
+        {
+            Dictionary<string, PolymerBatching> temp = new Dictionary<string, PolymerBatching>();
+            foreach (var item in GOODS_TYPES)
+            {
+                temp.Add(item.Key, new PolymerBatching() { Loc = item.Key });
+            }
+            return temp;
+        }
+    }
+}
diff --git a/BPASmartClient.Morkt.JAKA.JC/BPASmartClient.MorkTJAKAJC.csproj b/BPASmartClient.Morkt.JAKA.JC/BPASmartClient.MorkTJAKAJC.csproj
index 8c21b75c..83fb3b7c 100644
--- a/BPASmartClient.Morkt.JAKA.JC/BPASmartClient.MorkTJAKAJC.csproj
+++ b/BPASmartClient.Morkt.JAKA.JC/BPASmartClient.MorkTJAKAJC.csproj
@@ -7,9 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
     <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
+    <ProjectReference Include="..\BPASmartClient.DRCoffee\BPASmartClient.DRCoffee.csproj" />
+    <ProjectReference Include="..\BPASmartClient.GSIceCream\BPASmartClient.GSIceCream.csproj" />
     <ProjectReference Include="..\BPASmartClient.JAKA\BPASmartClient.JAKA.csproj" />
     <ProjectReference Include="..\BPASmartClient.Juicer\BPASmartClient.Juicer.csproj" />
+    <ProjectReference Include="..\BPASmartClient.LebaiRobot\BPASmartClient.LebaiRobot.csproj" />
     <ProjectReference Include="..\BPASmartClient.MCU\BPASmartClient.MCU.csproj" />
   </ItemGroup>
 
diff --git a/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs b/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs
index 883aafa3..15ce6969 100644
--- a/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs
+++ b/BPASmartClient.Morkt.JAKA.JC/Control_MORKJC.cs
@@ -16,28 +16,13 @@ using BPASmartClient.EventBus;
 using static BPASmartClient.EventBus.EventBus;
 using BPASmartClient.Model.PLC;
 using BPASmartClient.Model.单片机;
+using BPASmartClient.Message;
 
 namespace BPASmartClient.MorktJAKAJC
 {
-    /*
-     * 冰淇淋咖啡机组合套装
-     * 物料位置：
-     * 1：冰淇料
-     * 2：冰淇淋杯
-     * 5：咖啡
-     * 6：咖啡杯
-     * 9: 茶
-     * 10: 茶杯
-     */
     public class Control_MORKJC : BaseDevice
     {
         GVL_MORKJC mORKD = new GVL_MORKJC();
-        //咖啡机主控程序
-        //private CoffeeMachine coffeeMachine;
-        ////果汁机主控程序
-        //private JuicerMachine juicerMachine;
-        ////单片机主控程序
-        //private ICChipMachine icchipMachine;
         //物料存放位置
         private Dictionary<string, PolymerBatching> batchings = new Dictionary<string, PolymerBatching>();
         //容器位置
@@ -80,13 +65,6 @@ namespace BPASmartClient.MorktJAKAJC
             //构建所有商品物料信息
             batchings = PolymerBatching.BuildAll();
             EventBus.EventBus.GetInstance().Subscribe<DRCoffee_CoffeEndCookEvent>(DeviceId, DRCoffee_CoffeEndCookEventHandle);
-
-            System.Configuration.Configuration config = System.Configuration.ConfigurationManager.OpenExeConfiguration(System.Configuration.ConfigurationUserLevel.None);
-            //一系列外围基础配置
-            var com_Coffee = config.AppSettings.Settings["COM_Coffee"].Value;
-            var baud_Coffee = config.AppSettings.Settings["BAUD_Coffee"].Value;
-            //咖啡机创建
-            //coffeeMachine = new CoffeeMachine(com_Coffee, (BaudRates)Enum.Parse(typeof(BaudRates), baud_Coffee));
             Main();
             ReadData();
             ThreadManage.GetInstance().StartLong(new Action(() =>
@@ -99,9 +77,6 @@ namespace BPASmartClient.MorktJAKAJC
                     if (morkOrderPushes.TryDequeue(out MorkOrderPush order))
                     {
                         DeviceProcessLogShow($"开始制作订单[{order.SortNum}]");
-
-
-
                         //商品类型
                         GOODS_TYPE currentGoodsType = GOODS_TYPE.NEITHER;
                         //子订单ID
@@ -131,7 +106,6 @@ namespace BPASmartClient.MorktJAKAJC
                                 }
                             }
                         }
-
                         //根据商品类型执行具体制作流程
                         switch (currentGoodsType)
                         {
@@ -162,8 +136,6 @@ namespace BPASmartClient.MorktJAKAJC
 
         public void Main()
         {
-            //咖啡机开启主线程
-            //coffeeMachine.Start();
             //开始心跳刷新，根据咖啡机及冰淇淋机来判断
             ThreadManage.GetInstance().StartLong(new Action(() =>
             {
@@ -175,14 +147,6 @@ namespace BPASmartClient.MorktJAKAJC
                 //GeneralConfig.Healthy = true;
                 Thread.Sleep(100);
             }), "MORK-IC心跳刷新");
-            //ThreadManage.GetInstance().Start(new Action(() =>
-            //{
-            //    while (!Write.IsConnected)
-            //    {
-            //        Thread.Sleep(10);
-            //    }
-            //    //LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_欢迎);
-            //}), "MORK-JC欢迎");
         }
 
         public void DataParse<T>(T order)
@@ -242,14 +206,12 @@ namespace BPASmartClient.MorktJAKAJC
         {
             #region 接咖啡流程
             are.Reset();
-            // OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
             OrderChange(subOrderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
             int resultTakeCup = takeCup();
             if (resultTakeCup == 1)
             {
                 DeviceProcessLogShow("咖啡杯取杯完成");
                 new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_接咖啡 }.Publish();
-                // Write("JaKaProgramName",JakaModel.SENCE_接咖啡);
                 Wait(int.Parse(JakaModel.SENCE_接咖啡));
                 new DRCoffee_MakeCoffeeEvent() { DeviceId = DeviceId, DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish();  //接咖啡控制 //DrCoffeeDrinksCode.热水
                 are.WaitOne(1000 * 180);
@@ -351,7 +313,6 @@ namespace BPASmartClient.MorktJAKAJC
             int resultTakeCup = takeCup();
             if (resultTakeCup == 1)
             {
-
                 new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_接水 }.Publish();
                 Wait(int.Parse(JakaModel.SENCE_接水));
 
@@ -616,13 +577,6 @@ namespace BPASmartClient.MorktJAKAJC
                     new WriteJaka() { TagName = "JaKaProgramName", Value = JakaModel.SENCE_取杯检测 }.Publish();
                     Wait(int.Parse(JakaModel.SENCE_取杯检测));
                     bSensorInput = sensor_Sign(1);
-                    /*delayTimeOut = DateTime.Now;
-                    bSensorInput = sensor_Sign(1);
-                    while (bSensorInput == 3)
-                    {
-                        Thread.Sleep(100);
-                        bSensorInput = sensor_Sign(1);
-                    }*/
                     while (getCup_cnt < 4 && (bSensorInput == 2 || bSensorInput == 3))
                     {
                         DeviceProcessLogShow($"第{getCup_cnt}次取杯失败");
@@ -654,7 +608,7 @@ namespace BPASmartClient.MorktJAKAJC
             }
             catch (Exception ex)
             {
-                DeviceProcessLogShow(ex.ToString());
+                MessageLog.GetInstance.ShowEx(ex.ToString());
                 return 0;
             }
         }
@@ -697,7 +651,7 @@ namespace BPASmartClient.MorktJAKAJC
             }
             catch (Exception ex)
             {
-                DeviceProcessLogShow(ex.ToString());
+                MessageLog.GetInstance.ShowEx(ex.ToString());
                 return 0;
             }
         }
@@ -713,7 +667,6 @@ namespace BPASmartClient.MorktJAKAJC
         {
             try
             {
-                //cnt_Check = 0;
                 bSensorInput = sensor_Sign(2);
                 if (bSensorInput == 2)
                 {
@@ -729,7 +682,7 @@ namespace BPASmartClient.MorktJAKAJC
             }
             catch (Exception ex)
             {
-                DeviceProcessLogShow(ex.ToString());
+                MessageLog.GetInstance.ShowEx(ex.ToString());
                 return 0;
             }
         }
diff --git a/BPASmartClient.Morkt.JAKA.JC/View/DebugView.xaml b/BPASmartClient.Morkt.JAKA.JC/View/DebugView.xaml
new file mode 100644
index 00000000..a1e6ee6b
--- /dev/null
+++ b/BPASmartClient.Morkt.JAKA.JC/View/DebugView.xaml
@@ -0,0 +1,397 @@
+<UserControl x:Class="BPASmartClient.MorkTJAKAJC.View.DebugView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:BPASmartClient.MorkTJAKAJC.ViewModel"
+             mc:Ignorable="d" 
+             Name="调试界面"
+             d:DesignHeight="500" d:DesignWidth="1000" Unloaded="Dubug_Unloaded">
+    <UserControl.DataContext>
+        <vm:DebugViewModel/>
+    </UserControl.DataContext>
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="10*"/>
+            <ColumnDefinition Width="10*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="10*"/>
+            <RowDefinition Height="20*"/>
+        </Grid.RowDefinitions>
+
+        <GroupBox Grid.ColumnSpan="2"
+            FontFamily="楷体"
+            FontSize="20"
+            Header=" 乐白机器人 ">
+            <Grid Margin="10">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="3*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="连接状态" />
+                    <TextBlock Text="{Binding RobotConnected}"
+                           Margin="40,0"/>
+                    <TextBlock Text="机器人模式："/>
+                    <TextBlock Text="{Binding RobotMode}"
+                               Margin="40,0"/>
+                </StackPanel>
+                <TextBlock Text="连接状态" />
+                <TextBlock Text="{Binding RobotConnected}"
+                           Margin="120,0,0,0"/>
+                
+                <ListBox Grid.Row="2" Background="Transparent" Margin="0,0,0,-9">
+                    <ListBox.Template>
+                        <ControlTemplate TargetType="{x:Type ListBox}">
+                            <ScrollViewer  HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                                <WrapPanel Orientation="Horizontal" IsItemsHost="True" ScrollViewer.CanContentScroll="True"/>
+                            </ScrollViewer>
+                        </ControlTemplate>
+                    </ListBox.Template>
+                    <Button Content="机器人启动"
+                            Margin="20,5" Width="80" Height="40"
+                            Command="{Binding Button_RobotControlCommand}"
+                            CommandParameter="机器人启动">
+                    </Button>
+                    <Button Content="启动示教"
+                            Margin="20,5" Width="80" Height="40"
+                            Command="{Binding Button_RobotControlCommand}"
+                            CommandParameter="启动示教"/>
+                    <Button Content="停止示教" 
+                            Margin="20,5" Width="80" Height="40"
+                            Command="{Binding Button_RobotControlCommand}"
+                            CommandParameter="停止示教"/>
+                    <Button Content="机器人急停"
+                            Margin="20,5"  Width="80" Height="40"
+                            Command="{Binding Button_RobotControlCommand}"
+                            CommandParameter="机器人急停"/>
+                    <Button Content="暂停"
+                            Margin="10,5"  Width="40" Height="40"
+                            Command="{Binding Button_RobotControlCommand}"
+                            CommandParameter="机器人急停"/>
+                    <Button Content="恢复"
+                            Margin="10,5"  Width="40" Height="40"
+                            Command="{Binding Button_RobotControlCommand}"
+                            CommandParameter="机器人急停"/>
+                </ListBox>
+                <Grid Margin="629,-24,19,0" Grid.RowSpan="3">
+                    <Grid.RowDefinitions>
+                        <RowDefinition></RowDefinition>
+                        <RowDefinition></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid Grid.Row="0">
+                        <TextBlock>DI</TextBlock>
+                        <CheckBox Margin="50,0,0,0" IsEnabled="false" Name="Robot_DI0">DI0</CheckBox>
+                        <CheckBox Margin="120,0,0,0" IsEnabled="false" Name="Robot_DI1">DI1</CheckBox>
+                        <CheckBox Margin="190,0,0,0" IsEnabled="false" Name="Robot_DI2">DI2</CheckBox>
+                        <CheckBox Margin="260,0,0,0" IsEnabled="false" Name="Robot_DI3">DI3</CheckBox>
+                    </Grid>
+                    <Grid Grid.Row="1">
+                        <TextBlock Width="50">DO</TextBlock>
+                        <ComboBox  Width="70" Margin="50,12,268,10">
+                            <ComboBoxItem IsSelected="true">DO0</ComboBoxItem>
+                            <ComboBoxItem>DO1</ComboBoxItem>
+                            <ComboBoxItem>DO2</ComboBoxItem>
+                            <ComboBoxItem>DO3</ComboBoxItem>
+                        </ComboBox>
+                        <ComboBox Margin="142,12,108,10" Width="70">
+                            <ComboBoxItem IsSelected="true">true</ComboBoxItem>
+                            <ComboBoxItem>false</ComboBoxItem>
+                        </ComboBox>
+                        <Button Width="50" Margin="260,12,10,10">输出</Button>
+                    </Grid>
+                </Grid>
+            </Grid>
+        </GroupBox>
+        <GroupBox  Grid.Row="2"
+            FontFamily="楷体"
+            FontSize="20"
+            Header=" 果汁机 ">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="3*"/>
+                    <RowDefinition Height="3*"/>
+                    <RowDefinition Height="3*"/>
+                </Grid.RowDefinitions>
+                <TextBlock Text="连接状态" />
+                <TextBlock Text="{Binding IceCreamConnected}"
+                           Margin="120,0,0,0"/>
+                <Grid Grid.Row="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition></ColumnDefinition>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Text="设备状态" />
+                    <Grid Grid.Column="1">
+                        <Grid.RowDefinitions>
+                            <RowDefinition></RowDefinition>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition></ColumnDefinition>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Column="0" Name="Heating" HorizontalAlignment="Center">制热</TextBlock>
+                        <TextBlock Grid.Column="1" Name="cooling"  HorizontalAlignment="Center">制冷</TextBlock>
+                        <TextBlock Grid.Column="2" Name="LackOfWater"  HorizontalAlignment="Center">缺水</TextBlock>
+                        <TextBlock Grid.Column="3" Name="ChildLocks"  HorizontalAlignment="Center">童锁</TextBlock>
+                        <TextBlock Grid.Column="4" Name="Use"  HorizontalAlignment="Center">使用</TextBlock>
+                    </Grid>
+
+                </Grid>
+
+
+                <StackPanel Grid.Row="2" Orientation="Vertical">
+                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                        <TextBlock>果汁</TextBlock>
+                        <ComboBox Margin="100,0,0,0"
+                                Width="100" >
+                            <ComboBoxItem IsSelected="true">饮品1</ComboBoxItem>
+                            <ComboBoxItem>饮品2</ComboBoxItem>
+                            <ComboBoxItem>饮品3</ComboBoxItem>
+                            <ComboBoxItem>饮品4</ComboBoxItem>
+                        </ComboBox>
+                        <ComboBox Margin="20,0,0,0" Width="100">
+                            <ComboBoxItem IsSelected="true">冷饮</ComboBoxItem>
+                            <ComboBoxItem>热饮</ComboBoxItem>
+                        </ComboBox>
+                        <Button Command="{Binding Button_MakeIceCreamCommand}"
+                                Margin="20,0"
+                                Content="制作" />
+                    </StackPanel>
+                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+        </GroupBox>
+        <GroupBox  Grid.Row="2" Grid.Column="1"
+            FontFamily="楷体"
+            FontSize="20"
+            Header=" 咖啡机">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <TextBlock Text="连接状态" />
+                <TextBlock Text="{Binding CoffeeConnected}"
+                           Margin="120,0,0,0"/>
+                <Grid Grid.Row="1">
+                    <Grid.Resources>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="HorizontalAlignment" Value="Left" />
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </Grid.Resources>
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="99" />
+                        <ColumnDefinition Width="140" />
+                        <ColumnDefinition Width="100" />
+                        <ColumnDefinition Width="171" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Height="23" Width="100" FontSize="18" HorizontalAlignment="Center">咖啡机状态</TextBlock>
+                    <TextBlock FontSize="18" 
+                            Grid.Column="1"
+                            Text="{Binding CoffeeStatus}" Height="23" />
+                    <TextBlock Grid.Column="2" Height="23" Width="80" FontSize="18">应用状态</TextBlock>
+                    <TextBlock FontSize="18"
+                            Grid.Column="3" 
+                            Text="{Binding AppStatus}" Height="23"/>
+                    <TextBlock Grid.Row="1" Grid.Column="0" Height="22" Width="80" FontSize="18">告警信息</TextBlock>
+                    <TextBlock FontSize="15"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Text="{Binding Warning}"  />
+                    <TextBlock Grid.Row="1" Grid.Column="2" Height="22" Width="80" FontSize="18">故障信息</TextBlock>
+                    <TextBlock FontSize="18"
+                            Grid.Row="1"
+                            Grid.Column="3"
+                            Text="{Binding CaffeeFault}" Height="22" Width="60" />
+                </Grid>
+                <StackPanel Grid.Row="2" Orientation="Vertical">
+                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                        <TextBlock>饮品</TextBlock>
+                        <ComboBox Margin="10,0"
+                                Width="100"
+                                ItemsSource="{Binding Coffees}"
+                                SelectedItem="{Binding SelectedCoffee}" />
+                        <Button Margin="10,0"
+                            Command="{}"
+                                Content="制作"/>
+                        <Button Margin="10,0"
+                            Command="{}"
+                                Content="停止制作"/>
+                    </StackPanel>
+                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
+                        <TextBlock>模式</TextBlock>
+                        <ComboBox Margin="10,0"
+                                Width="100"
+                                ItemsSource="{Binding CoffeeCmds}"
+                                SelectedItem="{Binding SelectedCoffeeCmd}"/>
+                        <Button Margin="10,0"
+                                Command="{}"
+                                Content="设置" Cursor="Hand"/>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+        </GroupBox>
+        <GroupBox Header="单片机控制"
+                   FontSize="18"
+                  Grid.Row="1" Grid.ColumnSpan="2"
+                  Margin="0,0,0,10">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition></RowDefinition>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="5*"/>
+                    <ColumnDefinition Width="5*"/>
+                    <ColumnDefinition Width="13*"/>
+                    <ColumnDefinition Width="7*"/>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Column="0" >
+                    <TextBlock FontSize="12">连接状态</TextBlock>
+                    <TextBlock FontSize="12"></TextBlock>
+                </Grid>
+                <Grid Grid.Column="1" >
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition></ColumnDefinition>
+                        </Grid.ColumnDefinitions>
+                        <Grid Grid.Row="0" Grid.Column="0" >
+                            <TextBlock  FontSize="12"  HorizontalAlignment="Center">舵机控制</TextBlock>
+
+                        </Grid>
+                        <Grid Grid.Row="0" Grid.Column="1">
+                            <ComboBox Margin="0,0,0,0" FontSize="12" Width="60">
+                                <ComboBoxItem IsSelected="true">舵机1</ComboBoxItem>
+                                <ComboBoxItem>舵机2</ComboBoxItem>
+                                <ComboBoxItem>舵机3</ComboBoxItem>
+                                <ComboBoxItem>舵机4</ComboBoxItem>
+                            </ComboBox>
+                        </Grid>
+                        <Grid Grid.Row="1" Grid.Column="0">
+                            <Button FontSize="15"  HorizontalAlignment="Center">输出</Button>
+                        </Grid>
+                        <Grid Grid.Row="1" Grid.Column="1" Width="60">
+                            <TextBox>1</TextBox>
+                        </Grid>
+                    </Grid>
+                </Grid>
+                <Grid Grid.Column="2" >
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition></RowDefinition>
+                            <RowDefinition></RowDefinition>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition></ColumnDefinition>
+                        </Grid.ColumnDefinitions>
+                        <Grid Grid.Row="0" Grid.Column="0" >
+                            <TextBlock  FontSize="12"  HorizontalAlignment="Center">DI输入</TextBlock>
+                        </Grid>
+                        <Grid Grid.Row="1" Grid.Column="0" Width="400">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                    <ColumnDefinition></ColumnDefinition>
+                                </Grid.ColumnDefinitions>
+                                <Grid Grid.Column="0">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH0">DI0</CheckBox>
+                                </Grid>
+                                <Grid Grid.Column="1">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH1">DI1</CheckBox>
+                                </Grid>
+                                <Grid Grid.Column="2">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH2">DI2</CheckBox>
+                                </Grid>
+                                <Grid Grid.Column="3">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH3">DI3</CheckBox>
+                                </Grid>
+                                <Grid Grid.Column="4">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH4">DI4</CheckBox>
+                                </Grid>
+                                <Grid Grid.Column="5">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH5">DI5</CheckBox>
+                                </Grid>
+                                <Grid Grid.Column="6">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH6">DI6</CheckBox>
+                                </Grid>
+                                <Grid Grid.Column="7">
+                                    <CheckBox FontSize="12" IsEnabled="false" Name="CH7">DI7</CheckBox>
+                                </Grid>
+                            </Grid>
+
+                        </Grid>
+                    </Grid>
+                </Grid>
+
+                <Grid Grid.Column="3" >
+                    <Grid.RowDefinitions>
+                        <RowDefinition></RowDefinition>
+                        <RowDefinition></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition></ColumnDefinition>
+                    </Grid.ColumnDefinitions>
+                    <Grid Grid.Column="0">
+                        <TextBlock FontSize="12" HorizontalAlignment="Center">DO输出</TextBlock>
+                    </Grid>
+                    <Grid Grid.Column="1" Grid.Row="0">
+                        <ComboBox Width="50" FontSize="12" HorizontalAlignment="Center">
+                            <ComboBoxItem IsSelected="true">DO0</ComboBoxItem>
+                            <ComboBoxItem>DO1</ComboBoxItem>
+                            <ComboBoxItem>DO2</ComboBoxItem>
+                            <ComboBoxItem>DO3</ComboBoxItem>
+                            <ComboBoxItem>DO4</ComboBoxItem>
+                            <ComboBoxItem>DO5</ComboBoxItem>
+                            <ComboBoxItem>DO6</ComboBoxItem>
+                            <ComboBoxItem>DO7</ComboBoxItem>
+                        </ComboBox>
+                    </Grid>
+                    <Grid Grid.Column="0" Grid.Row="1">
+                        <Button Width="50">输出</Button>
+                    </Grid>
+                    <Grid Grid.Column="1" Grid.Row="1">
+                        <RadioButton FontSize="12" IsChecked="true">True</RadioButton>
+                        <RadioButton Margin="50,0,0,0" FontSize="12">false</RadioButton>
+                    </Grid>
+                </Grid>
+            </Grid>
+        </GroupBox>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.Morkt.JAKA.JC/View/DebugView.xaml.cs b/BPASmartClient.Morkt.JAKA.JC/View/DebugView.xaml.cs
new file mode 100644
index 00000000..9a5f1480
--- /dev/null
+++ b/BPASmartClient.Morkt.JAKA.JC/View/DebugView.xaml.cs
@@ -0,0 +1,35 @@
+using BPASmartClient.Helper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MorkTJAKAJC.View
+{
+    /// <summary>
+    /// DebugView.xaml 的交互逻辑
+    /// </summary>
+    public partial class DebugView : UserControl
+    {
+        public DebugView()
+        {
+            InitializeComponent();
+        }
+
+        private void Dubug_Unloaded(object sender, RoutedEventArgs e)
+        {
+            ThreadManage.GetInstance().StopTask("MorkT-状态刷新");
+            ThreadManage.GetInstance().StopTask("MorkT-传感器监视");
+        }
+    }
+}
diff --git a/BPASmartClient.Morkt.JAKA.JC/ViewModel/DebugViewModel.cs b/BPASmartClient.Morkt.JAKA.JC/ViewModel/DebugViewModel.cs
new file mode 100644
index 00000000..9b0c3763
--- /dev/null
+++ b/BPASmartClient.Morkt.JAKA.JC/ViewModel/DebugViewModel.cs
@@ -0,0 +1,237 @@
+using BPASmartClient.Business;
+using BPASmartClient.Device;
+using BPASmartClient.DRCoffee;
+using BPASmartClient.EventBus;
+using BPASmartClient.GSIceCream;
+using BPASmartClient.Helper;
+using BPASmartClient.LebaiRobot;
+using BPASmartClient.Message;
+using BPASmartClient.Model;
+using BPASmartClient.Model.乐白机器人;
+using BPASmartClient.Model.冰淇淋.Enum;
+using BPASmartClient.Model.单片机;
+using BPASmartClient.Model.单片机.Enum;
+using BPASmartClient.Model.咖啡机.Enum;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+
+namespace BPASmartClient.MorkTJAKAJC.ViewModel;
+    public class DebugViewModel : ObservableObject
+    {
+        
+        #region 乐白机器人
+        /// <summary>
+        /// 乐白机器人连接状态
+        /// </summary>
+        public string RobotConnected { get { return _robotConnected; } set { _robotConnected = value; OnPropertyChanged(); } }
+        private string _robotConnected { get; set; }
+        /// <summary>
+        /// 乐白机器人的模式状态
+        /// </summary>
+        public string RobotMode { get { return _robotMode; } set { _robotMode = value; OnPropertyChanged(); } }
+        private string _robotMode { get; set; }
+        /// <summary>
+        /// 机器人控制指令
+        /// </summary>
+        public RelayCommand<object> Button_RobotControlCommand { get; set; }
+        /// <summary>
+        /// 机器人控制
+        /// </summary>
+        /// <param name="o"></param>
+        private void Button_RobotControl(object o)
+        {
+            EventBus.EventBus.GetInstance().Publish(new LebaiRobot_LebaiControlEvent { DeviceId = DeviceId, LebaiControl = o.ToString() });
+        }
+
+        #endregion
+
+       
+
+        #region 果汁机
+        /// <summary>
+        /// 果汁机的连接状态
+        /// </summary>
+        public string JuicerConnected { get { return _JuicerConnected; } set { _JuicerConnected = value; OnPropertyChanged(); } }
+        private string _JuicerConnected { get; set; }
+        
+        /// <summary>
+        /// 果汁机的状态
+        /// </summary>
+        public string JuicerState { get { return _JuicerState; } set { _JuicerState = value; OnPropertyChanged(); } }
+        private string _JuicerState { get; set; }
+        
+    #endregion
+
+        #region 咖啡机
+    /// <summary>
+    /// 咖啡机连接状态
+    /// </summary>
+    public string CoffeeConnected { get { return _coffeeConnected; } set { _coffeeConnected = value; OnPropertyChanged(); } }
+            private string _coffeeConnected { get; set; }
+            /// <summary>
+            /// 咖啡机状态
+            /// </summary>
+            public string CoffeeStatus { get { return _coffeeStatus; } set { _coffeeStatus = value; OnPropertyChanged(); } }
+            private string _coffeeStatus { get; set; }
+            /// <summary>
+            /// 应用状态
+            /// </summary>
+            public string AppStatus { get { return _appStatus; } set { _appStatus = value; OnPropertyChanged(); } }
+            private string _appStatus { get; set; }
+            /// <summary>
+            /// 告警
+            /// </summary>
+            public string Warning { get { return _warning; } set { _warning = value; OnPropertyChanged(); } }
+            public string _warning { get; set; }
+            /// <summary>
+            /// 故障信息
+            /// </summary>
+            public string CaffeeFault { get { return _caffeeFault; } set { _caffeeFault = value; OnPropertyChanged(); } }
+            public string _caffeeFault { get; set; }
+
+            public List<string> Coffees { get; set; } = new List<string>();
+            public string SelectedCoffee { get; set; }
+
+            public List<string> CoffeeCmds { get; set; } = new List<string>();
+            public string SelectedCoffeeCmd { get; set; }
+            /// <summary>
+            /// 制作咖啡
+            /// </summary>
+            public RelayCommand Button_MakeCoffeeCommand { get; set; }
+            /// <summary>
+            /// 停止制作咖啡
+            /// </summary>
+            public RelayCommand Button_StopMakeCoffeCommand { get; set; }
+            /// <summary>
+            /// 咖啡模式设置
+            /// </summary>
+            public RelayCommand Button_CoffeeModeSetCommand { get; set; }
+
+            private void Button_MakeCoffee()
+            {
+                EventBus.EventBus.GetInstance().Publish(new DRCoffee_MakeCoffeeEvent() { DeviceId = DeviceId, DrinkCode = (DrCoffeeDrinksCode)Enum.Parse(typeof(DrCoffeeDrinksCode), SelectedCoffee)});
+            }
+            private void Button_StopMakeCoffe()
+            {
+                EventBus.EventBus.GetInstance().Publish(new DRCoffee_CancelMakeCoffeeEvent() { DeviceId = DeviceId });
+            }
+            private void Button_CoffeeModeSet()
+            {
+                EventBus.EventBus.GetInstance().Publish(new DRCoffee_CoffeeCommCmdEvent() { DeviceId = DeviceId, CommCmd = (DrCoffeeCommCmd)Enum.Parse(typeof(DrCoffeeCommCmd), SelectedCoffeeCmd)});
+            }
+            #endregion
+
+        #region 单片机
+        /// <summary>
+        /// 咖啡杯或冰淇淋杯落杯
+        /// </summary>
+        public RelayCommand<object> Button_CupControlCommand { get; set; }
+        /// <summary>
+        /// 单片机冰淇淋机器制冷
+        /// </summary>
+        public RelayCommand Button_SCChipRefrigerationCommand { get; set; }
+        /// <summary>
+        /// 单片机冰淇淋机器打料
+        /// </summary>
+        public RelayCommand Button_SCChipDischargeCommand { get; set; }
+        /// <summary>
+        /// 模拟测试
+        /// </summary>
+        public RelayCommand Button_SCChipTestCommand { get; set; }
+
+        private void Button_CupControl(object CupType)
+        {
+            EventBus.EventBus.GetInstance().Publish(new SCChip_TakeCupEvent() { DeviceId = DeviceId, Cup = (IC_CUP)Enum.Parse(typeof(IC_CUP), CupType.ToString()) });
+        }
+
+        private void Button_SCChipRefrigeration()
+        {
+            EventBus.EventBus.GetInstance().Publish(new SCChip_RotorSwitchEvent { DeviceId = DeviceId, TurnOn = true });
+            Thread.Sleep(500);
+            EventBus.EventBus.GetInstance().Publish(new SCChip_RotorSwitchEvent { DeviceId = DeviceId, TurnOn = false });
+            
+        }
+
+        private void Button_SCChipDischarge()
+        {
+            EventBus.EventBus.GetInstance().Publish(new SCChip_MakeIceCreamEvent { DeviceId = DeviceId, SteeringEngine = IC_SE.SE_2 });
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 设备ID
+        /// </summary>
+        public int DeviceId { get; set; }
+        /// <summary>
+        /// 设备数据
+        /// </summary>
+        public ObservableCollection<VariableMonitor> variableMonitors { get; set; }
+        
+        public DebugViewModel()
+        {
+            Button_RobotControlCommand = new RelayCommand<object>(Button_RobotControl);
+            Button_MakeCoffeeCommand = new RelayCommand(Button_MakeCoffee);
+            Button_StopMakeCoffeCommand = new RelayCommand(Button_StopMakeCoffe);
+            Button_CoffeeModeSetCommand = new RelayCommand(Button_CoffeeModeSet);
+
+            Button_CupControlCommand = new RelayCommand<object>(Button_CupControl);
+            Button_SCChipRefrigerationCommand = new RelayCommand(Button_SCChipRefrigeration);
+            Button_SCChipDischargeCommand = new RelayCommand(Button_SCChipDischarge);
+            Button_SCChipTestCommand = new RelayCommand(() =>
+            {
+                Button_SCChipRefrigeration();
+                Thread.Sleep(50);
+                Button_SCChipDischarge();
+            });
+
+            foreach (DrCoffeeDrinksCode code in Enum.GetValues(typeof(DrCoffeeDrinksCode)))
+            {
+                Coffees.Add(code.ToString());
+            }
+            SelectedCoffee = Coffees[0];
+            foreach (DrCoffeeCommCmd code in Enum.GetValues(typeof(DrCoffeeCommCmd)))
+            {
+                CoffeeCmds.Add(code.ToString());
+            }
+            SelectedCoffeeCmd = CoffeeCmds[0];
+
+            Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices().ForEach(device =>
+            {
+                if (device.Name == "MorkT") DeviceId = device.DeviceId
+                ;
+            });
+
+
+
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+
+                variableMonitors = Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices()?.FirstOrDefault(p => p.DeviceId == DeviceId)?.variableMonitors;
+
+                if (variableMonitors != null && variableMonitors.Count > 0)
+                {
+                    RobotConnected = variableMonitors.FirstOrDefault(p=>p.Notes == "机器人连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+                    CoffeeConnected = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+                    JuicerConnected = variableMonitors.FirstOrDefault(p => p.Notes == "果汁机连接状态").CurrentValue == "True" ? "已连接" : "未连接";
+
+                    RobotMode = variableMonitors.FirstOrDefault(p => p.Notes == "机器人状态").CurrentValue;
+
+                    CoffeeStatus = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机状态").CurrentValue;
+                    AppStatus = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机应用状态").CurrentValue;
+                    Warning = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机告警").CurrentValue;
+                    CaffeeFault = variableMonitors.FirstOrDefault(p => p.Notes == "咖啡机故障").CurrentValue;
+
+
+                }
+                
+                Thread.Sleep(500);
+            }), "MorkT-状态刷新");
+        }
+    }
+
diff --git a/BPASmartClient.Morkt.JAKA.JC/ViewModel/MonitorViewModel.cs b/BPASmartClient.Morkt.JAKA.JC/ViewModel/MonitorViewModel.cs
new file mode 100644
index 00000000..78dd38bf
--- /dev/null
+++ b/BPASmartClient.Morkt.JAKA.JC/ViewModel/MonitorViewModel.cs
@@ -0,0 +1,94 @@
+using BPASmartClient.Business;
+using BPASmartClient.Helper;
+using BPASmartClient.Model.乐白机器人;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace BPASmartClient.MorkTJAKAJC.ViewModel
+{
+
+    public class MonitorViewModel: ObservableObject
+    {
+        #region 传感器
+        /// <summary>
+        /// 机器人夹爪传感器
+        /// </summary>
+        public bool RobotSenser { get { return _robotSenser; } set { _robotSenser = value; OnPropertyChanged(); } }
+        private bool _robotSenser;
+        /// <summary>
+        /// 冰淇淋出口传感器
+        /// </summary>
+        public bool IceCreamSenser { get { return _iceCreamSenser; } set { _iceCreamSenser = value; OnPropertyChanged(); } }
+        private bool _iceCreamSenser;
+        /// <summary>
+        /// 取餐口检测传感器
+        /// </summary>
+        public bool TakeMealSenser { get { return _takeMealSenser; } set { _takeMealSenser = value; OnPropertyChanged(); } }
+        private bool _takeMealSenser;
+
+        #endregion
+
+
+        /// <summary>
+        /// 设备ID
+        /// </summary>
+        int DeviceId;
+        public MonitorViewModel()
+        {
+            Plugin.GetInstance()?.GetPlugin<DeviceMgr>()?.GetDevices().ForEach(device =>
+            {
+                if (device.Name == "MorkT") DeviceId = device.DeviceId;
+
+            });
+            ThreadManage.GetInstance().StartLong(new Action(() =>
+            {
+                EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetTCPInputEvent() { DeviceId = DeviceId, Pin = 1 },(res)=>
+                {
+                    if(res != null&& res.Length>0&& res[0] is bool b)
+                    {
+                        RobotSenser = b;
+                    }
+                });
+
+                EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetInputEvent() { DeviceId = DeviceId, Pin = 0 }, (res) =>
+                {
+                    if (res != null && res.Length > 0 && res[0] is bool b)
+                    {
+                        TakeMealSenser = b;
+                    }
+                });
+
+                EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetTCPInputEvent() { DeviceId = DeviceId, Pin = 3 }, (res) =>
+                {
+                    if (res != null && res.Length > 0 && res[0] is bool b)
+                    {
+                        IceCreamSenser = b;
+                    }
+                });
+                Thread.Sleep(500);
+            }), "MorkT-传感器监视");
+        }
+    }
+
+    public class BoolToColorConvert : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return (bool) value? new SolidColorBrush(Color.FromRgb(144, 238, 144)) : new SolidColorBrush(Color.FromRgb(178, 34, 34));
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+}
diff --git a/BPASmartClient/BPASmartClient.csproj b/BPASmartClient/BPASmartClient.csproj
index e648479b..bba8ce8f 100644
--- a/BPASmartClient/BPASmartClient.csproj
+++ b/BPASmartClient/BPASmartClient.csproj
@@ -35,6 +35,7 @@
     <ProjectReference Include="..\BPASmartClient.MorkS\BPASmartClient.MorkS.csproj" />
     <ProjectReference Include="..\BPASmartClient.Morkt.JAKA.JC\BPASmartClient.MorkTJAKAJC.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkT.Lebai.JC\BPASmartClient.MorkTLebaiJC.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MorkTJuicer\BPASmartClient.MorkTJuicer.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkT\BPASmartClient.MorkT.csproj" />
     <ProjectReference Include="..\BPASmartClient.SCChip\BPASmartClient.SCChip.csproj" />
     <ProjectReference Include="..\BPASmartClient.ViewModel\BPASmartClient.ViewModel.csproj" />
diff --git a/BPASmartClient/Control/VersionView.xaml b/BPASmartClient/Control/VersionView.xaml
index de474be6..e2f3dec5 100644
--- a/BPASmartClient/Control/VersionView.xaml
+++ b/BPASmartClient/Control/VersionView.xaml
@@ -23,7 +23,7 @@
         <Border Grid.Row="0" Style="{DynamicResource border阴影边框扩展}"></Border>
         <Border x:Name="border" Grid.Row="1" Style="{DynamicResource border阴影边框扩展}"></Border>
         <Border Grid.Row="2" Style="{DynamicResource border阴影边框扩展}"></Border>
-        <Button Grid.Row="0" Content="保存本地" Width="75" Style="{DynamicResource CommonBtn_返回}" Margin="100,0,10,0" HorizontalAlignment="Right"   VerticalAlignment="Center" Click="Button_Click"  Cursor="Hand"/>
+        <Button Grid.Row="0" Content="保存本地" Margin="100,0,10,0" HorizontalAlignment="Right"   VerticalAlignment="Center" Click="Button_Click"  Cursor="Hand"/>
         <Label HorizontalAlignment="Left" VerticalAlignment="Center" x:Name="label_currentver" Margin="10,0,0,0">1.0</Label>
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <TextBox FontSize="16" x:Name="memoEdit1" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" UseLayoutRounding="True" AcceptsReturn="True" TextWrapping="Wrap" UndoLimit="200" Height="{Binding Height, ElementName=border}" />
diff --git a/SmartClient.sln b/SmartClient.sln
index 00ada0b2..b2cf9325 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -94,7 +94,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Juicer", "BP
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkT_HQ", "BPASmartClient.MorkT_HQ\BPASmartClient.MorkT_HQ.csproj", "{00C17D87-A323-4A97-BC21-7039E55614DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DosingSystem", "DosingSystem\DosingSystem.csproj", "{4E0B01AD-CFD0-4BD5-BBE6-AD2A4183B4DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DosingSystem", "DosingSystem\DosingSystem.csproj", "{4E0B01AD-CFD0-4BD5-BBE6-AD2A4183B4DB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPASmartClient.MorkTJuicer", "BPASmartClient.MorkTJuicer\BPASmartClient.MorkTJuicer.csproj", "{724087A3-E7E7-4494-B844-414FF5CD1D40}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -870,6 +872,26 @@ Global
 		{4E0B01AD-CFD0-4BD5-BBE6-AD2A4183B4DB}.Release|x64.Build.0 = Release|Any CPU
 		{4E0B01AD-CFD0-4BD5-BBE6-AD2A4183B4DB}.Release|x86.ActiveCfg = Release|Any CPU
 		{4E0B01AD-CFD0-4BD5-BBE6-AD2A4183B4DB}.Release|x86.Build.0 = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|ARM.Build.0 = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|x64.Build.0 = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Debug|x86.Build.0 = Debug|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|ARM.ActiveCfg = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|ARM.Build.0 = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|ARM64.Build.0 = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|x64.ActiveCfg = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|x64.Build.0 = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|x86.ActiveCfg = Release|Any CPU
+		{724087A3-E7E7-4494-B844-414FF5CD1D40}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -913,6 +935,7 @@ Global
 		{C28A88B1-E449-484C-AC67-B5038FF2CA79} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
 		{00C17D87-A323-4A97-BC21-7039E55614DE} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
 		{4E0B01AD-CFD0-4BD5-BBE6-AD2A4183B4DB} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
+		{724087A3-E7E7-4494-B844-414FF5CD1D40} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}