Преглед изворни кода

feat:增加电务分析界面

mux пре 5 месеци
родитељ
комит
8a3bf950bd
3 измењених фајлова са 409 додато и 118 уклоњено
  1. 230 106
      DPTools/DevFrmMain.Designer.cs
  2. 5 0
      DPTools/DevFrmMain.cs
  3. 174 12
      DPTools/DevFrmMain.resx

+ 230 - 106
DPTools/DevFrmMain.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::Uninpho.LicManager.FrmSplashScreen), true, true);
             DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
             DevExpress.Utils.ToolTipTitleItem toolTipTitleItem1 = new DevExpress.Utils.ToolTipTitleItem();
@@ -358,12 +357,12 @@
             DevExpress.Utils.SuperToolTip superToolTip109 = new DevExpress.Utils.SuperToolTip();
             DevExpress.Utils.ToolTipTitleItem toolTipTitleItem109 = new DevExpress.Utils.ToolTipTitleItem();
             DevExpress.Utils.ToolTipItem toolTipItem109 = new DevExpress.Utils.ToolTipItem();
-            DevExpress.Utils.SuperToolTip superToolTip110 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipTitleItem toolTipTitleItem110 = new DevExpress.Utils.ToolTipTitleItem();
-            DevExpress.Utils.ToolTipItem toolTipItem110 = new DevExpress.Utils.ToolTipItem();
             DevExpress.Utils.SuperToolTip superToolTip111 = new DevExpress.Utils.SuperToolTip();
             DevExpress.Utils.ToolTipTitleItem toolTipTitleItem111 = new DevExpress.Utils.ToolTipTitleItem();
             DevExpress.Utils.ToolTipItem toolTipItem111 = new DevExpress.Utils.ToolTipItem();
+            DevExpress.Utils.SuperToolTip superToolTip112 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipTitleItem toolTipTitleItem112 = new DevExpress.Utils.ToolTipTitleItem();
+            DevExpress.Utils.ToolTipItem toolTipItem112 = new DevExpress.Utils.ToolTipItem();
             DevExpress.XtraReports.UserDesigner.XRDesignPanelListener xrDesignPanelListener1 = new DevExpress.XtraReports.UserDesigner.XRDesignPanelListener();
             DevExpress.XtraReports.UserDesigner.XRDesignPanelListener xrDesignPanelListener2 = new DevExpress.XtraReports.UserDesigner.XRDesignPanelListener();
             DevExpress.XtraReports.UserDesigner.XRDesignPanelListener xrDesignPanelListener3 = new DevExpress.XtraReports.UserDesigner.XRDesignPanelListener();
@@ -372,9 +371,12 @@
             DevExpress.XtraReports.UserDesigner.XRDesignPanelListener xrDesignPanelListener6 = new DevExpress.XtraReports.UserDesigner.XRDesignPanelListener();
             DevExpress.XtraReports.UserDesigner.XRDesignPanelListener xrDesignPanelListener7 = new DevExpress.XtraReports.UserDesigner.XRDesignPanelListener();
             DevExpress.XtraReports.UserDesigner.XRDesignPanelListener xrDesignPanelListener8 = new DevExpress.XtraReports.UserDesigner.XRDesignPanelListener();
-            this.xrDesignRibbonController1 = new DevExpress.XtraReports.UserDesigner.XRDesignRibbonController(this.components);
+            DevExpress.Utils.SuperToolTip superToolTip110 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipTitleItem toolTipTitleItem110 = new DevExpress.Utils.ToolTipTitleItem();
+            DevExpress.Utils.ToolTipItem toolTipItem110 = new DevExpress.Utils.ToolTipItem();
+            this.xrDesignRibbonController1 = new DevExpress.XtraReports.UserDesigner.XRDesignRibbonController();
             this.ribbon = new DevExpress.XtraBars.Ribbon.RibbonControl();
-            this.applicationMenu1 = new DevExpress.XtraBars.Ribbon.ApplicationMenu(this.components);
+            this.applicationMenu1 = new DevExpress.XtraBars.Ribbon.ApplicationMenu();
             this.commandBarItem31 = new DevExpress.XtraReports.UserDesigner.CommandBarItem();
             this.commandBarItem34 = new DevExpress.XtraReports.UserDesigner.CommandBarItem();
             this.commandBarItem32 = new DevExpress.XtraReports.UserDesigner.CommandBarItem();
@@ -542,22 +544,22 @@
             this.btnJXGJJ = new DevExpress.XtraBars.BarButtonItem();
             this.StartZDHBtn = new DevExpress.XtraBars.BarButtonItem();
             this.EndZDHBtn = new DevExpress.XtraBars.BarButtonItem();
-            this.ribbonMiniToolbar1 = new DevExpress.XtraBars.Ribbon.RibbonMiniToolbar(this.components);
+            this.ribbonMiniToolbar1 = new DevExpress.XtraBars.Ribbon.RibbonMiniToolbar();
             this.xrToolboxPageCategory1 = new DevExpress.XtraReports.UserDesigner.XRToolboxPageCategory();
             this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            this.ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPage2 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.ribbonPageGroup8 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup10 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup9 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.ribbonPageGroup4 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit();
             this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.ribbonStatusBar = new DevExpress.XtraBars.Ribbon.RibbonStatusBar();
-            this.xrDesignDockManager1 = new DevExpress.XtraReports.UserDesigner.XRDesignDockManager(this.components);
+            this.xrDesignDockManager1 = new DevExpress.XtraReports.UserDesigner.XRDesignDockManager();
             this.panelContainer1 = new DevExpress.XtraBars.Docking.DockPanel();
             this.panelContainer2 = new DevExpress.XtraBars.Docking.DockPanel();
             this.fieldListDockPanel1 = new DevExpress.XtraReports.UserDesigner.FieldListDockPanel();
@@ -573,19 +575,19 @@
             this.errorListDockPanel1_Container = new DevExpress.XtraReports.UserDesigner.DesignControlContainer();
             this.groupAndSortDockPanel1 = new DevExpress.XtraReports.UserDesigner.GroupAndSortDockPanel();
             this.groupAndSortDockPanel1_Container = new DevExpress.XtraReports.UserDesigner.DesignControlContainer();
-            this.galleryDropDown1 = new DevExpress.XtraBars.Ribbon.GalleryDropDown(this.components);
+            this.galleryDropDown1 = new DevExpress.XtraBars.Ribbon.GalleryDropDown();
             this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
-            this.defaultLookAndFeel1 = new DevExpress.LookAndFeel.DefaultLookAndFeel(this.components);
+            this.defaultLookAndFeel1 = new DevExpress.LookAndFeel.DefaultLookAndFeel();
             this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonItem6 = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonItem7 = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonItem9 = new DevExpress.XtraBars.BarButtonItem();
-            this.reportDesigner1 = new DevExpress.XtraReports.UserDesigner.XRDesignMdiController(this.components);
-            this.popupMenu1 = new DevExpress.XtraBars.PopupMenu(this.components);
-            this.galleryDropDown2 = new DevExpress.XtraBars.Ribbon.GalleryDropDown(this.components);
-            this.popupMenu2 = new DevExpress.XtraBars.PopupMenu(this.components);
-            this.popupMenu3 = new DevExpress.XtraBars.PopupMenu(this.components);
+            this.reportDesigner1 = new DevExpress.XtraReports.UserDesigner.XRDesignMdiController();
+            this.popupMenu1 = new DevExpress.XtraBars.PopupMenu();
+            this.galleryDropDown2 = new DevExpress.XtraBars.Ribbon.GalleryDropDown();
+            this.popupMenu2 = new DevExpress.XtraBars.PopupMenu();
+            this.popupMenu3 = new DevExpress.XtraBars.PopupMenu();
             this.ribbonPageGroup3 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.barButtonItem15 = new DevExpress.XtraBars.BarButtonItem();
             this.xtraTabDataManager = new DevExpress.XtraTab.XtraTabPage();
@@ -672,6 +674,14 @@
             this.xtraTabPageMTLF = new DevExpress.XtraTab.XtraTabPage();
             this.xtraTabPageZZJH = new DevExpress.XtraTab.XtraTabPage();
             this.xtraTabPageXXXW = new DevExpress.XtraTab.XtraTabPage();
+            this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
+            this.ribbonPageGroup11 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.barButtonItem29 = new DevExpress.XtraBars.BarButtonItem();
+            this.barButtonItem30 = new DevExpress.XtraBars.BarButtonItem();
+            this.barButtonItem31 = new DevExpress.XtraBars.BarButtonItem();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             ((System.ComponentModel.ISupportInitialize)(this.xrDesignRibbonController1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.applicationMenu1)).BeginInit();
@@ -901,9 +911,13 @@
             this.barButtonItem28,
             this.btnJXGJJ,
             this.StartZDHBtn,
-            this.EndZDHBtn});
+            this.EndZDHBtn,
+            this.barButtonItem29,
+            this.barButtonItem30,
+            this.barButtonItem31});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
-            this.ribbon.MaxItemId = 202;
+            this.ribbon.Margin = new System.Windows.Forms.Padding(4);
+            this.ribbon.MaxItemId = 210;
             this.ribbon.MiniToolbars.Add(this.ribbonMiniToolbar1);
             this.ribbon.Name = "ribbon";
             this.ribbon.PageCategories.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageCategory[] {
@@ -919,7 +933,7 @@
             this.repositoryItemCheckedComboBoxEdit1,
             this.repositoryItemCheckEdit1});
             this.ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2007;
-            this.ribbon.Size = new System.Drawing.Size(1331, 148);
+            this.ribbon.Size = new System.Drawing.Size(1664, 188);
             this.ribbon.StatusBar = this.ribbonStatusBar;
             this.ribbon.TransparentEditors = true;
             this.ribbon.Click += new System.EventHandler(this.ribbon_Click);
@@ -3445,9 +3459,9 @@
             this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
             this.ribbonPageGroup6,
             this.ribbonPageGroup5,
+            this.ribbonPageGroup11,
             this.ribbonPageGroup7,
-            this.ribbonPageGroup1,
-            this.ribbonPageGroup4});
+            this.ribbonPageGroup1});
             this.ribbonPage1.Name = "ribbonPage1";
             this.ribbonPage1.Text = "开始";
             // 
@@ -3473,13 +3487,13 @@
             this.ribbonPageGroup5.ItemLinks.Add(this.LGLbBtnI);
             this.ribbonPageGroup5.ItemLinks.Add(this.barButtonItem_DataManager);
             this.ribbonPageGroup5.Name = "ribbonPageGroup5";
-            toolTipTitleItem109.Text = "数据分析";
+            toolTipTitleItem109.Text = "工务数据分析";
             toolTipItem109.LeftIndent = 6;
-            toolTipItem109.Text = "数据分析";
+            toolTipItem109.Text = "工务数据分析";
             superToolTip109.Items.Add(toolTipTitleItem109);
             superToolTip109.Items.Add(toolTipItem109);
             this.ribbonPageGroup5.SuperTip = superToolTip109;
-            this.ribbonPageGroup5.Text = "数据分析";
+            this.ribbonPageGroup5.Text = "工务数据分析";
             // 
             // ribbonPageGroup7
             // 
@@ -3495,26 +3509,21 @@
             this.ribbonPageGroup1.ItemLinks.Add(this.barButtonItem16);
             this.ribbonPageGroup1.ItemLinks.Add(this.barButtonImageTile);
             this.ribbonPageGroup1.Name = "ribbonPageGroup1";
-            toolTipTitleItem110.Text = "数据管理";
-            toolTipItem110.LeftIndent = 6;
-            toolTipItem110.Text = "数据管理";
-            superToolTip110.Items.Add(toolTipTitleItem110);
-            superToolTip110.Items.Add(toolTipItem110);
-            this.ribbonPageGroup1.SuperTip = superToolTip110;
+            toolTipTitleItem111.Text = "数据管理";
+            toolTipItem111.LeftIndent = 6;
+            toolTipItem111.Text = "数据管理";
+            superToolTip111.Items.Add(toolTipTitleItem111);
+            superToolTip111.Items.Add(toolTipItem111);
+            this.ribbonPageGroup1.SuperTip = superToolTip111;
             this.ribbonPageGroup1.Text = "数据管理";
             // 
-            // ribbonPageGroup4
-            // 
-            this.ribbonPageGroup4.ItemLinks.Add(this.skinRibbonGalleryBarItem1);
-            this.ribbonPageGroup4.Name = "ribbonPageGroup4";
-            this.ribbonPageGroup4.Text = "系统主题";
-            // 
             // ribbonPage2
             // 
             this.ribbonPage2.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
             this.ribbonPageGroup8,
             this.ribbonPageGroup10,
-            this.ribbonPageGroup9});
+            this.ribbonPageGroup9,
+            this.ribbonPageGroup4});
             this.ribbonPage2.Name = "ribbonPage2";
             this.ribbonPage2.Text = "设置";
             // 
@@ -3539,6 +3548,12 @@
             this.ribbonPageGroup9.Text = "授权与邀请";
             this.ribbonPageGroup9.Visible = false;
             // 
+            // ribbonPageGroup4
+            // 
+            this.ribbonPageGroup4.ItemLinks.Add(this.skinRibbonGalleryBarItem1);
+            this.ribbonPageGroup4.Name = "ribbonPageGroup4";
+            this.ribbonPageGroup4.Text = "系统主题";
+            // 
             // repositoryItemCheckedComboBoxEdit1
             // 
             this.repositoryItemCheckedComboBoxEdit1.AutoHeight = false;
@@ -3560,10 +3575,11 @@
             this.ribbonStatusBar.ItemLinks.Add(this.barButtonItem8);
             this.ribbonStatusBar.ItemLinks.Add(this.printPreviewStaticItem2);
             this.ribbonStatusBar.ItemLinks.Add(this.zoomTrackBarEditItem1);
-            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 663);
+            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 828);
+            this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(4);
             this.ribbonStatusBar.Name = "ribbonStatusBar";
             this.ribbonStatusBar.Ribbon = this.ribbon;
-            this.ribbonStatusBar.Size = new System.Drawing.Size(1331, 32);
+            this.ribbonStatusBar.Size = new System.Drawing.Size(1664, 41);
             this.ribbonStatusBar.Visible = false;
             // 
             // xrDesignDockManager1
@@ -3779,12 +3795,12 @@
             // 
             this.ribbonPageGroup2.ItemLinks.Add(this.barButtonImageTile);
             this.ribbonPageGroup2.Name = "ribbonPageGroup2";
-            toolTipTitleItem111.Text = "许可管理工具";
-            toolTipItem111.LeftIndent = 6;
-            toolTipItem111.Text = "注册、删除许可等工具";
-            superToolTip111.Items.Add(toolTipTitleItem111);
-            superToolTip111.Items.Add(toolTipItem111);
-            this.ribbonPageGroup2.SuperTip = superToolTip111;
+            toolTipTitleItem112.Text = "许可管理工具";
+            toolTipItem112.LeftIndent = 6;
+            toolTipItem112.Text = "注册、删除许可等工具";
+            superToolTip112.Items.Add(toolTipTitleItem112);
+            superToolTip112.Items.Add(toolTipItem112);
+            this.ribbonPageGroup2.SuperTip = superToolTip112;
             this.ribbonPageGroup2.Text = "数据转换";
             // 
             // barButtonItem3
@@ -3877,27 +3893,31 @@
             // 
             // xtraTabDataManager
             // 
+            this.xtraTabDataManager.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabDataManager.Name = "xtraTabDataManager";
-            this.xtraTabDataManager.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabDataManager.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabDataManager.Text = "数据展示";
             // 
             // xtraTabPageLGL
             // 
             this.xtraTabPageLGL.Controls.Add(this.gridControl3);
             this.xtraTabPageLGL.Controls.Add(this.panelControl4);
+            this.xtraTabPageLGL.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageLGL.Name = "xtraTabPageLGL";
-            this.xtraTabPageLGL.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageLGL.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageLGL.Text = "轮轨力数据分析";
             // 
             // gridControl3
             // 
             this.gridControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl3.Location = new System.Drawing.Point(0, 48);
+            this.gridControl3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl3.Location = new System.Drawing.Point(0, 60);
             this.gridControl3.MainView = this.gridView3;
+            this.gridControl3.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl3.Name = "gridControl3";
             this.gridControl3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit2});
-            this.gridControl3.Size = new System.Drawing.Size(1325, 438);
+            this.gridControl3.Size = new System.Drawing.Size(1657, 544);
             this.gridControl3.TabIndex = 15;
             this.gridControl3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView3});
@@ -4066,24 +4086,27 @@
             this.panelControl4.Controls.Add(this.LGLjiancecheBtn);
             this.panelControl4.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl4.Location = new System.Drawing.Point(0, 0);
+            this.panelControl4.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl4.Name = "panelControl4";
-            this.panelControl4.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl4.Size = new System.Drawing.Size(1657, 60);
             this.panelControl4.TabIndex = 11;
             // 
             // LGLTQBtn
             // 
-            this.LGLTQBtn.Location = new System.Drawing.Point(346, 15);
+            this.LGLTQBtn.Location = new System.Drawing.Point(432, 19);
+            this.LGLTQBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLTQBtn.Name = "LGLTQBtn";
-            this.LGLTQBtn.Size = new System.Drawing.Size(75, 23);
+            this.LGLTQBtn.Size = new System.Drawing.Size(94, 29);
             this.LGLTQBtn.TabIndex = 5;
             this.LGLTQBtn.Text = "轮轨力分析";
             this.LGLTQBtn.Click += new System.EventHandler(this.LGLTQBtn_Click);
             // 
             // LGLFXBtn
             // 
-            this.LGLFXBtn.Location = new System.Drawing.Point(457, 15);
+            this.LGLFXBtn.Location = new System.Drawing.Point(571, 19);
+            this.LGLFXBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLFXBtn.Name = "LGLFXBtn";
-            this.LGLFXBtn.Size = new System.Drawing.Size(75, 23);
+            this.LGLFXBtn.Size = new System.Drawing.Size(94, 29);
             this.LGLFXBtn.TabIndex = 5;
             this.LGLFXBtn.Text = "道岔分析";
             this.LGLFXBtn.Visible = false;
@@ -4092,49 +4115,54 @@
             // LGLdelBtn
             // 
             this.LGLdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.LGLdelBtn.Location = new System.Drawing.Point(1218, 15);
+            this.LGLdelBtn.Location = new System.Drawing.Point(1523, 19);
+            this.LGLdelBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLdelBtn.Name = "LGLdelBtn";
-            this.LGLdelBtn.Size = new System.Drawing.Size(72, 23);
+            this.LGLdelBtn.Size = new System.Drawing.Size(90, 29);
             this.LGLdelBtn.TabIndex = 5;
             this.LGLdelBtn.Text = " 删除选中";
             this.LGLdelBtn.Click += new System.EventHandler(this.DelJHFXBtn_Click);
             // 
             // LGLJCCcomboBoxEdit
             // 
-            this.LGLJCCcomboBoxEdit.Location = new System.Drawing.Point(71, 16);
+            this.LGLJCCcomboBoxEdit.Location = new System.Drawing.Point(89, 20);
+            this.LGLJCCcomboBoxEdit.Margin = new System.Windows.Forms.Padding(4);
             this.LGLJCCcomboBoxEdit.MenuManager = this.xrDesignRibbonController1;
             this.LGLJCCcomboBoxEdit.Name = "LGLJCCcomboBoxEdit";
             this.LGLJCCcomboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.LGLJCCcomboBoxEdit.Size = new System.Drawing.Size(122, 20);
+            this.LGLJCCcomboBoxEdit.Size = new System.Drawing.Size(152, 24);
             this.LGLJCCcomboBoxEdit.TabIndex = 9;
             // 
             // LGLcheckEdit
             // 
             this.LGLcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.LGLcheckEdit.Location = new System.Drawing.Point(1075, 16);
+            this.LGLcheckEdit.Location = new System.Drawing.Point(1345, 20);
+            this.LGLcheckEdit.Margin = new System.Windows.Forms.Padding(4);
             this.LGLcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.LGLcheckEdit.Name = "LGLcheckEdit";
             this.LGLcheckEdit.Properties.Caption = "浏览文件夹";
-            this.LGLcheckEdit.Size = new System.Drawing.Size(89, 19);
+            this.LGLcheckEdit.Size = new System.Drawing.Size(111, 22);
             this.LGLcheckEdit.TabIndex = 5;
             this.LGLcheckEdit.Visible = false;
             // 
             // LGLOpenfileBtn
             // 
             this.LGLOpenfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.LGLOpenfileBtn.Location = new System.Drawing.Point(994, 15);
+            this.LGLOpenfileBtn.Location = new System.Drawing.Point(1243, 19);
+            this.LGLOpenfileBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLOpenfileBtn.Name = "LGLOpenfileBtn";
-            this.LGLOpenfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.LGLOpenfileBtn.Size = new System.Drawing.Size(94, 29);
             this.LGLOpenfileBtn.TabIndex = 0;
             this.LGLOpenfileBtn.Text = "浏览";
             this.LGLOpenfileBtn.Click += new System.EventHandler(this.LGLOpenfileBtn_Click);
             // 
             // LGLgengxinBtn
             // 
-            this.LGLgengxinBtn.Location = new System.Drawing.Point(21, 15);
+            this.LGLgengxinBtn.Location = new System.Drawing.Point(26, 19);
+            this.LGLgengxinBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLgengxinBtn.Name = "LGLgengxinBtn";
-            this.LGLgengxinBtn.Size = new System.Drawing.Size(44, 23);
+            this.LGLgengxinBtn.Size = new System.Drawing.Size(55, 29);
             this.LGLgengxinBtn.TabIndex = 5;
             this.LGLgengxinBtn.Text = "更新";
             this.LGLgengxinBtn.ToolTip = "更新检测车信息";
@@ -4142,9 +4170,10 @@
             // 
             // LGLjiancecheBtn
             // 
-            this.LGLjiancecheBtn.Location = new System.Drawing.Point(199, 15);
+            this.LGLjiancecheBtn.Location = new System.Drawing.Point(249, 19);
+            this.LGLjiancecheBtn.Margin = new System.Windows.Forms.Padding(4);
             this.LGLjiancecheBtn.Name = "LGLjiancecheBtn";
-            this.LGLjiancecheBtn.Size = new System.Drawing.Size(100, 23);
+            this.LGLjiancecheBtn.Size = new System.Drawing.Size(125, 29);
             this.LGLjiancecheBtn.TabIndex = 5;
             this.LGLjiancecheBtn.Text = " 修正检测车信息";
             this.LGLjiancecheBtn.ToolTip = "修正选中文件的检测车信息";
@@ -4154,19 +4183,22 @@
             // 
             this.xtraTabPageJH.Controls.Add(this.gridControl2);
             this.xtraTabPageJH.Controls.Add(this.panelControl1);
+            this.xtraTabPageJH.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageJH.Name = "xtraTabPageJH";
-            this.xtraTabPageJH.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageJH.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageJH.Text = "轨道几何数据分析";
             // 
             // gridControl2
             // 
             this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl2.Location = new System.Drawing.Point(0, 48);
+            this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl2.Location = new System.Drawing.Point(0, 60);
             this.gridControl2.MainView = this.gridView2;
+            this.gridControl2.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl2.Name = "gridControl2";
             this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit3});
-            this.gridControl2.Size = new System.Drawing.Size(1325, 438);
+            this.gridControl2.Size = new System.Drawing.Size(1657, 544);
             this.gridControl2.TabIndex = 14;
             this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView2});
@@ -4348,16 +4380,18 @@
             this.panelControl1.Controls.Add(this.JHFXJCCcomboBoxEdit);
             this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl1.Location = new System.Drawing.Point(0, 0);
+            this.panelControl1.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl1.Size = new System.Drawing.Size(1657, 60);
             this.panelControl1.TabIndex = 3;
             // 
             // JHdelBtn
             // 
             this.JHdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.JHdelBtn.Location = new System.Drawing.Point(1218, 15);
+            this.JHdelBtn.Location = new System.Drawing.Point(1523, 19);
+            this.JHdelBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHdelBtn.Name = "JHdelBtn";
-            this.JHdelBtn.Size = new System.Drawing.Size(72, 23);
+            this.JHdelBtn.Size = new System.Drawing.Size(90, 29);
             this.JHdelBtn.TabIndex = 9;
             this.JHdelBtn.Text = " 删除选中";
             this.JHdelBtn.Click += new System.EventHandler(this.DelJHFXBtn_Click);
@@ -4365,37 +4399,41 @@
             // JHFXcheckEdit
             // 
             this.JHFXcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.JHFXcheckEdit.Location = new System.Drawing.Point(1075, 16);
+            this.JHFXcheckEdit.Location = new System.Drawing.Point(1345, 20);
+            this.JHFXcheckEdit.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.JHFXcheckEdit.Name = "JHFXcheckEdit";
             this.JHFXcheckEdit.Properties.Caption = "浏览文件夹";
-            this.JHFXcheckEdit.Size = new System.Drawing.Size(89, 19);
+            this.JHFXcheckEdit.Size = new System.Drawing.Size(111, 22);
             this.JHFXcheckEdit.TabIndex = 4;
             this.JHFXcheckEdit.Visible = false;
             // 
             // WXSFBtn
             // 
-            this.WXSFBtn.Location = new System.Drawing.Point(459, 15);
+            this.WXSFBtn.Location = new System.Drawing.Point(574, 19);
+            this.WXSFBtn.Margin = new System.Windows.Forms.Padding(4);
             this.WXSFBtn.Name = "WXSFBtn";
-            this.WXSFBtn.Size = new System.Drawing.Size(75, 23);
+            this.WXSFBtn.Size = new System.Drawing.Size(94, 29);
             this.WXSFBtn.TabIndex = 5;
             this.WXSFBtn.Text = "微小算法";
             this.WXSFBtn.Click += new System.EventHandler(this.WXSFBtn_Click);
             // 
             // JHTQBtn
             // 
-            this.JHTQBtn.Location = new System.Drawing.Point(346, 15);
+            this.JHTQBtn.Location = new System.Drawing.Point(432, 19);
+            this.JHTQBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHTQBtn.Name = "JHTQBtn";
-            this.JHTQBtn.Size = new System.Drawing.Size(75, 23);
+            this.JHTQBtn.Size = new System.Drawing.Size(94, 29);
             this.JHTQBtn.TabIndex = 5;
             this.JHTQBtn.Text = "几何分析";
             this.JHTQBtn.Click += new System.EventHandler(this.JHTQBtn_Click);
             // 
             // JHgengxinBtn
             // 
-            this.JHgengxinBtn.Location = new System.Drawing.Point(23, 15);
+            this.JHgengxinBtn.Location = new System.Drawing.Point(29, 19);
+            this.JHgengxinBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHgengxinBtn.Name = "JHgengxinBtn";
-            this.JHgengxinBtn.Size = new System.Drawing.Size(44, 23);
+            this.JHgengxinBtn.Size = new System.Drawing.Size(55, 29);
             this.JHgengxinBtn.TabIndex = 10;
             this.JHgengxinBtn.Text = "更新";
             this.JHgengxinBtn.ToolTip = "更新检测车信息";
@@ -4403,9 +4441,10 @@
             // 
             // JHFXjiancecheBtn
             // 
-            this.JHFXjiancecheBtn.Location = new System.Drawing.Point(201, 15);
+            this.JHFXjiancecheBtn.Location = new System.Drawing.Point(251, 19);
+            this.JHFXjiancecheBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXjiancecheBtn.Name = "JHFXjiancecheBtn";
-            this.JHFXjiancecheBtn.Size = new System.Drawing.Size(100, 23);
+            this.JHFXjiancecheBtn.Size = new System.Drawing.Size(125, 29);
             this.JHFXjiancecheBtn.TabIndex = 8;
             this.JHFXjiancecheBtn.Text = " 修正检测车信息";
             this.JHFXjiancecheBtn.ToolTip = "修正选中文件的检测车信息";
@@ -4414,37 +4453,41 @@
             // JHFXopenfileBtn
             // 
             this.JHFXopenfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.JHFXopenfileBtn.Location = new System.Drawing.Point(994, 15);
+            this.JHFXopenfileBtn.Location = new System.Drawing.Point(1243, 19);
+            this.JHFXopenfileBtn.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXopenfileBtn.Name = "JHFXopenfileBtn";
-            this.JHFXopenfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.JHFXopenfileBtn.Size = new System.Drawing.Size(94, 29);
             this.JHFXopenfileBtn.TabIndex = 0;
             this.JHFXopenfileBtn.Text = "浏览";
             this.JHFXopenfileBtn.Click += new System.EventHandler(this.JHFXopenfileBtn_Click);
             // 
             // JHFXJCCcomboBoxEdit
             // 
-            this.JHFXJCCcomboBoxEdit.Location = new System.Drawing.Point(73, 16);
+            this.JHFXJCCcomboBoxEdit.Location = new System.Drawing.Point(91, 20);
+            this.JHFXJCCcomboBoxEdit.Margin = new System.Windows.Forms.Padding(4);
             this.JHFXJCCcomboBoxEdit.MenuManager = this.xrDesignRibbonController1;
             this.JHFXJCCcomboBoxEdit.Name = "JHFXJCCcomboBoxEdit";
             this.JHFXJCCcomboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.JHFXJCCcomboBoxEdit.Size = new System.Drawing.Size(122, 20);
+            this.JHFXJCCcomboBoxEdit.Size = new System.Drawing.Size(152, 24);
             this.JHFXJCCcomboBoxEdit.TabIndex = 7;
             this.JHFXJCCcomboBoxEdit.SelectedIndexChanged += new System.EventHandler(this.JHFXJCCcomboBoxEdit_SelectedIndexChanged);
             // 
             // xtraTabPageGJ
             // 
             this.xtraTabPageGJ.Controls.Add(this.gjInform9);
+            this.xtraTabPageGJ.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageGJ.Name = "xtraTabPageGJ";
-            this.xtraTabPageGJ.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageGJ.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageGJ.Text = "管界信息管理";
             // 
             // gjInform9
             // 
             this.gjInform9.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gjInform9.Location = new System.Drawing.Point(0, 0);
+            this.gjInform9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.gjInform9.Name = "gjInform9";
-            this.gjInform9.Size = new System.Drawing.Size(1325, 486);
+            this.gjInform9.Size = new System.Drawing.Size(1657, 604);
             this.gjInform9.TabIndex = 0;
             // 
             // xtraTabPageQX
@@ -4452,19 +4495,22 @@
             this.xtraTabPageQX.Controls.Add(this.gridControl1);
             this.xtraTabPageQX.Controls.Add(this.panelControl3);
             this.xtraTabPageQX.Controls.Add(this.panelControl2);
+            this.xtraTabPageQX.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageQX.Name = "xtraTabPageQX";
             this.xtraTabPageQX.ShowCloseButton = DevExpress.Utils.DefaultBoolean.False;
-            this.xtraTabPageQX.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageQX.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageQX.Text = "曲线信息管理";
             // 
             // gridControl1
             // 
             this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl1.Location = new System.Drawing.Point(0, 37);
+            this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gridControl1.Location = new System.Drawing.Point(0, 46);
             this.gridControl1.MainView = this.railwaybureau;
+            this.gridControl1.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl1.MenuManager = this.xrDesignRibbonController1;
             this.gridControl1.Name = "gridControl1";
-            this.gridControl1.Size = new System.Drawing.Size(1325, 449);
+            this.gridControl1.Size = new System.Drawing.Size(1657, 558);
             this.gridControl1.TabIndex = 0;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.railwaybureau,
@@ -4706,9 +4752,10 @@
             // panelControl3
             // 
             this.panelControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelControl3.Location = new System.Drawing.Point(0, 37);
+            this.panelControl3.Location = new System.Drawing.Point(0, 46);
+            this.panelControl3.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl3.Name = "panelControl3";
-            this.panelControl3.Size = new System.Drawing.Size(1325, 449);
+            this.panelControl3.Size = new System.Drawing.Size(1657, 558);
             this.panelControl3.TabIndex = 2;
             // 
             // panelControl2
@@ -4716,15 +4763,17 @@
             this.panelControl2.Controls.Add(this.deleteroebtnqx);
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
+            this.panelControl2.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(1325, 37);
+            this.panelControl2.Size = new System.Drawing.Size(1657, 46);
             this.panelControl2.TabIndex = 1;
             // 
             // deleteroebtnqx
             // 
-            this.deleteroebtnqx.Location = new System.Drawing.Point(21, 8);
+            this.deleteroebtnqx.Location = new System.Drawing.Point(26, 10);
+            this.deleteroebtnqx.Margin = new System.Windows.Forms.Padding(4);
             this.deleteroebtnqx.Name = "deleteroebtnqx";
-            this.deleteroebtnqx.Size = new System.Drawing.Size(75, 23);
+            this.deleteroebtnqx.Size = new System.Drawing.Size(94, 29);
             this.deleteroebtnqx.TabIndex = 0;
             this.deleteroebtnqx.Text = "删除选中行";
             this.deleteroebtnqx.Click += new System.EventHandler(this.deleteroebtnqx_Click);
@@ -4733,10 +4782,11 @@
             // 
             this.xtraTabControl1.ClosePageButtonShowMode = DevExpress.XtraTab.ClosePageButtonShowMode.InAllTabPageHeaders;
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 148);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 188);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPageQX;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1331, 515);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1664, 640);
             this.xtraTabControl1.TabIndex = 2;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPageQX,
@@ -4747,14 +4797,18 @@
             this.xtraTabPageMTLF,
             this.xtraTabPageZZJH,
             this.xtraTabPageXXXW,
-            this.xtraTabDataManager});
+            this.xtraTabDataManager,
+            this.xtraTabPage1,
+            this.xtraTabPage2,
+            this.xtraTabPage3});
             this.xtraTabControl1.CloseButtonClick += new System.EventHandler(this.xtraTabControl1_CloseButtonClick);
             // 
             // xtraTabPageDC
             // 
             this.xtraTabPageDC.Controls.Add(this.dcInform8);
+            this.xtraTabPageDC.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageDC.Name = "xtraTabPageDC";
-            this.xtraTabPageDC.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageDC.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageDC.Text = "道岔信息管理";
             this.xtraTabPageDC.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint);
             // 
@@ -4762,38 +4816,100 @@
             // 
             this.dcInform8.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dcInform8.Location = new System.Drawing.Point(0, 0);
+            this.dcInform8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.dcInform8.Name = "dcInform8";
-            this.dcInform8.Size = new System.Drawing.Size(1325, 486);
+            this.dcInform8.Size = new System.Drawing.Size(1657, 604);
             this.dcInform8.TabIndex = 0;
             // 
             // xtraTabPageMTLF
             // 
+            this.xtraTabPageMTLF.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageMTLF.Name = "xtraTabPageMTLF";
-            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageMTLF.Text = "密贴离缝";
             // 
             // xtraTabPageZZJH
             // 
+            this.xtraTabPageZZJH.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageZZJH.Name = "xtraTabPageZZJH";
-            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageZZJH.Text = "逐枕几何";
             // 
             // xtraTabPageXXXW
             // 
+            this.xtraTabPageXXXW.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageXXXW.Name = "xtraTabPageXXXW";
-            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1325, 486);
+            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1657, 604);
             this.xtraTabPageXXXW.Text = "线形线位";
             // 
+            // ribbonPageGroup11
+            // 
+            this.ribbonPageGroup11.ItemLinks.Add(this.barButtonItem29);
+            this.ribbonPageGroup11.ItemLinks.Add(this.barButtonItem30);
+            this.ribbonPageGroup11.ItemLinks.Add(this.barButtonItem31);
+            this.ribbonPageGroup11.Name = "ribbonPageGroup11";
+            toolTipTitleItem110.Text = "电务数据分析";
+            toolTipItem110.LeftIndent = 6;
+            toolTipItem110.Text = "电务数据分析";
+            superToolTip110.Items.Add(toolTipTitleItem110);
+            superToolTip110.Items.Add(toolTipItem110);
+            this.ribbonPageGroup11.SuperTip = superToolTip110;
+            this.ribbonPageGroup11.Text = "电务数据分析";
+            // 
+            // barButtonItem29
+            // 
+            this.barButtonItem29.Caption = "功率分析";
+            this.barButtonItem29.Glyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem29.Glyph")));
+            this.barButtonItem29.Id = 207;
+            this.barButtonItem29.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem29.LargeGlyph")));
+            this.barButtonItem29.Name = "barButtonItem29";
+            // 
+            // barButtonItem30
+            // 
+            this.barButtonItem30.Caption = "缺口分析";
+            this.barButtonItem30.Glyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem30.Glyph")));
+            this.barButtonItem30.Id = 208;
+            this.barButtonItem30.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem30.LargeGlyph")));
+            this.barButtonItem30.Name = "barButtonItem30";
+            // 
+            // barButtonItem31
+            // 
+            this.barButtonItem31.Caption = "数据展示";
+            this.barButtonItem31.Glyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem31.Glyph")));
+            this.barButtonItem31.Id = 209;
+            this.barButtonItem31.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("barButtonItem31.LargeGlyph")));
+            this.barButtonItem31.Name = "barButtonItem31";
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1657, 604);
+            this.xtraTabPage1.Text = "功率分析";
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1657, 604);
+            this.xtraTabPage2.Text = "缺口分析";
+            this.xtraTabPage2.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint_1);
+            // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1657, 604);
+            this.xtraTabPage3.Text = "电务数据展示";
+            // 
             // DevFrmMain
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1331, 695);
+            this.ClientSize = new System.Drawing.Size(1664, 869);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.ribbonStatusBar);
             this.Controls.Add(this.ribbon);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "DevFrmMain";
             this.Ribbon = this.ribbon;
             this.StatusBar = this.ribbonStatusBar;
@@ -5181,5 +5297,13 @@
         private DevExpress.XtraBars.BarButtonItem StartZDHBtn;
         private DevExpress.XtraBars.BarButtonItem EndZDHBtn;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup10;
+        private DevExpress.XtraBars.BarButtonItem barButtonItem29;
+        private DevExpress.XtraBars.BarButtonItem barButtonItem30;
+        private DevExpress.XtraBars.BarButtonItem barButtonItem31;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup11;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private System.Windows.Forms.PageSetupDialog pageSetupDialog1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
     }
 }

+ 5 - 0
DPTools/DevFrmMain.cs

@@ -719,5 +719,10 @@ namespace Uninpho.Tools
             frm.StartPosition = FormStartPosition.CenterParent;
             frm.ShowDialog();
         }
+
+        private void xtraTabPage2_Paint_1(object sender, PaintEventArgs e)
+        {
+
+        }
     }
 }

+ 174 - 12
DPTools/DevFrmMain.resx

@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="xrDesignRibbonController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>693, 17</value>
+    <value>832, 17</value>
   </metadata>
   <metadata name="applicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>906, 17</value>
+    <value>17, 59</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="barButtonImageTile.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -1391,16 +1391,175 @@
         SxeTSruXAX4gXr1hb5mt/FBu1U48CtbR4+85i6uPUbKevuxFuK37mbgSy3X0QjOHKx5nDlO0hxiY8I+R
         HlczoWGAQ0rCLnm38iCGl01yLg5+Sbw4/k2CvzwM19W3ISGGNgMcUhI+KvxKGK7/lrgUv3v8ywxIwZ1f
         5I/Gb45XG/jzgOx/2ZzKgxEwf90AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="barButtonItem29.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAhdEVYdFRpdGxlAEJyaW5nO0ZvcndhcmQ7QXJyYW5nZTtPcmRlcnAvsuAAAAK+SURBVDhPbdP/
+        L9RxHAfwj8SQJNUvrUk1Zn3Z+p78B/1Qybea8i0ijkwcTSHRbDU/oG+TLU6R8i1MTrjzNd+2UjkphOnL
+        OXecw9HWnr1eR81uPttjt899nq/n+957f06gy4SsIWtXMDNivoyfmQAQ/uHLVJ7qKm+57YrmtONoSmUu
+        aLrlAnnKspsuaEw5BumNo82UNzMuMOfQ4jcJFofzoB96QnKxMJgD/ZdH0A/ch/5zNuYVmahPOMwTlsYF
+        Fo2JR6AffIzZ7jjousSYJbquWOg6Y6DruGow25uOWvFBnrA2LrCSxh/CfH+WITjzlrRHkyjMtJHWK9C2
+        RkLXk4jq6P08YWNcYF0TewBzH+9QcCmsbRFB2yzCdFM4uYwpWSi0bbGojNjLE7b3JJ1ClqRDyMzrMBTY
+        VEXuoxWSMSVfCk/JQjDVGAxNA6kPgvpNIH0XhrKQ3VywifDJmWTktvG8YFsetgfT7WJDWENhTV0A1HX+
+        UEv9MFnri8nX5zEp9UfJRWfUNLzD3ZxmpD+Uy2iWj1+wKw12ptXDoeZwDYUNfKCqPgdV1VlMEP4s9nPE
+        +PefWPj9B2nZDfxr+L0QNr8IcKKVApfClcwbyldexAMTFR5QlrtDWXYGhT670P91FJPaBSRlSLmAXy5h
+        S9EFR8MqygoKMgory9zIafwqJSWnyEkUeO/E+/4h/FDPIT69mgssuGDDAzf7DonXDhR4OUDiSTwckO+5
+        Hfkey9yZPSSiE+gdGMOIcgbRKRVcsI4LeB8byVaybQWnpyUyfFAMoqW7Dy09CnR/GoZiVIWB8WmIrpdw
+        wfr/L8RKUcnl9EywjkwqhUqrR/+YhgY16DNQo29Eg5D451xgs2pBeMJLLrAMislrCr1WbAgHxxUhWMwK
+        ERTzDL4RufzHslq14JK4iAv4jK2ILeEt2q3A97R/wfQvufo5ATfXKdwAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="barButtonItem29.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAhdEVYdFRpdGxlAEJyaW5nO0ZvcndhcmQ7QXJyYW5nZTtPcmRlcnAvsuAAAAZLSURBVFhHxZZ5
+        UFVlGIe1MjX3rbIS1HF0shzHarLNoH8rQU1L1NxA3EXWFK0MMyerMbdqqskVCGUXFQTlAm4sVxZBkU0k
+        hLuvgAbM/Hrf75xz7yWvSfRH78wz7wHOfZ/fd5bv0gvA/8rfq3cPecQNyt9EuZMzrsUnP0o8RvRxw+Nu
+        6PsP8GeUIG7ljFJCrj7gnX31x3fAqH9gvKE+QF3gjSJCvZ86s88Lhfu8CS/peK8XCva+jYI9xPdeuLx7
+        hopmcshuB+jDgk5LDqFCpzmbOI9O0zlBhzETncaz6DBkoNOQjg79GeI0OnSn0KFNI1LRoUkhktHenIQr
+        373F0/sTfBXcyhml+KS+hbSCTlMWWq9GOlFvFrSoN1EniphPBC1MYYREQbjATrQ3xuHirjd4+gCCb6tb
+        OaMUB+iXv3uGWBlLxHCHQO4sKWRRmES+QijszJUQwb36I8jd8RpPH0h0P8Clb95EuybVsRqW2At4OHUh
+        CEWLLBFcDiY2wnaJkLv94kbcrfkVOVHTefogotsB+l/Y+Tr+vBMvRIrAJkvEMYuYi0EubBBYL66H7cJ6
+        WIm2ygM4/9krPH0w0a0AfNITOdun497tGNgv0WAFVwkNZ4ktj/s6WPOcWHLXCKxEa/luZEa+xNOHEPxa
+        u5UzSnGAAdnbXsW9uoOOlTgFa2mwKyTKIWHOalhVq2FRrXKSvRL2kp3IiJjG04cS3Q4wMGvLy2ir+kla
+        DQmsuSQgCYucglUwk8SiIs4T2YHUA2E+v0ImAPaibTgdMpWnDyNEgIcVBxiUsWkaWq/vgZmHk4hXIwRC
+        QsPPrZB7gIw/zFn+MBHmrOUCU+Yy2K5sQtqGKRxgBKFsRq7cVxxg8JnQqWgp3eVYiclF0kWUKYlMZxWW
+        CowZSwSWvBAkr3mBA4wm+FVUtmcO02WLVoov05C0oCmwq6NIQDKW8HASGWWBJKEuRIthSl8MY/rHDgzc
+        Ty+i8GuRGPg80s6qsX1vOnbsz8RX+7OoZ9HPGV22aKU4wNDUtS/Clr9FFiyRupA4RUJyZhEMgoUwnGYW
+        wHCK+inuCyh0AOKXT0J9YxPMtjbY7rZLtHVg67fpfGUcW7RSHGBY0srJsFwIIwGJaCUsEjI6FhKWCYkf
+        DGl+0MsYTs6H/uRH9Du50/lxSyaioroBjTorNOZWaCxtaDa3IfLrUxzAsUUrxfdleIL/JHrC1wmJniRi
+        uCIRwyWBIJX50IV50KfMFejob7ELJ6DsZj0atBbcMbY6iNh5kgM4dkilOMCI40sn0oMW6FaiI4EuhSXc
+        SZLsQtIHxBwnibMRPX88iq/Xoa7JhAa9XaYFYV+mcADeIbu8nhxgZOyiCXT5FssSQhbok1lAcE+eAy1J
+        tEmzhUiXOAtahQTGV3B07jgUllejptGIWxor6rU26jYERyVxAMcGxcVPIwcYFe03nlbrJ69CkmhJIjEL
+        OiFQ8JFk8b7QxPtAc2Kmk+MzcXiOJ/JLq1DZoEdNkwU1zVbUNlsQ9HkiB+iyQSkBRh6bN45EJBZIq9HI
+        Au0JljhF2hPvk0jhPTTLaOKox72LQ74euFxShev1OtxsNKPqjgVVjRas2xrPAXiDYqcoDsAPxJCffT1U
+        h+eMxRGBp1jF4dljCU8cYmZx96AuQxLmoO8YQu4+HvjNZwxignyQX16Hilt63Ggw0ZUw48YfJqyJPM4B
+        RhIcwLEX8DvJOxV/ez1J8A7GPPM3niU8icm/J+WhoKwSuYUVyJFRFVQgm8gtuiHkxVXNKL9lQMVtI2FC
+        eb0RqzbHcQB2dAnABxyC78vD/tvld3h0aFQCKm/rUFLbjJIaiWKmuklQWqNFaZ0OZXV6XKMQZTIrImI5
+        wFPEfbshF//iYfAHR4VFJdM9NeFavYEEeiEqJZReWsvdIB0TJfRzSa0O/uExHOBpeU5vt9/RD0J8QH5g
+        g79IFPdWrEwWljhEeroa1IniGp3gqszyUBGAby9fzZ4HWP9pAt1Tg1NIq2OpkFVLqKu11LWiF1XpBMuC
+        o//zFeDnZEhg+FFVQHgsGP+wGMHy0GiJkGgsUyDhUsExwcK1v+TS54fLc/51AC7XN4YfJuXtcOU5F8bI
+        8DGfy/J+hPRt6E70IOTiq9DdN0aBhQwf8y3kz/OcHgVQigf0FLl69foLYvJb569RFaoAAAAASUVORK5C
+        YII=
+</value>
+  </data>
+  <data name="barButtonItem30.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgdEVYdFRpdGxlAEJyaW5nO1RvIEZyb250O0Zyb250O09yZGVyAg10lwAAAoFJREFUOE91kelP
+        E1EUxQsIbd2+mPhZJUGNS0KMBv0zJCyByBIarBQ0LC0mLhUEQY0xCgouEYIsaorsKFuHAoJWJSH9wBLQ
+        KGiA0pZhCm1Bc3x3GHAkeJNf5uXNOefd965CKj8J/w3QngLAf6HyKyyxcDcf9aCw1IKCkm7ceMghv5hD
+        7r0Ojv3338y4BlVAXrEZyyu/4Vv+BY9vZZ3qhkFSKEkjQ+xMHhBovNuORe8yPpfr0Jt/Cj15J2G5ToTB
+        khuG7hyJa2HoNJ6grgLkAUEXC1vAL3pFke9rBXxfyuGZKGM8hXf8MTxjpfCMPoBnpAhv9KHk2iIPUGXk
+        NsDBL8F85Tg840/g/miAYNXDzRCsWRA+ZEJ4n4El2220pB8lV5A8QJ16uRYzTjfaso9hafi+KF4YYPSn
+        My5g4R2j7zyEwRw0ph4ml1IeoEzKrOCKyji0ZoVi0XYLPBPzfWnge3Xge3SYt6QwtOAHDHitPUiurQxx
+        xFT0qirGrqa0IxA+GeHq1sLFnWUkw2XWwNnF6Exi+6kwafajo3d4fcRiG1IrqrpzhzDfrxfFzo5EONsT
+        4GiPh6MtDnNvz7B1Il7Gh8DFC7h6p41MgfIAda3mADslBQ4mnmuNlYiBvTka9qYozLbEoCY2GJPTDmQX
+        NJMp6J+AVwkh7KTEVXEjEYmZhghGOGbrwzFTdxqV0fswMTWL9Jx6MqnkAcry6GCuigmIyqi9Is8jV6mg
+        b8QemAzhGPtuh+6SiUxqecDaY25n7JDYbWq24ttPO4ZGpzA09gO2iWmMTDqRnP2CTNvWAzaDlThiEmsM
+        NdDoiWokZVYhLu0ZTeHvFTaD1caudkrQWq1QKPz/AP67QEj8h3vaAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="barButtonItem30.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        WpjJnUIAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="barButtonItem31.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAF3RFWHRUaXRsZQBNZXJnZTtN
+        ZXJnZUNlbGxzO9/OO0QAAAJMSURBVDhPpdPtS1NRHAfwA1kUVP/HSmysfyXnfEii1BetWq0JszRtD2ma
+        biuCIoJYPtxN8anhZkw3CUsSclMiwY3eZ3PPbrsG337n3LvyRUTQ4MP3PPzOuedyzxj9jpAacvQfHVPx
+        dg1zuINRp+ctqhxunouUv9mFEOwuSlcQtpEQCaJ36M0Kc9JksXxAZBQoC/sHePfxK4qUhZKK2itrSUoZ
+        RerzOZ59jxbAbK4QFclI58vYy5WRLVSwGN1GjorzRRk5VSj6RYxV+/vlH3g58QHsPh0l8j4J7+Q6vFPr
+        orDjqQ4dT86j/bGOaNFG2ebR4YpHi8vuc8IlF1cH1ju8gDztnMpVhGxBpgVaRJOdh1gUCQsiHLV5tg7T
+        BvcGA+KoKTp+KstfQRZP4EW+zRb44s3wE56cJLIJy4nbaBmkDboHAnTsbXqfNSEQ/ozWkTpRIMUbIcUa
+        MVHNmIEouZQwo2mgFqyrfx7ZYgXfM2Xsqie4OFQnCnjheEyPsQ3FqGpsox5LO7dg6D8LZnXOIUOLdvkG
+        mRIy+QqaH9aKgqrwoQzv3Pyl3qEB67TPYDa0heevV/HMu4q5xS2xs/DgDBqIwUFJ9LSgwa7BBZsGesKT
+        WWzT4qnf0iWB34WZ4CbS9EUEmuOmg3FxV8R9oT6/C54Xy2DmvilaVBGDe1mFNL+htpXLxb/O+OwnSuVT
+        8+Tz1+5IYEbraMTUMwlTjx+mbj9ukOvcXZ9KokKfokuCkRYZuyZw1Sqh3fwqSn8odpycJKf+4vQf8PET
+        DMB/APsJckKsQ7QhL6EAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="barButtonItem31.LargeGlyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
 </value>
   </data>
   <metadata name="ribbonMiniToolbar1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>576, 55</value>
+    <value>17, 101</value>
   </metadata>
   <metadata name="xrDesignDockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1065, 17</value>
+    <value>207, 59</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>57</value>
+    <value>171</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1565,7 +1724,7 @@
 </value>
   </data>
   <metadata name="galleryDropDown1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>530, 17</value>
+    <value>636, 17</value>
   </metadata>
   <data name="barButtonItem2.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1603,7 +1762,7 @@
 </value>
   </data>
   <metadata name="defaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>353, 17</value>
+    <value>422, 17</value>
   </metadata>
   <data name="barButtonItem3.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1733,19 +1892,19 @@
 </value>
   </data>
   <metadata name="reportDesigner1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>205, 17</value>
+    <value>245, 17</value>
   </metadata>
   <metadata name="popupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 55</value>
+    <value>441, 59</value>
   </metadata>
   <metadata name="galleryDropDown2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>149, 55</value>
+    <value>598, 59</value>
   </metadata>
   <metadata name="popupMenu2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>312, 55</value>
+    <value>794, 59</value>
   </metadata>
   <metadata name="popupMenu3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>444, 55</value>
+    <value>951, 59</value>
   </metadata>
   <data name="barButtonItem15.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1788,4 +1947,7 @@
         z5X+PxSF4t+qN/szT9oWSwAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>217, 101</value>
+  </metadata>
 </root>