From e411302bca8857e102443a5250c82b9580ef07a3 Mon Sep 17 00:00:00 2001 From: duheng <2286773002@qq.com> Date: 星期五, 28 三月 2025 10:49:48 +0800 Subject: [PATCH] 修改成套设备增加逻辑 --- WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs | 92 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 87 insertions(+), 5 deletions(-) diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs index 34ef2f3..45a2af2 100644 --- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs +++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs @@ -43,6 +43,9 @@ txtFloorHouseHolds = new DevExpress.XtraEditors.TextEdit(); txtConstantP = new DevExpress.XtraEditors.TextEdit(); textEditWaterModel = new DevExpress.XtraEditors.ImageComboBoxEdit(); + imageComboBoxConnectionType = new DevExpress.XtraEditors.ImageComboBoxEdit(); + textEditConnectionAddress = new DevExpress.XtraEditors.TextEdit(); + textEditMaxHeight = new DevExpress.XtraEditors.TextEdit(); layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); txtFlooritem = new DevExpress.XtraLayout.LayoutControlItem(); comboBoxCompletePlantitem = new DevExpress.XtraLayout.LayoutControlItem(); @@ -55,6 +58,9 @@ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components); ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).BeginInit(); FacilitiesWizardFormlayoutControl1ConvertedLayout.SuspendLayout(); @@ -70,6 +76,9 @@ ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)imageComboBoxConnectionType.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)textEditConnectionAddress.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtFlooritem).BeginInit(); ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).BeginInit(); @@ -82,6 +91,9 @@ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit(); SuspendLayout(); // @@ -98,6 +110,9 @@ FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHouseHolds); FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtConstantP); FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditWaterModel); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(imageComboBoxConnectionType); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditConnectionAddress); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditMaxHeight); FacilitiesWizardFormlayoutControl1ConvertedLayout.Dock = DockStyle.Fill; FacilitiesWizardFormlayoutControl1ConvertedLayout.Location = new Point(0, 0); FacilitiesWizardFormlayoutControl1ConvertedLayout.Margin = new Padding(3, 4, 3, 4); @@ -204,12 +219,12 @@ comboBoxWaterSupply.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; comboBoxWaterSupply.TabIndex = 3; // - // comboBoxCompletePlant + // comboBoxPackages // comboBoxPackages.Location = new Point(158, 132); comboBoxPackages.Margin = new Padding(2, 3, 2, 3); comboBoxPackages.MinimumSize = new Size(0, 36); - comboBoxPackages.Name = "comboBoxCompletePlant"; + comboBoxPackages.Name = "comboBoxPackages"; comboBoxPackages.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); comboBoxPackages.Properties.NullText = "璇烽�夋嫨"; comboBoxPackages.Size = new Size(284, 36); @@ -245,13 +260,41 @@ textEditWaterModel.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; textEditWaterModel.TabIndex = 10; // + // imageComboBoxConnectionType + // + imageComboBoxConnectionType.Location = new Point(592, 212); + imageComboBoxConnectionType.MinimumSize = new Size(0, 36); + imageComboBoxConnectionType.Name = "imageComboBoxConnectionType"; + imageComboBoxConnectionType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); + imageComboBoxConnectionType.Size = new Size(285, 36); + imageComboBoxConnectionType.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + imageComboBoxConnectionType.TabIndex = 12; + // + // textEditConnectionAddress + // + textEditConnectionAddress.Location = new Point(158, 252); + textEditConnectionAddress.MinimumSize = new Size(0, 36); + textEditConnectionAddress.Name = "textEditConnectionAddress"; + textEditConnectionAddress.Size = new Size(284, 36); + textEditConnectionAddress.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + textEditConnectionAddress.TabIndex = 13; + // + // textEditMaxHeight + // + textEditMaxHeight.Location = new Point(592, 252); + textEditMaxHeight.MinimumSize = new Size(0, 36); + textEditMaxHeight.Name = "textEditMaxHeight"; + textEditMaxHeight.Size = new Size(285, 36); + textEditMaxHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + textEditMaxHeight.TabIndex = 14; + // // layoutControlGroup1 // layoutControlGroup1.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlGroup1.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; layoutControlGroup1.GroupBordersVisible = false; - layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem }); + layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem, layoutControlItem4, layoutControlItem9, layoutControlItem10 }); layoutControlGroup1.Name = "Root"; layoutControlGroup1.Size = new Size(889, 396); layoutControlGroup1.TextVisible = false; @@ -329,7 +372,7 @@ layoutControlItem6.Control = txtConstantP; layoutControlItem6.Location = new Point(0, 200); layoutControlItem6.Name = "layoutControlItem6"; - layoutControlItem6.Size = new Size(434, 176); + layoutControlItem6.Size = new Size(434, 40); layoutControlItem6.Text = "<color=red>*</color>鎭掑畾鍘嬪姏:"; layoutControlItem6.TextSize = new Size(134, 18); // @@ -349,7 +392,7 @@ layoutControlItem7.Control = textEditWaterModel; layoutControlItem7.Location = new Point(434, 160); layoutControlItem7.Name = "layoutControlItem7"; - layoutControlItem7.Size = new Size(435, 216); + layoutControlItem7.Size = new Size(435, 40); layoutControlItem7.Text = "渚涙按妯″紡:"; layoutControlItem7.TextSize = new Size(134, 18); // @@ -373,6 +416,33 @@ txtWaterPressureitem.Text = "<color=red>*</color>鏈鍘嬪姏(m):"; txtWaterPressureitem.TextLocation = DevExpress.Utils.Locations.Left; txtWaterPressureitem.TextSize = new Size(134, 18); + // + // layoutControlItem4 + // + layoutControlItem4.Control = imageComboBoxConnectionType; + layoutControlItem4.Location = new Point(434, 200); + layoutControlItem4.Name = "layoutControlItem4"; + layoutControlItem4.Size = new Size(435, 40); + layoutControlItem4.Text = "杩炴帴绫诲瀷:"; + layoutControlItem4.TextSize = new Size(134, 18); + // + // layoutControlItem9 + // + layoutControlItem9.Control = textEditConnectionAddress; + layoutControlItem9.Location = new Point(0, 240); + layoutControlItem9.Name = "layoutControlItem9"; + layoutControlItem9.Size = new Size(434, 136); + layoutControlItem9.Text = "杩炴帴鍦板潃:"; + layoutControlItem9.TextSize = new Size(134, 18); + // + // layoutControlItem10 + // + layoutControlItem10.Control = textEditMaxHeight; + layoutControlItem10.Location = new Point(434, 240); + layoutControlItem10.Name = "layoutControlItem10"; + layoutControlItem10.Size = new Size(435, 136); + layoutControlItem10.Text = "鏈�楂樻ゼ灞傛爣楂�:"; + layoutControlItem10.TextSize = new Size(134, 18); // // dxErrorProvider1 // @@ -400,6 +470,9 @@ ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)imageComboBoxConnectionType.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)textEditConnectionAddress.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit(); ((System.ComponentModel.ISupportInitialize)txtFlooritem).EndInit(); ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).EndInit(); @@ -412,6 +485,9 @@ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit(); ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit(); ResumeLayout(false); } @@ -450,5 +526,11 @@ private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList; private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxConnectionType; + private DevExpress.XtraEditors.TextEdit textEditConnectionAddress; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraEditors.TextEdit textEditMaxHeight; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; } } -- Gitblit v1.9.3