diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj index 8f2a7fb..56ea0ad 100644 --- a/DyeingComputer.csproj +++ b/DyeingComputer.csproj @@ -149,6 +149,7 @@ + @@ -159,6 +160,9 @@ CurveDiagramView.xaml + + CurveTemp.xaml + EngineerSetView.xaml @@ -218,6 +222,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/View/CurveTemp.xaml b/View/CurveTemp.xaml new file mode 100644 index 0000000..d69998b --- /dev/null +++ b/View/CurveTemp.xaml @@ -0,0 +1,17 @@ + + + + + diff --git a/View/CurveTemp.xaml.cs b/View/CurveTemp.xaml.cs new file mode 100644 index 0000000..9b539c9 --- /dev/null +++ b/View/CurveTemp.xaml.cs @@ -0,0 +1,35 @@ +using DyeingComputer.ViewModel; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace DyeingComputer.View +{ + /// + /// CurveDiagram.xaml 的交互逻辑 + /// + public partial class CurveTemp : UserControl + { + public static DataTable dataTable; + public CurveTemp(DataTable db) + { + InitializeComponent(); + + dataTable = db; + + DataContext = new CurveTempModel(); + } + } +} diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml index 4832ddf..9fedc48 100644 --- a/View/WorkOrderView.xaml +++ b/View/WorkOrderView.xaml @@ -89,8 +89,9 @@ - -