diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj
index b0244c6..8f2a7fb 100644
--- a/DyeingComputer.csproj
+++ b/DyeingComputer.csproj
@@ -292,6 +292,7 @@
PublicResXFileCodeGenerator
Resources.Designer.cs
+ Designer
PublicResXFileCodeGenerator
@@ -403,6 +404,11 @@
+
+
+
+
+
diff --git a/Lmage/inf.png b/Lmage/inf.png
new file mode 100644
index 0000000..166d910
Binary files /dev/null and b/Lmage/inf.png differ
diff --git a/Lmage/start.png b/Lmage/start.png
new file mode 100644
index 0000000..889ed92
Binary files /dev/null and b/Lmage/start.png differ
diff --git a/Lmage/start2.png b/Lmage/start2.png
new file mode 100644
index 0000000..00749ac
Binary files /dev/null and b/Lmage/start2.png differ
diff --git a/Lmage/start3.png b/Lmage/start3.png
new file mode 100644
index 0000000..68b2ede
Binary files /dev/null and b/Lmage/start3.png differ
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 68e1b02..5c468ed 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -105,6 +105,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Amount 的本地化字符串。
+ ///
+ public static string Amount {
+ get {
+ return ResourceManager.GetString("Amount", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Auto 的本地化字符串。
///
@@ -447,6 +456,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Grams 的本地化字符串。
+ ///
+ public static string Grams {
+ get {
+ return ResourceManager.GetString("Grams", resourceCulture);
+ }
+ }
+
///
/// 查找类似 GuidingWheel 的本地化字符串。
///
@@ -519,6 +537,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 inf 的本地化字符串。
+ ///
+ public static string inf {
+ get {
+ return ResourceManager.GetString("inf", resourceCulture);
+ }
+ }
+
///
/// 查找类似 I/O 的本地化字符串。
///
@@ -843,6 +870,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 ProductCode 的本地化字符串。
+ ///
+ public static string ProductCode {
+ get {
+ return ResourceManager.GetString("ProductCode", resourceCulture);
+ }
+ }
+
///
/// 查找类似 ProgramGroup 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index d89421e..59f23fc 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -505,9 +505,21 @@
Swing
-
+ CylinderBottom
Jump
+
+ ProductCode
+
+
+ Grams
+
+
+ Amount
+
+
+ Information
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 74de88f..8d47791 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -510,4 +510,16 @@
Jump
+
+ ProductCode
+
+
+ Grams
+
+
+ Amount
+
+
+ inf
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 8849d06..5a3995a 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -510,4 +510,16 @@
跳步
+
+ 原料代码
+
+
+ 目标 g
+
+
+ 实际
+
+
+ 信息
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index cb72bda..a0908f8 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -505,9 +505,21 @@
擺佈
-
+ 缸底
-
+ 跳步
+
+
+ 原料代碼
+
+
+ 目標g
+
+
+ 實際
+
+
+ 信息
\ No newline at end of file
diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml
index 7a71224..4832ddf 100644
--- a/View/WorkOrderView.xaml
+++ b/View/WorkOrderView.xaml
@@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
xmlns:local="clr-namespace:DyeingComputer.View"
+ xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF"
xmlns:lang="clr-namespace:DyeingComputer.Properties"
xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel"
xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
@@ -19,13 +20,17 @@
-
-
-
-
+
+
+
+
-
+
@@ -78,12 +83,24 @@
-
-
-
+
+
-
+
+
+
+
+
+
diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs
index 83c5aa5..7f7b3d5 100644
--- a/View/WorkOrderView.xaml.cs
+++ b/View/WorkOrderView.xaml.cs
@@ -129,8 +129,6 @@ namespace DyeingComputer.View
- var _mainWindow = Application.Current.Windows.Cast().FirstOrDefault(window => window is MainWindow) as MainWindow;//跨页面
- _mainWindow.container.Content = new TechnologicalProcessView();//获取控件
}
private void WorkOrderView_del_Click(object sender, RoutedEventArgs e)//删除按钮
{
@@ -224,6 +222,9 @@ namespace DyeingComputer.View
}
}
+ private void start_Click(object sender, RoutedEventArgs e)
+ {
+ }
}
}
diff --git a/View/start2.png b/View/start2.png
new file mode 100644
index 0000000..00749ac
Binary files /dev/null and b/View/start2.png differ