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

View/QueryView.xaml

@@ -5,9 +5,14 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:Audit.View"
       mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Query}"
-      d:DesignHeight="900" d:DesignWidth="1100">
+      d:DesignHeight="900" d:DesignWidth="1100" BorderBrush="Black" Background="White">
 
     <Grid>
-        <TextBlock Text="QueryView" FontSize="100"/>
+        <DataGrid HorizontalAlignment="Left" Height="645" Margin="30,200,0,0" VerticalAlignment="Top" Width="220" d:ItemsSource="{d:SampleData ItemCount=200}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="Black" VerticalGridLinesBrush="Black" GridLinesVisibility="All" SelectionChanged="DataGrid_SelectionChanged">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="单号" Width="150" FontSize="25" />
+                <DataGridTextColumn Header="染机" Width="70" FontSize="25"/>
+            </DataGrid.Columns>
+        </DataGrid>
     </Grid>
 </UserControl>

View/QueryView.xaml.cs

@@ -27,5 +27,10 @@ namespace Audit.View
         {
             InitializeComponent();
         }
+
+        private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+
+        }
     }
 }