Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement

View/MachinesView.xaml.cs

@@ -147,13 +147,19 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
                 if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
                 {
+                    if (drEmployee.Field<bool>("Type"))//
+                    {//网络
                         MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
                         {
                             ID = index,
                             DAT = "SC859" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
-                        +dat_859.ToJsonString()                        
+                        + dat_859.ToJsonString()
                         });
                     }
+                    else 
+                    {//串口
+                    }
+                }
             }
         }
         private void ListViewItem_Dharmachakra(object sender, MouseButtonEventArgs e)
@@ -238,12 +244,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
                 int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                if (drEmployee.Field<bool>("Type"))//
+                {//网络
                     MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
                     {
                         ID = index,
                         DAT = "SC862" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
                     });//发送862指令修改系统设置
                 }
+                else
+                {//串口 
+                }
+            }
             SysSet_view = true;
         }
 
@@ -261,12 +273,18 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
 
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
                 int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                if (drEmployee.Field<bool>("Type"))//
+                {//网络
                     MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
                     {
                         ID = index,
-                    DAT = "SC861" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") +datagrid_v.ToJsonString()
+                        DAT = "SC861" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'") + datagrid_v.ToJsonString()
                     });//发送861指令修改程序设置
                 }
+                else 
+                {//串口
+                }
+            }
             ParameterSet_view = true;
         }
 
@@ -286,6 +304,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             if (!string.IsNullOrEmpty(machine))
             {
                 DataRow drEmployee = MainWindowViewModel.Machines.Select("NAME='" + machine + "'").First();
+
+                if (drEmployee.Field<bool>("Type"))//
+                {//网络
                     int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
                     int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
                     if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
@@ -307,7 +328,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                                 ID = index,
                                 DAT = "SC853" + MainWindowViewModel.Selet_Machines(MainWindowViewModel.Machines, "SYSKEY", "ID='" + index + "'")
                             });
-                    } else if (view==1) 
+                        }
+                        else if (view == 1)
                         {
                             MainWindowViewModel.stringQueue.Enqueue(new MainWindowViewModel.QueueString
                             {
@@ -325,6 +347,27 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                         }
                     }
                 }
+                else
+                {//串口
+                    int State_ = Convert.ToInt16(drEmployee.Field<object>("State"));
+                    int index = Convert.ToInt16(drEmployee.Field<object>("ID"));
+                    if ((State_ == 101) || (State_ == 201) || (State_ == 202) || (State_ == 309))//获得细节信息
+                    {
+                        if (view == 0)
+                        {
+                           
+                        }
+                        else if (view == 1)
+                        {
+                           
+                        }
+                        else if (view == 2)
+                        {
+                            
+                        }
+                    }
+                }
+            }
         }
 
         public void CountDown()