diff --git a/View/HistoryRecordsView.xaml b/View/HistoryRecordsView.xaml
index db1ae10..892b783 100644
--- a/View/HistoryRecordsView.xaml
+++ b/View/HistoryRecordsView.xaml
@@ -57,7 +57,6 @@
-
+
diff --git a/View/HistoryRecordsView.xaml.cs b/View/HistoryRecordsView.xaml.cs
index bdb5524..afd8f06 100644
--- a/View/HistoryRecordsView.xaml.cs
+++ b/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;
}
}
diff --git a/ViewModel/HistoryRecordsViewModel.cs b/ViewModel/HistoryRecordsViewModel.cs
index 5c6ad7e..39ed758 100644
--- a/ViewModel/HistoryRecordsViewModel.cs
+++ b/ViewModel/HistoryRecordsViewModel.cs
@@ -25,18 +25,13 @@ namespace DyeingComputer.ViewModel
{
public partial class HistoryRecordsViewModel : ObservableObject
{
+ //数据
+ public ISeries[] _series;
+ public ISeries[] Series { get { return _series; } set { _series = value;OnPropertyChanged(); } }
+ //x轴
+ public ICartesianAxis[] _xAxes;
+ public ICartesianAxis[] XAxes { get {return _xAxes; } set { _xAxes = value; OnPropertyChanged(); } }
- public static ISeries[] Series { get; set; }
- //x轴时间格式
- public Axis[] XAxes { get; set; } =
- {
- new DateTimeAxis(TimeSpan.FromSeconds(5) , date => date.ToString("yyyy-MM-dd HH:mm"))
- {
- CrosshairLabelsBackground = SKColors.DarkGray.AsLvcColor(),
- CrosshairLabelsPaint = new SolidColorPaint(SKColors.DarkSlateBlue, 1),
- CrosshairPaint = new SolidColorPaint(SKColors.DarkSlateGray, 1),
- },
- };
//颜色
private static readonly SKColor s_blue = new SKColor(25, 118, 210);
private static readonly SKColor s_blue_0 = new SKColor(25, 18, 210);
@@ -224,6 +219,7 @@ namespace DyeingComputer.ViewModel
STTC_values = new ObservableCollection(STTC_items);
STLC_values = new ObservableCollection(STLC_items);
}
+ //数据
Series = new ISeries[]
{
new LineSeries
@@ -348,6 +344,16 @@ namespace DyeingComputer.ViewModel
ScalesYAt = 1,
}, //附缸3 液位
};
+ //x轴时间格式
+ XAxes = new ICartesianAxis[]
+ {
+ new DateTimeAxis(TimeSpan.FromSeconds(5) , date => date.ToString("yyyy-MM-dd HH:mm"))
+ {
+ CrosshairLabelsBackground = SKColors.DarkGray.AsLvcColor(),
+ CrosshairLabelsPaint = new SolidColorPaint(SKColors.DarkSlateBlue, 1),
+ CrosshairPaint = new SolidColorPaint(SKColors.DarkSlateGray, 1),
+ },
+ };
}
}
}