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

SunlightCentralizedControlManagement_SCCM_.csproj

@@ -114,11 +114,15 @@
     <Compile Include="ControlUse\Timeline\obj\x64\Debug\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs" />
     <Compile Include="ControlUse\Timeline\Processor\BarChartProcessor.cs" />
     <Compile Include="ControlUse\Timeline\Properties\AssemblyInfo.cs" />
-    <Compile Include="ControlUse\Timeline\Timeline.cs" />
+    <Compile Include="ControlUse\Timeline\Timeline.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="ControlUse\Timeline\Timeline.Designer.cs">
       <DependentUpon>Timeline.cs</DependentUpon>
     </Compile>
-    <Compile Include="ControlUse\Timeline\TimelineChart.cs" />
+    <Compile Include="ControlUse\Timeline\TimelineChart.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="ControlUse\Timeline\TimelineChart.Designer.cs">
       <DependentUpon>TimelineChart.cs</DependentUpon>
     </Compile>

ViewModel/ProductionPlanningModel.cs

@@ -38,7 +38,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
     public partial class ProductionPlanningModel : ObservableObject//ViewModelBase
     {
         //x轴时间格式
-        public Axis[] XAxes { get; set; } =
+     /*   public Axis[] XAxes { get; set; } =
         {
             new DateTimeAxis(TimeSpan.FromSeconds(5) , date => date.ToString("yyyy-MM-dd HH:mm"))
             {
@@ -91,7 +91,7 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel
             };
         }
 
-        public ISeries[] Series { get; set; } 
+        public ISeries[] Series { get; set; } */
 
     }
 }