Yangwl
/
lanju-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
zhaoaomin 2 years ago
parent 1d650f187d
commit 2d708bbf14
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File

BIN
shangjian/.vs/BL/v17/.suo
View File

Binary file not shown.

20
shangjian/XGL/Views/LanJu_InOut.xaml
Unescape Escape View File

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

7
shangjian/XGL/Views/LanJu_Operator.xaml
Unescape Escape View File

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

8
shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.cs
Unescape Escape View File

@ -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> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -43,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { 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")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgInOutRecord; internal System.Windows.Controls.DataGrid dgInOutRecord;
@ -82,7 +82,7 @@ namespace XGL.Views {
{ {
case 1: 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); ((XGL.Views.LanJu_InOut)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded);
#line default #line default
@ -91,7 +91,7 @@ namespace XGL.Views {
case 2: case 2:
this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target)); 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); this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
#line default #line default

8
shangjian/XGL/obj/x86/Debug/Views/LanJu_InOut.g.i.cs
Unescape Escape View File

@ -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> // <auto-generated>
// 此代码由工具生成。 // 此代码由工具生成。
@ -43,7 +43,7 @@ namespace XGL.Views {
public partial class LanJu_InOut : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector { 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")] [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.DataGrid dgInOutRecord; internal System.Windows.Controls.DataGrid dgInOutRecord;
@ -82,7 +82,7 @@ namespace XGL.Views {
{ {
case 1: 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); ((XGL.Views.LanJu_InOut)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserControl_Loaded);
#line default #line default
@ -91,7 +91,7 @@ namespace XGL.Views {
case 2: case 2:
this.dgInOutRecord = ((System.Windows.Controls.DataGrid)(target)); 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); this.dgInOutRecord.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgInOutRecord_LoadingRow);
#line default #line default

Write Preview
Loading…
Cancel
Save