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

View/CurveView.xaml

@@ -107,16 +107,9 @@
                 <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Binding="{Binding Remark}" Width="500" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-        
-        <lvc:CartesianChart x:Name="OscChart" MinWidth="400" MinHeight="300" EasingFunction="{x:Null}"                   
-                            Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="0,500,300,60">
-            <lvc:CartesianChart.Style>
-                <Style TargetType="{x:Type lvc:CartesianChart}">
-                    <Setter Property="ZoomMode" Value="PanX"/>
-                    <Setter Property="ZoomMode" Value="ZoomX"/>
-                </Style>
-            </lvc:CartesianChart.Style>
-        </lvc:CartesianChart>
+
+        <lvc:CartesianChart x:Name="OscChart" MinWidth="400" MinHeight="300" EasingFunction="{x:Null}" ZoomMode="X"                  
+                            Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="0,500,300,60"/>
 
         <StackPanel x:Name="s1cr" VerticalAlignment="Bottom" Height="60" Background="#FF00204E" Orientation="Horizontal">
             <ListView ScrollViewer.HorizontalScrollBarVisibility="Disabled" Foreground="#FF1368BD">

View/CurveView.xaml.cs

@@ -65,6 +65,8 @@ namespace SunlightCentralizedControlManagement_SCCM_.View
             Griddata.ItemsSource = MainWindowViewModel.Machines.DefaultView;
 
             Sdatepicker.Text = DateTime.Now.ToString("yyyy/MM/dd");
+
+            CurveDiagramViewModel.Curve("738891980000");
         }
 
         private void WorkOrderNumder_Click(object sender, RoutedEventArgs e)