diff --git a/MainWindow.xaml b/MainWindow.xaml index 4dfe322..ff20e98 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -106,8 +106,8 @@ - - + + @@ -116,5 +116,10 @@ + + + + + \ No newline at end of file diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 3336077..ebc4cbf 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -1,4 +1,6 @@ -using MahApps.Metro.Controls; +using Audit.View; +using Audit.ViewModel; +using MahApps.Metro.Controls; using System; using System.Collections.Generic; using System.Linq; @@ -31,7 +33,6 @@ namespace Audit private void TimePicker_SelectedDateTimeChanged(object sender, RoutedPropertyChangedEventArgs e) { - } private void exit(object sender, RoutedEventArgs e) @@ -44,5 +45,18 @@ namespace Audit Windows.help help= new Windows.help(); help.Show();//实例化并打开帮助窗口 } + + private void RadioButton_Checked(object sender, RoutedEventArgs e) + { + if (!(sender is RadioButton button)) return; + if (string.IsNullOrEmpty(button.Content.ToString())) return; + switch (button.Content.ToString()) + { + case "查询": container.Content = new QueryView(); break; + case "统计": container.Content = new StatisticsView(); break; + default: + break; + } + } } } diff --git a/View/QueryView.xaml b/View/QueryView.xaml index f6507df..d52e7bc 100644 --- a/View/QueryView.xaml +++ b/View/QueryView.xaml @@ -1,13 +1,13 @@ - + mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Query}" + d:DesignHeight="900" d:DesignWidth="1100"> - + diff --git a/View/QueryView.xaml.cs b/View/QueryView.xaml.cs index 07c449d..312db45 100644 --- a/View/QueryView.xaml.cs +++ b/View/QueryView.xaml.cs @@ -18,7 +18,7 @@ namespace Audit.View /// /// QueryView.xaml 的交互逻辑 /// - public partial class QueryView : Page + public partial class QueryView : UserControl { /// /// QueryView diff --git a/View/StatisticsView.xaml b/View/StatisticsView.xaml index ff2fe68..65e134a 100644 --- a/View/StatisticsView.xaml +++ b/View/StatisticsView.xaml @@ -4,9 +4,9 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Audit.View" - mc:Ignorable="d" - d:DesignHeight="450" d:DesignWidth="800"> + mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Statistics}" + d:DesignHeight="900" d:DesignWidth="1000"> - + diff --git a/View/StatisticsView.xaml.cs b/View/StatisticsView.xaml.cs index 6cac792..a7de1fb 100644 --- a/View/StatisticsView.xaml.cs +++ b/View/StatisticsView.xaml.cs @@ -20,9 +20,6 @@ namespace Audit.View /// public partial class StatisticsView : UserControl { - /// - /// StatisticsView - /// public StatisticsView() { InitializeComponent(); diff --git a/ViewModel/StatisticsViewModel.cs b/ViewModel/StatisticsViewModel.cs index a670f3b..cc7313c 100644 --- a/ViewModel/StatisticsViewModel.cs +++ b/ViewModel/StatisticsViewModel.cs @@ -6,6 +6,9 @@ using System.Threading.Tasks; namespace Audit.ViewModel { + /// + /// StatisticsViewModel + /// public class StatisticsViewModel { }