diff --git a/View/ActionPage.xaml b/View/ActionPage.xaml index b38a19e..71b3a21 100644 --- a/View/ActionPage.xaml +++ b/View/ActionPage.xaml @@ -8,6 +8,13 @@ Loaded="UserControl_Loaded" d:DesignHeight="720" d:DesignWidth="1080"> - + diff --git a/View/ActionPage.xaml.cs b/View/ActionPage.xaml.cs index 522a5ca..79e6556 100644 --- a/View/ActionPage.xaml.cs +++ b/View/ActionPage.xaml.cs @@ -1,5 +1,8 @@ -using System; +using SunlightAggregationManager.UserClass; +using SunlightAggregationManager.ViewModel; +using System; using System.Collections.Generic; +using System.Data; using System.Text; using System.Windows; using System.Windows.Controls; @@ -25,7 +28,9 @@ namespace SunlightAggregationManager.View private void UserControl_Loaded(object sender, RoutedEventArgs e) { - + var data =MainWindowViewModel.SQLiteHelpers.ExecuteDataSet( + "select * from ActionLog order by Time DESC", null)?.Tables[0] ?? new DataTable(); + CurrentData.ItemsSource=data.AsDataView(); } } }