界面字体修改

BPA.Model/RecipeInfo.cs

@@ -30,9 +30,12 @@ namespace BPA.Model
             get { return _mIsEnable; }
             set
             {
+                if (_mIsEnable != value)
+                {
+                    EnableChange?.Invoke(Id);
+                }
                 _mIsEnable = value;
                 OnPropertyChanged();
-                EnableChange?.Invoke(Id);
             }
         }
         private bool _mIsEnable = true;

BPA.SingleDevice/View/DebugLogView.xaml

@@ -12,7 +12,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
+                <RowDefinition Height="70" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -27,7 +27,7 @@
                 <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=IsShowHistory, Path=IsChecked, Converter={StaticResource BooleanToVisibleConverter}}">
                     <TextBlock Margin="5,0" Text="开始日期：" />
                     <DatePicker
-                        Width="150"
+                        Width="200"
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
                         bpa:InputBoxHelper.IsClearable="True"
@@ -36,7 +36,7 @@
                         SelectedDateFormat="Short" />
                     <TextBlock Margin="5,0" Text="结束日期：" />
                     <DatePicker
-                        Width="150"
+                        Width="200"
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
                         bpa:InputBoxHelper.IsClearable="True"
@@ -82,17 +82,17 @@
                         <DataGridTextColumn
                             Width="150"
                             Binding="{Binding Date}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="日期" />
                         <DataGridTextColumn
                             Width="150"
                             Binding="{Binding Time}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="时间" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding DebugInfo}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="日志信息" />
                     </DataGrid.Columns>
                 </DataGrid>

BPA.SingleDevice/View/DebugView.xaml

@@ -21,7 +21,7 @@
             HorizontalAlignment="Left"
             Content="开机自启"
             FontSize="22"
-            IsChecked="{Binding AutoStart}"
+            IsChecked="{Binding AutoStart}" 
             Style="{DynamicResource SwitchAccentToggleButton}" />
         <ToggleButton
             x:Name="ModeButton"
@@ -75,7 +75,7 @@
                     Width="150"
                     Height="45"
                     Margin="10"
-                    FontSize="16"
+                    FontSize="22"
                     Text="{Binding InchSpeed}" />
             </StackPanel>
         </Border>
@@ -93,7 +93,7 @@
                         Foreground="White"
                         Text="流水线移动参数设置" />
                     <Button
-                        Width="100"
+                        Width="170"
                         Height="40"
                         HorizontalAlignment="Right"
                         bpa:ButtonHelper.Shape="Round"

BPA.SingleDevice/View/MainView.xaml

@@ -89,9 +89,9 @@
             bpa:ItemsControlHelper.ItemMargin="0"
             bpa:ItemsControlHelper.ItemPadding="5 3"
             Background="#2d2d2d"
-            ExpandedWidth="170"
+            ExpandedWidth="230" CollapsedWidth="70"
             Foreground="{DynamicResource WhiteForeground}"
-            Header="菜单"
+            Header="菜单" FontSize="22"
             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="30"
+                    Height="55"
                     x:Shared="false">
-                    <TextBlock Text="{Binding Name}" />
+                    <TextBlock Text="{Binding Name}" FontSize="22" />
                 </Grid>
             </bpa:HamburgerMenu.Resources>
             <bpa:HamburgerMenu.ItemContainerStyle>

BPA.SingleDevice/View/OrderMainView.xaml

@@ -32,7 +32,7 @@
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="120" />
-                                <RowDefinition Height="40" />
+                                <RowDefinition Height="50" />
                                 <RowDefinition />
                             </Grid.RowDefinitions>
                             <!--  图片  -->
@@ -40,7 +40,7 @@
                             <TextBlock
                                 Grid.Row="1"
                                 HorizontalAlignment="Center"
-                                FontSize="16"
+                                FontSize="24"
                                 Foreground="#ddd"
                                 Text="{Binding Name}" />
                             <Border
@@ -52,7 +52,7 @@
                                 Margin="0,5,0,0"
                                 bpa:GridHelper.ColumnDefinitions="*,*">
                                 <bpa:NumericBox
-                                    Width="90"
+                                    Width="110" FontSize="16"
                                     bpa:ControlHelper.FocusBorderBrush="{DynamicResource Secondary}"
                                     BorderThickness="0"
                                     Style="{StaticResource FrontBackNumericBox}"

BPA.SingleDevice/View/RawMaterialManagementView.xaml

@@ -79,11 +79,11 @@
                             Binding="{Binding DeviceNum}"
                             Header="设备编号" />
                         <DataGridTextColumn
-                            Width="120"
+                            Width="160"
                             Binding="{Binding WarehouseNum}"
                             Header="设备料仓编号" />
                         <DataGridTextColumn
-                            Width="180"
+                            Width="240"
                             Binding="{Binding LastModified}"
                             Header="最后修改时间" />
                         <DataGridTemplateColumn Width="300" Header="操作">

BPA.SingleDevice/View/RecipeManagementView.xaml

@@ -54,7 +54,7 @@
                     GridLinesVisibility="All"
                     IsReadOnly="False"
                     ItemsSource="{Binding RecipeInfos}"
-                    RowHeight="35"
+                    RowHeight="50"
                     SelectionMode="Single">
                     <DataGrid.Columns>
                         <DataGridTextColumn
@@ -62,11 +62,11 @@
                             Binding="{Binding Name}"
                             Header="配方名称" />
                         <DataGridCheckBoxColumn
-                            Width="50"
+                            Width="80"
                             Binding="{Binding IsEnable, UpdateSourceTrigger=PropertyChanged}"
                             Header="启用" />
                         <DataGridTextColumn
-                            Width="180"
+                            Width="280"
                             Binding="{Binding LastModified}"
                             Header="最后修改时间" />
                         <DataGridTemplateColumn Width="300" Header="操作">

BPA.SingleDevice/View/RecipeStatusView.xaml

@@ -1,11 +1,11 @@
 <UserControl
     x:Class="BPA.SingleDevice.View.RecipeStatusView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:bpa="http://BPAUIControl.io/winfx/xaml/toolkit"
+    xmlns:conv="clr-namespace:BPA.SingleDevice.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:conv="clr-namespace:BPA.SingleDevice.Converters"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -61,7 +61,7 @@
                 GridLinesVisibility="All"
                 IsReadOnly="False"
                 ItemsSource="{Binding CurrentRecipes}"
-                RowHeight="35"
+                RowHeight="50"
                 SelectionMode="Single">
                 <DataGrid.Columns>
                     <DataGridTextColumn
@@ -69,15 +69,15 @@
                         Binding="{Binding Name}"
                         Header="配方名称" />
                     <DataGridTextColumn
-                        Width="180"
+                        Width="240"
                         Binding="{Binding IssueTime}"
                         Header="下发时间" />
                     <DataGridTextColumn
-                        Width="180"
+                        Width="240"
                         Binding="{Binding StartTime}"
                         Header="开始时间" />
                     <DataGridTextColumn
-                        Width="80"
+                        Width="120"
                         Binding="{Binding CurrentStation}"
                         Header="当前工站" />
                     <DataGridTextColumn Width="180" Header="当前工站进度">

BPA.SingleDevice/View/RunLogView.xaml

@@ -12,7 +12,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
+                <RowDefinition Height="70" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -27,7 +27,7 @@
                 <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=IsShowHistory, Path=IsChecked, Converter={StaticResource BooleanToVisibleConverter}}">
                     <TextBlock Margin="5,0" Text="开始日期：" />
                     <DatePicker
-                        Width="150"
+                        Width="200"
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
                         bpa:InputBoxHelper.IsClearable="True"
@@ -36,7 +36,7 @@
                         SelectedDateFormat="Short" />
                     <TextBlock Margin="5,0" Text="结束日期：" />
                     <DatePicker
-                        Width="150"
+                        Width="200"
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
                         bpa:InputBoxHelper.IsClearable="True"
@@ -82,17 +82,17 @@
                         <DataGridTextColumn
                             Width="150"
                             Binding="{Binding Date}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="日期" />
                         <DataGridTextColumn
                             Width="150"
                             Binding="{Binding Time}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="时间" />
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding RunLogInfo}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="日志信息" />
                     </DataGrid.Columns>
                 </DataGrid>

BPA.SingleDevice/View/UserLogView.xaml

@@ -12,7 +12,7 @@
     <bpa:DialogContainer>
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
+                <RowDefinition Height="70" />
                 <RowDefinition />
             </Grid.RowDefinitions>
 
@@ -27,7 +27,7 @@
                 <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=IsShowHistory, Path=IsChecked, Converter={StaticResource BooleanToVisibleConverter}}">
                     <TextBlock Margin="5,0" Text="开始日期：" />
                     <DatePicker
-                        Width="150"
+                        Width="200"
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
                         bpa:InputBoxHelper.IsClearable="True"
@@ -36,7 +36,7 @@
                         SelectedDateFormat="Short" />
                     <TextBlock Margin="5,0" Text="结束日期：" />
                     <DatePicker
-                        Width="150"
+                        Width="200"
                         bpa:ControlHelper.FocusBorderBrush="{DynamicResource Accent}"
                         bpa:ControlHelper.MouseOverBrush="{DynamicResource Accent}"
                         bpa:InputBoxHelper.IsClearable="True"
@@ -82,22 +82,22 @@
                         <DataGridTextColumn
                             Width="150"
                             Binding="{Binding Date}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="日期" />
                         <DataGridTextColumn
                             Width="150"
                             Binding="{Binding Time}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="时间" />
-                        <DataGridTextColumn
+                        <!--<DataGridTextColumn
                             Width="150"
                             Binding="{Binding UserName}"
-                            FontSize="16"
-                            Header="用户" />
+                            FontSize="22"
+                            Header="用户" />-->
                         <DataGridTextColumn
                             Width="*"
                             Binding="{Binding UserLogInfo}"
-                            FontSize="16"
+                            FontSize="22"
                             Header="操作信息" />
                     </DataGrid.Columns>
                 </DataGrid>

BPA.SingleDevice/View/VarMonitorView.xaml

@@ -10,7 +10,7 @@
     mc:Ignorable="d">
     <Grid Margin="10">
         <Grid.RowDefinitions>
-            <RowDefinition Height="30" />
+            <RowDefinition Height="40" />
             <RowDefinition />
         </Grid.RowDefinitions>
 
@@ -28,18 +28,18 @@
                 Grid.Column="0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontSize="16"
-                Text="ID" />
+                FontSize="22"
+                Text="序号" />
 
             <Grid Grid.Column="1">
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="16"
+                    FontSize="22"
                     Text="变量名" />
                 <Border
                     BorderBrush="Gray"
-                    BorderThickness="1,0,1,0"
+                    BorderThickness="2,0,2,0"
                     Cursor="SizeWE" />
             </Grid>
 
@@ -47,18 +47,18 @@
                 Grid.Column="2"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontSize="16"
+                FontSize="22"
                 Text="PLC 地址" />
 
             <Grid Grid.Column="3">
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="16"
+                    FontSize="22"
                     Text="注释" />
                 <Border
                     BorderBrush="Gray"
-                    BorderThickness="1,0,0,0"
+                    BorderThickness="2,0,0,0"
                     Cursor="SizeWE" />
             </Grid>
 
@@ -66,11 +66,11 @@
                 <TextBlock
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    FontSize="16"
+                    FontSize="22"
                     Text="Modbus TCP 地址" />
                 <Border
                     BorderBrush="Gray"
-                    BorderThickness="1,0,1,0"
+                    BorderThickness="2,0,2,0"
                     Cursor="SizeWE" />
             </Grid>
 
@@ -78,7 +78,7 @@
                 Grid.Column="5"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
-                FontSize="16"
+                FontSize="22"
                 Text="当前值" />
         </Grid>
         <!--#endregion-->
@@ -91,7 +91,7 @@
             <ItemsControl ItemsSource="{Binding VariableMonitors}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <Grid x:Name="gr" Height="30">
+                        <Grid x:Name="gr" Height="50">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="0.3*" />
                                 <ColumnDefinition />
@@ -106,7 +106,7 @@
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
                                 Background="Transparent"
-                                FontSize="14"
+                                FontSize="22"
                                 Text="{Binding Id}" />
 
                             <Grid Grid.Column="1">
@@ -114,9 +114,9 @@
                                     Margin="5,0,0,0"
                                     VerticalAlignment="Center"
                                     Background="Transparent"
-                                    FontSize="14"
+                                    FontSize="22"
                                     Text="{Binding VarName}" />
-                                <Border BorderBrush="Gray" BorderThickness="1,0,1,0" />
+                                <Border BorderBrush="Gray" BorderThickness="2,0,2,0" />
                             </Grid>
 
                             <TextBlock
@@ -124,7 +124,7 @@
                                 Margin="5,0,0,0"
                                 VerticalAlignment="Center"
                                 Background="Transparent"
-                                FontSize="14"
+                                FontSize="22"
                                 Text="{Binding PLCAddress}" />
 
                             <Grid Grid.Column="3">
@@ -132,9 +132,9 @@
                                     Margin="5,0,0,0"
                                     VerticalAlignment="Center"
                                     Background="Transparent"
-                                    FontSize="14"
+                                    FontSize="22"
                                     Text="{Binding Notes}" />
-                                <Border BorderBrush="Gray" BorderThickness="1,0,0,0" />
+                                <Border BorderBrush="Gray" BorderThickness="2,0,0,0" />
                             </Grid>
 
                             <Grid Grid.Column="4">
@@ -142,10 +142,10 @@
                                     Margin="5,0,0,0"
                                     VerticalAlignment="Center"
                                     Background="Transparent"
-                                    FontSize="14"
+                                    FontSize="22"
                                     Foreground="White"
                                     Text="{Binding ModbusTcpAddress}" />
-                                <Border BorderBrush="Gray" BorderThickness="1,0,1,0" />
+                                <Border BorderBrush="Gray" BorderThickness="2,0,2,0" />
                             </Grid>
 
                             <TextBlock
@@ -153,7 +153,7 @@
                                 Margin="5,0,0,0"
                                 VerticalAlignment="Center"
                                 Background="Transparent"
-                                FontSize="14"
+                                FontSize="22"
                                 Foreground="White"
                                 Text="{Binding CurrentValue}" />