2 changed files with 12 additions and 105 deletions
Unified View
Diff Options
+ 11
- 104
DosingSystem/View/RecipeControlView.xaml
View File
| @@ -782,92 +782,14 @@ | |||||
| </Grid> | </Grid> | ||||
| <!--<ScrollViewer | |||||
| Grid.Row="1" | |||||
| HorizontalScrollBarVisibility="Hidden" | |||||
| VerticalScrollBarVisibility="Hidden"> | |||||
| <Border> | |||||
| <Grid Grid.Row="1"> | |||||
| <Grid x:Name="repiceListMaking" Margin="5"> | |||||
| <Grid.RowDefinitions> | |||||
| <RowDefinition Height="30" /> | |||||
| <RowDefinition /> | |||||
| </Grid.RowDefinitions> | |||||
| <TextBlock | |||||
| Margin="10,0" | |||||
| HorizontalAlignment="Left" | |||||
| VerticalAlignment="Center" | |||||
| FontSize="18" | |||||
| Foreground="#FF2AB2E7" | |||||
| Text="{Binding CurrentRecipeName}" /> | |||||
| <ItemsControl | |||||
| Grid.Row="1" | |||||
| Margin="50,0" | |||||
| ItemsSource="{Binding recipeProcesses}"> | |||||
| <ItemsControl.ItemTemplate> | |||||
| <DataTemplate> | |||||
| <Grid Margin="5"> | |||||
| <Grid.ColumnDefinitions> | |||||
| <ColumnDefinition /> | |||||
| <ColumnDefinition Width="16" /> | |||||
| <ColumnDefinition /> | |||||
| </Grid.ColumnDefinitions> | |||||
| <TextBlock | |||||
| Margin="10,0,5,0" | |||||
| HorizontalAlignment="Left" | |||||
| VerticalAlignment="Center" | |||||
| FontSize="15" | |||||
| Foreground="#AA2AB2E7" | |||||
| Text="{Binding RawMaterialName}" | |||||
| ToolTip="{Binding RawMaterialSource, Converter={StaticResource IntToSourceConvert}}" /> | |||||
| <TextBlock | |||||
| Grid.Column="1" | |||||
| Margin="0,0,5,0" | |||||
| HorizontalAlignment="Left" | |||||
| VerticalAlignment="Center" | |||||
| FontSize="15" | |||||
| Foreground="#AA2AB2E7" | |||||
| Text=":" /> | |||||
| <Button | |||||
| Grid.Column="2" | |||||
| HorizontalAlignment="Center" | |||||
| VerticalAlignment="Center" | |||||
| Command="{Binding DataContext.ChangeRecipeStateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}" | |||||
| CommandParameter="{Binding RawMaterialId}" | |||||
| Content="{Binding RecipeStatus, Converter={StaticResource RunStatusConvert}}" | |||||
| IsEnabled="{Binding RawMaterialSource, Converter={StaticResource EnbleConvert}}" | |||||
| Style="{StaticResource materialMakingButton}" /> | |||||
| </Grid> | |||||
| </DataTemplate> | |||||
| </ItemsControl.ItemTemplate> | |||||
| </ItemsControl> | |||||
| </Grid> | |||||
| --> | |||||
| <!--<TreeView x:Name="repiceListMaking" ItemsSource="{Binding RecipeProcesse}" | |||||
| ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Stretch" Background="Wheat" ItemContainerStyle="{StaticResource recipeTreeItem}"> | |||||
| </TreeView>--> | |||||
| <!-- 等待和已完成 --> | |||||
| <!--<TreeView | |||||
| x:Name="repiceList" | |||||
| HorizontalAlignment="Stretch" | |||||
| Background="Transparent" | |||||
| BorderThickness="0" | |||||
| ItemContainerStyle="{StaticResource recipeTreeItem}" | |||||
| ItemsSource="{Binding UserTreeWait}" | |||||
| ScrollViewer.VerticalScrollBarVisibility="Visible" />--> | |||||
| <!-- | |||||
| </Grid> | |||||
| </Border> | |||||
| </ScrollViewer>--> | |||||
| <!--#region 等待制作和制作完成列表显示--> | <!--#region 等待制作和制作完成列表显示--> | ||||
| <Grid | <Grid | ||||
| Name="WaitOrCompleteGrid" | Name="WaitOrCompleteGrid" | ||||
| Grid.Row="1" | Grid.Row="1" | ||||
| Margin="10"> | |||||
| Margin="10" | |||||
| Visibility="Collapsed"> | |||||
| <Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
| <RowDefinition Height="30" /> | <RowDefinition Height="30" /> | ||||
| @@ -991,17 +913,17 @@ | |||||
| <!--#region 制作中设备状态监视--> | <!--#region 制作中设备状态监视--> | ||||
| <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Disabled"> | |||||
| <Grid | |||||
| Name="CookingGrid" | |||||
| Grid.Row="1" | |||||
| Margin="10" | |||||
| Visibility="Collapsed"> | |||||
| <Grid | |||||
| Name="CookingGrid" | |||||
| Grid.Row="1" | |||||
| Margin="10" | |||||
| Panel.ZIndex="10" | |||||
| Visibility="Collapsed"> | |||||
| <ScrollViewer VerticalScrollBarVisibility="Hidden"> | |||||
| <ItemsControl ItemsSource="{Binding recipeProcesses}"> | <ItemsControl ItemsSource="{Binding recipeProcesses}"> | ||||
| <ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
| <DataTemplate> | <DataTemplate> | ||||
| <Grid> | <Grid> | ||||
| <Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
| <RowDefinition Height="30" /> | <RowDefinition Height="30" /> | ||||
| <RowDefinition Height="30" /> | <RowDefinition Height="30" /> | ||||
| @@ -1014,10 +936,6 @@ | |||||
| Grid.RowSpan="5" | Grid.RowSpan="5" | ||||
| Source="/BPASmartClient.CustomResource;component/Image/背景边框4.png" | Source="/BPASmartClient.CustomResource;component/Image/背景边框4.png" | ||||
| Stretch="Fill" /> | Stretch="Fill" /> | ||||
| <!--<Image | |||||
| Grid.RowSpan="4" | |||||
| Source="/BPASmartClient.CustomResource;component/Image/组合边框2.png" | |||||
| Stretch="Fill" />--> | |||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="0" | Grid.Row="0" | ||||
| @@ -1116,23 +1034,12 @@ | |||||
| FontSize="16" | FontSize="16" | ||||
| Style="{StaticResource ControlButtonStyle}" /> | Style="{StaticResource ControlButtonStyle}" /> | ||||
| <!--<Button | |||||
| Grid.Row="3" | |||||
| Height="40" | |||||
| Margin="5,0,5,0" | |||||
| Command="{Binding CancelRecipeCommand}" | |||||
| CommandParameter="{Binding}" | |||||
| Content="取消配料" | |||||
| FontSize="20" | |||||
| Style="{StaticResource ImageButtonStyle}" />--> | |||||
| </Grid> | </Grid> | ||||
| </DataTemplate> | </DataTemplate> | ||||
| </ItemsControl.ItemTemplate> | </ItemsControl.ItemTemplate> | ||||
| </ItemsControl> | </ItemsControl> | ||||
| </Grid> | |||||
| </ScrollViewer> | |||||
| </ScrollViewer> | |||||
| </Grid> | |||||
| <!--#endregion--> | <!--#endregion--> | ||||
+ 1
- 1
DosingSystem/View/RecipeControlView.xaml.cs
View File
| @@ -15,7 +15,7 @@ namespace BPASmartClient.DosingSystem.View | |||||
| { | { | ||||
| InitializeComponent(); | InitializeComponent(); | ||||
| RadioButtonWait_Click(null, null); | RadioButtonWait_Click(null, null); | ||||
| UseTheScrollViewerScrolling(gr); | |||||
| UseTheScrollViewerScrolling(CookingGrid); | |||||
| } | } | ||||
| public void UseTheScrollViewerScrolling(FrameworkElement fElement) | public void UseTheScrollViewerScrolling(FrameworkElement fElement) | ||||