diff --git a/MainWindow.xaml b/MainWindow.xaml
index f54954b..318a0fc 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -44,7 +44,7 @@
-
+
@@ -76,37 +76,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 07d3f6d..bc6932b 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -402,6 +402,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 ConveyorCenters 的本地化字符串。
+ ///
+ public static string ConveyorCenters {
+ get {
+ return ResourceManager.GetString("ConveyorCenters", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Cooling 的本地化字符串。
///
@@ -1059,6 +1068,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Machine 的本地化字符串。
+ ///
+ public static string Machine {
+ get {
+ return ResourceManager.GetString("Machine", resourceCulture);
+ }
+ }
+
+ ///
+ /// 查找类似 MachineGroup 的本地化字符串。
+ ///
+ public static string MachineGroup {
+ get {
+ return ResourceManager.GetString("MachineGroup", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Malfunction 的本地化字符串。
///
@@ -1212,6 +1239,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 Monitor 的本地化字符串。
+ ///
+ public static string Monitor {
+ get {
+ return ResourceManager.GetString("Monitor", resourceCulture);
+ }
+ }
+
///
/// 查找类似 New 的本地化字符串。
///
@@ -1599,6 +1635,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 ProductionPlanning 的本地化字符串。
+ ///
+ public static string ProductionPlanning {
+ get {
+ return ResourceManager.GetString("ProductionPlanning", resourceCulture);
+ }
+ }
+
///
/// 查找类似 ProgramGroup 的本地化字符串。
///
@@ -2175,6 +2220,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties {
}
}
+ ///
+ /// 查找类似 USER 的本地化字符串。
+ ///
+ public static string USER {
+ get {
+ return ResourceManager.GetString("USER", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Washing 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 45a77b6..d59e532 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -867,4 +867,32 @@
Orders
+
+ USER
+
+
+
+
+
+
+
+
+
+
+
+
+ Conveyor
+
+
+ Planning
+
+
+ Monitor
+
+
+ Machine
+
+
+ MachineGroup
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index bb7fdeb..702ca84 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -867,4 +867,22 @@
orders
+
+ USER
+
+
+ Monitor
+
+
+ Machine
+
+
+ MachineGroup
+
+
+ ConveyorCenters
+
+
+ ProductionPlanning
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 1c5d0ff..c32accd 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -867,4 +867,22 @@
工单
+
+ 用户
+
+
+ 生产计划
+
+
+ 监控
+
+
+ 设备
+
+
+ 设备组
+
+
+ 输送中心
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 95a3650..2776c58 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -867,4 +867,22 @@
訂單
+
+ 使用者
+
+
+ 監測
+
+
+ 機器
+
+
+ 機器羣組
+
+
+ 生產計劃
+
+
+ 輸送中心
+
\ No newline at end of file
diff --git a/View/Whole.xaml.cs b/View/Whole.xaml.cs
index 4dfb802..b03ad22 100644
--- a/View/Whole.xaml.cs
+++ b/View/Whole.xaml.cs
@@ -42,9 +42,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
inf[i].Margin = new Thickness(5, 5, 0, 5);
inf[i].Width = 300;
inf[i].Height = 400;
- inf[i].name.Text = Selet_Machines(MainWindowViewModel.Machines, "name",i.ToString()).ToString();
+ inf[i].name.Text = Selet_Machines(MainWindowViewModel.Machines, "name",i).ToString();
- string State_ = Selet_Machines(MainWindowViewModel.Machines, "State", i.ToString()).ToString();
+ string State_ = Selet_Machines(MainWindowViewModel.Machines, "State",i).ToString();
if (State_ == "101")
{ inf[i].name.Background = new SolidColorBrush(Color.FromRgb(100, 100, 100)); }
else if (State_ == "201")
@@ -54,12 +54,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
else
{ inf[i].name.Background = new SolidColorBrush(Color.FromRgb(255, 0, 0)); }
- inf[i].temp.Text = (Selet_Machines(MainWindowViewModel.Machines, "Temperature", i.ToString()) + "°C").ToString();
- inf[i].Process.Text = Selet_Machines(MainWindowViewModel.Machines, "Process", i.ToString()).ToString();
- inf[i].Step.Text = Selet_Machines(MainWindowViewModel.Machines, "Step", i.ToString()).ToString();
- inf[i].Message.Text = Selet_Machines(MainWindowViewModel.Machines, "Message", i.ToString()).ToString();
- inf[i].Orders.Text = Selet_Machines(MainWindowViewModel.Machines, "Orders", i.ToString()).ToString();
- inf[i].time.Text = Selet_Machines(MainWindowViewModel.Machines, "time", i.ToString()).ToString();
+ inf[i].temp.Text = (Selet_Machines(MainWindowViewModel.Machines, "Temperature", i) + "°C").ToString();
+ inf[i].Process.Text = Selet_Machines(MainWindowViewModel.Machines, "Process", i).ToString();
+ inf[i].Step.Text = Selet_Machines(MainWindowViewModel.Machines, "Step", i).ToString();
+ inf[i].Message.Text = Selet_Machines(MainWindowViewModel.Machines, "Message", i).ToString();
+ inf[i].Orders.Text = Selet_Machines(MainWindowViewModel.Machines, "Orders", i).ToString();
+ inf[i].time.Text = Selet_Machines(MainWindowViewModel.Machines, "time", i).ToString();
WholeView.Children.Add(inf[i]);
}
@@ -67,13 +67,13 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
CountDown();
}
- public static object Selet_Machines(DataTable DB,string name ,string key)//查询
+ public static object Selet_Machines(DataTable DB,string name ,int key)//查询
{
try
{
lock (DB)
{
- DataRow drEmployee = DB.Select("ID=" + key).First();;
+ DataRow drEmployee = DB.Rows[key];
object index = drEmployee.Field