Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

View/QueryView.xaml

@@ -1,13 +1,13 @@
-<Page x:Class="Audit.View.QueryView"
+<UserControl x:Class="Audit.View.QueryView"           
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       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=Query}"
+      d:DesignHeight="900" d:DesignWidth="1100">
 
     <Grid>
         <TextBlock Text="QueryView" FontSize="100"/>
     </Grid>
-</Page>
+</UserControl>

View/QueryView.xaml.cs

@@ -18,7 +18,7 @@ namespace Audit.View
     /// <summary>
     /// QueryView.xaml 的交互逻辑
     /// </summary>
-    public partial class QueryView : Page
+    public partial class QueryView : UserControl
     {
         ///<Summary>
         /// QueryView

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">
     <Grid>
-        <TextBlock Text="StatisticsViewModel" FontSize="100"/>
+        <TextBlock Text="StatisticsView" FontSize="100"/>
     </Grid>
 </UserControl>

View/StatisticsView.xaml.cs

@@ -20,9 +20,6 @@ namespace Audit.View
     /// </summary>
     public partial class StatisticsView : UserControl
     {
-        ///<Summary>
-        /// StatisticsView
-        ///</Summary>
         public StatisticsView()
         {
             InitializeComponent();