功率数据管理 增加线路选择、导入功能

DPTools/DevFrmMain.Designer.cs

@@ -726,8 +726,7 @@
             this.repositoryItemCheckEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.panelControl5 = new DevExpress.XtraEditors.PanelControl();
             this.DWGLdelBtn = new DevExpress.XtraEditors.SimpleButton();
-            this.DWGLcheckBtn = new DevExpress.XtraEditors.CheckEdit();
-            this.DWGLopenfileBtn = new DevExpress.XtraEditors.SimpleButton();
+            this.DWGLimportfileBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWGLanalysisBtn = new DevExpress.XtraEditors.SimpleButton();
             this.xtraTabPageQK = new DevExpress.XtraTab.XtraTabPage();
             this.gridControl5 = new DevExpress.XtraGrid.GridControl();
@@ -745,8 +744,7 @@
             this.repositoryItemCheckEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.panelControl6 = new DevExpress.XtraEditors.PanelControl();
             this.DWQKdelBtn = new DevExpress.XtraEditors.SimpleButton();
-            this.checkEdit1 = new DevExpress.XtraEditors.CheckEdit();
-            this.DWQKopenfileBtn = new DevExpress.XtraEditors.SimpleButton();
+            this.DWQKimportfileBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWQKanalysisBtn = new DevExpress.XtraEditors.SimpleButton();
             this.xtraTabPageDWZS = new DevExpress.XtraTab.XtraTabPage();
             this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
@@ -819,14 +817,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).BeginInit();
             this.panelControl5.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.DWGLcheckBtn.Properties)).BeginInit();
             this.xtraTabPageQK.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gridControl5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl6)).BeginInit();
             this.panelControl6.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // xrDesignRibbonController1
@@ -1016,7 +1012,6 @@
             this.barButtonItem30,
             this.barButtonItem31});
             this.ribbon.Location = new System.Drawing.Point(0, 0);
-            this.ribbon.Margin = new System.Windows.Forms.Padding(4);
             this.ribbon.MaxItemId = 216;
             this.ribbon.MiniToolbars.Add(this.ribbonMiniToolbar1);
             this.ribbon.Name = "ribbon";
@@ -1033,7 +1028,7 @@
             this.repositoryItemCheckedComboBoxEdit1,
             this.repositoryItemCheckEdit1});
             this.ribbon.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2007;
-            this.ribbon.Size = new System.Drawing.Size(1664, 188);
+            this.ribbon.Size = new System.Drawing.Size(1331, 148);
             this.ribbon.StatusBar = this.ribbonStatusBar;
             this.ribbon.TransparentEditors = true;
             this.ribbon.Click += new System.EventHandler(this.ribbon_Click);
@@ -3767,11 +3762,10 @@
             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, 840);
-            this.ribbonStatusBar.Margin = new System.Windows.Forms.Padding(4);
+            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 673);
             this.ribbonStatusBar.Name = "ribbonStatusBar";
             this.ribbonStatusBar.Ribbon = this.ribbon;
-            this.ribbonStatusBar.Size = new System.Drawing.Size(1664, 41);
+            this.ribbonStatusBar.Size = new System.Drawing.Size(1331, 32);
             this.ribbonStatusBar.Visible = false;
             // 
             // xrDesignDockManager1
@@ -4085,31 +4079,27 @@
             // 
             // xtraTabDataManager
             // 
-            this.xtraTabDataManager.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabDataManager.Name = "xtraTabDataManager";
-            this.xtraTabDataManager.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabDataManager.Size = new System.Drawing.Size(1325, 496);
             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(1657, 616);
+            this.xtraTabPageLGL.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageLGL.Text = "轮轨力数据分析";
             // 
             // gridControl3
             // 
             this.gridControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
-            this.gridControl3.Location = new System.Drawing.Point(0, 60);
+            this.gridControl3.Location = new System.Drawing.Point(0, 48);
             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(1657, 556);
+            this.gridControl3.Size = new System.Drawing.Size(1325, 448);
             this.gridControl3.TabIndex = 15;
             this.gridControl3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView3});
@@ -4278,27 +4268,24 @@
             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(1657, 60);
+            this.panelControl4.Size = new System.Drawing.Size(1325, 48);
             this.panelControl4.TabIndex = 11;
             // 
             // LGLTQBtn
             // 
-            this.LGLTQBtn.Location = new System.Drawing.Point(432, 19);
-            this.LGLTQBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLTQBtn.Location = new System.Drawing.Point(346, 15);
             this.LGLTQBtn.Name = "LGLTQBtn";
-            this.LGLTQBtn.Size = new System.Drawing.Size(94, 29);
+            this.LGLTQBtn.Size = new System.Drawing.Size(75, 23);
             this.LGLTQBtn.TabIndex = 5;
             this.LGLTQBtn.Text = "轮轨力分析";
             this.LGLTQBtn.Click += new System.EventHandler(this.LGLTQBtn_Click);
             // 
             // LGLFXBtn
             // 
-            this.LGLFXBtn.Location = new System.Drawing.Point(571, 19);
-            this.LGLFXBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLFXBtn.Location = new System.Drawing.Point(457, 15);
             this.LGLFXBtn.Name = "LGLFXBtn";
-            this.LGLFXBtn.Size = new System.Drawing.Size(94, 29);
+            this.LGLFXBtn.Size = new System.Drawing.Size(75, 23);
             this.LGLFXBtn.TabIndex = 5;
             this.LGLFXBtn.Text = "道岔分析";
             this.LGLFXBtn.Visible = false;
@@ -4307,54 +4294,49 @@
             // 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(1522, 19);
-            this.LGLdelBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLdelBtn.Location = new System.Drawing.Point(1217, 15);
             this.LGLdelBtn.Name = "LGLdelBtn";
-            this.LGLdelBtn.Size = new System.Drawing.Size(90, 29);
+            this.LGLdelBtn.Size = new System.Drawing.Size(72, 23);
             this.LGLdelBtn.TabIndex = 5;
             this.LGLdelBtn.Text = " 删除选中";
             this.LGLdelBtn.Click += new System.EventHandler(this.DelJHFXBtn_Click);
             // 
             // LGLJCCcomboBoxEdit
             // 
-            this.LGLJCCcomboBoxEdit.Location = new System.Drawing.Point(89, 20);
-            this.LGLJCCcomboBoxEdit.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLJCCcomboBoxEdit.Location = new System.Drawing.Point(71, 16);
             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(152, 24);
+            this.LGLJCCcomboBoxEdit.Size = new System.Drawing.Size(122, 20);
             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(1345, 20);
-            this.LGLcheckEdit.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLcheckEdit.Location = new System.Drawing.Point(1075, 16);
             this.LGLcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.LGLcheckEdit.Name = "LGLcheckEdit";
             this.LGLcheckEdit.Properties.Caption = "浏览文件夹";
-            this.LGLcheckEdit.Size = new System.Drawing.Size(111, 22);
+            this.LGLcheckEdit.Size = new System.Drawing.Size(89, 19);
             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(1242, 19);
-            this.LGLOpenfileBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLOpenfileBtn.Location = new System.Drawing.Point(993, 15);
             this.LGLOpenfileBtn.Name = "LGLOpenfileBtn";
-            this.LGLOpenfileBtn.Size = new System.Drawing.Size(94, 29);
+            this.LGLOpenfileBtn.Size = new System.Drawing.Size(75, 23);
             this.LGLOpenfileBtn.TabIndex = 0;
             this.LGLOpenfileBtn.Text = "浏览";
             this.LGLOpenfileBtn.Click += new System.EventHandler(this.LGLOpenfileBtn_Click);
             // 
             // LGLgengxinBtn
             // 
-            this.LGLgengxinBtn.Location = new System.Drawing.Point(26, 19);
-            this.LGLgengxinBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLgengxinBtn.Location = new System.Drawing.Point(21, 15);
             this.LGLgengxinBtn.Name = "LGLgengxinBtn";
-            this.LGLgengxinBtn.Size = new System.Drawing.Size(55, 29);
+            this.LGLgengxinBtn.Size = new System.Drawing.Size(44, 23);
             this.LGLgengxinBtn.TabIndex = 5;
             this.LGLgengxinBtn.Text = "更新";
             this.LGLgengxinBtn.ToolTip = "更新检测车信息";
@@ -4362,10 +4344,9 @@
             // 
             // LGLjiancecheBtn
             // 
-            this.LGLjiancecheBtn.Location = new System.Drawing.Point(249, 19);
-            this.LGLjiancecheBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.LGLjiancecheBtn.Location = new System.Drawing.Point(199, 15);
             this.LGLjiancecheBtn.Name = "LGLjiancecheBtn";
-            this.LGLjiancecheBtn.Size = new System.Drawing.Size(125, 29);
+            this.LGLjiancecheBtn.Size = new System.Drawing.Size(100, 23);
             this.LGLjiancecheBtn.TabIndex = 5;
             this.LGLjiancecheBtn.Text = " 修正检测车信息";
             this.LGLjiancecheBtn.ToolTip = "修正选中文件的检测车信息";
@@ -4375,22 +4356,19 @@
             // 
             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(1657, 616);
+            this.xtraTabPageJH.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageJH.Text = "轨道几何数据分析";
             // 
             // gridControl2
             // 
             this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
-            this.gridControl2.Location = new System.Drawing.Point(0, 60);
+            this.gridControl2.Location = new System.Drawing.Point(0, 48);
             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(1657, 556);
+            this.gridControl2.Size = new System.Drawing.Size(1325, 448);
             this.gridControl2.TabIndex = 14;
             this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView2});
@@ -4572,18 +4550,16 @@
             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(1657, 60);
+            this.panelControl1.Size = new System.Drawing.Size(1325, 48);
             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(1522, 19);
-            this.JHdelBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.JHdelBtn.Location = new System.Drawing.Point(1217, 15);
             this.JHdelBtn.Name = "JHdelBtn";
-            this.JHdelBtn.Size = new System.Drawing.Size(90, 29);
+            this.JHdelBtn.Size = new System.Drawing.Size(72, 23);
             this.JHdelBtn.TabIndex = 9;
             this.JHdelBtn.Text = " 删除选中";
             this.JHdelBtn.Click += new System.EventHandler(this.DelJHFXBtn_Click);
@@ -4591,41 +4567,37 @@
             // 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(1345, 20);
-            this.JHFXcheckEdit.Margin = new System.Windows.Forms.Padding(4);
+            this.JHFXcheckEdit.Location = new System.Drawing.Point(1075, 16);
             this.JHFXcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.JHFXcheckEdit.Name = "JHFXcheckEdit";
             this.JHFXcheckEdit.Properties.Caption = "浏览文件夹";
-            this.JHFXcheckEdit.Size = new System.Drawing.Size(111, 22);
+            this.JHFXcheckEdit.Size = new System.Drawing.Size(89, 19);
             this.JHFXcheckEdit.TabIndex = 4;
             this.JHFXcheckEdit.Visible = false;
             // 
             // WXSFBtn
             // 
-            this.WXSFBtn.Location = new System.Drawing.Point(574, 19);
-            this.WXSFBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.WXSFBtn.Location = new System.Drawing.Point(459, 15);
             this.WXSFBtn.Name = "WXSFBtn";
-            this.WXSFBtn.Size = new System.Drawing.Size(94, 29);
+            this.WXSFBtn.Size = new System.Drawing.Size(75, 23);
             this.WXSFBtn.TabIndex = 5;
             this.WXSFBtn.Text = "微小算法";
             this.WXSFBtn.Click += new System.EventHandler(this.WXSFBtn_Click);
             // 
             // JHTQBtn
             // 
-            this.JHTQBtn.Location = new System.Drawing.Point(432, 19);
-            this.JHTQBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.JHTQBtn.Location = new System.Drawing.Point(346, 15);
             this.JHTQBtn.Name = "JHTQBtn";
-            this.JHTQBtn.Size = new System.Drawing.Size(94, 29);
+            this.JHTQBtn.Size = new System.Drawing.Size(75, 23);
             this.JHTQBtn.TabIndex = 5;
             this.JHTQBtn.Text = "几何分析";
             this.JHTQBtn.Click += new System.EventHandler(this.JHTQBtn_Click);
             // 
             // JHgengxinBtn
             // 
-            this.JHgengxinBtn.Location = new System.Drawing.Point(29, 19);
-            this.JHgengxinBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.JHgengxinBtn.Location = new System.Drawing.Point(23, 15);
             this.JHgengxinBtn.Name = "JHgengxinBtn";
-            this.JHgengxinBtn.Size = new System.Drawing.Size(55, 29);
+            this.JHgengxinBtn.Size = new System.Drawing.Size(44, 23);
             this.JHgengxinBtn.TabIndex = 10;
             this.JHgengxinBtn.Text = "更新";
             this.JHgengxinBtn.ToolTip = "更新检测车信息";
@@ -4633,10 +4605,9 @@
             // 
             // JHFXjiancecheBtn
             // 
-            this.JHFXjiancecheBtn.Location = new System.Drawing.Point(251, 19);
-            this.JHFXjiancecheBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.JHFXjiancecheBtn.Location = new System.Drawing.Point(201, 15);
             this.JHFXjiancecheBtn.Name = "JHFXjiancecheBtn";
-            this.JHFXjiancecheBtn.Size = new System.Drawing.Size(125, 29);
+            this.JHFXjiancecheBtn.Size = new System.Drawing.Size(100, 23);
             this.JHFXjiancecheBtn.TabIndex = 8;
             this.JHFXjiancecheBtn.Text = " 修正检测车信息";
             this.JHFXjiancecheBtn.ToolTip = "修正选中文件的检测车信息";
@@ -4645,41 +4616,38 @@
             // 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(1242, 19);
-            this.JHFXopenfileBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.JHFXopenfileBtn.Location = new System.Drawing.Point(993, 15);
             this.JHFXopenfileBtn.Name = "JHFXopenfileBtn";
-            this.JHFXopenfileBtn.Size = new System.Drawing.Size(94, 29);
+            this.JHFXopenfileBtn.Size = new System.Drawing.Size(75, 23);
             this.JHFXopenfileBtn.TabIndex = 0;
             this.JHFXopenfileBtn.Text = "浏览";
             this.JHFXopenfileBtn.Click += new System.EventHandler(this.JHFXopenfileBtn_Click);
             // 
             // JHFXJCCcomboBoxEdit
             // 
-            this.JHFXJCCcomboBoxEdit.Location = new System.Drawing.Point(91, 20);
-            this.JHFXJCCcomboBoxEdit.Margin = new System.Windows.Forms.Padding(4);
+            this.JHFXJCCcomboBoxEdit.Location = new System.Drawing.Point(73, 16);
             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(152, 24);
+            this.JHFXJCCcomboBoxEdit.Size = new System.Drawing.Size(122, 20);
             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(1657, 616);
+            this.xtraTabPageGJ.Size = new System.Drawing.Size(1325, 496);
             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.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.gjInform9.Name = "gjInform9";
-            this.gjInform9.Size = new System.Drawing.Size(1657, 616);
+            this.gjInform9.Size = new System.Drawing.Size(1325, 496);
             this.gjInform9.TabIndex = 0;
             this.gjInform9.Load += new System.EventHandler(this.gjInform9_Load);
             // 
@@ -4688,22 +4656,19 @@
             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(1657, 616);
+            this.xtraTabPageQX.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageQX.Text = "曲线信息管理";
             // 
             // gridControl1
             // 
             this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
-            this.gridControl1.Location = new System.Drawing.Point(0, 46);
+            this.gridControl1.Location = new System.Drawing.Point(0, 37);
             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(1657, 570);
+            this.gridControl1.Size = new System.Drawing.Size(1325, 459);
             this.gridControl1.TabIndex = 0;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.railwaybureau,
@@ -4945,10 +4910,9 @@
             // panelControl3
             // 
             this.panelControl3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelControl3.Location = new System.Drawing.Point(0, 46);
-            this.panelControl3.Margin = new System.Windows.Forms.Padding(4);
+            this.panelControl3.Location = new System.Drawing.Point(0, 37);
             this.panelControl3.Name = "panelControl3";
-            this.panelControl3.Size = new System.Drawing.Size(1657, 570);
+            this.panelControl3.Size = new System.Drawing.Size(1325, 459);
             this.panelControl3.TabIndex = 2;
             // 
             // panelControl2
@@ -4956,17 +4920,15 @@
             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(1657, 46);
+            this.panelControl2.Size = new System.Drawing.Size(1325, 37);
             this.panelControl2.TabIndex = 1;
             // 
             // deleteroebtnqx
             // 
-            this.deleteroebtnqx.Location = new System.Drawing.Point(26, 10);
-            this.deleteroebtnqx.Margin = new System.Windows.Forms.Padding(4);
+            this.deleteroebtnqx.Location = new System.Drawing.Point(21, 8);
             this.deleteroebtnqx.Name = "deleteroebtnqx";
-            this.deleteroebtnqx.Size = new System.Drawing.Size(94, 29);
+            this.deleteroebtnqx.Size = new System.Drawing.Size(75, 23);
             this.deleteroebtnqx.TabIndex = 0;
             this.deleteroebtnqx.Text = "删除选中行";
             this.deleteroebtnqx.Click += new System.EventHandler(this.deleteroebtnqx_Click);
@@ -4975,11 +4937,10 @@
             // 
             this.xtraTabControl1.ClosePageButtonShowMode = DevExpress.XtraTab.ClosePageButtonShowMode.InAllTabPageHeaders;
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 188);
-            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 148);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPageQX;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1664, 652);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1331, 525);
             this.xtraTabControl1.TabIndex = 2;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPageQX,
@@ -5001,9 +4962,8 @@
             // 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(1657, 616);
+            this.xtraTabPageDC.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageDC.Text = "道岔信息管理";
             this.xtraTabPageDC.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint);
             // 
@@ -5011,9 +4971,9 @@
             // 
             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.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.dcInform8.Name = "dcInform8";
-            this.dcInform8.Size = new System.Drawing.Size(1657, 616);
+            this.dcInform8.Size = new System.Drawing.Size(1325, 496);
             this.dcInform8.TabIndex = 0;
             this.dcInform8.Load += new System.EventHandler(this.dcInform8_Load);
             // 
@@ -5021,21 +4981,20 @@
             // 
             this.xtraTabPageGLData.Controls.Add(this.gridControl6);
             this.xtraTabPageGLData.Controls.Add(this.panelControl7);
+            this.xtraTabPageGLData.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageGLData.Name = "xtraTabPageGLData";
-            this.xtraTabPageGLData.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageGLData.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageGLData.Text = "功率数据管理";
             // 
             // gridControl6
             // 
             this.gridControl6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl6.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
-            this.gridControl6.Location = new System.Drawing.Point(0, 60);
+            this.gridControl6.Location = new System.Drawing.Point(0, 48);
             this.gridControl6.MainView = this.gridView6;
-            this.gridControl6.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl6.Name = "gridControl6";
             this.gridControl6.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit6});
-            this.gridControl6.Size = new System.Drawing.Size(1657, 556);
+            this.gridControl6.Size = new System.Drawing.Size(1325, 448);
             this.gridControl6.TabIndex = 20;
             this.gridControl6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView6});
@@ -5115,18 +5074,16 @@
             this.panelControl7.Controls.Add(this.deleteGLdata);
             this.panelControl7.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl7.Location = new System.Drawing.Point(0, 0);
-            this.panelControl7.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl7.Name = "panelControl7";
-            this.panelControl7.Size = new System.Drawing.Size(1657, 60);
+            this.panelControl7.Size = new System.Drawing.Size(1325, 48);
             this.panelControl7.TabIndex = 19;
             // 
             // importGLData
             // 
             this.importGLData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.importGLData.Location = new System.Drawing.Point(1415, 19);
-            this.importGLData.Margin = new System.Windows.Forms.Padding(4);
+            this.importGLData.Location = new System.Drawing.Point(1131, 15);
             this.importGLData.Name = "importGLData";
-            this.importGLData.Size = new System.Drawing.Size(90, 29);
+            this.importGLData.Size = new System.Drawing.Size(72, 23);
             this.importGLData.TabIndex = 6;
             this.importGLData.Text = "导入";
             this.importGLData.Click += new System.EventHandler(this.importGLData_Click);
@@ -5134,10 +5091,9 @@
             // deleteGLdata
             // 
             this.deleteGLdata.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.deleteGLdata.Location = new System.Drawing.Point(1522, 19);
-            this.deleteGLdata.Margin = new System.Windows.Forms.Padding(4);
+            this.deleteGLdata.Location = new System.Drawing.Point(1217, 15);
             this.deleteGLdata.Name = "deleteGLdata";
-            this.deleteGLdata.Size = new System.Drawing.Size(90, 29);
+            this.deleteGLdata.Size = new System.Drawing.Size(72, 23);
             this.deleteGLdata.TabIndex = 5;
             this.deleteGLdata.Text = " 删除选中";
             this.deleteGLdata.Click += new System.EventHandler(this.deleteGLdata_Click);
@@ -5146,21 +5102,20 @@
             // 
             this.xtraTabPageQKData.Controls.Add(this.gridControl7);
             this.xtraTabPageQKData.Controls.Add(this.panelControl8);
+            this.xtraTabPageQKData.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageQKData.Name = "xtraTabPageQKData";
-            this.xtraTabPageQKData.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageQKData.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageQKData.Text = "缺口数据管理";
             // 
             // gridControl7
             // 
             this.gridControl7.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl7.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
-            this.gridControl7.Location = new System.Drawing.Point(0, 60);
+            this.gridControl7.Location = new System.Drawing.Point(0, 48);
             this.gridControl7.MainView = this.gridView7;
-            this.gridControl7.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl7.Name = "gridControl7";
             this.gridControl7.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit7});
-            this.gridControl7.Size = new System.Drawing.Size(1657, 556);
+            this.gridControl7.Size = new System.Drawing.Size(1325, 448);
             this.gridControl7.TabIndex = 22;
             this.gridControl7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView7});
@@ -5250,51 +5205,45 @@
             this.panelControl8.Controls.Add(this.deleteQKdata);
             this.panelControl8.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl8.Location = new System.Drawing.Point(0, 0);
-            this.panelControl8.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl8.Name = "panelControl8";
-            this.panelControl8.Size = new System.Drawing.Size(1657, 60);
+            this.panelControl8.Size = new System.Drawing.Size(1325, 48);
             this.panelControl8.TabIndex = 21;
             // 
             // simpleButton1
             // 
             this.simpleButton1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.simpleButton1.Location = new System.Drawing.Point(1415, 19);
-            this.simpleButton1.Margin = new System.Windows.Forms.Padding(4);
+            this.simpleButton1.Location = new System.Drawing.Point(1131, 15);
             this.simpleButton1.Name = "simpleButton1";
-            this.simpleButton1.Size = new System.Drawing.Size(90, 29);
+            this.simpleButton1.Size = new System.Drawing.Size(72, 23);
             this.simpleButton1.TabIndex = 6;
             this.simpleButton1.Text = "导入";
             // 
             // deleteQKdata
             // 
             this.deleteQKdata.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.deleteQKdata.Location = new System.Drawing.Point(1522, 19);
-            this.deleteQKdata.Margin = new System.Windows.Forms.Padding(4);
+            this.deleteQKdata.Location = new System.Drawing.Point(1217, 15);
             this.deleteQKdata.Name = "deleteQKdata";
-            this.deleteQKdata.Size = new System.Drawing.Size(90, 29);
+            this.deleteQKdata.Size = new System.Drawing.Size(72, 23);
             this.deleteQKdata.TabIndex = 5;
             this.deleteQKdata.Text = " 删除选中";
             this.deleteQKdata.Click += new System.EventHandler(this.deleteQKdata_Click);
             // 
             // xtraTabPageMTLF
             // 
-            this.xtraTabPageMTLF.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageMTLF.Name = "xtraTabPageMTLF";
-            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageMTLF.Text = "密贴离缝";
             // 
             // xtraTabPageZZJH
             // 
-            this.xtraTabPageZZJH.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageZZJH.Name = "xtraTabPageZZJH";
-            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageZZJH.Text = "逐枕几何";
             // 
             // xtraTabPageXXXW
             // 
-            this.xtraTabPageXXXW.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPageXXXW.Name = "xtraTabPageXXXW";
-            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageXXXW.Text = "线形线位";
             // 
             // xtraTabPageGL
@@ -5303,23 +5252,22 @@
             this.xtraTabPageGL.Controls.Add(this.panelControl5);
             this.xtraTabPageGL.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageGL.Name = "xtraTabPageGL";
-            this.xtraTabPageGL.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageGL.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageGL.Text = "功率分析";
             // 
             // gridControl4
             // 
             this.gridControl4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl4.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
-            this.gridControl4.Location = new System.Drawing.Point(0, 60);
+            this.gridControl4.Location = new System.Drawing.Point(0, 48);
             this.gridControl4.MainView = this.gridView4;
-            this.gridControl4.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl4.Name = "gridControl4";
             this.gridControl4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit4});
-            this.gridControl4.Size = new System.Drawing.Size(1657, 556);
+            this.gridControl4.Size = new System.Drawing.Size(1325, 448);
             this.gridControl4.TabIndex = 16;
             this.gridControl4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView4});
+            this.gridControl4.Click += new System.EventHandler(this.gridControl4_Click);
             // 
             // gridView4
             // 
@@ -5451,56 +5399,39 @@
             // panelControl5
             // 
             this.panelControl5.Controls.Add(this.DWGLdelBtn);
-            this.panelControl5.Controls.Add(this.DWGLcheckBtn);
-            this.panelControl5.Controls.Add(this.DWGLopenfileBtn);
+            this.panelControl5.Controls.Add(this.DWGLimportfileBtn);
             this.panelControl5.Controls.Add(this.DWGLanalysisBtn);
             this.panelControl5.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl5.Location = new System.Drawing.Point(0, 0);
-            this.panelControl5.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl5.Name = "panelControl5";
-            this.panelControl5.Size = new System.Drawing.Size(1657, 60);
+            this.panelControl5.Size = new System.Drawing.Size(1325, 48);
             this.panelControl5.TabIndex = 12;
             // 
             // DWGLdelBtn
             // 
             this.DWGLdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWGLdelBtn.Location = new System.Drawing.Point(1522, 19);
-            this.DWGLdelBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.DWGLdelBtn.Location = new System.Drawing.Point(1217, 15);
             this.DWGLdelBtn.Name = "DWGLdelBtn";
-            this.DWGLdelBtn.Size = new System.Drawing.Size(90, 29);
+            this.DWGLdelBtn.Size = new System.Drawing.Size(72, 23);
             this.DWGLdelBtn.TabIndex = 5;
             this.DWGLdelBtn.Text = " 删除选中";
             this.DWGLdelBtn.Click += new System.EventHandler(this.DWGLdelBtn_Click);
             // 
-            // DWGLcheckBtn
-            // 
-            this.DWGLcheckBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWGLcheckBtn.Location = new System.Drawing.Point(1345, 20);
-            this.DWGLcheckBtn.Margin = new System.Windows.Forms.Padding(4);
-            this.DWGLcheckBtn.MenuManager = this.xrDesignRibbonController1;
-            this.DWGLcheckBtn.Name = "DWGLcheckBtn";
-            this.DWGLcheckBtn.Properties.Caption = "浏览文件夹";
-            this.DWGLcheckBtn.Size = new System.Drawing.Size(111, 22);
-            this.DWGLcheckBtn.TabIndex = 5;
-            this.DWGLcheckBtn.Visible = false;
-            // 
-            // DWGLopenfileBtn
-            // 
-            this.DWGLopenfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWGLopenfileBtn.Location = new System.Drawing.Point(1242, 19);
-            this.DWGLopenfileBtn.Margin = new System.Windows.Forms.Padding(4);
-            this.DWGLopenfileBtn.Name = "DWGLopenfileBtn";
-            this.DWGLopenfileBtn.Size = new System.Drawing.Size(94, 29);
-            this.DWGLopenfileBtn.TabIndex = 0;
-            this.DWGLopenfileBtn.Text = "浏览";
-            this.DWGLopenfileBtn.Click += new System.EventHandler(this.DWGLopenfileBtn_Click);
+            // DWGLimportfileBtn
+            // 
+            this.DWGLimportfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.DWGLimportfileBtn.Location = new System.Drawing.Point(993, 15);
+            this.DWGLimportfileBtn.Name = "DWGLimportfileBtn";
+            this.DWGLimportfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.DWGLimportfileBtn.TabIndex = 0;
+            this.DWGLimportfileBtn.Text = "导入";
+            this.DWGLimportfileBtn.Click += new System.EventHandler(this.DWGLopenfileBtn_Click);
             // 
             // DWGLanalysisBtn
             // 
-            this.DWGLanalysisBtn.Location = new System.Drawing.Point(27, 16);
-            this.DWGLanalysisBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.DWGLanalysisBtn.Location = new System.Drawing.Point(22, 13);
             this.DWGLanalysisBtn.Name = "DWGLanalysisBtn";
-            this.DWGLanalysisBtn.Size = new System.Drawing.Size(125, 29);
+            this.DWGLanalysisBtn.Size = new System.Drawing.Size(100, 23);
             this.DWGLanalysisBtn.TabIndex = 5;
             this.DWGLanalysisBtn.Text = "分析算法";
             this.DWGLanalysisBtn.ToolTip = "未定义";
@@ -5511,21 +5442,19 @@
             this.xtraTabPageQK.Controls.Add(this.panelControl6);
             this.xtraTabPageQK.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageQK.Name = "xtraTabPageQK";
-            this.xtraTabPageQK.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageQK.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageQK.Text = "缺口分析";
             this.xtraTabPageQK.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint_1);
             // 
             // gridControl5
             // 
             this.gridControl5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl5.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
-            this.gridControl5.Location = new System.Drawing.Point(0, 60);
+            this.gridControl5.Location = new System.Drawing.Point(0, 48);
             this.gridControl5.MainView = this.gridView5;
-            this.gridControl5.Margin = new System.Windows.Forms.Padding(4);
             this.gridControl5.Name = "gridControl5";
             this.gridControl5.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit5});
-            this.gridControl5.Size = new System.Drawing.Size(1657, 556);
+            this.gridControl5.Size = new System.Drawing.Size(1325, 448);
             this.gridControl5.TabIndex = 18;
             this.gridControl5.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView5});
@@ -5662,55 +5591,38 @@
             // panelControl6
             // 
             this.panelControl6.Controls.Add(this.DWQKdelBtn);
-            this.panelControl6.Controls.Add(this.checkEdit1);
-            this.panelControl6.Controls.Add(this.DWQKopenfileBtn);
+            this.panelControl6.Controls.Add(this.DWQKimportfileBtn);
             this.panelControl6.Controls.Add(this.DWQKanalysisBtn);
             this.panelControl6.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl6.Location = new System.Drawing.Point(0, 0);
-            this.panelControl6.Margin = new System.Windows.Forms.Padding(4);
             this.panelControl6.Name = "panelControl6";
-            this.panelControl6.Size = new System.Drawing.Size(1657, 60);
+            this.panelControl6.Size = new System.Drawing.Size(1325, 48);
             this.panelControl6.TabIndex = 17;
             // 
             // DWQKdelBtn
             // 
             this.DWQKdelBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWQKdelBtn.Location = new System.Drawing.Point(1522, 19);
-            this.DWQKdelBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.DWQKdelBtn.Location = new System.Drawing.Point(1217, 15);
             this.DWQKdelBtn.Name = "DWQKdelBtn";
-            this.DWQKdelBtn.Size = new System.Drawing.Size(90, 29);
+            this.DWQKdelBtn.Size = new System.Drawing.Size(72, 23);
             this.DWQKdelBtn.TabIndex = 5;
             this.DWQKdelBtn.Text = " 删除选中";
             // 
-            // checkEdit1
-            // 
-            this.checkEdit1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.checkEdit1.Location = new System.Drawing.Point(1345, 20);
-            this.checkEdit1.Margin = new System.Windows.Forms.Padding(4);
-            this.checkEdit1.MenuManager = this.xrDesignRibbonController1;
-            this.checkEdit1.Name = "checkEdit1";
-            this.checkEdit1.Properties.Caption = "浏览文件夹";
-            this.checkEdit1.Size = new System.Drawing.Size(111, 22);
-            this.checkEdit1.TabIndex = 5;
-            this.checkEdit1.Visible = false;
-            // 
-            // DWQKopenfileBtn
-            // 
-            this.DWQKopenfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.DWQKopenfileBtn.Location = new System.Drawing.Point(1242, 19);
-            this.DWQKopenfileBtn.Margin = new System.Windows.Forms.Padding(4);
-            this.DWQKopenfileBtn.Name = "DWQKopenfileBtn";
-            this.DWQKopenfileBtn.Size = new System.Drawing.Size(94, 29);
-            this.DWQKopenfileBtn.TabIndex = 0;
-            this.DWQKopenfileBtn.Text = "浏览";
-            this.DWQKopenfileBtn.Click += new System.EventHandler(this.DWQKopenfileBtn_Click);
+            // DWQKimportfileBtn
+            // 
+            this.DWQKimportfileBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.DWQKimportfileBtn.Location = new System.Drawing.Point(993, 15);
+            this.DWQKimportfileBtn.Name = "DWQKimportfileBtn";
+            this.DWQKimportfileBtn.Size = new System.Drawing.Size(75, 23);
+            this.DWQKimportfileBtn.TabIndex = 0;
+            this.DWQKimportfileBtn.Text = "导入";
+            this.DWQKimportfileBtn.Click += new System.EventHandler(this.DWQKopenfileBtn_Click);
             // 
             // DWQKanalysisBtn
             // 
-            this.DWQKanalysisBtn.Location = new System.Drawing.Point(43, 19);
-            this.DWQKanalysisBtn.Margin = new System.Windows.Forms.Padding(4);
+            this.DWQKanalysisBtn.Location = new System.Drawing.Point(34, 15);
             this.DWQKanalysisBtn.Name = "DWQKanalysisBtn";
-            this.DWQKanalysisBtn.Size = new System.Drawing.Size(125, 29);
+            this.DWQKanalysisBtn.Size = new System.Drawing.Size(100, 23);
             this.DWQKanalysisBtn.TabIndex = 5;
             this.DWQKanalysisBtn.Text = "分析算法";
             this.DWQKanalysisBtn.ToolTip = "未定义";
@@ -5719,20 +5631,19 @@
             // 
             this.xtraTabPageDWZS.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageDWZS.Name = "xtraTabPageDWZS";
-            this.xtraTabPageDWZS.Size = new System.Drawing.Size(1657, 616);
+            this.xtraTabPageDWZS.Size = new System.Drawing.Size(1325, 496);
             this.xtraTabPageDWZS.Text = "电务数据展示";
             // 
             // DevFrmMain
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1664, 881);
+            this.ClientSize = new System.Drawing.Size(1331, 705);
             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;
@@ -5808,14 +5719,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).EndInit();
             this.panelControl5.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.DWGLcheckBtn.Properties)).EndInit();
             this.xtraTabPageQK.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gridControl5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl6)).EndInit();
             this.panelControl6.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -6169,8 +6078,7 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit4;
         private DevExpress.XtraEditors.PanelControl panelControl5;
         private DevExpress.XtraEditors.SimpleButton DWGLdelBtn;
-        private DevExpress.XtraEditors.CheckEdit DWGLcheckBtn;
-        private DevExpress.XtraEditors.SimpleButton DWGLopenfileBtn;
+        private DevExpress.XtraEditors.SimpleButton DWGLimportfileBtn;
         private DevExpress.XtraEditors.SimpleButton DWGLanalysisBtn;
         private DevExpress.XtraGrid.GridControl gridControl5;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView5;
@@ -6187,8 +6095,7 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit5;
         private DevExpress.XtraEditors.PanelControl panelControl6;
         private DevExpress.XtraEditors.SimpleButton DWQKdelBtn;
-        private DevExpress.XtraEditors.CheckEdit checkEdit1;
-        private DevExpress.XtraEditors.SimpleButton DWQKopenfileBtn;
+        private DevExpress.XtraEditors.SimpleButton DWQKimportfileBtn;
         private DevExpress.XtraEditors.SimpleButton DWQKanalysisBtn;
         private DevExpress.XtraBars.BarButtonItem gongLvDataSetting;
         private DevExpress.XtraBars.BarButtonItem queKouDataSetting;

DPTools/DevFrmMain.cs

@@ -750,14 +750,12 @@ namespace Uninpho.Tools
         }
         //导入文件
         private void DWGLopenfileBtn_Click(object sender, EventArgs e)
-        {//解析方式要重新写
-            List<int> indexid = new List<int>();
-            List<string> indexzt = new List<string>();
-            DACommon.getSFZT(gridView4, ref indexid, ref indexzt);
-            DACommon.OpenFile("txt", JHFXcheckEdit.Checked, gridView4);
-            List<T_file_account> daochaLists = DataAnalysisToPG.getfile("geo", indexid, indexzt) as List<T_file_account>;
-            this.gridControl2.DataSource = daochaLists;
-            DACommon.repushSFZT(gridView4, indexid);
+        {
+            ImportGLdatamanageForm frm = new ImportGLdatamanageForm();
+            frm.StartPosition = FormStartPosition.CenterParent;
+            if (frm.ShowDialog(this) == DialogResult.OK)
+            {
+            }
         }
 
         private void DWGLdelBtn_Click(object sender, EventArgs e)
@@ -931,5 +929,10 @@ namespace Uninpho.Tools
             {
             }
         }
+
+        private void gridControl4_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

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>832, 17</value>
+    <value>17, 55</value>
   </metadata>
   <metadata name="applicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1090, 17</value>
+    <value>230, 55</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">
@@ -1766,10 +1766,10 @@
 </value>
   </data>
   <metadata name="ribbonMiniToolbar1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>918, 59</value>
+    <value>444, 93</value>
   </metadata>
   <metadata name="xrDesignDockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 59</value>
+    <value>389, 55</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>113</value>
@@ -1937,7 +1937,7 @@
 </value>
   </data>
   <metadata name="galleryDropDown1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>636, 17</value>
+    <value>530, 17</value>
   </metadata>
   <data name="barButtonItem2.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1975,7 +1975,7 @@
 </value>
   </data>
   <metadata name="defaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>422, 17</value>
+    <value>353, 17</value>
   </metadata>
   <data name="barButtonItem3.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -2105,19 +2105,19 @@
 </value>
   </data>
   <metadata name="reportDesigner1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>245, 17</value>
+    <value>205, 17</value>
   </metadata>
   <metadata name="popupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>251, 59</value>
+    <value>583, 55</value>
   </metadata>
   <metadata name="galleryDropDown2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>408, 59</value>
+    <value>17, 93</value>
   </metadata>
   <metadata name="popupMenu2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>604, 59</value>
+    <value>180, 93</value>
   </metadata>
   <metadata name="popupMenu3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>761, 59</value>
+    <value>312, 93</value>
   </metadata>
   <data name="barButtonItem15.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -2161,6 +2161,6 @@
 </value>
   </data>
   <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1118, 59</value>
+    <value>614, 93</value>
   </metadata>
 </root>

DPTools/Uninpho.Railway.Tools.csproj

@@ -304,6 +304,12 @@
     <Compile Include="components\DWForm\ImportGLdataForm.Designer.cs">
       <DependentUpon>ImportGLdataForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="components\DWForm\ImportGLdatamanageForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="components\DWForm\ImportGLdatamanageForm.Designer.cs">
+      <DependentUpon>ImportGLdatamanageForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="components\LogGeneratorFun.cs" />
     <Compile Include="components\LoggingForm.cs">
       <SubType>Form</SubType>
@@ -565,6 +571,9 @@
     <EmbeddedResource Include="components\DWForm\ImportGLdataForm.resx">
       <DependentUpon>ImportGLdataForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="components\DWForm\ImportGLdatamanageForm.resx">
+      <DependentUpon>ImportGLdatamanageForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="components\LoggingForm.resx">
       <DependentUpon>LoggingForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -671,6 +680,7 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

DPTools/components/DWForm/ImportGLdataForm.Designer.cs

@@ -43,64 +43,58 @@
             // 
             // labelControl7
             // 
-            this.labelControl7.Location = new System.Drawing.Point(66, 45);
-            this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl7.Location = new System.Drawing.Point(58, 35);
             this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(60, 18);
+            this.labelControl7.Size = new System.Drawing.Size(48, 14);
             this.labelControl7.TabIndex = 5;
             this.labelControl7.Text = "线路名：";
             this.labelControl7.Click += new System.EventHandler(this.labelControl7_Click);
             // 
             // labelControl1
             // 
-            this.labelControl1.Location = new System.Drawing.Point(41, 102);
-            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.labelControl1.Location = new System.Drawing.Point(36, 79);
             this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(90, 18);
+            this.labelControl1.Size = new System.Drawing.Size(72, 14);
             this.labelControl1.TabIndex = 6;
             this.labelControl1.Text = "站（所）名：";
             this.labelControl1.Click += new System.EventHandler(this.labelControl1_Click);
             // 
             // xianlumingText
             // 
-            this.xianlumingText.Location = new System.Drawing.Point(135, 41);
-            this.xianlumingText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.xianlumingText.Location = new System.Drawing.Point(118, 32);
             this.xianlumingText.Name = "xianlumingText";
             this.xianlumingText.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.xianlumingText.Size = new System.Drawing.Size(345, 24);
+            this.xianlumingText.Size = new System.Drawing.Size(302, 20);
             this.xianlumingText.TabIndex = 3;
-            this.xianlumingText.EditValueChanged += new System.EventHandler(this.xianlumingText_TextChanged);
             this.xianlumingText.SelectedIndexChanged += new System.EventHandler(this.xianlumingText_SelectedIndexChanged);
+            this.xianlumingText.EditValueChanged += new System.EventHandler(this.xianlumingText_TextChanged);
             // 
             // zhanmingText
             // 
             this.zhanmingText.Enabled = false;
-            this.zhanmingText.Location = new System.Drawing.Point(134, 98);
-            this.zhanmingText.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.zhanmingText.Location = new System.Drawing.Point(117, 76);
             this.zhanmingText.Name = "zhanmingText";
             this.zhanmingText.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.zhanmingText.Size = new System.Drawing.Size(346, 24);
+            this.zhanmingText.Size = new System.Drawing.Size(303, 20);
             this.zhanmingText.TabIndex = 4;
             this.zhanmingText.SelectedIndexChanged += new System.EventHandler(this.zhanmingText_SelectedIndexChanged);
             // 
             // NewcancelBtn
             // 
-            this.NewcancelBtn.Location = new System.Drawing.Point(407, 223);
-            this.NewcancelBtn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.NewcancelBtn.Location = new System.Drawing.Point(356, 173);
             this.NewcancelBtn.Name = "NewcancelBtn";
-            this.NewcancelBtn.Size = new System.Drawing.Size(73, 28);
+            this.NewcancelBtn.Size = new System.Drawing.Size(64, 22);
             this.NewcancelBtn.TabIndex = 7;
             this.NewcancelBtn.Text = "取消";
             this.NewcancelBtn.Click += new System.EventHandler(this.NewcancelBtn_Click);
             // 
             // newCreateBtnSon
             // 
-            this.newCreateBtnSon.Location = new System.Drawing.Point(285, 223);
-            this.newCreateBtnSon.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.newCreateBtnSon.Location = new System.Drawing.Point(249, 173);
             this.newCreateBtnSon.Name = "newCreateBtnSon";
-            this.newCreateBtnSon.Size = new System.Drawing.Size(73, 28);
+            this.newCreateBtnSon.Size = new System.Drawing.Size(64, 22);
             this.newCreateBtnSon.TabIndex = 8;
             this.newCreateBtnSon.Text = "导入";
             this.newCreateBtnSon.Click += new System.EventHandler(this.newCreateBtnSon_Click);
@@ -108,20 +102,18 @@
             // simpleButton2
             // 
             this.simpleButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.simpleButton2.Location = new System.Drawing.Point(395, 153);
-            this.simpleButton2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.simpleButton2.Location = new System.Drawing.Point(346, 119);
             this.simpleButton2.Name = "simpleButton2";
-            this.simpleButton2.Size = new System.Drawing.Size(86, 30);
+            this.simpleButton2.Size = new System.Drawing.Size(75, 23);
             this.simpleButton2.TabIndex = 7;
             this.simpleButton2.Text = "浏览...";
             this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
             // 
             // lblShow
             // 
-            this.lblShow.Location = new System.Drawing.Point(51, 160);
-            this.lblShow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.lblShow.Location = new System.Drawing.Point(45, 124);
             this.lblShow.Name = "lblShow";
-            this.lblShow.Size = new System.Drawing.Size(65, 18);
+            this.lblShow.Size = new System.Drawing.Size(52, 14);
             this.lblShow.TabIndex = 10;
             this.lblShow.Text = "文件目录:";
             this.lblShow.Click += new System.EventHandler(this.lblShow_Click);
@@ -130,18 +122,17 @@
             // 
             this.txtindir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtindir.Location = new System.Drawing.Point(136, 155);
-            this.txtindir.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.txtindir.Location = new System.Drawing.Point(119, 121);
             this.txtindir.Name = "txtindir";
-            this.txtindir.Size = new System.Drawing.Size(252, 26);
+            this.txtindir.Size = new System.Drawing.Size(221, 22);
             this.txtindir.TabIndex = 4;
             this.txtindir.TextChanged += new System.EventHandler(this.txtindir_TextChanged);
             // 
             // ImportGLdataForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(531, 281);
+            this.ClientSize = new System.Drawing.Size(465, 219);
             this.Controls.Add(this.simpleButton2);
             this.Controls.Add(this.lblShow);
             this.Controls.Add(this.NewcancelBtn);
@@ -151,6 +142,7 @@
             this.Controls.Add(this.labelControl1);
             this.Controls.Add(this.xianlumingText);
             this.Controls.Add(this.zhanmingText);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "ImportGLdataForm";

DPTools/components/DWForm/ImportGLdatamanageForm.Designer.cs

@@ -0,0 +1,162 @@
+namespace Uninpho.Tools.components.DWForm
+{
+    partial class ImportGLdatamanageForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
+            this.lblShow = new DevExpress.XtraEditors.LabelControl();
+            this.NewcancelBtn = new DevExpress.XtraEditors.SimpleButton();
+            this.newCreateBtnSon = new DevExpress.XtraEditors.SimpleButton();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.txtindir = new System.Windows.Forms.TextBox();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.xianlumingText = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.zhanmingText = new DevExpress.XtraEditors.ComboBoxEdit();
+            ((System.ComponentModel.ISupportInitialize)(this.xianlumingText.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.zhanmingText.Properties)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // simpleButton2
+            // 
+            this.simpleButton2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.simpleButton2.Location = new System.Drawing.Point(409, 159);
+            this.simpleButton2.Name = "simpleButton2";
+            this.simpleButton2.Size = new System.Drawing.Size(87, 27);
+            this.simpleButton2.TabIndex = 16;
+            this.simpleButton2.Text = "浏览...";
+            this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
+            // 
+            // lblShow
+            // 
+            this.lblShow.Location = new System.Drawing.Point(58, 164);
+            this.lblShow.Name = "lblShow";
+            this.lblShow.Size = new System.Drawing.Size(52, 14);
+            this.lblShow.TabIndex = 19;
+            this.lblShow.Text = "文件目录:";
+            // 
+            // NewcancelBtn
+            // 
+            this.NewcancelBtn.Location = new System.Drawing.Point(421, 222);
+            this.NewcancelBtn.Name = "NewcancelBtn";
+            this.NewcancelBtn.Size = new System.Drawing.Size(75, 26);
+            this.NewcancelBtn.TabIndex = 17;
+            this.NewcancelBtn.Text = "取消";
+            this.NewcancelBtn.Click += new System.EventHandler(this.NewcancelBtn_Click);
+            // 
+            // newCreateBtnSon
+            // 
+            this.newCreateBtnSon.Location = new System.Drawing.Point(296, 222);
+            this.newCreateBtnSon.Name = "newCreateBtnSon";
+            this.newCreateBtnSon.Size = new System.Drawing.Size(75, 26);
+            this.newCreateBtnSon.TabIndex = 18;
+            this.newCreateBtnSon.Text = "导入";
+            this.newCreateBtnSon.Click += new System.EventHandler(this.newCreateBtnSon_Click);
+            // 
+            // labelControl7
+            // 
+            this.labelControl7.Location = new System.Drawing.Point(73, 61);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(48, 14);
+            this.labelControl7.TabIndex = 14;
+            this.labelControl7.Text = "线路名：";
+            // 
+            // txtindir
+            // 
+            this.txtindir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtindir.Location = new System.Drawing.Point(145, 161);
+            this.txtindir.Name = "txtindir";
+            this.txtindir.Size = new System.Drawing.Size(257, 22);
+            this.txtindir.TabIndex = 12;
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Location = new System.Drawing.Point(48, 112);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(72, 14);
+            this.labelControl1.TabIndex = 15;
+            this.labelControl1.Text = "站（所）名：";
+            // 
+            // xianlumingText
+            // 
+            this.xianlumingText.Location = new System.Drawing.Point(143, 57);
+            this.xianlumingText.Name = "xianlumingText";
+            this.xianlumingText.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.xianlumingText.Size = new System.Drawing.Size(352, 20);
+            this.xianlumingText.TabIndex = 11;
+            this.xianlumingText.SelectedIndexChanged += new System.EventHandler(this.xianlumingText_SelectedIndexChanged);
+            this.xianlumingText.EditValueChanged += new System.EventHandler(this.xianlumingText_EditValueChanged);
+            // 
+            // zhanmingText
+            // 
+            this.zhanmingText.Enabled = false;
+            this.zhanmingText.Location = new System.Drawing.Point(142, 108);
+            this.zhanmingText.Name = "zhanmingText";
+            this.zhanmingText.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.zhanmingText.Size = new System.Drawing.Size(353, 20);
+            this.zhanmingText.TabIndex = 13;
+            // 
+            // ImportGLdatamanageForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(544, 304);
+            this.Controls.Add(this.simpleButton2);
+            this.Controls.Add(this.lblShow);
+            this.Controls.Add(this.NewcancelBtn);
+            this.Controls.Add(this.newCreateBtnSon);
+            this.Controls.Add(this.labelControl7);
+            this.Controls.Add(this.txtindir);
+            this.Controls.Add(this.labelControl1);
+            this.Controls.Add(this.xianlumingText);
+            this.Controls.Add(this.zhanmingText);
+            this.Name = "ImportGLdatamanageForm";
+            this.Text = "导入数据";
+            this.Load += new System.EventHandler(this.ImportGLdatamanageForm_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.xianlumingText.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.zhanmingText.Properties)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraEditors.SimpleButton simpleButton2;
+        private DevExpress.XtraEditors.LabelControl lblShow;
+        private DevExpress.XtraEditors.SimpleButton NewcancelBtn;
+        private DevExpress.XtraEditors.SimpleButton newCreateBtnSon;
+        private DevExpress.XtraEditors.LabelControl labelControl7;
+        private System.Windows.Forms.TextBox txtindir;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.ComboBoxEdit xianlumingText;
+        private DevExpress.XtraEditors.ComboBoxEdit zhanmingText;
+    }
+}

DPTools/components/DWForm/ImportGLdatamanageForm.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using Uninpho.DBOperation.Model;
+using System.IO;
+using Uninpho.DBOperation.Operation;
+using System.Text.RegularExpressions;
+using System.Reflection;
+
+namespace Uninpho.Tools.components.DWForm
+{
+    public partial class ImportGLdatamanageForm : DevExpress.XtraEditors.XtraForm
+    {
+        public ImportGLdatamanageForm()
+        {
+            InitializeComponent();
+        }
+
+       /// 浏览文件目录
+        private void simpleButton2_Click(object sender, EventArgs e)
+        {
+            // 创建一个OpenFileDialog实例  
+            OpenFileDialog openFileDialog = new OpenFileDialog
+            {
+                // 设置文件对话框的标题  
+                Title = "选择文件",
+
+                // 初始目录，可选  
+                InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
+
+                // 设置过滤条件，只显示文本文件，可以根据需要修改  
+                Filter = "文本 (*.txt)|*.txt"
+            };
+
+            // 显示文件对话框并检查用户是否选择了文件  
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                // 将选择的文件路径写入文本框  
+                txtindir.Text = openFileDialog.FileName;
+            }
+        }
+
+        /// 导入数据
+        private void newCreateBtnSon_Click(object sender, EventArgs e)
+        {
+                
+        }
+
+        ///取消
+        private void NewcancelBtn_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        ///关联数据库
+        /// 电务/缺口
+        List<T_dwfile_account> dwglData = new List<T_dwfile_account>();
+      
+        private void xianlumingText_SelectedIndexChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        ///初始界面加载
+        private void ImportGLdatamanageForm_Load(object sender, EventArgs e)
+        {
+            dwglData = DBOperation.Operation.DataAnalysisToPG.QueryDWGLALL();
+            //整理线路名集合
+            var listtgXLMALL = dwglData.GroupBy(c => c.Xianlu).Select(c => c.First()).ToList();
+            foreach (var item in listtgXLMALL)
+            {
+                xianlumingText.Properties.Items.Add(item.Xianlu);
+            }
+        }
+
+        ///线路名下拉选择
+        private void xianlumingText_EditValueChanged(object sender, EventArgs e)
+        {
+            zhanmingText.Properties.Items.Clear();
+            var isInputTrueXLM = dwglData.FindAll(delegate (T_dwfile_account dwgl)
+            {
+                return dwgl.Xianlu == xianlumingText.Text;
+            });
+            //线路名
+            if (isInputTrueXLM.Count != 0)
+            {
+                var listtg = isInputTrueXLM.GroupBy(c => c.Chezhan).Select(c => c.First()).ToList();
+                foreach (var item in listtg)
+                {
+                    zhanmingText.Properties.Items.Add(item.Chezhan);
+                }
+                zhanmingText.Enabled = true;
+            }
+            else
+            {
+                zhanmingText.Enabled = false;
+            }
+            zhanmingText.Text = "";
+        }
+    
+    }
+}

DPTools/components/DWForm/ImportGLdatamanageForm.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Uninpho.DBOperation/Model/T_dwfile_account .cs

@@ -9,13 +9,13 @@ namespace Uninpho.DBOperation.Model
         public int Id { get; set; }
         public string Xianlu { get; set; }
         public string Chezhan { get; set; }
-        public DateTime StartTime { get; set; }
-        public DateTime EndTime { get; set; }
-        public string FileName { get; set; }
-        public string FileSize { get; set; }
-        public string FileStatusc { get; set; }
-        public string FileStatus { get; set; }
-        public string TaskStatus { get; set; }
+        public DateTime Starttime { get; set; }
+        public DateTime Endtime { get; set; }
+        public string Filename { get; set; }
+        public string Filesize { get; set; }
+        public string Remark { get; set; }
+        public string Filestatus { get; set; }
+        public string Taskstatus { get; set; }
         public string Srlj { get; set; }
     }
 }

Uninpho.DBOperation/Operation/DataAnalysisToPG.cs

@@ -59,7 +59,7 @@ namespace Uninpho.DBOperation.Operation
             {
                 if (!File.Exists(obj[i].Srlj))
                 {
-                    obj[i].FileStatus = "文件未找到";
+                    obj[i].Filestatus = "文件未找到";
                 }
 
                 ///for (int j = 0; j < suanfarunid.Count; j++)
@@ -564,6 +564,13 @@ namespace Uninpho.DBOperation.Operation
             }
             return list1.Max;
         }
+
+        /// 查询电务功率全部信息
+        public static List<T_dwfile_account> QueryDWGLALL()
+        {
+            return db.Queryable<T_dwfile_account>().ToList();
+        }
+
         /// <summary>
         /// 查询道岔台账全部信息
         /// </summary>