From a0bce3b366451b3ca94e676eb98dd7b415375c14 Mon Sep 17 00:00:00 2001 From: Shuxia Ning <NingShuxia0927@outlook.com> Date: 星期五, 17 一月 2025 14:00:00 +0800 Subject: [PATCH] 代码修改 --- Desktop/HStation.DeskTop.Xhs.Main/GuideMain.Designer.cs | 169 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 141 insertions(+), 28 deletions(-) diff --git a/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.Designer.cs b/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.Designer.cs index bdf7534..f2864d2 100644 --- a/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.Designer.cs +++ b/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.Designer.cs @@ -37,6 +37,7 @@ nbMain = new DevExpress.XtraBars.Navigation.NavButton(); nbMapOverview = new DevExpress.XtraBars.Navigation.NavButton(); nbSystemConfig = new DevExpress.XtraBars.Navigation.NavButton(); + nbSystemOrganize = new DevExpress.XtraBars.Navigation.NavButton(); nbSystemAuthority = new DevExpress.XtraBars.Navigation.NavButton(); nbMinimize = new DevExpress.XtraBars.Navigation.NavButton(); nbClose = new DevExpress.XtraBars.Navigation.NavButton(); @@ -46,15 +47,19 @@ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); simpleSeparator1 = new DevExpress.XtraLayout.SimpleSeparator(); popSystemConfig = new DevExpress.XtraBars.PopupMenu(components); + barBtnProject = new DevExpress.XtraBars.BarButtonItem(); barBtnSupplier = new DevExpress.XtraBars.BarButtonItem(); - barBtnBuildingType = new DevExpress.XtraBars.BarButtonItem(); barBtnBuilding = new DevExpress.XtraBars.BarButtonItem(); barBtnFacilities = new DevExpress.XtraBars.BarButtonItem(); barBtnSystemType = new DevExpress.XtraBars.BarButtonItem(); barBtnPart = new DevExpress.XtraBars.BarButtonItem(); + barBtnBuildingType = new DevExpress.XtraBars.BarButtonItem(); barBtnWaterUtensil = new DevExpress.XtraBars.BarButtonItem(); barBtnWaterEquivalent = new DevExpress.XtraBars.BarButtonItem(); - barBtnProject = new DevExpress.XtraBars.BarButtonItem(); + barBtnPumpManage = new DevExpress.XtraBars.BarButtonItem(); + barButtonTypeManage = new DevExpress.XtraBars.BarButtonItem(); + BtnCatlogManage = new DevExpress.XtraBars.BarButtonItem(); + BtnPropManage = new DevExpress.XtraBars.BarButtonItem(); barManager1 = new DevExpress.XtraBars.BarManager(components); barDockControlTop = new DevExpress.XtraBars.BarDockControl(); barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); @@ -64,6 +69,8 @@ barBtnAuthority = new DevExpress.XtraBars.BarButtonItem(); barBtnSystemLog = new DevExpress.XtraBars.BarButtonItem(); barBtnCorp = new DevExpress.XtraBars.BarButtonItem(); + barBtnRoleManage = new DevExpress.XtraBars.BarButtonItem(); + popSystemOrganize = new DevExpress.XtraBars.PopupMenu(components); popSystemAuthority = new DevExpress.XtraBars.PopupMenu(components); ((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit(); ((System.ComponentModel.ISupportInitialize)tabbedView1).BeginInit(); @@ -76,6 +83,7 @@ ((System.ComponentModel.ISupportInitialize)simpleSeparator1).BeginInit(); ((System.ComponentModel.ISupportInitialize)popSystemConfig).BeginInit(); ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)popSystemOrganize).BeginInit(); ((System.ComponentModel.ISupportInitialize)popSystemAuthority).BeginInit(); SuspendLayout(); // @@ -94,6 +102,7 @@ tileNavPane.Buttons.Add(nbMain); tileNavPane.Buttons.Add(nbMapOverview); tileNavPane.Buttons.Add(nbSystemConfig); + tileNavPane.Buttons.Add(nbSystemOrganize); tileNavPane.Buttons.Add(nbSystemAuthority); tileNavPane.Buttons.Add(nbMinimize); tileNavPane.Buttons.Add(nbClose); @@ -174,6 +183,26 @@ nbSystemConfig.Name = "nbSystemConfig"; nbSystemConfig.Tag = "SystemConfig"; // + // nbSystemOrganize + // + nbSystemOrganize.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right; + nbSystemOrganize.Appearance.FontSizeDelta = 2; + nbSystemOrganize.Appearance.FontStyleDelta = System.Drawing.FontStyle.Bold; + nbSystemOrganize.Appearance.ForeColor = System.Drawing.Color.Black; + nbSystemOrganize.Appearance.Options.UseFont = true; + nbSystemOrganize.Appearance.Options.UseForeColor = true; + nbSystemOrganize.AppearanceHovered.FontSizeDelta = 2; + nbSystemOrganize.AppearanceHovered.FontStyleDelta = System.Drawing.FontStyle.Bold; + nbSystemOrganize.AppearanceHovered.Options.UseFont = true; + nbSystemOrganize.AppearanceSelected.FontSizeDelta = 2; + nbSystemOrganize.AppearanceSelected.FontStyleDelta = System.Drawing.FontStyle.Bold; + nbSystemOrganize.AppearanceSelected.Options.UseFont = true; + nbSystemOrganize.Caption = "缁勭粐绠$悊"; + nbSystemOrganize.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbSystemOrganize.ImageOptions.SvgImage"); + nbSystemOrganize.ImageOptions.SvgImageSize = new System.Drawing.Size(24, 24); + nbSystemOrganize.Name = "nbSystemOrganize"; + nbSystemOrganize.Tag = "SystemOrganize"; + // // nbSystemAuthority // nbSystemAuthority.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right; @@ -187,10 +216,11 @@ nbSystemAuthority.AppearanceHovered.Options.UseFont = true; nbSystemAuthority.AppearanceSelected.FontSizeDelta = 2; nbSystemAuthority.AppearanceSelected.FontStyleDelta = System.Drawing.FontStyle.Bold; + nbSystemAuthority.AppearanceSelected.ForeColor = System.Drawing.Color.Black; nbSystemAuthority.AppearanceSelected.Options.UseFont = true; - nbSystemAuthority.Caption = "绯荤粺鏉冮檺"; + nbSystemAuthority.AppearanceSelected.Options.UseForeColor = true; + nbSystemAuthority.Caption = "鏉冮檺绠$悊"; nbSystemAuthority.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbSystemAuthority.ImageOptions.SvgImage"); - nbSystemAuthority.ImageOptions.SvgImageSize = new System.Drawing.Size(24, 24); nbSystemAuthority.Name = "nbSystemAuthority"; nbSystemAuthority.Tag = "SystemAuthority"; // @@ -270,11 +300,22 @@ // // popSystemConfig // - popSystemConfig.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnSupplier, true), new DevExpress.XtraBars.LinkPersistInfo(barBtnBuildingType), new DevExpress.XtraBars.LinkPersistInfo(barBtnBuilding), new DevExpress.XtraBars.LinkPersistInfo(barBtnFacilities), new DevExpress.XtraBars.LinkPersistInfo(barBtnSystemType), new DevExpress.XtraBars.LinkPersistInfo(barBtnPart), new DevExpress.XtraBars.LinkPersistInfo(barBtnWaterUtensil), new DevExpress.XtraBars.LinkPersistInfo(barBtnWaterEquivalent), new DevExpress.XtraBars.LinkPersistInfo(barBtnProject) }); + popSystemConfig.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnProject, true), new DevExpress.XtraBars.LinkPersistInfo(barBtnSupplier), new DevExpress.XtraBars.LinkPersistInfo(barBtnBuilding), new DevExpress.XtraBars.LinkPersistInfo(barBtnFacilities), new DevExpress.XtraBars.LinkPersistInfo(barBtnSystemType), new DevExpress.XtraBars.LinkPersistInfo(barBtnPart), new DevExpress.XtraBars.LinkPersistInfo(barBtnBuildingType), new DevExpress.XtraBars.LinkPersistInfo(barBtnWaterUtensil), new DevExpress.XtraBars.LinkPersistInfo(barBtnWaterEquivalent), new DevExpress.XtraBars.LinkPersistInfo(barBtnPumpManage), new DevExpress.XtraBars.LinkPersistInfo(barButtonTypeManage), new DevExpress.XtraBars.LinkPersistInfo(BtnCatlogManage), new DevExpress.XtraBars.LinkPersistInfo(BtnPropManage) }); popSystemConfig.Manager = barManager1; popSystemConfig.MenuAppearance.HeaderItemAppearance.Options.UseTextOptions = true; popSystemConfig.MenuAppearance.HeaderItemAppearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; popSystemConfig.Name = "popSystemConfig"; + // + // barBtnProject + // + barBtnProject.Caption = "椤圭洰鍒楄〃"; + barBtnProject.Id = 12; + barBtnProject.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnProject.ImageOptions.SvgImage"); + barBtnProject.ItemInMenuAppearance.Normal.FontSizeDelta = 2; + barBtnProject.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; + barBtnProject.ItemInMenuAppearance.Normal.Options.UseFont = true; + barBtnProject.Name = "barBtnProject"; + barBtnProject.ItemClick += barBtnProject_ItemClick; // // barBtnSupplier // @@ -285,18 +326,8 @@ barBtnSupplier.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnSupplier.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnSupplier.Name = "barBtnSupplier"; + barBtnSupplier.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnSupplier.ItemClick += barBtnSupplier_ItemClick; - // - // barBtnBuildingType - // - barBtnBuildingType.Caption = "寤虹瓚绫诲瀷"; - barBtnBuildingType.Id = 1; - barBtnBuildingType.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnBuildingType.ImageOptions.SvgImage"); - barBtnBuildingType.ItemInMenuAppearance.Normal.FontSizeDelta = 2; - barBtnBuildingType.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; - barBtnBuildingType.ItemInMenuAppearance.Normal.Options.UseFont = true; - barBtnBuildingType.Name = "barBtnBuildingType"; - barBtnBuildingType.ItemClick += barBtnBuildingType_ItemClick; // // barBtnBuilding // @@ -307,6 +338,7 @@ barBtnBuilding.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnBuilding.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnBuilding.Name = "barBtnBuilding"; + barBtnBuilding.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnBuilding.ItemClick += barBtnBuilding_ItemClick; // // barBtnFacilities @@ -318,6 +350,7 @@ barBtnFacilities.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnFacilities.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnFacilities.Name = "barBtnFacilities"; + barBtnFacilities.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnFacilities.ItemClick += barBtnFacilities_ItemClick; // // barBtnSystemType @@ -329,6 +362,7 @@ barBtnSystemType.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnSystemType.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnSystemType.Name = "barBtnSystemType"; + barBtnSystemType.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnSystemType.ItemClick += barBtnSystemType_ItemClick; // // barBtnPart @@ -341,7 +375,20 @@ barBtnPart.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnPart.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnPart.Name = "barBtnPart"; + barBtnPart.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnPart.ItemClick += barBtnPart_ItemClick; + // + // barBtnBuildingType + // + barBtnBuildingType.Caption = "寤虹瓚绫诲瀷"; + barBtnBuildingType.Id = 1; + barBtnBuildingType.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnBuildingType.ImageOptions.SvgImage"); + barBtnBuildingType.ItemInMenuAppearance.Normal.FontSizeDelta = 2; + barBtnBuildingType.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; + barBtnBuildingType.ItemInMenuAppearance.Normal.Options.UseFont = true; + barBtnBuildingType.Name = "barBtnBuildingType"; + barBtnBuildingType.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + barBtnBuildingType.ItemClick += barBtnBuildingType_ItemClick; // // barBtnWaterUtensil // @@ -351,6 +398,7 @@ barBtnWaterUtensil.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnWaterUtensil.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnWaterUtensil.Name = "barBtnWaterUtensil"; + barBtnWaterUtensil.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnWaterUtensil.ItemClick += barBtnWaterUtensil_ItemClick; // // barBtnWaterEquivalent @@ -362,15 +410,52 @@ barBtnWaterEquivalent.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnWaterEquivalent.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnWaterEquivalent.Name = "barBtnWaterEquivalent"; + barBtnWaterEquivalent.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnWaterEquivalent.ItemClick += barBtnWaterEquivalent_ItemClick; // - // barBtnProject + // barBtnPumpManage // - barBtnProject.Caption = "椤圭洰绠$悊"; - barBtnProject.Id = 12; - barBtnProject.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage"); - barBtnProject.Name = "barBtnProject"; - barBtnProject.ItemClick += barBtnProject_ItemClick; + barBtnPumpManage.Caption = "姘存车绠$悊"; + barBtnPumpManage.Id = 13; + barBtnPumpManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpManage.ImageOptions.SvgImage"); + barBtnPumpManage.ItemInMenuAppearance.Normal.FontSizeDelta = 2; + barBtnPumpManage.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; + barBtnPumpManage.ItemInMenuAppearance.Normal.Options.UseFont = true; + barBtnPumpManage.Name = "barBtnPumpManage"; + barBtnPumpManage.ItemClick += barBtnPumpManage_ItemClick; + // + // barButtonTypeManage + // + barButtonTypeManage.Caption = "绫诲瀷绠$悊"; + barButtonTypeManage.Id = 14; + barButtonTypeManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonTypeManage.ImageOptions.SvgImage"); + barButtonTypeManage.ItemInMenuAppearance.Normal.FontSizeDelta = 2; + barButtonTypeManage.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; + barButtonTypeManage.ItemInMenuAppearance.Normal.Options.UseFont = true; + barButtonTypeManage.Name = "barButtonTypeManage"; + barButtonTypeManage.ItemClick += barButtonTypeManage_ItemClick; + // + // BtnCatlogManage + // + BtnCatlogManage.Caption = "鍒嗙被绠$悊"; + BtnCatlogManage.Id = 15; + BtnCatlogManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnCatlogManage.ImageOptions.SvgImage"); + BtnCatlogManage.ItemAppearance.Normal.FontSizeDelta = 2; + BtnCatlogManage.ItemAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; + BtnCatlogManage.ItemAppearance.Normal.Options.UseFont = true; + BtnCatlogManage.Name = "BtnCatlogManage"; + BtnCatlogManage.ItemClick += BtnCatlogManage_ItemClick; + // + // BtnPropManage + // + BtnPropManage.Caption = "灞炴�х鐞�"; + BtnPropManage.Id = 16; + BtnPropManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnPropManage.ImageOptions.SvgImage"); + BtnPropManage.ItemAppearance.Normal.FontSizeDelta = 2; + BtnPropManage.ItemAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; + BtnPropManage.ItemAppearance.Normal.Options.UseFont = true; + BtnPropManage.Name = "BtnPropManage"; + BtnPropManage.ItemClick += BtnPropManage_ItemClick; // // barManager1 // @@ -379,8 +464,8 @@ barManager1.DockControls.Add(barDockControlLeft); barManager1.DockControls.Add(barDockControlRight); barManager1.Form = this; - barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnSupplier, barBtnBuildingType, barBtnBuilding, barBtnFacilities, barBtnSystemType, barBtnPart, barBtnWaterEquivalent, barBtnUser, barBtnAuthority, barBtnSystemLog, barBtnCorp, barBtnWaterUtensil, barBtnProject }); - barManager1.MaxItemId = 13; + barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnSupplier, barBtnBuildingType, barBtnBuilding, barBtnFacilities, barBtnSystemType, barBtnPart, barBtnWaterEquivalent, barBtnUser, barBtnAuthority, barBtnSystemLog, barBtnCorp, barBtnWaterUtensil, barBtnProject, barBtnPumpManage, barButtonTypeManage, BtnCatlogManage, BtnPropManage, barBtnRoleManage }); + barManager1.MaxItemId = 18; // // barDockControlTop // @@ -434,6 +519,7 @@ barBtnAuthority.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnAuthority.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnAuthority.Name = "barBtnAuthority"; + barBtnAuthority.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; barBtnAuthority.ItemClick += barBtnAuthority_ItemClick; // // barBtnSystemLog @@ -457,10 +543,28 @@ barBtnCorp.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; barBtnCorp.ItemInMenuAppearance.Normal.Options.UseFont = true; barBtnCorp.Name = "barBtnCorp"; + barBtnCorp.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + // + // barBtnRoleManage + // + barBtnRoleManage.Caption = "瑙掕壊绠$悊"; + barBtnRoleManage.Id = 17; + barBtnRoleManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRoleManage.ImageOptions.SvgImage"); + barBtnRoleManage.ItemAppearance.Normal.FontSizeDelta = 2; + barBtnRoleManage.ItemAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold; + barBtnRoleManage.ItemAppearance.Normal.Options.UseFont = true; + barBtnRoleManage.Name = "barBtnRoleManage"; + barBtnRoleManage.ItemClick += BarBtnRoleManage_ItemClick; + // + // popSystemOrganize + // + popSystemOrganize.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnUser), new DevExpress.XtraBars.LinkPersistInfo(barBtnAuthority), new DevExpress.XtraBars.LinkPersistInfo(barBtnSystemLog), new DevExpress.XtraBars.LinkPersistInfo(barBtnCorp) }); + popSystemOrganize.Manager = barManager1; + popSystemOrganize.Name = "popSystemOrganize"; // // popSystemAuthority // - popSystemAuthority.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnUser), new DevExpress.XtraBars.LinkPersistInfo(barBtnAuthority), new DevExpress.XtraBars.LinkPersistInfo(barBtnSystemLog), new DevExpress.XtraBars.LinkPersistInfo(barBtnCorp) }); + popSystemAuthority.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnSystemLog), new DevExpress.XtraBars.LinkPersistInfo(barBtnRoleManage) }); popSystemAuthority.Manager = barManager1; popSystemAuthority.Name = "popSystemAuthority"; // @@ -477,6 +581,7 @@ Name = "GuideMain"; StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; Text = "s"; + Load += GuideMain_Load; ((System.ComponentModel.ISupportInitialize)documentManager1).EndInit(); ((System.ComponentModel.ISupportInitialize)tabbedView1).EndInit(); ((System.ComponentModel.ISupportInitialize)tileNavPane).EndInit(); @@ -488,6 +593,7 @@ ((System.ComponentModel.ISupportInitialize)simpleSeparator1).EndInit(); ((System.ComponentModel.ISupportInitialize)popSystemConfig).EndInit(); ((System.ComponentModel.ISupportInitialize)barManager1).EndInit(); + ((System.ComponentModel.ISupportInitialize)popSystemOrganize).EndInit(); ((System.ComponentModel.ISupportInitialize)popSystemAuthority).EndInit(); ResumeLayout(false); PerformLayout(); @@ -502,7 +608,7 @@ private DevExpress.XtraBars.Navigation.NavButton nbMinimize; private DevExpress.XtraBars.Navigation.NavButton nbClose; private DevExpress.XtraBars.Navigation.NavButton nbSystemConfig; - private DevExpress.XtraBars.Navigation.NavButton nbSystemAuthority; + private DevExpress.XtraBars.Navigation.NavButton nbSystemOrganize; private DevExpress.XtraEditors.SidePanel sidePanelTop; private DevExpress.XtraLayout.LayoutControl layoutControl1; private DevExpress.XtraLayout.LayoutControlGroup Root; @@ -519,15 +625,22 @@ private DevExpress.XtraBars.BarButtonItem barBtnBuilding; private DevExpress.XtraBars.BarButtonItem barBtnFacilities; private DevExpress.XtraBars.BarButtonItem barBtnSystemType; - private DevExpress.XtraBars.BarButtonItem barBtnPart; private DevExpress.XtraBars.BarButtonItem barBtnWaterEquivalent; private DevExpress.XtraBars.BarButtonItem barBtnUser; private DevExpress.XtraBars.BarButtonItem barBtnAuthority; private DevExpress.XtraBars.BarButtonItem barBtnSystemLog; private DevExpress.XtraBars.BarButtonItem barBtnCorp; - private DevExpress.XtraBars.PopupMenu popSystemAuthority; + private DevExpress.XtraBars.PopupMenu popSystemOrganize; private DevExpress.XtraBars.Navigation.NavButton nbMapOverview; private DevExpress.XtraBars.BarButtonItem barBtnWaterUtensil; private DevExpress.XtraBars.BarButtonItem barBtnProject; + private DevExpress.XtraBars.BarButtonItem barBtnPumpManage; + protected DevExpress.XtraBars.BarButtonItem barBtnPart; + private DevExpress.XtraBars.BarButtonItem barButtonTypeManage; + private DevExpress.XtraBars.BarButtonItem BtnCatlogManage; + private DevExpress.XtraBars.BarButtonItem BtnPropManage; + private DevExpress.XtraBars.Navigation.NavButton nbSystemAuthority; + private DevExpress.XtraBars.PopupMenu popSystemAuthority; + private DevExpress.XtraBars.BarButtonItem barBtnRoleManage; } } \ No newline at end of file -- Gitblit v1.9.3