diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 4fc52e4..204cb59 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -28,6 +28,8 @@ namespace formula_manage
///
public partial class MainWindow : Window
{
+ DataTable STUFFdataTable = new DataTable(); //建立STUFF缓存
+
public MainWindow()
{
int ID_N = 1;
@@ -161,7 +163,8 @@ namespace formula_manage
private void MAC_SET(object sender, RoutedEventArgs e)
{
-
+ Windows.Machine mac = new Windows.Machine();
+ mac.ShowDialog();//实例化并置顶打开设置窗口
}
private void STUFF(object sender, RoutedEventArgs e)
diff --git a/Windows/Machine.xaml b/Windows/Machine.xaml
new file mode 100644
index 0000000..c38d556
--- /dev/null
+++ b/Windows/Machine.xaml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Windows/Machine.xaml.cs b/Windows/Machine.xaml.cs
new file mode 100644
index 0000000..7733b4a
--- /dev/null
+++ b/Windows/Machine.xaml.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+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.Shapes;
+
+namespace formula_manage.Windows
+{
+ ///
+ /// Machine.xaml 的交互逻辑
+ ///
+ public partial class Machine : Window
+ {
+ public Machine()
+ {
+ InitializeComponent();
+ }
+
+ private void DataGridMac_MouseDoubleClick(object sender, MouseButtonEventArgs e)//数据表双击事件
+ {
+ }
+
+ private async void Button_Preservation(object sender, RoutedEventArgs e)//保存按钮事件
+ {
+
+ }
+
+ private async void Button_Delete(object sender, RoutedEventArgs e)//删除按钮事件
+ {
+ }
+ }
+}
diff --git a/Windows/Stuff.xaml b/Windows/Stuff.xaml
index 003ac14..c800ad8 100644
--- a/Windows/Stuff.xaml
+++ b/Windows/Stuff.xaml
@@ -7,7 +7,8 @@
xmlns:ConvertMoels="clr-namespace:formula_manage.ConvertMoels"
xmlns:viewmodel="clr-namespace:formula_manage.ViewModel"
mc:Ignorable="d" Loaded="Stuff_Loaded"
- Title="Stuff" Height="720" Width="1100" BorderBrush="White" Background="#FFE0E0E0">
+ Title="Stuff" Height="720" Width="1100" MaxHeight="720" MaxWidth="1100" MinHeight="720" MinWidth="1100"
+ BorderBrush="White" Background="#FFE0E0E0">
@@ -16,7 +17,7 @@
APP_set.xaml
+
+ Machine.xaml
+
Sql.xaml
@@ -185,6 +188,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile