修改成型机界面显示数据少一行的问题

shangjian/XGL/Views/LanJu_InOut.xaml

@@ -6,7 +6,8 @@
     xmlns:local="clr-namespace:XGL.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:convert="clr-namespace:XGL.Tools"
     Width="1920"
-    MinHeight="330"
+    MinHeight="230" 
+    Height="290"
     mc:Ignorable="d" Loaded="UserControl_Loaded">
     <UserControl.Resources>
         <Style x:Key="CustomCellStyle" TargetType="DataGridCell">
@@ -28,21 +29,20 @@
             </Style.Triggers>
         </Style>
     </UserControl.Resources>
-    <Viewbox Stretch="Fill">
-        <Canvas
+    <!--<Viewbox Stretch="Fill">-->
+        <!--<Canvas
             Width="1920"
             MinHeight="330"
-            Background="#F2F3F5">
+                  Height="430"
+            Background="#F2F3F5">-->
             <Grid
-                Width="1920"
-                Height="330"
+                Width="1920" 
                 Margin="0"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center">
                 <DataGrid
                     x:Name="dgInOutRecord"
-                    Width="1870"
-                    MinHeight="330"
+                    Width="1870" 
                     Margin="0"
                     CellStyle="{StaticResource CustomCellStyle}"
                     HorizontalAlignment="Center"
@@ -93,6 +93,6 @@
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>
-        </Canvas>
-    </Viewbox>
+        <!--</Canvas>-->
+    <!--</Viewbox>-->
 </UserControl>

shangjian/XGL/Views/LanJu_Operator.xaml

@@ -528,14 +528,15 @@
 
         <Grid
                     Grid.Row="3"
-                    Grid.ColumnSpan="9" 
-                    MinHeight="330"
-                    Margin="0"
+                    Grid.ColumnSpan="9"  
+                    Margin="0" 
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"> 
             <ContentControl
                         x:Name="Window1"
                         Grid.ColumnSpan="2"
+                  MinHeight="290" 
+                  
                         Width="1920"
                        />
 

shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DFF00B4A6E4CE0008A5434520F8E0D43EE84982D77CA80307B94AA9684B8DAC8"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "325B96D3783AA376BCFFB09CF1A1BF4A942CDB070392C7AE48449FF9B3008D41"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -43,7 +43,7 @@ namespace XGL.Views {
     public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 43 "..\..\..\..\Views\LanJu_InOut.xaml"
+        #line 45 "..\..\..\..\Views\LanJu_InOut.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgInOutRecord;
         
@@ -82,7 +82,7 @@ namespace XGL.Views {
             {
             case 1:
             
-            #line 10 "..\..\..\..\Views\LanJu_InOut.xaml"
+            #line 11 "..\..\..\..\Views\LanJu_InOut.xaml"
             ((XGL.Views.LanJu_InOut)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded);
             
             #line default
@@ -91,7 +91,7 @@ namespace XGL.Views {
             case 2:
             this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 55 "..\..\..\..\Views\LanJu_InOut.xaml"
+            #line 58 "..\..\..\..\Views\LanJu_InOut.xaml"
             this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
             
             #line default

shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "DFF00B4A6E4CE0008A5434520F8E0D43EE84982D77CA80307B94AA9684B8DAC8"
+#pragma checksum "..\..\..\..\Views\LanJu_InOut.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "325B96D3783AA376BCFFB09CF1A1BF4A942CDB070392C7AE48449FF9B3008D41"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -43,7 +43,7 @@ namespace XGL.Views {
     public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 43 "..\..\..\..\Views\LanJu_InOut.xaml"
+        #line 45 "..\..\..\..\Views\LanJu_InOut.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgInOutRecord;
         
@@ -82,7 +82,7 @@ namespace XGL.Views {
             {
             case 1:
             
-            #line 10 "..\..\..\..\Views\LanJu_InOut.xaml"
+            #line 11 "..\..\..\..\Views\LanJu_InOut.xaml"
             ((XGL.Views.LanJu_InOut)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded);
             
             #line default
@@ -91,7 +91,7 @@ namespace XGL.Views {
             case 2:
             this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 55 "..\..\..\..\Views\LanJu_InOut.xaml"
+            #line 58 "..\..\..\..\Views\LanJu_InOut.xaml"
             this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
             
             #line default