修复绑定错误 - ValveStatus统一 + DatePicker改用DateTimeOffset

src/YZWater.Avalonia/Controls/ValveControl.cs

@@ -3,30 +3,10 @@ using Avalonia.Controls;
 using Avalonia.Media;
 using System;
 using System.Globalization;
+using YZWater.Core.ViewModels;
 
 namespace YZWater.Avalonia.Controls;
 
-/// <summary>
-/// 阀门状态枚举
-/// </summary>
-public enum ValveStatus
-{
-    /// <summary>
-    /// 关闭
-    /// </summary>
-    Closed,
-
-    /// <summary>
-    /// 中间位置
-    /// </summary>
-    Middle,
-
-    /// <summary>
-    /// 打开
-    /// </summary>
-    Open
-}
-
 /// <summary>
 /// 阀门控件 - 模拟 HslSwitch
 /// </summary>

src/YZWater.Core/ViewModels/ViewCViewModel.cs

@@ -29,10 +29,10 @@ public partial class ViewCViewModel : ObservableObject
     private Axis[] _yAxes;
 
     [ObservableProperty]
-    private DateTime? _startDate = DateTime.Now.AddDays(-7);
+    private DateTimeOffset? _startDate = DateTimeOffset.Now.AddDays(-7);
 
     [ObservableProperty]
-    private DateTime? _endDate = DateTime.Now;
+    private DateTimeOffset? _endDate = DateTimeOffset.Now;
 
     [ObservableProperty]
     private List<FlowRecord> _flowRecords = new();
@@ -98,8 +98,8 @@ public partial class ViewCViewModel : ObservableObject
     {
         try
         {
-            var start = StartDate ?? DateTime.Now.AddDays(-7);
-            var end = EndDate ?? DateTime.Now;
+            var start = StartDate?.DateTime ?? DateTime.Now.AddDays(-7);
+            var end = EndDate?.DateTime ?? DateTime.Now;
             var records = await DatabaseService.Db.Select<FlowRecord>()
                 .Where(r => r.RecordTime >= start && r.RecordTime <= end)
                 .OrderByDescending(r => r.RecordTime)

src/YZWater.Core/ViewModels/ViewDViewModel.cs

@@ -21,10 +21,10 @@ public partial class ViewDViewModel : ObservableObject
     private int _unconfirmedCount;
 
     [ObservableProperty]
-    private DateTime? _startDate = DateTime.Now.AddDays(-7);
+    private DateTimeOffset? _startDate = DateTimeOffset.Now.AddDays(-7);
 
     [ObservableProperty]
-    private DateTime? _endDate = DateTime.Now;
+    private DateTimeOffset? _endDate = DateTimeOffset.Now;
 
     [ObservableProperty]
     private string _filterType = "全部";
@@ -42,8 +42,8 @@ public partial class ViewDViewModel : ObservableObject
     {
         try
         {
-            var start = StartDate ?? DateTime.Now.AddDays(-7);
-            var end = EndDate ?? DateTime.Now;
+            var start = StartDate?.DateTime ?? DateTime.Now.AddDays(-7);
+            var end = EndDate?.DateTime ?? DateTime.Now;
             var query = DatabaseService.Db.Select<AlarmRecord>()
                 .Where(r => r.AlarmTime >= start && r.AlarmTime <= end);