diff --git a/MainWindow.xaml b/MainWindow.xaml
index 218c76c..522552a 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -71,9 +71,7 @@
-
-
-
+
+ d:DesignHeight="630" d:DesignWidth="1280">
+ d:DesignHeight="630" d:DesignWidth="1280">
diff --git a/View/ProgramstepsView .xaml b/View/ProgramstepsView .xaml
index 2a63aee..50b2f4d 100644
--- a/View/ProgramstepsView .xaml
+++ b/View/ProgramstepsView .xaml
@@ -7,7 +7,7 @@
xmlns:lang="clr-namespace:DyeingComputer.Properties"
xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
mc:Ignorable="d" Loaded="UserControl_Loaded"
- d:DesignHeight="630" d:DesignWidth="1280" HorizontalAlignment="Left">
+ d:DesignHeight="630" d:DesignWidth="1280">
diff --git a/View/SysSetView.xaml b/View/SysSetView.xaml
index 39ad78a..9829e92 100644
--- a/View/SysSetView.xaml
+++ b/View/SysSetView.xaml
@@ -6,7 +6,7 @@
xmlns:local="clr-namespace:DyeingComputer.View"
xmlns:lang="clr-namespace:DyeingComputer.Properties"
mc:Ignorable="d" Loaded="UserControl_Loaded"
- d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
+ d:DesignHeight="630" d:DesignWidth="1280">
+ d:DesignHeight="630" d:DesignWidth="1280">
-
-
+
+
+ d:DesignHeight="630" d:DesignWidth="1280" >
@@ -30,61 +30,59 @@
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility ="Column"
Background="White" SelectionMode="Single" FontSize="15" >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs
index b6dcac7..0e0134a 100644
--- a/View/WorkOrderView.xaml.cs
+++ b/View/WorkOrderView.xaml.cs
@@ -3,6 +3,7 @@ using DyeingComputer.ViewModel;
using ScottPlot;
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Data;
using System.Linq;
using System.Text;
@@ -158,6 +159,10 @@ namespace DyeingComputer.View
if (e.Key == Key.K)
{
MainWindowViewModel.WorkNumder = WorkOrder_Numder;
+ TechnologicalProcessView.workName = Process_id;
+
+ var _mainWindow = Application.Current.Windows .Cast() .FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面
+ _mainWindow.container.Content = new TechnologicalProcessView();//获取控件
}
}
}