duheng
2024-11-11 b10f8e0a7cdd4fcfb92b011091ec39c1024eee33
Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
已修改7个文件
934 ■■■■ 文件已修改
Hydro/Yw.Hydro.Core/ParseHelper.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.Designer.cs 581 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.cs 261 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.resx 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.resx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Hydro/Yw.Hydro.Core/ParseHelper.cs
@@ -419,6 +419,10 @@
                                        var point2dList = curveol.CurveData.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
                                        var ptCurveOL = new Yw.Geometry.CubicSpline2d(point2dList);
                                        valveModel.ValveSetting = ptCurveOL.GetPointY(valve.OpeningDegree).ToString();
                                        if (valve.OpeningDegree > 0)
                                        {
                                            valveModel.LinkStatus = Yw.EPAnet.ValveStatus.None;
                                        }
                                    }
                                }
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.Designer.cs
@@ -35,6 +35,11 @@
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            EditorButtonImageOptions editorButtonImageOptions2 = new EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            setSchemeParterRecordBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -47,10 +52,8 @@
            colDelete = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
            barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
            barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
            barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            repositoryItemTextEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
            repositoryItemTextEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
            sidePanel3dModel = new SidePanel();
            tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
            tabPagePump = new DevExpress.XtraBars.Navigation.TabNavigationPage();
@@ -67,18 +70,50 @@
            colAfterValue = new DevExpress.XtraGrid.Columns.GridColumn();
            colBeforeValue = new DevExpress.XtraGrid.Columns.GridColumn();
            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
            dockPanelMenu = new DevExpress.XtraBars.Docking.DockPanel();
            controlContainer1 = new DevExpress.XtraBars.Docking.ControlContainer();
            layoutControl3 = new DevExpress.XtraLayout.LayoutControl();
            buttonEdit = new ButtonEdit();
            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            dockPanel5 = new DevExpress.XtraBars.Docking.DockPanel();
            dockPanelChangeRecord = new DevExpress.XtraBars.Docking.DockPanel();
            dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
            dockPanelChangeRecordItem = new DevExpress.XtraBars.Docking.DockPanel();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            dockPanelScheme = new DevExpress.XtraBars.Docking.DockPanel();
            dockPanel3_Container = new DevExpress.XtraBars.Docking.ControlContainer();
            layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
            setFlagsEditCtrl1 = new SetFlagsEditCtrl();
            imgCmbSchemeType = new ImageComboBoxEdit();
            txtNo = new TextEdit();
            txtName = new TextEdit();
            btnSave = new SimpleButton();
            memoDescription = new MemoEdit();
            layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            dockPanelParterList = new DevExpress.XtraBars.Docking.DockPanel();
            dockPanel2_Container = new DevExpress.XtraBars.Docking.ControlContainer();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)setSchemeParterRecordBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((ISupportInitialize)ribbon).BeginInit();
            ((ISupportInitialize)repositoryItemTextEdit1).BeginInit();
            ((ISupportInitialize)repositoryItemTextEdit2).BeginInit();
            ((ISupportInitialize)tabPane1).BeginInit();
            tabPane1.SuspendLayout();
            tabPagePump.SuspendLayout();
@@ -88,25 +123,55 @@
            ((ISupportInitialize)setSchemeParterRecordItemBindingSource).BeginInit();
            ((ISupportInitialize)gridView2).BeginInit();
            ((ISupportInitialize)dockManager1).BeginInit();
            dockPanelMenu.SuspendLayout();
            controlContainer1.SuspendLayout();
            ((ISupportInitialize)layoutControl3).BeginInit();
            layoutControl3.SuspendLayout();
            ((ISupportInitialize)buttonEdit.Properties).BeginInit();
            ((ISupportInitialize)layoutControlGroup4).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            dockPanel5.SuspendLayout();
            dockPanelChangeRecord.SuspendLayout();
            dockPanel1_Container.SuspendLayout();
            dockPanelChangeRecordItem.SuspendLayout();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)Root).BeginInit();
            ((ISupportInitialize)layoutControlGroup1).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlGroup2).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            dockPanelScheme.SuspendLayout();
            dockPanel3_Container.SuspendLayout();
            ((ISupportInitialize)layoutControl2).BeginInit();
            layoutControl2.SuspendLayout();
            ((ISupportInitialize)imgCmbSchemeType.Properties).BeginInit();
            ((ISupportInitialize)txtNo.Properties).BeginInit();
            ((ISupportInitialize)txtName.Properties).BeginInit();
            ((ISupportInitialize)memoDescription.Properties).BeginInit();
            ((ISupportInitialize)layoutControlGroup3).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)layoutControlItem13).BeginInit();
            ((ISupportInitialize)layoutControlItem14).BeginInit();
            ((ISupportInitialize)layoutControlItem12).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)layoutControlItem11).BeginInit();
            dockPanelParterList.SuspendLayout();
            dockPanel2_Container.SuspendLayout();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)layoutControlItem9).BeginInit();
            ((ISupportInitialize)layoutControlItem10).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
            // 
            gridControl1.DataSource = setSchemeParterRecordBindingSource;
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.Location = new Point(0, 0);
            gridControl1.Location = new Point(0, 33);
            gridControl1.MainView = gridView1;
            gridControl1.MenuManager = ribbon;
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(369, 431);
            gridControl1.Size = new Size(393, 421);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -195,18 +260,18 @@
            // 
            ribbon.ExpandCollapseItem.Id = 0;
            ribbon.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem, barButtonItem1, barButtonItem2, barButtonItem3 });
            ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem });
            ribbon.Location = new Point(0, 0);
            ribbon.MaxItemId = 10;
            ribbon.MaxItemId = 19;
            ribbon.Name = "ribbon";
            ribbon.OptionsExpandCollapseMenu.EnableExpandCollapseMenu = DevExpress.Utils.DefaultBoolean.False;
            ribbon.OptionsExpandCollapseMenu.ShowQuickAccessToolbarItem = DevExpress.Utils.DefaultBoolean.False;
            ribbon.OptionsExpandCollapseMenu.ShowRibbonGroup = DevExpress.Utils.DefaultBoolean.False;
            ribbon.OptionsExpandCollapseMenu.ShowRibbonLayoutGroup = DevExpress.Utils.DefaultBoolean.False;
            ribbon.OptionsTouch.TouchUI = DevExpress.Utils.DefaultBoolean.False;
            ribbon.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbon.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemTextEdit1, repositoryItemTextEdit2 });
            ribbon.RibbonCaptionAlignment = DevExpress.XtraBars.Ribbon.RibbonCaptionAlignment.Left;
            ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice;
            ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.TabletOffice;
            ribbon.SearchItemPosition = DevExpress.XtraBars.Ribbon.SearchItemPosition.None;
            ribbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
            ribbon.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.False;
@@ -216,38 +281,25 @@
            ribbon.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
            ribbon.ShowQatLocationSelector = false;
            ribbon.ShowToolbarCustomizeItem = false;
            ribbon.Size = new Size(1569, 174);
            ribbon.Size = new Size(1569, 48);
            ribbon.Toolbar.ShowCustomizeItem = false;
            // 
            // barButtonItem1
            // repositoryItemTextEdit1
            // 
            barButtonItem1.Caption = "barButtonItem1";
            barButtonItem1.Id = 7;
            barButtonItem1.Name = "barButtonItem1";
            repositoryItemTextEdit1.AutoHeight = false;
            repositoryItemTextEdit1.Name = "repositoryItemTextEdit1";
            // 
            // barButtonItem2
            // repositoryItemTextEdit2
            // 
            barButtonItem2.Caption = "barButtonItem2";
            barButtonItem2.Id = 8;
            barButtonItem2.Name = "barButtonItem2";
            //
            // barButtonItem3
            //
            barButtonItem3.Caption = "barButtonItem3";
            barButtonItem3.Id = 9;
            barButtonItem3.Name = "barButtonItem3";
            //
            // ribbonPage1
            //
            ribbonPage1.Name = "ribbonPage1";
            ribbonPage1.Text = "ribbonPage1";
            repositoryItemTextEdit2.AutoHeight = false;
            repositoryItemTextEdit2.Name = "repositoryItemTextEdit2";
            // 
            // sidePanel3dModel
            // 
            sidePanel3dModel.Dock = DockStyle.Fill;
            sidePanel3dModel.Location = new Point(0, 174);
            sidePanel3dModel.Location = new Point(0, 142);
            sidePanel3dModel.Name = "sidePanel3dModel";
            sidePanel3dModel.Size = new Size(1199, 583);
            sidePanel3dModel.Size = new Size(1175, 615);
            sidePanel3dModel.TabIndex = 2;
            sidePanel3dModel.Text = "sidePanel2";
            // 
@@ -260,9 +312,9 @@
            tabPane1.Location = new Point(0, 0);
            tabPane1.Name = "tabPane1";
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPagePump, tabPageValve, tabPagePipe });
            tabPane1.RegularSize = new Size(1199, 312);
            tabPane1.RegularSize = new Size(1175, 312);
            tabPane1.SelectedPage = tabPagePump;
            tabPane1.Size = new Size(1199, 312);
            tabPane1.Size = new Size(1175, 312);
            tabPane1.TabIndex = 0;
            tabPane1.Text = "tabPane1";
            // 
@@ -271,7 +323,7 @@
            tabPagePump.Caption = "水泵";
            tabPagePump.Controls.Add(setSchemePumpListCtrl1);
            tabPagePump.Name = "tabPagePump";
            tabPagePump.Size = new Size(1199, 263);
            tabPagePump.Size = new Size(1175, 263);
            // 
            // setSchemePumpListCtrl1
            // 
@@ -279,7 +331,7 @@
            setSchemePumpListCtrl1.Location = new Point(0, 0);
            setSchemePumpListCtrl1.Margin = new Padding(4, 5, 4, 5);
            setSchemePumpListCtrl1.Name = "setSchemePumpListCtrl1";
            setSchemePumpListCtrl1.Size = new Size(1199, 263);
            setSchemePumpListCtrl1.Size = new Size(1175, 263);
            setSchemePumpListCtrl1.TabIndex = 0;
            // 
            // tabPageValve
@@ -316,25 +368,23 @@
            // 
            // panelContainer1
            // 
            panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
            panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
            panelContainer1.DockedAsTabbedDocument = true;
            panelContainer1.ID = new Guid("69c11a8a-862c-4240-930a-ff3d90593b2b");
            panelContainer1.Location = new Point(0, 0);
            panelContainer1.Name = "panelContainer1";
            panelContainer1.OriginalSize = new Size(200, 200);
            panelContainer1.Size = new Size(1526, 527);
            panelContainer1.TabsPosition = DevExpress.XtraBars.Docking.TabsPosition.Top;
            panelContainer1.Size = new Size(200, 200);
            panelContainer1.Text = "panelContainer1";
            // 
            // gridControl2
            // 
            gridControl2.DataSource = setSchemeParterRecordItemBindingSource;
            gridControl2.Dock = DockStyle.Fill;
            gridControl2.Location = new Point(0, 0);
            gridControl2.Location = new Point(0, 487);
            gridControl2.MainView = gridView2;
            gridControl2.MenuManager = ribbon;
            gridControl2.Name = "gridControl2";
            gridControl2.Size = new Size(369, 430);
            gridControl2.Size = new Size(393, 230);
            gridControl2.TabIndex = 0;
            gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView2 });
            // 
@@ -384,20 +434,96 @@
            dockManager1.DockingOptions.ShowMaximizeButton = false;
            dockManager1.DockingOptions.ShowMinimizeButton = false;
            dockManager1.Form = this;
            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel5, dockPanelParterList });
            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanelMenu, dockPanel5, dockPanelParterList });
            dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
            dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
            //
            // dockPanelMenu
            //
            dockPanelMenu.Controls.Add(controlContainer1);
            dockPanelMenu.Dock = DevExpress.XtraBars.Docking.DockingStyle.Top;
            dockPanelMenu.FloatVertical = true;
            dockPanelMenu.ID = new Guid("1bb3525e-4915-41ae-84bf-f32262890542");
            dockPanelMenu.Location = new Point(0, 48);
            dockPanelMenu.Name = "dockPanelMenu";
            dockPanelMenu.OriginalSize = new Size(200, 94);
            dockPanelMenu.Size = new Size(1569, 94);
            dockPanelMenu.Text = "菜单";
            //
            // controlContainer1
            //
            controlContainer1.Controls.Add(layoutControl3);
            controlContainer1.Location = new Point(0, 34);
            controlContainer1.Name = "controlContainer1";
            controlContainer1.Size = new Size(1569, 59);
            controlContainer1.TabIndex = 0;
            //
            // layoutControl3
            //
            layoutControl3.Controls.Add(buttonEdit);
            layoutControl3.Dock = DockStyle.Fill;
            layoutControl3.Location = new Point(0, 0);
            layoutControl3.Name = "layoutControl3";
            layoutControl3.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(724, 181, 975, 600);
            layoutControl3.Root = layoutControlGroup4;
            layoutControl3.Size = new Size(1569, 59);
            layoutControl3.TabIndex = 0;
            layoutControl3.Text = "layoutControl3";
            //
            // buttonEdit
            //
            buttonEdit.Location = new Point(12, 12);
            buttonEdit.MenuManager = ribbon;
            buttonEdit.Name = "buttonEdit";
            editorButtonImageOptions2.Location = ImageLocation.MiddleLeft;
            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
            editorButtonImageOptions2.SvgImageSize = new Size(18, 18);
            buttonEdit.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "一键显隐", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", "showhide", null, DevExpress.Utils.ToolTipAnchor.Default) });
            buttonEdit.Properties.TextEditStyle = TextEditStyles.HideTextEditor;
            buttonEdit.Size = new Size(144, 37);
            buttonEdit.StyleController = layoutControl3;
            buttonEdit.TabIndex = 0;
            buttonEdit.ButtonClick += buttonEdit_ButtonClick;
            //
            // layoutControlGroup4
            //
            layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            layoutControlGroup4.GroupBordersVisible = false;
            layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem6, emptySpaceItem1 });
            layoutControlGroup4.Name = "Root";
            layoutControlGroup4.Size = new Size(1543, 61);
            layoutControlGroup4.TextVisible = false;
            //
            // layoutControlItem6
            //
            layoutControlItem6.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
            layoutControlItem6.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem6.Control = buttonEdit;
            layoutControlItem6.HighlightFocusedItem = DevExpress.Utils.DefaultBoolean.False;
            layoutControlItem6.Location = new Point(0, 0);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(148, 41);
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            //
            // emptySpaceItem1
            //
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(148, 0);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(1375, 41);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // dockPanel5
            // 
            dockPanel5.Controls.Add(dockPanelChangeRecord);
            dockPanel5.Controls.Add(dockPanelChangeRecordItem);
            dockPanel5.Controls.Add(dockPanelScheme);
            dockPanel5.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
            dockPanel5.ID = new Guid("4f9140be-dc44-4cc6-9924-d22c117f4a97");
            dockPanel5.Location = new Point(1199, 174);
            dockPanel5.Location = new Point(1175, 142);
            dockPanel5.Name = "dockPanel5";
            dockPanel5.OriginalSize = new Size(370, 200);
            dockPanel5.Size = new Size(370, 930);
            dockPanel5.OriginalSize = new Size(394, 200);
            dockPanel5.Size = new Size(394, 962);
            dockPanel5.Text = "panelContainer1";
            // 
            // dockPanelChangeRecord
@@ -407,36 +533,259 @@
            dockPanelChangeRecord.ID = new Guid("2c97b548-e9c5-4899-b8e1-203e6decf6f7");
            dockPanelChangeRecord.Location = new Point(0, 0);
            dockPanelChangeRecord.Name = "dockPanelChangeRecord";
            dockPanelChangeRecord.OriginalSize = new Size(370, 245);
            dockPanelChangeRecord.Size = new Size(370, 465);
            dockPanelChangeRecord.Text = "变更记录列表";
            dockPanelChangeRecord.OriginalSize = new Size(394, 309);
            dockPanelChangeRecord.Size = new Size(394, 751);
            dockPanelChangeRecord.Text = "变更记录";
            // 
            // dockPanel1_Container
            // 
            dockPanel1_Container.Controls.Add(gridControl1);
            dockPanel1_Container.Controls.Add(layoutControl1);
            dockPanel1_Container.Location = new Point(1, 34);
            dockPanel1_Container.Name = "dockPanel1_Container";
            dockPanel1_Container.Size = new Size(369, 431);
            dockPanel1_Container.Size = new Size(393, 717);
            dockPanel1_Container.TabIndex = 0;
            // 
            // dockPanelChangeRecordItem
            // layoutControl1
            // 
            dockPanelChangeRecordItem.Controls.Add(dockPanel3_Container);
            dockPanelChangeRecordItem.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
            dockPanelChangeRecordItem.ID = new Guid("39552842-60b6-4e4d-b215-438810b7a737");
            dockPanelChangeRecordItem.Location = new Point(0, 465);
            dockPanelChangeRecordItem.Name = "dockPanelChangeRecordItem";
            dockPanelChangeRecordItem.OriginalSize = new Size(370, 245);
            dockPanelChangeRecordItem.Size = new Size(370, 465);
            dockPanelChangeRecordItem.Text = "变更记录详细";
            layoutControl1.Controls.Add(gridControl2);
            layoutControl1.Controls.Add(gridControl1);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(565, 389, 975, 600);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(393, 717);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            //
            // Root
            //
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            Root.Size = new Size(393, 717);
            Root.TextVisible = false;
            //
            // layoutControlGroup1
            //
            layoutControlGroup1.ExpandButtonVisible = true;
            layoutControlGroup1.GroupStyle = DevExpress.Utils.GroupStyle.Title;
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
            layoutControlGroup1.Location = new Point(0, 0);
            layoutControlGroup1.Name = "layoutControlGroup1";
            layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup1.ShowInCustomizationForm = false;
            layoutControlGroup1.Size = new Size(393, 454);
            layoutControlGroup1.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup1.Text = "记录列表";
            //
            // layoutControlItem1
            //
            layoutControlItem1.Control = gridControl1;
            layoutControlItem1.HighlightFocusedItem = DevExpress.Utils.DefaultBoolean.True;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItem1.Size = new Size(393, 421);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            //
            // layoutControlGroup2
            //
            layoutControlGroup2.ExpandButtonVisible = true;
            layoutControlGroup2.GroupStyle = DevExpress.Utils.GroupStyle.Title;
            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
            layoutControlGroup2.Location = new Point(0, 454);
            layoutControlGroup2.Name = "layoutControlGroup2";
            layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup2.ShowInCustomizationForm = false;
            layoutControlGroup2.Size = new Size(393, 263);
            layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlGroup2.Text = "记录详情";
            //
            // layoutControlItem2
            //
            layoutControlItem2.Control = gridControl2;
            layoutControlItem2.HighlightFocusedItem = DevExpress.Utils.DefaultBoolean.True;
            layoutControlItem2.Location = new Point(0, 0);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            layoutControlItem2.Size = new Size(393, 230);
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
            //
            // dockPanelScheme
            //
            dockPanelScheme.Controls.Add(dockPanel3_Container);
            dockPanelScheme.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
            dockPanelScheme.ID = new Guid("39552842-60b6-4e4d-b215-438810b7a737");
            dockPanelScheme.Location = new Point(0, 751);
            dockPanelScheme.Name = "dockPanelScheme";
            dockPanelScheme.OriginalSize = new Size(394, 87);
            dockPanelScheme.Size = new Size(394, 211);
            dockPanelScheme.Text = "方案信息";
            // 
            // dockPanel3_Container
            // 
            dockPanel3_Container.Controls.Add(gridControl2);
            dockPanel3_Container.Controls.Add(layoutControl2);
            dockPanel3_Container.Location = new Point(1, 35);
            dockPanel3_Container.Name = "dockPanel3_Container";
            dockPanel3_Container.Size = new Size(369, 430);
            dockPanel3_Container.Size = new Size(393, 176);
            dockPanel3_Container.TabIndex = 0;
            //
            // layoutControl2
            //
            layoutControl2.Controls.Add(setFlagsEditCtrl1);
            layoutControl2.Controls.Add(imgCmbSchemeType);
            layoutControl2.Controls.Add(txtNo);
            layoutControl2.Controls.Add(txtName);
            layoutControl2.Controls.Add(btnSave);
            layoutControl2.Controls.Add(memoDescription);
            layoutControl2.Dock = DockStyle.Fill;
            layoutControl2.Location = new Point(0, 0);
            layoutControl2.Name = "layoutControl2";
            layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(71, 697, 975, 600);
            layoutControl2.Root = layoutControlGroup3;
            layoutControl2.Size = new Size(393, 176);
            layoutControl2.TabIndex = 0;
            layoutControl2.Text = "layoutControl2";
            //
            // setFlagsEditCtrl1
            //
            setFlagsEditCtrl1.Location = new Point(262, 44);
            setFlagsEditCtrl1.Margin = new Padding(6, 8, 6, 8);
            setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
            setFlagsEditCtrl1.Size = new Size(119, 28);
            setFlagsEditCtrl1.TabIndex = 3;
            //
            // imgCmbSchemeType
            //
            imgCmbSchemeType.Location = new Point(76, 44);
            imgCmbSchemeType.Margin = new Padding(4, 5, 4, 5);
            imgCmbSchemeType.Name = "imgCmbSchemeType";
            imgCmbSchemeType.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
            imgCmbSchemeType.Size = new Size(118, 28);
            imgCmbSchemeType.StyleController = layoutControl2;
            imgCmbSchemeType.TabIndex = 4;
            //
            // txtNo
            //
            txtNo.Location = new Point(76, 12);
            txtNo.Margin = new Padding(4, 5, 4, 5);
            txtNo.Name = "txtNo";
            txtNo.Size = new Size(118, 28);
            txtNo.StyleController = layoutControl2;
            txtNo.TabIndex = 0;
            //
            // txtName
            //
            txtName.Location = new Point(262, 12);
            txtName.Margin = new Padding(4, 5, 4, 5);
            txtName.Name = "txtName";
            txtName.Size = new Size(119, 28);
            txtName.StyleController = layoutControl2;
            txtName.TabIndex = 2;
            //
            // btnSave
            //
            btnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            btnSave.Appearance.Options.UseBackColor = true;
            btnSave.Location = new Point(120, 124);
            btnSave.Name = "btnSave";
            btnSave.Size = new Size(153, 32);
            btnSave.StyleController = layoutControl2;
            btnSave.TabIndex = 6;
            btnSave.Text = "保存";
            btnSave.Click += btnSave_Click;
            //
            // memoDescription
            //
            memoDescription.Location = new Point(76, 76);
            memoDescription.MenuManager = ribbon;
            memoDescription.Name = "memoDescription";
            memoDescription.Properties.ScrollBars = ScrollBars.Horizontal;
            memoDescription.Size = new Size(305, 36);
            memoDescription.StyleController = layoutControl2;
            memoDescription.TabIndex = 5;
            //
            // layoutControlGroup3
            //
            layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            layoutControlGroup3.GroupBordersVisible = false;
            layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5, layoutControlItem13, layoutControlItem14, layoutControlItem12, layoutControlItem3, layoutControlItem11 });
            layoutControlGroup3.Name = "Root";
            layoutControlGroup3.Size = new Size(393, 176);
            layoutControlGroup3.TextVisible = false;
            //
            // layoutControlItem5
            //
            layoutControlItem5.Control = btnSave;
            layoutControlItem5.Location = new Point(0, 104);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(110, 110, 10, 10);
            layoutControlItem5.Size = new Size(373, 52);
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            //
            // layoutControlItem13
            //
            layoutControlItem13.AppearanceItemCaption.Options.UseTextOptions = true;
            layoutControlItem13.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            layoutControlItem13.Control = txtNo;
            layoutControlItem13.Location = new Point(0, 0);
            layoutControlItem13.Name = "layoutControlItem13";
            layoutControlItem13.Size = new Size(186, 32);
            layoutControlItem13.Text = "编码:";
            layoutControlItem13.TextSize = new Size(52, 22);
            //
            // layoutControlItem14
            //
            layoutControlItem14.AllowHtmlStringInCaption = true;
            layoutControlItem14.AppearanceItemCaption.Options.UseTextOptions = true;
            layoutControlItem14.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            layoutControlItem14.Control = txtName;
            layoutControlItem14.Location = new Point(186, 0);
            layoutControlItem14.Name = "layoutControlItem14";
            layoutControlItem14.Size = new Size(187, 32);
            layoutControlItem14.Text = "<color=red>*</color>名称:";
            layoutControlItem14.TextSize = new Size(52, 22);
            //
            // layoutControlItem12
            //
            layoutControlItem12.AllowHtmlStringInCaption = true;
            layoutControlItem12.AppearanceItemCaption.Options.UseTextOptions = true;
            layoutControlItem12.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            layoutControlItem12.Control = imgCmbSchemeType;
            layoutControlItem12.Location = new Point(0, 32);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(186, 32);
            layoutControlItem12.Text = "<color=red>*</color>类型:";
            layoutControlItem12.TextSize = new Size(52, 22);
            //
            // layoutControlItem3
            //
            layoutControlItem3.AppearanceItemCaption.Options.UseTextOptions = true;
            layoutControlItem3.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            layoutControlItem3.Control = memoDescription;
            layoutControlItem3.Location = new Point(0, 64);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(373, 40);
            layoutControlItem3.Text = "说明:";
            layoutControlItem3.TextSize = new Size(52, 22);
            //
            // layoutControlItem11
            //
            layoutControlItem11.AllowHtmlStringInCaption = true;
            layoutControlItem11.AppearanceItemCaption.Options.UseTextOptions = true;
            layoutControlItem11.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            layoutControlItem11.Control = setFlagsEditCtrl1;
            layoutControlItem11.Location = new Point(186, 32);
            layoutControlItem11.Name = "layoutControlItem11";
            layoutControlItem11.Size = new Size(187, 32);
            layoutControlItem11.Text = "标签:";
            layoutControlItem11.TextSize = new Size(52, 22);
            // 
            // dockPanelParterList
            // 
@@ -446,7 +795,7 @@
            dockPanelParterList.Location = new Point(0, 757);
            dockPanelParterList.Name = "dockPanelParterList";
            dockPanelParterList.OriginalSize = new Size(200, 347);
            dockPanelParterList.Size = new Size(1199, 347);
            dockPanelParterList.Size = new Size(1175, 347);
            dockPanelParterList.Text = "构建列表";
            // 
            // dockPanel2_Container
@@ -454,8 +803,29 @@
            dockPanel2_Container.Controls.Add(tabPane1);
            dockPanel2_Container.Location = new Point(0, 35);
            dockPanel2_Container.Name = "dockPanel2_Container";
            dockPanel2_Container.Size = new Size(1199, 312);
            dockPanel2_Container.Size = new Size(1175, 312);
            dockPanel2_Container.TabIndex = 0;
            //
            // dxErrorProvider1
            //
            dxErrorProvider1.ContainerControl = this;
            //
            // layoutControlItem9
            //
            layoutControlItem9.AllowHtmlStringInCaption = true;
            layoutControlItem9.Location = new Point(0, 32);
            layoutControlItem9.Name = "layoutControlItem3";
            layoutControlItem9.Size = new Size(421, 32);
            layoutControlItem9.Text = "<color=red>*</color>类型:";
            layoutControlItem9.TextSize = new Size(64, 22);
            //
            // layoutControlItem10
            //
            layoutControlItem10.Location = new Point(421, 32);
            layoutControlItem10.Name = "layoutControlItem4";
            layoutControlItem10.Size = new Size(423, 32);
            layoutControlItem10.Text = "标签:";
            layoutControlItem10.TextSize = new Size(64, 22);
            // 
            // AddXhsSchemeDlg
            // 
@@ -465,6 +835,7 @@
            Controls.Add(sidePanel3dModel);
            Controls.Add(dockPanelParterList);
            Controls.Add(dockPanel5);
            Controls.Add(dockPanelMenu);
            Controls.Add(ribbon);
            Name = "AddXhsSchemeDlg";
            Ribbon = ribbon;
@@ -475,6 +846,8 @@
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((ISupportInitialize)ribbon).EndInit();
            ((ISupportInitialize)repositoryItemTextEdit1).EndInit();
            ((ISupportInitialize)repositoryItemTextEdit2).EndInit();
            ((ISupportInitialize)tabPane1).EndInit();
            tabPane1.ResumeLayout(false);
            tabPagePump.ResumeLayout(false);
@@ -484,13 +857,44 @@
            ((ISupportInitialize)setSchemeParterRecordItemBindingSource).EndInit();
            ((ISupportInitialize)gridView2).EndInit();
            ((ISupportInitialize)dockManager1).EndInit();
            dockPanelMenu.ResumeLayout(false);
            controlContainer1.ResumeLayout(false);
            ((ISupportInitialize)layoutControl3).EndInit();
            layoutControl3.ResumeLayout(false);
            ((ISupportInitialize)buttonEdit.Properties).EndInit();
            ((ISupportInitialize)layoutControlGroup4).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            dockPanel5.ResumeLayout(false);
            dockPanelChangeRecord.ResumeLayout(false);
            dockPanel1_Container.ResumeLayout(false);
            dockPanelChangeRecordItem.ResumeLayout(false);
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)Root).EndInit();
            ((ISupportInitialize)layoutControlGroup1).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlGroup2).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            dockPanelScheme.ResumeLayout(false);
            dockPanel3_Container.ResumeLayout(false);
            ((ISupportInitialize)layoutControl2).EndInit();
            layoutControl2.ResumeLayout(false);
            ((ISupportInitialize)imgCmbSchemeType.Properties).EndInit();
            ((ISupportInitialize)txtNo.Properties).EndInit();
            ((ISupportInitialize)txtName.Properties).EndInit();
            ((ISupportInitialize)memoDescription.Properties).EndInit();
            ((ISupportInitialize)layoutControlGroup3).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)layoutControlItem13).EndInit();
            ((ISupportInitialize)layoutControlItem14).EndInit();
            ((ISupportInitialize)layoutControlItem12).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)layoutControlItem11).EndInit();
            dockPanelParterList.ResumeLayout(false);
            dockPanel2_Container.ResumeLayout(false);
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)layoutControlItem9).EndInit();
            ((ISupportInitialize)layoutControlItem10).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -499,7 +903,6 @@
        private DevExpress.XtraBars.Ribbon.RibbonControl ribbon;
        private SidePanel sidePanel3dModel;
        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
        private DevExpress.XtraBars.Docking.DockPanel panelContainer1;
        private DevExpress.XtraBars.Navigation.TabPane tabPane1;
        private DevExpress.XtraBars.Navigation.TabNavigationPage tabPagePump;
@@ -529,12 +932,42 @@
        private DevExpress.XtraBars.Docking.DockPanel dockPanel5;
        private DevExpress.XtraBars.Docking.DockPanel dockPanelChangeRecord;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
        private DevExpress.XtraBars.Docking.DockPanel dockPanelChangeRecordItem;
        private DevExpress.XtraBars.Docking.DockPanel dockPanelScheme;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel3_Container;
        private DevExpress.XtraGrid.Columns.GridColumn colDelete;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraBars.BarButtonItem barButtonItem1;
        private DevExpress.XtraBars.BarButtonItem barButtonItem2;
        private DevExpress.XtraBars.BarButtonItem barButtonItem3;
        private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit1;
        private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit2;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControl layoutControl2;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
        private SimpleButton btnSave;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private SetFlagsEditCtrl setFlagsEditCtrl1;
        private ImageComboBoxEdit imgCmbSchemeType;
        private TextEdit txtNo;
        private TextEdit txtName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private MemoEdit memoDescription;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraBars.Docking.DockPanel dockPanelMenu;
        private DevExpress.XtraBars.Docking.ControlContainer controlContainer1;
        private DevExpress.XtraLayout.LayoutControl layoutControl3;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
        private ButtonEdit buttonEdit;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
    }
}
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.cs
@@ -13,10 +13,10 @@
            this.gridView2.SetNormalView();
            this.gridView2.OptionsView.EnableAppearanceOddRow = false;   // 使能 // 和和上面绑定 同时使用有效  
            this.gridView2.OptionsView.EnableAppearanceEvenRow = false;
            this.gridView1.OptionsView.ShowIndicator = false;
            this.gridView2.OptionsView.ShowIndicator = false;
            foreach (var page in this.tabPane1.Pages)
            {
                if (page.Controls[0] is ISetSchemeParterList ctrl)
@@ -24,8 +24,8 @@
                    ctrl.ShowFindPanel = false;
                    ctrl.HydroClickEvent += async (parter) =>
                    {
                        _selectedParter = parter;
                        await _bimfaceCtrl?.ZoomAndSelectComponent(_selectedParter.Code);
                        _selected_parter = parter;
                        await _bimfaceCtrl?.ZoomAndSelectComponent(_selected_parter.Code);
                    };
                    ctrl.HydroRecordChangedEvent += (record) =>
                    {
@@ -39,16 +39,15 @@
                }
            }
        }
        private HStation.Vmo.XhsProjectVmo _project = null;//项目
        private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//项目站
        private Yw.Model.HydroModelInfo _hydroInfo = null;//水力信息
        private Yw.Model.HydroModelInfo _hydroInfo_init = null;//初始 水力信息
        private HStation.Vmo.XhsProjectSiteVmo _project_site = null;//项目站
        private Yw.Model.HydroModelInfo _hydro_info = null;//水力信息
        private Yw.Model.HydroModelInfo _hydro_info_init = null;//初始 水力信息
        private Yw.Model.HydroParterInfo _selectedParter = null; //选择构件
        private Yw.Model.HydroParterInfo _selected_parter = null; //选择构件
        private List<SetSchemeParterRecord> _set_record_list = null;
        /// <summary>
@@ -57,8 +56,8 @@
        public async Task SetBindingData
            (
                HStation.Vmo.XhsProjectVmo project,
                HStation.Vmo.XhsProjectSiteVmo projectSite,
                Yw.Model.HydroModelInfo hydroInfo
                HStation.Vmo.XhsProjectSiteVmo project_site,
                Yw.Model.HydroModelInfo hydro_info
            )
        {
            if (project == null)
@@ -66,25 +65,107 @@
                return;
            }
            _project = project;
            _projectSite = projectSite;
            _hydroInfo_init = hydroInfo;
            _project_site = project_site;
            _hydro_info_init = hydro_info;
            _set_record_list = new List<SetSchemeParterRecord>();
            if (_projectSite == null)
            if (_project_site == null)
            {
                _projectSite = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID(_project.ID);
                _project_site = await BLLFactory<HStation.BLL.XhsProjectSite>.Instance.GetDefaultByProjectID(_project.ID);
            }
            if (_hydroInfo_init == null)
            if (_hydro_info_init == null)
            {
                var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
                _hydroInfo_init = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
            }
                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _project_site.ID, HStation.Xhs.Purpose.Simulation);
                _hydro_info_init = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
            }
            this.setSchemeParterRecordBindingSource.DataSource = _set_record_list;
            this.setSchemeParterRecordBindingSource.ResetBindings(false);
            LoadData();
            ShowBimfaceCtrl();
            SetBindingData();
            ShowBimfaceCtrl();
            FastShowHidden(false);
            InitialSchemeType();
            await InitialFlags();
        }
        //初始化文件格式
        private void InitialSchemeType()
        {
            this.imgCmbSchemeType.Properties.BeginUpdate();
            this.imgCmbSchemeType.Properties.Items.Clear();
            this.imgCmbSchemeType.Properties.Items.AddEnum(typeof(HStation.Xhs.eSchemeType), false);
            this.imgCmbSchemeType.EditValue = eSchemeType.Common;
            this.imgCmbSchemeType.Properties.EndUpdate();
        }
        //初始化标签
        private async Task InitialFlags()
        {
            var allFlagList = await BLLFactory<Yw.BLL.SysFlag>.Instance.GetBySysType(HStation.Xhs.DataType.XhsScheme);
            var allFlagNameList = allFlagList?.Select(x => x.Name).ToList();
            this.setFlagsEditCtrl1.SetBindingData(allFlagNameList, null);
        }
        private void SetBindingData(List<SetSchemeParterRecord> set_record_list = null)
        {
            _hydro_info = _hydro_info_init.Adapt<Yw.Model.HydroModelInfo, Yw.Model.HydroModelInfo>();
            if (set_record_list != null && set_record_list.Any())
            {
                foreach (var item in set_record_list)
                {
                    switch (item.Catalog)
                    {
                        case Yw.Hydro.ParterCatalog.Pump:
                            {
                                var vm = item.MatchingModel as PumpMatchingViewModel;
                                var bol = AssetsMatchingParasHelper.Apply(_hydro_info, vm);
                            }
                            break;
                        case Yw.Hydro.ParterCatalog.Valve:
                            {
                                var vm = item.MatchingModel as ValveMatchingViewModel;
                                var bol = AssetsMatchingParasHelper.Apply(_hydro_info, vm);
                            }
                            break;
                        case Yw.Hydro.ParterCatalog.Pipe:
                            {
                                var vm = item.MatchingModel as PipeMatchingViewModel;
                                var bol = AssetsMatchingParasHelper.Apply(_hydro_info, vm);
                            }
                            break;
                        default:
                            break;
                    }
                }
            }
            this.setSchemePumpListCtrl1.SetBindingData(_hydro_info);
            this.setSchemeValveListCtrl1.SetBindingData(_hydro_info);
            this.setSchemePipeListCtrl1.SetBindingData(_hydro_info);
        }
        //按钮
        private void buttonEdit_ButtonClick(object sender, ButtonPressedEventArgs e)
        {
            if (e.Button.Tag is not string tag)
            {
                return;
            }
            switch (tag)
            {
                case "showhide":
                    {
                        _show_hidden = !_show_hidden;
                        FastShowHidden(_show_hidden);
                    }
                    break;
                default:
                    break;
            }
        }
        #region Bimface
@@ -99,18 +180,18 @@
            {
                _bimfaceCtrl = new XhsProjectSimulationBimfaceCtrl();
                _bimfaceCtrl.Dock = DockStyle.Fill;
                await _bimfaceCtrl.InitialData(_project, _projectSite, () => _hydroInfo);
                await _bimfaceCtrl.InitialData(_project, _project_site, () => _hydro_info);
                _bimfaceCtrl.LoadCompletedEvent += () =>
                {
                    //view加载完成事件
                    if (_hydroInfo == null)
                    if (_hydro_info == null)
                    {
                        return;
                    }
                };
                _bimfaceCtrl.HydroMouseLeftClickEvent += (obj) =>
                {//鼠标左键点击事件
                    if (_hydroInfo == null)
                    if (_hydro_info == null)
                    {
                        return;
                    }
@@ -134,7 +215,30 @@
        #endregion
        #region FastShowHidden
        private bool _show_hidden = false;
        private async void FastShowHidden(bool visible)
        {
            var code_list = _hydro_info.Decorators.Select(x => x.Code).ToList();
            if (code_list == null)
            {
                return;
            }
            if (visible)
            {
                await _bimfaceCtrl?.ShowComponents(code_list);
            }
            else
            {
                await _bimfaceCtrl?.HideComponents(code_list);
            }
        }
        #endregion
        #region GridView
        private void gridView1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
@@ -150,51 +254,88 @@
                var row = this.gridView1.GetRow(e.RowHandle) as SetSchemeParterRecord;
                _set_record_list.Remove(row);
                this.setSchemeParterRecordBindingSource.ResetBindings(false);
                LoadData(_set_record_list);
                SetBindingData(_set_record_list);
            }
        }
        private void LoadData( List<SetSchemeParterRecord> set_record_list=null)
        {
            _hydroInfo = _hydroInfo_init.Adapt<Yw.Model.HydroModelInfo, Yw.Model.HydroModelInfo>();
            if (set_record_list != null && set_record_list.Any())
            {
                foreach (var item in set_record_list)
                {
                    switch (item.Catalog)
                    {
                        case Yw.Hydro.ParterCatalog.Pump:
                            {
                                var vm = item.MatchingModel as PumpMatchingViewModel;
                                var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, vm);
                            }
                            break;
                        case Yw.Hydro.ParterCatalog.Valve:
                            {
                                var vm = item.MatchingModel as ValveMatchingViewModel;
                                var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, vm);
                            }
                            break;
                        case Yw.Hydro.ParterCatalog.Pipe:
                            {
                                var vm = item.MatchingModel as PipeMatchingViewModel;
                                var bol = AssetsMatchingParasHelper.Apply(_hydroInfo, vm);
                            }
                            break;
                        default:
                            break;
                    }
        #endregion
        private bool Verify()
        {
            this.dxErrorProvider1.ClearErrors();
            if (string.IsNullOrEmpty(this.txtNo.Text))
            {
                this.dxErrorProvider1.SetError(this.txtNo, "必填项");
                return false;
            }
            if (string.IsNullOrEmpty(this.txtName.Text))
            {
                this.dxErrorProvider1.SetError(this.txtName, "必填项");
                return false;
            }
            return true;
        }
        private async void btnSave_Click(object sender, EventArgs e)
        {
            if (_hydro_info == null)
            {
                return;
            }
            if (!Verify())
            {
                return;
            }
            var bll_hydro_model = new Yw.BLL.HydroModel();
            var bll_xhs_scheme = new BLL.XhsScheme();
            var hydro_model_id = await bll_hydro_model.Copy(_hydro_info.ID);
            if (hydro_model_id > 0)
            {
                var xhs_scheme = new Vmo.XhsSchemeVmo();
                xhs_scheme.SiteID = _project_site.ID;
                xhs_scheme.NO = this.txtNo.Text.Trim();
                xhs_scheme.Name = this.txtName.Text.Trim();
                xhs_scheme.SchemeType = eSchemeType.Common;
                xhs_scheme.Paras = null;
                xhs_scheme.Flags = null;
                xhs_scheme.UseStatus = Yw.Model.eUseStatus.Enable;
                var xhs_scheme_id = await bll_xhs_scheme.Insert(xhs_scheme);
                if (xhs_scheme_id < 0)
                {
                    await bll_hydro_model.DeleteByID(hydro_model_id);
                    XtraMessageBox.Show("方案创建失败!");
                    return;
                }
                var hydro_relation = new Yw.Vmo.HydroModelRelationVmo();
                hydro_relation.ObjectType = HStation.Xhs.DataType.XhsScheme;
                hydro_relation.ObjectID = xhs_scheme_id;
                hydro_relation.ModelID = hydro_model_id;
                hydro_relation.Purpose = HStation.Xhs.Purpose.Simulation;
                hydro_relation.Content = null;
                hydro_relation.Description = this.memoDescription.Text.Trim();
                var hydro_relation_id = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance.Insert(hydro_relation);
                if (hydro_relation_id < 1)
                {
                    await bll_hydro_model.DeleteByID(hydro_model_id);
                    await bll_xhs_scheme.DeleteByID(xhs_scheme_id);
                    XtraMessageBox.Show("模型依赖创建失败!");
                    return;
                }
            }
            this.setSchemePumpListCtrl1.SetBindingData(_hydroInfo);
            this.setSchemeValveListCtrl1.SetBindingData(_hydroInfo);
            this.setSchemePipeListCtrl1.SetBindingData(_hydroInfo);
            TipFormHelper.Show(eTipStatus.Succeed, "创建成功!");
            this.Close();
        }
    }
}
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-add/AddXhsSchemeDlg.resx
@@ -146,6 +146,33 @@
    <value>608, 17</value>
  </metadata>
  <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>-9, 19</value>
    <value>17, 17</value>
  </metadata>
  <data name="editorButtonImageOptions2.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAP0DAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku
        WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4
        N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk
        aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDJIMUMwLjUs
        MiwwLDIuNSwwLDN2N2gyOFYzQzI4LDIuNSwyNy41LDIsMjcsMnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8
        ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMjYsMTYuMlYxMGgydjYuOUMyNy40LDE2LjYsMjYu
        NywxNi40LDI2LDE2LjJ6IE0xNC4xLDI0LjdMMTMuOSwyNEgyVjEwSDB2MTVjMCwwLjUsMC41LDEsMSwx
        aDEzLjggICBDMTQuNCwyNS4zLDE0LjIsMjQuOCwxNC4xLDI0Ljd6IiBjbGFzcz0iQmxhY2siIC8+DQog
        IDwvZz4NCiAgPHBhdGggZD0iTTI0LDE4Yy01LjcsMC04LDYtOCw2czIuMyw2LDgsNnM4LTYsOC02UzI5
        LjcsMTgsMjQsMTh6IE0yNCwyOGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNCAgYzIuMiww
        LDQsMS44LDQsNEMyOCwyNi4yLDI2LjIsMjgsMjQsMjh6IE0yNiwyNGMwLDEuMS0wLjksMi0yLDJzLTIt
        MC45LTItMnMwLjktMiwyLTJTMjYsMjIuOSwyNiwyNHoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
</value>
  </data>
  <metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1042, 17</value>
  </metadata>
</root>
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -102,18 +102,21 @@
            // 
            // ribbonControl1
            // 
            ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroVisualList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnParallelAnaly, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnLoadFlowDirection, barBtnUnloadFlowDirection, barBtnClearMark, batBtnCancelGradingApply });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.Margin = new Padding(4, 5, 4, 5);
            ribbonControl1.MaxItemId = 55;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.OptionsMenuMinWidth = 471;
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
            ribbonControl1.ShowQatLocationSelector = false;
            ribbonControl1.ShowToolbarCustomizeItem = false;
            ribbonControl1.Size = new Size(1328, 128);
            ribbonControl1.Size = new Size(1897, 148);
            ribbonControl1.Toolbar.ShowCustomizeItem = false;
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
@@ -153,7 +156,7 @@
            // 
            barBtnHydroVisualList.Caption = "构件明细";
            barBtnHydroVisualList.Id = 8;
            barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
            barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroVisualList.ImageOptions.SvgImage");
            barBtnHydroVisualList.Name = "barBtnHydroVisualList";
            barBtnHydroVisualList.ItemClick += barBtnHydroVisualList_ItemClick;
            // 
@@ -470,26 +473,29 @@
            tabPane1.Controls.Add(tabPageBimface);
            tabPane1.Controls.Add(tabPageQ3d);
            tabPane1.Dock = DockStyle.Fill;
            tabPane1.Location = new Point(0, 128);
            tabPane1.Location = new Point(0, 148);
            tabPane1.Margin = new Padding(4, 5, 4, 5);
            tabPane1.Name = "tabPane1";
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
            tabPane1.RegularSize = new Size(1053, 407);
            tabPane1.RegularSize = new Size(1504, 693);
            tabPane1.SelectedPage = tabPageBimface;
            tabPane1.Size = new Size(1053, 407);
            tabPane1.Size = new Size(1504, 693);
            tabPane1.TabIndex = 1;
            tabPane1.Text = "tabPane1";
            // 
            // tabPageBimface
            // 
            tabPageBimface.Caption = "三维模型";
            tabPageBimface.Margin = new Padding(4, 5, 4, 5);
            tabPageBimface.Name = "tabPageBimface";
            tabPageBimface.Size = new Size(1053, 374);
            tabPageBimface.Size = new Size(1504, 644);
            // 
            // tabPageQ3d
            // 
            tabPageQ3d.Caption = "水力模型";
            tabPageQ3d.Margin = new Padding(4, 5, 4, 5);
            tabPageQ3d.Name = "tabPageQ3d";
            tabPageQ3d.Size = new Size(931, 374);
            tabPageQ3d.Size = new Size(1330, 588);
            // 
            // dockManager1
            // 
@@ -502,17 +508,19 @@
            docPnlRight.Controls.Add(controlContainerRight);
            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
            docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
            docPnlRight.Location = new Point(1053, 128);
            docPnlRight.Location = new Point(1504, 148);
            docPnlRight.Margin = new Padding(4, 5, 4, 5);
            docPnlRight.Name = "docPnlRight";
            docPnlRight.OriginalSize = new Size(275, 200);
            docPnlRight.Size = new Size(275, 572);
            docPnlRight.Size = new Size(393, 952);
            docPnlRight.Text = "属性";
            // 
            // controlContainerRight
            // 
            controlContainerRight.Location = new Point(4, 26);
            controlContainerRight.Location = new Point(7, 38);
            controlContainerRight.Margin = new Padding(4, 5, 4, 5);
            controlContainerRight.Name = "controlContainerRight";
            controlContainerRight.Size = new Size(268, 543);
            controlContainerRight.Size = new Size(382, 910);
            controlContainerRight.TabIndex = 0;
            // 
            // docPnlBottom
@@ -520,17 +528,19 @@
            docPnlBottom.Controls.Add(controlContainerBottom);
            docPnlBottom.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom;
            docPnlBottom.ID = new Guid("2baf4268-45b9-4b56-9f84-98580a0109e5");
            docPnlBottom.Location = new Point(0, 535);
            docPnlBottom.Location = new Point(0, 841);
            docPnlBottom.Margin = new Padding(4, 5, 4, 5);
            docPnlBottom.Name = "docPnlBottom";
            docPnlBottom.OriginalSize = new Size(200, 165);
            docPnlBottom.Size = new Size(1053, 165);
            docPnlBottom.Size = new Size(1504, 259);
            docPnlBottom.Text = "底部功能面板";
            // 
            // controlContainerBottom
            // 
            controlContainerBottom.Location = new Point(3, 27);
            controlContainerBottom.Location = new Point(4, 41);
            controlContainerBottom.Margin = new Padding(4, 5, 4, 5);
            controlContainerBottom.Name = "controlContainerBottom";
            controlContainerBottom.Size = new Size(1047, 135);
            controlContainerBottom.Size = new Size(1496, 214);
            controlContainerBottom.TabIndex = 0;
            // 
            // svgImg32
@@ -569,15 +579,15 @@
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(tabPane1);
            Controls.Add(docPnlBottom);
            Controls.Add(docPnlRight);
            Controls.Add(docPnlBottom);
            Controls.Add(ribbonControl1);
            Margin = new Padding(2);
            Margin = new Padding(3, 3, 3, 3);
            Name = "XhsProjectSimulationCorePage";
            Size = new Size(1328, 700);
            Size = new Size(1897, 1100);
            ((ISupportInitialize)ribbonControl1).EndInit();
            ((ISupportInitialize)tabPane1).EndInit();
            tabPane1.ResumeLayout(false);
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -1044,7 +1044,7 @@
        #region 水力计算
        #region 前提条件
        #region 工况
        //显示工况计算窗体
@@ -1088,6 +1088,9 @@
                if (_calcuResult.Succeed)
                {
                    GetCalcuResultList(false);
                    UpdateVisualViewModelCalcuProperty();
                    UpdateVisualListCtrl();
                    UpdateSelectedProperty();
                    await _bimfaceCtrl?.SetLogicCalcuCustomLabels(_calcuResult);
                    TipFormHelper.ShowSucceed("计算成功!");
                    var codes = _hydroInfo.Pumps.Select(x => x.Code).ToList();
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.resx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Microsoft ResX Schema
    Version 2.0
@@ -48,7 +48,7 @@
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -202,7 +202,7 @@
        TTE0LDEwaC0yVjZoMlYxMHoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="barBtnHydroParterList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barBtnHydroVisualList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl