From 74dba39c95f8120bb31a64739c872cb43790935c Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 20 十一月 2024 10:14:38 +0800
Subject: [PATCH] 核心界面修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs |  391 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 324 insertions(+), 67 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 2208e0d..060adc4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -32,12 +32,14 @@
         {
             components = new Container();
             ComponentResourceManager resources = new ComponentResourceManager(typeof(XhsProjectSimulationCorePage));
+            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
             ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
-            barBtnHydroCheck = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroCalcu = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroExportInp = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingCalcu = new DevExpress.XtraBars.BarButtonItem();
+            barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
             barBtnSave = new DevExpress.XtraBars.BarButtonItem();
-            barBtnHydroParterList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnHydroVisualList = new DevExpress.XtraBars.BarButtonItem();
             barBtnFastShowHidden = new DevExpress.XtraBars.BarButtonItem();
             barBtnMatchingList = new DevExpress.XtraBars.BarButtonItem();
             barBtnUnMatchingList = new DevExpress.XtraBars.BarButtonItem();
@@ -51,7 +53,7 @@
             barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnParallelAnaly = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCurrentWorkingParallelAnalysis = new DevExpress.XtraBars.BarButtonItem();
             barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
             barBtnGradingSet = new DevExpress.XtraBars.BarButtonItem();
             barBtnGradingApply = new DevExpress.XtraBars.BarButtonItem();
@@ -67,11 +69,30 @@
             barBtnSetCompressorList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetFlowmeterList = new DevExpress.XtraBars.BarButtonItem();
             barBtnSetPressmeterList = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetMonitor = new DevExpress.XtraBars.BarButtonItem();
+            barBtnSetMonitorValue = new DevExpress.XtraBars.BarButtonItem();
+            barCkMonitor = new DevExpress.XtraBars.BarCheckItem();
+            barEditCurrentWorking = new DevExpress.XtraBars.BarEditItem();
+            repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
+            barCkMark = new DevExpress.XtraBars.BarCheckItem();
+            barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
+            barCkGrading = new DevExpress.XtraBars.BarCheckItem();
+            barCkCurrentWorkingCalcuResult = new DevExpress.XtraBars.BarCheckItem();
+            barBtnCurrentWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCurrentWorkingLossScale = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCurrentWorkingPowerAnalysis = new DevExpress.XtraBars.BarButtonItem();
+            barBtnCurrentWorkingMultiAnalysis = new DevExpress.XtraBars.BarButtonItem();
+            barBtnParallel = new DevExpress.XtraBars.BarButtonItem();
+            barBtnRepair = new DevExpress.XtraBars.BarButtonItem();
+            barBtnWorkingList = new DevExpress.XtraBars.BarButtonItem();
             ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             pageGroupMatching = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
@@ -84,7 +105,11 @@
             controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
             svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
             rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
+            docPnlWorking = new DevExpress.XtraBars.Docking.DockPanel();
+            dockPanel2 = new DevExpress.XtraBars.Docking.DockPanel();
+            dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
             ((ISupportInitialize)ribbonControl1).BeginInit();
+            ((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
             ((ISupportInitialize)tabPane1).BeginInit();
             tabPane1.SuspendLayout();
             ((ISupportInitialize)dockManager1).BeginInit();
@@ -92,48 +117,52 @@
             docPnlBottom.SuspendLayout();
             ((ISupportInitialize)svgImg32).BeginInit();
             ((ISupportInitialize)rmSet).BeginInit();
+            dockPanel1.SuspendLayout();
             SuspendLayout();
             // 
             // ribbonControl1
             // 
             ribbonControl1.ExpandCollapseItem.Id = 0;
             ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
-            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnHydroCheck, barBtnHydroCalcu, barBtnHydroExportInp, barBtnSave, barBtnHydroParterList, 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 });
+            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnWorkingCalcu, barBtnExportInp, barBtnSave, barBtnHydroVisualList, barBtnFastShowHidden, barBtnMatchingList, barBtnUnMatchingList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnCurrentWorkingParallelAnalysis, barBtnSearch, barBtnGradingSet, barBtnGradingApply, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barEditCurrentWorking, barCkMark, barCkFlowEffect, barCkGrading, barCkCurrentWorkingCalcuResult, barBtnCurrentWorkingLossCurve, barBtnCurrentWorkingLossScale, barBtnCurrentWorkingPowerAnalysis, barBtnCurrentWorkingMultiAnalysis, barBtnParallel, barBtnRepair, barBtnWorkingList });
             ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 51;
+            ribbonControl1.MaxItemId = 76;
             ribbonControl1.Name = "ribbonControl1";
             ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
+            ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemImageComboBox1 });
             ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
             ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
             ribbonControl1.ShowQatLocationSelector = false;
             ribbonControl1.ShowToolbarCustomizeItem = false;
-            ribbonControl1.Size = new Size(1206, 128);
+            ribbonControl1.Size = new Size(1941, 128);
             ribbonControl1.Toolbar.ShowCustomizeItem = false;
             ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
             // 
-            // barBtnHydroCheck
+            // barBtnCheck
             // 
-            barBtnHydroCheck.Caption = "鏍¢獙";
-            barBtnHydroCheck.Id = 1;
-            barBtnHydroCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCheck.ImageOptions.SvgImage");
-            barBtnHydroCheck.Name = "barBtnHydroCheck";
-            barBtnHydroCheck.ItemClick += barBtnHydroCheck_ItemClick;
+            barBtnCheck.Caption = "姘村姏妫�鏌�";
+            barBtnCheck.Id = 1;
+            barBtnCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCheck.ImageOptions.SvgImage");
+            barBtnCheck.Name = "barBtnCheck";
+            barBtnCheck.ItemClick += barBtnCheck_ItemClick;
             // 
-            // barBtnHydroCalcu
+            // barBtnWorkingCalcu
             // 
-            barBtnHydroCalcu.Caption = "璁$畻";
-            barBtnHydroCalcu.Id = 2;
-            barBtnHydroCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroCalcu.ImageOptions.SvgImage");
-            barBtnHydroCalcu.Name = "barBtnHydroCalcu";
-            barBtnHydroCalcu.ItemClick += barBtnHydroCalcu_ItemClick;
+            barBtnWorkingCalcu.Caption = "宸ュ喌璁$畻";
+            barBtnWorkingCalcu.Id = 2;
+            barBtnWorkingCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingCalcu.ImageOptions.SvgImage");
+            barBtnWorkingCalcu.Name = "barBtnWorkingCalcu";
+            barBtnWorkingCalcu.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+            barBtnWorkingCalcu.ItemClick += barBtnHydroCalcu_ItemClick;
             // 
-            // barBtnHydroExportInp
+            // barBtnExportInp
             // 
-            barBtnHydroExportInp.Caption = "瀵煎嚭Inp";
-            barBtnHydroExportInp.Id = 4;
-            barBtnHydroExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroExportInp.ImageOptions.SvgImage");
-            barBtnHydroExportInp.Name = "barBtnHydroExportInp";
-            barBtnHydroExportInp.ItemClick += barBtnHydroExportInp_ItemClick;
+            barBtnExportInp.Caption = "瀵煎嚭Inp鏂囦欢";
+            barBtnExportInp.Id = 4;
+            barBtnExportInp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnExportInp.ImageOptions.SvgImage");
+            barBtnExportInp.Name = "barBtnExportInp";
+            barBtnExportInp.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnExportInp.ItemClick += barBtnExportInp_ItemClick;
             // 
             // barBtnSave
             // 
@@ -143,13 +172,13 @@
             barBtnSave.Name = "barBtnSave";
             barBtnSave.ItemClick += barBtnSave_ItemClick;
             // 
-            // barBtnHydroParterList
+            // barBtnHydroVisualList
             // 
-            barBtnHydroParterList.Caption = "鏋勪欢鏄庣粏";
-            barBtnHydroParterList.Id = 8;
-            barBtnHydroParterList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroParterList.ImageOptions.SvgImage");
-            barBtnHydroParterList.Name = "barBtnHydroParterList";
-            barBtnHydroParterList.ItemClick += barBtnHydroParterList_ItemClick;
+            barBtnHydroVisualList.Caption = "鏋勪欢鏄庣粏";
+            barBtnHydroVisualList.Id = 8;
+            barBtnHydroVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHydroVisualList.ImageOptions.SvgImage");
+            barBtnHydroVisualList.Name = "barBtnHydroVisualList";
+            barBtnHydroVisualList.ItemClick += barBtnHydroVisualList_ItemClick;
             // 
             // barBtnFastShowHidden
             // 
@@ -165,6 +194,7 @@
             barBtnMatchingList.Id = 10;
             barBtnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnMatchingList.ImageOptions.SvgImage");
             barBtnMatchingList.Name = "barBtnMatchingList";
+            barBtnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnMatchingList.ItemClick += barBtnMatchingList_ItemClick;
             // 
             // barBtnUnMatchingList
@@ -173,6 +203,7 @@
             barBtnUnMatchingList.Id = 19;
             barBtnUnMatchingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUnMatchingList.ImageOptions.SvgImage");
             barBtnUnMatchingList.Name = "barBtnUnMatchingList";
+            barBtnUnMatchingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnUnMatchingList.ItemClick += barBtnUnMatchingList_ItemClick;
             // 
             // barBtnSetList
@@ -181,6 +212,7 @@
             barBtnSetList.Id = 21;
             barBtnSetList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetList.ImageOptions.SvgImage");
             barBtnSetList.Name = "barBtnSetList";
+            barBtnSetList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSetList.ItemClick += barBtnSetList_ItemClick;
             // 
             // barBtnSetPumpList
@@ -246,13 +278,14 @@
             barBtnSetJunctionList.Id = 30;
             barBtnSetJunctionList.Name = "barBtnSetJunctionList";
             // 
-            // barBtnParallelAnaly
+            // barBtnCurrentWorkingParallelAnalysis
             // 
-            barBtnParallelAnaly.Caption = "骞惰仈鍒嗘瀽";
-            barBtnParallelAnaly.Id = 31;
-            barBtnParallelAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallelAnaly.ImageOptions.SvgImage");
-            barBtnParallelAnaly.Name = "barBtnParallelAnaly";
-            barBtnParallelAnaly.ItemClick += barBtnAnaly_ItemClick;
+            barBtnCurrentWorkingParallelAnalysis.Caption = "骞惰仈鍒嗘瀽";
+            barBtnCurrentWorkingParallelAnalysis.Id = 31;
+            barBtnCurrentWorkingParallelAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingParallelAnalysis.ImageOptions.SvgImage");
+            barBtnCurrentWorkingParallelAnalysis.Name = "barBtnCurrentWorkingParallelAnalysis";
+            barBtnCurrentWorkingParallelAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnCurrentWorkingParallelAnalysis.ItemClick += barBtnAnaly_ItemClick;
             // 
             // barBtnSearch
             // 
@@ -260,6 +293,7 @@
             barBtnSearch.Id = 32;
             barBtnSearch.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSearch.ImageOptions.SvgImage");
             barBtnSearch.Name = "barBtnSearch";
+            barBtnSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSearch.ItemClick += barBtnSearch_ItemClick;
             // 
             // barBtnGradingSet
@@ -276,6 +310,7 @@
             barBtnGradingApply.Id = 35;
             barBtnGradingApply.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnGradingApply.ImageOptions.SvgImage");
             barBtnGradingApply.Name = "barBtnGradingApply";
+            barBtnGradingApply.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnGradingApply.ItemClick += barBtnGradingApply_ItemClick;
             // 
             // barBtnRefresh
@@ -288,10 +323,11 @@
             // 
             // barBtnSetMark
             // 
-            barBtnSetMark.Caption = "璁剧疆鏍囨敞";
+            barBtnSetMark.Caption = "璁剧疆";
             barBtnSetMark.Id = 40;
             barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage");
             barBtnSetMark.Name = "barBtnSetMark";
+            barBtnSetMark.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
             barBtnSetMark.ItemClick += barBtnSetMark_ItemClick;
             // 
             // barBtnSetReservoirList
@@ -362,9 +398,140 @@
             barBtnSetPressmeterList.Id = 50;
             barBtnSetPressmeterList.Name = "barBtnSetPressmeterList";
             // 
+            // barBtnSetMonitor
+            // 
+            barBtnSetMonitor.Caption = "鐩戞祴鐐�";
+            barBtnSetMonitor.Id = 56;
+            barBtnSetMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitor.ImageOptions.SvgImage");
+            barBtnSetMonitor.Name = "barBtnSetMonitor";
+            barBtnSetMonitor.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnSetMonitor.ItemClick += barBtnSetMonitor_ItemClick;
+            // 
+            // barBtnSetMonitorValue
+            // 
+            barBtnSetMonitorValue.Caption = "鐩戞祴鍊�";
+            barBtnSetMonitorValue.Id = 57;
+            barBtnSetMonitorValue.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitorValue.ImageOptions.SvgImage");
+            barBtnSetMonitorValue.Name = "barBtnSetMonitorValue";
+            barBtnSetMonitorValue.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnSetMonitorValue.ItemClick += barBtnSetMonitorValue_ItemClick;
+            // 
+            // barCkMonitor
+            // 
+            barCkMonitor.Caption = "鏄剧ず";
+            barCkMonitor.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkMonitor.Id = 58;
+            barCkMonitor.Name = "barCkMonitor";
+            barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged;
+            // 
+            // barEditCurrentWorking
+            // 
+            barEditCurrentWorking.Caption = "褰撳墠宸ュ喌";
+            barEditCurrentWorking.Edit = repositoryItemImageComboBox1;
+            barEditCurrentWorking.Id = 63;
+            barEditCurrentWorking.Name = "barEditCurrentWorking";
+            barEditCurrentWorking.EditValueChanged += barEditCurrentWorking_EditValueChanged;
+            // 
+            // repositoryItemImageComboBox1
+            // 
+            repositoryItemImageComboBox1.AutoHeight = false;
+            repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
+            repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
+            // 
+            // barCkMark
+            // 
+            barCkMark.Caption = "鏄剧ず";
+            barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkMark.Id = 65;
+            barCkMark.Name = "barCkMark";
+            barCkMark.CheckedChanged += barCkMark_CheckedChanged;
+            // 
+            // barCkFlowEffect
+            // 
+            barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
+            barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkFlowEffect.Id = 66;
+            barCkFlowEffect.Name = "barCkFlowEffect";
+            barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
+            // 
+            // barCkGrading
+            // 
+            barCkGrading.Caption = "鏄剧ず";
+            barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkGrading.Id = 67;
+            barCkGrading.Name = "barCkGrading";
+            barCkGrading.CheckedChanged += barCkGrading_CheckedChanged;
+            // 
+            // barCkCurrentWorkingCalcuResult
+            // 
+            barCkCurrentWorkingCalcuResult.Caption = "璁$畻缁撴灉";
+            barCkCurrentWorkingCalcuResult.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.AfterText;
+            barCkCurrentWorkingCalcuResult.Id = 68;
+            barCkCurrentWorkingCalcuResult.Name = "barCkCurrentWorkingCalcuResult";
+            // 
+            // barBtnCurrentWorkingLossCurve
+            // 
+            barBtnCurrentWorkingLossCurve.Caption = "鎹熷け鏇茬嚎";
+            barBtnCurrentWorkingLossCurve.Id = 69;
+            barBtnCurrentWorkingLossCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingLossCurve.ImageOptions.SvgImage");
+            barBtnCurrentWorkingLossCurve.Name = "barBtnCurrentWorkingLossCurve";
+            barBtnCurrentWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            // 
+            // barBtnCurrentWorkingLossScale
+            // 
+            barBtnCurrentWorkingLossScale.Caption = "鎹熷け姣斾緥";
+            barBtnCurrentWorkingLossScale.Id = 70;
+            barBtnCurrentWorkingLossScale.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingLossScale.ImageOptions.SvgImage");
+            barBtnCurrentWorkingLossScale.Name = "barBtnCurrentWorkingLossScale";
+            barBtnCurrentWorkingLossScale.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            // 
+            // barBtnCurrentWorkingPowerAnalysis
+            // 
+            barBtnCurrentWorkingPowerAnalysis.Caption = "鑳芥晥鍒嗘瀽";
+            barBtnCurrentWorkingPowerAnalysis.Id = 71;
+            barBtnCurrentWorkingPowerAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingPowerAnalysis.ImageOptions.SvgImage");
+            barBtnCurrentWorkingPowerAnalysis.Name = "barBtnCurrentWorkingPowerAnalysis";
+            barBtnCurrentWorkingPowerAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            // 
+            // barBtnCurrentWorkingMultiAnalysis
+            // 
+            barBtnCurrentWorkingMultiAnalysis.Caption = "缁煎悎鍒嗘瀽";
+            barBtnCurrentWorkingMultiAnalysis.Id = 72;
+            barBtnCurrentWorkingMultiAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurrentWorkingMultiAnalysis.ImageOptions.SvgImage");
+            barBtnCurrentWorkingMultiAnalysis.Name = "barBtnCurrentWorkingMultiAnalysis";
+            barBtnCurrentWorkingMultiAnalysis.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
+            // 
+            // barBtnParallel
+            // 
+            barBtnParallel.Caption = "骞惰仈璁$畻";
+            barBtnParallel.Id = 73;
+            barBtnParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnParallel.ImageOptions.SvgImage");
+            barBtnParallel.Name = "barBtnParallel";
+            barBtnParallel.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            barBtnParallel.ItemClick += barBtnParallel_ItemClick;
+            // 
+            // barBtnRepair
+            // 
+            barBtnRepair.Caption = "绠$綉淇";
+            barBtnRepair.Id = 74;
+            barBtnRepair.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRepair.ImageOptions.SvgImage");
+            barBtnRepair.Name = "barBtnRepair";
+            barBtnRepair.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
+            toolTipItem2.Text = "閫氳繃璇曠畻锛岃皟鏁寸娈典笂涓嬫父";
+            superToolTip2.Items.Add(toolTipItem2);
+            barBtnRepair.SuperTip = superToolTip2;
+            barBtnRepair.ItemClick += barBtnRepair_ItemClick;
+            // 
+            // barBtnWorkingList
+            // 
+            barBtnWorkingList.Caption = "宸ュ喌鍒楄〃";
+            barBtnWorkingList.Id = 75;
+            barBtnWorkingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingList.ImageOptions.SvgImage");
+            barBtnWorkingList.Name = "barBtnWorkingList";
+            // 
             // ribbonPage1
             // 
-            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup1, ribbonPageGroup2, ribbonPageGroup3 });
+            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupMatching, pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
             ribbonPage1.Name = "ribbonPage1";
             ribbonPage1.Text = "ribbonPage1";
             // 
@@ -378,32 +545,62 @@
             // pageGroupModel
             // 
             pageGroupModel.ItemLinks.Add(barBtnFastShowHidden);
+            pageGroupModel.ItemLinks.Add(barBtnHydroVisualList);
             pageGroupModel.ItemLinks.Add(barBtnSearch);
-            pageGroupModel.ItemLinks.Add(barBtnHydroParterList);
             pageGroupModel.ItemLinks.Add(barBtnSetList);
-            pageGroupModel.ItemLinks.Add(barBtnSetMark);
+            pageGroupModel.ItemLinks.Add(barCkFlowEffect);
             pageGroupModel.Name = "pageGroupModel";
             pageGroupModel.Text = "妯″瀷";
+            // 
+            // ribbonPageGroup6
+            // 
+            ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
+            ribbonPageGroup6.ItemLinks.Add(barCkMark);
+            ribbonPageGroup6.Name = "ribbonPageGroup6";
+            ribbonPageGroup6.Text = "鏍囨敞";
             // 
             // ribbonPageGroup1
             // 
             ribbonPageGroup1.ItemLinks.Add(barBtnGradingSet);
             ribbonPageGroup1.ItemLinks.Add(barBtnGradingApply);
+            ribbonPageGroup1.ItemLinks.Add(barCkGrading);
             ribbonPageGroup1.Name = "ribbonPageGroup1";
             ribbonPageGroup1.Text = "棰滆壊鍒嗙骇";
             // 
+            // ribbonPageGroup7
+            // 
+            ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitor);
+            ribbonPageGroup7.ItemLinks.Add(barBtnSetMonitorValue);
+            ribbonPageGroup7.ItemLinks.Add(barCkMonitor);
+            ribbonPageGroup7.Name = "ribbonPageGroup7";
+            ribbonPageGroup7.Text = "鐩戞祴";
+            // 
             // ribbonPageGroup2
             // 
-            ribbonPageGroup2.ItemLinks.Add(barBtnParallelAnaly);
-            ribbonPageGroup2.ItemLinks.Add(barBtnHydroCheck);
-            ribbonPageGroup2.ItemLinks.Add(barBtnHydroCalcu);
+            ribbonPageGroup2.ItemLinks.Add(barBtnCheck);
+            ribbonPageGroup2.ItemLinks.Add(barBtnRepair);
+            ribbonPageGroup2.ItemLinks.Add(barBtnParallel);
+            ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
+            ribbonPageGroup2.ItemLinks.Add(barBtnWorkingCalcu);
             ribbonPageGroup2.Name = "ribbonPageGroup2";
-            ribbonPageGroup2.Text = "姘村姏";
+            ribbonPageGroup2.Text = "姘村姏璁$畻";
+            // 
+            // ribbonPageGroup9
+            // 
+            ribbonPageGroup9.ItemLinks.Add(barEditCurrentWorking);
+            ribbonPageGroup9.ItemLinks.Add(barCkCurrentWorkingCalcuResult);
+            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingParallelAnalysis);
+            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingLossCurve);
+            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingLossScale);
+            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingPowerAnalysis);
+            ribbonPageGroup9.ItemLinks.Add(barBtnCurrentWorkingMultiAnalysis);
+            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingList);
+            ribbonPageGroup9.Name = "ribbonPageGroup9";
+            ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
             // 
             // ribbonPageGroup3
             // 
             ribbonPageGroup3.ItemLinks.Add(barBtnSave);
-            ribbonPageGroup3.ItemLinks.Add(barBtnHydroExportInp);
             ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
             ribbonPageGroup3.Name = "ribbonPageGroup3";
             ribbonPageGroup3.Text = "鏇村...";
@@ -421,9 +618,9 @@
             tabPane1.Location = new Point(0, 128);
             tabPane1.Name = "tabPane1";
             tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
-            tabPane1.RegularSize = new Size(931, 407);
+            tabPane1.RegularSize = new Size(1666, 407);
             tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(931, 407);
+            tabPane1.Size = new Size(1666, 407);
             tabPane1.TabIndex = 1;
             tabPane1.Text = "tabPane1";
             // 
@@ -431,7 +628,7 @@
             // 
             tabPageBimface.Caption = "涓夌淮妯″瀷";
             tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(931, 401);
+            tabPageBimface.Size = new Size(1666, 374);
             // 
             // tabPageQ3d
             // 
@@ -442,25 +639,26 @@
             // dockManager1
             // 
             dockManager1.Form = this;
-            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlRight, docPnlBottom });
+            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1, docPnlBottom });
             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" });
             // 
             // docPnlRight
             // 
             docPnlRight.Controls.Add(controlContainerRight);
-            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+            docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
+            docPnlRight.FloatVertical = true;
             docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
-            docPnlRight.Location = new Point(931, 128);
+            docPnlRight.Location = new Point(4, 26);
             docPnlRight.Name = "docPnlRight";
-            docPnlRight.OriginalSize = new Size(275, 200);
-            docPnlRight.Size = new Size(275, 572);
+            docPnlRight.OriginalSize = new Size(200, 200);
+            docPnlRight.Size = new Size(268, 516);
             docPnlRight.Text = "灞炴��";
             // 
             // controlContainerRight
             // 
-            controlContainerRight.Location = new Point(4, 26);
+            controlContainerRight.Location = new Point(0, 0);
             controlContainerRight.Name = "controlContainerRight";
-            controlContainerRight.Size = new Size(268, 543);
+            controlContainerRight.Size = new Size(268, 516);
             controlContainerRight.TabIndex = 0;
             // 
             // docPnlBottom
@@ -471,14 +669,14 @@
             docPnlBottom.Location = new Point(0, 535);
             docPnlBottom.Name = "docPnlBottom";
             docPnlBottom.OriginalSize = new Size(200, 165);
-            docPnlBottom.Size = new Size(931, 165);
+            docPnlBottom.Size = new Size(1666, 165);
             docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
             // 
             // controlContainerBottom
             // 
             controlContainerBottom.Location = new Point(3, 27);
             controlContainerBottom.Name = "controlContainerBottom";
-            controlContainerBottom.Size = new Size(925, 135);
+            controlContainerBottom.Size = new Size(1660, 135);
             controlContainerBottom.TabIndex = 0;
             // 
             // svgImg32
@@ -513,6 +711,41 @@
             rmSet.Ribbon = ribbonControl1;
             rmSet.BeforePopup += rmSet_BeforePopup;
             // 
+            // docPnlWorking
+            // 
+            docPnlWorking.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill;
+            docPnlWorking.ID = new Guid("6a12321b-176a-43ac-b64f-fbaa0f6806ce");
+            docPnlWorking.Location = new Point(4, 26);
+            docPnlWorking.Name = "docPnlWorking";
+            docPnlWorking.OriginalSize = new Size(200, 200);
+            docPnlWorking.Size = new Size(268, 516);
+            docPnlWorking.Text = "宸ュ喌";
+            // 
+            // dockPanel2
+            // 
+            dockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+            dockPanel2.ID = new Guid("9e1401bf-eba9-4e65-8e3e-50e08d389108");
+            dockPanel2.Location = new Point(1666, 128);
+            dockPanel2.Name = "dockPanel2";
+            dockPanel2.OriginalSize = new Size(275, 200);
+            dockPanel2.Size = new Size(275, 572);
+            dockPanel2.Tabbed = true;
+            dockPanel2.Text = "panelContainer1";
+            // 
+            // dockPanel1
+            // 
+            dockPanel1.ActiveChild = docPnlRight;
+            dockPanel1.Controls.Add(docPnlRight);
+            dockPanel1.Controls.Add(docPnlWorking);
+            dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
+            dockPanel1.ID = new Guid("9c1c1fcf-0dc2-460f-ad97-7c25e496b4ae");
+            dockPanel1.Location = new Point(1666, 128);
+            dockPanel1.Name = "dockPanel1";
+            dockPanel1.OriginalSize = new Size(275, 200);
+            dockPanel1.Size = new Size(275, 572);
+            dockPanel1.Tabbed = true;
+            dockPanel1.Text = "panelContainer1";
+            // 
             // XhsProjectSimulationCorePage
             // 
             Appearance.BackColor = SystemColors.Control;
@@ -520,13 +753,14 @@
             AutoScaleDimensions = new SizeF(7F, 14F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabPane1);
-            Controls.Add(docPnlRight);
             Controls.Add(docPnlBottom);
+            Controls.Add(dockPanel1);
             Controls.Add(ribbonControl1);
             Margin = new Padding(2);
             Name = "XhsProjectSimulationCorePage";
-            Size = new Size(1206, 700);
+            Size = new Size(1941, 700);
             ((ISupportInitialize)ribbonControl1).EndInit();
+            ((ISupportInitialize)repositoryItemImageComboBox1).EndInit();
             ((ISupportInitialize)tabPane1).EndInit();
             tabPane1.ResumeLayout(false);
             ((ISupportInitialize)dockManager1).EndInit();
@@ -534,6 +768,7 @@
             docPnlBottom.ResumeLayout(false);
             ((ISupportInitialize)svgImg32).EndInit();
             ((ISupportInitialize)rmSet).EndInit();
+            dockPanel1.ResumeLayout(false);
             ResumeLayout(false);
             PerformLayout();
         }
@@ -541,14 +776,14 @@
         #endregion
 
         private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroCheck;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroCalcu;
+        private DevExpress.XtraBars.BarButtonItem barBtnCheck;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingCalcu;
         private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupMatching;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroExportInp;
+        private DevExpress.XtraBars.BarButtonItem barBtnExportInp;
         private DevExpress.XtraBars.BarButtonItem barBtnSave;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
-        private DevExpress.XtraBars.BarButtonItem barBtnHydroParterList;
+        private DevExpress.XtraBars.BarButtonItem barBtnHydroVisualList;
         private DevExpress.XtraBars.BarButtonItem barBtnFastShowHidden;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
@@ -560,7 +795,6 @@
         private DevExpress.XtraBars.Docking.DockPanel docPnlRight;
         private DevExpress.XtraBars.Docking.ControlContainer controlContainerRight;
         private DevExpress.Utils.SvgImageCollection svgImg32;
-        private DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
         private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
         private DevExpress.XtraBars.BarButtonItem barBtnSetList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
@@ -572,7 +806,7 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnParallelAnaly;
+        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingParallelAnalysis;
         private DevExpress.XtraBars.BarButtonItem barBtnSearch;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
         private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
@@ -592,5 +826,28 @@
         private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
         private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
+        public DevExpress.XtraBars.BarButtonItem barBtnUnMatchingList;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup6;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup7;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetMonitor;
+        private DevExpress.XtraBars.BarButtonItem barBtnSetMonitorValue;
+        private DevExpress.XtraBars.BarCheckItem barCkMonitor;
+        private DevExpress.XtraBars.BarEditItem barEditCurrentWorking;
+        private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup9;
+        private DevExpress.XtraBars.BarCheckItem barCkMark;
+        private DevExpress.XtraBars.BarCheckItem barCkFlowEffect;
+        private DevExpress.XtraBars.BarCheckItem barCkGrading;
+        private DevExpress.XtraBars.BarCheckItem barCkCurrentWorkingCalcuResult;
+        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingLossCurve;
+        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingLossScale;
+        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingPowerAnalysis;
+        private DevExpress.XtraBars.BarButtonItem barBtnCurrentWorkingMultiAnalysis;
+        private DevExpress.XtraBars.BarButtonItem barBtnParallel;
+        private DevExpress.XtraBars.BarButtonItem barBtnRepair;
+        private DevExpress.XtraBars.BarButtonItem barBtnWorkingList;
+        private DevExpress.XtraBars.Docking.DockPanel dockPanel2;
+        private DevExpress.XtraBars.Docking.DockPanel docPnlWorking;
+        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
     }
 }

--
Gitblit v1.9.3