From 80ec78f9c85466b09ac4a4101d5073c26f37021e Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 06 一月 2025 09:14:32 +0800
Subject: [PATCH] 水力计算bug修复
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs | 59 +++++++++++++++++++++--------------------------------------
1 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
index efbb59c..94c3f39 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/03-factor/AddAssetsFourlinkFactorDlg.Designer.cs
@@ -32,7 +32,7 @@
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
txtDescription = new DevExpress.XtraEditors.MemoEdit();
- txtCoefficient = new DevExpress.XtraEditors.TextEdit();
+ txtCoefficient = new DevExpress.XtraEditors.TextEdit();
txtCaliber = new DevExpress.XtraEditors.TextEdit();
txtMaterial = new DevExpress.XtraEditors.TextEdit();
txtName = new DevExpress.XtraEditors.TextEdit();
@@ -40,16 +40,14 @@
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtDescription.Properties).BeginInit();
- ((ISupportInitialize)txtCoefficient.Properties).BeginInit();
+ ((ISupportInitialize)txtCoefficient.Properties).BeginInit();
((ISupportInitialize)txtCaliber.Properties).BeginInit();
((ISupportInitialize)txtMaterial.Properties).BeginInit();
((ISupportInitialize)txtName.Properties).BeginInit();
@@ -57,10 +55,8 @@
((ISupportInitialize)layoutControlItem1).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlItem4).BeginInit();
- ((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
@@ -69,7 +65,7 @@
//
layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
layoutControl1.Controls.Add(txtDescription);
- layoutControl1.Controls.Add(txtCoefficient);
+ layoutControl1.Controls.Add(txtCoefficient);
layoutControl1.Controls.Add(txtCaliber);
layoutControl1.Controls.Add(txtMaterial);
layoutControl1.Controls.Add(txtName);
@@ -91,29 +87,29 @@
generalOkAndCancelCtrl1.Location = new Point(12, 278);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
generalOkAndCancelCtrl1.Size = new Size(501, 26);
- generalOkAndCancelCtrl1.TabIndex = 8;
+ generalOkAndCancelCtrl1.TabIndex = 6;
//
// txtDescription
//
- txtDescription.Location = new Point(83, 84);
+ txtDescription.Location = new Point(83, 60);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(430, 190);
+ txtDescription.Size = new Size(430, 214);
txtDescription.StyleController = layoutControl1;
- txtDescription.TabIndex = 7;
+ txtDescription.TabIndex = 5;
//
- // txtMinorLoss
+ // txtCoefficient
//
- txtCoefficient.Location = new Point(83, 60);
+ txtCoefficient.Location = new Point(335, 36);
txtCoefficient.Name = "txtCoefficient";
txtCoefficient.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
txtCoefficient.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtCoefficient.Size = new Size(177, 20);
+ txtCoefficient.Size = new Size(178, 20);
txtCoefficient.StyleController = layoutControl1;
- txtCoefficient.TabIndex = 5;
+ txtCoefficient.TabIndex = 4;
//
// txtCaliber
//
- txtCaliber.Location = new Point(335, 36);
+ txtCaliber.Location = new Point(335, 12);
txtCaliber.Name = "txtCaliber";
txtCaliber.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
txtCaliber.Properties.DisplayFormat.FormatString = "{0}mm";
@@ -122,7 +118,7 @@
txtCaliber.Properties.NullValuePrompt = "mm";
txtCaliber.Size = new Size(178, 20);
txtCaliber.StyleController = layoutControl1;
- txtCaliber.TabIndex = 4;
+ txtCaliber.TabIndex = 2;
//
// txtMaterial
//
@@ -148,7 +144,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, layoutControlItem7 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem6, layoutControlItem7, layoutControlItem4 });
Root.Name = "Root";
Root.Size = new Size(525, 316);
Root.TextVisible = false;
@@ -166,7 +162,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 = "鍙ｅ緞:";
@@ -176,13 +172,12 @@
//
layoutControlItem4.AllowHtmlStringInCaption = true;
layoutControlItem4.Control = txtCoefficient;
- layoutControlItem4.Location = new Point(0, 48);
+ layoutControlItem4.Location = new Point(252, 24);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(252, 24);
- layoutControlItem4.Text = "<color=red>*</color>娴侀噺绯绘暟:";
+ layoutControlItem4.Size = new Size(253, 24);
+ layoutControlItem4.Text = "<color=red>*</color>灞�闃荤郴鏁�:";
layoutControlItem4.TextSize = new Size(59, 14);
//
- //
// layoutControlItem2
//
layoutControlItem2.AllowHtmlStringInCaption = true;
@@ -196,19 +191,11 @@
// layoutControlItem6
//
layoutControlItem6.Control = txtDescription;
- layoutControlItem6.Location = new Point(0, 72);
+ layoutControlItem6.Location = new Point(0, 48);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(505, 194);
+ layoutControlItem6.Size = new Size(505, 218);
layoutControlItem6.Text = "璇存槑:";
layoutControlItem6.TextSize = new Size(59, 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);
//
// layoutControlItem7
//
@@ -235,7 +222,7 @@
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)txtDescription.Properties).EndInit();
- ((ISupportInitialize)txtCoefficient.Properties).EndInit();
+ ((ISupportInitialize)txtCoefficient.Properties).EndInit();
((ISupportInitialize)txtCaliber.Properties).EndInit();
((ISupportInitialize)txtMaterial.Properties).EndInit();
((ISupportInitialize)txtName.Properties).EndInit();
@@ -243,10 +230,8 @@
((ISupportInitialize)layoutControlItem1).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlItem4).EndInit();
- ((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
@@ -264,11 +249,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraEditors.TextEdit txtCoefficient;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
private DevExpress.XtraEditors.MemoEdit txtDescription;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
}
--
Gitblit v1.9.3