From 4607e20cecf567ee2e86f9a07158deaa1b74d622 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 09 十二月 2024 15:05:19 +0800
Subject: [PATCH] 方案修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.resx             |  120 ++
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs                 |  711 ++++++-------
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj                                   |  455 ++++----
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs      |   46 
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultExtensions.cs                        |   13 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs         |   28 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user                              |    6 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeHelper.cs            |   12 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs          |  144 ++
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs         |    3 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.resx        |  161 +++
 /dev/null                                                                                               |  717 -------------
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.resx               |   26 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.Designer.cs |  261 ++++
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.cs               |   25 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeManager.cs           |   15 
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs                        |  230 +---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs        |  112 -
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeViewModel.cs         |   57 +
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/08-function/SimulationFunctionHelper.cs       |    6 
 20 files changed, 1,524 insertions(+), 1,624 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/08-function/SimulationFunctionHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/08-function/SimulationFunctionHelper.cs
index 1156227..0f11b3b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/08-function/SimulationFunctionHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/00-core/08-function/SimulationFunctionHelper.cs
@@ -19,17 +19,13 @@
         /// <summary>
         /// 姘村姏妯℃嫙
         /// </summary>
-        public const string Simulation = "simulation-project-site-core";
+        public const string Simulation = "simulation-project-site-simulation";
 
         /// <summary>
         /// 姘村姏宸ュ喌
         /// </summary>
         public const string Working = "simulatio- project-site-working";
 
-        /// <summary>
-        /// 姘村姏鏂规
-        /// </summary>
-        public const string Scheme = "simulation-project-site-scheme";
 
 
     }
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs
new file mode 100644
index 0000000..9d12ffa
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.Designer.cs
@@ -0,0 +1,46 @@
+锘縩amespace HStation.WinFrmUI
+{
+    partial class CreateXhsSchemeDlg
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            SuspendLayout();
+            // 
+            // CreateXhsSchemeDlg
+            // 
+            AutoScaleDimensions = new SizeF(7F, 14F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1062, 638);
+            Name = "CreateXhsSchemeDlg";
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "鍒涘缓鏂规";
+            ResumeLayout(false);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.cs
new file mode 100644
index 0000000..8b2602f
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.cs
@@ -0,0 +1,25 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace HStation.WinFrmUI
+{
+    public partial class CreateXhsSchemeDlg : DevExpress.XtraEditors.XtraForm
+    {
+        public CreateXhsSchemeDlg()
+        {
+            InitializeComponent();
+            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
+
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeDlg.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    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
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeHelper.cs
new file mode 100644
index 0000000..60a7790
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeHelper.cs
@@ -0,0 +1,12 @@
+锘縩amespace HStation.WinFrmUI
+{
+    /// <summary>
+    ///
+    /// </summary>
+    public class CreateXhsSchemeHelper
+    {
+
+
+
+    }
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeManager.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeManager.cs
new file mode 100644
index 0000000..8dc2f2f
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeManager.cs
@@ -0,0 +1,15 @@
+锘縩amespace HStation.WinFrmUI
+{
+    /// <summary>
+    /// 鍒涘缓鏂规绠$悊
+    /// </summary>
+    public class CreateXhsSchemeManager : WizardManager<CreateXhsSchemeViewModel>
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        public CreateXhsSchemeManager(CreateXhsSchemeViewModel t) : base(t)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeViewModel.cs
new file mode 100644
index 0000000..f127d2a
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/00-core/CreateXhsSchemeViewModel.cs
@@ -0,0 +1,57 @@
+锘縰sing HStation.BLL;
+
+namespace HStation.WinFrmUI
+{
+    /// <summary>
+    /// 鍒涘缓鏂规 view model
+    /// </summary>
+    public class CreateXhsSchemeViewModel
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public CreateXhsSchemeViewModel() { }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public CreateXhsSchemeViewModel(XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo)
+        {
+            this.Project = project;
+            this.ProjectSite = projectSite;
+            this.HydroInfo = hydroInfo;
+        }
+
+
+        #region 鍒濆鍖�
+
+        /// <summary>
+        /// 椤圭洰
+        /// </summary>
+        public XhsProjectVmo Project { get; set; }
+
+        /// <summary>
+        /// 椤圭洰绔�
+        /// </summary>
+        public XhsProjectSiteVmo ProjectSite { get; set; }
+
+        /// <summary>
+        /// 姘村姏淇℃伅
+        /// </summary>
+        public Yw.Model.HydroModelInfo HydroInfo { get; set; }
+
+        #endregion
+
+        #region 鍩烘湰淇℃伅
+
+        public XhsScheme Scheme { get; set; }
+
+
+        #endregion
+
+
+
+
+
+    }
+}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.Designer.cs
new file mode 100644
index 0000000..1506f00
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.Designer.cs
@@ -0,0 +1,261 @@
+锘縩amespace HStation.WinFrmUI
+{
+    partial class CreateXhsSchemeInfoPage
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new Container();
+            EditorButtonImageOptions editorButtonImageOptions1 = new EditorButtonImageOptions();
+            ComponentResourceManager resources = new ComponentResourceManager(typeof(CreateXhsSchemeInfoPage));
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            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();
+            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            setFlagsEditCtrl1 = new SetFlagsEditCtrl();
+            txtDescription = new MemoEdit();
+            txtTagNme = new TextEdit();
+            txtCustomer = new TextEdit();
+            txtName = new TextEdit();
+            btnEditSelectModelFile = new ButtonEdit();
+            Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+            ((ISupportInitialize)layoutControl1).BeginInit();
+            layoutControl1.SuspendLayout();
+            ((ISupportInitialize)txtDescription.Properties).BeginInit();
+            ((ISupportInitialize)txtTagNme.Properties).BeginInit();
+            ((ISupportInitialize)txtCustomer.Properties).BeginInit();
+            ((ISupportInitialize)txtName.Properties).BeginInit();
+            ((ISupportInitialize)btnEditSelectModelFile.Properties).BeginInit();
+            ((ISupportInitialize)Root).BeginInit();
+            ((ISupportInitialize)layoutControlItem2).BeginInit();
+            ((ISupportInitialize)layoutControlItem7).BeginInit();
+            ((ISupportInitialize)layoutControlItem5).BeginInit();
+            ((ISupportInitialize)layoutControlItem8).BeginInit();
+            ((ISupportInitialize)layoutControlItem6).BeginInit();
+            ((ISupportInitialize)layoutControlItem3).BeginInit();
+            ((ISupportInitialize)dxErrorProvider1).BeginInit();
+            SuspendLayout();
+            // 
+            // layoutControl1
+            // 
+            layoutControl1.Controls.Add(setFlagsEditCtrl1);
+            layoutControl1.Controls.Add(txtDescription);
+            layoutControl1.Controls.Add(txtTagNme);
+            layoutControl1.Controls.Add(txtCustomer);
+            layoutControl1.Controls.Add(txtName);
+            layoutControl1.Controls.Add(btnEditSelectModelFile);
+            layoutControl1.Dock = DockStyle.Fill;
+            layoutControl1.Location = new Point(0, 0);
+            layoutControl1.Name = "layoutControl1";
+            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1200, 175, 650, 400);
+            layoutControl1.Root = Root;
+            layoutControl1.Size = new Size(859, 464);
+            layoutControl1.TabIndex = 0;
+            layoutControl1.Text = "layoutControl1";
+            // 
+            // setFlagsEditCtrl1
+            // 
+            setFlagsEditCtrl1.Location = new Point(113, 36);
+            setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
+            setFlagsEditCtrl1.Size = new Size(314, 20);
+            setFlagsEditCtrl1.TabIndex = 5;
+            // 
+            // txtDescription
+            // 
+            txtDescription.Location = new Point(113, 87);
+            txtDescription.Name = "txtDescription";
+            txtDescription.Size = new Size(734, 365);
+            txtDescription.StyleController = layoutControl1;
+            txtDescription.TabIndex = 7;
+            // 
+            // txtTagNme
+            // 
+            txtTagNme.Location = new Point(532, 36);
+            txtTagNme.Name = "txtTagNme";
+            txtTagNme.Size = new Size(315, 20);
+            txtTagNme.StyleController = layoutControl1;
+            txtTagNme.TabIndex = 4;
+            // 
+            // txtCustomer
+            // 
+            txtCustomer.Location = new Point(532, 12);
+            txtCustomer.Name = "txtCustomer";
+            txtCustomer.Size = new Size(315, 20);
+            txtCustomer.StyleController = layoutControl1;
+            txtCustomer.TabIndex = 3;
+            // 
+            // txtName
+            // 
+            txtName.Location = new Point(113, 12);
+            txtName.Name = "txtName";
+            txtName.Size = new Size(314, 20);
+            txtName.StyleController = layoutControl1;
+            txtName.TabIndex = 0;
+            // 
+            // btnEditSelectModelFile
+            // 
+            btnEditSelectModelFile.EditValue = "";
+            btnEditSelectModelFile.Location = new Point(113, 60);
+            btnEditSelectModelFile.Name = "btnEditSelectModelFile";
+            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+            editorButtonImageOptions1.SvgImageSize = new Size(15, 15);
+            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
+            editorButtonImageOptions2.SvgImageSize = new Size(15, 15);
+            btnEditSelectModelFile.Properties.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "鏈湴鏂囦欢", "Local", null, DevExpress.Utils.ToolTipAnchor.Default), new EditorButton(ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "浜戞枃浠�", "Http", null, DevExpress.Utils.ToolTipAnchor.Default) });
+            btnEditSelectModelFile.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
+            btnEditSelectModelFile.Size = new Size(734, 23);
+            btnEditSelectModelFile.StyleController = layoutControl1;
+            btnEditSelectModelFile.TabIndex = 6;
+            // 
+            // Root
+            // 
+            Root.AppearanceItemCaption.Options.UseTextOptions = true;
+            Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            Root.GroupBordersVisible = false;
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem7, layoutControlItem5, layoutControlItem8, layoutControlItem6, layoutControlItem3 });
+            Root.Name = "Root";
+            Root.Size = new Size(859, 464);
+            Root.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            layoutControlItem2.AllowHtmlStringInCaption = true;
+            layoutControlItem2.Control = txtName;
+            layoutControlItem2.Location = new Point(0, 0);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new Size(419, 24);
+            layoutControlItem2.Text = "<color=red>*</color>鍚嶇О锛�";
+            layoutControlItem2.TextSize = new Size(89, 14);
+            // 
+            // layoutControlItem7
+            // 
+            layoutControlItem7.Control = txtDescription;
+            layoutControlItem7.Location = new Point(0, 75);
+            layoutControlItem7.Name = "layoutControlItem7";
+            layoutControlItem7.Size = new Size(839, 369);
+            layoutControlItem7.Text = "璇存槑";
+            layoutControlItem7.TextSize = new Size(89, 14);
+            // 
+            // layoutControlItem5
+            // 
+            layoutControlItem5.Control = setFlagsEditCtrl1;
+            layoutControlItem5.Location = new Point(0, 24);
+            layoutControlItem5.Name = "layoutControlItem5";
+            layoutControlItem5.Size = new Size(419, 24);
+            layoutControlItem5.Text = "鏍囩锛�";
+            layoutControlItem5.TextSize = new Size(89, 14);
+            // 
+            // layoutControlItem8
+            // 
+            layoutControlItem8.AppearanceItemCaption.FontSizeDelta = 1;
+            layoutControlItem8.AppearanceItemCaption.Options.UseFont = true;
+            layoutControlItem8.Control = btnEditSelectModelFile;
+            layoutControlItem8.Location = new Point(0, 48);
+            layoutControlItem8.Name = "layoutControlItem8";
+            layoutControlItem8.Size = new Size(839, 27);
+            layoutControlItem8.Text = "閫夋嫨妯″瀷鏂囦欢:";
+            layoutControlItem8.TextSize = new Size(89, 17);
+            // 
+            // layoutControlItem6
+            // 
+            layoutControlItem6.Control = txtTagNme;
+            layoutControlItem6.Location = new Point(419, 24);
+            layoutControlItem6.Name = "layoutControlItem6";
+            layoutControlItem6.Size = new Size(420, 24);
+            layoutControlItem6.Text = "鏍囧織锛�";
+            layoutControlItem6.TextSize = new Size(89, 14);
+            // 
+            // layoutControlItem3
+            // 
+            layoutControlItem3.Control = txtCustomer;
+            layoutControlItem3.Location = new Point(419, 0);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Size = new Size(420, 24);
+            layoutControlItem3.Text = "瀹㈡埛锛�";
+            layoutControlItem3.TextSize = new Size(89, 14);
+            // 
+            // dxErrorProvider1
+            // 
+            dxErrorProvider1.ContainerControl = this;
+            // 
+            // InputXhsProjectInfoWizardPage
+            // 
+            AutoScaleDimensions = new SizeF(7F, 14F);
+            AutoScaleMode = AutoScaleMode.Font;
+            Controls.Add(layoutControl1);
+            Name = "InputXhsProjectInfoWizardPage";
+            Size = new Size(859, 464);
+            ((ISupportInitialize)layoutControl1).EndInit();
+            layoutControl1.ResumeLayout(false);
+            ((ISupportInitialize)txtDescription.Properties).EndInit();
+            ((ISupportInitialize)txtTagNme.Properties).EndInit();
+            ((ISupportInitialize)txtCustomer.Properties).EndInit();
+            ((ISupportInitialize)txtName.Properties).EndInit();
+            ((ISupportInitialize)btnEditSelectModelFile.Properties).EndInit();
+            ((ISupportInitialize)Root).EndInit();
+            ((ISupportInitialize)layoutControlItem2).EndInit();
+            ((ISupportInitialize)layoutControlItem7).EndInit();
+            ((ISupportInitialize)layoutControlItem5).EndInit();
+            ((ISupportInitialize)layoutControlItem8).EndInit();
+            ((ISupportInitialize)layoutControlItem6).EndInit();
+            ((ISupportInitialize)layoutControlItem3).EndInit();
+            ((ISupportInitialize)dxErrorProvider1).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraEditors.TextEdit txtName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+        private DevExpress.XtraEditors.TextEdit txtCustomer;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraEditors.TextEdit txtTagNme;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraEditors.MemoEdit txtDescription;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private SetFlagsEditCtrl setFlagsEditCtrl1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraEditors.ButtonEdit btnEditSelectModelFile;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+    }
+}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs
new file mode 100644
index 0000000..96e8214
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs
@@ -0,0 +1,144 @@
+锘縩amespace HStation.WinFrmUI
+{
+    public partial class CreateXhsSchemeInfoPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<CreateXhsSchemeViewModel>
+    {
+        public CreateXhsSchemeInfoPage()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// 椤甸潰鐘舵�佹敼鍙樹簨浠�
+        /// </summary>
+        public event Action PageStateChangedEvent;
+
+        private CreateXhsSchemeViewModel _vm = null;//鎿嶄綔瀵硅薄
+        private bool _isInitialize = false;//鏄惁鍒濆鍖�
+        private Lazy<HStation.BLL.XhsProject> _bllProject = new(() => new HStation.BLL.XhsProject());//椤圭洰bll
+        private Lazy<Yw.BLL.SysFlag> _bllFlag = new(() => new Yw.BLL.SysFlag());//鏍囩bll
+        public static Action AutoAddItem;
+        public static Action DeleteItem;
+        public static bool AllowImport = false;
+
+
+        public async void InitialPage(ImportXhsProjectViewModel t)
+        {
+            if (_isInitialize)
+            {
+                return;
+            }
+            //_vm = t;
+            //_isInitialize = true;
+            //var allFlagList = await _bllFlag.Value.GetBySysType(HStation.Xhs.DataType.XhsProject);
+            //if (allFlagList == null)
+            //{
+            //    return;
+            //}
+            //this.setFlagsEditCtrl1.SetBindingData(allFlagList.Select(x => x.Name).ToList(), null);
+        }
+
+        /// <summary>
+        /// 鍒濆鍖�
+        /// </summary>
+        public void InitialPage(CreateXhsSchemeViewModel t)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// 鍏佽涓婁竴姝�
+        /// </summary>
+        public bool AllowPrev
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 鍏佽涓嬩竴姝�
+        /// </summary>
+        public bool AllowNext
+        {
+            get
+            {
+                return _isInitialize;
+            }
+        }
+
+        /// <summary>
+        /// 鍏佽鍙栨秷
+        /// </summary>
+        public bool AllowCancel
+        {
+            get { return true; }
+        }
+
+        /// <summary>
+        /// 鍏佽瀹屾垚
+        /// </summary>
+        public bool AllowComplete
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// 鑳藉惁涓婁竴姝�
+        /// </summary>
+        public bool CanPrev()
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// 鑳藉惁涓嬩竴姝�
+        /// </summary>
+        public bool CanNext()
+        {
+            if (!_isInitialize)
+            {
+                return false;
+            }
+            this.dxErrorProvider1.ClearErrors();
+            if (string.IsNullOrEmpty(this.txtName.Text.Trim()))
+            {
+                this.dxErrorProvider1.SetError(this.txtName, "蹇呭~椤�");
+                return false;
+            }
+            var tagName = this.txtTagNme.Text.Trim();
+            if (!string.IsNullOrEmpty(tagName))
+            {
+                if (_bllProject.Value.IsExistTagName(tagName).Result)
+                {
+                    this.dxErrorProvider1.SetError(this.txtTagNme, "鏍囪宸插瓨鍦�");
+                    return false;
+                }
+            }
+            //_vm.Name = this.txtName.Text.Trim();
+            //_vm.Customer = this.txtCustomer.Text.Trim();
+            //_vm.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
+            //_vm.TagName = tagName;
+            //_vm.Description = this.txtDescription.Text.Trim();
+            return true;
+        }
+
+        /// <summary>
+        /// 鑳藉惁鍏抽棴
+        /// </summary>
+        public bool CanCancel()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// 鑳藉惁瀹屾垚
+        /// </summary>
+        public bool CanComplete()
+        {
+            return false;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.resx
new file mode 100644
index 0000000..d2bb617
--- /dev/null
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.resx
@@ -0,0 +1,161 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    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
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iT3BlbiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
+        MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0
+        MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBkPSJN
+        Mi4yLDI1LjJsNS41LTEyYzAuMy0wLjcsMS0xLjIsMS44LTEuMkgyNlY5YzAtMC42LTAuNC0xLTEtMUgx
+        MlY1YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw0LDIsNC40LDIsNXYyMCAgIGMwLDAuMiwwLDAuMywwLjEs
+        MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K
+        ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx
+        NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <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
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKsCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5C
+        bGFja3tmaWxsOiM3MjcyNzI7fQoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLlJlZHtmaWxsOiNEMTFD
+        MUM7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2xvdWR5XzFfIj4NCiAgICA8cGF0aCBkPSJNMjcsMThjLTAu
+        NCwwLTAuOCwwLjEtMS4yLDAuMmMwLjEtMC40LDAuMi0wLjgsMC4yLTEuMmMwLTIuOC0yLjItNS01LTVj
+        LTAuNSwwLTEuMSwwLjEtMS42LDAuMyAgIEMxOC40LDkuOCwxNS45LDgsMTMsOGMtMy45LDAtNywzLjEt
+        Nyw3YzAsMC4zLDAsMC43LDAuMSwxYzAsMC0wLjEsMC0wLjEsMGMtMi4yLDAtNCwxLjgtNCw0YzAsMi4y
+        LDEuOCw0LDQsNGgyMWMxLjcsMCwzLTEuMywzLTMgICBTMjguNywxOCwyNywxOHoiIGNsYXNzPSJCbHVl
+        IiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <metadata name="dxErrorProvider1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.Designer.cs
deleted file mode 100644
index 3ded6ad..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.Designer.cs
+++ /dev/null
@@ -1,811 +0,0 @@
-锘縰sing HStation.WinFrmUI.Xhs;
-
-namespace HStation.WinFrmUI
-{
-    partial class XhsProjectSimulationSchemePage
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            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();
-            barBtnCheck = new DevExpress.XtraBars.BarButtonItem();
-            barBtnCalcu = new DevExpress.XtraBars.BarButtonItem();
-            barBtnExportInp = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSave = new DevExpress.XtraBars.BarButtonItem();
-            barBtnVisualList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetPumpList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetValveList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetPipeList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetElbowsList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetThreelinkList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetFourlinkList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetTranslationList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetExchangerList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetJunctionList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnPumpAnaly = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSearch = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetGradingList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnApplyGradingList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetMark = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetReservoirList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetTankList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetWaterboxList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetBluntheadList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetNozzleList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetHydrantList = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetMeterList = new DevExpress.XtraBars.BarButtonItem();
-            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();
-            barCkMark = new DevExpress.XtraBars.BarCheckItem();
-            barCkFlowEffect = new DevExpress.XtraBars.BarCheckItem();
-            barCkGrading = new DevExpress.XtraBars.BarCheckItem();
-            barCkCalcu = new DevExpress.XtraBars.BarCheckItem();
-            barBtnWorkingLossCurve = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingLossStatistics = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingPower = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingAnaly = new DevExpress.XtraBars.BarButtonItem();
-            barBtnPumpParallel = new DevExpress.XtraBars.BarButtonItem();
-            barBtnRepair = new DevExpress.XtraBars.BarButtonItem();
-            barBtnWorkingEvaluation = new DevExpress.XtraBars.BarButtonItem();
-            barBtnSetVisualVisible = new DevExpress.XtraBars.BarButtonItem();
-            barCkDecorator = new DevExpress.XtraBars.BarCheckItem();
-            barBtnAddWorking = new DevExpress.XtraBars.BarButtonItem();
-            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            pageGroupModel = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
-            ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            tabPane1 = new DevExpress.XtraBars.Navigation.TabPane();
-            tabPageBimface = new DevExpress.XtraBars.Navigation.TabNavigationPage();
-            tabPageQ3d = new DevExpress.XtraBars.Navigation.TabNavigationPage();
-            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
-            docPnlRight = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainerRight = new DevExpress.XtraBars.Docking.ControlContainer();
-            docPnlBottom = new DevExpress.XtraBars.Docking.DockPanel();
-            controlContainerBottom = new DevExpress.XtraBars.Docking.ControlContainer();
-            svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
-            rmSet = new DevExpress.XtraBars.Ribbon.RadialMenu(components);
-            ((ISupportInitialize)ribbonControl1).BeginInit();
-            ((ISupportInitialize)repositoryItemImageComboBox1).BeginInit();
-            ((ISupportInitialize)tabPane1).BeginInit();
-            tabPane1.SuspendLayout();
-            ((ISupportInitialize)dockManager1).BeginInit();
-            docPnlRight.SuspendLayout();
-            docPnlBottom.SuspendLayout();
-            ((ISupportInitialize)svgImg32).BeginInit();
-            ((ISupportInitialize)rmSet).BeginInit();
-            SuspendLayout();
-            // 
-            // ribbonControl1
-            // 
-            ribbonControl1.ExpandCollapseItem.Id = 0;
-            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
-            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnCheck, barBtnCalcu, barBtnExportInp, barBtnSave, barBtnVisualList, barBtnSetList, barBtnSetPumpList, barBtnSetValveList, barBtnSetPipeList, barBtnSetElbowsList, barBtnSetThreelinkList, barBtnSetFourlinkList, barBtnSetTranslationList, barBtnSetExchangerList, barBtnSetJunctionList, barBtnPumpAnaly, barBtnSearch, barBtnSetGradingList, barBtnApplyGradingList, barBtnRefresh, barBtnSetMark, barBtnSetReservoirList, barBtnSetTankList, barBtnSetWaterboxList, barBtnSetBluntheadList, barBtnSetNozzleList, barBtnSetHydrantList, barBtnSetMeterList, barBtnSetCompressorList, barBtnSetFlowmeterList, barBtnSetPressmeterList, barBtnSetMonitor, barBtnSetMonitorValue, barCkMonitor, barCkMark, barCkFlowEffect, barCkGrading, barCkCalcu, barBtnWorkingLossCurve, barBtnWorkingLossStatistics, barBtnWorkingPower, barBtnWorkingAnaly, barBtnPumpParallel, barBtnRepair, barBtnWorkingEvaluation, barBtnSetVisualVisible, barCkDecorator, barBtnAddWorking });
-            ribbonControl1.Location = new Point(0, 0);
-            ribbonControl1.MaxItemId = 81;
-            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(1464, 128);
-            ribbonControl1.Toolbar.ShowCustomizeItem = false;
-            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
-            // 
-            // barBtnCheck
-            // 
-            barBtnCheck.Caption = "姘村姏妫�鏌�";
-            barBtnCheck.Id = 1;
-            barBtnCheck.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCheck.ImageOptions.SvgImage");
-            barBtnCheck.Name = "barBtnCheck";
-            barBtnCheck.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnCheck.ItemClick += barBtnCheck_ItemClick;
-            // 
-            // barBtnCalcu
-            // 
-            barBtnCalcu.Caption = "璁$畻";
-            barBtnCalcu.Id = 2;
-            barBtnCalcu.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCalcu.ImageOptions.SvgImage");
-            barBtnCalcu.Name = "barBtnCalcu";
-            barBtnCalcu.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
-            barBtnCalcu.ItemClick += barBtnCalcu_ItemClick;
-            // 
-            // barBtnExportInp
-            // 
-            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
-            // 
-            barBtnSave.Caption = "淇濆瓨";
-            barBtnSave.Id = 5;
-            barBtnSave.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSave.ImageOptions.SvgImage");
-            barBtnSave.Name = "barBtnSave";
-            barBtnSave.ItemClick += barBtnSave_ItemClick;
-            // 
-            // barBtnVisualList
-            // 
-            barBtnVisualList.Caption = "鏋勪欢鏄庣粏";
-            barBtnVisualList.Id = 8;
-            barBtnVisualList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnVisualList.ImageOptions.SvgImage");
-            barBtnVisualList.Name = "barBtnVisualList";
-            barBtnVisualList.ItemClick += barBtnVisualList_ItemClick;
-            // 
-            // barBtnSetList
-            // 
-            barBtnSetList.Caption = "鎵归噺閰嶇疆";
-            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
-            // 
-            barBtnSetPumpList.Caption = "姘存车";
-            barBtnSetPumpList.CloseRadialMenuOnItemClick = true;
-            barBtnSetPumpList.Id = 22;
-            barBtnSetPumpList.Name = "barBtnSetPumpList";
-            // 
-            // barBtnSetValveList
-            // 
-            barBtnSetValveList.Caption = "闃�闂�";
-            barBtnSetValveList.CloseRadialMenuOnItemClick = true;
-            barBtnSetValveList.Id = 23;
-            barBtnSetValveList.Name = "barBtnSetValveList";
-            // 
-            // barBtnSetPipeList
-            // 
-            barBtnSetPipeList.Caption = "绠¢亾";
-            barBtnSetPipeList.CloseRadialMenuOnItemClick = true;
-            barBtnSetPipeList.Id = 24;
-            barBtnSetPipeList.Name = "barBtnSetPipeList";
-            // 
-            // barBtnSetElbowsList
-            // 
-            barBtnSetElbowsList.Caption = "寮ご";
-            barBtnSetElbowsList.CloseRadialMenuOnItemClick = true;
-            barBtnSetElbowsList.Id = 25;
-            barBtnSetElbowsList.Name = "barBtnSetElbowsList";
-            // 
-            // barBtnSetThreelinkList
-            // 
-            barBtnSetThreelinkList.Caption = "涓夐��";
-            barBtnSetThreelinkList.CloseRadialMenuOnItemClick = true;
-            barBtnSetThreelinkList.Id = 26;
-            barBtnSetThreelinkList.Name = "barBtnSetThreelinkList";
-            // 
-            // barBtnSetFourlinkList
-            // 
-            barBtnSetFourlinkList.Caption = "鍥涢��";
-            barBtnSetFourlinkList.CloseRadialMenuOnItemClick = true;
-            barBtnSetFourlinkList.Id = 27;
-            barBtnSetFourlinkList.Name = "barBtnSetFourlinkList";
-            // 
-            // barBtnSetTranslationList
-            // 
-            barBtnSetTranslationList.Caption = "杩囨浮浠�";
-            barBtnSetTranslationList.CloseRadialMenuOnItemClick = true;
-            barBtnSetTranslationList.Id = 28;
-            barBtnSetTranslationList.Name = "barBtnSetTranslationList";
-            // 
-            // barBtnSetExchangerList
-            // 
-            barBtnSetExchangerList.Caption = "鎹㈢儹鍣�";
-            barBtnSetExchangerList.CloseRadialMenuOnItemClick = true;
-            barBtnSetExchangerList.Id = 29;
-            barBtnSetExchangerList.Name = "barBtnSetExchangerList";
-            // 
-            // barBtnSetJunctionList
-            // 
-            barBtnSetJunctionList.Caption = "杩炴帴鑺傜偣";
-            barBtnSetJunctionList.CloseRadialMenuOnItemClick = true;
-            barBtnSetJunctionList.Id = 30;
-            barBtnSetJunctionList.Name = "barBtnSetJunctionList";
-            // 
-            // barBtnPumpAnaly
-            // 
-            barBtnPumpAnaly.Caption = "姘存车鍒嗘瀽";
-            barBtnPumpAnaly.Id = 31;
-            barBtnPumpAnaly.ImageOptions.Image = Xhs.Core.Properties.Resources.pump_run_32;
-            barBtnPumpAnaly.ImageOptions.LargeImage = Xhs.Core.Properties.Resources.pump_run_32;
-            barBtnPumpAnaly.Name = "barBtnPumpAnaly";
-            barBtnPumpAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnPumpAnaly.ItemClick += barBtnPumpAnaly_ItemClick;
-            // 
-            // barBtnSearch
-            // 
-            barBtnSearch.Caption = "鏋勪欢鏌ヨ";
-            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;
-            // 
-            // barBtnSetGradingList
-            // 
-            barBtnSetGradingList.Caption = "閰嶇疆";
-            barBtnSetGradingList.Id = 34;
-            barBtnSetGradingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetGradingList.ImageOptions.SvgImage");
-            barBtnSetGradingList.Name = "barBtnSetGradingList";
-            barBtnSetGradingList.ItemClick += barBtnSetGradingList_ItemClick;
-            // 
-            // barBtnApplyGradingList
-            // 
-            barBtnApplyGradingList.Caption = "搴旂敤";
-            barBtnApplyGradingList.Id = 35;
-            barBtnApplyGradingList.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnApplyGradingList.ImageOptions.SvgImage");
-            barBtnApplyGradingList.Name = "barBtnApplyGradingList";
-            barBtnApplyGradingList.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnApplyGradingList.ItemClick += barBtnApplyGradingList_ItemClick;
-            // 
-            // barBtnRefresh
-            // 
-            barBtnRefresh.Caption = "鍒锋柊";
-            barBtnRefresh.Id = 39;
-            barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
-            barBtnRefresh.Name = "barBtnRefresh";
-            barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
-            // 
-            // barBtnSetMark
-            // 
-            barBtnSetMark.Caption = "璁剧疆";
-            barBtnSetMark.Id = 40;
-            barBtnSetMark.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMark.ImageOptions.SvgImage");
-            barBtnSetMark.Name = "barBtnSetMark";
-            barBtnSetMark.ItemClick += barBtnSetMark_ItemClick;
-            // 
-            // barBtnSetReservoirList
-            // 
-            barBtnSetReservoirList.Caption = "姘村簱";
-            barBtnSetReservoirList.CloseRadialMenuOnItemClick = true;
-            barBtnSetReservoirList.Id = 41;
-            barBtnSetReservoirList.Name = "barBtnSetReservoirList";
-            // 
-            // barBtnSetTankList
-            // 
-            barBtnSetTankList.Caption = "姘存睜";
-            barBtnSetTankList.CloseRadialMenuOnItemClick = true;
-            barBtnSetTankList.Id = 42;
-            barBtnSetTankList.Name = "barBtnSetTankList";
-            // 
-            // barBtnSetWaterboxList
-            // 
-            barBtnSetWaterboxList.Caption = "姘寸";
-            barBtnSetWaterboxList.CloseRadialMenuOnItemClick = true;
-            barBtnSetWaterboxList.Id = 43;
-            barBtnSetWaterboxList.Name = "barBtnSetWaterboxList";
-            // 
-            // barBtnSetBluntheadList
-            // 
-            barBtnSetBluntheadList.Caption = "闂峰ご";
-            barBtnSetBluntheadList.CloseRadialMenuOnItemClick = true;
-            barBtnSetBluntheadList.Id = 44;
-            barBtnSetBluntheadList.Name = "barBtnSetBluntheadList";
-            // 
-            // barBtnSetNozzleList
-            // 
-            barBtnSetNozzleList.Caption = "鍠峰槾";
-            barBtnSetNozzleList.CloseRadialMenuOnItemClick = true;
-            barBtnSetNozzleList.Id = 45;
-            barBtnSetNozzleList.Name = "barBtnSetNozzleList";
-            // 
-            // barBtnSetHydrantList
-            // 
-            barBtnSetHydrantList.Caption = "娑堢伀鏍�";
-            barBtnSetHydrantList.Id = 46;
-            barBtnSetHydrantList.Name = "barBtnSetHydrantList";
-            // 
-            // barBtnSetMeterList
-            // 
-            barBtnSetMeterList.Caption = "姘磋〃";
-            barBtnSetMeterList.CloseRadialMenuOnItemClick = true;
-            barBtnSetMeterList.Id = 47;
-            barBtnSetMeterList.Name = "barBtnSetMeterList";
-            // 
-            // barBtnSetCompressorList
-            // 
-            barBtnSetCompressorList.Caption = "绌哄帇鏈�";
-            barBtnSetCompressorList.CloseRadialMenuOnItemClick = true;
-            barBtnSetCompressorList.Id = 48;
-            barBtnSetCompressorList.Name = "barBtnSetCompressorList";
-            // 
-            // barBtnSetFlowmeterList
-            // 
-            barBtnSetFlowmeterList.Caption = "娴侀噺璁�";
-            barBtnSetFlowmeterList.CloseRadialMenuOnItemClick = true;
-            barBtnSetFlowmeterList.Id = 49;
-            barBtnSetFlowmeterList.Name = "barBtnSetFlowmeterList";
-            // 
-            // barBtnSetPressmeterList
-            // 
-            barBtnSetPressmeterList.Caption = "鍘嬪姏琛�";
-            barBtnSetPressmeterList.Id = 50;
-            barBtnSetPressmeterList.Name = "barBtnSetPressmeterList";
-            // 
-            // barBtnSetMonitor
-            // 
-            barBtnSetMonitor.Caption = "鐩戞祴鐐�";
-            barBtnSetMonitor.Enabled = false;
-            barBtnSetMonitor.Id = 56;
-            barBtnSetMonitor.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetMonitor.ImageOptions.SvgImage");
-            barBtnSetMonitor.Name = "barBtnSetMonitor";
-            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.BeforeText;
-            barCkMonitor.Id = 58;
-            barCkMonitor.Name = "barCkMonitor";
-            barCkMonitor.CheckedChanged += barCkMonitor_CheckedChanged;
-            // 
-            // barCkMark
-            // 
-            barCkMark.Caption = "甯歌";
-            barCkMark.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
-            barCkMark.Id = 65;
-            barCkMark.Name = "barCkMark";
-            barCkMark.CheckedChanged += barCkMark_CheckedChanged;
-            // 
-            // barCkFlowEffect
-            // 
-            barCkFlowEffect.Caption = "姘存祦鍔ㄧ敾";
-            barCkFlowEffect.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
-            barCkFlowEffect.Id = 66;
-            barCkFlowEffect.Name = "barCkFlowEffect";
-            barCkFlowEffect.CheckedChanged += barCkFlowEffect_CheckedChanged;
-            // 
-            // barCkGrading
-            // 
-            barCkGrading.Caption = "鏄剧ず";
-            barCkGrading.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
-            barCkGrading.Id = 67;
-            barCkGrading.Name = "barCkGrading";
-            barCkGrading.CheckedChanged += barCkGrading_CheckedChanged;
-            // 
-            // barCkCalcu
-            // 
-            barCkCalcu.Caption = "璁$畻";
-            barCkCalcu.CheckBoxVisibility = DevExpress.XtraBars.CheckBoxVisibility.BeforeText;
-            barCkCalcu.Id = 68;
-            barCkCalcu.Name = "barCkCalcu";
-            barCkCalcu.CheckedChanged += barCkCalcu_CheckedChanged;
-            // 
-            // barBtnWorkingLossCurve
-            // 
-            barBtnWorkingLossCurve.Caption = "鎹熷け鏇茬嚎";
-            barBtnWorkingLossCurve.Id = 69;
-            barBtnWorkingLossCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossCurve.ImageOptions.SvgImage");
-            barBtnWorkingLossCurve.Name = "barBtnWorkingLossCurve";
-            barBtnWorkingLossCurve.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnWorkingLossCurve.ItemClick += barBtnWorkingLossCurve_ItemClick;
-            // 
-            // barBtnWorkingLossStatistics
-            // 
-            barBtnWorkingLossStatistics.Caption = "鎹熷け缁熻";
-            barBtnWorkingLossStatistics.Id = 70;
-            barBtnWorkingLossStatistics.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingLossStatistics.ImageOptions.SvgImage");
-            barBtnWorkingLossStatistics.Name = "barBtnWorkingLossStatistics";
-            barBtnWorkingLossStatistics.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnWorkingLossStatistics.ItemClick += barBtnWorkingLossStatistics_ItemClick;
-            // 
-            // barBtnWorkingPower
-            // 
-            barBtnWorkingPower.Caption = "鑳芥晥鍒嗘瀽";
-            barBtnWorkingPower.Id = 71;
-            barBtnWorkingPower.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingPower.ImageOptions.SvgImage");
-            barBtnWorkingPower.Name = "barBtnWorkingPower";
-            barBtnWorkingPower.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnWorkingPower.ItemClick += barBtnWorkingPower_ItemClick;
-            // 
-            // barBtnWorkingAnaly
-            // 
-            barBtnWorkingAnaly.Caption = "缁煎悎鍒嗘瀽";
-            barBtnWorkingAnaly.Id = 72;
-            barBtnWorkingAnaly.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingAnaly.ImageOptions.SvgImage");
-            barBtnWorkingAnaly.Name = "barBtnWorkingAnaly";
-            barBtnWorkingAnaly.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
-            barBtnWorkingAnaly.ItemClick += barBtnWorkingAnaly_ItemClick;
-            // 
-            // barBtnPumpParallel
-            // 
-            barBtnPumpParallel.Caption = "骞惰仈妯℃嫙";
-            barBtnPumpParallel.Id = 73;
-            barBtnPumpParallel.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpParallel.ImageOptions.SvgImage");
-            barBtnPumpParallel.Name = "barBtnPumpParallel";
-            barBtnPumpParallel.ItemClick += barBtnPumpParallel_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;
-            // 
-            // barBtnWorkingEvaluation
-            // 
-            barBtnWorkingEvaluation.Caption = "绮惧害璇勪及";
-            barBtnWorkingEvaluation.Id = 76;
-            barBtnWorkingEvaluation.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnWorkingEvaluation.ImageOptions.SvgImage");
-            barBtnWorkingEvaluation.Name = "barBtnWorkingEvaluation";
-            barBtnWorkingEvaluation.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnWorkingEvaluation.ItemClick += barBtnWorkingEvaluation_ItemClick;
-            // 
-            // barBtnSetVisualVisible
-            // 
-            barBtnSetVisualVisible.Caption = "鏋勪欢鏄剧ず";
-            barBtnSetVisualVisible.Id = 77;
-            barBtnSetVisualVisible.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetVisualVisible.ImageOptions.SvgImage");
-            barBtnSetVisualVisible.Name = "barBtnSetVisualVisible";
-            barBtnSetVisualVisible.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barBtnSetVisualVisible.ItemClick += barBtnSetVisualVisible_ItemClick;
-            // 
-            // barCkDecorator
-            // 
-            barCkDecorator.BindableChecked = true;
-            barCkDecorator.Caption = "涓�閿樉闅�";
-            barCkDecorator.Checked = true;
-            barCkDecorator.Id = 78;
-            barCkDecorator.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barCkDecorator.ImageOptions.SvgImage");
-            barCkDecorator.Name = "barCkDecorator";
-            barCkDecorator.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
-            barCkDecorator.CheckedChanged += barCkDecorator_CheckedChanged;
-            // 
-            // barBtnAddWorking
-            // 
-            barBtnAddWorking.Caption = "鏂板宸ュ喌";
-            barBtnAddWorking.Enabled = false;
-            barBtnAddWorking.Id = 79;
-            barBtnAddWorking.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAddWorking.ImageOptions.SvgImage");
-            barBtnAddWorking.Name = "barBtnAddWorking";
-            barBtnAddWorking.ItemClick += barBtnAddWorking_ItemClick;
-            // 
-            // ribbonPage1
-            // 
-            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { pageGroupModel, ribbonPageGroup6, ribbonPageGroup1, ribbonPageGroup7, ribbonPageGroup5, ribbonPageGroup2, ribbonPageGroup9, ribbonPageGroup3 });
-            ribbonPage1.Name = "ribbonPage1";
-            ribbonPage1.Text = "ribbonPage1";
-            // 
-            // pageGroupModel
-            // 
-            pageGroupModel.ItemLinks.Add(barCkDecorator);
-            pageGroupModel.ItemLinks.Add(barBtnSetVisualVisible);
-            pageGroupModel.ItemLinks.Add(barBtnVisualList);
-            pageGroupModel.ItemLinks.Add(barBtnSearch);
-            pageGroupModel.ItemLinks.Add(barBtnSetList);
-            pageGroupModel.ItemLinks.Add(barCkFlowEffect);
-            pageGroupModel.Name = "pageGroupModel";
-            pageGroupModel.Text = "妯″瀷";
-            // 
-            // ribbonPageGroup6
-            // 
-            ribbonPageGroup6.ItemLinks.Add(barBtnSetMark);
-            ribbonPageGroup6.ItemLinks.Add(barCkMark);
-            ribbonPageGroup6.ItemLinks.Add(barCkCalcu);
-            ribbonPageGroup6.Name = "ribbonPageGroup6";
-            ribbonPageGroup6.Text = "鏍囨敞";
-            // 
-            // ribbonPageGroup1
-            // 
-            ribbonPageGroup1.ItemLinks.Add(barBtnSetGradingList);
-            ribbonPageGroup1.ItemLinks.Add(barBtnApplyGradingList);
-            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 = "鐩戞祴";
-            // 
-            // ribbonPageGroup5
-            // 
-            ribbonPageGroup5.ItemLinks.Add(barBtnPumpParallel);
-            ribbonPageGroup5.Name = "ribbonPageGroup5";
-            ribbonPageGroup5.Text = "姘存车";
-            // 
-            // ribbonPageGroup2
-            // 
-            ribbonPageGroup2.ItemLinks.Add(barBtnCheck);
-            ribbonPageGroup2.ItemLinks.Add(barBtnRepair);
-            ribbonPageGroup2.ItemLinks.Add(barBtnExportInp);
-            ribbonPageGroup2.ItemLinks.Add(barBtnCalcu);
-            ribbonPageGroup2.ItemLinks.Add(barBtnAddWorking);
-            ribbonPageGroup2.Name = "ribbonPageGroup2";
-            ribbonPageGroup2.Text = "姘村姏璁$畻";
-            // 
-            // ribbonPageGroup9
-            // 
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingEvaluation);
-            ribbonPageGroup9.ItemLinks.Add(barBtnPumpAnaly);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingPower);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossCurve);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingLossStatistics);
-            ribbonPageGroup9.ItemLinks.Add(barBtnWorkingAnaly);
-            ribbonPageGroup9.Name = "ribbonPageGroup9";
-            ribbonPageGroup9.Text = "宸ュ喌鍒嗘瀽";
-            // 
-            // ribbonPageGroup3
-            // 
-            ribbonPageGroup3.ItemLinks.Add(barBtnSave);
-            ribbonPageGroup3.ItemLinks.Add(barBtnRefresh);
-            ribbonPageGroup3.Name = "ribbonPageGroup3";
-            ribbonPageGroup3.Text = "鏇村...";
-            // 
-            // repositoryItemImageComboBox1
-            // 
-            repositoryItemImageComboBox1.AutoHeight = false;
-            repositoryItemImageComboBox1.Buttons.AddRange(new EditorButton[] { new EditorButton(ButtonPredefines.Combo) });
-            repositoryItemImageComboBox1.Name = "repositoryItemImageComboBox1";
-            // 
-            // ribbonPageGroup4
-            // 
-            ribbonPageGroup4.Name = "ribbonPageGroup4";
-            ribbonPageGroup4.Text = "鏇村";
-            // 
-            // tabPane1
-            // 
-            tabPane1.Controls.Add(tabPageBimface);
-            tabPane1.Controls.Add(tabPageQ3d);
-            tabPane1.Dock = DockStyle.Fill;
-            tabPane1.Location = new Point(0, 128);
-            tabPane1.Name = "tabPane1";
-            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
-            tabPane1.RegularSize = new Size(1189, 407);
-            tabPane1.SelectedPage = tabPageBimface;
-            tabPane1.Size = new Size(1189, 407);
-            tabPane1.TabIndex = 1;
-            tabPane1.Text = "tabPane1";
-            // 
-            // tabPageBimface
-            // 
-            tabPageBimface.Caption = "涓夌淮妯″瀷";
-            tabPageBimface.Name = "tabPageBimface";
-            tabPageBimface.Size = new Size(1189, 374);
-            // 
-            // tabPageQ3d
-            // 
-            tabPageQ3d.Caption = "姘村姏妯″瀷";
-            tabPageQ3d.Name = "tabPageQ3d";
-            tabPageQ3d.Size = new Size(931, 374);
-            // 
-            // dockManager1
-            // 
-            dockManager1.Form = this;
-            dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { docPnlRight, 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.FloatVertical = true;
-            docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
-            docPnlRight.Location = new Point(1189, 128);
-            docPnlRight.Name = "docPnlRight";
-            docPnlRight.OriginalSize = new Size(275, 200);
-            docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
-            docPnlRight.SavedIndex = 0;
-            docPnlRight.Size = new Size(275, 572);
-            docPnlRight.Text = "灞炴��";
-            // 
-            // controlContainerRight
-            // 
-            controlContainerRight.Location = new Point(4, 26);
-            controlContainerRight.Name = "controlContainerRight";
-            controlContainerRight.Size = new Size(268, 543);
-            controlContainerRight.TabIndex = 0;
-            // 
-            // docPnlBottom
-            // 
-            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.Name = "docPnlBottom";
-            docPnlBottom.OriginalSize = new Size(200, 165);
-            docPnlBottom.Size = new Size(1189, 165);
-            docPnlBottom.Text = "搴曢儴鍔熻兘闈㈡澘";
-            // 
-            // controlContainerBottom
-            // 
-            controlContainerBottom.Location = new Point(3, 27);
-            controlContainerBottom.Name = "controlContainerBottom";
-            controlContainerBottom.Size = new Size(1183, 135);
-            controlContainerBottom.TabIndex = 0;
-            // 
-            // svgImg32
-            // 
-            svgImg32.ImageSize = new Size(32, 32);
-            svgImg32.Add("calculatesheet", "image://svgimages/spreadsheet/calculatesheet.svg");
-            // 
-            // rmSet
-            // 
-            rmSet.AllowGlyphSkinning = true;
-            rmSet.Glyph = (Image)resources.GetObject("rmSet.Glyph");
-            rmSet.ItemLinks.Add(barBtnSetReservoirList);
-            rmSet.ItemLinks.Add(barBtnSetTankList);
-            rmSet.ItemLinks.Add(barBtnSetWaterboxList);
-            rmSet.ItemLinks.Add(barBtnSetPumpList);
-            rmSet.ItemLinks.Add(barBtnSetValveList);
-            rmSet.ItemLinks.Add(barBtnSetPipeList);
-            rmSet.ItemLinks.Add(barBtnSetNozzleList);
-            rmSet.ItemLinks.Add(barBtnSetHydrantList);
-            rmSet.ItemLinks.Add(barBtnSetBluntheadList);
-            rmSet.ItemLinks.Add(barBtnSetElbowsList);
-            rmSet.ItemLinks.Add(barBtnSetThreelinkList);
-            rmSet.ItemLinks.Add(barBtnSetFourlinkList);
-            rmSet.ItemLinks.Add(barBtnSetMeterList);
-            rmSet.ItemLinks.Add(barBtnSetFlowmeterList);
-            rmSet.ItemLinks.Add(barBtnSetPressmeterList);
-            rmSet.ItemLinks.Add(barBtnSetTranslationList);
-            rmSet.ItemLinks.Add(barBtnSetExchangerList);
-            rmSet.ItemLinks.Add(barBtnSetCompressorList);
-            rmSet.ItemLinks.Add(barBtnSetJunctionList);
-            rmSet.Name = "rmSet";
-            rmSet.Ribbon = ribbonControl1;
-            rmSet.BeforePopup += rmSet_BeforePopup;
-            // 
-            // XhsProjectSimulationCorePage
-            // 
-            Appearance.BackColor = SystemColors.Control;
-            Appearance.Options.UseBackColor = true;
-            AutoScaleDimensions = new SizeF(7F, 14F);
-            AutoScaleMode = AutoScaleMode.Font;
-            Controls.Add(tabPane1);
-            Controls.Add(docPnlBottom);
-            Controls.Add(docPnlRight);
-            Controls.Add(ribbonControl1);
-            Margin = new Padding(2);
-            Name = "XhsProjectSimulationCorePage";
-            Size = new Size(1464, 700);
-            ((ISupportInitialize)ribbonControl1).EndInit();
-            ((ISupportInitialize)repositoryItemImageComboBox1).EndInit();
-            ((ISupportInitialize)tabPane1).EndInit();
-            tabPane1.ResumeLayout(false);
-            ((ISupportInitialize)dockManager1).EndInit();
-            docPnlRight.ResumeLayout(false);
-            docPnlBottom.ResumeLayout(false);
-            ((ISupportInitialize)svgImg32).EndInit();
-            ((ISupportInitialize)rmSet).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
-        private DevExpress.XtraBars.BarButtonItem barBtnCheck;
-        private DevExpress.XtraBars.BarButtonItem barBtnCalcu;
-        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage1;
-        private DevExpress.XtraBars.BarButtonItem barBtnExportInp;
-        private DevExpress.XtraBars.BarButtonItem barBtnSave;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
-        private DevExpress.XtraBars.BarButtonItem barBtnVisualList;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup4;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
-        private DevExpress.XtraBars.Navigation.TabPane tabPane1;
-        private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageBimface;
-        private DevExpress.XtraBars.Navigation.TabNavigationPage tabPageQ3d;
-        private DevExpress.XtraBars.Docking.DockManager dockManager1;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlRight;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainerRight;
-        private DevExpress.Utils.SvgImageCollection svgImg32;
-        private DevExpress.XtraBars.Ribbon.RadialMenu rmSet;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetPumpList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetValveList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetPipeList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetElbowsList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetThreelinkList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetFourlinkList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetTranslationList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetExchangerList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetJunctionList;
-        private DevExpress.XtraBars.BarButtonItem barBtnPumpAnaly;
-        private DevExpress.XtraBars.BarButtonItem barBtnSearch;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup pageGroupModel;
-        private DevExpress.XtraBars.Docking.DockPanel docPnlBottom;
-        private DevExpress.XtraBars.Docking.ControlContainer controlContainerBottom;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetGradingList;
-        private DevExpress.XtraBars.BarButtonItem barBtnApplyGradingList;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
-        private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetMark;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetReservoirList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetTankList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetWaterboxList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetBluntheadList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetNozzleList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetHydrantList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetMeterList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetCompressorList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetFlowmeterList;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetPressmeterList;
-        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.Ribbon.RibbonPageGroup ribbonPageGroup9;
-        private DevExpress.XtraBars.BarCheckItem barCkMark;
-        private DevExpress.XtraBars.BarCheckItem barCkFlowEffect;
-        private DevExpress.XtraBars.BarCheckItem barCkGrading;
-        private DevExpress.XtraBars.BarCheckItem barCkCalcu;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossCurve;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingLossStatistics;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingPower;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingAnaly;
-        private DevExpress.XtraBars.BarButtonItem barBtnPumpParallel;
-        private DevExpress.XtraBars.BarButtonItem barBtnRepair;
-        private DevExpress.XtraBars.BarButtonItem barBtnWorkingEvaluation;
-        private DevExpress.XtraBars.BarButtonItem barBtnSetVisualVisible;
-        private DevExpress.XtraBars.BarCheckItem barCkDecorator;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup5;
-        private DevExpress.XtraBars.BarButtonItem barBtnAddWorking;
-        private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
-    }
-}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.cs
deleted file mode 100644
index 82d6b0f..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.cs
+++ /dev/null
@@ -1,2388 +0,0 @@
-锘縰sing DevExpress.Diagram.Core.Native;
-using DevExpress.Mvvm.Native;
-using DevExpress.Utils.MVVM;
-using DevExpress.XtraMap;
-using HStation.WinFrmUI.PhartRelation;
-using Mapster;
-using NPOI.SS.Formula.Functions;
-using System.Diagnostics;
-using Yw.EPAnet;
-using Yw.Hydro;
-using Yw.Model;
-using Yw.Vmo;
-using Yw.WinFrmUI.Q3d;
-
-namespace HStation.WinFrmUI
-{
-    public partial class XhsProjectSimulationSchemePage : DocumentPage
-    {
-        public XhsProjectSimulationSchemePage()
-        {
-            InitializeComponent();
-            this.PageTitle.Caption = "鏂规妯℃嫙";
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-        }
-
-        /// <summary>
-        /// 鏂板宸ュ喌浜嬩欢
-        /// </summary>
-        public event Action<HydroWorkingVmo> AppendWorkingEvent;
-
-        private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
-        private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
-        private XhsSchemeVmo _scheme = null;//鏂规
-        private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
-        private Dictionary<HydroWorkingVmo, bool> _allWorkingCheckedListDict = null;//鎵�鏈夊伐鍐甸�夋嫨鍒楄〃瀛楀吀
-
-        /// <summary>
-        /// 缁戝畾鏁版嵁
-        /// </summary>
-        public void SetBindingData
-            (
-                XhsProjectVmo project,
-                XhsProjectSiteVmo projectSite,
-                XhsSchemeVmo scheme,
-                Yw.Model.HydroModelInfo hydroInfo,
-                Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict
-            )
-        {
-            _project = project;
-            _projectSite = projectSite;
-            _scheme = scheme;
-            _hydroInfo = hydroInfo;
-            _allWorkingCheckedListDict = allWorkingCheckedListDict;
-            this.PageTitle.Caption = $"{_project.Name}\r\n鏂规妯℃嫙";
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栨暟鎹�
-        /// </summary>
-        public override void InitialDataSource()
-        {
-            base.InitialDataSource();
-            ShowBimfaceCtrl();
-            ShowQ3dCtrl();
-            ShowPropertyCtrl();
-        }
-
-        #region BIM鎺т欢
-
-        //bimface鎺т欢
-        private SimulationBimfaceCtrl _bimfaceCtrl = null;
-
-        //鑾峰彇 bimface 鎺т欢
-        private async Task<SimulationBimfaceCtrl> GetBimfaceCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_bimfaceCtrl == null)
-            {
-                var overlay = this.ShowOverlay();
-                _bimfaceCtrl = new SimulationBimfaceCtrl();
-                _bimfaceCtrl.Dock = DockStyle.Fill;
-                await _bimfaceCtrl.InitialData(_project, _projectSite);
-                _bimfaceCtrl.LoadCompletedEvent += () =>
-                {//view鍔犺浇瀹屾垚浜嬩欢
-                    overlay.Close();
-                    this.barCkDecorator.Checked = false;
-                    this.barCkGrading.Checked = true;
-                };
-                _bimfaceCtrl.HydroMouseLeftClickEvent += (code) =>
-                {//榧犳爣宸﹂敭鐐瑰嚮浜嬩欢
-                    var visualListHelper = GetVisualListHelper();
-                    var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Bimface);
-                };
-            }
-            return _bimfaceCtrl;
-        }
-
-        //鏄剧ず bimface 鎺т欢
-        private async void ShowBimfaceCtrl()
-        {
-            var bimfaceCtrl = await GetBimfaceCtrl();
-            this.tabPageBimface.Controls.Clear();
-            this.tabPageBimface.Controls.Add(bimfaceCtrl);
-        }
-
-        #endregion
-
-        #region Q3d鎺т欢
-
-        //Q3d 鎺т欢
-        private XhsProjectSimulationQ3dCtrl _q3dCtrl = null;
-
-        //鑾峰彇 Q3d 鎺т欢
-        private XhsProjectSimulationQ3dCtrl GetQ3dCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_q3dCtrl == null)
-            {
-                _q3dCtrl = new XhsProjectSimulationQ3dCtrl();
-                _q3dCtrl.Dock = DockStyle.Fill;
-                _q3dCtrl.InitialData(() => _hydroInfo);
-                _q3dCtrl.SelectedPartersChangedEvent += (codes) =>
-                {
-                    var visualListHelper = GetVisualListHelper();
-                    var visuals = visualListHelper.GetVisualList(codes);
-                    SelectVisual(visuals?.LastOrDefault(), eVisualSource.Q3d);
-                };
-            }
-            return _q3dCtrl;
-        }
-
-        //鏄剧ず Q3d 鎺т欢
-        private void ShowQ3dCtrl()
-        {
-            var q3dCtrl = GetQ3dCtrl();
-            this.tabPageQ3d.Controls.Clear();
-            this.tabPageQ3d.Controls.Add(q3dCtrl);
-        }
-
-        #endregion
-
-        #region 灞炴�ф帶浠�
-
-        //灞炴�ф帶浠�
-        private SimulationPropertyCtrl _propertyCtrl = null;
-
-        //鑾峰彇灞炴�ф帶浠�
-        private SimulationPropertyCtrl GetPropertyCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_propertyCtrl == null)
-            {
-                _propertyCtrl = new SimulationPropertyCtrl();
-                _propertyCtrl.Dock = DockStyle.Fill;
-                _propertyCtrl.HydroViewEvent += (visual) =>
-                {
-                    SelectVisual(visual, eVisualSource.Property);
-                };
-                _propertyCtrl.BlinkLinkNodeEvent += async (link, linkNodeCode) =>
-                { //寮鸿皟杩炴帴鑺傜偣
-                    if (link == null)
-                    {
-                        return;
-                    }
-                    var visualListHelper = GetVisualListHelper();
-                    var linkNode = visualListHelper.GetVisual(linkNodeCode);
-                    if (linkNode == null)
-                    {
-                        return;
-                    }
-                    var blinkCodes = new List<string>();
-                    if (linkNode.GetType() == typeof(HydroJunctionInfo))
-                    {
-                        var allLinkList = visualListHelper.GetLinkList();
-                        if (allLinkList == null || allLinkList.Count < 1)
-                        {
-                            return;
-                        }
-                        var linkList = allLinkList.Where(x => (x.StartCode == linkNodeCode || x.EndCode == linkNodeCode) && x.Code != linkNodeCode).ToList();
-                        if (linkList == null || linkList.Count < 1)
-                        {
-                            return;
-                        }
-                        blinkCodes.AddRange(linkList.Select(x => x.Code));
-                    }
-                    else
-                    {
-                        blinkCodes.Add(linkNodeCode);
-                    }
-
-                    await _bimfaceCtrl?.ClearBlinkComponents();
-                    await _bimfaceCtrl?.SetBlinkComponents(blinkCodes);
-                    await Task.Delay(5000);
-                    await _bimfaceCtrl?.ClearBlinkComponents();
-                };
-                _propertyCtrl.PropertyValueChangedEvent += async (visual) =>
-                {
-                    if (visual == null)
-                    {
-                        return;
-                    }
-                    UpdateVisualListCtrl();
-                    var gradingHelper = await GetGradingHelper();
-                    gradingHelper.Set();
-                };
-                _propertyCtrl.MarkPropertyValueChangedEvent += async (visual) =>
-                {
-                    //鏍囨敞灞炴�у彂鐢熸敼鍙�
-                    //鍒ゆ柇褰撳墠鏄惁鏈夋爣娉ㄥ睍绀猴紝鑻ユ湁鍒欐洿鏂版爣娉紝鏈�濂芥槸鏇存柊鍗曚釜鏍囨敞
-                    var markHelper = await GetMarkHelper();
-                    markHelper.Set(visual);
-                };
-                _propertyCtrl.GradingPropertyValueChangedEvent += async (visual) =>
-                {
-                    //鍒嗙骇灞炴�у彂鐢熸敼鍙�
-                    //鍒ゆ柇褰撳墠鏄惁鏈夊垎绾у睍绀猴紝鑻ユ湁鍒欐洿鏂板垎绾э紝鏈�濂芥槸鏇存柊鍗曚釜鍒嗙骇
-                    var gradingHelper = await GetGradingHelper();
-                    gradingHelper.Set(visual);
-                };
-                _propertyCtrl.FlowEffectPropertyValueChangedEvent += async (visual) =>
-                {
-                    //娴佸悜灞炴�у彂鐢熸敼鍙�
-                    //鍒ゆ柇娴佸悜鏄惁鍔犺浇锛屽鏋滃姞杞藉垯鏇存柊娴佸悜锛屾渶濂芥槸鏇存柊鍗曚釜娴佸悜
-                    var flowEffectHelper = await GetFlowEffectHelper();
-                    flowEffectHelper.Set(visual);
-                };
-
-            }
-            return _propertyCtrl;
-        }
-
-        //灞炴�ф帶浠舵槸鍚﹀彲瑙�
-        private bool IsPropertyCtrlVisible
-        {
-            get
-            {
-                if (this.docPnlRight.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
-                {
-                    if (this.controlContainerRight.Controls.Count > 0)
-                    {
-                        if (this.controlContainerRight.Controls[0] is SimulationPropertyCtrl)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-
-        //鏄剧ず灞炴�ф帶浠�
-        private void ShowPropertyCtrl()
-        {
-            if (IsPropertyCtrlVisible)
-            {
-                return;
-            }
-            var propertyCtrl = GetPropertyCtrl();
-            this.controlContainerRight.Controls.Clear();
-            this.controlContainerRight.Controls.Add(propertyCtrl);
-            this.docPnlRight.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlRight.Text = "灞炴��";
-            this.docPnlRight.Width = 300;
-        }
-
-        //璁剧疆灞炴�ф帶浠�
-        private void SetPropertyCtrl(HydroVisualInfo visual)
-        {
-            ShowPropertyCtrl();
-            var visualVmListHelper = GetVisualVmListHelper();
-            var vm = visualVmListHelper.GetVisual(visual);
-            _propertyCtrl.SelectedObject = vm;
-        }
-
-        //鏇存柊灞炴�ф帶浠�
-        private void UpdatePropertyCtrl()
-        {
-            _propertyCtrl?.UpdateRows();
-        }
-
-        //娓呯悊灞炴�ф帶浠�
-        private void ClearPropertyCtrl()
-        {
-            if (_propertyCtrl != null)
-            {
-                _propertyCtrl.SelectedObject = null;
-            }
-        }
-
-        #endregion
-
-        #region 閫夋嫨鏋勪欢
-
-        //鍙鏉ユ簮
-        protected enum eVisualSource
-        {
-            None,
-            Bimface,
-            Q3d,
-            Property,
-            List,
-            Search,
-            Monitor,
-            Check,
-            Calcu,
-            Warning,
-        }
-
-        //閫夋嫨鏋勪欢
-        private Yw.Model.HydroVisualInfo _visual = null;
-
-        //閫夋嫨鏋勪欢
-        private void SelectVisual(HydroVisualInfo visual, eVisualSource source)
-        {
-            _visual = visual;
-            switch (source)
-            {
-                case eVisualSource.None:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Bimface:
-                    {
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Q3d:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Property:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                    }
-                    break;
-                case eVisualSource.List:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Search:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Monitor:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Check:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Calcu:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                case eVisualSource.Warning:
-                    {
-                        _bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
-                        this.barBtnSetMonitor.Enabled = visual != null;
-                        SetPropertyCtrl(visual);
-                    }
-                    break;
-                default: break;
-            }
-        }
-
-        #endregion
-
-        #region 鏋勪欢鏄庣粏
-
-        #region 鍙鍒楄〃
-
-        //鍙鍒楄〃杈呭姪绫�
-        private SimulationVisualListHelper _visualListHelper = null;
-
-        //鑾峰彇鍙鍒楄〃杈呭姪绫�
-        private SimulationVisualListHelper GetVisualListHelper()
-        {
-            if (_visualListHelper == null)
-            {
-                _visualListHelper = new SimulationVisualListHelper();
-                _visualListHelper.InitialData(_hydroInfo);
-            }
-            return _visualListHelper;
-        }
-
-        #endregion
-
-        #region 瑙嗗浘鍒楄〃
-
-        //鍙瑙嗗浘鍒楄〃杈呭姪绫�
-        private SimulationVisualVmListHelper _visualVmListHelper = null;
-
-        //鑾峰彇鍙瑙嗗浘鍒楄〃杈呭姪绫�
-        private SimulationVisualVmListHelper GetVisualVmListHelper()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_visualVmListHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                var calcuResultHelper = GetCalcuResultHelper();
-                _visualVmListHelper = new SimulationVisualVmListHelper(visualListHelper, calcuResultHelper);
-            }
-            return _visualVmListHelper;
-        }
-
-        #endregion
-
-        #region 鏄庣粏鎺т欢
-
-        //鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroVisualListCtrl _visualListCtrl = null;
-
-        //鑾峰彇鏋勪欢鏄庣粏鎺т欢
-        private Yw.WinFrmUI.HydroVisualListCtrl GetVisualListCtrl()
-        {
-            if (_visualListCtrl == null)
-            {
-                _visualListCtrl = new HydroVisualListCtrl();
-                _visualListCtrl.Dock = DockStyle.Fill;
-                _visualListCtrl.HydroClickInfoEvent += (visual) =>
-                {
-                    SelectVisual(visual, eVisualSource.List);
-                };
-                _visualListCtrl.HydroChangedInfoEvent += (visualList) =>
-                {
-                    SelectVisual(_visual, eVisualSource.List);
-                };
-            }
-            return _visualListCtrl;
-        }
-
-        //鏋勪欢鏄庣粏鎺т欢鏄惁鍙
-        private bool IsVisualListCtrlVisible
-        {
-            get
-            {
-                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
-                {
-                    if (this.controlContainerBottom.Controls.Count > 0)
-                    {
-                        if (this.controlContainerBottom.Controls[0] is HydroVisualListCtrl)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-
-        //鏄剧ず鏋勪欢鏄庣粏鎺т欢
-        private void ShowVisualListCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var visualListCtrl = GetVisualListCtrl();
-            if (!IsVisualListCtrlVisible)
-            {
-                this.controlContainerBottom.Controls.Clear();
-                this.controlContainerBottom.Controls.Add(visualListCtrl);
-                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlBottom.Text = "鏋勪欢鏄庣粏";
-                this.docPnlBottom.Height = 350;
-            }
-            var visualVmListHelper = GetVisualVmListHelper();
-            var allVisualVmList = visualVmListHelper.GetVisualList();
-            visualListCtrl.SetBindingData(allVisualVmList);
-            var calcuResult = GetCalcuResult();
-            if (calcuResult != null && calcuResult.Succeed)
-            {
-                visualListCtrl.SetCalcuView();
-            }
-            else
-            {
-                visualListCtrl.SetNormalView();
-            }
-        }
-
-        //鏇存柊鏋勪欢鏄庣粏鎺т欢
-        private void UpdateVisualListCtrl()
-        {
-            if (!IsVisualListCtrlVisible)
-            {
-                return;
-            }
-            _visualListCtrl?.UpdateBindingData();
-        }
-
-        //鏋勪欢鏄庣粏
-        private void barBtnVisualList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowVisualListCtrl();
-        }
-
-        #endregion
-
-        #region 鏋勪欢鏄剧ず
-
-        //鏋勪欢鍙杈呭姪绫�
-        private SimulationVisualVisibleHelper _visualVisibleHelper = null;
-
-        //鑾峰彇鏋勪欢鍙杈呭姪绫�
-        private async Task<SimulationVisualVisibleHelper> GetVisualVisibleHelper()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_visualVisibleHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                var bimfaceCtrl = await GetBimfaceCtrl();
-                _visualVisibleHelper = new SimulationVisualVisibleHelper(visualListHelper, bimfaceCtrl);
-                _visualVisibleHelper.InitialData(_hydroInfo);
-            }
-            return _visualVisibleHelper;
-        }
-
-        //璁剧疆鏋勪欢鍙鎬�
-        private async void SetVisualVisible()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var visualVisibleHelper = await GetVisualVisibleHelper();
-            var allVisibleList = visualVisibleHelper.Items;
-            var dlg = new SetHydroVisualVisibleDlg();
-            dlg.SetBindingData(allVisibleList);
-            dlg.ReloadDataEvent += (list) =>
-            {
-                visualVisibleHelper.Items = list;
-                visualVisibleHelper.Set();
-            };
-            dlg.ShowDialog();
-        }
-
-        //璁剧疆鏋勪欢鏄剧ず
-        private void barBtnSetVisualVisible_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            SetVisualVisible();
-        }
-
-        #endregion
-
-        #endregion
-
-        #region 涓�閿樉闅�
-
-        //璁剧疆瑁呴グ浠跺彲瑙佹��
-        private async void SetDecoratorVisible(bool isDecoratorVisible)
-        {
-            var codes = _hydroInfo.Decorators?.Select(x => x.Code).Distinct().ToList();
-            if (isDecoratorVisible)
-            {
-                await _bimfaceCtrl?.ShowComponents(codes);
-            }
-            else
-            {
-                await _bimfaceCtrl?.HideComponents(codes);
-            }
-        }
-
-        //璁剧疆
-        private void barCkDecorator_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            SetDecoratorVisible(this.barCkDecorator.Checked);
-        }
-
-        #endregion   
-
-        #region 淇濆瓨淇℃伅
-
-        //淇濆瓨
-        private async void barBtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
-
-
-            var id = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.Save(_hydroInfo);
-
-            //鑰楁椂宸ㄥぇ鐨勪唬鐮�  
-
-            sw.Stop();
-            TimeSpan ts2 = sw.Elapsed;
-            Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
-            if (id < 1)
-            {
-                TipFormHelper.ShowError("淇濆瓨澶辫触锛�");
-                return;
-            }
-            _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(id);
-            TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
-        }
-
-        #endregion
-
-        #region 鎵归噺閰嶇疆
-
-        //娉ㄥ唽鎵归噺閰嶇疆浜嬩欢
-        private void RegistBulkSetEvents()
-        {
-            //姘村簱
-            this.barBtnSetReservoirList.ItemClick += delegate
-            {
-                //var dlg = new HydroReservoirBulkSetListDlg();
-                //dlg.ShowDialog();
-            };
-            //姘存睜
-            this.barBtnSetTankList.ItemClick += delegate
-            {
-                //var dlg = new HydroTankBulkSetListDlg();
-                //dlg.ShowDialog();
-            };
-            //姘寸
-            this.barBtnSetWaterboxList.ItemClick += delegate
-            {
-                //if (_hydroInfo == null)
-                //{
-                //    return;
-                //}
-                //var dlg = new SetHydroWaterboxListDlg();
-                //dlg.SetBindingData(_hydroInfo);
-                //dlg.HydroClickEvent += async (obj) =>
-                //{
-                //    if (obj == null)
-                //    {
-                //        return;
-                //    }
-                //    _selectedParter = obj;
-                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
-                //    ShowProperty();
-                //};
-                //dlg.HydroChangedEvent += (obj) =>
-                //{
-
-                //};
-                //dlg.ShowDialog();
-            };
-            //杩炴帴鑺傜偣
-            this.barBtnSetJunctionList.ItemClick += delegate
-            {
-                //var dlg = new HydroJunctionBulkSetListDlg();
-                //dlg.ShowDialog();
-            };
-            //闂峰ご
-            this.barBtnSetBluntheadList.ItemClick += delegate
-            {
-                //if (_hydroInfo == null)
-                //{
-                //    return;
-                //}
-                //var dlg = new SetHydroBluntheadListDlg();
-                //dlg.SetBindingData(_hydroInfo);
-                //dlg.HydroClickEvent += async (obj) =>
-                //{
-                //    if (obj == null)
-                //    {
-                //        return;
-                //    }
-                //    _selectedParter = obj;
-                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
-                //    ShowProperty();
-                //};
-                //dlg.HydroChangedEvent += (obj) =>
-                //{
-
-                //};
-                //dlg.ShowDialog();
-            };
-            //寮ご
-            this.barBtnSetElbowsList.ItemClick += delegate
-            {
-                //if (_hydroInfo == null)
-                //{
-                //    return;
-                //}
-                //var dlg = new SetHydroElbowListDlg();
-                //dlg.SetBindingData(_hydroInfo);
-                //dlg.HydroClickEvent += async (obj) =>
-                //{
-                //    if (obj == null)
-                //    {
-                //        return;
-                //    }
-                //    _selectedParter = obj;
-                //    await _bimfaceCtrl?.ZoomAndSelectComponent(obj.Code);
-                //    ShowProperty();
-                //};
-                //dlg.HydroChangedEvent += (obj) =>
-                //{
-
-                //};
-                //dlg.ShowDialog();
-            };
-            //涓夐��
-            this.barBtnSetThreelinkList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroThreelinkListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //鍥涢��
-            this.barBtnSetFourlinkList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroFourlinkListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //姘磋〃
-            this.barBtnSetMeterList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroMeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //娴侀噺璁�
-            this.barBtnSetFlowmeterList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroFlowmeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //鍘嬪姏琛�
-            this.barBtnSetPressmeterList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroPressmeterListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //绠¢亾
-            this.barBtnSetPipeList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroPipeListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //姘存车
-            this.barBtnSetPumpList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroPumpListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-            //闃�闂�
-            this.barBtnSetValveList.ItemClick += delegate
-            {
-                if (_hydroInfo == null)
-                {
-                    return;
-                }
-                var dlg = new SetHydroValveListDlg();
-                dlg.SetBindingData(_hydroInfo);
-                dlg.ShowDialog();
-            };
-        }
-
-
-        //鏄剧ずRadialMenu
-        private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            this.rmSet.ShowPopup(MousePosition, true);
-        }
-
-        //寮瑰嚭鍓�
-        private void rmSet_BeforePopup(object sender, CancelEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                e.Cancel = true;
-                return;
-            }
-            //姘村簱
-            if (_hydroInfo.Reservoirs == null || _hydroInfo.Reservoirs.Count < 1)
-            {
-                this.barBtnSetReservoirList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetReservoirList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //姘存睜
-            if (_hydroInfo.Tanks == null || _hydroInfo.Tanks.Count < 1)
-            {
-                this.barBtnSetTankList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetTankList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //姘寸
-            if (_hydroInfo.Waterboxs == null || _hydroInfo.Waterboxs.Count < 1)
-            {
-                this.barBtnSetWaterboxList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetWaterboxList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //杩炴帴鑺傜偣
-            if (_hydroInfo.Junctions == null || _hydroInfo.Junctions.Count < 1)
-            {
-                this.barBtnSetJunctionList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetJunctionList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //鍠峰槾
-            if (_hydroInfo.Nozzles == null || _hydroInfo.Nozzles.Count < 1)
-            {
-                this.barBtnSetNozzleList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetNozzleList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //娑堢伀鏍�
-            if (_hydroInfo.Hydrants == null || _hydroInfo.Hydrants.Count < 1)
-            {
-                this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetHydrantList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //闂峰ご
-            if (_hydroInfo.Bluntheads == null || _hydroInfo.Bluntheads.Count < 1)
-            {
-                this.barBtnSetBluntheadList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetBluntheadList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //寮ご
-            if (_hydroInfo.Elbows == null || _hydroInfo.Elbows.Count < 1)
-            {
-                this.barBtnSetElbowsList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetElbowsList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //涓夐��
-            if (_hydroInfo.Threelinks == null || _hydroInfo.Threelinks.Count < 1)
-            {
-                this.barBtnSetThreelinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetThreelinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //鍥涢��
-            if (_hydroInfo.Fourlinks == null || _hydroInfo.Fourlinks.Count < 1)
-            {
-                this.barBtnSetFourlinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetFourlinkList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //姘磋〃
-            if (_hydroInfo.Meters == null || _hydroInfo.Meters.Count < 1)
-            {
-                this.barBtnSetMeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetMeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //娴侀噺璁�
-            if (_hydroInfo.Flowmeters == null || _hydroInfo.Flowmeters.Count < 1)
-            {
-                this.barBtnSetFlowmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetFlowmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //鍘嬪姏琛�
-            if (_hydroInfo.Pressmeters == null || _hydroInfo.Pressmeters.Count < 1)
-            {
-                this.barBtnSetPressmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetPressmeterList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //绠¢亾
-            if (_hydroInfo.Pipes == null || _hydroInfo.Pipes.Count < 1)
-            {
-                this.barBtnSetPipeList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetPipeList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //杩囨浮浠�
-            if (_hydroInfo.Translations == null || _hydroInfo.Translations.Count < 1)
-            {
-                this.barBtnSetTranslationList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetTranslationList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //鎹㈢儹鍣�
-            if (_hydroInfo.Exchangers == null || _hydroInfo.Exchangers.Count < 1)
-            {
-                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetExchangerList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //绌哄帇鏈�
-            if (_hydroInfo.Compressors == null || _hydroInfo.Compressors.Count < 1)
-            {
-                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //姘存车
-            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
-            {
-                this.barBtnSetPumpList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetPumpList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-            //闃�闂�
-            if (_hydroInfo.Valves == null || _hydroInfo.Valves.Count < 1)
-            {
-                this.barBtnSetValveList.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
-            }
-            else
-            {
-                this.barBtnSetValveList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
-            }
-
-        }
-
-        #endregion
-
-        #region 鏋勪欢鏌ヨ
-
-        //鏌ヨ缁勪欢
-        private HydroVisualSearchListCtrl _searchCtrl = null;
-
-        //鑾峰彇鏌ヨ缁勪欢
-        private HydroVisualSearchListCtrl GetSearchCtrl()
-        {
-            if (_searchCtrl == null)
-            {
-                var visualVmListHelper = GetVisualVmListHelper();
-                var allVisualVmList = visualVmListHelper.GetVisualList();
-                _searchCtrl = new HydroVisualSearchListCtrl();
-                _searchCtrl.Dock = DockStyle.Fill;
-                _searchCtrl.InitialData(allVisualVmList);
-                _searchCtrl.HydroClickInfoEvent += (visual) =>
-                {
-                    SelectVisual(visual, eVisualSource.Check);
-                };
-                _searchCtrl.HydroSearchInfoEvent += (list) =>
-                {
-                    var visual = list?.FirstOrDefault();
-                    SelectVisual(visual, eVisualSource.Search);
-                };
-            }
-            return _searchCtrl;
-        }
-
-        //鏌ヨ鎺т欢鏄惁鍙
-        private bool IsSearchCtrlVisible
-        {
-            get
-            {
-                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
-                {
-                    if (this.controlContainerBottom.Controls.Count > 0)
-                    {
-                        if (this.controlContainerBottom.Controls[0] is HydroVisualSearchListCtrl)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-
-        //鏄剧ず鏌ヨ鎺т欢
-        private void ShowSearchCtrl(string content)
-        {
-            if (IsSearchCtrlVisible)
-            {
-                return;
-            }
-            var searchCtrl = GetSearchCtrl();
-            searchCtrl.SetBindingData(content);
-            this.controlContainerBottom.Controls.Clear();
-            this.controlContainerBottom.Controls.Add(searchCtrl);
-            this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-            this.docPnlBottom.Text = "鏋勪欢鏌ヨ";
-            this.docPnlBottom.Height = 350;
-        }
-
-        //鏄剧ず鏌ヨ绐椾綋
-        private void ShowSearchDlg()
-        {
-            if (IsSearchCtrlVisible)
-            {
-                return;
-            }
-            var dlg = new InputHydroVisualSearchListDlg();
-            dlg.SearchEvent += (content) =>
-            {
-                if (string.IsNullOrEmpty(content))
-                {
-                    return;
-                }
-                ShowSearchCtrl(content);
-            };
-            dlg.SetBindingData();
-            dlg.ShowDialog();
-        }
-
-        //鏌ヨ
-        private void barBtnSearch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowSearchDlg();
-        }
-
-        #endregion
-
-        #region 妯″瀷鏍囨敞
-
-        //鏍囨敞杈呭姪绫�
-        private SimulationMarkHelper _markHelper = null;
-
-        //鑾峰彇鏍囨敞杈呭姪绫�
-        private async Task<SimulationMarkHelper> GetMarkHelper()
-        {
-            if (_markHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                var calcuResultHelper = GetCalcuResultHelper();
-                var bimfaceCtrl = await GetBimfaceCtrl();
-                _markHelper = new SimulationMarkHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
-            }
-            return _markHelper;
-        }
-
-        //鏄剧ず鏍囨敞鍒楄〃
-        private async void ShowMarkList()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var markHelper = await GetMarkHelper();
-            var dlg = new SetHydroMarkDlg();
-            dlg.SetBindingData(markHelper.Sets);
-            dlg.ReloadDataEvent += (list) =>
-            {
-                markHelper.Sets = list;
-                markHelper.Set();
-            };
-            dlg.ShowDialog();
-        }
-
-        //璁剧疆鏍囨敞
-        private void barBtnSetMark_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowMarkList();
-        }
-
-        //鏄惁鏄剧ず
-        private async void barCkMark_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var markHelper = await GetMarkHelper();
-            markHelper.Visible = this.barCkMark.Checked;
-            markHelper.Set();
-        }
-
-        #endregion
-
-        #region 棰滆壊鍒嗙骇
-
-        //棰滆壊鍒嗙骇杈呭姪绫�
-        private SimulationGradingHelper _gradingHelper = null;
-
-        //鑾峰彇棰滆壊鍒嗙骇杈呭姪绫�
-        private async Task<SimulationGradingHelper> GetGradingHelper()
-        {
-            if (_gradingHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                var calcuResultHelper = GetCalcuResultHelper();
-                var bimfaceCtrl = await GetBimfaceCtrl();
-                _gradingHelper = new SimulationGradingHelper(visualListHelper, calcuResultHelper, bimfaceCtrl);
-            }
-            return _gradingHelper;
-        }
-
-        //璁剧疆棰滆壊鍒嗙骇鍒楄〃
-        private async void SetGradingList()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var gradingHelper = await GetGradingHelper();
-            var allGradingList = await gradingHelper.GetGradingList();
-            var dlg = new SetHydroGradingTreeDlg();
-            dlg.SetBindingData(_hydroInfo, allGradingList);
-            dlg.ReloadDataEvent += (list) =>
-            {
-                gradingHelper.SetGradingList(list);
-                gradingHelper.Set();
-            };
-            dlg.ApplyDataEvent += (catalog, propName) =>
-            {
-                gradingHelper.UpdateApply(catalog, propName);
-                gradingHelper.Set();
-            };
-            dlg.ShowDialog();
-        }
-
-        //閰嶇疆棰滆壊鍒嗙骇
-        private void barBtnSetGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            SetGradingList();
-        }
-
-        //搴旂敤棰滆壊鍒嗙骇鍒楄〃
-        private async void ApplyGradingList()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var gradingHelper = await GetGradingHelper();
-            var dlg = new ApplyHydroGradingDlg();
-            dlg.SetBindingData(gradingHelper.Applies);
-            dlg.ReloadDataEvent += (list) =>
-            {
-                gradingHelper.Applies = list;
-                gradingHelper.Set();
-            };
-            dlg.ShowDialog();
-        }
-
-        //搴旂敤棰滆壊鍒嗙骇
-        private void barBtnApplyGradingList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ApplyGradingList();
-        }
-
-        //棰滆壊鍒嗙骇灞曠ず
-        private async void barCkGrading_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var gradingHelper = await GetGradingHelper();
-            gradingHelper.Visible = this.barCkGrading.Checked;
-            gradingHelper.Set();
-        }
-
-        #endregion
-
-        #region 浜哄伐鍒锋柊
-
-        //鍒锋柊
-        private async void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes)
-            {
-                if (_project == null)
-                {
-                    return;
-                }
-                if (_projectSite == null)
-                {
-                    return;
-                }
-                var hydroRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
-                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
-                Stopwatch sw = new Stopwatch();
-                sw.Start();
-                _hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(hydroRelation.ModelID);
-                sw.Stop();
-                TimeSpan ts2 = sw.Elapsed;
-                Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
-                _visual = null;
-                await _bimfaceCtrl?.ZoomAndSelectComponents(null);
-                //ShowSelectedProperty();
-                TipFormHelper.ShowSucceed("鏁版嵁宸插埛鏂�");
-
-                var visualListHelper = GetVisualListHelper();
-                visualListHelper.InitialData(_hydroInfo);
-            }
-        }
-
-        #endregion
-
-        #region 姘存祦鍔ㄧ敾
-
-        //姘存祦鍔ㄧ敾杈呭姪绫�
-        private SimulationFlowEffectHelper _flowEffectHelper = null;
-
-        //鑾峰彇姘存祦鍔ㄧ敾杈呭姪绫�
-        private async Task<SimulationFlowEffectHelper> GetFlowEffectHelper()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_flowEffectHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                var bimfaceCtrl = await GetBimfaceCtrl();
-                _flowEffectHelper = new SimulationFlowEffectHelper(visualListHelper, bimfaceCtrl);
-                var calcuResult = GetCalcuResult();
-                _flowEffectHelper.InitialData(calcuResult);
-            }
-            return _flowEffectHelper;
-        }
-
-        //姘存祦鍔ㄧ敾鏄惁鍙
-        private async void barCkFlowEffect_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var flowEffectHelper = await GetFlowEffectHelper();
-            flowEffectHelper.Visible = this.barCkFlowEffect.Checked;
-            flowEffectHelper.Set();
-        }
-
-        #endregion
-
-        #region 鐩戞祴鍒楄〃
-
-        #region 鐩戞祴鐐�
-
-        //鐩戞祴鐐硅緟鍔╃被
-        private SimulationMonitorHelper _monitorHelper = null;
-
-        //鑾峰彇鐩戞祴鐐硅緟鍔╃被
-        private SimulationMonitorHelper GetMonitorHelper()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_monitorHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                _monitorHelper = new SimulationMonitorHelper(visualListHelper);
-            }
-            return _monitorHelper;
-        }
-
-        //璁剧疆鐩戞祴鐐瑰垪琛�
-        private async void SetMonitorList(HydroVisualInfo visual)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var monitorHelper = GetMonitorHelper();
-            var allMonitorList = await monitorHelper.Get();
-            var dlg = new SetHydroMonitorListDlg();
-            dlg.SetBindingData(_hydroInfo, visual, allMonitorList);
-            dlg.ReloadDataEvent += async (list) =>
-            {
-                var bol = await BLLFactory<Yw.BLL.HydroMonitor>.Instance.Save(_hydroInfo.ID, visual.Code, list);
-                if (!bol)
-                {
-                    TipFormHelper.ShowError("璁剧疆澶辫触锛�");
-                    return;
-                }
-                TipFormHelper.ShowSucceed("璁剧疆鎴愬姛锛�");
-                var monitorList = await monitorHelper.Update(visual.Code);
-                var monitorValueHelper = GetMonitorValueHelper();
-                monitorValueHelper.Update(visual.Code, monitorList);
-                var monitorMarkerHelper = await GetMonitorMarkerHelper();
-                monitorMarkerHelper.Update(visual.Code, monitorList);
-                monitorMarkerHelper.Set();
-            };
-            dlg.ShowDialog();
-        }
-
-        //璁剧疆鐩戞祴鐐�
-        private void barBtnSetMonitor_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            SetMonitorList(_visual);
-        }
-
-        #endregion
-
-        #region 鐩戞祴鍊�
-
-        //鐩戞祴鍊艰緟鍔╃被
-        private SimulationMonitorValueHelper _monitorValueHelper = null;
-
-        //鑾峰彇鐩戞祴鍊艰緟鍔╃被
-        private SimulationMonitorValueHelper GetMonitorValueHelper()
-        {
-            if (_monitorValueHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                var monitorHelper = GetMonitorHelper();
-                _monitorValueHelper = new SimulationMonitorValueHelper(visualListHelper, monitorHelper);
-            }
-            return _monitorValueHelper;
-        }
-
-        #endregion
-
-        #region 鐩戞祴鍊兼帶浠�
-
-        //鐩戞祴鍊煎垪琛ㄦ帶浠�
-        private HydroMonitorValueListCtrl _monitorValueListCtrl = null;
-
-        //鑾峰彇鐩戞祴鍊煎垪琛ㄦ帶浠�
-        private HydroMonitorValueListCtrl GetMonitorValueListCtrl()
-        {
-            if (_monitorValueListCtrl == null)
-            {
-                _monitorValueListCtrl = new HydroMonitorValueListCtrl();
-                _monitorValueListCtrl.Dock = DockStyle.Fill;
-                _monitorValueListCtrl.HydroViewEvent += (code) =>
-                {
-                    var visualListHelper = GetVisualListHelper();
-                    var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Monitor);
-                };
-            }
-            return _monitorValueListCtrl;
-        }
-
-        //鐩戞祴鍊煎垪琛ㄦ帶浠舵槸鍚﹀彲瑙�
-        private bool IsMonitorValueListCtrlVisible
-        {
-            get
-            {
-                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
-                {
-                    if (this.controlContainerBottom.Controls.Count > 0)
-                    {
-                        if (this.controlContainerBottom.Controls[0] is HydroMonitorValueListCtrl)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-
-        //鏄剧ず鐩戞祴鍊煎垪琛ㄦ帶浠�
-        private async void ShowMonitorValueListCtrl()
-        {
-            var monitorValueListCtrl = GetMonitorValueListCtrl();
-            if (!IsMonitorValueListCtrlVisible)
-            {
-                this.controlContainerBottom.Controls.Clear();
-                this.controlContainerBottom.Controls.Add(monitorValueListCtrl);
-                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlBottom.Text = "鐩戞祴鍊�";
-                this.docPnlBottom.Height = 350;
-            }
-            var monitorValueHelper = GetMonitorValueHelper();
-            var allMonitorValueList = await monitorValueHelper.Get();
-            monitorValueListCtrl.SetBindingData(allMonitorValueList);
-        }
-
-        //璁剧疆鐩戞祴鍊�
-        private void barBtnSetMonitorValue_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            ShowMonitorValueListCtrl();
-        }
-
-        #endregion
-
-        #region 鐩戞祴鐐规爣璁�
-
-        //鐩戞祴鏍囪杈呭姪绫�
-        private SimulationMonitorMarkerHelper _monitorMarkerHelper = null;
-
-        //鑾峰彇鐩戞祴鏍囪杈呭姪绫�
-        private async Task<SimulationMonitorMarkerHelper> GetMonitorMarkerHelper()
-        {
-            if (_monitorMarkerHelper == null)
-            {
-                var monitorHelper = GetMonitorHelper();
-                var bimfaceCtrl = await GetBimfaceCtrl();
-                _monitorMarkerHelper = new SimulationMonitorMarkerHelper(monitorHelper, bimfaceCtrl);
-            }
-            return _monitorMarkerHelper;
-        }
-
-        //鏄剧ず鐘舵�佹敼鍙�
-        private async void barCkMonitor_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var monitorMarkerHelper = await GetMonitorMarkerHelper();
-            monitorMarkerHelper.Visible = this.barCkMonitor.Checked;
-            monitorMarkerHelper.Set();
-        }
-
-        #endregion
-
-        #endregion
-
-        #region 妯″瀷妫�鏌�
-
-        //妫�鏌ユ帶浠�
-        private HydroCheckResultCtrl _checkCtrl = null;
-
-        //鑾峰彇妫�鏌ユ帶浠�
-        private HydroCheckResultCtrl GetCheckCtrl()
-        {
-            if (_hydroInfo == null)
-            {
-                return default;
-            }
-            if (_checkCtrl == null)
-            {
-                _checkCtrl = new HydroCheckResultCtrl();
-                _checkCtrl.Dock = DockStyle.Fill;
-                _checkCtrl.HydroClickEvent += (code) =>
-                {
-                    var visualListHelper = GetVisualListHelper();
-                    var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Check);
-                };
-            }
-            return _checkCtrl;
-        }
-
-        //妫�鏌ユ帶浠舵槸鍚﹀彲瑙�
-        private bool IsCheckCtrlVisible
-        {
-            get
-            {
-                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
-                {
-                    if (this.controlContainerBottom.Controls.Count > 0)
-                    {
-                        if (this.controlContainerBottom.Controls[0] is HydroCheckResultCtrl)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-
-        //鏄剧ず妫�鏌ユ帶浠�
-        private void ShowCheckCtrl(HydroCheckResult checkResult)
-        {
-            if (checkResult == null)
-            {
-                return;
-            }
-            var checkCtrl = GetCheckCtrl();
-            if (!IsCheckCtrlVisible)
-            {
-                this.controlContainerBottom.Controls.Clear();
-                this.controlContainerBottom.Controls.Add(checkCtrl);
-                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlBottom.Text = "妫�鏌ョ粨鏋�";
-                this.docPnlBottom.Height = 350;
-            }
-            checkCtrl.SetBindingData(checkResult);
-        }
-
-        //鏄剧ず妫�鏌ユ帶浠�
-        private void ShowCheckCtrl()
-        {
-            var checkResult = GetCheckResult();
-            ShowCheckCtrl(checkResult);
-        }
-
-        //妫�鏌�
-        private void barBtnCheck_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var checkResult = _hydroInfo.Check();
-            ShowCheckCtrl(checkResult);
-        }
-
-        #endregion
-
-        #region 妯″瀷璁$畻
-
-        #region 璁$畻缁撴灉
-
-        //璁$畻缁撴灉杈呭姪绫�
-        private SimulationCalcuResultHelper _calcuResultHelper = null;
-
-        //鑾峰彇璁$畻缁撴灉杈呭姪绫�
-        private SimulationCalcuResultHelper GetCalcuResultHelper()
-        {
-            if (_calcuResultHelper == null)
-            {
-                var workingHelper = GetWorkingHelper();
-                _calcuResultHelper = new SimulationCalcuResultHelper(workingHelper);
-            }
-            return _calcuResultHelper;
-        }
-
-        #endregion
-
-        #region 璁$畻澶辫触
-
-        //璁$畻澶辫触鎺т欢
-        private HydroCalcuFailedCtrl _calcuFailedCtrl = null;
-
-        //鑾峰彇璁$畻澶辫触鎺т欢
-        private HydroCalcuFailedCtrl GetCalcuFailedCtrl()
-        {
-            if (_calcuFailedCtrl == null)
-            {
-                _calcuFailedCtrl = new HydroCalcuFailedCtrl();
-                _calcuFailedCtrl.Dock = DockStyle.Fill;
-            }
-            return _calcuFailedCtrl;
-        }
-
-        //璁$畻澶辫触鎺т欢鏄惁鍙
-        private bool IsCalcuFailedCtrlVisible
-        {
-            get
-            {
-                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
-                {
-                    if (this.controlContainerBottom.Controls.Count > 0)
-                    {
-                        if (this.controlContainerBottom.Controls[0] is HydroCalcuFailedCtrl)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-
-        //鏄剧ず璁$畻澶辫触鎺т欢
-        private void ShowCalcuFailedCtrl(HydroCalcuResult calcuResult)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (calcuResult == null)
-            {
-                return;
-            }
-            if (calcuResult.Succeed)
-            {
-                return;
-            }
-            var calcuFailedCtrl = GetCalcuFailedCtrl();
-            if (!IsCalcuFailedCtrlVisible)
-            {
-                this.controlContainerBottom.Controls.Clear();
-                this.controlContainerBottom.Controls.Add(calcuFailedCtrl);
-                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlBottom.Text = "璁$畻澶辫触鍘熷洜";
-                this.docPnlBottom.Height = 350;
-            }
-            calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
-        }
-
-        #endregion
-
-        #region 璁$畻璀﹀憡
-
-        //璁$畻璀﹀憡鎺т欢
-        private HydroCalcuWarningCtrl _calcuWarningCtrl = null;
-
-        //鑾峰彇璁$畻璀﹀憡鎺т欢
-        private HydroCalcuWarningCtrl GetCalcuWarningCtrl()
-        {
-            if (_calcuWarningCtrl == null)
-            {
-                _calcuWarningCtrl = new HydroCalcuWarningCtrl();
-                _calcuWarningCtrl.Dock = DockStyle.Fill;
-                _calcuWarningCtrl.HydroClickEvent += (code) =>
-                {
-                    var visualListHelper = GetVisualListHelper();
-                    var visual = visualListHelper.GetVisual(code);
-                    SelectVisual(visual, eVisualSource.Warning);
-                };
-            }
-            return _calcuWarningCtrl;
-        }
-
-        //璁$畻璀﹀憡鎺т欢鏄惁鍙
-        private bool IsCalcuWarningCtrlVisible
-        {
-            get
-            {
-                if (this.docPnlBottom.Visibility == DevExpress.XtraBars.Docking.DockVisibility.Visible)
-                {
-                    if (this.controlContainerBottom.Controls.Count > 0)
-                    {
-                        if (this.controlContainerBottom.Controls[0] is HydroCalcuWarningCtrl)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-
-        //鏄剧ず璁$畻璀﹀憡鎺т欢
-        private void ShowCalcuWarningCtrl(HydroCalcuResult calcuResult)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (calcuResult == null)
-            {
-                return;
-            }
-            if (!calcuResult.Succeed)
-            {
-                return;
-            }
-            var calcuWaringCtrl = GetCalcuWarningCtrl();
-            if (!IsCalcuWarningCtrlVisible)
-            {
-                this.controlContainerBottom.Controls.Clear();
-                this.controlContainerBottom.Controls.Add(calcuWaringCtrl);
-                this.docPnlBottom.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Visible;
-                this.docPnlBottom.Text = "璁$畻璀﹀憡";
-                this.docPnlBottom.Height = 350;
-            }
-            var visualListHelper = GetVisualListHelper();
-            var allVisualDict = visualListHelper.GetVisualDict();
-            calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
-        }
-
-        #endregion
-
-        #region 璁$畻鏍囩
-
-        //璁$畻鏍囩杈呭姪绫�
-        private SimulationCalcuResultLabelHelper _calcuResultLabelHelper = null;
-
-        //鑾峰彇璁$畻鏍囩杈呭姪绫�
-        private async Task<SimulationCalcuResultLabelHelper> GetCalcuResultLabelHelper()
-        {
-            if (_calcuResultLabelHelper == null)
-            {
-                var calcuResultHelper = GetCalcuResultHelper();
-                var bimfaceCtrl = await GetBimfaceCtrl();
-                _calcuResultLabelHelper = new SimulationCalcuResultLabelHelper(calcuResultHelper, bimfaceCtrl);
-            }
-            return _calcuResultLabelHelper;
-        }
-
-        //璁剧疆璁$畻鏍囩鏄惁鏄剧ず
-        private async void barCkCalcu_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
-            calcuResultLabelHelper.Visible = this.barCkCalcu.Checked;
-            calcuResultLabelHelper.Set();
-        }
-
-        #endregion
-
-        #endregion
-
-        #region 绠$綉淇
-
-        //淇绠$綉
-        private void Repair()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var checkResult = _hydroInfo.Check();
-            if (!checkResult.Succeed)
-            {
-                ShowCheckCtrl(checkResult);
-                TipFormHelper.ShowWarn("妫�鏌ュけ璐ュ鑷存棤娉曡繘琛岃瘯绠楋紝鍋滄绠$綉淇锛�");
-                return;
-            }
-            var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.Simple);
-            if (!calcuResult.Succeed)
-            {
-                ShowCalcuFailedCtrl(calcuResult);
-                TipFormHelper.ShowWarn("璇曠畻澶辫触锛屽仠姝㈢缃戜慨澶嶏紒");
-                return;
-            }
-            var visualListHelper = GetVisualListHelper();
-            var allLinkList = visualListHelper.GetLinkList();
-            if (allLinkList != null && allLinkList.Count < 1)
-            {
-                TipFormHelper.ShowError("妯″瀷涓湭鍖呭惈绠℃淇℃伅锛屽仠姝㈢缃戜慨澶嶏紒");
-                return;
-            }
-            int count = 0;
-            foreach (var link in allLinkList)
-            {
-                var calcuLink = calcuResult.LinkList?.Find(x => x.Code == link.Code);
-                if (calcuLink == null)
-                {
-                    continue;
-                }
-                if (!calcuLink.CalcuFlow.HasValue)
-                {
-                    continue;
-                }
-                if (calcuLink.CalcuFlow.Value < 0)
-                {
-                    var tempCode = link.StartCode;
-                    link.StartCode = link.EndCode;
-                    link.EndCode = tempCode;
-                    count++;
-                }
-            }
-            var visualVmListHelper = GetVisualVmListHelper();
-            visualVmListHelper.UpdateProperty();
-            UpdateVisualListCtrl();
-            UpdatePropertyCtrl();
-            TipFormHelper.ShowSucceed($"淇瀹屾垚锛屽叡淇绠℃({count})涓紒");
-        }
-
-        //绠$綉淇
-        private void barBtnRepair_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            Repair();
-        }
-
-        #endregion
-
-        #region 瀵煎嚭INP
-
-        //瀵煎嚭INP鏂囦欢
-        private void barBtnExportInp_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var fileName = FileDialogHelper.SaveInp("瀵煎嚭Inp鏂囦欢");
-            if (string.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-            var netWork = Yw.Hydro.ParseHelper.ToNetwork(_hydroInfo);
-            var json = JsonHelper.Object2Json(netWork);
-            var result = netWork.ToInpString();
-            File.WriteAllText(fileName, result);
-            TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
-        }
-
-        #endregion
-
-        #region 姘存车鍒楄〃
-
-        #region 骞惰仈妯℃嫙
-
-        //骞惰仈妯℃嫙
-        private void PumpParallel()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var pumps = _hydroInfo.Pumps;
-            if (pumps == null || pumps.Count < 1)
-            {
-                XtraMessageBox.Show("鏃犳按娉典俊鎭�");
-                return;
-            }
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in pumps)
-            {
-                if (!pump.RatedN.HasValue)
-                {
-                    continue;
-                }
-                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
-                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
-                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
-                if (qh == null)
-                {
-                    continue;
-                }
-
-                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-
-                var vm = new XhsSinglePumpViewModel();
-                vmList.Add(vm);
-                vm.ID = pump.ID;
-                vm.Name = pump.Name;
-                vm.Code = pump.Code;
-                vm.IsBp = true;
-                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
-                vm.RatedHz = pump.RatedHz;
-                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                vm.RatedSpeed = pump.RatedN.Value;
-                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio, 1);
-                vm.CurveQH = qhPtList;
-                vm.CurveQE = qePtList;
-                vm.CurveQP = qpPtList;
-
-            }
-
-            //var dlg = new PumpParallelAnalyDlg();
-            //dlg.SetBindingData(vmList);
-            //dlg.ReloadDataEvent += (list) =>
-            //{
-            //    list?.ForEach(x =>
-            //    {
-            //        var pump = pumps.Find(t => t.Code == x.Code);
-            //        if (pump != null)
-            //        {
-            //            pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
-            //            pump.SpeedRatio = x.CurrentHz / pump.RatedHz;
-            //        }
-            //    });
-            //    var codes = list?.Select(x => x.Code).ToList();
-            //    //UpdateVisualViewModelProperty(codes);
-            //    //ShowSelectedProperty();
-            //    UpdateVisualListCtrl();
-            //    return true;
-            //};
-            //dlg.ShowDialog();
-        }
-
-        //骞惰仈妯℃嫙
-        private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            PumpParallel();
-        }
-
-        #endregion
-
-        #endregion
-
-        #region 姘村姏璁$畻
-
-        //璁$畻
-        private async void Calcu()
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            var workingCheckedListHelper = GetWorkingCheckedListHelper();
-            var allWorkingList = workingCheckedListHelper.GetWorkingList();
-            var monitorValueHelper = GetMonitorValueHelper();
-            var allMonitorValueList = await monitorValueHelper.Get();
-            var dlg = new SetHydroWorkingDlg();
-            dlg.SetBindingData(_hydroInfo, allWorkingList, allMonitorValueList);
-            dlg.HydroViewEvent += (visual) =>
-            {
-                SelectVisual(visual, eVisualSource.Calcu);
-            };
-            dlg.HydroCalcuEvent += async (vm) =>
-            {
-                _hydroInfo.UpdateWorkingInfo(vm.WorkingInfo);
-                allMonitorValueList.UpdateMonitorValue(vm.MonitorInfo);
-
-                var hydroInfo = _hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
-
-                var working = new HydroWorkingVmo();
-                working.ModelID = vm.ModelID;
-                working.Name = vm.Name;
-                working.WorkingInfo = JsonHelper.Object2Json(vm.WorkingInfo);
-                working.MonitorInfo = JsonHelper.Object2Json(vm.MonitorInfo);
-                working.SortCode = vm.SortCode;
-                working.Description = vm.Description;
-
-                var workingHelper = GetWorkingHelper();
-                //鏍¢獙
-                var checkResult = _hydroInfo.Check();
-                if (!checkResult.Succeed)
-                {
-                    ShowCheckCtrl(checkResult);
-                    workingHelper.InitialData(hydroInfo, working, checkResult, null);
-                    TipFormHelper.ShowError("鏍¢獙澶辫触锛岃妫�鏌ュ悗閲嶈瘯");
-                    return;
-                }
-
-                WaitFormHelper.ShowWaitForm(this, "姝e湪璁$畻鍒嗘瀽涓紝璇风◢鍊�...");
-                //await Task.Delay(3000);
-                var calcuResult = _hydroInfo.Calcu(Yw.EPAnet.CalcuMode.MinorLoss);
-                WaitFormHelper.HideWaitForm();
-                workingHelper.InitialData(hydroInfo, working, checkResult, calcuResult);
-                if (calcuResult.Succeed)
-                {
-                    if (calcuResult.WainingList != null && calcuResult.WainingList.Count > 0)
-                    {
-                        ShowCalcuWarningCtrl(calcuResult);
-                    }
-                    this.barBtnAddWorking.Enabled = true;
-                    TipFormHelper.ShowSucceed("璁$畻鎴愬姛锛�");
-                }
-                else
-                {
-                    ShowCalcuFailedCtrl(calcuResult);
-                    TipFormHelper.ShowError("璁$畻澶辫触锛�");
-                }
-
-                #region 瑙嗗浘鍒楄〃
-
-                var visualVmListHelper = GetVisualVmListHelper();
-                visualVmListHelper.UpdateCalcuProperty(calcuResult);
-
-                #endregion
-
-                #region 璁$畻鏍囩
-
-                var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
-                calcuResultLabelHelper.Set();
-
-                #endregion
-
-            };
-
-            dlg.ShowDialog();
-
-        }
-
-        //姘村姏璁$畻
-        private void barBtnCalcu_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            Calcu();
-        }
-
-        #endregion
-
-        #region 褰撳墠宸ュ喌
-
-        //宸ュ喌杈呭姪绫�
-        private SimulationWorkingHelper _workingHelper = null;
-
-        //鑾峰彇宸ュ喌杈呭姪绫�
-        private SimulationWorkingHelper GetWorkingHelper()
-        {
-            if (_workingHelper == null)
-            {
-                _workingHelper = new SimulationWorkingHelper();
-            }
-            return _workingHelper;
-        }
-
-        //鑾峰彇宸ュ喌
-        private HydroWorkingVmo GetWorking()
-        {
-            var workingHelper = GetWorkingHelper();
-            return workingHelper.Working;
-        }
-
-        //鑾峰彇妫�鏌ョ粨鏋�
-        private HydroCheckResult GetCheckResult()
-        {
-            var workingHelper = GetWorkingHelper();
-            return workingHelper.CheckResult;
-        }
-
-        //鑾峰彇璁$畻缁撴灉
-        private HydroCalcuResult GetCalcuResult()
-        {
-            var workingHelper = GetWorkingHelper();
-            return workingHelper.CalcuResult;
-        }
-
-        //鏂板宸ュ喌
-        private void AddWorking()
-        {
-            var workingHelper = GetWorkingHelper();
-            if (workingHelper.Working == null)
-            {
-                TipFormHelper.ShowWarn("灏氭湭璁$畻锛岃璁$畻鍚庨噸璇曪紒");
-                return;
-            }
-            var dlg = new AddHydroWorkingDlg();
-            dlg.SetBindingData(workingHelper.Working);
-            dlg.ReloadDataEvent += (rhs) =>
-            {
-                this.barBtnAddWorking.Enabled = false;
-                workingHelper.ResetWorking(rhs);
-                this.AppendWorkingEvent?.Invoke(rhs);
-            };
-            dlg.ShowDialog();
-        }
-
-        //澧炲姞宸ュ喌
-        private void barBtnAddWorking_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            AddWorking();
-        }
-
-        #endregion
-
-        #region 閫夋嫨宸ュ喌
-
-        //宸ュ喌閫夋嫨鍒楄〃杈呭姪绫�
-        private SimulationWorkingCheckedListHelper _workingCheckedListHelper = null;
-
-        //鑾峰彇宸ュ喌鍏冪粍杈呭姪绫�
-        private SimulationWorkingCheckedListHelper GetWorkingCheckedListHelper()
-        {
-            if (_workingCheckedListHelper == null)
-            {
-                var visualListHelper = GetVisualListHelper();
-                _workingCheckedListHelper = new SimulationWorkingCheckedListHelper(visualListHelper);
-                _workingCheckedListHelper.InitialData(_allWorkingCheckedListDict);
-            }
-            return _workingCheckedListHelper;
-        }
-
-        //鏇存柊宸ュ喌閫夋嫨鍒楄〃
-        public void UpdateWorkingCheckedList(HydroWorkingVmo working, bool hasChecked)
-        {
-            var helper = GetWorkingCheckedListHelper();
-            helper.Update(working, hasChecked);
-        }
-
-
-        #endregion
-
-        #region 宸ュ喌鍒嗘瀽
-
-        //绮惧害璇勪及
-        private async void barBtnWorkingEvaluation_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var monitorHelper = GetMonitorHelper();
-            var allMonitorList = await monitorHelper.Get();
-
-            var workingCheckedListHelper = GetWorkingCheckedListHelper();
-            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
-            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
-            {
-                var workingHelper = GetWorkingHelper();
-                if (!workingHelper.Initialized)
-                {
-                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
-                    return;
-                }
-                var dlg = new HydroSingleWorkingEvaluationDlg();
-                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult);
-                dlg.ShowDialog();
-            }
-            else
-            {
-                var dlg = new HydroMultiWorkingEvaluationDlg();
-                dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList);
-                dlg.ShowDialog();
-            }
-        }
-
-        //姘存车鍒嗘瀽
-        private void barBtnPumpAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_hydroInfo == null)
-            {
-                return;
-            }
-            if (_hydroInfo.Pumps == null || _hydroInfo.Pumps.Count < 1)
-            {
-                return;
-            }
-
-            var calcuResultHelper = GetCalcuResultHelper();
-            var vmList = new List<XhsSinglePumpViewModel>();
-            foreach (var pump in _hydroInfo.Pumps)
-            {
-                if (!pump.RatedN.HasValue)
-                {
-                    continue;
-                }
-                var qh = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQH)?.CurveData;
-                var qe = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQE)?.CurveData;
-                var qp = _hydroInfo.Curves?.Find(t => t.Code == pump.CurveQP)?.CurveData;
-                if (qh == null)
-                {
-                    continue;
-                }
-
-                var qhPtList = qh.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qePtList = qe?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-                var qpPtList = qp?.Select(x => new XhsSplinePointViewModel(x.X, x.Y)).ToList();
-
-                var vm = new XhsSinglePumpViewModel();
-                vmList.Add(vm);
-                vm.ID = pump.ID;
-                vm.Name = pump.Name;
-                vm.Code = pump.Code;
-                vm.IsBp = true;
-                vm.RunStatus = pump.LinkStatus == Yw.Hydro.LinkStatus.Open;
-                vm.RatedHz = pump.RatedHz;
-                vm.CurrentHz = Math.Round(pump.RatedHz * pump.SpeedRatio, 1);
-                vm.RatedSpeed = pump.RatedN.Value;
-                vm.CurrentSpeed = Math.Round(pump.RatedN.Value * pump.SpeedRatio);
-                vm.CurveQH = qhPtList;
-                vm.CurveQE = qePtList;
-                vm.CurveQP = qpPtList;
-
-                var calcuResultVisualDict = calcuResultHelper.GetVisualDict();
-                if (calcuResultVisualDict != null && calcuResultVisualDict.Count > 0)
-                {
-                    //var calcuResult = allCalcuResultList.Find(x => x.Code == pump.Code) as HydroCalcuLinkResult;
-                    //if (calcuResult != null)
-                    //{
-                    //    if (calcuResult.CalcuFlow.HasValue)
-                    //    {
-                    //        vm.CalcuQ = Math.Abs(calcuResult.CalcuFlow.Value);
-                    //    }
-
-                    //    var calcuResultStart = allCalcuResultList.Find(x => x.Code == pump.StartCode) as HydroCalcuNodeResult;
-                    //    var calcuResultEnd = allCalcuResultList.Find(x => x.Code == pump.EndCode) as HydroCalcuNodeResult;
-                    //    if (calcuResultStart != null && calcuResultEnd != null)
-                    //    {
-                    //        if (calcuResultStart.CalcuHead.HasValue && calcuResultEnd.CalcuHead.HasValue)
-                    //        {
-                    //            vm.CalcuH = Math.Round(Math.Abs(calcuResultStart.CalcuHead.Value - calcuResultEnd.CalcuHead.Value), 4);
-                    //        }
-                    //    }
-                    //}
-                }
-
-            }
-
-            //var dlg = new PumpParallelAnalyDlg();
-            //dlg.SetBindingData(vmList);
-            //dlg.ReloadDataEvent += (list) =>
-            //{
-            //    list?.ForEach(x =>
-            //    {
-            //        var pump = _hydroInfo.Pumps?.Find(t => t.Code == x.Code);
-            //        if (pump != null)
-            //        {
-            //            pump.LinkStatus = x.RunStatus ? Yw.Hydro.PumpStatus.Open : Yw.Hydro.PumpStatus.Closed;
-            //            pump.SpeedRatio = Math.Round(x.CurrentHz / pump.RatedHz, 1);
-            //        }
-            //    });
-            //    //ShowSelectedProperty();
-            //    return true;
-            //};
-            //dlg.ShowDialog();
-        }
-
-        //鑳芥晥鍒嗘瀽
-        private void barBtnWorkingPower_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var workingCheckedListHelper = GetWorkingCheckedListHelper();
-            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
-            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
-            {
-                var workingHelper = GetWorkingHelper();
-                if (!workingHelper.Initialized)
-                {
-                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
-                    return;
-                }
-                var dlg = new SimulationSingleWorkingEnergyDlg();
-                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult);
-                dlg.ShowDialog();
-            }
-            else
-            {
-                var dlg = new SimulationMultiWorkingEnergyDlg();
-                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
-                dlg.ShowDialog();
-            }
-        }
-
-        //鎹熷け鏇茬嚎
-        private void barBtnWorkingLossCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_visual == null)
-            {
-                TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
-                return;
-            }
-            HydroVisualInfo visual = _visual;
-            if (_visual is HydroLinkInfo linkInfo)
-            {
-                var visualListHelper = GetVisualListHelper();
-                visual = visualListHelper.GetVisual(linkInfo.StartCode);
-            }
-
-            var workingCheckedListHelper = GetWorkingCheckedListHelper();
-            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
-            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
-            {
-                var workingHelper = GetWorkingHelper();
-                if (!workingHelper.Initialized)
-                {
-                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
-                    return;
-                }
-                var dlg = new HydroSingleWorkingLossCurveDlg();
-                dlg.SetBindingData(workingHelper.HydroInfo, workingHelper.CalcuResult, visual);
-                dlg.ShowDialog();
-            }
-            else
-            {
-                var dlg = new HydroMultiWorkingLossCurveDlg();
-                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList, visual);
-                dlg.ShowDialog();
-            }
-        }
-
-        //鎹熷け缁熻
-        private void barBtnWorkingLossStatistics_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            var workingCheckedListHelper = GetWorkingCheckedListHelper();
-            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
-            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
-            {
-                var workingHelper = GetWorkingHelper();
-                if (!workingHelper.Initialized)
-                {
-                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
-                    return;
-                }
-                var dlg = new HydroSingleWorkingLossStatisticsDlg();
-                dlg.SetBindingData(workingHelper.HydroInfo);
-                dlg.ShowDialog();
-            }
-            else
-            {
-                var dlg = new HydroMultiWorkingLossStatisticsDlg();
-                dlg.SetBindingData(_hydroInfo, allCheckedWorkingList);
-                dlg.ShowDialog();
-            }
-        }
-
-        //缁煎悎鍒嗘瀽
-        private async void barBtnWorkingAnaly_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            if (_visual == null)
-            {
-                TipFormHelper.ShowWarn("璇烽�夋嫨鏋勪欢鍚庨噸璇曪紒");
-                return;
-            }
-            HydroVisualInfo visual = _visual;
-            if (_visual is HydroLinkInfo linkInfo)
-            {
-                var visualListHelper = GetVisualListHelper();
-                visual = visualListHelper.GetVisual(linkInfo.StartCode);
-            }
-
-            var monitorHelper = GetMonitorHelper();
-            var allMonitorList = await monitorHelper.Get();
-
-            var workingCheckedListHelper = GetWorkingCheckedListHelper();
-            var allCheckedWorkingList = workingCheckedListHelper.GetCheckedWorkingList();
-            if (allCheckedWorkingList == null || allCheckedWorkingList.Count < 1)
-            {
-                var workingHelper = GetWorkingHelper();
-                if (!workingHelper.Initialized)
-                {
-                    TipFormHelper.ShowWarn("璇疯绠楀悗閲嶈瘯锛�");
-                    return;
-                }
-                var dlg = new SimulationSingleWorkingAnalyDlg();
-                dlg.SetBindingData(workingHelper.HydroInfo, allMonitorList, workingHelper.Working, workingHelper.CalcuResult, visual);
-                dlg.ShowDialog();
-            }
-            else
-            {
-                var dlg = new SimulationMultiWorkingAnalyDlg();
-                dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList, visual);
-                dlg.ShowDialog();
-            }
-        }
-
-        #endregion
-
-
-
-
-
-
-    }
-}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.resx
deleted file mode 100644
index 846ce62..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/02-page/XhsProjectSimulationSchemePage.resx
+++ /dev/null
@@ -1,717 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    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
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="barBtnCheck.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKMCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iQ2hlY2tCb3giPg0KICAgIDxwYXRoIGQ9Ik0yNyw0SDVDNC41LDQsNCw0LjUsNCw1
-        djIyYzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWNUMyOCw0LjUsMjcuNSw0LDI3LDR6
-        IE0xNCwyMmwtNi02bDItMmw0LDQgICBsOC04bDIsMkwxNCwyMnoiIGNsYXNzPSJHcmVlbiIgLz4NCiAg
-        PC9nPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="barBtnCalcu.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEoIAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iRGVmaW5lZE5hbWVVc2VJbkZvcm11bGEiIHN0eWxlPSJlbmFibGUtYmFj
-        a2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2Zp
-        bGw6IzExNzdENzt9CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTcs
-        MjBsLTctN1Y5bDctN2gyMmMwLjYsMCwxLDAuNCwxLDF2MTZjMCwwLjYtMC40LDEtMSwxaC04LjRsMC41
-        LTJoMi4zSDI4VjRINy44TDIsOS44djIuM0w3LjgsMThoMy44aDEuNiAgbC0wLjQsMkg3eiBNNiwxMWMw
-        LDEuMSwwLjksMiwyLDJzMi0wLjksMi0yYzAtMS4xLTAuOS0yLTItMlM2LDkuOSw2LDExeiIgY2xhc3M9
-        IkJsYWNrIiAvPg0KICA8cGF0aCBkPSJNMTkuOSwxNGgyLjNsLTAuNSwyaC0yLjNsLTIuMSw4LjdjLTAu
-        MywxLjItMC43LDIuMi0xLjIsM2MtMC42LDAuOC0xLjIsMS40LTIsMS44Yy0wLjcsMC40LTEuNiwwLjYt
-        Mi42LDAuNiAgYy0xLDAtMS44LTAuMi0yLjMtMC42Yy0wLjctMC41LTEtMS0xLTEuNmMwLTAuNSwwLjIt
-        MC45LDAuNS0xLjJjMC4zLTAuMywwLjctMC41LDEuMi0wLjVjMC4yLDAsMC40LDAsMC42LDAuMSAgYzAu
-        MiwwLjEsMC40LDAuMiwwLjYsMC4zYzAuMSwwLjEsMC4zLDAuMywwLjYsMC43YzAuMSwwLjIsMC4zLDAu
-        MywwLjQsMC4zYzAuMSwwLjEsMC4yLDAuMSwwLjQsMC4xYzAuNSwwLDAuOS0wLjYsMS4xLTEuN2wyLjIt
-        OS45ICBoLTEuN2wwLjQtMmgxLjdsMC40LTEuN2MwLjMtMS40LDEtMi40LDItMy4yYzEtMC44LDIuMy0x
-        LjEsNC0xLjFjMC44LDAsMS41LDAuMSwxLjksMC4zYzAuNSwwLjIsMC44LDAuNSwxLjEsMC44ICBjMC4z
-        LDAuNCwwLjQsMC43LDAuNCwxLjFjMCwwLjMtMC4xLDAuNi0wLjIsMC45Yy0wLjIsMC4zLTAuNCwwLjUt
-        MC42LDAuNmMtMC4zLDAuMS0wLjYsMC4yLTAuOSwwLjJjLTAuMywwLTAuNi0wLjEtMC45LTAuMiAgYy0w
-        LjMtMC4xLTAuNS0wLjMtMC44LTAuNmMtMC4zLTAuMy0wLjUtMC41LTAuNi0wLjZjLTAuMS0wLjEtMC4z
-        LTAuMS0wLjQtMC4xYy0wLjMsMC0wLjYsMC4xLTAuOCwwLjRjLTAuMSwwLjItMC4zLDAuNi0wLjQsMS4z
-        ICBMMTkuOSwxNHogTTIyLjUsMjIuM2wxLjIsMi40YzAuNy0wLjksMS4xLTEuNSwxLjMtMS43YzAuMy0w
-        LjMsMC42LTAuNSwxLTAuN3MwLjYtMC4yLDAuOS0wLjJjMC4zLDAsMC42LDAuMSwwLjgsMC4zICBzMC4z
-        LDAuNCwwLjMsMC43YzAsMC4yLDAsMC40LTAuMSwwLjVzLTAuMiwwLjMtMC4zLDAuNHMtMC4zLDAuMi0w
-        LjQsMC4yYy0wLjEsMC0wLjIsMC0wLjUsMC4xYy0wLjMsMC0wLjUsMC0wLjYsMC4xICBjLTAuMSwwLTAu
-        MiwwLjEtMC40LDAuMmMtMC4yLDAuMS0wLjMsMC4zLTAuNSwwLjRjLTAuMSwwLjEtMC4zLDAuNC0wLjgs
-        MS4xbDAuNCwwLjhjMC4zLDAuNiwwLjYsMS4xLDAuOCwxLjIgIGMwLjIsMC4yLDAuNCwwLjMsMC42LDAu
-        M2MwLjMsMCwwLjctMC4yLDEuMS0wLjZsMC44LDFjLTAuOSwwLjgtMS44LDEuMi0yLjcsMS4yYy0wLjQs
-        MC0wLjctMC4xLTEtMC4yYy0wLjMtMC4xLTAuNi0wLjMtMC44LTAuNiAgYy0wLjItMC4yLTAuNS0wLjYt
-        MC43LTEuMWwtMC40LTAuOWMtMC40LDAuNy0wLjgsMS4yLTEuMiwxLjZjLTAuNCwwLjQtMC44LDAuNy0x
-        LjEsMC45Yy0wLjMsMC4yLTAuNiwwLjItMC45LDAuMiAgYy0wLjIsMC0wLjQsMC0wLjYtMC4xYy0wLjEt
-        MC4xLTAuMy0wLjItMC40LTAuNEMxOCwyOS4zLDE4LDI5LjIsMTgsMjljMC0wLjIsMC4xLTAuNCwwLjIt
-        MC42YzAuMS0wLjIsMC4zLTAuMywwLjQtMC40ICBjMC4yLTAuMSwwLjUtMC4xLDAuOS0wLjFjMC4zLDAs
-        MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu
-        NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz
-        cz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnExportInp.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
-        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
-        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iT3V0bG9va0V4cG9ydCI+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNiw0IDI0LDQg
-        MjQsMCAzMiw2IDI0LDEyIDI0LDggMTYsOCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0i
-        TTI1LDE0SDE0VjhMMCwxMi4yVjI4bDE0LDR2LTZoMTFjMC41LDAsMS0wLjUsMS0xVjE1QzI2LDE0LjUs
-        MjUuNSwxNCwyNSwxNHogTTkuMiwyMi45QzguNiwyMy42LDcuOSwyNCw3LDI0ICAgYy0wLjksMC0xLjYt
-        MC40LTIuMi0xLjFDNC4zLDIyLjIsNCwyMS4zLDQsMjAuMWMwLTEuMiwwLjMtMi4yLDAuOC0zQzUuNCwx
-        Ni40LDYuMSwxNiw3LjEsMTZjMC45LDAsMS42LDAuNCwyLjEsMS4xICAgYzAuNSwwLjcsMC44LDEuNyww
-        LjgsMi44QzEwLDIxLjIsOS43LDIyLjIsOS4yLDIyLjl6IE0xNCwxNmg5bC02LDRsLTMtMlYxNnogTTI0
-        LDI0SDE0di00bDMsMmw3LTQuNlYyNHogTTguNCwxNy45ICAgYzAuMywwLjUsMC41LDEuMiwwLjUsMi4x
-        YzAsMC45LTAuMiwxLjYtMC41LDIuMWMtMC4zLDAuNS0wLjgsMC44LTEuNCwwLjhjLTAuNiwwLTEtMC4z
-        LTEuNC0wLjhTNS4xLDIwLjksNS4xLDIwICAgYzAtMC45LDAuMi0xLjYsMC41LTIuMUM2LDE3LjQsNi41
-        LDE3LjEsNywxNy4xQzcuNiwxNy4xLDguMSwxNy40LDguNCwxNy45eiIgY2xhc3M9IkJsdWUiIC8+DQog
-        IDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnSave.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMICAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku
-        WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4
-        N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk
-        aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRoLTN2MTBI
-        OFY0SDVDNC40LDQsNCw0LjQsNCw1djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTFW
-        NUMyOCw0LjQsMjcuNiw0LDI3LDR6IE0yNCwyNEg4di02ICBoMTZWMjR6IE0xMCw0djhoMTBWNEgxMHog
-        TTE0LDEwaC0yVjZoMlYxMHoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnVisualList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKsDAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
-        QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
-        MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2hvd1dlaWdo
-        dGVkTGVnZW5kIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwb2x5Z29uIHBvaW50cz0iMjgs
-        MCAyLDAgMiwyIDI4LDIgMjgsMjggMzAsMjggMzAsMiAzMCwwICAgIiBjbGFzcz0iQmxhY2siIC8+DQog
-        ICAgPC9nPg0KICAgIDxwYXRoIGQ9Ik0yLDI4VjBIMHYzMGgzMHYtMkgyeiBNMjQsOEgxNFY2aDEwVjh6
-        IE0yNCwxNEgxNHYyaDEwVjE0eiBNMjQsMjJIMTR2MmgxMFYyMnoiIGNsYXNzPSJCbGFjayIgLz4NCiAg
-        ICA8cGF0aCBkPSJNMTAsNmMwLDEuMS0wLjksMi0yLDJTNiw3LjEsNiw2czAuOS0yLDItMlMxMCw0Ljks
-        MTAsNnogTTgsMTBjLTEuNywwLTMsMS4zLTMsM3MxLjMsMywzLDNzMy0xLjMsMy0zICAgUzkuNywxMCw4
-        LDEweiBNMTIsMjJjMC0yLjItMS44LTQtNC00cy00LDEuOC00LDRzMS44LDQsNCw0UzEyLDI0LjIsMTIs
-        MjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="barBtnSetList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
-        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
-        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iWC1BeGlzX1NldHRpbmdzIj4N
-        CiAgICA8cG9seWdvbiBwb2ludHM9IjQsMjYgNCwyIDIsMiAyLDI4IDYsMjggNiwzMCA4LDMwIDgsMjgg
-        MTIsMjggMTIsMzAgMTQsMzAgMTQsMjggMTgsMjggMTgsMzAgMjAsMzAgMjAsMjggMjQsMjggICAgMjQs
-        MzAgMjYsMzAgMjYsMjggMzAsMjggMzAsMjYgICIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9
-        Ik0yOCwxNC40di0yLjhsLTMtMC42Yy0wLjMtMC44LTAuNS0xLjgtMS4xLTIuNWwxLjgtMi41bC0xLjkt
-        MS45TDIxLjMsNmMtMC43LTAuNC0xLjYtMC44LTIuNS0xbC0wLjQtM2gtMi44ICAgbC0wLjUsM2MtMC44
-        LDAuMy0xLjgsMC41LTIuNSwxbC0yLjUtMS44TDguMiw2LjFMMTAsOC42Yy0wLjQsMC43LTAuOCwxLjct
-        MS4xLDIuNUw2LDExLjZ2Mi44bDMsMC41YzAuMywwLjgsMC41LDEuOCwxLjEsMi41ICAgbC0xLjgsMi41
-        bDEuOSwxLjlsMi41LTEuOGMwLjcsMC40LDEuNiwwLjgsMi41LDFsMC40LDNoMi44bDAuNi0zYzAuOC0w
-        LjMsMS44LTAuNiwyLjUtMWwyLjUsMS44bDEuOS0xLjlMMjQsMTcuNCAgIGMwLjQtMC43LDAuOC0xLjYs
-        MS4xLTIuNUwyOCwxNC40eiBNMTcsMTZjLTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywz
-        UzE4LjcsMTYsMTcsMTZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="barBtnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
-        QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
-        MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
-        cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
-        LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
-        NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
-        MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
-        MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
-        MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
-        IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
-        NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
-        ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
-        LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
-        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnSetGradingList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAsFAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
-        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
-        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRWRpdENvbG9ycyI+DQogICAgPHBhdGggZD0i
-        TTI5LDBIMUMwLjUsMCwwLDAuNSwwLDF2MjhjMCwwLjUsMC41LDEsMSwxaDI4YzAuNSwwLDEtMC41LDEt
-        MVYxQzMwLDAuNSwyOS41LDAsMjksMHogTTI4LDI4SDJWMmgyNlYyOHoiIGNsYXNzPSJCbGFjayIgLz4N
-        CiAgICA8cGF0aCBkPSJNMTAsMTBINFY0aDZWMTB6IE0xOCw0aC02djZoNlY0eiBNMTAsMTJINHY2aDZW
-        MTJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDxwYXRoIGQ9Ik0xMCwyNkg0di02aDZWMjZ6IE0xOCwx
-        MmgtNnY2aDZWMTJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTI2LDEwaC02VjRoNlYx
-        MHogTTI2LDEyaC02djZoNlYxMnoiIGNsYXNzPSJSZWQiIC8+DQogICAgPHBhdGggZD0iTTI2LDI2aC02
-        di02aDZWMjZ6IE0xOCwyMGgtNnY2aDZWMjB6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8ZyBjbGFzcz0i
-        c3QxIj4NCiAgICAgIDxyZWN0IHg9IjQiIHk9IjEyIiB3aWR0aD0iNiIgaGVpZ2h0PSI2IiBjbGFzcz0i
-        R3JlZW4iIC8+DQogICAgICA8cGF0aCBkPSJNMTgsMTBoLTZWNGg2VjEweiBNMjYsMjBoLTZ2Nmg2VjIw
-        eiIgY2xhc3M9IlJlZCIgLz4NCiAgICAgIDxwYXRoIGQ9Ik0yNiwxOGgtNnYtNmg2VjE4eiBNMTgsMTJo
-        LTZ2Nmg2VjEyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPC9nPg0KICAgIDxnIGNsYXNzPSJzdDEiPg0K
-        ICAgICAgPHJlY3QgeD0iMjAiIHk9IjIwIiB3aWR0aD0iNiIgaGVpZ2h0PSI2IiBjbGFzcz0iQmx1ZSIg
-        Lz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnApplyGradingList.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMDAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku
-        WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4
-        N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk
-        aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI5LDE2SDE1Yy0w
-        LjUsMC0xLDAuNS0xLDF2MTRjMCwwLjUsMC41LDEsMSwxaDE0YzAuNSwwLDEtMC41LDEtMVYxN0MzMCwx
-        Ni41LDI5LjUsMTYsMjksMTZ6IE0yMC41LDI4ICBMMTcsMjQuNWwxLjUtMS41bDIsMmw1LTVsMS41LDEu
-        NUwyMC41LDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8cGF0aCBkPSJNMTIsMTBoLTJWOGgyVjEweiBN
-        MjIsOGgtOHYyaDhWOHogTTEyLDEyaC0ydjJoMlYxMnogTTEyLDE2aC0ydjJoMlYxNnogTTEyLDIwaC0y
-        djJoMlYyMHogTTIyLDEyaC04djJoOFYxMnogICIgY2xhc3M9IkJsYWNrIiAvPg0KICA8cGF0aCBkPSJN
-        MTIsMjZINlY0aDIwdjEwaDJWM2MwLTAuNS0wLjUtMS0xLTFINUM0LjUsMiw0LDIuNSw0LDN2MjRjMCww
-        LjUsMC41LDEsMSwxaDdWMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="barBtnRefresh.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
-        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
-        MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
-        bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2hhbmdlVmlldyI+DQogICAgPHBh
-        dGggZD0iTTI0LjUsNy41QzIyLjMsNS4zLDE5LjMsNCwxNiw0QzEwLjEsNCw1LjEsOC4zLDQuMiwxNGg0
-        LjFjMC45LTMuNCw0LTYsNy43LTZjMi4yLDAsNC4yLDAuOSw1LjYsMi40TDE4LDE0ICAgaDUuN2g0LjFI
-        MjhWNEwyNC41LDcuNXogTTE2LDI0Yy0yLjIsMC00LjItMC45LTUuNi0yLjRMMTQsMThIOC4yaC00SDR2
-        MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo
-        LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2
-        Zz4L
-</value>
-  </data>
-  <data name="barBtnSetMark.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIICAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
-        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkxhYmVsIj4NCiAgICA8cGF0aCBkPSJNMjksOEgxMGwt
-        OCw4bDgsOGgxOWMwLjUsMCwxLTAuNSwxLTFWOUMzMCw4LjUsMjkuNSw4LDI5LDh6IE0xMCwxOGMtMS4x
-        LDAtMi0wLjktMi0yYzAtMS4xLDAuOS0yLDItMiAgIHMyLDAuOSwyLDJDMTIsMTcuMSwxMS4xLDE4LDEw
-        LDE4eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="barBtnSetMonitor.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMEEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
-        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
-        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iUHJvZHVjdFF1aWNrVG9wU2FsZXNwZXJzb24iPg0KICAgIDxwYXRoIGQ9Ik0wLDE0
-        aDZ2MTJIMFYxNHogTTIxLjQsMjMuNWMwLjEsMCwwLjItMC4xLDAuMy0wLjFjLTAuMi0wLjQtMC40LTAu
-        OC0wLjUtMS4yYy0wLjQtMC40LTAuNy0wLjktMC44LTEuNiAgIGMtMC4zLTAuNC0wLjYtMS4yLTAuNC0y
-        LjJsMC4xLTAuMmMtMC4zLTEuNiwwLTMuMiwwLjgtNC4zYzAuMy0wLjMsMC42LTAuNywxLjEtMVYyaC02
-        djI0aDIuNkMxOS4yLDI0LjYsMjAuNCwyNCwyMS40LDIzLjV6IE04LDI2ICAgaDZWOEg4VjI2eiIgY2xh
-        c3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTMyLDI5LjFWMzBIMjB2LTAuOWMwLTQsMi4zLTMuMywz
-        LjYtNC42YzAuNSwwLjgsMS4zLDEuNSwyLjQsMS41YzEuMSwwLDEuOS0wLjYsMi41LTEuNCAgIEMyOS44
-        LDI1LjgsMzIsMjUuMSwzMiwyOS4xeiBNMjIuOSwyMC44djAuMWMwLjQsMS41LDEuMywzLjEsMy4xLDMu
-        MXMyLjgtMS42LDMuMi0zLjF2LTAuMWMwLjcsMCwwLjQtMC43LDAuNi0xczAuMy0wLjUsMC4yLTAuOSAg
-        IGMtMC4xLTAuMy0wLjMtMC4yLTAuNC0wLjJjMS4yLTMuMS0wLjctMi45LTAuNy0yLjlTMjguNywxNCwy
-        NS4yLDE0Yy0zLjIsMC0zLjYsMi41LTIuOSw0LjdjMCwwLjEtMC4yLDAuMS0wLjMsMC4yICAgYy0wLjEs
-        MC40LDAuMSwwLjYsMC4zLDAuOVMyMi4yLDIwLjgsMjIuOSwyMC44eiIgY2xhc3M9IkJsYWNrIiAvPg0K
-        ICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="barBtnSetMonitorValue.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOwCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuWWVsbG93e2ZpbGw6I0ZG
-        QjExNTt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
-        aXNwbGF5OmlubGluZTtmaWxsOiMxMTc3RDc7fQoJLnN0NHtkaXNwbGF5OmlubGluZTtmaWxsOiM3Mjcy
-        NzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU3BhcmtsaW5lV2luTG9zcyI+DQogICAgPHBhdGggZD0iTTAs
-        OGg2djhIMFY4eiBNMTIsMTZoNlYyaC02VjE2eiBNMjQsMTZoNlY2aC02VjE2eiIgY2xhc3M9IkJsdWUi
-        IC8+DQogICAgPHBhdGggZD0iTTYsMTZoNnYxMEg2VjE2eiBNMTgsMzBoNlYxNmgtNlYzMHoiIGNsYXNz
-        PSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnWorkingLossCurve.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHsCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLlll
-        bGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
-        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMzU7fQoJLnN0M3tv
-        cGFjaXR5OjAuNjU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU3RlcEFyZWEiPg0KICAgIDxwb2x5Z29uIHBv
-        aW50cz0iNiwxMCA2LDIgMTQsMiAxNCw2IDIyLDYgMjIsMTYgMzAsMTYgMzAsMjggMCwyOCAwLDEwICAi
-        IGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="barBtnWorkingLossStatistics.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACIDAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
-        QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
-        MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iUGllU2VyaWVz
-        Ij4NCiAgICA8cGF0aCBkPSJNMjYuMyw1LjFMMTYuNCwxNWw5LjksOS45YzIuMy0yLjYsMy43LTYuMSwz
-        LjctOS45UzI4LjYsNy44LDI2LjMsNS4xeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJN
-        MTQsMTZ2LTF2LTAuNEwyNC45LDMuN0MyMi4yLDEuNCwxOC44LDAsMTUsMEM2LjcsMCwwLDYuNywwLDE1
-        YzAsNy45LDYuMiwxNC40LDE0LDE0LjlWMTZ6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0i
-        TTE2LDI5LjljMy40LTAuMiw2LjUtMS42LDguOS0zLjdMMTYsMTcuNFYyOS45eiIgY2xhc3M9IkJsdWUi
-        IC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnWorkingPower.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAF4JAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLlll
-        bGxvd3tmaWxsOiNGRkIxMTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
-        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMzU7fQoJLnN0M3tv
-        cGFjaXR5OjAuNjU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iUmFkYXJBcmVhIj4NCiAgICA8ZyBjbGFzcz0i
-        c3QyIj4NCiAgICAgIDxwYXRoIGQ9Ik0xNiwxMmMtMi4yLDAtNCwxLjgtNCw0YzAsMi4yLDEuOCw0LDQs
-        NHM0LTEuOCw0LTRDMjAsMTMuOCwxOC4yLDEyLDE2LDEyeiBNMTYsMThjLTEuMSwwLTItMC45LTItMiAg
-        ICBjMC0xLjEsMC45LTIsMi0yczIsMC45LDIsMkMxOCwxNy4xLDE3LjEsMTgsMTYsMTh6IE0xNiwwQzcu
-        MiwwLDAsNy4yLDAsMTZzNy4yLDE2LDE2LDE2czE2LTcuMiwxNi0xNlMyNC44LDAsMTYsMHogTTE2LDMw
-        ICAgIEM4LjMsMzAsMiwyMy43LDIsMTZTOC4zLDIsMTYsMnMxNCw2LjMsMTQsMTRTMjMuNywzMCwxNiwz
-        MHogTTIzLjcsOS43QzIzLjYsOS45LDIzLjMsMTAsMjMsMTBjLTAuNiwwLTEtMC40LTEtMSAgICBjMC0w
-        LjMsMC4xLTAuNiwwLjMtMC43QzIwLjYsNi44LDE4LjQsNiwxNiw2Yy01LDAtOS4yLDMuNy05LjksOC42
-        QzYuMywxNC4yLDYuNiwxNCw3LDE0YzAuNiwwLDEsMC40LDEsMWMwLDAuNi0wLjQsMS0xLDEgICAgYy0w
-        LjUsMC0wLjktMC4zLTEtMC44YzAsMC4zLDAsMC41LDAsMC44YzAsNS41LDQuNSwxMCwxMCwxMGMwLjMs
-        MCwwLjUsMCwwLjgsMGMtMC41LTAuMS0wLjgtMC41LTAuOC0xYzAtMC42LDAuNC0xLDEtMXMxLDAuNCwx
-        LDEgICAgYzAsMC40LTAuMiwwLjctMC42LDAuOUMyMi4zLDI1LjIsMjYsMjEsMjYsMTZDMjYsMTMuNiwy
-        NS4yLDExLjQsMjMuNyw5Ljd6IE0xNiwyNGMtNC40LDAtOC0zLjYtOC04YzAtMywxLjYtNS41LDQtNi45
-        ICAgIGMwLDAsMCwwLDAtMC4xYzAtMC42LDAuNC0xLDEtMWMwLjMsMCwwLjUsMC4xLDAuNywwLjNDMTQu
-        NSw4LjEsMTUuMiw4LDE2LDhjNC40LDAsOCwzLjYsOCw4UzIwLjQsMjQsMTYsMjR6IiBjbGFzcz0iQmxh
-        Y2siIC8+DQogICAgPC9nPg0KICAgIDxnIGNsYXNzPSJzdDEiPg0KICAgICAgPHBvbHlnb24gcG9pbnRz
-        PSIyMiw4IDE0LDggMTQsMTAgMTAuNiwxMCA3LDEzLjYgNi40LDEzIDUuNCwxNCA4LDE0IDgsMTcuNCAx
-        NS44LDI1LjIgMTUuNiwyNS43IDE2LDI1LjggMTYsMjQgICAgIDE4LjQsMjQgMjMuOCwxMCAyMiwxMCAg
-        ICIgY2xhc3M9IkdyZWVuIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMjMsNmMtMS4zLDAtMi40
-        LDAuOC0yLjgsMmgtNC40Yy0wLjQtMS4yLTEuNS0yLTIuOC0yYy0xLjcsMC0zLDEuMy0zLDNjMCwwLjUs
-        MC4xLDAuOSwwLjMsMS4zbC0yLDIgICBDNy45LDEyLjEsNy41LDEyLDcsMTJjLTEuNywwLTMsMS4zLTMs
-        M3MxLjMsMywzLDNjMC41LDAsMC45LTAuMSwxLjMtMC4zbDYsNkMxNC4xLDI0LjEsMTQsMjQuNSwxNCwy
-        NWMwLDEuNywxLjMsMywzLDNzMy0xLjMsMy0zICAgYzAtMC45LTAuNC0xLjgtMS4xLTIuM0wyMywxMmMx
-        LjYsMCwzLTEuNCwzLTNDMjYsNy4zLDI0LjcsNiwyMyw2eiBNNywxNmMtMC42LDAtMS0wLjQtMS0xYzAt
-        MC42LDAuNC0xLDEtMXMxLDAuNCwxLDEgICBDOCwxNS42LDcuNiwxNiw3LDE2eiBNMTMsOGMwLjYsMCwx
-        LDAuNCwxLDFjMCwwLjYtMC40LDEtMSwxcy0xLTAuNC0xLTFDMTIsOC40LDEyLjQsOCwxMyw4eiBNMTcs
-        MjZjLTAuNiwwLTEtMC40LTEtMSAgIGMwLTAuNiwwLjQtMSwxLTFzMSwwLjQsMSwxQzE4LDI1LjYsMTcu
-        NiwyNiwxNywyNnogTTE3LDIyQzE3LDIyLDE3LDIyLDE3LDIyYy0wLjUsMC0wLjksMC4xLTEuMywwLjNs
-        LTYtNkM5LjksMTUuOSwxMCwxNS41LDEwLDE1ICAgcy0wLjEtMC45LTAuMy0xLjNsMi0yYzAuNCwwLjIs
-        MC44LDAuMywxLjMsMC4zYzEuMywwLDIuNC0wLjgsMi44LTJoNC40YzAuMiwwLjUsMC41LDEsMSwxLjNM
-        MTcsMjJ6IE0yMywxMGMtMC42LDAtMS0wLjQtMS0xICAgYzAtMC42LDAuNC0xLDEtMXMxLDAuNCwxLDFD
-        MjQsOS42LDIzLjYsMTAsMjMsMTB6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnWorkingAnaly.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAA0DAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iU3BhcmtsaW5lIj4NCiAgICA8cGF0aCBkPSJNMzEsNEgxQzAuNSw0LDAsNC41LDAs
-        NXYyMmMwLDAuNSwwLjUsMSwxLDFoMzBjMC41LDAsMS0wLjUsMS0xVjVDMzIsNC41LDMxLjUsNCwzMSw0
-        eiBNMzAsMjZIMlY2aDI4VjI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5bGluZSBwb2ludHM9
-        IjQsMjAgOCwxNiAxMCwxOCAxNiwxMiAxOCwxNCAyNCw4IDI4LDEyIDI4LDE1IDI0LDExIDE4LDE3IDE2
-        LDE1IDEwLDIxIDgsMTkgNCwyMyA0LDIwICAiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnPumpParallel.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMYCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iQ3JlYXRlX0Z1bGxfU3RhY2tlZF9MaW5lX0NoYXJ0X05vX01hcmtlcnMi
-        IHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRl
-        eHQvY3NzIj4KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuUmVk
-        e2ZpbGw6I0QxMUMxQzt9Cjwvc3R5bGU+DQogIDxyZWN0IHg9IjIiIHk9IjQiIHdpZHRoPSIyNiIgaGVp
-        Z2h0PSIyIiBjbGFzcz0iUmVkIiAvPg0KICA8cG9seWdvbiBwb2ludHM9IjEuNywxMy45IDEuNywxMy45
-        IDIuMywxMiAxNCwxNS45IDI3LjcsMTIgMjguMywxMy45IDE0LDE4IDEuNywxMy45ICIgY2xhc3M9Illl
-        bGxvdyIgLz4NCiAgPHBhdGggZD0iTTIuNCwyOS45TDIuNCwyOS45TDIuNCwyOS45TDIuNCwyOS45TDIu
-        NCwyOS45eiBNMS42LDI4LjFMMTMuOSwyMmwxNC40LDQuMUwyNy43LDI4bC0xMy42LTMuOUwyLjQsMjku
-        OSAgTDEuNiwyOC4xTDEuNiwyOC4xeiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="barBtnRepair.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMsFAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku
-        WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4
-        N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk
-        aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTMxLDhoLTRjLTAu
-        NiwwLTEsMC40LTEsMXY0YzAsMC42LDAuNCwxLDEsMWg0YzAuNiwwLDEtMC40LDEtMVY5QzMyLDguNCwz
-        MS42LDgsMzEsOHogTTMwLDEyaC0ydi0yaDJWMTJ6ICAgTTMxLDE2aC00Yy0wLjYsMC0xLDAuNC0xLDF2
-        NGMwLDAuNiwwLjQsMSwxLDFoNGMwLjYsMCwxLTAuNCwxLTF2LTRDMzIsMTYuNCwzMS42LDE2LDMxLDE2
-        eiBNMzAsMjBoLTJ2LTJoMlYyMHogTTMxLDI0aC00ICBjLTAuNiwwLTEsMC40LTEsMXY0YzAsMC42LDAu
-        NCwxLDEsMWg0YzAuNiwwLDEtMC40LDEtMXYtNEMzMiwyNC40LDMxLjYsMjQsMzEsMjR6IE0zMCwyOGgt
-        MnYtMmgyVjI4eiIgY2xhc3M9IkJsdWUiIC8+DQogIDxwYXRoIGQ9Ik0xOSwxMmgtNGMtMC42LDAtMSww
-        LjQtMSwxdjRjMCwwLjYsMC40LDEsMSwxaDRjMC42LDAsMS0wLjQsMS0xdi00QzIwLDEyLjQsMTkuNiwx
-        MiwxOSwxMnogTTE4LDE2aC0ydi0yaDJWMTYgIHogTTE5LDI0aC00Yy0wLjYsMC0xLDAuNC0xLDF2NGMw
-        LDAuNiwwLjQsMSwxLDFoNGMwLjYsMCwxLTAuNCwxLTF2LTRDMjAsMjQuNCwxOS42LDI0LDE5LDI0eiBN
-        MTgsMjhoLTJ2LTJoMlYyOHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNNywxOEgzYy0wLjYs
-        MC0xLDAuNC0xLDF2NGMwLDAuNiwwLjQsMSwxLDFoNGMwLjYsMCwxLTAuNCwxLTF2LTRDOCwxOC40LDcu
-        NiwxOCw3LDE4eiBNNiwyMkg0di0yaDJWMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPHBvbHlnb24gcG9p
-        bnRzPSIzMSwzIDI4LDAgMjgsMiAyLDIgMiw0IDI4LDQgMjgsNiAiIGNsYXNzPSJCbGFjayIgLz4NCiAg
-        PGcgY2xhc3M9InN0MCI+DQogICAgPHBhdGggZD0iTTE0LDE0djJoLTJ2MTBoMnYyaC00di02SDh2LTJo
-        MnYtNkgxNHogTTI2LDEydi0yaC00djRoLTJ2MmgydjRoNHYtMmgtMnYtNkgyNnogTTIwLDI4aDZ2LTJo
-        LTZWMjh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnWorkingEvaluation.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGYEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
-        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
-        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
-        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
-        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
-        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
-        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJLUElfeDVGX1Njb3Jl
-        Y2FyZCI+DQogICAgPGcgY2xhc3M9InN0MSI+DQogICAgICA8cGF0aCBkPSJNOCwxMmgxMnYySDhWMTJ6
-        IE04LDE4aDkuMmgxLjdIMjB2LTJIOFYxOHogTTgsMTBoMTJWOEg4VjEweiIgY2xhc3M9IkJsYWNrIiAv
-        Pg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEuMiwyNEg0VjJoMjB2MTcuMmwyLTJWMWMwLTAuNS0w
-        LjUtMS0xLTFIM0MyLjUsMCwyLDAuNSwyLDF2MjRjMCwwLjUsMC41LDEsMSwxaDYuMkwxMS4yLDI0eiIg
-        Y2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iOCwzMCAxOCwyMCAyMiwyNCAzMiwx
-        NCAzMiwzMCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="barBtnSetVisualVisible.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGQCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        UmVke2ZpbGw6I0QxMUMxQzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuR3JlZW57ZmlsbDojMDM5
-        QzIzO30KPC9zdHlsZT4NCiAgPGcgaWQ9IlZpc2liaWxpdHkiPg0KICAgIDxjaXJjbGUgY3g9IjE2IiBj
-        eT0iMTYiIHI9IjQiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMTYsOEM4LDgsMiwxNiwy
-        LDE2czYsOCwxNCw4czE0LTgsMTQtOFMyNCw4LDE2LDh6IE0xNiwyMmMtMy4zLDAtNi0yLjctNi02czIu
-        Ny02LDYtNnM2LDIuNyw2LDYgICBTMTkuMywyMiwxNiwyMnoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9n
-        Pg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="barCkDecorator.ImageOptions.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>
-  <data name="barBtnAddWorking.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEcDAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuR3JlZW57ZmlsbDojMDM5
-        QzIzO30KCS5CbHVle2ZpbGw6IzExNzdENzt9Cjwvc3R5bGU+DQogIDxnIGlkPSJXYWxsZXQiPg0KICAg
-        IDxwYXRoIGQ9Ik0yMCwyMmMtMy40LDAtNi4xLTIuOC02LTYuMmMwLjEtMy4zLDMtNS44LDYuMy01LjhI
-        MjhjMCwwLDAsMCwwLDBWNlY1YzAtMC42LTAuNS0xLTEtMUgzQzIuNSw0LDIsNC41LDIsNVYyNyAgIGMw
-        LDAuNiwwLjUsMSwxLDFIMjdjMC42LDAsMS0wLjUsMS0xVjIyYzAsMCwwLDAsMCwwSDIweiIgY2xhc3M9
-        IlJlZCIgLz4NCiAgICA8cGF0aCBkPSJNMjksMTJMMjksMTJoLTljLTIuMywwLTQuMiwyLTQsNC40YzAu
-        MiwyLjEsMi4xLDMuNiw0LjIsMy42SDI5aDBjMC41LDAsMS0wLjUsMS0xdi02QzMwLDEyLjUsMjkuNSwx
-        MiwyOSwxMnogICAgTTIwLDE4Yy0xLjEsMC0yLTAuOS0yLTJjMC0xLjEsMC45LTIsMi0yczIsMC45LDIs
-        MkMyMiwxNy4xLDIxLjEsMTgsMjAsMTh6IiBjbGFzcz0iUmVkIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
-  <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>179, 21</value>
-  </metadata>
-  <metadata name="svgImg32.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>45, 22</value>
-  </metadata>
-  <metadata name="rmSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>323, 21</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="rmSet.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAFNldHVwO0N1c3RvbWl6O0Rlc2ln
-        bjtTZXR0aW5nO1Byb3BlcnQ4H7UhAAABzElEQVRYR8WWS07DQBBEswIkYAE3YkkkLgJHYMcJ+G7gEnwk
-        4AzAno9YorCEG5gqyx61O9WOnUnw4kXWTHV1xZ+ZGRVFMSjlz97RY192wQQUFbzmmNKG5ASwzW0IpQ3J
-        CeCb1yhtSFuAFXACXsE5WAV2XjUnVsMa1tLjGNDTzocBKLwG1vge0HAL7FdjCs5RQy1r7Bw9GyGiAKfA
-        FtY8gR83pqDm2Y3V0Dv1igK8A1W8CD5A6hUFuASqeBFcgdQrCrAGHoAyyIGejZc5CkAYInqO8/AC/JfU
-        GmAb/AJlRm7BDtio4PUdUFpCL3o2+rQFOADKiBwCVUM4p2oIPRt6G8Cv7RH8lw0TAe+OqrWUe4cN0KU5
-        4a32DT3UqFrPxAZQAsUm8A091KjaKZYVgC+lqp3CBhjiEXzbAGMOmMkIvmC+oafLS/gFxjaA598/Q8+s
-        hegG8FavV/C67Z/3Xoi4bHL5VGbzwGW981JM4TI2o/pQk3pFAQbfjj+BKl4E9E69ogDRkYzPMfdIdgZS
-        ryjArENp2yfKuexDKaGQx/I3cAH8G2yNLVbDGtbSo9exvAuqOVHakJwAau/gUq60ITkB/N5Rru1AaUNS
-        gOEoRn8K5LVvQjKRrgAAAABJRU5ErkJggg==
-</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs
index 4c8a96f..91d37a3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.Designer.cs
@@ -29,27 +29,22 @@
         private void InitializeComponent()
         {
             components = new Container();
+            DevExpress.XtraBars.Navigation.AccordionContextButton accordionContextButton1 = new DevExpress.XtraBars.Navigation.AccordionContextButton();
             ComponentResourceManager resources = new ComponentResourceManager(typeof(SimulationFunctionCtrl));
             accordionControl1 = new DevExpress.XtraBars.Navigation.AccordionControl();
             elementProjectSiteInfo = new DevExpress.XtraBars.Navigation.AccordionControlElement();
             elementProjectSiteSimulation = new DevExpress.XtraBars.Navigation.AccordionControlElement();
-            elementSchemeList = new DevExpress.XtraBars.Navigation.AccordionControlElement();
+            elementProjectSiteSchemeList = new DevExpress.XtraBars.Navigation.AccordionControlElement();
             svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            btnCompareWorking = new SimpleButton();
-            btnCreateProjectSiteScheme = new SimpleButton();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             ((ISupportInitialize)accordionControl1).BeginInit();
             ((ISupportInitialize)svgImg32).BeginInit();
             ((ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
             ((ISupportInitialize)Root).BeginInit();
             ((ISupportInitialize)layoutControlItem1).BeginInit();
-            ((ISupportInitialize)layoutControlItem3).BeginInit();
-            ((ISupportInitialize)layoutControlItem2).BeginInit();
             SuspendLayout();
             // 
             // accordionControl1
@@ -59,7 +54,7 @@
             accordionControl1.Appearance.Group.Default.Options.UseFont = true;
             accordionControl1.Appearance.Item.Default.FontSizeDelta = 1;
             accordionControl1.Appearance.Item.Default.Options.UseFont = true;
-            accordionControl1.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] { elementProjectSiteInfo, elementProjectSiteSimulation, elementSchemeList });
+            accordionControl1.Elements.AddRange(new DevExpress.XtraBars.Navigation.AccordionControlElement[] { elementProjectSiteInfo, elementProjectSiteSimulation, elementProjectSiteSchemeList });
             accordionControl1.ExpandElementMode = DevExpress.XtraBars.Navigation.ExpandElementMode.Multiple;
             accordionControl1.ExpandGroupOnHeaderClick = false;
             accordionControl1.ExpandItemOnHeaderClick = false;
@@ -73,11 +68,11 @@
             accordionControl1.OptionsMinimizing.AllowFooterResizing = false;
             accordionControl1.OptionsMinimizing.AllowMinimizeMode = DevExpress.Utils.DefaultBoolean.False;
             accordionControl1.ScrollBarMode = DevExpress.XtraBars.Navigation.ScrollBarMode.Fluent;
-            accordionControl1.Size = new Size(232, 660);
+            accordionControl1.Size = new Size(232, 710);
             accordionControl1.StyleController = layoutControl1;
             accordionControl1.TabIndex = 1;
             accordionControl1.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
-            accordionControl1.ElementClick += accordionControl1_ElementClick;
+            accordionControl1.ContextButtonClick += accordionControl1_ContextButtonClick;
             // 
             // elementProjectSiteInfo
             // 
@@ -99,13 +94,22 @@
             elementProjectSiteSimulation.Text = "姘村姏妯℃嫙";
             elementProjectSiteSimulation.Click += elementProjectSiteSimulation_Click;
             // 
-            // elementSchemeList
+            // elementProjectSiteSchemeList
             // 
-            elementSchemeList.ImageOptions.ImageIndex = 2;
-            elementSchemeList.Name = "elementSchemeList";
-            elementSchemeList.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
-            elementSchemeList.Tag = "scheme-list";
-            elementSchemeList.Text = "鏂规绠$悊";
+            accordionContextButton1.AlignmentOptions.Panel = DevExpress.Utils.ContextItemPanel.Center;
+            accordionContextButton1.AlignmentOptions.Position = DevExpress.Utils.ContextItemPosition.Far;
+            accordionContextButton1.Id = new Guid("c11f8afe-1d26-419d-b332-c96d2729c114");
+            accordionContextButton1.ImageOptionsCollection.ItemNormal.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("resource.SvgImage");
+            accordionContextButton1.ImageOptionsCollection.ItemNormal.SvgImageSize = new Size(20, 20);
+            accordionContextButton1.Name = "accordionContextButton1";
+            accordionContextButton1.ToolTip = "鍒涘缓鏂规";
+            elementProjectSiteSchemeList.ContextButtons.Add(accordionContextButton1);
+            elementProjectSiteSchemeList.HeaderTemplate.AddRange(new DevExpress.XtraBars.Navigation.HeaderElementInfo[] { new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.Image), new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.Text), new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.ContextButtons, DevExpress.XtraBars.Navigation.HeaderElementAlignment.Left), new DevExpress.XtraBars.Navigation.HeaderElementInfo(DevExpress.XtraBars.Navigation.HeaderElementType.HeaderControl) });
+            elementProjectSiteSchemeList.ImageOptions.ImageIndex = 2;
+            elementProjectSiteSchemeList.Name = "elementProjectSiteSchemeList";
+            elementProjectSiteSchemeList.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
+            elementProjectSiteSchemeList.Tag = "scheme-list";
+            elementProjectSiteSchemeList.Text = "鏂规绠$悊";
             // 
             // svgImg32
             // 
@@ -119,8 +123,6 @@
             // 
             // layoutControl1
             // 
-            layoutControl1.Controls.Add(btnCompareWorking);
-            layoutControl1.Controls.Add(btnCreateProjectSiteScheme);
             layoutControl1.Controls.Add(accordionControl1);
             layoutControl1.Dock = DockStyle.Fill;
             layoutControl1.Location = new Point(0, 0);
@@ -131,47 +133,11 @@
             layoutControl1.TabIndex = 2;
             layoutControl1.Text = "layoutControl1";
             // 
-            // btnCompareWorking
-            // 
-            btnCompareWorking.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            btnCompareWorking.Appearance.ForeColor = Color.White;
-            btnCompareWorking.Appearance.Options.UseBackColor = true;
-            btnCompareWorking.Appearance.Options.UseForeColor = true;
-            btnCompareWorking.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
-            btnCompareWorking.ImageOptions.ImageToTextAlignment = ImageAlignToText.LeftCenter;
-            btnCompareWorking.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnCompareWorking.ImageOptions.SvgImage");
-            btnCompareWorking.ImageOptions.SvgImageSize = new Size(16, 16);
-            btnCompareWorking.Location = new Point(1, 686);
-            btnCompareWorking.Name = "btnCompareWorking";
-            btnCompareWorking.Size = new Size(230, 23);
-            btnCompareWorking.StyleController = layoutControl1;
-            btnCompareWorking.TabIndex = 5;
-            btnCompareWorking.Text = "宸ュ喌瀵规瘮";
-            btnCompareWorking.Click += btnCompareWorking_Click;
-            // 
-            // btnCreateProjectSiteScheme
-            // 
-            btnCreateProjectSiteScheme.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            btnCreateProjectSiteScheme.Appearance.ForeColor = Color.White;
-            btnCreateProjectSiteScheme.Appearance.Options.UseBackColor = true;
-            btnCreateProjectSiteScheme.Appearance.Options.UseForeColor = true;
-            btnCreateProjectSiteScheme.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
-            btnCreateProjectSiteScheme.ImageOptions.ImageToTextAlignment = ImageAlignToText.LeftCenter;
-            btnCreateProjectSiteScheme.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnCreateProjectSiteScheme.ImageOptions.SvgImage");
-            btnCreateProjectSiteScheme.ImageOptions.SvgImageSize = new Size(16, 16);
-            btnCreateProjectSiteScheme.Location = new Point(1, 661);
-            btnCreateProjectSiteScheme.Name = "btnCreateProjectSiteScheme";
-            btnCreateProjectSiteScheme.Size = new Size(230, 23);
-            btnCreateProjectSiteScheme.StyleController = layoutControl1;
-            btnCreateProjectSiteScheme.TabIndex = 4;
-            btnCreateProjectSiteScheme.Text = "鍒涘缓鏂规";
-            btnCreateProjectSiteScheme.Click += btnCreateProjectSiteScheme_Click;
-            // 
             // Root
             // 
             Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             Root.GroupBordersVisible = false;
-            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1 });
             Root.Name = "Root";
             Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             Root.Size = new Size(232, 710);
@@ -183,35 +149,9 @@
             layoutControlItem1.Location = new Point(0, 0);
             layoutControlItem1.Name = "layoutControlItem1";
             layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            layoutControlItem1.Size = new Size(232, 660);
+            layoutControlItem1.Size = new Size(232, 710);
             layoutControlItem1.TextSize = new Size(0, 0);
             layoutControlItem1.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            layoutControlItem3.Control = btnCompareWorking;
-            layoutControlItem3.Location = new Point(0, 685);
-            layoutControlItem3.MaxSize = new Size(0, 25);
-            layoutControlItem3.MinSize = new Size(76, 25);
-            layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 1, 1);
-            layoutControlItem3.Size = new Size(232, 25);
-            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem3.TextSize = new Size(0, 0);
-            layoutControlItem3.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            layoutControlItem2.Control = btnCreateProjectSiteScheme;
-            layoutControlItem2.Location = new Point(0, 660);
-            layoutControlItem2.MaxSize = new Size(0, 25);
-            layoutControlItem2.MinSize = new Size(1, 25);
-            layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 1, 1);
-            layoutControlItem2.Size = new Size(232, 25);
-            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            layoutControlItem2.TextSize = new Size(0, 0);
-            layoutControlItem2.TextVisible = false;
             // 
             // SimulationFunctionCtrl
             // 
@@ -226,8 +166,6 @@
             layoutControl1.ResumeLayout(false);
             ((ISupportInitialize)Root).EndInit();
             ((ISupportInitialize)layoutControlItem1).EndInit();
-            ((ISupportInitialize)layoutControlItem3).EndInit();
-            ((ISupportInitialize)layoutControlItem2).EndInit();
             ResumeLayout(false);
         }
 
@@ -237,13 +175,9 @@
         private DevExpress.XtraBars.Navigation.AccordionControl accordionControl1;
         private DevExpress.XtraBars.Navigation.AccordionControlElement elementProjectSiteInfo;
         private DevExpress.XtraBars.Navigation.AccordionControlElement elementProjectSiteSimulation;
-        private DevExpress.XtraBars.Navigation.AccordionControlElement elementSchemeList;
+        private DevExpress.XtraBars.Navigation.AccordionControlElement elementProjectSiteSchemeList;
         private DevExpress.XtraLayout.LayoutControl layoutControl1;
-        private SimpleButton btnCompareWorking;
-        private SimpleButton btnCreateProjectSiteScheme;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
     }
 }
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
index c4a57c5..58dba41 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.cs
@@ -20,56 +20,27 @@
         /// <summary>
         /// 鏄剧ず椤圭洰绔欐ā鎷熶簨浠�
         /// </summary>
-        public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, Dictionary<HydroWorkingVmo, bool>, SvgImage> ShowProjectSiteSimulationEvent;
+        public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, Dictionary<HydroWorkingVmo, bool>, SvgImage> ShowProjectSiteSimulationEvent;
         /// <summary>
         /// 鏄剧ず椤圭洰绔欏伐鍐典簨浠�
         /// </summary>
-        public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo, SvgImage> ShowProjectSiteWorkingEvent;
+        public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo, SvgImage> ShowProjectSiteWorkingEvent;
         /// <summary>
         /// 椤圭洰绔欏伐鍐甸�夋嫨鏀瑰彉浜嬩欢
         /// </summary>
-        public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo, bool> ProjectSiteWorkingCheckedEvent;
+        public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, HydroWorkingVmo, bool> ProjectSiteWorkingCheckedEvent;
         /// <summary>
         /// 椤圭洰绔欏伐鍐垫洿鏂颁簨浠�
         /// </summary>
-        public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo> ProjectSiteWorkingUpdateEvent;
+        public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, HydroWorkingVmo> ProjectSiteWorkingUpdateEvent;
         /// <summary>
         /// 椤圭洰绔欏伐鍐电Щ闄や簨浠�
         /// </summary>
-        public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo> ProjectSiteWorkingRemoveEvent;
-        /// <summary>
-        /// 鏄剧ず椤圭洰绔欐柟妗堜簨浠�
-        /// </summary>
-        public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, Dictionary<HydroWorkingVmo, bool>, SvgImage> ShowProjectSiteSchemeEvent;
-        /// <summary>
-        /// 鏄剧ず椤圭洰绔欐柟妗堝伐鍐典簨浠�
-        /// </summary>
-        public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, Yw.Model.HydroModelInfo, HydroWorkingVmo, SvgImage> ShowProjectSiteSchemeWorkingEvent;
-        /// <summary>
-        /// 椤圭洰绔欐柟妗堝伐鍐甸�夋嫨宸ュ喌浜嬩欢
-        /// </summary>
-        public event Action<XhsSchemeVmo, HydroWorkingVmo, bool> ProjectSiteSchemeWorkingCheckedEvent;
-        /// <summary>
-        /// 椤圭洰绔欐柟妗堝伐鍐垫洿鏂颁簨浠�
-        /// </summary>
-        public event Action<XhsSchemeVmo, HydroWorkingVmo> ProjectSiteSchemeWorkingUpdateEvent;
-        /// <summary>
-        /// 椤圭洰绔欐柟妗堝伐鍐电Щ闄や簨浠�
-        /// </summary>
-        public event Action<XhsSchemeVmo, HydroWorkingVmo> ProjectSiteSchemeWorkingRemoveEvent;
-
-
-
+        public event Action<XhsProjectVmo, XhsProjectSiteVmo, XhsSchemeVmo, HydroWorkingVmo> ProjectSiteWorkingRemoveEvent;
         /// <summary>
         /// 鍒涘缓椤圭洰绔欐柟妗堜簨浠�
         /// </summary>
         public event Action<XhsProjectVmo, XhsProjectSiteVmo, Yw.Model.HydroModelInfo, SvgImage> CreateProjectSiteSchemeEvent;
-
-        /// <summary>
-        /// 姣斿椤圭洰宸ュ喌浜嬩欢
-        /// </summary>
-        public event Action<SvgImage> CompareProjectWorkingEvent;
-
 
         private XhsProjectVmo _project = null;//椤圭洰
         private XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
@@ -97,144 +68,89 @@
                 return;
             }
             var allWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(relation.ModelID);
-            if (allWorkingList != null && allWorkingList.Count > 0)
+            allWorkingList?.ForEach(x =>
             {
-                _allWorkingCheckedListDict = new Dictionary<HydroWorkingVmo, bool>();
-                foreach (var working in allWorkingList)
-                {
-                    _allWorkingCheckedListDict.Add(working, false);
-                    AppendWorking(working);
-                }
-            }
+                AppendWorking(null, x);
+            });
             var allSchemeList = await BLLFactory<HStation.BLL.XhsScheme>.Instance.GetBySiteID(_projectSite.ID);
-            if (allSchemeList != null && allSchemeList.Count > 0)
+            allSchemeList?.ForEach(async x =>
             {
-                _allSchemeWorkingCheckedListDict = new Dictionary<XhsSchemeVmo, Dictionary<HydroWorkingVmo, bool>>();
-                foreach (var scheme in allSchemeList)
+                AppendScheme(x);
+                var schemeRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
+                        .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsScheme, x.ID, HStation.Xhs.Purpose.Simulation);
+                if (schemeRelation != null)
                 {
-                    AppendScheme(scheme);
-                    var schemeRelation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
-                        .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsScheme, scheme.ID, HStation.Xhs.Purpose.Simulation);
-                    if (schemeRelation != null)
+                    var allSchemeWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(schemeRelation.ModelID);
+                    allSchemeWorkingList?.ForEach(y =>
                     {
-                        var allSchemeWorkingList = await BLLFactory<Yw.BLL.HydroWorking>.Instance.GetByModelID(schemeRelation.ModelID);
-                        if (allSchemeWorkingList != null && allSchemeWorkingList.Count > 0)
-                        {
-                            _allSchemeWorkingCheckedListDict.Add(scheme, new Dictionary<HydroWorkingVmo, bool>());
-                            foreach (var schemeWorking in allSchemeWorkingList)
-                            {
-                                _allSchemeWorkingCheckedListDict[scheme].Add(schemeWorking, false);
-                                AppendSchemeWorking(scheme, schemeWorking);
-                            }
-                        }
-                    }
+                        AppendWorking(x, y);
+                    });
                 }
-            }
+            });
             overlay.Close();
         }
 
-        #region 鑾峰彇姘村姏淇℃伅
+        #region 閫氱敤鏂规硶
 
         /// <summary>
         /// 鑾峰彇姘村姏淇℃伅
         /// UseCache 鏄惁浣跨敤缂撳瓨
         /// </summary>
-        public async Task<Yw.Model.HydroModelInfo> GetHydroInfo(bool useCache)
+        public async Task<Yw.Model.HydroModelInfo> GetHydroInfo(XhsSchemeVmo scheme, bool useCache)
         {
+            Yw.Model.HydroModelInfo hydroInfo = null;
             if (!useCache)
             {
-                _hydroInfo = await GetHydroInfo();
-                if (_hydroInfo == null)
-                {
-                    return null;
-                }
-            }
-            if (_hydroInfo == null)
-            {
-                _hydroInfo = await GetHydroInfo();
-            }
-            return _hydroInfo;
-        }
-
-        //鑾峰彇姘村姏淇℃伅
-        private async Task<Yw.Model.HydroModelInfo> GetHydroInfo()
-        {
-            if (_project == null)
-            {
-                return default;
-            }
-            if (_projectSite == null)
-            {
-                return default;
-            }
-            var relation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
-                .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
-            if (relation == null)
-            {
-                return null;
-            }
-            var hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(relation.ModelID);
-            return hydroInfo;
-        }
-
-        #endregion
-
-        #region 鑾峰彇鏂规姘村姏淇℃伅
-
-        /// <summary>
-        /// 鑾峰彇鏂规姘村姏淇℃伅
-        /// UseCache 鏄惁浣跨敤缂撳瓨
-        /// </summary>
-        public async Task<Yw.Model.HydroModelInfo> GetSchemeHydroInfo(XhsSchemeVmo scheme, bool useCache)
-        {
-            if (_project == null)
-            {
-                return default;
-            }
-            if (_projectSite == null)
-            {
-                return default;
-            }
-            if (scheme == null)
-            {
-                return default;
-            }
-            if (!useCache)
-            {
-                var hydroInfo = await GetSchemeHydroInfo(scheme);
+                hydroInfo = await GetHydroInfo(scheme);
                 if (hydroInfo == null)
                 {
-                    return null;
+                    return default;
                 }
-                if (_allSchemeHydroInfoDict == null)
-                {
-                    _allSchemeHydroInfoDict = new Dictionary<XhsSchemeVmo, Yw.Model.HydroModelInfo>();
-                }
-                if (_allSchemeHydroInfoDict.ContainsKey(scheme))
-                {
-                    _allSchemeHydroInfoDict[scheme] = hydroInfo;
-                }
-                else
-                {
-                    _allSchemeHydroInfoDict.Add(scheme, hydroInfo);
-                }
-                return hydroInfo;
             }
+
+            if (scheme == null)
+            {
+                if (hydroInfo == null)
+                {
+                    if (_hydroInfo == null)
+                    {
+                        _hydroInfo = await GetHydroInfo(null);
+                    }
+                    return _hydroInfo;
+                }
+                _hydroInfo = hydroInfo;
+                return _hydroInfo;
+            }
+
             if (_allSchemeHydroInfoDict == null)
             {
                 _allSchemeHydroInfoDict = new Dictionary<XhsSchemeVmo, Yw.Model.HydroModelInfo>();
             }
-            if (!_allSchemeHydroInfoDict.ContainsKey(scheme))
+
+            if (hydroInfo == null)
             {
-                var hydroInfo = await GetSchemeHydroInfo(scheme);
-                _allSchemeHydroInfoDict.Add(scheme, hydroInfo);
-                return hydroInfo;
+                if (!_allSchemeHydroInfoDict.ContainsKey(scheme))
+                {
+                    hydroInfo = await GetHydroInfo(scheme);
+                    _allSchemeHydroInfoDict.Add(scheme, hydroInfo);
+                    return hydroInfo;
+                }
             }
-            return _allSchemeHydroInfoDict[scheme];
+
+            if (_allSchemeHydroInfoDict.ContainsKey(scheme))
+            {
+                _allSchemeHydroInfoDict[scheme] = hydroInfo;
+            }
+            else
+            {
+                _allSchemeHydroInfoDict.Add(scheme, hydroInfo);
+            }
+
+            return hydroInfo;
         }
 
-        //鑾峰彇鏂规姘村姏淇℃伅
-        private async Task<Yw.Model.HydroModelInfo> GetSchemeHydroInfo(XhsSchemeVmo scheme)
+        //鑾峰彇姘村姏淇℃伅
+        private async Task<Yw.Model.HydroModelInfo> GetHydroInfo(XhsSchemeVmo scheme)
         {
             if (_project == null)
             {
@@ -244,12 +160,18 @@
             {
                 return default;
             }
+
+            HydroModelRelationVmo relation = null;
             if (scheme == null)
             {
-                return default;
+                relation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
+                    .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsProjectSite, _projectSite.ID, HStation.Xhs.Purpose.Simulation);
             }
-            var relation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
-                   .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsScheme, scheme.ID, HStation.Xhs.Purpose.Simulation);
+            else
+            {
+                relation = await BLLFactory<Yw.BLL.HydroModelRelation>.Instance
+                      .GetDefaultByObjectTypeAndObjectIDOfPurpose(HStation.Xhs.DataType.XhsScheme, scheme.ID, HStation.Xhs.Purpose.Simulation);
+            }
             if (relation == null)
             {
                 return default;
@@ -257,163 +179,34 @@
             var hydroInfo = await BLLFactory<Yw.BLL.HydroModelInfo>.Instance.GetByID(relation.ModelID);
             return hydroInfo;
         }
-
-        #endregion
-
-        #region 椤圭洰绔欏伐鍐垫柟娉�
-
-        /// <summary>
-        /// 娣诲姞宸ュ喌
-        /// 绾坊鍔狅紝涓嶄細瑙﹀彂浜嬩欢
-        /// </summary>
-        public void AppendWorking(Yw.Vmo.HydroWorkingVmo working)
-        {
-            if (_project == null)
-            {
-                return;
-            }
-            if (_projectSite == null)
-            {
-                return;
-            }
-            if (working == null)
-            {
-                return;
-            }
-            this.elementProjectSiteSimulation.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
-            var ckEdit = new CheckEdit();
-            ckEdit.Properties.AutoWidth = true;
-            ckEdit.Properties.Caption = string.Empty;
-            ckEdit.CheckedChanged += async (sender, e) =>
-            {
-                if (_allWorkingCheckedListDict == null)
-                {
-                    _allWorkingCheckedListDict = new Dictionary<HydroWorkingVmo, bool>();
-                }
-                if (_allWorkingCheckedListDict.ContainsKey(working))
-                {
-                    _allWorkingCheckedListDict[working] = ckEdit.Checked;
-                }
-                else
-                {
-                    _allWorkingCheckedListDict.Add(working, ckEdit.Checked);
-                }
-                var hydroInfo = await GetHydroInfo(true);
-                this.ProjectSiteWorkingCheckedEvent?.Invoke(_project, _projectSite, hydroInfo, working, ckEdit.Checked);
-            };
-            this.accordionControl1.Controls.Add(ckEdit);
-            var elementWorking = new DevExpress.XtraBars.Navigation.AccordionControlElement();
-            elementWorking.HeaderControl = ckEdit;
-            elementWorking.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
-            elementWorking.Text = working.Name;
-            elementWorking.Hint = working.Description;
-            elementWorking.Tag = working;
-            elementWorking.Click += async (sender, e) =>
-            {
-                var hydroInfo = await GetHydroInfo(true);
-                this.ShowProjectSiteWorkingEvent?.Invoke(_project, _projectSite, hydroInfo, working, this.svgImg32[4]);
-            };
-            this.elementProjectSiteSimulation.Elements.Add(elementWorking);
-        }
-
-        /// <summary>
-        /// 鏇存柊宸ュ喌
-        /// 鏇存柊锛屼細瑙﹀彂鏇存柊浜嬩欢
-        /// </summary>
-        public async void UpdateWorking(Yw.Vmo.HydroWorkingVmo working)
-        {
-            if (_project == null)
-            {
-                return;
-            }
-            if (_projectSite == null)
-            {
-                return;
-            }
-            var hydroInfo = await GetHydroInfo(true);
-            if (working == null)
-            {
-                return;
-            }
-            var element = this.elementProjectSiteSimulation.Elements.
-                Where(x => x.Tag != null && (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
-            if (element == null)
-            {
-                return;
-            }
-            element.Tag = working;
-            element.Text = working.Name;
-            element.Hint = working.Description;
-            this.ProjectSiteWorkingUpdateEvent?.Invoke(_project, _projectSite, hydroInfo, working);
-        }
-
-        /// <summary>
-        /// 绉婚櫎宸ュ喌
-        /// 绉婚櫎锛屼細瑙﹀彂绉婚櫎浜嬩欢
-        /// </summary>
-        public async void RemoveWorking(Yw.Vmo.HydroWorkingVmo working)
-        {
-            if (_project == null)
-            {
-                return;
-            }
-            if (_projectSite == null)
-            {
-                return;
-            }
-            var hydroInfo = await GetHydroInfo(true);
-            if (working == null)
-            {
-                return;
-            }
-            var element = this.elementProjectSiteSimulation.Elements.
-                Where(x => x.Tag != null && (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
-            if (element == null)
-            {
-                return;
-            }
-            if (element.HeaderControl != null)
-            {
-                this.accordionControl1.Controls.Remove(element.HeaderControl);
-            }
-            this.elementProjectSiteSimulation.Elements.Remove(element);
-            if (this.elementProjectSiteSimulation.Elements.Count < 1)
-            {
-                this.elementProjectSiteSimulation.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
-            }
-            this.ProjectSiteWorkingRemoveEvent?.Invoke(_project, _projectSite, hydroInfo, working);
-        }
-
-        #endregion
-
-        #region 椤圭洰绔欐柟妗�
 
         /// <summary>
         /// 娣诲姞鏂规
         /// </summary>
         public void AppendScheme(XhsSchemeVmo scheme)
         {
+            if (_project == null)
+            {
+                return;
+            }
+            if (_projectSite == null)
+            {
+                return;
+            }
             if (scheme == null)
             {
                 return;
             }
-            this.elementSchemeList.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
+
             var elementScheme = new DevExpress.XtraBars.Navigation.AccordionControlElement();
-            elementScheme.Text = scheme.Name;
             elementScheme.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
-            elementScheme.ImageOptions.ImageIndex = 3;
+            elementScheme.Text = scheme.Name;
+            elementScheme.Hint = scheme.Description;
             elementScheme.Tag = scheme;
+            elementScheme.ImageOptions.ImageIndex = 3;
             elementScheme.Click += async (sender, e) =>
             {
-                if (_project == null)
-                {
-                    return;
-                }
-                if (_projectSite == null)
-                {
-                    return;
-                }
-                var hydroInfo = await GetSchemeHydroInfo(scheme);
+                var hydroInfo = await GetHydroInfo(scheme, true);
                 if (hydroInfo == null)
                 {
                     return;
@@ -426,19 +219,29 @@
                         dict = _allSchemeWorkingCheckedListDict[scheme];
                     }
                 }
-                this.ShowProjectSiteSchemeEvent?.Invoke(_project, _projectSite, scheme, hydroInfo, dict, this.svgImg32[3]);
+                this.ShowProjectSiteSimulationEvent?.Invoke(_project, _projectSite, scheme, hydroInfo, dict, this.svgImg32[3]);
             };
-            this.elementSchemeList.Elements.Add(elementScheme);
+            this.elementProjectSiteSchemeList.Elements.Add(elementScheme);
+            this.elementProjectSiteSchemeList.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
+            if (_allSchemeHydroInfoDict == null)
+            {
+                _allSchemeHydroInfoDict = new Dictionary<XhsSchemeVmo, Yw.Model.HydroModelInfo>();
+            }
+            if (_allSchemeWorkingCheckedListDict == null)
+            {
+                _allSchemeWorkingCheckedListDict = new Dictionary<XhsSchemeVmo, Dictionary<HydroWorkingVmo, bool>>();
+            }
+            if (!_allSchemeWorkingCheckedListDict.ContainsKey(scheme))
+            {
+                _allSchemeWorkingCheckedListDict.Add(scheme, new Dictionary<HydroWorkingVmo, bool>());
+            }
         }
 
-        #endregion
-
-        #region 椤圭洰绔欐柟妗堝伐鍐�
-
         /// <summary>
-        /// 娣诲姞鏂规宸ュ喌
+        /// 娣诲姞宸ュ喌
+        /// 绾坊鍔狅紝涓嶄細瑙﹀彂浜嬩欢
         /// </summary>
-        public void AppendSchemeWorking(XhsSchemeVmo scheme, Yw.Vmo.HydroWorkingVmo working)
+        public void AppendWorking(XhsSchemeVmo scheme, Yw.Vmo.HydroWorkingVmo working)
         {
             if (_project == null)
             {
@@ -448,47 +251,114 @@
             {
                 return;
             }
-            if (scheme == null)
-            {
-                return;
-            }
             if (working == null)
             {
                 return;
             }
-            var elementScheme = this.elementSchemeList.Elements.FirstOrDefault(x => x.Tag is XhsSchemeVmo && (x.Tag as XhsSchemeVmo).ID == scheme.ID);
-            if (elementScheme == null)
+            if (scheme == null)
             {
-                return;
+                var ckEdit = new CheckEdit();
+                ckEdit.Properties.AutoWidth = true;
+                ckEdit.Properties.Caption = string.Empty;
+                ckEdit.Checked = false;
+                ckEdit.CheckedChanged += (sender, e) =>
+                {
+                    if (_allWorkingCheckedListDict != null)
+                    {
+                        if (_allWorkingCheckedListDict.ContainsKey(working))
+                        {
+                            _allWorkingCheckedListDict[working] = ckEdit.Checked;
+                        }
+                    }
+                    this.ProjectSiteWorkingCheckedEvent?.Invoke(_project, _projectSite, null, working, ckEdit.Checked);
+                };
+                this.accordionControl1.Controls.Add(ckEdit);
+                var elementWorking = new DevExpress.XtraBars.Navigation.AccordionControlElement();
+                elementWorking.HeaderControl = ckEdit;
+                elementWorking.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
+                elementWorking.Text = working.Name;
+                elementWorking.Hint = working.Description;
+                elementWorking.Tag = working;
+                elementWorking.Click += async (sender, e) =>
+                {
+                    var hydroInfo = await GetHydroInfo(null, true);
+                    this.ShowProjectSiteWorkingEvent?.Invoke(_project, _projectSite, null, hydroInfo, working, this.svgImg32[4]);
+                };
+                this.elementProjectSiteSimulation.Elements.Add(elementWorking);
+                this.elementProjectSiteSimulation.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
+                if (_allWorkingCheckedListDict == null)
+                {
+                    _allWorkingCheckedListDict = new Dictionary<HydroWorkingVmo, bool>();
+                }
+                if (!_allWorkingCheckedListDict.ContainsKey(working))
+                {
+                    _allWorkingCheckedListDict.Add(working, false);
+                }
             }
-            elementScheme.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
-            var ckEdit = new CheckEdit();
-            ckEdit.Properties.AutoWidth = true;
-            ckEdit.Properties.Caption = string.Empty;
-            ckEdit.CheckedChanged += (sender, e) =>
+            else
             {
-                this.ProjectSiteSchemeWorkingCheckedEvent?.Invoke(scheme, working, ckEdit.Checked);
-            };
-            this.accordionControl1.Controls.Add(ckEdit);
-            var elementWorking = new DevExpress.XtraBars.Navigation.AccordionControlElement();
-            elementWorking.HeaderControl = ckEdit;
-            elementWorking.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
-            elementWorking.Text = working.Name;
-            elementWorking.Hint = working.Description;
-            elementWorking.Tag = working;
-            elementWorking.Click += async (sender, e) =>
-            {
-                var hydroInfo = await GetSchemeHydroInfo(scheme, true);
-                this.ShowProjectSiteSchemeWorkingEvent?.Invoke(_project, _projectSite, scheme, hydroInfo, working, this.svgImg32[4]);
-            };
-            elementScheme.Elements.Add(elementWorking);
+                var elementScheme = this.elementProjectSiteSchemeList.Elements
+                    .FirstOrDefault(x => (x.Tag is XhsSchemeVmo) && (x.Tag as XhsSchemeVmo).ID == scheme.ID);
+                if (elementScheme == null)
+                {
+                    return;
+                }
+                var ckEdit = new CheckEdit();
+                ckEdit.Properties.AutoWidth = true;
+                ckEdit.Properties.Caption = string.Empty;
+                ckEdit.Checked = false;
+                ckEdit.CheckedChanged += (sender, e) =>
+                {
+                    if (_allSchemeWorkingCheckedListDict != null)
+                    {
+                        if (_allSchemeWorkingCheckedListDict.ContainsKey(scheme))
+                        {
+                            var workingCheckedDict = _allSchemeWorkingCheckedListDict[scheme];
+                            if (workingCheckedDict.ContainsKey(working))
+                            {
+                                workingCheckedDict[working] = ckEdit.Checked;
+                            }
+                        }
+                    }
+                    this.ProjectSiteWorkingCheckedEvent?.Invoke(_project, _projectSite, scheme, working, ckEdit.Checked);
+                };
+                this.accordionControl1.Controls.Add(ckEdit);
+                var elementWorking = new DevExpress.XtraBars.Navigation.AccordionControlElement();
+                elementWorking.HeaderControl = ckEdit;
+                elementWorking.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
+                elementWorking.Text = working.Name;
+                elementWorking.Hint = working.Description;
+                elementWorking.Tag = working;
+                elementWorking.Click += async (sender, e) =>
+                {
+                    var hydroInfo = await GetHydroInfo(scheme, true);
+                    this.ShowProjectSiteWorkingEvent?.Invoke(_project, _projectSite, scheme, hydroInfo, working, this.svgImg32[4]);
+                };
+                elementScheme.Elements.Add(elementWorking);
+                elementScheme.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
+                if (_allSchemeWorkingCheckedListDict == null)
+                {
+                    _allSchemeWorkingCheckedListDict = new Dictionary<XhsSchemeVmo, Dictionary<HydroWorkingVmo, bool>>();
+                }
+                if (_allSchemeWorkingCheckedListDict.ContainsKey(scheme))
+                {
+                    var workingCheckedDict = _allSchemeWorkingCheckedListDict[scheme];
+                    if (workingCheckedDict != null)
+                    {
+                        if (!workingCheckedDict.ContainsKey(working))
+                        {
+                            workingCheckedDict.Add(working, false);
+                        }
+                    }
+                }
+            }
         }
 
         /// <summary>
-        /// 鏇存柊鏂规宸ュ喌
+        /// 鏇存柊宸ュ喌
         /// 鏇存柊锛屼細瑙﹀彂鏇存柊浜嬩欢
         /// </summary>
-        public void UpdateSchemeWorking(XhsSchemeVmo scheme, Yw.Vmo.HydroWorkingVmo working)
+        public void UpdateWorking(XhsSchemeVmo scheme, Yw.Vmo.HydroWorkingVmo working)
         {
             if (_project == null)
             {
@@ -498,35 +368,78 @@
             {
                 return;
             }
-            if (scheme == null)
-            {
-                return;
-            }
             if (working == null)
             {
                 return;
             }
-            var elementScheme = this.elementSchemeList.Elements.FirstOrDefault(x => (x.Tag is XhsSchemeVmo) && (x.Tag as XhsSchemeVmo).ID == scheme.ID);
-            if (elementScheme == null)
+
+            if (scheme == null)
             {
-                return;
+                var element = this.elementProjectSiteSimulation.Elements.
+                         Where(x => (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
+                if (element == null)
+                {
+                    return;
+                }
+                element.Tag = working;
+                element.Text = working.Name;
+                element.Hint = working.Description;
+                if (_allWorkingCheckedListDict != null)
+                {
+                    var key = _allWorkingCheckedListDict.Keys.FirstOrDefault(x => x.ID == working.ID);
+                    if (key != null)
+                    {
+                        var hasChecked = _allWorkingCheckedListDict[key];
+                        _allWorkingCheckedListDict.Remove(key);
+                        _allWorkingCheckedListDict.Add(key, hasChecked);
+                    }
+                }
             }
-            var element = elementScheme.Elements.
-                Where(x => (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
-            if (element == null)
+            else
             {
-                return;
+                var elementScheme = this.elementProjectSiteSchemeList.Elements
+                    .FirstOrDefault(x => (x.Tag is XhsSchemeVmo) && (x.Tag as XhsSchemeVmo).ID == scheme.ID);
+                if (elementScheme == null)
+                {
+                    return;
+                }
+                var element = elementScheme.Elements.
+                    Where(x => (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
+                if (element == null)
+                {
+                    return;
+                }
+                element.Tag = working;
+                element.Text = working.Name;
+                element.Hint = working.Description;
+                if (_allSchemeWorkingCheckedListDict != null)
+                {
+                    var schemeKey = _allSchemeWorkingCheckedListDict.Keys.FirstOrDefault(x => x.ID == scheme.ID);
+                    if (schemeKey != null)
+                    {
+                        var workingCheckedDict = _allSchemeWorkingCheckedListDict[schemeKey];
+                        if (workingCheckedDict != null)
+                        {
+                            var workingKey = workingCheckedDict.Keys.FirstOrDefault(x => x.ID == working.ID);
+                            if (workingKey != null)
+                            {
+                                var hasChecked = workingCheckedDict[workingKey];
+                                workingCheckedDict.Remove(workingKey);
+                                workingCheckedDict.Add(working, hasChecked);
+                            }
+                        }
+                    }
+                }
             }
-            element.Tag = working;
-            element.Text = working.Name;
-            element.Hint = working.Description;
-            this.ProjectSiteSchemeWorkingUpdateEvent?.Invoke(scheme, working);
+
+            this.ProjectSiteWorkingUpdateEvent?.Invoke(_project, _projectSite, scheme, working);
         }
 
         /// <summary>
-        /// 绉婚櫎鏂规宸ュ喌
+        /// 绉婚櫎宸ュ喌
+        /// 绉婚櫎锛屼細瑙﹀彂绉婚櫎浜嬩欢
         /// </summary>
-        public void RemoveSchemeWorking(XhsSchemeVmo scheme, Yw.Vmo.HydroWorkingVmo working)
+        public void RemoveWorking(XhsSchemeVmo scheme, Yw.Vmo.HydroWorkingVmo working)
         {
             if (_project == null)
             {
@@ -536,46 +449,81 @@
             {
                 return;
             }
-            if (scheme == null)
-            {
-                return;
-            }
             if (working == null)
             {
                 return;
             }
-            var elementScheme = this.elementSchemeList.Elements.FirstOrDefault(x => (x.Tag is XhsSchemeVmo) && (x.Tag as XhsSchemeVmo).ID == scheme.ID);
-            if (elementScheme == null)
+            if (scheme == null)
             {
-                return;
+                var element = this.elementProjectSiteSimulation.Elements.
+                        Where(x => (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
+                if (element == null)
+                {
+                    return;
+                }
+                if (element.HeaderControl != null)
+                {
+                    this.accordionControl1.Controls.Remove(element.HeaderControl);
+                }
+                this.elementProjectSiteSimulation.Elements.Remove(element);
+                if (this.elementProjectSiteSimulation.Elements.Count < 1)
+                {
+                    this.elementProjectSiteSimulation.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
+                }
+                if (_allWorkingCheckedListDict != null)
+                {
+                    var key = _allWorkingCheckedListDict.Keys.FirstOrDefault(x => x.ID == working.ID);
+                    if (key != null)
+                    {
+                        _allWorkingCheckedListDict.Remove(key);
+                    }
+                }
             }
-            var element = elementScheme.Elements.
-                Where(x => (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
-            if (element == null)
+            else
             {
-                return;
+                var elementScheme = this.elementProjectSiteSchemeList.Elements
+                    .FirstOrDefault(x => (x.Tag is XhsSchemeVmo) && (x.Tag as XhsSchemeVmo).ID == scheme.ID);
+                if (elementScheme == null)
+                {
+                    return;
+                }
+                var element = elementScheme.Elements.
+                    Where(x => (x.Tag is HydroWorkingVmo) && (x.Tag as HydroWorkingVmo).ID == working.ID).FirstOrDefault();
+                if (element == null)
+                {
+                    return;
+                }
+                if (element.HeaderControl != null)
+                {
+                    this.accordionControl1.Controls.Remove(element.HeaderControl);
+                }
+                elementScheme.Elements.Remove(element);
+                if (elementScheme.Elements.Count < 1)
+                {
+                    elementScheme.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
+                }
+                if (_allSchemeWorkingCheckedListDict != null)
+                {
+                    var schemeKey = _allSchemeWorkingCheckedListDict.Keys.FirstOrDefault(x => x.ID == scheme.ID);
+                    if (schemeKey != null)
+                    {
+                        var workingCheckedDict = _allSchemeWorkingCheckedListDict[schemeKey];
+                        if (workingCheckedDict != null)
+                        {
+                            var workingKey = workingCheckedDict.Keys.FirstOrDefault(x => x.ID == working.ID);
+                            if (workingKey != null)
+                            {
+                                workingCheckedDict.Remove(workingKey);
+                            }
+                        }
+                    }
+                }
             }
-            if (element.HeaderControl != null)
-            {
-                this.accordionControl1.Controls.Remove(element.HeaderControl);
-            }
-            elementScheme.Elements.Remove(element);
-            if (elementScheme.Elements.Count < 1)
-            {
-                elementScheme.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
-            }
-            this.ProjectSiteSchemeWorkingRemoveEvent?.Invoke(scheme, working);
-        }
 
+            this.ProjectSiteWorkingRemoveEvent?.Invoke(_project, _projectSite, scheme, working);
+        }
 
         #endregion
-
-
-        //鍏冪礌鐐瑰嚮浜嬩欢
-        private void accordionControl1_ElementClick(object sender, DevExpress.XtraBars.Navigation.ElementClickEventArgs e)
-        {
-
-        }
 
         //椤圭洰绔欐鍐�
         private async void elementProjectSiteInfo_Click(object sender, EventArgs e)
@@ -588,7 +536,7 @@
             {
                 return;
             }
-            var hydroInfo = await GetHydroInfo(true);
+            var hydroInfo = await GetHydroInfo(null, true);
             if (hydroInfo == null)
             {
                 return;
@@ -607,16 +555,16 @@
             {
                 return;
             }
-            var hydroInfo = await GetHydroInfo(true);
+            var hydroInfo = await GetHydroInfo(null, true);
             if (hydroInfo == null)
             {
                 return;
             }
-            this.ShowProjectSiteSimulationEvent?.Invoke(_project, _projectSite, hydroInfo, _allWorkingCheckedListDict, this.svgImg32[1]);
+            this.ShowProjectSiteSimulationEvent?.Invoke(_project, _projectSite, null, hydroInfo, _allWorkingCheckedListDict, this.svgImg32[1]);
         }
 
         //鍒涘缓椤圭洰绔欐柟妗�
-        private async void btnCreateProjectSiteScheme_Click(object sender, EventArgs e)
+        private async void accordionControl1_ContextButtonClick(object sender, DevExpress.Utils.ContextItemClickEventArgs e)
         {
             if (_project == null)
             {
@@ -626,7 +574,12 @@
             {
                 return;
             }
-            var hydroInfo = await GetHydroInfo(true);
+            var element = e.DataItem as DevExpress.XtraBars.Navigation.AccordionControlElement;
+            if (element != this.elementProjectSiteSchemeList)
+            {
+                return;
+            }
+            var hydroInfo = await GetHydroInfo(null, true);
             if (hydroInfo == null)
             {
                 return;
@@ -634,11 +587,7 @@
             this.CreateProjectSiteSchemeEvent?.Invoke(_project, _projectSite, hydroInfo, this.svgImg32[3]);
         }
 
-        //宸ュ喌瀵规瘮
-        private void btnCompareWorking_Click(object sender, EventArgs e)
-        {
-            this.CompareProjectWorkingEvent?.Invoke(this.svgImg32[5]);
-        }
+
 
 
     }
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.resx
index 4e452c1..abe7a2a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/05-function/SimulationFunctionCtrl.resx
@@ -117,29 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="svgImg32.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="btnCompareWorking.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHUCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
-        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
-        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iUHJvZHVjdFF1aWNrQ29tcGFyaXNvbnMiPg0KICAgIDxwYXRoIGQ9Ik0xMCw2VjBs
-        OSw5bC05LDl2LTZIMFY2SDEweiBNMjAsMzB2LTZoMTB2LTZIMjB2LTZsLTksOUwyMCwzMHoiIGNsYXNz
-        PSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="btnCreateProjectSiteScheme.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="resource.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -158,4 +137,7 @@
         DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
+  <metadata name="svgImg32.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index 06dcbfc..a684848 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -32,6 +32,7 @@
 
         private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
         private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
+        private HStation.Vmo.XhsSchemeVmo _scheme = null;//鏂规
         private Yw.Model.HydroModelInfo _hydroInfo = null;//姘村姏淇℃伅
         private Dictionary<HydroWorkingVmo, bool> _allWorkingCheckedListDict = null;//鎵�鏈夊伐鍐甸�夋嫨鍒楄〃瀛楀吀
 
@@ -42,12 +43,14 @@
             (
                 XhsProjectVmo project,
                 XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
                 Yw.Model.HydroModelInfo hydroInfo,
                 Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict
             )
         {
             _project = project;
             _projectSite = projectSite;
+            _scheme = scheme;
             _hydroInfo = hydroInfo;
             _allWorkingCheckedListDict = allWorkingCheckedListDict;
         }
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
index 2d954f4..c20af2b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/08-working/XhsProjectSimulationWorkingPage.cs
@@ -45,25 +45,6 @@
             (
                 XhsProjectVmo project,
                 XhsProjectSiteVmo projectSite,
-                Yw.Model.HydroModelInfo hydroInfo,
-                HydroWorkingVmo working
-            )
-        {
-            _project = project;
-            _projectSite = projectSite;
-            _hydroInfo = hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
-            _working = working;
-            _hydroInfo.UpdateWorkingInfo(_working.WorkingInfo);
-            this.PageTitle.Caption = $"姘村姏妯℃嫙\r\n{_working.Name}";
-        }
-
-        /// <summary>
-        /// 缁戝畾鏁版嵁
-        /// </summary>
-        public void SetBindingData
-            (
-                XhsProjectVmo project,
-                XhsProjectSiteVmo projectSite,
                 XhsSchemeVmo scheme,
                 Yw.Model.HydroModelInfo hydroInfo,
                 HydroWorkingVmo working
@@ -75,7 +56,14 @@
             _hydroInfo = hydroInfo.Adapt<Yw.Model.HydroModelInfo>();
             _working = working;
             _hydroInfo.UpdateWorkingInfo(_working.WorkingInfo);
-            this.PageTitle.Caption = $"{scheme.Name}\r\n{_working.Name}";
+            if (_scheme == null)
+            {
+                this.PageTitle.Caption = $"姘村姏妯℃嫙\r\n{_working.Name}";
+            }
+            else
+            {
+                this.PageTitle.Caption = $"{scheme.Name}\r\n{_working.Name}";
+            }
         }
 
         /// <summary>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
index 37f5caf..1cb1f0d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/XhsProjectSimulationMgrPage.cs
@@ -15,18 +15,13 @@
             this.PageTitle.Caption = "姘村姏妯℃嫙";
             this.PageTitle.HeaderSvgImage = this.svgImg32[0];
             this.PageTitle.SvgImageSize = new Size(24, 24);
-            this.simulationFunctionMgrCtrl1.ShowProjectSiteInfoEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent;
-            this.simulationFunctionMgrCtrl1.ShowProjectSiteSimulationEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent;
-            this.simulationFunctionMgrCtrl1.ShowProjectSiteWorkingEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteWorkingEvent;
-            this.simulationFunctionMgrCtrl1.ProjectSiteWorkingUpdateEvent += XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent;
-            this.simulationFunctionMgrCtrl1.ProjectSiteWorkingRemoveEvent += XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent;
-            this.simulationFunctionMgrCtrl1.ProjectSiteWorkingCheckedEvent += XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent;
-            this.simulationFunctionMgrCtrl1.CreateProjectSiteSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent;
-            this.simulationFunctionMgrCtrl1.ShowProjectSiteSchemeEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeEvent;
-            this.simulationFunctionMgrCtrl1.ShowProjectSiteSchemeWorkingEvent += XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeWorkingEvent;
-            this.simulationFunctionMgrCtrl1.ProjectSiteSchemeWorkingCheckedEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingCheckedEvent;
-            this.simulationFunctionMgrCtrl1.ProjectSiteSchemeWorkingUpdateEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingUpdateEvent;
-            this.simulationFunctionMgrCtrl1.ProjectSiteSchemeWorkingRemoveEvent += SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingRemoveEvent;
+            this.simulationFunctionMgrCtrl1.ShowProjectSiteInfoEvent += SimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent;
+            this.simulationFunctionMgrCtrl1.ShowProjectSiteSimulationEvent += SimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent;
+            this.simulationFunctionMgrCtrl1.ShowProjectSiteWorkingEvent += SimulationFunctionMgrCtrl1_ShowProjectSiteWorkingEvent;
+            this.simulationFunctionMgrCtrl1.ProjectSiteWorkingUpdateEvent += SimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent;
+            this.simulationFunctionMgrCtrl1.ProjectSiteWorkingRemoveEvent += SimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent;
+            this.simulationFunctionMgrCtrl1.ProjectSiteWorkingCheckedEvent += SimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent;
+            this.simulationFunctionMgrCtrl1.CreateProjectSiteSchemeEvent += SimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent;
         }
 
         private XhsProjectVmo _project = null;//椤圭洰
@@ -70,8 +65,13 @@
         #region 鍔熻兘闈㈡澘
 
         //鏄剧ず椤圭洰绔欐鍐典簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, SvgImage svgImage)
+        private void SimulationFunctionMgrCtrl1_ShowProjectSiteInfoEvent
+            (
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                Yw.Model.HydroModelInfo hydroInfo,
+                SvgImage svgImage
+            )
         {
             lock (_locker)
             {
@@ -80,6 +80,7 @@
                     Modular = this.PageGuid.Modular,
                     MoudingType = eMoudingType.Tab,
                     Function = SimulationFunctionHelper.Info,
+                    TagName = $"{project.ID}-{projectSite.ID}"
                 };
                 if (!IsExistPage(guid, true))
                 {
@@ -92,8 +93,15 @@
         }
 
         //鏄剧ず椤圭洰绔欐按鍔涙ā鎷熶簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict, SvgImage svgImage)
+        private void SimulationFunctionMgrCtrl1_ShowProjectSiteSimulationEvent
+            (
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
+                Yw.Model.HydroModelInfo hydroInfo,
+                Dictionary<HydroWorkingVmo, bool> allWorkingCheckedListDict,
+                SvgImage svgImage
+            )
         {
             lock (_locker)
             {
@@ -102,7 +110,7 @@
                     Modular = this.PageGuid.Modular,
                     MoudingType = eMoudingType.Tab,
                     Function = SimulationFunctionHelper.Simulation,
-                    TagName = projectSite.ID.ToString()
+                    TagName = $"{project.ID}-{projectSite.ID}-{scheme?.ID}"
                 };
                 if (!IsExistPage(guid, true))
                 {
@@ -110,17 +118,24 @@
                     page.PageTitle.HeaderSvgImage = svgImage;
                     page.AppendWorkingEvent += (working) =>
                     {
-                        this.simulationFunctionMgrCtrl1.AppendWorking(working);
+                        this.simulationFunctionMgrCtrl1.AppendWorking(scheme, working);
                     };
-                    page.SetBindingData(project, projectSite, hydroInfo, allWorkingCheckedListDict);
+                    page.SetBindingData(project, projectSite, scheme, hydroInfo, allWorkingCheckedListDict);
                     CreatePage(page, guid);
                 }
             }
         }
 
         //鏄剧ず椤圭洰绔欏伐鍐典簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteWorkingEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working, SvgImage svgImage)
+        private void SimulationFunctionMgrCtrl1_ShowProjectSiteWorkingEvent
+            (
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
+                Yw.Model.HydroModelInfo hydroInfo,
+                HydroWorkingVmo working,
+                SvgImage svgImage
+            )
         {
             lock (_locker)
             {
@@ -129,29 +144,34 @@
                     Modular = this.PageGuid.Modular,
                     MoudingType = eMoudingType.Tab,
                     Function = SimulationFunctionHelper.Working,
-                    TagName = working.ID.ToString()
+                    TagName = $"{project.ID}-{projectSite.ID}-{scheme?.ID}-{working.ID}"
                 };
                 if (!IsExistPage(guid, true))
                 {
                     var page = new XhsProjectSimulationWorkingPage();
                     page.UpdateWorkingEvent += (rhs) =>
                     {
-                        this.simulationFunctionMgrCtrl1.UpdateWorking(rhs);
+                        this.simulationFunctionMgrCtrl1.UpdateWorking(scheme, rhs);
                     };
                     page.RemoveWorkingEvent += (rhs) =>
                     {
-                        this.simulationFunctionMgrCtrl1.RemoveWorking(rhs);
+                        this.simulationFunctionMgrCtrl1.RemoveWorking(scheme, rhs);
                     };
                     page.PageTitle.HeaderSvgImage = svgImage;
-                    page.SetBindingData(project, projectSite, hydroInfo, working);
+                    page.SetBindingData(project, projectSite, scheme, hydroInfo, working);
                     CreatePage(page, guid);
                 }
             }
         }
 
         //椤圭洰绔欏伐鍐垫洿鏂颁簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working)
+        private void SimulationFunctionMgrCtrl1_ProjectSiteWorkingUpdateEvent
+            (
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
+                HydroWorkingVmo working
+            )
         {
             var guid = new PageGuid()
             {
@@ -174,8 +194,13 @@
         }
 
         //椤圭洰绔欏伐鍐电Щ闄や簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working)
+        private void SimulationFunctionMgrCtrl1_ProjectSiteWorkingRemoveEvent
+            (
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
+                HydroWorkingVmo working
+            )
         {
             var guid = new PageGuid()
             {
@@ -198,8 +223,14 @@
         }
 
         //椤圭洰绔欏伐鍐甸�夋嫨鏀瑰彉浜嬩欢
-        private void XhsProjectSimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working, bool hasChecked)
+        private void SimulationFunctionMgrCtrl1_ProjectSiteWorkingCheckedEvent
+            (
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                XhsSchemeVmo scheme,
+                HydroWorkingVmo working,
+                bool hasChecked
+            )
         {
             var guid = new PageGuid()
             {
@@ -222,8 +253,13 @@
         }
 
         //椤圭洰绔欐柟妗堝垱寤轰簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, Yw.Model.HydroModelInfo hydroInfo, SvgImage svgImage)
+        private void SimulationFunctionMgrCtrl1_CreateProjectSiteSchemeEvent
+            (
+                XhsProjectVmo project,
+                XhsProjectSiteVmo projectSite,
+                Yw.Model.HydroModelInfo hydroInfo,
+                SvgImage svgImage
+            )
         {
             WaitFormHelper.ShowWaitForm(this.FindForm(), "姝e湪鍔犺浇妯″瀷锛岃绋嶄警...");
             var dlg = new AddXhsSchemeDlg();
@@ -235,134 +271,6 @@
             dlg.SetBindingData(project, projectSite, hydroInfo);
             dlg.ShowDialog();
         }
-
-        //鏄剧ず椤圭洰绔欐柟妗堜簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, XhsSchemeVmo scheme, Yw.Model.HydroModelInfo hydroInfo, Dictionary<HydroWorkingVmo, bool> dict, SvgImage svgImage)
-        {
-            lock (_locker)
-            {
-                var guid = new PageGuid()
-                {
-                    Modular = this.PageGuid.Modular,
-                    MoudingType = eMoudingType.Tab,
-                    Function = SimulationFunctionHelper.Scheme,
-                    TagName = scheme.ID.ToString()
-                };
-                if (!IsExistPage(guid, true))
-                {
-                    var page = new XhsProjectSimulationSchemePage();
-                    page.PageTitle.HeaderSvgImage = svgImage;
-                    page.AppendWorkingEvent += (working) =>
-                    {
-                        this.simulationFunctionMgrCtrl1.AppendSchemeWorking(scheme, working);
-                    };
-                    page.SetBindingData(project, projectSite, scheme, hydroInfo, dict);
-                    CreatePage(page, guid);
-                }
-            }
-        }
-
-        //鏄剧ず椤圭洰绔欐柟妗堝伐鍐典簨浠�
-        private void XhsProjectSimulationFunctionMgrCtrl1_ShowProjectSiteSchemeWorkingEvent
-            (XhsProjectVmo project, XhsProjectSiteVmo projectSite, XhsSchemeVmo scheme, Yw.Model.HydroModelInfo hydroInfo, HydroWorkingVmo working, SvgImage svgImage)
-        {
-            lock (_locker)
-            {
-                var guid = new PageGuid()
-                {
-                    Modular = this.PageGuid.Modular,
-                    MoudingType = eMoudingType.Tab,
-                    Function = SimulationFunctionHelper.Working,
-                    TagName = working.ID.ToString()
-                };
-                if (!IsExistPage(guid, true))
-                {
-                    var page = new XhsProjectSimulationWorkingPage();
-                    page.PageTitle.HeaderSvgImage = svgImage;
-                    page.UpdateWorkingEvent += (rhs) =>
-                    {
-                        this.simulationFunctionMgrCtrl1.UpdateSchemeWorking(scheme, rhs);
-                    };
-                    page.RemoveWorkingEvent += (rhs) =>
-                    {
-                        this.simulationFunctionMgrCtrl1.RemoveSchemeWorking(scheme, rhs);
-                    };
-                    page.SetBindingData(project, projectSite, scheme, hydroInfo, working);
-                    CreatePage(page, guid);
-                }
-            }
-        }
-
-        //椤圭洰绔欐柟妗堝伐鍐甸�夋嫨鏀瑰彉浜嬩欢
-        private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingCheckedEvent(XhsSchemeVmo scheme, HydroWorkingVmo working, bool hasChecked)
-        {
-            var guid = new PageGuid()
-            {
-                Modular = this.PageGuid.Modular,
-                MoudingType = eMoudingType.Tab,
-                Function = SimulationFunctionHelper.Scheme,
-                TagName = scheme.ID.ToString()
-            };
-            var page = FindPage(guid);
-            if (page == null)
-            {
-                return;
-            }
-            var ctrl = page as XhsProjectSimulationSchemePage;
-            if (ctrl == null)
-            {
-                return;
-            }
-            ctrl.UpdateWorkingCheckedList(working, hasChecked);
-        }
-
-        //椤圭洰绔欐柟妗堝伐鍐垫洿鏂颁簨浠�
-        private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingUpdateEvent(XhsSchemeVmo scheme, HydroWorkingVmo working)
-        {
-            var guid = new PageGuid()
-            {
-                Modular = this.PageGuid.Modular,
-                MoudingType = eMoudingType.Tab,
-                Function = SimulationFunctionHelper.Scheme,
-                TagName = scheme.ID.ToString()
-            };
-            var page = FindPage(guid);
-            if (page == null)
-            {
-                return;
-            }
-            var ctrl = page as XhsProjectSimulationSchemePage;
-            if (ctrl == null)
-            {
-                return;
-            }
-
-        }
-
-        //椤圭洰绔欐柟妗堝伐鍐电Щ闄や簨浠�
-        private void SimulationFunctionMgrCtrl1_ProjectSiteSchemeWorkingRemoveEvent(XhsSchemeVmo scheme, HydroWorkingVmo working)
-        {
-            var guid = new PageGuid()
-            {
-                Modular = this.PageGuid.Modular,
-                MoudingType = eMoudingType.Tab,
-                Function = SimulationFunctionHelper.Scheme,
-                TagName = scheme.ID.ToString()
-            };
-            var page = FindPage(guid);
-            if (page == null)
-            {
-                return;
-            }
-            var ctrl = page as XhsProjectSimulationSchemePage;
-            if (ctrl == null)
-            {
-                return;
-            }
-
-        }
-
 
         #endregion
 
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
index c648338..4da8c25 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj
@@ -1,240 +1,243 @@
 锘�<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>disable</Nullable>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0-windows</TargetFramework>
+		<Nullable>disable</Nullable>
+		<UseWindowsForms>true</UseWindowsForms>
+		<ImplicitUsings>enable</ImplicitUsings>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="02-project\01-import\01-ModelFile\**" />
-    <Compile Remove="02-project\01-import\04-completed\**" />
-    <Compile Remove="03-ViewModel\**" />
-    <Compile Remove="04-HomePageMainPanel\**" />
-    <Compile Remove="04-pump\02-analy\**" />
-    <Compile Remove="04-pump\03-calc\**" />
-    <Compile Remove="Resources\**" />
-    <EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
-    <EmbeddedResource Remove="02-project\01-import\04-completed\**" />
-    <EmbeddedResource Remove="03-ViewModel\**" />
-    <EmbeddedResource Remove="04-HomePageMainPanel\**" />
-    <EmbeddedResource Remove="04-pump\02-analy\**" />
-    <EmbeddedResource Remove="04-pump\03-calc\**" />
-    <EmbeddedResource Remove="Resources\**" />
-    <None Remove="02-project\01-import\01-ModelFile\**" />
-    <None Remove="02-project\01-import\04-completed\**" />
-    <None Remove="03-ViewModel\**" />
-    <None Remove="04-HomePageMainPanel\**" />
-    <None Remove="04-pump\02-analy\**" />
-    <None Remove="04-pump\03-calc\**" />
-    <None Remove="Resources\**" />
-    <Page Remove="02-project\01-import\01-ModelFile\**" />
-    <Page Remove="02-project\01-import\04-completed\**" />
-    <Page Remove="03-ViewModel\**" />
-    <Page Remove="04-HomePageMainPanel\**" />
-    <Page Remove="04-pump\02-analy\**" />
-    <Page Remove="04-pump\03-calc\**" />
-    <Page Remove="Resources\**" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="02-project\01-import\01-ModelFile\**" />
+		<Compile Remove="02-project\01-import\04-completed\**" />
+		<Compile Remove="03-ViewModel\**" />
+		<Compile Remove="04-HomePageMainPanel\**" />
+		<Compile Remove="04-pump\02-analy\**" />
+		<Compile Remove="04-pump\03-calc\**" />
+		<Compile Remove="Resources\**" />
+		<EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
+		<EmbeddedResource Remove="02-project\01-import\04-completed\**" />
+		<EmbeddedResource Remove="03-ViewModel\**" />
+		<EmbeddedResource Remove="04-HomePageMainPanel\**" />
+		<EmbeddedResource Remove="04-pump\02-analy\**" />
+		<EmbeddedResource Remove="04-pump\03-calc\**" />
+		<EmbeddedResource Remove="Resources\**" />
+		<None Remove="02-project\01-import\01-ModelFile\**" />
+		<None Remove="02-project\01-import\04-completed\**" />
+		<None Remove="03-ViewModel\**" />
+		<None Remove="04-HomePageMainPanel\**" />
+		<None Remove="04-pump\02-analy\**" />
+		<None Remove="04-pump\03-calc\**" />
+		<None Remove="Resources\**" />
+		<Page Remove="02-project\01-import\01-ModelFile\**" />
+		<Page Remove="02-project\01-import\04-completed\**" />
+		<Page Remove="03-ViewModel\**" />
+		<Page Remove="04-HomePageMainPanel\**" />
+		<Page Remove="04-pump\02-analy\**" />
+		<Page Remove="04-pump\03-calc\**" />
+		<Page Remove="Resources\**" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="00-core\AssetsMatchingHelper-Bak.cs" />
-    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
-    <Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
-    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
-    <Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePipeViewModel.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePumpViewModel.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemeValveViewModel.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.Designer.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.Designer.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.Designer.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.Designer.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.cs" />
-    <Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingViewModel.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingViewModel.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingViewModel.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingViewModel.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingViewModel.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" />
-    <Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" />
-    <Compile Remove="04-pump\PumpFullInfoCtrl.cs" />
-    <Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" />
-    <Compile Remove="04-pump\PumpFullInfoViewDlg.cs" />
-    <Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" />
-    <Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" />
-    <Compile Remove="04-pump\SinglePumpInfoViewDLg.Designer.cs" />
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Remove="00-core\AssetsMatchingHelper-Bak.cs" />
+		<Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.cs" />
+		<Compile Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.Designer.cs" />
+		<Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.cs" />
+		<Compile Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePipeViewModel.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemePumpViewModel.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\00-viewmodel\SetSchemeValveViewModel.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.Designer.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.cs" />
+		<Compile Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingViewModel.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" />
+		<Compile Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" />
+		<Compile Remove="04-pump\PumpFullInfoCtrl.cs" />
+		<Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" />
+		<Compile Remove="04-pump\PumpFullInfoViewDlg.cs" />
+		<Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" />
+		<Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" />
+		<Compile Remove="04-pump\SinglePumpInfoViewDLg.Designer.cs" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
-    <EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
-    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.resx" />
-    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.resx" />
-    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.resx" />
-    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.resx" />
-    <EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" />
-    <EmbeddedResource Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" />
-    <EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" />
-    <EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" />
-    <EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" />
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Remove="02-project\01-import\00-core\ImportXhsProjectDlg-bak.resx" />
+		<EmbeddedResource Remove="02-project\03-mgr\XhsProjectMgrPage - 澶嶅埗.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl - 澶嶅埗.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%282%29.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%283%29.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗%284%29.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-add\AddXhsSchemeDlg - 澶嶅埗.resx" />
+		<EmbeddedResource Remove="03-simulation\04-scheme\01-info\CreateXhsSchemeInfoPage.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\00-core\XhsProjectSimulationMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainChoicePage.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\01-pumpsinglematching\AssetsPumpMainForm-bak.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\02-pump\XhsPumpMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\03-valve\XhsProjectSimulationValveMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\04-pipe\XhsProjectSimulationPipeMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="03-simulation\06-simulation\01-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" />
+		<EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" />
+		<EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" />
+		<EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Remove="map\gaode\html\ViewProjectList.html" />
-    <None Remove="map\gaode\img\xhs_project.png" />
-    <None Remove="map\gaode\js\xhs_base64.js" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Remove="map\gaode\html\ViewProjectList.html" />
+		<None Remove="map\gaode\img\xhs_project.png" />
+		<None Remove="map\gaode\js\xhs_base64.js" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Content Include="map\gaode\html\ViewProjectList.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="map\gaode\img\xhs_project.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="map\gaode\js\xhs_base64.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="Resources\pump_run_32.png" />
-    <None Include="Resources\Cancel.svg" />
-    <None Include="Resources\Close32.png" />
-    <None Include="Resources\Folder.svg" />
-    <None Include="Resources\IncomingCall.svg" />
-    <None Include="Resources\MapLayers.svg" />
-    <None Include="Resources\Remove.svg" />
-    <None Include="Resources\Square32.png" />
-    <None Include="Resources\SizeNormal32.png" />
-    <None Include="Resources\SizeMin32.png" />
-  </ItemGroup>
+	<ItemGroup>
+		<Content Include="map\gaode\html\ViewProjectList.html">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="map\gaode\img\xhs_project.png">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="map\gaode\js\xhs_base64.js">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<None Include="Resources\pump_run_32.png" />
+		<None Include="Resources\Cancel.svg" />
+		<None Include="Resources\Close32.png" />
+		<None Include="Resources\Folder.svg" />
+		<None Include="Resources\IncomingCall.svg" />
+		<None Include="Resources\MapLayers.svg" />
+		<None Include="Resources\Remove.svg" />
+		<None Include="Resources\Square32.png" />
+		<None Include="Resources\SizeNormal32.png" />
+		<None Include="Resources\SizeMin32.png" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
-    <PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
+		<PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="03-simulation\06-simulation\01-matching\00-core\" />
-    <Folder Include="map\gaode\css\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="03-simulation\04-scheme\01-info\" />
+		<Folder Include="03-simulation\06-simulation\01-matching\00-core\" />
+		<Folder Include="map\gaode\css\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\BLL\HStation.BLL.TransferFile.Core\HStation.BLL.TransferFile.Core.csproj" />
-    <ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
-    <ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
-    <ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
-    <ProjectReference Include="..\HStation.WinFrmUI.Bimface.Core\HStation.WinFrmUI.Bimface.Core.csproj" />
-    <ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
-    <ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
-    <ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
-    <ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\BLL\HStation.BLL.TransferFile.Core\HStation.BLL.TransferFile.Core.csproj" />
+		<ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
+		<ProjectReference Include="..\..\Hydro\HStation.Hydro.Core\HStation.Hydro.Core.csproj" />
+		<ProjectReference Include="..\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
+		<ProjectReference Include="..\HStation.WinFrmUI.Bimface.Core\HStation.WinFrmUI.Bimface.Core.csproj" />
+		<ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
+		<ProjectReference Include="..\HStation.WinFrmUI.Hydro.Core\HStation.WinFrmUI.Hydro.Core.csproj" />
+		<ProjectReference Include="..\Yw.WinFrmUI.Map.Core\Yw.WinFrmUI.Map.Core.csproj" />
+		<ProjectReference Include="..\Yw.WinFrmUI.Phart.Core\Yw.WinFrmUI.Phart.Core.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" />
-    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs" />
-    <Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs" />
-    <Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs" />
-    <Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs" />
-    <Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs" />
-    <Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs" />
-    <Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs" />
-    <Compile Update="02-project\04-dlg\EditProjectDlg.cs" />
-    <Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs" />
-    <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs" />
-    <Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs" />
-    <Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
-    <Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
-    <Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" />
-    <Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" />
-    <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\SimulationPipeSing;eMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs" />
-    <Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs" />
-    <Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
-    <Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
-    <Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs" />
-    <Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" />
-    <Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs" />
-    <Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.cs" />
-    <Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelDlg.cs" />
-    <Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatDlg.cs" />
-    <Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatDlg.cs" />
-    <Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs" />
-    <Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs" />
-    <Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs" />
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
+	<ItemGroup>
+		<Compile Update="02-project\01-import\05-completed\XhsProjectSimulationBimfaceInfoCtrl.cs" />
+		<Compile Update="02-project\01-import\05-completed\XhsProjectSimulationHydroInfoCtrl.cs" />
+		<Compile Update="02-project\01-import\05-completed\XhsProjectSimulationProjectInfoCtrl.cs" />
+		<Compile Update="02-project\04-dlg\00-core\ImportXhsProjectFileDlg.cs" />
+		<Compile Update="02-project\04-dlg\01-FileChoice\SelectXhsProjectFileModelFileWizardPage.cs" />
+		<Compile Update="02-project\04-dlg\02-GeneralProject\GenerateXhsProjectFileWizardPage.cs" />
+		<Compile Update="02-project\04-dlg\03-ImportCompleted\ImportXhsProjectFileCompletedCtrl.cs" />
+		<Compile Update="02-project\04-dlg\04-ProjectResultShowPanel\ProjectFileResultShowPanel.cs" />
+		<Compile Update="02-project\04-dlg\EditProjectDlg.cs" />
+		<Compile Update="03-simulation\04-scheme\01-add\01-set\03-pipe\SetSchemePipeListCtrl.cs" />
+		<Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs" />
+		<Compile Update="03-simulation\04-scheme\01-add\01-set\02-valve\SetSchemeValveListCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankChartShowDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\09-tank\SimulationTankSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\09-tank\TankSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SprinklerSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\16-sprinkler\SimulationSprinklerSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\15-translation\TranslationSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\15-translation\SimulationTranslationSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\PressmeterSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\13-pressmeter\SimulationPressmeterSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\HydrantSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\12-hydrant\SimulationHydrantSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\FlowmeterSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\11-flowmeter\SimulationFlowmeterSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\10-meter\MeterSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\10-meter\SimulationMeterSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\BluntheadSingleMatchingForm.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\14-blunthead\SimulationBluntheadSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationHydroInfoCtrl.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" />
+		<Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" />
+		<Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\SimulationValveSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\03-valve\01-valvesinglematching\ValveSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\SimulationPipeSing;eMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\04-pipe\01-pipesinglematching\PipeSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\ElbowSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\05-elbows\01-elbowsinglematching\SimulationElbowSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\FourlinkSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\07-fourlink\01-fourlinksinglematching\SimulationFourlinkSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\17-compressor\SimulationCompressorSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorChartShowDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\17-compressor\CompressorSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerChartShowDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\ExchangerSingleMatchingCtrl.cs" />
+		<Compile Update="03-simulation\06-simulation\01-matching\18-exchanger\SimulationExchangerSingleMatchingDlg.cs" />
+		<Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
+		<Compile Update="03-simulation\07-l3d\XhsProjectSimulationL3dCtrl.cs" />
+		<Compile Update="03-simulation\08-working\XhsProjectSimulationWorkingPage.cs" />
+		<Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" />
+		<Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs" />
+		<Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.cs" />
+		<Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelDlg.cs" />
+		<Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatDlg.cs" />
+		<Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatDlg.cs" />
+		<Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs" />
+		<Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs" />
+		<Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs" />
+		<Compile Update="Properties\Resources.Designer.cs">
+			<DesignTime>True</DesignTime>
+			<AutoGen>True</AutoGen>
+			<DependentUpon>Resources.resx</DependentUpon>
+		</Compile>
+	</ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Update="Properties\Resources.resx">
+			<Generator>ResXFileCodeGenerator</Generator>
+			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
+	</ItemGroup>
 
 </Project>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index c120540..9285a3e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -94,6 +94,9 @@
     <Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
+    <Compile Update="03-simulation\04-scheme\00-core\CreateXhsSchemeDlg.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Update="03-simulation\04-scheme\01-add\01-set\01-pump\SetSchemePumpListCtrl.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -105,9 +108,6 @@
     </Compile>
     <Compile Update="03-simulation\04-scheme\01-add\AddXhsSchemeDlg.cs">
       <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="03-simulation\04-scheme\02-page\XhsProjectSimulationSchemePage.cs">
-      <SubType>UserControl</SubType>
     </Compile>
     <Compile Update="03-simulation\05-function\SimulationFunctionCtrl.cs">
       <SubType>UserControl</SubType>
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultExtensions.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultExtensions.cs
index e153d6a..f757c9b 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultExtensions.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultExtensions.cs
@@ -112,9 +112,22 @@
                                 var calcuNodeEndResult = allCalcuResultVisualDict?.GetValue(pump.EndCode) as HydroCalcuNodeResult;
                                 if (calcuNodeStartResult != null && calcuNodeEndResult != null)
                                 {
+
                                     if (calcuNodeStartResult.CalcuPress.HasValue && calcuNodeEndResult.CalcuPress.HasValue)
                                     {
                                         calcuPumpNewResult.CalcuH = Math.Abs(calcuNodeStartResult.CalcuPress.Value - calcuNodeEndResult.CalcuPress.Value);
+                                        //var curveqh = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQH);
+                                        //if (curveqh != null)
+                                        //{
+                                        //    if (curveqh.CurveData != null && curveqh.CurveData.Count > 3)
+                                        //    {
+                                        //        var point2dList = curveqh.CurveData.Select(x => new Yw.Geometry.Point2d(x.X, x.Y)).ToList();
+                                        //        var point2dSimularList = point2dList.GetQHPointListByN(pump.RatedN.Value, pump.RatedN.Value * pump.SpeedRatio);
+                                        //        var pumpCurveQh = new Yw.Pump.CurveQH(eFeatType.Cubic, point2dSimularList);
+                                        //        var curveQhRange = pumpCurveQh.FeatCurve.GetXRange();
+                                        //        var h = pumpCurveQh.FeatCurve.GetPointYUnlimited(calcuPumpNewResult.CalcuQ.Value);
+                                        //    }
+                                        //}
                                     }
                                     if (pump.LinkStatus == Yw.Hydro.PumpStatus.Open && pump.RatedN.HasValue)
                                     {

--
Gitblit v1.9.3