sc 1 year ago
parent
commit
1103c652bc
  1. 6
      DyeingComputer.csproj
  2. 17
      MainWindow.xaml.cs
  3. 6
      View/WorkOrderView.xaml
  4. 4
      View/WorkOrderView.xaml.cs

6
DyeingComputer.csproj

@ -90,8 +90,8 @@
<Compile Include="UserClass\StrToInt.cs" /> <Compile Include="UserClass\StrToInt.cs" />
<Compile Include="UserClass\TCPServer.cs" /> <Compile Include="UserClass\TCPServer.cs" />
<Compile Include="ViewModel\ViewModelLocator.cs" /> <Compile Include="ViewModel\ViewModelLocator.cs" />
<Compile Include="View\WorkOrder.xaml.cs"> <Compile Include="View\WorkOrderView.xaml.cs">
<DependentUpon>WorkOrder.xaml</DependentUpon> <DependentUpon>WorkOrderView.xaml</DependentUpon>
</Compile> </Compile>
<Page Include="MainWindow.xaml"> <Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
@ -105,7 +105,7 @@
<DependentUpon>MainWindow.xaml</DependentUpon> <DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Page Include="View\WorkOrder.xaml"> <Page Include="View\WorkOrderView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>

17
MainWindow.xaml.cs

@ -74,20 +74,11 @@ namespace DyeingComputer
if (string.IsNullOrEmpty(button.Name.ToString())) return; if (string.IsNullOrEmpty(button.Name.ToString())) return;
switch (button.Name.ToString()) switch (button.Name.ToString())
{ {
case "Next": case "Work_Order":
this.In_Out.Visibility = Visibility.Collapsed; container.Content = new WorkOrderView();
this.Sys_Set.Visibility = Visibility.Collapsed;
this.Parameter_Set.Visibility = Visibility.Collapsed;
this.Program_group.Visibility = Visibility.Collapsed;
this.Engineer_Set.Visibility = Visibility.Collapsed;
this.Previous.Visibility = Visibility.Collapsed;
break; break;
case "Previous": case "Technological_Process":
this.Work_Order.Visibility = Visibility.Collapsed;
this.Technological_Process.Visibility = Visibility.Collapsed;
this.Curve_Diagram.Visibility = Visibility.Collapsed;
this.Equipment_Simulation.Visibility = Visibility.Collapsed;
this.History_Records.Visibility = Visibility.Collapsed;
break; break;
default: default:
break; break;

6
View/WorkOrder.xaml → View/WorkOrderView.xaml

@ -1,4 +1,4 @@
<UserControl x:Class="DyeingComputer.View.WorkOrder" <UserControl x:Class="DyeingComputer.View.WorkOrderView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -7,6 +7,10 @@
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="450" d:DesignWidth="800">
<Grid> <Grid>
<Grid>
<Grid HorizontalAlignment="Left" Height="236" Margin="190,81,0,0" VerticalAlignment="Top" Width="406"/>
<DataGrid HorizontalAlignment="Left" Height="226" Margin="78,91,0,0" VerticalAlignment="Top" Width="437" d:ItemsSource="{d:SampleData ItemCount=5}"/>
</Grid>
</Grid> </Grid>
</UserControl> </UserControl>

4
View/WorkOrder.xaml.cs → View/WorkOrderView.xaml.cs

@ -18,9 +18,9 @@ namespace DyeingComputer.View
/// <summary> /// <summary>
/// WorkOrder.xaml 的交互逻辑 /// WorkOrder.xaml 的交互逻辑
/// </summary> /// </summary>
public partial class WorkOrder : UserControl public partial class WorkOrderView : UserControl
{ {
public WorkOrder() public WorkOrderView()
{ {
InitializeComponent(); InitializeComponent();
} }
Loading…
Cancel
Save