1 changed files with 57 additions and 65 deletions
Unified View
Diff Options
+ 57
- 65
DosingSystem/View/NewMaterialDeviceParView.xaml
View File
| @@ -60,29 +60,17 @@ | |||||
| <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" /> | <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png" /> | ||||
| </Border.Background> | </Border.Background> | ||||
| <Grid> | <Grid> | ||||
| <Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
| <RowDefinition Height="5" /> | <RowDefinition Height="5" /> | ||||
| <RowDefinition /> | <RowDefinition /> | ||||
| </Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
| <Grid Grid.Row="1"> | <Grid Grid.Row="1"> | ||||
| <Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
| <RowDefinition Height="40" /> | |||||
| <RowDefinition Height="40" /> | <RowDefinition Height="40" /> | ||||
| <RowDefinition /> | <RowDefinition /> | ||||
| </Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
| <TextBlock | |||||
| Margin="10,0,0,0" | |||||
| Background="Transparent" | |||||
| FontSize="20" | |||||
| Foreground="#FF2AB2E7" | |||||
| Text="请输入原料名称：" /> | |||||
| <TextBlock | <TextBlock | ||||
| Margin="0,0,10,0" | Margin="0,0,10,0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| @@ -91,36 +79,7 @@ | |||||
| Foreground="Red" | Foreground="Red" | ||||
| Text="{Binding ErrorInfo}" /> | Text="{Binding ErrorInfo}" /> | ||||
| <StackPanel | |||||
| Grid.Row="1" | |||||
| Margin="10,0,0,0" | |||||
| Orientation="Horizontal"> | |||||
| <TextBox | |||||
| Grid.Column="1" | |||||
| Width="200" | |||||
| Height="40" | |||||
| Margin="0,0,7,0" | |||||
| FontSize="16" | |||||
| Style="{StaticResource TextBoxStyle}" | |||||
| Text="{Binding RecipeName}" /> | |||||
| <Button | |||||
| Width="80" | |||||
| Height="30" | |||||
| Command="{Binding SaveCommand}" | |||||
| Content="确认" /> | |||||
| <Button | |||||
| Name="btClose" | |||||
| Width="80" | |||||
| Height="30" | |||||
| Margin="7,0,0,0" | |||||
| Content="取消" /> | |||||
| </StackPanel> | |||||
| <Grid Grid.Row="2" Margin="5"> | |||||
| <Grid Grid.Row="1" Margin="5"> | |||||
| <Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
| <RowDefinition /> | <RowDefinition /> | ||||
| <RowDefinition /> | <RowDefinition /> | ||||
| @@ -130,6 +89,7 @@ | |||||
| <RowDefinition /> | <RowDefinition /> | ||||
| <RowDefinition /> | <RowDefinition /> | ||||
| <RowDefinition /> | <RowDefinition /> | ||||
| <RowDefinition /> | |||||
| </Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
| <Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
| @@ -138,9 +98,40 @@ | |||||
| <ColumnDefinition /> | <ColumnDefinition /> | ||||
| </Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
| <!--#region 请输入原料名称--> | |||||
| <TextBlock | |||||
| Grid.Column="0" | |||||
| HorizontalAlignment="Right" | |||||
| Background="Transparent" | |||||
| FontSize="20" | |||||
| Foreground="#FF2AB2E7" | |||||
| Text="请输入原料名称：" /> | |||||
| <TextBox | |||||
| Grid.Column="1" | |||||
| Margin="3" | |||||
| Style="{StaticResource TextBoxStyle}" | |||||
| Text="{Binding RawMaterialName}" /> | |||||
| <StackPanel Grid.Column="2" Orientation="Horizontal"> | |||||
| <Button | |||||
| Width="80" | |||||
| Height="30" | |||||
| Command="{Binding SaveCommand}" | |||||
| Content="确认" /> | |||||
| <Button | |||||
| Name="btClose" | |||||
| Width="80" | |||||
| Height="30" | |||||
| Margin="7,0,0,0" | |||||
| Content="取消" /> | |||||
| </StackPanel> | |||||
| <!--#endregion--> | |||||
| <!--#region 慢加重量--> | <!--#region 慢加重量--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="0" | |||||
| Grid.Row="1" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -149,13 +140,14 @@ | |||||
| Text="慢加重量：" /> | Text="慢加重量：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="1" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="0" | |||||
| Grid.Row="1" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
| @@ -167,7 +159,7 @@ | |||||
| <!--#region 提前关阀重量--> | <!--#region 提前关阀重量--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="1" | |||||
| Grid.Row="2" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -176,14 +168,14 @@ | |||||
| Text="提前关阀重量：" /> | Text="提前关阀重量：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="1" | |||||
| Grid.Row="2" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="1" | |||||
| Grid.Row="2" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
| @@ -195,7 +187,7 @@ | |||||
| <!--#region 快加速度--> | <!--#region 快加速度--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="2" | |||||
| Grid.Row="3" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -204,14 +196,14 @@ | |||||
| Text="快加速度：" /> | Text="快加速度：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="2" | |||||
| Grid.Row="3" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="2" | |||||
| Grid.Row="3" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
| @@ -223,7 +215,7 @@ | |||||
| <!--#region 慢加速度--> | <!--#region 慢加速度--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="3" | |||||
| Grid.Row="4" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -232,14 +224,14 @@ | |||||
| Text="慢加速度：" /> | Text="慢加速度：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="3" | |||||
| Grid.Row="4" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="3" | |||||
| Grid.Row="4" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
| @@ -251,7 +243,7 @@ | |||||
| <!--#region 伺服手动速度--> | <!--#region 伺服手动速度--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="4" | |||||
| Grid.Row="5" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -260,14 +252,14 @@ | |||||
| Text="伺服手动速度：" /> | Text="伺服手动速度：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="4" | |||||
| Grid.Row="5" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="4" | |||||
| Grid.Row="5" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
| @@ -279,7 +271,7 @@ | |||||
| <!--#region 料仓上限重量--> | <!--#region 料仓上限重量--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="5" | |||||
| Grid.Row="6" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -288,14 +280,14 @@ | |||||
| Text="料仓上限重量：" /> | Text="料仓上限重量：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="5" | |||||
| Grid.Row="6" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="5" | |||||
| Grid.Row="6" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
| @@ -307,7 +299,7 @@ | |||||
| <!--#region 料仓下限重量--> | <!--#region 料仓下限重量--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="6" | |||||
| Grid.Row="7" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -316,14 +308,14 @@ | |||||
| Text="料仓下限重量：" /> | Text="料仓下限重量：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="6" | |||||
| Grid.Row="7" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="6" | |||||
| Grid.Row="7" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||
| @@ -335,7 +327,7 @@ | |||||
| <!--#region 搅拌速度--> | <!--#region 搅拌速度--> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="7" | |||||
| Grid.Row="8" | |||||
| Grid.Column="0" | Grid.Column="0" | ||||
| HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
| Background="Transparent" | Background="Transparent" | ||||
| @@ -344,14 +336,14 @@ | |||||
| Text="搅拌速度：" /> | Text="搅拌速度：" /> | ||||
| <TextBox | <TextBox | ||||
| Grid.Row="7" | |||||
| Grid.Row="8" | |||||
| Grid.Column="1" | Grid.Column="1" | ||||
| Margin="3" | Margin="3" | ||||
| Style="{StaticResource TextBoxStyle}" | Style="{StaticResource TextBoxStyle}" | ||||
| Text="{Binding RawMaterialName}" /> | Text="{Binding RawMaterialName}" /> | ||||
| <TextBlock | <TextBlock | ||||
| Grid.Row="7" | |||||
| Grid.Row="8" | |||||
| Grid.Column="2" | Grid.Column="2" | ||||
| Margin="5,0,0,0" | Margin="5,0,0,0" | ||||
| HorizontalAlignment="Left" | HorizontalAlignment="Left" | ||||