From 5bdfdb8d00f0bcd9428cd09e9fee6d2470dd5882 Mon Sep 17 00:00:00 2001
From: Nah <15196688790@163.com>
Date: Wed, 1 Nov 2023 14:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E5=BD=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=AD=97=E4=BD=93=E5=8F=8A=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPA.Model/Table/MaterialTB.cs                 |  48 +++
 BPA.SingleDevice/App.xaml                     | 346 +++++++++++++++++-
 .../View/AddRawMaterialDialogView.xaml        |  36 +-
 BPA.SingleDevice/View/DebugLogView.xaml       |  13 +-
 BPA.SingleDevice/View/DebugView.xaml          |  34 +-
 BPA.SingleDevice/View/MainView.xaml           |   8 +-
 BPA.SingleDevice/View/NewRecipeView.xaml      |  35 +-
 BPA.SingleDevice/View/OrderMainView.xaml      |  62 ++--
 .../View/RawMaterialManagementView.xaml       |  24 +-
 BPA.SingleDevice/View/RecipeCompletView.xaml  |  13 +-
 .../View/RecipeManagementView.xaml            |  18 +-
 BPA.SingleDevice/View/RecipeStatusView.xaml   |  15 +-
 BPA.SingleDevice/View/RunLogView.xaml         |  13 +-
 BPA.SingleDevice/View/UserLogView.xaml        |  13 +-
 .../RawMaterialManagementViewModel.cs         |   2 +-
 BPA.UIControl/Themes/MessageBoxCard.xaml      |  11 +-
 16 files changed, 554 insertions(+), 137 deletions(-)
 create mode 100644 BPA.Model/Table/MaterialTB.cs

diff --git a/BPA.Model/Table/MaterialTB.cs b/BPA.Model/Table/MaterialTB.cs
new file mode 100644
index 0000000..10dc4ca
--- /dev/null
+++ b/BPA.Model/Table/MaterialTB.cs
@@ -0,0 +1,48 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.Model.Table
+{
+    public class MaterialTB
+    {
+        /// <summary>
+        /// 数据ID
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true,IsIdentity =true)]
+        public int ID { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MaterialCode { get; set; }
+        /// <summary>
+        /// 是否删除
+        /// </summary>
+        public bool IsDeleted { get; set; }
+        /// <summary>
+        /// 是否激活
+        /// </summary>
+        public bool IsActive { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateTime { get; set; }
+
+        /// <summary>
+        /// 最后修改时间
+        /// </summary>
+        public string LastModified { get; set; }
+        /// <summary>
+        /// 物料描述
+        /// </summary>
+        public string Description { get; set; }
+    }
+
+}
diff --git a/BPA.SingleDevice/App.xaml b/BPA.SingleDevice/App.xaml
index 8d64f71..5bf8c8e 100644
--- a/BPA.SingleDevice/App.xaml
+++ b/BPA.SingleDevice/App.xaml
@@ -1,7 +1,8 @@
 <Application
     x:Class="BPA.SingleDevice.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:bpa="http://BPAUIControl.io/winfx/xaml/toolkit">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -11,6 +12,349 @@
                 <ResourceDictionary Source="/BPA.SingleDevice;component/Themes/ThemesColor.xaml" />
                 <!--<ResourceDictionary Source="/BPA.SingleDevice;component/Themes/Generic.xaml" />-->
             </ResourceDictionary.MergedDictionaries>
+            <Style
+                x:Key="DataGridLargeScrollStyle"
+                BasedOn="{StaticResource RubyerDataGrid}"
+                TargetType="{x:Type DataGrid}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type DataGrid}">
+                            <Border
+                                x:Name="border"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                SnapsToDevicePixels="True">
+                                <ScrollViewer
+                                    x:Name="DG_ScrollViewer"
+                                    bpa:ScrollViewerHelper.ScrollBarSize="40"
+                                    Background="Transparent"
+                                    Focusable="False"
+                                    Style="{StaticResource RubyerScrollViewer}">
+                                    <ScrollViewer.Template>
+                                        <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                                            <Grid x:Name="root">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                </Grid.ColumnDefinitions>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="*" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+
+
+                                                <DataGridColumnHeader
+                                                    Width="{Binding RowHeaderActualWidth, RelativeSource={RelativeSource AncestorType=DataGrid}}"
+                                                    Command="DataGrid.SelectAllCommand"
+                                                    Style="{StaticResource FirstDataGridColumnHeader}"
+                                                    Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}">
+                                                    <ContentControl Content="{Binding Path=(bpa:DataGridHelper.RowHeaderTitle), RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+                                                </DataGridColumnHeader>
+
+                                                <DataGridColumnHeadersPresenter
+                                                    x:Name="PART_ColumnHeadersPresenter"
+                                                    Grid.Column="1"
+                                                    Grid.ColumnSpan="2"
+                                                    Style="{StaticResource RubyerDataGridColumnHeadersPresenter}"
+                                                    Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
+                                                <ScrollContentPresenter
+                                                    x:Name="PART_ScrollContentPresenter"
+                                                    Grid.Row="1"
+                                                    Grid.RowSpan="2"
+                                                    Grid.ColumnSpan="3"
+                                                    CanContentScroll="{TemplateBinding CanContentScroll}" />
+
+                                                <ScrollBar
+                                                    x:Name="PART_VerticalScrollBar"
+                                                    Grid.Row="1"
+                                                    Grid.Column="2"
+                                                    Maximum="{TemplateBinding ScrollableHeight}"
+                                                    Orientation="Vertical"
+                                                    Style="{StaticResource RubyerScrollBar}"
+                                                    ViewportSize="{TemplateBinding ViewportHeight}"
+                                                    Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
+                                                    Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                                                <ScrollBar
+                                                    x:Name="PART_HorizontalScrollBar"
+                                                    Grid.Row="2"
+                                                    Grid.ColumnSpan="2"
+                                                    Maximum="{TemplateBinding ScrollableWidth}"
+                                                    Orientation="Horizontal"
+                                                    Style="{StaticResource RubyerScrollBar}"
+                                                    ViewportSize="{TemplateBinding ViewportWidth}"
+                                                    Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
+                                                    Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                                                <Border
+                                                    x:Name="emptyBorder"
+                                                    Grid.Row="1"
+                                                    Grid.ColumnSpan="3"
+                                                    Visibility="Collapsed">
+                                                    <ContentControl x:Name="emptyView" Content="{Binding Path=(bpa:DataGridHelper.EmptyView), RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+                                                </Border>
+
+                                                <Border
+                                                    x:Name="loadingBorder"
+                                                    Grid.Row="1"
+                                                    Grid.ColumnSpan="3"
+                                                    Background="{DynamicResource DialogBackground}"
+                                                    Visibility="Collapsed">
+                                                    <bpa:Card
+                                                        Padding="10"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center">
+                                                        <bpa:Loading
+                                                            x:Name="loading"
+                                                            Background="Transparent"
+                                                            Content="{Binding Path=(bpa:DataGridHelper.LoadingContent), RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+                                                    </bpa:Card>
+                                                </Border>
+                                            </Grid>
+                                            <ControlTemplate.Triggers>
+                                                <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Mode=TemplatedParent}}" Value="0">
+                                                    <Setter TargetName="emptyBorder" Property="Visibility" Value="Visible" />
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Path=(bpa:DataGridHelper.Loading), RelativeSource={RelativeSource AncestorType=DataGrid}}" Value="True">
+                                                    <Setter TargetName="loadingBorder" Property="Visibility" Value="Visible" />
+                                                </DataTrigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </ScrollViewer.Template>
+
+                                    <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </ScrollViewer>
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+                <Style.Triggers>
+                    <Trigger Property="IsGrouping" Value="True">
+                        <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                    </Trigger>
+                    <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Opacity" Value="{DynamicResource UnenableOpcity}" />
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+
+            <Style
+                x:Key="LargeScrollListView"
+                BasedOn="{StaticResource RubyerListView}"
+                TargetType="{x:Type ListView}">
+                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ListView">
+                            <Border
+                                Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <ScrollViewer bpa:ScrollViewerHelper.ScrollBarSize="60" Style="{DynamicResource {x:Static GridView.GridViewScrollViewerStyleKey}}">
+                                    <ItemsPresenter />
+                                </ScrollViewer>
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsGrouping" Value="True" />
+                                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="False" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                                </MultiTrigger>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter Property="Opacity" Value="{DynamicResource UnenableOpcity}" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
+            <Style
+                x:Key="LargeScrollComboBoxStyle"
+                BasedOn="{StaticResource RubyerComboBox}"
+                TargetType="{x:Type ComboBox}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ComboBox}">
+                            <Grid
+                                x:Name="templateRoot"
+                                Background="Transparent"
+                                SnapsToDevicePixels="True">
+
+                                <Popup
+                                    x:Name="PART_Popup"
+                                    Grid.ColumnSpan="2"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                    AllowsTransparency="True"
+                                    HorizontalOffset="-5"
+                                    IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Placement="Bottom"
+                                    PopupAnimation="Fade">
+                                    <Popup.MinWidth>
+                                        <MultiBinding Converter="{StaticResource ComboBoxPopupWidth}">
+                                            <Binding ElementName="templateRoot" Path="ActualWidth" />
+                                            <Binding ElementName="dropDownBorder" Path="Margin.Left" />
+                                        </MultiBinding>
+                                    </Popup.MinWidth>
+                                    <Grid>
+                                        <Border
+                                            x:Name="dropDownBorder"
+                                            Margin="5"
+                                            Background="{DynamicResource FloatBackground}"
+                                            CornerRadius="{Binding Path=(bpa:ControlHelper.CornerRadius), RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                            Effect="{DynamicResource AllDirectionEffect}" />
+                                        <ScrollViewer
+                                            x:Name="DropDownScrollViewer"
+                                            Margin="5,10"
+                                            bpa:ScrollViewerHelper.ScrollBarSize="100"
+                                            Style="{StaticResource SmallScrollViewer}">
+                                            <Grid x:Name="grid" RenderOptions.ClearTypeHint="Enabled">
+                                                <ItemsPresenter
+                                                    x:Name="ItemsPresenter"
+                                                    KeyboardNavigation.DirectionalNavigation="Contained"
+                                                    OverridesDefaultStyle="True"
+                                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                            </Grid>
+                                        </ScrollViewer>
+                                    </Grid>
+                                </Popup>
+
+                                <ToggleButton
+                                    x:Name="toggleButton"
+                                    Grid.ColumnSpan="2"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Style="{StaticResource RubyerComboBoxToggleButton}">
+                                    <Grid
+                                        Margin="{Binding Path=(bpa:InputBoxHelper.InternalSpacing), Converter={StaticResource DoubleToLeftAndRightThicknessConverter}, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                        bpa:GridHelper.ColumnDefinitions="Auto,*,Auto,Auto"
+                                        bpa:PanelHelper.Spacing="{Binding Path=(bpa:InputBoxHelper.InternalSpacing), RelativeSource={RelativeSource Mode=TemplatedParent}}">
+
+                                        <ContentControl
+                                            x:Name="preContent"
+                                            Grid.Column="0"
+                                            VerticalAlignment="Center"
+                                            Content="{Binding Path=(bpa:InputBoxHelper.PreContent), RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                            Foreground="{DynamicResource SeconarydText}"
+                                            IsHitTestVisible="False"
+                                            IsTabStop="False" />
+
+                                        <Grid Grid.Column="1" VerticalAlignment="Center">
+                                            <ContentPresenter
+                                                x:Name="contentPresenter"
+                                                Margin="{TemplateBinding Padding}"
+                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                Content="{TemplateBinding SelectionBoxItem}"
+                                                ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                                ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                                ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                IsHitTestVisible="False"
+                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                                            <TextBlock
+                                                x:Name="multiSelectText"
+                                                Margin="{TemplateBinding Padding}"
+                                                VerticalAlignment="Center"
+                                                IsHitTestVisible="False"
+                                                Text="{Binding Path=(bpa:ComboBoxHelper.MultiSelectText), RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                                Visibility="Collapsed" />
+
+                                            <TextBlock
+                                                x:Name="watermark"
+                                                VerticalAlignment="Center"
+                                                Foreground="{DynamicResource WatermarkText}"
+                                                IsHitTestVisible="False"
+                                                Text="{Binding Path=(bpa:InputBoxHelper.Watermark), RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+                                        </Grid>
+
+                                        <Button
+                                            x:Name="clearButton"
+                                            Grid.Column="2"
+                                            Padding="2"
+                                            bpa:ButtonHelper.Shape="Circle"
+                                            Focusable="False"
+                                            Foreground="{DynamicResource SeconarydText}"
+                                            Style="{StaticResource TextButton}"
+                                            Visibility="Collapsed">
+                                            <bpa:Icon Type="CloseLine" />
+                                        </Button>
+
+                                        <ContentControl
+                                            x:Name="postContent"
+                                            Grid.Column="3"
+                                            VerticalAlignment="Center"
+                                            Content="{Binding Path=(bpa:InputBoxHelper.PostContent), RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                            Foreground="{DynamicResource SeconarydText}"
+                                            IsHitTestVisible="False"
+                                            IsTabStop="False" />
+                                    </Grid>
+                                </ToggleButton>
+                            </Grid>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsEnabled" Value="False">
+                                    <Setter TargetName="templateRoot" Property="Opacity" Value="{DynamicResource UnenableOpcity}" />
+                                </Trigger>
+                                <Trigger Property="HasItems" Value="False">
+                                    <Setter TargetName="dropDownBorder" Property="Height" Value="100" />
+                                </Trigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsGrouping" Value="True" />
+                                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="False" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="bpa:ControlHelper.IsKeyBoardFocused" Value="True" />
+                                        <Condition Property="bpa:InputBoxHelper.IsClearable" Value="True" />
+                                    </MultiTrigger.Conditions>
+                                    <!--<Setter TargetName="clearButton" Property="Visibility" Value="Visible" />-->
+                                </MultiTrigger>
+                                <MultiTrigger>
+                                    <MultiTrigger.Conditions>
+                                        <Condition Property="IsMouseOver" Value="True" />
+                                        <Condition Property="bpa:InputBoxHelper.IsClearable" Value="True" />
+                                    </MultiTrigger.Conditions>
+                                    <Setter TargetName="clearButton" Property="Visibility" Value="Visible" />
+                                </MultiTrigger>
+                                <MultiDataTrigger>
+                                    <MultiDataTrigger.Conditions>
+                                        <Condition Binding="{Binding Path=(bpa:ComboBoxHelper.IsMultiSelect), RelativeSource={RelativeSource Self}}" Value="False" />
+                                        <Condition Binding="{Binding Path=Content, ElementName=contentPresenter, Converter={StaticResource IsNullOrEmptyConverter}}" Value="False" />
+                                    </MultiDataTrigger.Conditions>
+                                    <Setter TargetName="watermark" Property="Visibility" Value="Hidden" />
+                                </MultiDataTrigger>
+                                <Trigger Property="bpa:InputBoxHelper.IsRound" Value="True">
+                                    <Setter Property="bpa:ControlHelper.CornerRadius" Value="{Binding ActualHeight, RelativeSource={RelativeSource Self}, Converter={StaticResource HalfOfDoubleConverter}}" />
+                                </Trigger>
+                                <MultiDataTrigger>
+                                    <MultiDataTrigger.Conditions>
+                                        <Condition Binding="{Binding Path=(bpa:ComboBoxHelper.IsMultiSelect), RelativeSource={RelativeSource Self}}" Value="True" />
+                                        <Condition Binding="{Binding Path=Text, ElementName=multiSelectText, Converter={StaticResource IsNullOrEmptyConverter}}" Value="False" />
+                                    </MultiDataTrigger.Conditions>
+                                    <Setter TargetName="watermark" Property="Visibility" Value="Hidden" />
+                                </MultiDataTrigger>
+                                <DataTrigger Binding="{Binding Path=(bpa:ComboBoxHelper.IsMultiSelect), RelativeSource={RelativeSource Self}}" Value="True">
+                                    <Setter TargetName="contentPresenter" Property="Visibility" Value="Collapsed" />
+                                    <Setter TargetName="multiSelectText" Property="Visibility" Value="Visible" />
+                                </DataTrigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/BPA.SingleDevice/View/AddRawMaterialDialogView.xaml b/BPA.SingleDevice/View/AddRawMaterialDialogView.xaml
index 3aa8a69..a52dbe3 100644
--- a/BPA.SingleDevice/View/AddRawMaterialDialogView.xaml
+++ b/BPA.SingleDevice/View/AddRawMaterialDialogView.xaml
@@ -17,7 +17,7 @@
 
     <Grid Margin="10" bpa:PanelHelper.Spacing="10">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="160" />
+            <ColumnDefinition Width="320" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
@@ -32,13 +32,15 @@
             Grid.Row="0"
             Grid.Column="0"
             HorizontalAlignment="Right"
-            FontSize="22"
+            FontSize="40"
             Foreground="#ddd"
             Text="原料名称：" />
         <TextBox
             Grid.Row="0"
             Grid.Column="1"
-            Width="220" Height="50" FontSize="22"
+            Width="350"
+            Height="70"
+            FontSize="40"
             Style="{StaticResource DarkTextBox}"
             Text="{Binding RawMaterResultInfo.Name}" />
 
@@ -46,47 +48,55 @@
             Grid.Row="1"
             Grid.Column="0"
             HorizontalAlignment="Right"
-            FontSize="22"
+            FontSize="40"
             Foreground="#ddd"
             Text="设备对应工位：" />
         <ComboBox
             Grid.Row="1"
-            Grid.Column="1" Height="50" FontSize="22"
+            Grid.Column="1"
+            Height="70"
+            FontSize="40"
             ItemsSource="{Binding DeviceNums}"
-            SelectedIndex="0"
+            SelectedIndex="0" 
             Text="{Binding RawMaterResultInfo.DeviceNum}" />
 
         <TextBlock
             Grid.Row="2"
             Grid.Column="0"
             HorizontalAlignment="Right"
-            FontSize="22"
+            FontSize="40"
             Foreground="#ddd"
             Text="设备料仓编号：" />
         <ComboBox
             Grid.Row="2"
-            Grid.Column="1" Height="50" FontSize="22"
+            Grid.Column="1"
+            Height="70"
+            FontSize="40"
             ItemsSource="{Binding ChNum}"
             SelectedIndex="0"
+            Style="{StaticResource LargeScrollComboBoxStyle}"
             Text="{Binding RawMaterResultInfo.ChNum}" />
 
         <Grid
             Grid.Row="3"
             Grid.ColumnSpan="2"
-            Margin="0,5" Height="50"
+            Height="70"
+            Margin="0,5"
             bpa:PanelHelper.Spacing="10">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
             <Button
-                Grid.Column="0" FontSize="22"
+                Grid.Column="0"
                 Command="{Binding SaveCommand}"
-                Content="确认" />
+                Content="确认"
+                FontSize="40" />
             <Button
-                Grid.Column="1" FontSize="22"
+                Grid.Column="1"
                 Command="{Binding CancelCommand}"
-                Content="取消" />
+                Content="取消"
+                FontSize="40" />
         </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/BPA.SingleDevice/View/DebugLogView.xaml b/BPA.SingleDevice/View/DebugLogView.xaml
index f92b2cc..137aa63 100644
--- a/BPA.SingleDevice/View/DebugLogView.xaml
+++ b/BPA.SingleDevice/View/DebugLogView.xaml
@@ -12,7 +12,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="70" />
+                <RowDefinition Height="auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -27,19 +27,19 @@
                 <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=IsShowHistory, Path=IsChecked, Converter={StaticResource BooleanToVisibleConverter}}">
                     <TextBlock Margin="5,0" Text="开始日期：" />
                     <DatePicker
-                        Width="200"
+                       
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="False"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding StartTime}"
                         SelectedDateFormat="Short" />
                     <TextBlock Margin="5,0" Text="结束日期：" />
                     <DatePicker
-                        Width="200"
+                        
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="False"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding EndTime}" />
 
@@ -54,7 +54,7 @@
                     bpa:ToggleButtonHelper.CheckedContent="历史日志"
                     Command="{Binding SwitchLogModeCommand}"
                     Content="实时日志"
-                    FontSize="25"
+                    FontSize="40"
                     Style="{DynamicResource SwitchToggleButton}" />
             </StackPanel>
 
@@ -63,6 +63,7 @@
             <!--#region 列表-->
             <bpa:ControlDisplay Grid.Row="1">
                 <DataGrid
+                    Style="{StaticResource DataGridLargeScrollStyle}"
                     Grid.Row="1"
                     AutoGenerateColumns="False"
                     BorderBrush="Gray"
diff --git a/BPA.SingleDevice/View/DebugView.xaml b/BPA.SingleDevice/View/DebugView.xaml
index 5c75aae..618aa62 100644
--- a/BPA.SingleDevice/View/DebugView.xaml
+++ b/BPA.SingleDevice/View/DebugView.xaml
@@ -20,7 +20,7 @@
             Margin="10"
             HorizontalAlignment="Left"
             Content="开机自启"
-            FontSize="22"
+            FontSize="40"
             IsChecked="{Binding AutoStart}" 
             Style="{DynamicResource SwitchAccentToggleButton}" />
         <ToggleButton
@@ -31,7 +31,7 @@
             Command="{Binding SwitchSystemModeCommand}"
             CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}"
             Content="配料模式"
-            FontSize="22"
+            FontSize="40"
             Style="{DynamicResource SwitchAccentToggleButton}" />
 
         <!--  流水线手动控制移动  -->
@@ -46,36 +46,31 @@
                 IsEnabled="{Binding ElementName=ModeButton, Path=IsChecked}"
                 Orientation="Horizontal">
                 <Button
-                    Width="100"
-                    Height="50"
                     Margin="10"
                     Command="{Binding StartMoveInchCommand}"
                     Content="寸动开始"
-                    FontSize="18" />
+                    FontSize="40" />
                 <Button
-                    Width="100"
-                    Height="50"
                     Margin="10"
                     Command="{Binding StopMoveInchCommand}"
                     Content="寸动停止"
-                    FontSize="18" />
+                    FontSize="40" />
                 <ToggleButton
                     Margin="10"
                     bpa:ToggleButtonHelper.CheckedContent="反转"
                     Content="正转"
-                    FontSize="22"
+                    FontSize="40"
                     IsChecked="{Binding IsReverse}"
                     Style="{DynamicResource SwitchAccentToggleButton}" />
                 <TextBlock
-                    FontSize="22"
+                    FontSize="40"
                     Foreground="White"
                     Text="寸动速度：" />
 
                 <TextBox
-                    Width="150"
-                    Height="45"
+                    Width="200"
                     Margin="10"
-                    FontSize="22"
+                    FontSize="40"
                     Text="{Binding InchSpeed}" />
             </StackPanel>
         </Border>
@@ -89,12 +84,11 @@
             <StackPanel Margin="5" Orientation="Vertical">
                 <Grid Margin="0,0,0,10">
                     <TextBlock
-                        FontSize="22"
+                        FontSize="40"
                         Foreground="White"
                         Text="流水线移动参数设置" />
                     <Button
-                        Width="170"
-                        Height="40"
+                        Width="320"
                         HorizontalAlignment="Right"
                         bpa:ButtonHelper.Shape="Round"
                         Command="{Binding WriteParamsCommand}"
@@ -103,10 +97,10 @@
 
                 <StackPanel Margin="5" Orientation="Horizontal">
                     <TextBlock
-                        FontSize="22"
+                        FontSize="40"
                         Foreground="White"
                         Text="移动速度：" />
-                    <TextBox Width="120" Text="{Binding MoveSpeed}" />
+                    <TextBox Width="200" Text="{Binding MoveSpeed}" />
                 </StackPanel>
                 <!--<StackPanel Margin="5" Orientation="Horizontal">
                     <TextBlock
@@ -117,10 +111,10 @@
                 </StackPanel>-->
                 <StackPanel Margin="5" Orientation="Horizontal">
                     <TextBlock
-                        FontSize="22"
+                        FontSize="40"
                         Foreground="White"
                         Text="移动长度：" />
-                    <TextBox Width="120" Text="{Binding MoveLength}" />
+                    <TextBox Width="200" Text="{Binding MoveLength}" />
                 </StackPanel>
             </StackPanel>
         </Border>
diff --git a/BPA.SingleDevice/View/MainView.xaml b/BPA.SingleDevice/View/MainView.xaml
index 398abd9..750dfe3 100644
--- a/BPA.SingleDevice/View/MainView.xaml
+++ b/BPA.SingleDevice/View/MainView.xaml
@@ -89,9 +89,9 @@
             bpa:ItemsControlHelper.ItemMargin="0"
             bpa:ItemsControlHelper.ItemPadding="5 3"
             Background="#2d2d2d"
-            ExpandedWidth="230" CollapsedWidth="70"
+            ExpandedWidth="400" CollapsedWidth="100"
             Foreground="{DynamicResource WhiteForeground}"
-            Header="菜单" FontSize="22"
+            Header="菜单" FontSize="40"
             ItemsSource="{Binding ViewItems}"
             PaneBackground="{Binding TitleBackground, RelativeSource={RelativeSource AncestorType=bpa:BPAWindow}}"
             SelectedItem="{Binding CurrentViewItem}"
@@ -100,9 +100,9 @@
             <bpa:HamburgerMenu.Resources>
                 <Grid
                     x:Key="headContent"
-                    Height="55"
+                    Height="70"
                     x:Shared="false">
-                    <TextBlock Text="{Binding Name}" FontSize="22" />
+                    <TextBlock Text="{Binding Name}" FontSize="40" />
                 </Grid>
             </bpa:HamburgerMenu.Resources>
             <bpa:HamburgerMenu.ItemContainerStyle>
diff --git a/BPA.SingleDevice/View/NewRecipeView.xaml b/BPA.SingleDevice/View/NewRecipeView.xaml
index da3babd..8c5322a 100644
--- a/BPA.SingleDevice/View/NewRecipeView.xaml
+++ b/BPA.SingleDevice/View/NewRecipeView.xaml
@@ -17,21 +17,26 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="60" />
+            <RowDefinition Height="auto" />
             <RowDefinition />
-            <RowDefinition Height="60" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
 
         <Grid Margin="10,0" bpa:GridHelper.Columns="2">
-            <TextBlock FontSize="22" Text="配方名称：" />
+            <TextBlock FontSize="40" Text="配方名称：" />
             <TextBox
                 Grid.Column="1"
-                Margin="0,5" Height="50" FontSize="22"
+                Margin="0,5"
+                FontSize="40"
                 Style="{StaticResource DarkTextBox}"
                 Text="{Binding RecipeName}" />
         </Grid>
 
-        <ScrollViewer Grid.Row="1" bpa:ScrollViewerHelper.ScrollBarSize="40" Width="780" Height="780">
+        <ScrollViewer
+            Grid.Row="1"
+            Width="950"
+            Height="700"
+            bpa:ScrollViewerHelper.ScrollBarSize="40">
             <ListView ItemsSource="{Binding NewRecipeModels}">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
@@ -41,19 +46,21 @@
                 <ListView.ItemTemplate>
                     <DataTemplate>
                         <UniformGrid
-                            Width="330"
-                            Margin="5,0,0,0" Height="40"
+                            Width="450"
+                            Height="50"
+                            Margin="5,0,0,0"
                             HorizontalAlignment="Right"
                             bpa:GridHelper.ColumnDefinitions="Auto,Auto"
                             Columns="2">
                             <CheckBox
                                 Margin="10,5"
                                 Content="{Binding Name}"
-                                FontSize="22"
+                                FontSize="32"
                                 IsChecked="{Binding IsChecked}" />
                             <TextBox
                                 Grid.Column="1"
-                                Width="140" FontSize="22"
+                                Width="140"
+                                FontSize="32"
                                 IsEnabled="{Binding IsChecked}"
                                 Text="{Binding Weight}" />
                         </UniformGrid>
@@ -68,13 +75,15 @@
             bpa:GridHelper.ColumnDefinitions="*,*"
             bpa:PanelHelper.Spacing="10">
             <Button
-                Grid.Column="0" FontSize="22"
+                Grid.Column="0"
                 Command="{Binding SaveCommand}"
-                Content="确认" />
+                Content="确认"
+                FontSize="40" />
             <Button
-                Grid.Column="1" FontSize="22"
+                Grid.Column="1"
                 Command="{Binding CancelCommand}"
-                Content="取消" />
+                Content="取消"
+                FontSize="40" />
         </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/BPA.SingleDevice/View/OrderMainView.xaml b/BPA.SingleDevice/View/OrderMainView.xaml
index 4816aea..96c32c9 100644
--- a/BPA.SingleDevice/View/OrderMainView.xaml
+++ b/BPA.SingleDevice/View/OrderMainView.xaml
@@ -14,22 +14,22 @@
     <!--<UserControl.DataContext>
         <vm:OrderMainViewModel />
     </UserControl.DataContext>-->
-
     <Grid Margin="10">
         <ListView
-            VerticalAlignment="Top"
-            bpa:ItemsControlHelper.ItemPadding="8 5 8 8"
-            ItemsSource="{Binding Goods}">
+        Style="{StaticResource LargeScrollListView}"
+        VerticalAlignment="Top"
+        bpa:ItemsControlHelper.ItemPadding="8 5 8 8"
+        ItemsSource="{Binding Goods}">
             <ListView.ItemsPanel>
                 <ItemsPanelTemplate>
                     <!--<UniformGrid Columns="5" />-->
-                    <WrapPanel />
+                    <WrapPanel  Width="1750"/>
                 </ItemsPanelTemplate>
             </ListView.ItemsPanel>
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <bpa:ControlDisplay Margin="5">
-                        <Grid>
+                        <Grid Width="390">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="120" />
                                 <RowDefinition Height="50" />
@@ -37,35 +37,36 @@
                             </Grid.RowDefinitions>
                             <!--  图片  -->
                             <!--<Border Width="120" Background="Gray" />-->
-                            <bpa:Icon Type="RestaurantFill" Width="120"/>
+                            <bpa:Icon Width="120" Type="RestaurantFill" />
                             <TextBlock
-                                Grid.Row="1"
-                                HorizontalAlignment="Center"
-                                FontSize="24"
-                                Foreground="#ddd"
-                                Text="{Binding Name}" />
+                            Grid.Row="1"
+                            HorizontalAlignment="Center"
+                            FontSize="40"
+                            Foreground="#ddd"
+                            Text="{Binding Name}" />
                             <Border
-                                Grid.Row="1"
-                                BorderBrush="#505050"
-                                BorderThickness="0,0,0,1" />
+                            Grid.Row="1"
+                            BorderBrush="#505050"
+                            BorderThickness="0,0,0,1" />
                             <Grid
-                                Grid.Row="2"
-                                Margin="0,5,0,0"
-                                bpa:GridHelper.ColumnDefinitions="*,*">
+                            Grid.Row="2"
+                            Margin="0,5,0,0"
+                            bpa:GridHelper.ColumnDefinitions="*,*">
                                 <bpa:NumericBox
-                                    Width="110" FontSize="16"
-                                    bpa:ControlHelper.FocusBorderBrush="{DynamicResource Secondary}"
-                                    BorderThickness="0"
-                                    Style="{StaticResource FrontBackNumericBox}"
-                                    Value="{Binding Count}" />
+                                Width="200"
+                                bpa:ControlHelper.FocusBorderBrush="{DynamicResource Secondary}"
+                                BorderThickness="0"
+                                FontSize="40"
+                                Style="{StaticResource FrontBackNumericBox}"
+                                Value="{Binding Count}" />
                                 <Button
-                                    Grid.Column="1"
-                                    Margin="10,0,0,0"
-                                    Command="{Binding DataContext.DownRecipeCommand, RelativeSource={RelativeSource AncestorType=local:OrderMainView}}"
-                                    CommandParameter="{Binding Id}"
-                                    Content="开始下单"
-                                    Foreground="#ddd"
-                                    Style="{DynamicResource SecondaryButton}" />
+                                Grid.Column="1"
+                                Margin="10,0,0,0"
+                                Command="{Binding DataContext.DownRecipeCommand, RelativeSource={RelativeSource AncestorType=local:OrderMainView}}"
+                                CommandParameter="{Binding Id}"
+                                Content="开始下单"
+                                Foreground="#ddd"
+                                Style="{DynamicResource SecondaryButton}" />
                             </Grid>
                         </Grid>
                     </bpa:ControlDisplay>
@@ -73,4 +74,5 @@
             </ListView.ItemTemplate>
         </ListView>
     </Grid>
+    
 </UserControl>
\ No newline at end of file
diff --git a/BPA.SingleDevice/View/RawMaterialManagementView.xaml b/BPA.SingleDevice/View/RawMaterialManagementView.xaml
index 6341c34..f8b4b39 100644
--- a/BPA.SingleDevice/View/RawMaterialManagementView.xaml
+++ b/BPA.SingleDevice/View/RawMaterialManagementView.xaml
@@ -18,7 +18,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
+                <RowDefinition Height="auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -30,13 +30,13 @@
                 bpa:PanelHelper.Spacing="15"
                 Orientation="Horizontal">
                 <Button
-                    Width="120"
+                    Width="250"
                     HorizontalAlignment="Right"
                     Command="{Binding RefreshCommand}"
                     Content="刷新"
                     Style="{DynamicResource DarkButton}" />
                 <Button
-                    Width="120"
+                    Width="300"
                     HorizontalAlignment="Right"
                     Command="{Binding AddCommand}"
                     Content="添加原料"
@@ -54,6 +54,7 @@
             <!--#region 列表-->
             <bpa:ControlDisplay Grid.Row="1" >
                 <DataGrid
+                    bpa:HeaderHelper.HorizontalAlignment="Center"
                     Grid.Row="1"
                     AutoGenerateColumns="False"
                     BorderBrush="Gray"
@@ -66,8 +67,9 @@
                     GridLinesVisibility="All"
                     IsReadOnly="True"
                     ItemsSource="{Binding RawMaterInfos}"
-                    RowHeight="50"
-                    SelectionMode="Single">
+                    RowHeight="70"
+                    SelectionMode="Single" Style="{StaticResource DataGridLargeScrollStyle}">
+                    
                     <!--<DataGrid.RowHeaderTemplate>
                 <DataTemplate>
                     <Border>
@@ -81,23 +83,23 @@
                             Binding="{Binding Name}"
                             Header="原料名称" />
                         <DataGridTextColumn
-                            Width="120"
+                            Width="200"
                             Binding="{Binding DeviceNum}"
                             Header="设备编号" />
                         <DataGridTextColumn
-                            Width="160"
+                            Width="280"
                             Binding="{Binding WarehouseNum}"
                             Header="设备料仓编号" />
                         <DataGridTextColumn
-                            Width="240"
+                            Width="420"
                             Binding="{Binding LastModified}"
                             Header="最后修改时间" />
-                        <DataGridTemplateColumn Width="300" Header="操作">
+                        <DataGridTemplateColumn Width="500" Header="操作">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
                                         <Button
-                                            Width="150"
+                                            Width="300"
                                             Command="{Binding DataContext.EditCommand, RelativeSource={RelativeSource AncestorType=local:RawMaterialManagementView}}"
                                             CommandParameter="{Binding Id}"
                                             Foreground="#2196F3"
@@ -113,7 +115,7 @@
                                             <bpa:Icon Type="CopyleftFill" />
                                         </Button>-->
                                         <Button
-                                            Width="100"
+                                            Width="150"
                                             Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=local:RawMaterialManagementView}}"
                                             CommandParameter="{Binding Id}"
                                             Style="{StaticResource TextErrorButton}">
diff --git a/BPA.SingleDevice/View/RecipeCompletView.xaml b/BPA.SingleDevice/View/RecipeCompletView.xaml
index 7deb430..25bdac7 100644
--- a/BPA.SingleDevice/View/RecipeCompletView.xaml
+++ b/BPA.SingleDevice/View/RecipeCompletView.xaml
@@ -12,7 +12,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="70" />
+                <RowDefinition Height="auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -27,19 +27,19 @@
                 <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=IsShowHistory, Path=IsChecked, Converter={StaticResource BooleanToVisibleConverter}}">
                     <TextBlock Margin="5,0" Text="开始日期：" />
                     <DatePicker
-                        Width="200"
+                        
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="False"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding StartTime}"
                         SelectedDateFormat="Short" />
                     <TextBlock Margin="5,0" Text="结束日期：" />
                     <DatePicker
-                        Width="200"
+                        
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="False"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding EndTime}" />
 
@@ -54,7 +54,7 @@
                     bpa:ToggleButtonHelper.CheckedContent="历史日志"
                     Command="{Binding SwitchLogModeCommand}"
                     Content="实时日志"
-                    FontSize="25"
+                    FontSize="40"
                     Style="{DynamicResource SwitchToggleButton}" />
             </StackPanel>
 
@@ -63,6 +63,7 @@
             <!--#region 列表-->
             <bpa:ControlDisplay Grid.Row="1">
                 <DataGrid
+                    Style="{StaticResource DataGridLargeScrollStyle}"
                     Grid.Row="1"
                     AutoGenerateColumns="False"
                     BorderBrush="Gray"
diff --git a/BPA.SingleDevice/View/RecipeManagementView.xaml b/BPA.SingleDevice/View/RecipeManagementView.xaml
index 41268a7..699cdf3 100644
--- a/BPA.SingleDevice/View/RecipeManagementView.xaml
+++ b/BPA.SingleDevice/View/RecipeManagementView.xaml
@@ -18,7 +18,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
+                <RowDefinition Height="auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -30,7 +30,7 @@
                 bpa:PanelHelper.Spacing="15"
                 Orientation="Horizontal">
                 <Button
-                    Width="120"
+                    Width="300"
                     HorizontalAlignment="Right"
                     Command="{Binding AddCommand}"
                     Content="添加配方"
@@ -42,6 +42,8 @@
             <!--#region 列表-->
             <bpa:ControlDisplay Grid.Row="1">
                 <DataGrid
+                    bpa:HeaderHelper.HorizontalAlignment="Center"
+                    Style="{StaticResource DataGridLargeScrollStyle}"
                     Grid.Row="1"
                     AutoGenerateColumns="False"
                     BorderBrush="Gray"
@@ -55,7 +57,7 @@
                     GridLinesVisibility="All"
                     IsReadOnly="False"
                     ItemsSource="{Binding RecipeInfos}"
-                    RowHeight="50"
+                    RowHeight="80"
                     SelectionMode="Single">
                     <DataGrid.Columns>
                         <DataGridTextColumn
@@ -63,19 +65,19 @@
                             Binding="{Binding Name}"
                             Header="配方名称" />
                         <DataGridCheckBoxColumn
-                            Width="80"
+                            Width="100"
                             Binding="{Binding IsEnable, UpdateSourceTrigger=PropertyChanged}"
                             Header="启用" />
                         <DataGridTextColumn
-                            Width="280"
+                            Width="420"
                             Binding="{Binding LastModified}"
                             Header="最后修改时间" />
-                        <DataGridTemplateColumn Width="300" Header="操作">
+                        <DataGridTemplateColumn Width="500" Header="操作">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
                                         <Button
-                                            Width="150"
+                                            Width="300"
                                             Command="{Binding DataContext.EditCommand, RelativeSource={RelativeSource AncestorType=local:RecipeManagementView}}"
                                             CommandParameter="{Binding Id}"
                                             Foreground="#2196F3"
@@ -90,7 +92,7 @@
                                             <bpa:Icon Type="CopyleftFill" />
                                         </Button>-->
                                         <Button
-                                            Width="100"
+                                            Width="150"
                                             Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=local:RecipeManagementView}}"
                                             CommandParameter="{Binding Id}"
                                             Style="{StaticResource TextErrorButton}">
diff --git a/BPA.SingleDevice/View/RecipeStatusView.xaml b/BPA.SingleDevice/View/RecipeStatusView.xaml
index a9c20d1..7e41c0f 100644
--- a/BPA.SingleDevice/View/RecipeStatusView.xaml
+++ b/BPA.SingleDevice/View/RecipeStatusView.xaml
@@ -49,6 +49,7 @@
         <bpa:ControlDisplay Grid.Column="0" Grid.ColumnSpan="2">
             <DataGrid
                 Grid.Row="1"
+                bpa:HeaderHelper.HorizontalAlignment="Center"
                 AutoGenerateColumns="False"
                 BorderBrush="Gray"
                 BorderThickness="1"
@@ -61,7 +62,7 @@
                 GridLinesVisibility="All"
                 IsReadOnly="False"
                 ItemsSource="{Binding CurrentRecipes}"
-                RowHeight="50"
+                RowHeight="70"
                 SelectionMode="Single">
                 <DataGrid.Columns>
                     <DataGridTextColumn
@@ -69,18 +70,18 @@
                         Binding="{Binding Name}"
                         Header="配方名称" />
                     <DataGridTextColumn
-                        Width="260"
-                        Binding="{Binding IssueTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Width="420"
+                        Binding="{Binding IssueTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
                         Header="下发时间" />
                     <DataGridTextColumn
-                        Width="260"
-                        Binding="{Binding StartTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Width="420"
+                        Binding="{Binding StartTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
                         Header="开始时间" />
                     <DataGridTextColumn
-                        Width="120"
+                        Width="180"
                         Binding="{Binding CurrentStation}"
                         Header="当前工站" />
-                    <DataGridTextColumn Width="240" Header="当前工站进度">
+                    <DataGridTextColumn Width="420" Header="当前工站进度">
                         <DataGridTextColumn.Binding>
                             <MultiBinding Converter="{StaticResource DictionaryValueMultiConverter}">
                                 <Binding Path="BatchStatus" />
diff --git a/BPA.SingleDevice/View/RunLogView.xaml b/BPA.SingleDevice/View/RunLogView.xaml
index 3e29345..ff4abe4 100644
--- a/BPA.SingleDevice/View/RunLogView.xaml
+++ b/BPA.SingleDevice/View/RunLogView.xaml
@@ -12,7 +12,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="70" />
+                <RowDefinition Height="auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -27,19 +27,19 @@
                 <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=IsShowHistory, Path=IsChecked, Converter={StaticResource BooleanToVisibleConverter}}">
                     <TextBlock Margin="5,0" Text="开始日期：" />
                     <DatePicker
-                        Width="200"
+                        
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="false"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding StartTime}"
                         SelectedDateFormat="Short" />
                     <TextBlock Margin="5,0" Text="结束日期：" />
                     <DatePicker
-                        Width="200"
+                        
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="False"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding EndTime}" />
 
@@ -54,7 +54,7 @@
                     bpa:ToggleButtonHelper.CheckedContent="历史日志"
                     Command="{Binding SwitchLogModeCommand}"
                     Content="实时日志"
-                    FontSize="25"
+                    FontSize="40"
                     Style="{DynamicResource SwitchToggleButton}" />
             </StackPanel>
 
@@ -63,6 +63,7 @@
             <!--#region 列表-->
             <bpa:ControlDisplay Grid.Row="1">
                 <DataGrid
+                    Style="{StaticResource DataGridLargeScrollStyle}"
                     Grid.Row="1"
                     AutoGenerateColumns="False"
                     BorderBrush="Gray"
diff --git a/BPA.SingleDevice/View/UserLogView.xaml b/BPA.SingleDevice/View/UserLogView.xaml
index 559d884..50fe876 100644
--- a/BPA.SingleDevice/View/UserLogView.xaml
+++ b/BPA.SingleDevice/View/UserLogView.xaml
@@ -12,7 +12,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="70" />
+                <RowDefinition Height="auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -27,19 +27,19 @@
                 <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=IsShowHistory, Path=IsChecked, Converter={StaticResource BooleanToVisibleConverter}}">
                     <TextBlock Margin="5,0" Text="开始日期：" />
                     <DatePicker
-                        Width="200"
+                        
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="False"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding StartTime}"
                         SelectedDateFormat="Short" />
                     <TextBlock Margin="5,0" Text="结束日期：" />
                     <DatePicker
-                        Width="200"
+                            
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
-                        bpa:InputBoxHelper.IsClearable="True"
+                        bpa:InputBoxHelper.IsClearable="False"
                         bpa:InputBoxHelper.Watermark="请选择日期"
                         SelectedDate="{Binding EndTime}" />
 
@@ -54,7 +54,7 @@
                     bpa:ToggleButtonHelper.CheckedContent="历史日志"
                     Command="{Binding SwitchLogModeCommand}"
                     Content="实时日志"
-                    FontSize="25"
+                    FontSize="40"
                     Style="{DynamicResource SwitchToggleButton}" />
             </StackPanel>
 
@@ -63,6 +63,7 @@
             <!--#region 列表-->
             <bpa:ControlDisplay Grid.Row="1">
                 <DataGrid
+                    Style="{StaticResource DataGridLargeScrollStyle}"
                     Grid.Row="1"
                     AutoGenerateColumns="False"
                     BorderBrush="Gray"
diff --git a/BPA.SingleDevice/ViewModel/RawMaterialManagementViewModel.cs b/BPA.SingleDevice/ViewModel/RawMaterialManagementViewModel.cs
index 62eb2b7..af280bf 100644
--- a/BPA.SingleDevice/ViewModel/RawMaterialManagementViewModel.cs
+++ b/BPA.SingleDevice/ViewModel/RawMaterialManagementViewModel.cs
@@ -98,7 +98,7 @@ namespace BPA.SingleDevice.ViewModel
                     var index = RawMaterInfos.ToList().FindIndex(p => p.Id == o.ToString());
                     if (index >= 0)
                     {
-                        var result = await MessageBoxR.Confirm("是否删除改数据?");
+                        var result = await MessageBoxR.Confirm("是否删除该数据?");
                         if (result == System.Windows.MessageBoxResult.Yes)
                         {
                             SqlHelper.GetInstance.DeleteAsync<RawMaterTB>(o.ToString()).OnSuccess(() =>
diff --git a/BPA.UIControl/Themes/MessageBoxCard.xaml b/BPA.UIControl/Themes/MessageBoxCard.xaml
index 8cf8c9b..bcbcd1b 100644
--- a/BPA.UIControl/Themes/MessageBoxCard.xaml
+++ b/BPA.UIControl/Themes/MessageBoxCard.xaml
@@ -15,7 +15,7 @@
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="Margin" Value="0" />
-        <Setter Property="MaxWidth" Value="460" />
+        <Setter Property="MaxWidth" Value="600" />
         <Setter Property="MessageBoxButton" Value="OK" />
         <Setter Property="MinHeight" Value="120" />
         <Setter Property="MinWidth" Value="250" />
@@ -25,6 +25,7 @@
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="ThemeColorBrush" Value="{DynamicResource Info}" />
         <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontSize" Value="60" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="bpa:HeaderHelper.Background" Value="{Binding Background, RelativeSource={RelativeSource Self}}" />
@@ -104,20 +105,20 @@
                                                 bpa:PanelHelper.Spacing="10"
                                                 Orientation="Horizontal">
                                         <Button x:Name="PART_YesButton"
-                                                MinWidth="60"
+                                                MinWidth="200"
                                                 Content="{DynamicResource I18N_MessageBox_Yes}"
                                                 Visibility="Collapsed" />
                                         <Button x:Name="PART_NoButton"
-                                                MinWidth="60"
+                                                MinWidth="200"
                                                 Background="{DynamicResource Info}"
                                                 Content="{DynamicResource I18N_MessageBox_No}"
                                                 Visibility="Visible" />
                                         <Button x:Name="PART_OkButton"
-                                                MinWidth="60"
+                                                MinWidth="200"
                                                 Content="{DynamicResource I18N_MessageBox_Ok}"
                                                 Visibility="Collapsed" />
                                         <Button x:Name="PART_CancelButton"
-                                                MinWidth="60"
+                                                MinWidth="200"
                                                 Background="{DynamicResource Info}"
                                                 Content="{DynamicResource I18N_MessageBox_Cancel}"
                                                 Visibility="Collapsed" />