From af5eeb8797d88e142410a9e82e84291355e7c336 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期三, 02 四月 2025 17:01:57 +0800
Subject: [PATCH] --成套设备曲线增加 --用水当量逻辑改变
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/PackageManageMainPage.Designer.cs | 128 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 47 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/PackageManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/PackageManageMainPage.Designer.cs
index 454fe55..c1c2969 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/PackageManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/PackageManageMainPage.Designer.cs
@@ -28,8 +28,8 @@
/// </summary>
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PackageManageMainPage));
+ components = new Container();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(PackageManageMainPage));
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -59,23 +59,22 @@
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colEquipmentCount = new DevExpress.XtraGrid.Columns.GridColumn();
- colUseCount = new DevExpress.XtraGrid.Columns.GridColumn();
colNO = new DevExpress.XtraGrid.Columns.GridColumn();
colManufacturer = new DevExpress.XtraGrid.Columns.GridColumn();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
EquipmentTreeListCtrl1 = new PackageTreeListCtrl();
- ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
+ ((ISupportInitialize)ribbonControl1).BeginInit();
+ ((ISupportInitialize)svgImageCollection1).BeginInit();
sidePanel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)gridControl2).BeginInit();
- ((System.ComponentModel.ISupportInitialize)equipmentViewModelBindingSource1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)gridView2).BeginInit();
- ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)kitViewModelBindingSource).BeginInit();
- ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
+ ((ISupportInitialize)gridControl2).BeginInit();
+ ((ISupportInitialize)equipmentViewModelBindingSource1).BeginInit();
+ ((ISupportInitialize)gridView2).BeginInit();
+ ((ISupportInitialize)gridControl1).BeginInit();
+ ((ISupportInitialize)kitViewModelBindingSource).BeginInit();
+ ((ISupportInitialize)gridView1).BeginInit();
+ ((ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
dockPanel1_Container.SuspendLayout();
SuspendLayout();
@@ -83,18 +82,21 @@
// ribbonControl1
//
ribbonControl1.DrawGroupsBorderMode = DevExpress.Utils.DefaultBoolean.True;
+ ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, BtnAdd, BtnEdit, BtnDelete, BarBtnEidtPumpPart, BarBtnEidtProp });
ribbonControl1.Location = new Point(0, 0);
+ ribbonControl1.Margin = new Padding(3, 4, 3, 4);
ribbonControl1.MaxItemId = 26;
ribbonControl1.Name = "ribbonControl1";
+ ribbonControl1.OptionsMenuMinWidth = 377;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
ribbonControl1.ShowPageHeadersInFormCaption = DevExpress.Utils.DefaultBoolean.True;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
- ribbonControl1.Size = new Size(690, 101);
+ ribbonControl1.Size = new Size(788, 157);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// BtnAdd
@@ -154,6 +156,7 @@
//
ribbonPageGroup2.Name = "ribbonPageGroup2";
ribbonPageGroup2.Text = "鏇村";
+ ribbonPageGroup2.Visible = false;
//
// svgImageCollection1
//
@@ -165,9 +168,10 @@
sidePanel1.Controls.Add(gridControl1);
sidePanel1.Controls.Add(ribbonControl1);
sidePanel1.Dock = DockStyle.Fill;
- sidePanel1.Location = new Point(200, 0);
+ sidePanel1.Location = new Point(229, 0);
+ sidePanel1.Margin = new Padding(3, 4, 3, 4);
sidePanel1.Name = "sidePanel1";
- sidePanel1.Size = new Size(690, 520);
+ sidePanel1.Size = new Size(788, 669);
sidePanel1.TabIndex = 2;
sidePanel1.Text = "sidePanel1";
//
@@ -175,11 +179,13 @@
//
gridControl2.DataSource = equipmentViewModelBindingSource1;
gridControl2.Dock = DockStyle.Fill;
- gridControl2.Location = new Point(0, 326);
+ gridControl2.EmbeddedNavigator.Margin = new Padding(3, 4, 3, 4);
+ gridControl2.Location = new Point(0, 446);
gridControl2.MainView = gridView2;
+ gridControl2.Margin = new Padding(3, 4, 3, 4);
gridControl2.MenuManager = ribbonControl1;
gridControl2.Name = "gridControl2";
- gridControl2.Size = new Size(690, 194);
+ gridControl2.Size = new Size(788, 223);
gridControl2.TabIndex = 7;
gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView2 });
//
@@ -192,89 +198,111 @@
gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView2.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colEquipmentCount1, colName1, colRatedEfficiency, colRatedFlow, colRatedHead, colRatedSpeed, colRatedPower, colErosion, colOtherName });
+ gridView2.DetailHeight = 450;
gridView2.GridControl = gridControl2;
gridView2.Name = "gridView2";
+ gridView2.OptionsEditForm.PopupEditFormWidth = 914;
gridView2.OptionsView.ShowGroupPanel = false;
gridView2.CellValueChanged += gridView2_CellValueChanged;
//
// colEquipmentCount1
//
colEquipmentCount1.FieldName = "ID";
+ colEquipmentCount1.MinWidth = 23;
colEquipmentCount1.Name = "colEquipmentCount1";
+ colEquipmentCount1.Width = 86;
//
// colName1
//
colName1.FieldName = "Name";
+ colName1.MinWidth = 23;
colName1.Name = "colName1";
colName1.Visible = true;
colName1.VisibleIndex = 0;
+ colName1.Width = 86;
//
// colRatedEfficiency
//
colRatedEfficiency.FieldName = "RatedEfficiency";
+ colRatedEfficiency.MinWidth = 23;
colRatedEfficiency.Name = "colRatedEfficiency";
colRatedEfficiency.OptionsColumn.AllowEdit = false;
colRatedEfficiency.OptionsColumn.AllowFocus = false;
colRatedEfficiency.Visible = true;
colRatedEfficiency.VisibleIndex = 2;
+ colRatedEfficiency.Width = 86;
//
// colRatedFlow
//
colRatedFlow.FieldName = "RatedFlow";
+ colRatedFlow.MinWidth = 23;
colRatedFlow.Name = "colRatedFlow";
colRatedFlow.OptionsColumn.AllowFocus = false;
colRatedFlow.Visible = true;
colRatedFlow.VisibleIndex = 3;
+ colRatedFlow.Width = 86;
//
// colRatedHead
//
colRatedHead.FieldName = "RatedHead";
+ colRatedHead.MinWidth = 23;
colRatedHead.Name = "colRatedHead";
colRatedHead.OptionsColumn.AllowEdit = false;
colRatedHead.Visible = true;
colRatedHead.VisibleIndex = 4;
+ colRatedHead.Width = 86;
//
// colRatedSpeed
//
colRatedSpeed.FieldName = "RatedSpeed";
+ colRatedSpeed.MinWidth = 23;
colRatedSpeed.Name = "colRatedSpeed";
colRatedSpeed.OptionsColumn.AllowEdit = false;
colRatedSpeed.Visible = true;
colRatedSpeed.VisibleIndex = 5;
+ colRatedSpeed.Width = 86;
//
// colRatedPower
//
colRatedPower.FieldName = "RatedPower";
+ colRatedPower.MinWidth = 23;
colRatedPower.Name = "colRatedPower";
colRatedPower.OptionsColumn.AllowEdit = false;
colRatedPower.Visible = true;
colRatedPower.VisibleIndex = 6;
+ colRatedPower.Width = 86;
//
// colErosion
//
colErosion.FieldName = "Erosion";
+ colErosion.MinWidth = 23;
colErosion.Name = "colErosion";
colErosion.OptionsColumn.AllowEdit = false;
colErosion.Visible = true;
colErosion.VisibleIndex = 7;
+ colErosion.Width = 86;
//
// colOtherName
//
colOtherName.FieldName = "OtherName";
+ colOtherName.MinWidth = 23;
colOtherName.Name = "colOtherName";
colOtherName.OptionsColumn.AllowEdit = false;
colOtherName.Visible = true;
colOtherName.VisibleIndex = 1;
+ colOtherName.Width = 86;
//
// gridControl1
//
gridControl1.DataSource = kitViewModelBindingSource;
gridControl1.Dock = DockStyle.Top;
- gridControl1.Location = new Point(0, 101);
+ gridControl1.EmbeddedNavigator.Margin = new Padding(3, 4, 3, 4);
+ gridControl1.Location = new Point(0, 157);
gridControl1.MainView = gridView1;
+ gridControl1.Margin = new Padding(3, 4, 3, 4);
gridControl1.MenuManager = ribbonControl1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(690, 225);
+ gridControl1.Size = new Size(788, 289);
gridControl1.TabIndex = 6;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -287,9 +315,11 @@
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colDescription, colEquipmentCount, colUseCount, colNO, colManufacturer });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colDescription, colEquipmentCount, colNO, colManufacturer });
+ gridView1.DetailHeight = 450;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
+ gridView1.OptionsEditForm.PopupEditFormWidth = 914;
gridView1.OptionsView.ShowGroupPanel = false;
gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
//
@@ -298,48 +328,49 @@
colName.AppearanceCell.Options.UseTextOptions = true;
colName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colName.FieldName = "Name";
+ colName.MinWidth = 23;
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 192;
+ colName.Width = 219;
//
// colDescription
//
colDescription.AppearanceCell.Options.UseTextOptions = true;
colDescription.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
colDescription.FieldName = "Description";
+ colDescription.MinWidth = 23;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 5;
- colDescription.Width = 222;
+ colDescription.VisibleIndex = 4;
+ colDescription.Width = 254;
//
// colEquipmentCount
//
- colEquipmentCount.FieldName = "EquipmentCount";
+ colEquipmentCount.FieldName = "UseCount";
+ colEquipmentCount.MinWidth = 23;
colEquipmentCount.Name = "colEquipmentCount";
colEquipmentCount.Visible = true;
colEquipmentCount.VisibleIndex = 3;
- //
- // colUseCount
- //
- colUseCount.FieldName = "UseCount";
- colUseCount.Name = "colUseCount";
- colUseCount.Visible = true;
- colUseCount.VisibleIndex = 4;
+ colEquipmentCount.Width = 86;
//
// colNO
//
colNO.FieldName = "NO";
+ colNO.MinWidth = 23;
colNO.Name = "colNO";
colNO.Visible = true;
colNO.VisibleIndex = 2;
+ colNO.Width = 86;
//
// colManufacturer
//
colManufacturer.FieldName = "Manufacturer";
+ colManufacturer.MinWidth = 23;
colManufacturer.Name = "colManufacturer";
colManufacturer.Visible = true;
colManufacturer.VisibleIndex = 1;
+ colManufacturer.Width = 86;
//
// dockManager1
//
@@ -355,17 +386,19 @@
dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left;
dockPanel1.ID = new Guid("5c79babb-4f43-4086-8e5b-a9593219e048");
dockPanel1.Location = new Point(0, 0);
+ dockPanel1.Margin = new Padding(3, 4, 3, 4);
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(200, 200);
- dockPanel1.Size = new Size(200, 520);
+ dockPanel1.Size = new Size(229, 669);
dockPanel1.Text = "鎴愬璁惧绯诲垪";
//
// dockPanel1_Container
//
dockPanel1_Container.Controls.Add(EquipmentTreeListCtrl1);
- dockPanel1_Container.Location = new Point(3, 26);
+ dockPanel1_Container.Location = new Point(4, 32);
+ dockPanel1_Container.Margin = new Padding(3, 4, 3, 4);
dockPanel1_Container.Name = "dockPanel1_Container";
- dockPanel1_Container.Size = new Size(193, 491);
+ dockPanel1_Container.Size = new Size(219, 633);
dockPanel1_Container.TabIndex = 0;
//
// EquipmentTreeListCtrl1
@@ -374,31 +407,33 @@
EquipmentTreeListCtrl1.Appearance.Options.UseBackColor = true;
EquipmentTreeListCtrl1.Dock = DockStyle.Fill;
EquipmentTreeListCtrl1.Location = new Point(0, 0);
+ EquipmentTreeListCtrl1.Margin = new Padding(3, 5, 3, 5);
EquipmentTreeListCtrl1.Name = "EquipmentTreeListCtrl1";
- EquipmentTreeListCtrl1.Size = new Size(193, 491);
+ EquipmentTreeListCtrl1.Size = new Size(219, 633);
EquipmentTreeListCtrl1.TabIndex = 0;
//
// PackageManageMainPage
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(sidePanel1);
Controls.Add(dockPanel1);
+ Margin = new Padding(3, 5, 3, 5);
Name = "PackageManageMainPage";
- Size = new Size(890, 520);
- ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
- ((System.ComponentModel.ISupportInitialize)svgImageCollection1).EndInit();
+ Size = new Size(1017, 669);
+ ((ISupportInitialize)ribbonControl1).EndInit();
+ ((ISupportInitialize)svgImageCollection1).EndInit();
sidePanel1.ResumeLayout(false);
sidePanel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)gridControl2).EndInit();
- ((System.ComponentModel.ISupportInitialize)equipmentViewModelBindingSource1).EndInit();
- ((System.ComponentModel.ISupportInitialize)gridView2).EndInit();
- ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
- ((System.ComponentModel.ISupportInitialize)kitViewModelBindingSource).EndInit();
- ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
- ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
+ ((ISupportInitialize)gridControl2).EndInit();
+ ((ISupportInitialize)equipmentViewModelBindingSource1).EndInit();
+ ((ISupportInitialize)gridView2).EndInit();
+ ((ISupportInitialize)gridControl1).EndInit();
+ ((ISupportInitialize)kitViewModelBindingSource).EndInit();
+ ((ISupportInitialize)gridView1).EndInit();
+ ((ISupportInitialize)dockManager1).EndInit();
dockPanel1.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
ResumeLayout(false);
@@ -429,7 +464,6 @@
private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
private DevExpress.XtraGrid.Columns.GridColumn colEquipmentCount;
- private DevExpress.XtraGrid.Columns.GridColumn colUseCount;
private DevExpress.XtraGrid.Columns.GridColumn colNO;
private BindingSource equipmentViewModelBindingSource1;
private BindingSource kitViewModelBindingSource;
--
Gitblit v1.9.3