From 9ffb31c233f3b4891550293294c2ee716f77b42a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期日, 22 九月 2024 19:08:49 +0800
Subject: [PATCH] 完善自动匹配
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.Designer.cs | 174 ++++++++++++++++++++++++---------------------------------
1 files changed, 73 insertions(+), 101 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.Designer.cs
index eb5d8aa..6f1aa35 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/AssetsAutoMatchingMainDlg.Designer.cs
@@ -1,4 +1,4 @@
-锘縩amespace HStation.WinFrmUI.Xhs
+锘縩amespace HStation.WinFrmUI .Xhs
{
partial class AssetsAutoMatchingMainDlg
{
@@ -32,44 +32,35 @@
btnComplete = new SimpleButton();
navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame();
navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
- pumpMainChoicePage = new PumpMainChoicePage();
+ AssetsMainChoicePage = new AssetsMainChoicePage();
navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage();
- btnPrev = new SimpleButton();
- btnNext = new SimpleButton();
- btnCancel = new SimpleButton();
- simpleButton1 = new SimpleButton();
+ BtnAutoMatching = new SimpleButton();
+ simpleButton2 = new SimpleButton();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
- itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
- itemForCancel = new DevExpress.XtraLayout.LayoutControlItem();
- itemForNext = new DevExpress.XtraLayout.LayoutControlItem();
- itemForPrev = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)navigationFrame1).BeginInit();
navigationFrame1.SuspendLayout();
navigationPage1.SuspendLayout();
- navigationPage2.SuspendLayout();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)emptySpaceItem1).BeginInit();
- ((ISupportInitialize)itemForComplete).BeginInit();
- ((ISupportInitialize)itemForCancel).BeginInit();
- ((ISupportInitialize)itemForNext).BeginInit();
- ((ISupportInitialize)itemForPrev).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)itemForComplete).BeginInit();
SuspendLayout();
//
// layoutControl1
//
layoutControl1.Controls.Add(btnComplete);
layoutControl1.Controls.Add(navigationFrame1);
- layoutControl1.Controls.Add(btnPrev);
- layoutControl1.Controls.Add(btnNext);
- layoutControl1.Controls.Add(btnCancel);
- layoutControl1.Controls.Add(simpleButton1);
+ layoutControl1.Controls.Add(BtnAutoMatching);
+ layoutControl1.Controls.Add(simpleButton2);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -83,13 +74,13 @@
//
btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
btnComplete.Appearance.Options.UseBackColor = true;
- btnComplete.Location = new Point(959, 547);
+ btnComplete.Location = new Point(869, 547);
btnComplete.MaximumSize = new Size(104, 0);
btnComplete.MinimumSize = new Size(104, 0);
btnComplete.Name = "btnComplete";
btnComplete.Size = new Size(104, 22);
btnComplete.StyleController = layoutControl1;
- btnComplete.TabIndex = 6;
+ btnComplete.TabIndex = 3;
btnComplete.Text = "瀹屾垚";
btnComplete.Click += btnComplete_Click;
//
@@ -108,36 +99,51 @@
// navigationPage1
//
navigationPage1.Caption = "navigationPage1";
- navigationPage1.Controls.Add(pumpMainChoicePage);
+ navigationPage1.Controls.Add(AssetsMainChoicePage);
navigationPage1.Name = "navigationPage1";
navigationPage1.Size = new Size(1051, 505);
//
- // pumpMainChoicePage
+ // AssetsMainChoicePage
//
- pumpMainChoicePage.Dock = DockStyle.Fill;
- pumpMainChoicePage.Location = new Point(0, 0);
- pumpMainChoicePage.Name = "pumpMainChoicePage";
- pumpMainChoicePage.Size = new Size(1051, 505);
- pumpMainChoicePage.TabIndex = 0;
+ AssetsMainChoicePage.Dock = DockStyle.Fill;
+ AssetsMainChoicePage.Location = new Point(0, 0);
+ AssetsMainChoicePage.Name = "AssetsMainChoicePage";
+ AssetsMainChoicePage.Size = new Size(1051, 505);
+ AssetsMainChoicePage.TabIndex = 0;
//
- //
- //
- //
- //
- // simpleButton1
+ // navigationPage2
//
- simpleButton1.Location = new Point(12, 12);
- simpleButton1.Name = "simpleButton1";
- simpleButton1.Size = new Size(1051, 22);
- simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 7;
- simpleButton1.Text = "simpleButton1";
+ navigationPage2.Caption = "navigationPage2";
+ navigationPage2.Name = "navigationPage2";
+ navigationPage2.Size = new Size(1051, 505);
+ //
+ // BtnAutoMatching
+ //
+ BtnAutoMatching.Location = new Point(12, 12);
+ BtnAutoMatching.Name = "BtnAutoMatching";
+ BtnAutoMatching.Size = new Size(1051, 22);
+ BtnAutoMatching.StyleController = layoutControl1;
+ BtnAutoMatching.TabIndex = 0;
+ BtnAutoMatching.Text = "鑷姩鍖归厤";
+ BtnAutoMatching.Click += BtnAutoMatching_Click;
+ //
+ // simpleButton2
+ //
+ simpleButton2.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
+ simpleButton2.Appearance.Options.UseBackColor = true;
+ simpleButton2.DialogResult = DialogResult.Cancel;
+ simpleButton2.Location = new Point(977, 547);
+ simpleButton2.Name = "simpleButton2";
+ simpleButton2.Size = new Size(86, 22);
+ simpleButton2.StyleController = layoutControl1;
+ simpleButton2.TabIndex = 4;
+ simpleButton2.Text = "鍙栨秷";
//
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, emptySpaceItem1, itemForComplete, itemForCancel, itemForNext, itemForPrev, layoutControlItem3 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, emptySpaceItem1, layoutControlItem3, layoutControlItem1, itemForComplete });
Root.Name = "Root";
Root.Size = new Size(1075, 581);
Root.TextVisible = false;
@@ -156,13 +162,31 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 535);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(623, 26);
+ emptySpaceItem1.Size = new Size(857, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.Control = BtnAutoMatching;
+ layoutControlItem3.Location = new Point(0, 0);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(1055, 26);
+ layoutControlItem3.TextSize = new Size(0, 0);
+ layoutControlItem3.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.Control = simpleButton2;
+ layoutControlItem1.Location = new Point(965, 535);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(90, 26);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
//
// itemForComplete
//
itemForComplete.Control = btnComplete;
- itemForComplete.Location = new Point(947, 535);
+ itemForComplete.Location = new Point(857, 535);
itemForComplete.MaxSize = new Size(108, 26);
itemForComplete.MinSize = new Size(108, 26);
itemForComplete.Name = "itemForComplete";
@@ -170,51 +194,6 @@
itemForComplete.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
itemForComplete.TextSize = new Size(0, 0);
itemForComplete.TextVisible = false;
- //
- // itemForCancel
- //
- itemForCancel.Control = btnCancel;
- itemForCancel.Location = new Point(839, 535);
- itemForCancel.MaxSize = new Size(108, 26);
- itemForCancel.MinSize = new Size(108, 26);
- itemForCancel.Name = "itemForCancel";
- itemForCancel.Size = new Size(108, 26);
- itemForCancel.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- itemForCancel.TextSize = new Size(0, 0);
- itemForCancel.TextVisible = false;
- //
- // itemForNext
- //
- itemForNext.Control = btnNext;
- itemForNext.Location = new Point(731, 535);
- itemForNext.MaxSize = new Size(108, 26);
- itemForNext.MinSize = new Size(108, 26);
- itemForNext.Name = "itemForNext";
- itemForNext.Size = new Size(108, 26);
- itemForNext.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- itemForNext.TextSize = new Size(0, 0);
- itemForNext.TextVisible = false;
- //
- // itemForPrev
- //
- itemForPrev.Control = btnPrev;
- itemForPrev.Location = new Point(623, 535);
- itemForPrev.MaxSize = new Size(108, 26);
- itemForPrev.MinSize = new Size(108, 26);
- itemForPrev.Name = "itemForPrev";
- itemForPrev.Size = new Size(108, 26);
- itemForPrev.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- itemForPrev.TextSize = new Size(0, 0);
- itemForPrev.TextVisible = false;
- //
- // layoutControlItem3
- //
- layoutControlItem3.Control = simpleButton1;
- layoutControlItem3.Location = new Point(0, 0);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(1055, 26);
- layoutControlItem3.TextSize = new Size(0, 0);
- layoutControlItem3.TextVisible = false;
//
// AssetsAutoMatchingMainDlg
//
@@ -224,21 +203,18 @@
Controls.Add(layoutControl1);
Name = "AssetsAutoMatchingMainDlg";
StartPosition = FormStartPosition.CenterScreen;
- Text = "娉靛瀷鍙烽�夋嫨";
+ Text = "鑷姩鍖归厤";
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)navigationFrame1).EndInit();
navigationFrame1.ResumeLayout(false);
navigationPage1.ResumeLayout(false);
- navigationPage2.ResumeLayout(false);
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)emptySpaceItem1).EndInit();
- ((ISupportInitialize)itemForComplete).EndInit();
- ((ISupportInitialize)itemForCancel).EndInit();
- ((ISupportInitialize)itemForNext).EndInit();
- ((ISupportInitialize)itemForPrev).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)itemForComplete).EndInit();
ResumeLayout(false);
}
@@ -251,16 +227,12 @@
private DevExpress.XtraBars.Navigation.NavigationPage navigationPage2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.SimpleButton btnComplete;
- private DevExpress.XtraEditors.SimpleButton btnPrev;
- private DevExpress.XtraEditors.SimpleButton btnNext;
- private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraLayout.LayoutControlItem itemForComplete;
- private DevExpress.XtraLayout.LayoutControlItem itemForCancel;
- private DevExpress.XtraLayout.LayoutControlItem itemForNext;
- private DevExpress.XtraLayout.LayoutControlItem itemForPrev;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
- private PumpMainChoicePage pumpMainChoicePage;
- private SimpleButton simpleButton1;
+ private AssetsMainChoicePage AssetsMainChoicePage;
+ private SimpleButton BtnAutoMatching;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private SimpleButton simpleButton2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3