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

View/ProductionPlanningView.xaml

@@ -26,8 +26,8 @@
         <Grid Grid.Row="0">
          <!-- <lvc:CartesianChart x:Name="ch" XAxes="{Binding XAxes}" YAxes="{Binding YAxes}" Series="{Binding Series}" />-->
 
-            <wfi:WindowsFormsHost>
-                <UserTimeline:Timeline Name="Q"/>
+            <wfi:WindowsFormsHost >
+                <UserTimeline:TimelineChart Name="Timeline"/>
             </wfi:WindowsFormsHost>
         </Grid>
         <StackPanel x:Name="scr" Grid.Row="1" Height="60" Background="#FF00204E" Orientation="Horizontal">            

View/ProductionPlanningView.xaml.cs

@@ -79,6 +79,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
                 }
             }
 
+           
+          //  var dfg = new TimelineChart(); 
+          //  qwe.Child = dfg.ShowBarChart(startDate, endDate, testList);
            // timeline1.ShowBarChart(startDate, endDate, testList);
         }