From 2d708bbf140368fe4191293fffc140e808471111 Mon Sep 17 00:00:00 2001
From: zhaoaomin <18366680202@163.com>
Date: Wed, 25 Oct 2023 11:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=9E=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E5=B0=91?=
 =?UTF-8?q?=E4=B8=80=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shangjian/.vs/BL/v17/.suo                     | Bin 1100800 -> 1100800 bytes
 shangjian/XGL/Views/LanJu_InOut.xaml          |  20 +++++++++---------
 shangjian/XGL/Views/LanJu_Operator.xaml       |   7 +++---
 .../XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs  |   8 +++----
 .../obj/x86/Debug/Views/LanJu_InOut.g.i.cs    |   8 +++----
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/shangjian/.vs/BL/v17/.suo b/shangjian/.vs/BL/v17/.suo
index 2b02b45657ac8ed10117605168a4a0b7b8c3a07c..757005703ee1026a7d341ca85cac96992fac966c 100644
GIT binary patch
delta 8996
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
K8LmsN2mTEXhCCJk

delta 8337
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
NvMjB3fFZkU{u>ytEA9XQ

diff --git a/shangjian/XGL/Views/LanJu_InOut.xaml b/shangjian/XGL/Views/LanJu_InOut.xaml
index c9e6bf2..34640fa 100644
--- a/shangjian/XGL/Views/LanJu_InOut.xaml
+++ b/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>
diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml b/shangjian/XGL/Views/LanJu_Operator.xaml
index 1e0fe35..abd207e 100644
--- a/shangjian/XGL/Views/LanJu_Operator.xaml
+++ b/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"
                        />
 
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
index d4d6cfd..3b77cf9 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
+++ b/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
diff --git a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs b/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
index d4d6cfd..3b77cf9 100644
--- a/shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
+++ b/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