Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

DyeingComputer.csproj

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

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;

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:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -7,6 +7,10 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <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>
 </UserControl>

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

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