@@ -517,7 +517,7 @@ | |||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> | <StackPanel HorizontalAlignment="Right" Orientation="Horizontal"> | ||||
<CheckBox | <CheckBox | ||||
Margin="5,0,5,0" | |||||
Margin="5,0,8,0" | |||||
Content="开机启动" | Content="开机启动" | ||||
IsChecked="{Binding AutoStart}" | IsChecked="{Binding AutoStart}" | ||||
Style="{StaticResource checkBoxStyle}" /> | Style="{StaticResource checkBoxStyle}" /> | ||||
@@ -127,7 +127,7 @@ namespace FryPot_DosingSystem | |||||
}); | }); | ||||
InfoLog.Add(new SubMenumodel() | InfoLog.Add(new SubMenumodel() | ||||
{ | { | ||||
SubMenuName = "炒锅状态记录", | |||||
SubMenuName = "炒锅历史状态", | |||||
SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.观察员 }, | SubMenuPermission = new Permission[] { Permission.操作员, Permission.管理员, Permission.技术员, Permission.观察员 }, | ||||
AssemblyName = "FryPot_DosingSystem", | AssemblyName = "FryPot_DosingSystem", | ||||
ToggleWindowPath = "View.SqliteDataView" | ToggleWindowPath = "View.SqliteDataView" | ||||
@@ -14,7 +14,7 @@ | |||||
<Style x:Key="dataGrid" TargetType="DataGrid" > | <Style x:Key="dataGrid" TargetType="DataGrid" > | ||||
<Setter Property="HorizontalGridLinesBrush" Value="#FF2AB2E7"/> | <Setter Property="HorizontalGridLinesBrush" Value="#FF2AB2E7"/> | ||||
<Setter Property="VerticalGridLinesBrush" Value="#FF2AB2E7"/> | <Setter Property="VerticalGridLinesBrush" Value="#FF2AB2E7"/> | ||||
<Setter Property="BorderThickness" Value="1"/> | |||||
<Setter Property="BorderThickness" Value="0"/> | |||||
<Setter Property="BorderBrush" Value="#FF2AB2E7"/> | <Setter Property="BorderBrush" Value="#FF2AB2E7"/> | ||||
<Setter Property="CanUserResizeColumns" Value="False"/> | <Setter Property="CanUserResizeColumns" Value="False"/> | ||||
<Setter Property="HeadersVisibility" Value="Column"/> | <Setter Property="HeadersVisibility" Value="Column"/> | ||||
@@ -15,7 +15,7 @@ | |||||
<Style x:Key="dataGrid" TargetType="DataGrid" > | <Style x:Key="dataGrid" TargetType="DataGrid" > | ||||
<Setter Property="HorizontalGridLinesBrush" Value="#FF2AB2E7"/> | <Setter Property="HorizontalGridLinesBrush" Value="#FF2AB2E7"/> | ||||
<Setter Property="VerticalGridLinesBrush" Value="#FF2AB2E7"/> | <Setter Property="VerticalGridLinesBrush" Value="#FF2AB2E7"/> | ||||
<Setter Property="BorderThickness" Value="1"/> | |||||
<Setter Property="BorderThickness" Value="0"/> | |||||
<Setter Property="BorderBrush" Value="#FF2AB2E7"/> | <Setter Property="BorderBrush" Value="#FF2AB2E7"/> | ||||
<Setter Property="CanUserResizeColumns" Value="False"/> | <Setter Property="CanUserResizeColumns" Value="False"/> | ||||
<Setter Property="HeadersVisibility" Value="Column"/> | <Setter Property="HeadersVisibility" Value="Column"/> | ||||