From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs
index bfeb15e..5f9e8da 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/03-factor/ViewAssetsCoolingFactorDlg.Designer.cs
@@ -42,7 +42,6 @@
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtDescription.Properties).BeginInit();
@@ -58,7 +57,6 @@
((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)emptySpaceItem1).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -90,7 +88,7 @@
//
// txtLowerLimit
//
- txtLowerLimit.Location = new Point(328, 60);
+ txtLowerLimit.Location = new Point(328, 36);
txtLowerLimit.Name = "txtLowerLimit";
txtLowerLimit.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
txtLowerLimit.Properties.DisplayFormat.FormatString = "{0}m";
@@ -103,7 +101,7 @@
txtLowerLimit.StyleController = layoutControl1;
txtLowerLimit.TabIndex = 6;
//
- // txtMinorLoss
+ // txtCoefficient
//
txtCoefficient.Location = new Point(76, 60);
txtCoefficient.Name = "txtCoefficient";
@@ -111,13 +109,13 @@
txtCoefficient.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
txtCoefficient.Properties.ReadOnly = true;
txtCoefficient.Properties.UseReadOnlyAppearance = false;
- txtCoefficient.Size = new Size(184, 20);
+ txtCoefficient.Size = new Size(437, 20);
txtCoefficient.StyleController = layoutControl1;
txtCoefficient.TabIndex = 5;
//
// txtCaliber
//
- txtCaliber.Location = new Point(328, 36);
+ txtCaliber.Location = new Point(328, 12);
txtCaliber.Name = "txtCaliber";
txtCaliber.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
txtCaliber.Properties.DisplayFormat.FormatString = "{0}mm";
@@ -130,7 +128,7 @@
txtCaliber.StyleController = layoutControl1;
txtCaliber.TabIndex = 4;
//
- // txtDN
+ // txtMaterial
//
txtMaterial.Location = new Point(76, 36);
txtMaterial.Name = "txtMaterial";
@@ -158,7 +156,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem4, layoutControlItem5, layoutControlItem2, layoutControlItem6, emptySpaceItem1 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem6, layoutControlItem4, layoutControlItem5 });
Root.Name = "Root";
Root.Size = new Size(525, 316);
Root.TextVisible = false;
@@ -175,7 +173,7 @@
// layoutControlItem3
//
layoutControlItem3.Control = txtCaliber;
- layoutControlItem3.Location = new Point(252, 24);
+ layoutControlItem3.Location = new Point(252, 0);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Size = new Size(253, 24);
layoutControlItem3.Text = "鍙ｅ緞:";
@@ -186,14 +184,14 @@
layoutControlItem4.Control = txtCoefficient;
layoutControlItem4.Location = new Point(0, 48);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(252, 24);
+ layoutControlItem4.Size = new Size(505, 24);
layoutControlItem4.Text = "娴侀噺绯绘暟:";
layoutControlItem4.TextSize = new Size(52, 14);
//
// layoutControlItem5
//
layoutControlItem5.Control = txtLowerLimit;
- layoutControlItem5.Location = new Point(252, 48);
+ layoutControlItem5.Location = new Point(252, 24);
layoutControlItem5.Name = "layoutControlItem5";
layoutControlItem5.Size = new Size(253, 24);
layoutControlItem5.Text = "鏈�灏忓帇鍔�:";
@@ -216,14 +214,6 @@
layoutControlItem6.Size = new Size(505, 224);
layoutControlItem6.Text = "璇存槑:";
layoutControlItem6.TextSize = new Size(52, 14);
- //
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(252, 0);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(253, 24);
- emptySpaceItem1.TextSize = new Size(0, 0);
//
// ViewAssetsCoolingFactorDlg
//
@@ -249,7 +239,6 @@
((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)emptySpaceItem1).EndInit();
ResumeLayout(false);
}
@@ -269,6 +258,5 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.MemoEdit txtDescription;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3