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

View/HistoryRecordsView.xaml

@@ -57,7 +57,6 @@
                 <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Width="*" Binding="{Binding Remark}" IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-        <lvc:CartesianChart Margin="0,300,0,0" x:Name="chart"
-                     Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
+        <lvc:CartesianChart Margin="0,300,0,0" x:Name="chart" Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
     </Grid>
 </UserControl>

View/HistoryRecordsView.xaml.cs

@@ -52,7 +52,6 @@ namespace DyeingComputer.View
                 HistoryRecordsViewModel.stime = (gridH.Columns[5].GetCellContent(gridH.Items[rownum]) as TextBlock).Text;//定位第1列，
                 HistoryRecordsViewModel.etime = (gridH.Columns[6].GetCellContent(gridH.Items[rownum]) as TextBlock).Text;//定位第6列    
                 HistoryRecordsViewModel.history_ = true;
-               // chart.Series = HistoryRecordsViewModel.Series;
             }
         }