Browse Source

临时更新

样式分支
taoye 2 years ago
parent
commit
4eae7261e8
3 changed files with 5 additions and 5 deletions
  1. +2
    -2
      BPASmartClient.CustomResource/UserControls/Cylinder.xaml
  2. +1
    -1
      BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs
  3. +2
    -2
      BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml

+ 2
- 2
BPASmartClient.CustomResource/UserControls/Cylinder.xaml View File

@@ -66,9 +66,9 @@
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="el" Property="Fill" Value="Green" />
</Trigger>
<Trigger Property="IsChecked" Value="False">
<!--<Trigger Property="IsChecked" Value="False">
<Setter TargetName="el" Property="Fill" Value="red" />
</Trigger>
</Trigger>-->
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>


+ 1
- 1
BPASmartClient.JXJFoodBigStation/Model/ProcessControl.cs View File

@@ -61,7 +61,7 @@ namespace BPASmartClient.JXJFoodBigStation.Model
RawMaterials.Clear();
for (int i = 0; i < 15; i++)
{
if (RawMaterialsNamePos.ContainsKey(res.RecipeName)
if (RawMaterialsNamePos.ContainsKey(res.RecipeName))
{
RawMaterials.Add(new RemoteRecipeRawMaterial()
{


+ 2
- 2
BPASmartClient.JXJFoodBigStation/View/RecipeReceiveView.xaml View File

@@ -149,7 +149,7 @@
</UserControl.Resources>

<UserControl.DataContext>
<vm:RecipeReceiveViewModel />
<vm:RecipeReceiveViewModel/>
</UserControl.DataContext>

<Grid>
@@ -192,7 +192,7 @@
IsEnabled="True"
Style="{StaticResource IcoButtonStyle}" />
</StackPanel>
<ScrollViewer Grid.Row="1">
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
<ListBox
Grid.Row="2"
Margin="5"


Loading…
Cancel
Save