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

ViewModel/MainWindowViewModel.cs

@@ -191,7 +191,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
         }
 
         public static TcpClient[] MachiensTcpClient = new TcpClient[999];
-        public DataRow[] machinesdata = new DataRow[999];
+        public static DataRow[] machinesdata = new DataRow[999];
         public int Machinesdata_Count;
         public void TcpClientNEW()
         {

ViewModel/ProductionPlanningModel.cs

@@ -37,8 +37,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
 {
     public partial class ProductionPlanningModel : ObservableObject//ViewModelBase
     {
-        //x轴时间格式
-     /*   public Axis[] XAxes { get; set; } =
+        //x轴时间格式    
+        public Axis[] XAxes { get; set; } =
         {
             new DateTimeAxis(TimeSpan.FromSeconds(5) , date => date.ToString("yyyy-MM-dd HH:mm"))
             {
@@ -46,8 +46,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                 CrosshairLabelsPaint = new SolidColorPaint(SKColors.DarkSlateBlue, 1),
                 CrosshairPaint = new SolidColorPaint(SKColors.DarkSlateGray, 1),
             },
-         };
-               
+         };               
         public Axis[] YAxes { get; set; } =
         {          
            new Axis
@@ -55,8 +54,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
                MinLimit = 0,      
              //  TextSize = 20,
                LabelsDensity = 1,
-               Labels = MainWindowViewModel.Machines.AsEnumerable().Select(row=> row.Field<string>("name")).ToList(),//转换列名为机台          
-
+              Labels = MainWindowViewModel.Machines.AsEnumerable().Select(row=> row.Field<string>("name")).ToList(),//转换列名为机台          
+ 
            }
         };
 
@@ -91,7 +90,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             };
         }
 
-        public ISeries[] Series { get; set; } */
+        public ISeries[] Series { get; set; } 
 
     }
 }