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 |   96 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 84 insertions(+), 12 deletions(-)

diff --git a/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.Designer.cs b/Desktop/HStation.DeskTop.Xhs.Main/GuideMain.Designer.cs
index 7c100b9..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();
@@ -57,6 +58,8 @@
             barBtnWaterEquivalent = 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();
@@ -66,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();
@@ -78,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();
             // 
@@ -96,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);
@@ -176,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;
@@ -189,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";
             // 
@@ -272,7 +300,7 @@
             // 
             // popSystemConfig
             // 
-            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) });
+            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;
@@ -280,7 +308,7 @@
             // 
             // barBtnProject
             // 
-            barBtnProject.Caption = "椤圭洰绠$悊";
+            barBtnProject.Caption = "椤圭洰鍒楄〃";
             barBtnProject.Id = 12;
             barBtnProject.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnProject.ImageOptions.SvgImage");
             barBtnProject.ItemInMenuAppearance.Normal.FontSizeDelta = 2;
@@ -387,7 +415,7 @@
             // 
             // barBtnPumpManage
             // 
-            barBtnPumpManage.Caption = "娉电鐞�";
+            barBtnPumpManage.Caption = "姘存车绠$悊";
             barBtnPumpManage.Id = 13;
             barBtnPumpManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnPumpManage.ImageOptions.SvgImage");
             barBtnPumpManage.ItemInMenuAppearance.Normal.FontSizeDelta = 2;
@@ -400,11 +428,34 @@
             // 
             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
             // 
@@ -413,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, barBtnPumpManage, barButtonTypeManage });
-            barManager1.MaxItemId = 15;
+            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
             // 
@@ -457,7 +508,6 @@
             barBtnUser.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold;
             barBtnUser.ItemInMenuAppearance.Normal.Options.UseFont = true;
             barBtnUser.Name = "barBtnUser";
-            barBtnUser.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             barBtnUser.ItemClick += barBtnUser_ItemClick;
             // 
             // barBtnAuthority
@@ -481,7 +531,6 @@
             barBtnSystemLog.ItemInMenuAppearance.Normal.FontStyleDelta = System.Drawing.FontStyle.Bold;
             barBtnSystemLog.ItemInMenuAppearance.Normal.Options.UseFont = true;
             barBtnSystemLog.Name = "barBtnSystemLog";
-            barBtnSystemLog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
             barBtnSystemLog.ItemClick += barBtnSystemLog_ItemClick;
             // 
             // barBtnCorp
@@ -496,9 +545,26 @@
             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";
             // 
@@ -527,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();
@@ -541,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;
@@ -563,12 +630,17 @@
         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