HStation/XHS.V1.0.git

			@@ -56,18 +56,16 @@
			navBarControlPara = new DevExpress.XtraNavBar.NavBarControl();
			pumpPerformCompareInfoCtrl1 = new Yw.WinFrmUI.Phart.PumpPerformCompareInfoCtrl();
			tabPage产品属性2 = new DevExpress.XtraTab.XtraTabPage();
			layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
			pumpPropViewCtrl1 = new PumpPropViewCtrl();
			Root = new DevExpress.XtraLayout.LayoutControlGroup();
			layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			_tabPage产品材料 = new DevExpress.XtraTab.XtraTabPage();
			splitContainerControlMaterial = new SplitContainerControl();
			_tabPage多速度曲线参数 = new DevExpress.XtraTab.XtraTabPage();
			pumpVariableSpeedInfoCtrl1 = new Yw.WinFrmUI.Phart.PumpVariableSpeedInfoCtrl();
			navBarGroupControlContainer6 = new DevExpress.XtraNavBar.NavBarGroupControlContainer();
			navBarGroupJieZhi = new DevExpress.XtraNavBar.NavBarGroup();
			layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
			Root = new DevExpress.XtraLayout.LayoutControlGroup();
			pumpBarItem1 = new PumpBarItem();
			layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			pumpPropViewCtrl1 = new PumpPropViewCtrl();
			layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			((ISupportInitialize)xtraTabCtrlMain).BeginInit();
			xtraTabCtrlMain.SuspendLayout();
			((ISupportInitialize)imageCollection1).BeginInit();
			@@ -86,17 +84,16 @@
			((ISupportInitialize)navBarControlPara).BeginInit();
			navBarControlPara.SuspendLayout();
			tabPage产品属性2.SuspendLayout();
			((ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1.SuspendLayout();
			((ISupportInitialize)Root).BeginInit();
			((ISupportInitialize)layoutControlItem2).BeginInit();
			_tabPage产品材料.SuspendLayout();
			((ISupportInitialize)splitContainerControlMaterial).BeginInit();
			((ISupportInitialize)splitContainerControlMaterial.Panel1).BeginInit();
			((ISupportInitialize)splitContainerControlMaterial.Panel2).BeginInit();
			splitContainerControlMaterial.SuspendLayout();
			_tabPage多速度曲线参数.SuspendLayout();
			((ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1.SuspendLayout();
			((ISupportInitialize)Root).BeginInit();
			((ISupportInitialize)layoutControlItem1).BeginInit();
			((ISupportInitialize)layoutControlItem2).BeginInit();
			SuspendLayout();
			//
			// xtraTabCtrlMain
			@@ -371,6 +368,43 @@
			tabPage产品属性2.Size = new Size(389, 693);
			tabPage产品属性2.Text = "产品属性";
			//
			// layoutControl1
			//
			layoutControl1.Controls.Add(pumpPropViewCtrl1);
			layoutControl1.Dock = DockStyle.Fill;
			layoutControl1.Location = new Point(0, 0);
			layoutControl1.Name = "layoutControl1";
			layoutControl1.Root = Root;
			layoutControl1.Size = new Size(389, 693);
			layoutControl1.TabIndex = 1;
			layoutControl1.Text = "layoutControl1";
			//
			// pumpPropViewCtrl1
			//
			pumpPropViewCtrl1.Location = new Point(12, 12);
			pumpPropViewCtrl1.Margin = new Padding(4, 5, 4, 5);
			pumpPropViewCtrl1.Name = "pumpPropViewCtrl1";
			pumpPropViewCtrl1.Size = new Size(365, 669);
			pumpPropViewCtrl1.TabIndex = 5;
			//
			// Root
			//
			Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			Root.GroupBordersVisible = false;
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
			Root.Name = "Root";
			Root.Size = new Size(389, 693);
			Root.TextVisible = false;
			//
			// layoutControlItem2
			//
			layoutControlItem2.Control = pumpPropViewCtrl1;
			layoutControlItem2.Location = new Point(0, 0);
			layoutControlItem2.Name = "layoutControlItem2";
			layoutControlItem2.Size = new Size(369, 673);
			layoutControlItem2.TextSize = new Size(0, 0);
			layoutControlItem2.TextVisible = false;
			//
			// _tabPage产品材料
			//
			_tabPage产品材料.Controls.Add(splitContainerControlMaterial);
			@@ -438,60 +472,6 @@
			navBarGroupJieZhi.ImageOptions.LargeImage = (Image)resources.GetObject("navBarGroupJieZhi.ImageOptions.LargeImage");
			navBarGroupJieZhi.Name = "navBarGroupJieZhi";
			//
			// layoutControl1
			//
			layoutControl1.Controls.Add(pumpPropViewCtrl1);
			layoutControl1.Controls.Add(pumpBarItem1);
			layoutControl1.Dock = DockStyle.Fill;
			layoutControl1.Location = new Point(0, 0);
			layoutControl1.Name = "layoutControl1";
			layoutControl1.Root = Root;
			layoutControl1.Size = new Size(389, 693);
			layoutControl1.TabIndex = 1;
			layoutControl1.Text = "layoutControl1";
			//
			// Root
			//
			Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			Root.GroupBordersVisible = false;
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 });
			Root.Name = "Root";
			Root.Size = new Size(389, 693);
			Root.TextVisible = false;
			//
			// pumpBarItem1
			//
			pumpBarItem1.Location = new Point(12, 12);
			pumpBarItem1.Name = "pumpBarItem1";
			pumpBarItem1.Size = new Size(365, 23);
			pumpBarItem1.TabIndex = 4;
			//
			// layoutControlItem1
			//
			layoutControlItem1.Control = pumpBarItem1;
			layoutControlItem1.Location = new Point(0, 0);
			layoutControlItem1.Name = "layoutControlItem1";
			layoutControlItem1.Size = new Size(369, 27);
			layoutControlItem1.TextSize = new Size(0, 0);
			layoutControlItem1.TextVisible = false;
			//
			// pumpPropViewCtrl1
			//
			pumpPropViewCtrl1.Location = new Point(12, 39);
			pumpPropViewCtrl1.Margin = new Padding(4, 5, 4, 5);
			pumpPropViewCtrl1.Name = "pumpPropViewCtrl1";
			pumpPropViewCtrl1.Size = new Size(365, 642);
			pumpPropViewCtrl1.TabIndex = 5;
			//
			// layoutControlItem2
			//
			layoutControlItem2.Control = pumpPropViewCtrl1;
			layoutControlItem2.Location = new Point(0, 27);
			layoutControlItem2.Name = "layoutControlItem2";
			layoutControlItem2.Size = new Size(369, 646);
			layoutControlItem2.TextSize = new Size(0, 0);
			layoutControlItem2.TextVisible = false;
			//
			// PumpFullInfoCtrl
			//
			Appearance.BackColor = SystemColors.Control;
			@@ -519,17 +499,16 @@
			((ISupportInitialize)navBarControlPara).EndInit();
			navBarControlPara.ResumeLayout(false);
			tabPage产品属性2.ResumeLayout(false);
			((ISupportInitialize)layoutControl1).EndInit();
			layoutControl1.ResumeLayout(false);
			((ISupportInitialize)Root).EndInit();
			((ISupportInitialize)layoutControlItem2).EndInit();
			_tabPage产品材料.ResumeLayout(false);
			((ISupportInitialize)splitContainerControlMaterial.Panel1).EndInit();
			((ISupportInitialize)splitContainerControlMaterial.Panel2).EndInit();
			((ISupportInitialize)splitContainerControlMaterial).EndInit();
			splitContainerControlMaterial.ResumeLayout(false);
			_tabPage多速度曲线参数.ResumeLayout(false);
			((ISupportInitialize)layoutControl1).EndInit();
			layoutControl1.ResumeLayout(false);
			((ISupportInitialize)Root).EndInit();
			((ISupportInitialize)layoutControlItem1).EndInit();
			((ISupportInitialize)layoutControlItem2).EndInit();
			ResumeLayout(false);
			}

			@@ -573,9 +552,7 @@
			private Yw.WinFrmUI.Phart.PumpPerformCompareInfoCtrl pumpPerformCompareInfoCtrl1;
			private DevExpress.XtraLayout.LayoutControl layoutControl1;
			private PumpPropViewCtrl pumpPropViewCtrl1;
			private PumpBarItem pumpBarItem1;
			private DevExpress.XtraLayout.LayoutControlGroup Root;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
			}
			}