HStation/XHS.V1.0.git

			@@ -41,10 +41,8 @@
			barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
			barButtonItem4 = new DevExpress.XtraBars.BarButtonItem();
			barButtonItem5 = new DevExpress.XtraBars.BarButtonItem();
			barButtonItem6 = new DevExpress.XtraBars.BarButtonItem();
			barButtonItem7 = new DevExpress.XtraBars.BarButtonItem();
			barButtonItem8 = new DevExpress.XtraBars.BarButtonItem();
			barButtonItem9 = new DevExpress.XtraBars.BarButtonItem();
			barEditItem2 = new DevExpress.XtraBars.BarEditItem();
			repositoryItemImageComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox();
			barButtonItem10 = new DevExpress.XtraBars.BarButtonItem();
			@@ -113,7 +111,7 @@
			ribbon.EmptyAreaImageOptions.ImagePadding = new Padding(43, 47, 43, 47);
			ribbon.ExpandCollapseItem.Id = 0;
			ribbon.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
			ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem, barButtonItemNoConnect, barButtonItemClose, barButtonItemConnected, barBtnBlue, barButtonItem1, barButtonItem2, barButtonItem3, barButtonItem4, barButtonItem5, barButtonItem6, barButtonItem7, barButtonItem8, barButtonItem9, barEditItem2, barButtonItem10, barEditItem3, barButtonItem11, barButtonItem12, barButtonItem13, barButtonItem14 });
			ribbon.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbon.ExpandCollapseItem, barButtonItemNoConnect, barButtonItemClose, barButtonItemConnected, barBtnBlue, barButtonItem1, barButtonItem2, barButtonItem3, barButtonItem4, barButtonItem5, barButtonItem7, barButtonItem8, barEditItem2, barButtonItem10, barEditItem3, barButtonItem11, barButtonItem12, barButtonItem13, barButtonItem14 });
			ribbon.Location = new Point(0, 0);
			ribbon.Margin = new Padding(4, 5, 4, 5);
			ribbon.MaxItemId = 68;
			@@ -210,16 +208,6 @@
			barButtonItem5.Name = "barButtonItem5";
			barButtonItem5.ItemClick += barButtonItem5_ItemClick;
			//
			// barButtonItem6
			//
			barButtonItem6.Caption = "泵组总览";
			barButtonItem6.Enabled = false;
			barButtonItem6.Id = 55;
			barButtonItem6.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem6.ImageOptions.SvgImage");
			barButtonItem6.Name = "barButtonItem6";
			barButtonItem6.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
			barButtonItem6.ItemClick += barButtonItem6_ItemClick;
			//
			// barButtonItem7
			//
			barButtonItem7.Caption = "协议配置";
			@@ -237,17 +225,6 @@
			barButtonItem8.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem8.ImageOptions.SvgImage");
			barButtonItem8.Name = "barButtonItem8";
			barButtonItem8.ItemClick += barButtonItem8_ItemClick;
			//
			// barButtonItem9
			//
			barButtonItem9.Caption = "智控数据";
			barButtonItem9.Enabled = false;
			barButtonItem9.Id = 58;
			barButtonItem9.ImageOptions.Image = (Image)resources.GetObject("barButtonItem9.ImageOptions.Image");
			barButtonItem9.ImageOptions.LargeImage = (Image)resources.GetObject("barButtonItem9.ImageOptions.LargeImage");
			barButtonItem9.Name = "barButtonItem9";
			barButtonItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
			barButtonItem9.ItemClick += barButtonItem9_ItemClick;
			//
			// barEditItem2
			//
			@@ -351,7 +328,6 @@
			// ribbonPageGroup2
			//
			ribbonPageGroup2.ItemLinks.Add(barButtonItem2);
			ribbonPageGroup2.ItemLinks.Add(barButtonItem6);
			ribbonPageGroup2.ItemLinks.Add(barButtonItem14);
			ribbonPageGroup2.Name = "ribbonPageGroup2";
			ribbonPageGroup2.Text = "监测分析";
			@@ -362,7 +338,6 @@
			ribbonPageGroup3.ItemLinks.Add(barButtonItem8);
			ribbonPageGroup3.ItemLinks.Add(barButtonItem13);
			ribbonPageGroup3.ItemLinks.Add(barButtonItem3);
			ribbonPageGroup3.ItemLinks.Add(barButtonItem9);
			ribbonPageGroup3.ItemLinks.Add(barButtonItem5);
			ribbonPageGroup3.ItemLinks.Add(barButtonItem11);
			ribbonPageGroup3.ItemLinks.Add(barButtonItem12);
			@@ -632,11 +607,9 @@
			private DevExpress.XtraBars.BarButtonItem barButtonItem3;
			private DevExpress.XtraBars.BarButtonItem barButtonItem4;
			private DevExpress.XtraBars.BarButtonItem barButtonItem5;
			private DevExpress.XtraBars.BarButtonItem barButtonItem6;
			private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup3;
			private DevExpress.XtraBars.BarButtonItem barButtonItem7;
			private DevExpress.XtraBars.BarButtonItem barButtonItem8;
			private DevExpress.XtraBars.BarButtonItem barButtonItem9;
			private DevExpress.XtraBars.BarEditItem barEditItem2;
			private DevExpress.XtraEditors.Repository.RepositoryItemImageComboBox repositoryItemImageComboBox1;
			private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;