Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
c797d21a34
7 files changed
+160
-24
No files matched your search
+17
-17
@@ -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<object>(name);
|
||||
return index;
|
||||
}
|
||||
@@ -98,7 +98,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
|
||||
{
|
||||
for (int i = 0; i < MainWindowViewModel.Machines.Rows.Count; i++)
|
||||
{
|
||||
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")
|
||||
@@ -108,12 +108,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();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user