Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-11-21 3e59a097e89632a53554f369eb55ece5fdda3eda

 Desktop/HStation.Desktop.PBS.Core/MainForm.Designer.cs

@@ -43,7 +43,7 @@
            navBtnNext = new DevExpress.XtraBars.Navigation.NavButton();
            navBtnPattern = new DevExpress.XtraBars.Navigation.NavButton();
            nbPlaceMgr = new DevExpress.XtraBars.Navigation.NavButton();
            nbEquivalentMgr = new DevExpress.XtraBars.Navigation.NavButton();
            nbWEMgr = new DevExpress.XtraBars.Navigation.NavButton();
            nbAssetManage = new DevExpress.XtraBars.Navigation.NavButton();
            nbSystemConfig = new DevExpress.XtraBars.Navigation.NavButton();
            nbAuthConfig = new DevExpress.XtraBars.Navigation.NavButton();
@@ -59,21 +59,21 @@
            barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
            barDockControlRight = new DevExpress.XtraBars.BarDockControl();
            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
            barDockingMenuItem1 = new DevExpress.XtraBars.BarDockingMenuItem();
            tabbedView1 = new DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(components);
            flyoutPanel1 = new DevExpress.Utils.FlyoutPanel();
            flyoutPanelControl1 = new DevExpress.Utils.FlyoutPanelControl();
            svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
            ((System.ComponentModel.ISupportInitialize)tileNavPane).BeginInit();
            ((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)tabbedView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)flyoutPanel1).BeginInit();
            flyoutPanel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)flyoutPanelControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImg32).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            SuspendLayout();
            // 
            // tileNavPane
@@ -85,7 +85,7 @@
            tileNavPane.Buttons.Add(navBtnNext);
            tileNavPane.Buttons.Add(navBtnPattern);
            tileNavPane.Buttons.Add(nbPlaceMgr);
            tileNavPane.Buttons.Add(nbEquivalentMgr);
            tileNavPane.Buttons.Add(nbWEMgr);
            tileNavPane.Buttons.Add(nbAssetManage);
            tileNavPane.Buttons.Add(nbSystemConfig);
            tileNavPane.Buttons.Add(nbAuthConfig);
@@ -185,14 +185,14 @@
            nbPlaceMgr.Name = "nbPlaceMgr";
            nbPlaceMgr.ElementClick += nbPlaceMgr_ElementClick;
            // 
            // nbEquivalentMgr
            // nbWEMgr
            // 
            nbEquivalentMgr.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            nbEquivalentMgr.Caption = "当量管理";
            nbEquivalentMgr.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbEquivalentMgr.ImageOptions.SvgImage");
            nbEquivalentMgr.ImageOptions.SvgImageSize = new Size(24, 24);
            nbEquivalentMgr.Name = "nbEquivalentMgr";
            nbEquivalentMgr.ElementClick += nbEquivalentMgr_ElementClick;
            nbWEMgr.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
            nbWEMgr.Caption = "当量管理";
            nbWEMgr.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbWEMgr.ImageOptions.SvgImage");
            nbWEMgr.ImageOptions.SvgImageSize = new Size(24, 24);
            nbWEMgr.Name = "nbWEMgr";
            nbWEMgr.ElementClick += nbWEMgr_ElementClick;
            // 
            // nbAssetManage
            // 
@@ -330,12 +330,6 @@
            barDockControlRight.Margin = new Padding(4, 5, 4, 5);
            barDockControlRight.Size = new Size(0, 1085);
            // 
            // dockManager1
            // 
            dockManager1.Form = this;
            dockManager1.MenuManager = barManager1;
            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" });
            // 
            // barDockingMenuItem1
            // 
            barDockingMenuItem1.Caption = "Window";
@@ -397,6 +391,12 @@
            svgImg32.Add("GuestUser.svg", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32.GuestUser.svg"));
            svgImg32.Add("PassiveAuthentication.svg", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImg32.PassiveAuthentication.svg"));
            // 
            // dockManager1
            // 
            dockManager1.Form = this;
            dockManager1.MenuManager = barManager1;
            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" });
            // 
            // MainForm
            // 
            AutoScaleDimensions = new SizeF(10F, 22F);
@@ -420,12 +420,12 @@
            ((System.ComponentModel.ISupportInitialize)tileNavPane).EndInit();
            ((System.ComponentModel.ISupportInitialize)documentManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)barManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)tabbedView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)flyoutPanel1).EndInit();
            flyoutPanel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)flyoutPanelControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)svgImg32).EndInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -448,9 +448,8 @@
        private DevExpress.XtraBars.Navigation.NavButton nbMin;
        private DevExpress.XtraBars.Navigation.NavButton nbNormal;
        private DevExpress.XtraBars.Navigation.NavButton nbClose;
        private DevExpress.XtraBars.Docking.DockManager dockManager1;
        private DevExpress.XtraBars.Navigation.NavButton nbPlaceMgr;
        private DevExpress.XtraBars.Navigation.NavButton nbEquivalentMgr;
        private DevExpress.XtraBars.Navigation.NavButton nbWEMgr;
        private DevExpress.Utils.FlyoutPanel flyoutPanel1;
        private DevExpress.Utils.FlyoutPanelControl flyoutPanelControl1;
        private DevExpress.Utils.SvgImageCollection svgImg32;
@@ -461,5 +460,6 @@
        private DevExpress.XtraBars.Navigation.NavButton navBtnNext;
        private DevExpress.XtraBars.Navigation.NavButton nbAuthConfig;
        private DevExpress.XtraBars.Navigation.NavButton navBtnPattern;
        private DevExpress.XtraBars.Docking.DockManager dockManager1;
    }
}