From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs | 93 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs
index 716f68d..963c460 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs
@@ -133,9 +133,9 @@
//
BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
BtnOk.Appearance.Options.UseBackColor = true;
- BtnOk.Location = new Point(426, 452);
+ BtnOk.Location = new Point(493, 452);
BtnOk.Name = "BtnOk";
- BtnOk.Size = new Size(122, 22);
+ BtnOk.Size = new Size(83, 22);
BtnOk.StyleController = layoutControl1;
BtnOk.TabIndex = 12;
BtnOk.Text = "瀹屾垚";
@@ -146,9 +146,9 @@
simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
simpleButton1.Appearance.Options.UseBackColor = true;
simpleButton1.DialogResult = DialogResult.Cancel;
- simpleButton1.Location = new Point(552, 452);
+ simpleButton1.Location = new Point(580, 452);
simpleButton1.Name = "simpleButton1";
- simpleButton1.Size = new Size(121, 22);
+ simpleButton1.Size = new Size(93, 22);
simpleButton1.StyleController = layoutControl1;
simpleButton1.TabIndex = 13;
simpleButton1.Text = "鍙栨秷";
@@ -157,11 +157,11 @@
//
TextEditName.Location = new Point(117, 8);
TextEditName.Name = "TextEditName";
- TextEditName.Size = new Size(556, 20);
+ TextEditName.Size = new Size(221, 20);
TextEditName.StyleController = layoutControl1;
TextEditName.TabIndex = 0;
//
- // TextEditDescription
+ // DescriptionTextEdit
//
DescriptionTextEdit.Location = new Point(20, 164);
DescriptionTextEdit.Name = "DescriptionTextEdit";
@@ -171,67 +171,67 @@
//
// TextEditErosion
//
- TextEditErosion.Location = new Point(442, 32);
+ TextEditErosion.Location = new Point(451, 56);
TextEditErosion.Name = "TextEditErosion";
- TextEditErosion.Size = new Size(231, 20);
+ TextEditErosion.Size = new Size(222, 20);
TextEditErosion.StyleController = layoutControl1;
- TextEditErosion.TabIndex = 3;
+ TextEditErosion.TabIndex = 6;
//
// TextEditRatedPower
//
TextEditRatedPower.Location = new Point(117, 104);
TextEditRatedPower.Name = "TextEditRatedPower";
- TextEditRatedPower.Size = new Size(212, 20);
+ TextEditRatedPower.Size = new Size(556, 20);
TextEditRatedPower.StyleController = layoutControl1;
- TextEditRatedPower.TabIndex = 8;
+ TextEditRatedPower.TabIndex = 9;
//
// TextEditRatedeffciency
//
- TextEditRatedeffciency.Location = new Point(442, 56);
+ TextEditRatedeffciency.Location = new Point(451, 8);
TextEditRatedeffciency.Name = "TextEditRatedeffciency";
- TextEditRatedeffciency.Size = new Size(231, 20);
+ TextEditRatedeffciency.Size = new Size(222, 20);
TextEditRatedeffciency.StyleController = layoutControl1;
- TextEditRatedeffciency.TabIndex = 5;
+ TextEditRatedeffciency.TabIndex = 2;
//
// TextEditD2
//
- TextEditD2.Location = new Point(442, 80);
+ TextEditD2.Location = new Point(451, 32);
TextEditD2.Name = "TextEditD2";
- TextEditD2.Size = new Size(231, 20);
+ TextEditD2.Size = new Size(222, 20);
TextEditD2.StyleController = layoutControl1;
- TextEditD2.TabIndex = 7;
+ TextEditD2.TabIndex = 4;
//
// TextEditTagName
//
- TextEditTagName.Location = new Point(442, 104);
+ TextEditTagName.Location = new Point(451, 80);
TextEditTagName.Name = "TextEditTagName";
- TextEditTagName.Size = new Size(231, 20);
+ TextEditTagName.Size = new Size(222, 20);
TextEditTagName.StyleController = layoutControl1;
- TextEditTagName.TabIndex = 9;
+ TextEditTagName.TabIndex = 8;
//
// TextEditRatedHead
//
TextEditRatedHead.Location = new Point(117, 80);
TextEditRatedHead.Name = "TextEditRatedHead";
- TextEditRatedHead.Size = new Size(212, 20);
+ TextEditRatedHead.Size = new Size(221, 20);
TextEditRatedHead.StyleController = layoutControl1;
- TextEditRatedHead.TabIndex = 6;
+ TextEditRatedHead.TabIndex = 7;
//
// TextEditRatedFlow
//
TextEditRatedFlow.Location = new Point(117, 32);
TextEditRatedFlow.Name = "TextEditRatedFlow";
- TextEditRatedFlow.Size = new Size(212, 20);
+ TextEditRatedFlow.Size = new Size(221, 20);
TextEditRatedFlow.StyleController = layoutControl1;
- TextEditRatedFlow.TabIndex = 2;
+ TextEditRatedFlow.TabIndex = 3;
//
// TextEditRatedSpeed
//
TextEditRatedSpeed.Location = new Point(117, 56);
TextEditRatedSpeed.Name = "TextEditRatedSpeed";
- TextEditRatedSpeed.Size = new Size(212, 20);
+ TextEditRatedSpeed.Size = new Size(221, 20);
TextEditRatedSpeed.StyleController = layoutControl1;
- TextEditRatedSpeed.TabIndex = 4;
+ TextEditRatedSpeed.TabIndex = 5;
//
// Root
//
@@ -239,7 +239,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[] { layoutControlItem2, layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem7, tabbedControlGroup1, layoutControlItem1, layoutControlItem10, layoutControlItem11, layoutControlItem9, layoutControlItem12, layoutControlItem6, layoutControlItem3 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem3, layoutControlItem7, layoutControlItem10, layoutControlItem12, layoutControlItem9, layoutControlItem11, layoutControlItem6 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -251,16 +251,16 @@
layoutControlItem2.Control = TextEditRatedSpeed;
layoutControlItem2.Location = new Point(0, 48);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(325, 24);
+ layoutControlItem2.Size = new Size(334, 24);
layoutControlItem2.Text = "<color=red>*</color>棰濆畾杞��:";
layoutControlItem2.TextSize = new Size(97, 14);
//
// layoutControlItem4
//
layoutControlItem4.Control = BtnOk;
- layoutControlItem4.Location = new Point(418, 444);
+ layoutControlItem4.Location = new Point(485, 444);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(126, 26);
+ layoutControlItem4.Size = new Size(87, 26);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
//
@@ -269,15 +269,15 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 444);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(418, 26);
+ emptySpaceItem1.Size = new Size(485, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem8
//
layoutControlItem8.Control = simpleButton1;
- layoutControlItem8.Location = new Point(544, 444);
+ layoutControlItem8.Location = new Point(572, 444);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(125, 26);
+ layoutControlItem8.Size = new Size(97, 26);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
@@ -287,7 +287,7 @@
layoutControlItem7.Control = TextEditRatedHead;
layoutControlItem7.Location = new Point(0, 72);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(325, 24);
+ layoutControlItem7.Size = new Size(334, 24);
layoutControlItem7.Text = "<color=red>*</color>棰濆畾鎵▼(m):";
layoutControlItem7.TextSize = new Size(97, 14);
//
@@ -326,7 +326,7 @@
layoutControlItem1.Control = TextEditName;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(669, 24);
+ layoutControlItem1.Size = new Size(334, 24);
layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem1.TextSize = new Size(97, 14);
//
@@ -336,43 +336,44 @@
layoutControlItem10.Control = TextEditRatedPower;
layoutControlItem10.Location = new Point(0, 96);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(325, 24);
+ layoutControlItem10.Size = new Size(669, 24);
layoutControlItem10.Text = "<color=red>*</color>棰濆畾鍔熺巼:";
layoutControlItem10.TextSize = new Size(97, 14);
//
// layoutControlItem11
//
layoutControlItem11.Control = TextEditErosion;
- layoutControlItem11.Location = new Point(325, 24);
+ layoutControlItem11.Location = new Point(334, 48);
layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(344, 24);
+ layoutControlItem11.Size = new Size(335, 24);
layoutControlItem11.Text = "姘旇殌:";
layoutControlItem11.TextSize = new Size(97, 14);
//
// layoutControlItem9
//
+ layoutControlItem9.AllowHtmlStringInCaption = true;
layoutControlItem9.Control = TextEditRatedeffciency;
- layoutControlItem9.Location = new Point(325, 48);
+ layoutControlItem9.Location = new Point(334, 0);
layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(344, 24);
- layoutControlItem9.Text = "棰濆畾鏁堢巼:";
+ layoutControlItem9.Size = new Size(335, 24);
+ layoutControlItem9.Text = "<color=red>*</color>棰濆畾鏁堢巼:";
layoutControlItem9.TextSize = new Size(97, 14);
//
// layoutControlItem12
//
layoutControlItem12.Control = TextEditD2;
- layoutControlItem12.Location = new Point(325, 72);
+ layoutControlItem12.Location = new Point(334, 24);
layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(344, 24);
+ layoutControlItem12.Size = new Size(335, 24);
layoutControlItem12.Text = "鍙惰疆澶栧緞(mm):";
layoutControlItem12.TextSize = new Size(97, 14);
//
// layoutControlItem6
//
layoutControlItem6.Control = TextEditTagName;
- layoutControlItem6.Location = new Point(325, 96);
+ layoutControlItem6.Location = new Point(334, 72);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(344, 24);
+ layoutControlItem6.Size = new Size(335, 24);
layoutControlItem6.Text = "鏍囩鍚嶇О:";
layoutControlItem6.TextSize = new Size(97, 14);
//
@@ -382,7 +383,7 @@
layoutControlItem3.Control = TextEditRatedFlow;
layoutControlItem3.Location = new Point(0, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(325, 24);
+ layoutControlItem3.Size = new Size(334, 24);
layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺(m鲁/h):";
layoutControlItem3.TextSize = new Size(97, 14);
//
--
Gitblit v1.9.3