diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj index d08f1fe..5b70de9 100644 --- a/DyeingComputer.csproj +++ b/DyeingComputer.csproj @@ -90,8 +90,8 @@ - - WorkOrder.xaml + + WorkOrderView.xaml MSBuild:Compile @@ -105,7 +105,7 @@ MainWindow.xaml Code - + Designer MSBuild:Compile diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 5c24be3..2d7395e 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -74,20 +74,11 @@ namespace DyeingComputer if (string.IsNullOrEmpty(button.Name.ToString())) return; switch (button.Name.ToString()) { - case "Next": - this.In_Out.Visibility = Visibility.Collapsed; - 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; + case "Work_Order": + container.Content = new WorkOrderView(); break; - case "Previous": - 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; + case "Technological_Process": + break; default: break; diff --git a/View/WorkOrder.xaml b/View/WorkOrderView.xaml similarity index 57% rename from View/WorkOrder.xaml rename to View/WorkOrderView.xaml index b22877b..7958c02 100644 --- a/View/WorkOrder.xaml +++ b/View/WorkOrderView.xaml @@ -1,4 +1,4 @@ - - + + + + + diff --git a/View/WorkOrder.xaml.cs b/View/WorkOrderView.xaml.cs similarity index 87% rename from View/WorkOrder.xaml.cs rename to View/WorkOrderView.xaml.cs index 696a84e..ec5de25 100644 --- a/View/WorkOrder.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -18,9 +18,9 @@ namespace DyeingComputer.View /// /// WorkOrder.xaml 的交互逻辑 /// - public partial class WorkOrder : UserControl + public partial class WorkOrderView : UserControl { - public WorkOrder() + public WorkOrderView() { InitializeComponent(); }