From a5b25c4f314079d293bf159ed6f0d7dcbadadbb7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 10:46:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/report/SimulationCommonReport.Designer.cs | 37 +++++++------------------------------
1 files changed, 7 insertions(+), 30 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/report/SimulationCommonReport.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/report/SimulationCommonReport.Designer.cs
index 807d293..a1c87bf 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/report/SimulationCommonReport.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/report/SimulationCommonReport.Designer.cs
@@ -31,47 +31,22 @@
this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
- this.labCorp = new DevExpress.XtraReports.UI.XRLabel();
- this.pageCurrentNum = new DevExpress.XtraReports.UI.XRPageInfo();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// TopMargin
//
- this.TopMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.labCorp});
+ this.TopMargin.HeightF = 50F;
this.TopMargin.Name = "TopMargin";
//
// BottomMargin
//
- this.BottomMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.pageCurrentNum});
+ this.BottomMargin.HeightF = 50F;
this.BottomMargin.Name = "BottomMargin";
//
// Detail
//
+ this.Detail.HeightF = 684.375F;
this.Detail.Name = "Detail";
- //
- // labCorp
- //
- this.labCorp.LocationFloat = new DevExpress.Utils.PointFloat(404.5833F, 65.95834F);
- this.labCorp.Multiline = true;
- this.labCorp.Name = "labCorp";
- this.labCorp.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
- this.labCorp.SizeF = new System.Drawing.SizeF(235.4166F, 24.04166F);
- this.labCorp.StylePriority.UseTextAlignment = false;
- this.labCorp.Text = "鏉窞绉戠淮鑺傝兘鎶�鏈偂浠芥湁闄愬叕鍙� ";
- this.labCorp.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // pageCurrentNum
- //
- this.pageCurrentNum.LocationFloat = new DevExpress.Utils.PointFloat(539.9999F, 10.00001F);
- this.pageCurrentNum.Name = "pageCurrentNum";
- this.pageCurrentNum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
- this.pageCurrentNum.PageInfo = DevExpress.XtraPrinting.PageInfo.Number;
- this.pageCurrentNum.SizeF = new System.Drawing.SizeF(100F, 23F);
- this.pageCurrentNum.StylePriority.UseTextAlignment = false;
- this.pageCurrentNum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.pageCurrentNum.TextFormatString = "绗瑊0}椤�";
//
// SimulationCommonReport
//
@@ -80,6 +55,10 @@
this.BottomMargin,
this.Detail});
this.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
+ this.Margins = new DevExpress.Drawing.DXMargins(50F, 50F, 50F, 50F);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -90,7 +69,5 @@
private DevExpress.XtraReports.UI.TopMarginBand TopMargin;
private DevExpress.XtraReports.UI.BottomMarginBand BottomMargin;
private DevExpress.XtraReports.UI.DetailBand Detail;
- private DevExpress.XtraReports.UI.XRLabel labCorp;
- private DevExpress.XtraReports.UI.XRPageInfo pageCurrentNum;
}
}
--
Gitblit v1.9.3