浏览代码

1.台帐界面修改为工务、电务两个模块 2.功率数据管理导入功能实现:原始文件名、大小、路径

wrinkle17 4 月之前
父节点
当前提交
4fd58e5fa1

+ 151 - 96
DPTools/DevFrmMain.Designer.cs

@@ -367,6 +367,9 @@
             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.Utils.SuperToolTip superToolTip113 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipTitleItem toolTipTitleItem113 = new DevExpress.Utils.ToolTipTitleItem();
+            DevExpress.Utils.ToolTipItem toolTipItem113 = 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();
@@ -558,6 +561,7 @@
             this.xrToolboxPageCategory1 = new DevExpress.XtraReports.UserDesigner.XRToolboxPageCategory();
             this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.ribbonPageGroup6 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
+            this.ribbonPageGroup12 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup5 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup11 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPageGroup7 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -588,7 +592,6 @@
             this.groupAndSortDockPanel1_Container = new DevExpress.XtraReports.UserDesigner.DesignControlContainer();
             this.galleryDropDown1 = new DevExpress.XtraBars.Ribbon.GalleryDropDown(this.components);
             this.barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
-            this.defaultLookAndFeel1 = new DevExpress.LookAndFeel.DefaultLookAndFeel(this.components);
             this.ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.barButtonItem3 = new DevExpress.XtraBars.BarButtonItem();
             this.barButtonItem6 = new DevExpress.XtraBars.BarButtonItem();
@@ -723,8 +726,10 @@
             this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn74 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemCheckEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.panelControl5 = new DevExpress.XtraEditors.PanelControl();
+            this.DWGLcheckEdit = new DevExpress.XtraEditors.CheckEdit();
             this.DWGLdelBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWGLimportfileBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWGLanalysisBtn = new DevExpress.XtraEditors.SimpleButton();
@@ -743,6 +748,7 @@
             this.gridColumn66 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemCheckEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.panelControl6 = new DevExpress.XtraEditors.PanelControl();
+            this.DWQKcheckEdit = new DevExpress.XtraEditors.CheckEdit();
             this.DWQKdelBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWQKimportfileBtn = new DevExpress.XtraEditors.SimpleButton();
             this.DWQKanalysisBtn = new DevExpress.XtraEditors.SimpleButton();
@@ -817,12 +823,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).BeginInit();
             this.panelControl5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.DWGLcheckEdit.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.DWQKcheckEdit.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // xrDesignRibbonController1
@@ -1028,7 +1036,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(1422, 147);
             this.ribbon.StatusBar = this.ribbonStatusBar;
             this.ribbon.TransparentEditors = true;
             this.ribbon.Click += new System.EventHandler(this.ribbon_Click);
@@ -3629,6 +3637,7 @@
             // 
             this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
             this.ribbonPageGroup6,
+            this.ribbonPageGroup12,
             this.ribbonPageGroup5,
             this.ribbonPageGroup11,
             this.ribbonPageGroup7});
@@ -3641,17 +3650,28 @@
             this.ribbonPageGroup6.ItemLinks.Add(this.btnDaoChainfo);
             this.ribbonPageGroup6.ItemLinks.Add(this.btnGuanJieinfo);
             this.ribbonPageGroup6.ItemLinks.Add(this.btnJXGJJ);
-            this.ribbonPageGroup6.ItemLinks.Add(this.barButtonItem30);
-            this.ribbonPageGroup6.ItemLinks.Add(this.barButtonItem31);
-            this.ribbonPageGroup6.ItemLinks.Add(this.barSubItem2, true);
             this.ribbonPageGroup6.Name = "ribbonPageGroup6";
-            toolTipTitleItem108.Text = "台账管理";
+            toolTipTitleItem108.Text = "工务台账管理";
             toolTipItem108.LeftIndent = 6;
-            toolTipItem108.Text = "台账管理";
+            toolTipItem108.Text = "工务台账管理";
             superToolTip108.Items.Add(toolTipTitleItem108);
             superToolTip108.Items.Add(toolTipItem108);
             this.ribbonPageGroup6.SuperTip = superToolTip108;
-            this.ribbonPageGroup6.Text = "台账管理";
+            this.ribbonPageGroup6.Text = "工务台账管理";
+            // 
+            // ribbonPageGroup12
+            // 
+            this.ribbonPageGroup12.ItemLinks.Add(this.barButtonItem30);
+            this.ribbonPageGroup12.ItemLinks.Add(this.barButtonItem31);
+            this.ribbonPageGroup12.ItemLinks.Add(this.barSubItem2);
+            this.ribbonPageGroup12.Name = "ribbonPageGroup12";
+            toolTipTitleItem109.Text = "电务台账管理";
+            toolTipItem109.LeftIndent = 6;
+            toolTipItem109.Text = "电务台账管理";
+            superToolTip109.Items.Add(toolTipTitleItem109);
+            superToolTip109.Items.Add(toolTipItem109);
+            this.ribbonPageGroup12.SuperTip = superToolTip109;
+            this.ribbonPageGroup12.Text = "电务台账管理";
             // 
             // ribbonPageGroup5
             // 
@@ -3659,12 +3679,12 @@
             this.ribbonPageGroup5.ItemLinks.Add(this.LGLbBtnI);
             this.ribbonPageGroup5.ItemLinks.Add(this.barButtonItem_DataManager);
             this.ribbonPageGroup5.Name = "ribbonPageGroup5";
-            toolTipTitleItem109.Text = "工务数据分析";
-            toolTipItem109.LeftIndent = 6;
-            toolTipItem109.Text = "工务数据分析";
-            superToolTip109.Items.Add(toolTipTitleItem109);
-            superToolTip109.Items.Add(toolTipItem109);
-            this.ribbonPageGroup5.SuperTip = superToolTip109;
+            toolTipTitleItem110.Text = "工务数据分析";
+            toolTipItem110.LeftIndent = 6;
+            toolTipItem110.Text = "工务数据分析";
+            superToolTip110.Items.Add(toolTipTitleItem110);
+            superToolTip110.Items.Add(toolTipItem110);
+            this.ribbonPageGroup5.SuperTip = superToolTip110;
             this.ribbonPageGroup5.Text = "工务数据分析";
             // 
             // ribbonPageGroup11
@@ -3673,12 +3693,12 @@
             this.ribbonPageGroup11.ItemLinks.Add(this.QKBtn);
             this.ribbonPageGroup11.ItemLinks.Add(this.DWSJBtn);
             this.ribbonPageGroup11.Name = "ribbonPageGroup11";
-            toolTipTitleItem110.Text = "电务数据分析";
-            toolTipItem110.LeftIndent = 6;
-            toolTipItem110.Text = "电务数据分析";
-            superToolTip110.Items.Add(toolTipTitleItem110);
-            superToolTip110.Items.Add(toolTipItem110);
-            this.ribbonPageGroup11.SuperTip = superToolTip110;
+            toolTipTitleItem111.Text = "电务数据分析";
+            toolTipItem111.LeftIndent = 6;
+            toolTipItem111.Text = "电务数据分析";
+            superToolTip111.Items.Add(toolTipTitleItem111);
+            superToolTip111.Items.Add(toolTipItem111);
+            this.ribbonPageGroup11.SuperTip = superToolTip111;
             this.ribbonPageGroup11.Text = "电务数据分析";
             // 
             // ribbonPageGroup7
@@ -3733,12 +3753,12 @@
             this.ribbonPageGroup1.ItemLinks.Add(this.barButtonItem16);
             this.ribbonPageGroup1.ItemLinks.Add(this.barButtonImageTile);
             this.ribbonPageGroup1.Name = "ribbonPageGroup1";
-            toolTipTitleItem111.Text = "数据管理";
-            toolTipItem111.LeftIndent = 6;
-            toolTipItem111.Text = "数据管理";
-            superToolTip111.Items.Add(toolTipTitleItem111);
-            superToolTip111.Items.Add(toolTipItem111);
-            this.ribbonPageGroup1.SuperTip = superToolTip111;
+            toolTipTitleItem112.Text = "数据管理";
+            toolTipItem112.LeftIndent = 6;
+            toolTipItem112.Text = "数据管理";
+            superToolTip112.Items.Add(toolTipTitleItem112);
+            superToolTip112.Items.Add(toolTipItem112);
+            this.ribbonPageGroup1.SuperTip = superToolTip112;
             this.ribbonPageGroup1.Text = "数据管理";
             // 
             // repositoryItemCheckedComboBoxEdit1
@@ -3762,10 +3782,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, 673);
+            this.ribbonStatusBar.Location = new System.Drawing.Point(0, 674);
             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(1422, 31);
             this.ribbonStatusBar.Visible = false;
             // 
             // xrDesignDockManager1
@@ -3973,20 +3993,16 @@
             this.barButtonItem2.Name = "barButtonItem2";
             this.barButtonItem2.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
             // 
-            // defaultLookAndFeel1
-            // 
-            this.defaultLookAndFeel1.LookAndFeel.SkinName = "Office 2010 Blue";
-            // 
             // ribbonPageGroup2
             // 
             this.ribbonPageGroup2.ItemLinks.Add(this.barButtonImageTile);
             this.ribbonPageGroup2.Name = "ribbonPageGroup2";
-            toolTipTitleItem112.Text = "许可管理工具";
-            toolTipItem112.LeftIndent = 6;
-            toolTipItem112.Text = "注册、删除许可等工具";
-            superToolTip112.Items.Add(toolTipTitleItem112);
-            superToolTip112.Items.Add(toolTipItem112);
-            this.ribbonPageGroup2.SuperTip = superToolTip112;
+            toolTipTitleItem113.Text = "许可管理工具";
+            toolTipItem113.LeftIndent = 6;
+            toolTipItem113.Text = "注册、删除许可等工具";
+            superToolTip113.Items.Add(toolTipTitleItem113);
+            superToolTip113.Items.Add(toolTipItem113);
+            this.ribbonPageGroup2.SuperTip = superToolTip113;
             this.ribbonPageGroup2.Text = "数据转换";
             // 
             // barButtonItem3
@@ -4080,7 +4096,7 @@
             // xtraTabDataManager
             // 
             this.xtraTabDataManager.Name = "xtraTabDataManager";
-            this.xtraTabDataManager.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabDataManager.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabDataManager.Text = "数据展示";
             // 
             // xtraTabPageLGL
@@ -4088,7 +4104,7 @@
             this.xtraTabPageLGL.Controls.Add(this.gridControl3);
             this.xtraTabPageLGL.Controls.Add(this.panelControl4);
             this.xtraTabPageLGL.Name = "xtraTabPageLGL";
-            this.xtraTabPageLGL.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageLGL.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageLGL.Text = "轮轨力数据分析";
             // 
             // gridControl3
@@ -4099,7 +4115,7 @@
             this.gridControl3.Name = "gridControl3";
             this.gridControl3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit2});
-            this.gridControl3.Size = new System.Drawing.Size(1325, 448);
+            this.gridControl3.Size = new System.Drawing.Size(1416, 448);
             this.gridControl3.TabIndex = 15;
             this.gridControl3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView3});
@@ -4269,7 +4285,7 @@
             this.panelControl4.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl4.Location = new System.Drawing.Point(0, 0);
             this.panelControl4.Name = "panelControl4";
-            this.panelControl4.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl4.Size = new System.Drawing.Size(1416, 48);
             this.panelControl4.TabIndex = 11;
             // 
             // LGLTQBtn
@@ -4294,7 +4310,7 @@
             // 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(1217, 15);
+            this.LGLdelBtn.Location = new System.Drawing.Point(1308, 15);
             this.LGLdelBtn.Name = "LGLdelBtn";
             this.LGLdelBtn.Size = new System.Drawing.Size(72, 23);
             this.LGLdelBtn.TabIndex = 5;
@@ -4314,7 +4330,7 @@
             // 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(1166, 16);
             this.LGLcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.LGLcheckEdit.Name = "LGLcheckEdit";
             this.LGLcheckEdit.Properties.Caption = "浏览文件夹";
@@ -4325,7 +4341,7 @@
             // 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(993, 15);
+            this.LGLOpenfileBtn.Location = new System.Drawing.Point(1084, 15);
             this.LGLOpenfileBtn.Name = "LGLOpenfileBtn";
             this.LGLOpenfileBtn.Size = new System.Drawing.Size(75, 23);
             this.LGLOpenfileBtn.TabIndex = 0;
@@ -4357,7 +4373,7 @@
             this.xtraTabPageJH.Controls.Add(this.gridControl2);
             this.xtraTabPageJH.Controls.Add(this.panelControl1);
             this.xtraTabPageJH.Name = "xtraTabPageJH";
-            this.xtraTabPageJH.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageJH.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageJH.Text = "轨道几何数据分析";
             // 
             // gridControl2
@@ -4368,7 +4384,7 @@
             this.gridControl2.Name = "gridControl2";
             this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit3});
-            this.gridControl2.Size = new System.Drawing.Size(1325, 448);
+            this.gridControl2.Size = new System.Drawing.Size(1416, 448);
             this.gridControl2.TabIndex = 14;
             this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView2});
@@ -4551,13 +4567,13 @@
             this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl1.Location = new System.Drawing.Point(0, 0);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl1.Size = new System.Drawing.Size(1416, 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(1217, 15);
+            this.JHdelBtn.Location = new System.Drawing.Point(1308, 15);
             this.JHdelBtn.Name = "JHdelBtn";
             this.JHdelBtn.Size = new System.Drawing.Size(72, 23);
             this.JHdelBtn.TabIndex = 9;
@@ -4567,7 +4583,7 @@
             // 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(1166, 16);
             this.JHFXcheckEdit.MenuManager = this.xrDesignRibbonController1;
             this.JHFXcheckEdit.Name = "JHFXcheckEdit";
             this.JHFXcheckEdit.Properties.Caption = "浏览文件夹";
@@ -4616,7 +4632,7 @@
             // 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(993, 15);
+            this.JHFXopenfileBtn.Location = new System.Drawing.Point(1084, 15);
             this.JHFXopenfileBtn.Name = "JHFXopenfileBtn";
             this.JHFXopenfileBtn.Size = new System.Drawing.Size(75, 23);
             this.JHFXopenfileBtn.TabIndex = 0;
@@ -4638,7 +4654,7 @@
             // 
             this.xtraTabPageGJ.Controls.Add(this.gjInform9);
             this.xtraTabPageGJ.Name = "xtraTabPageGJ";
-            this.xtraTabPageGJ.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageGJ.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageGJ.Text = "管界信息管理";
             // 
             // gjInform9
@@ -4647,7 +4663,7 @@
             this.gjInform9.Location = new System.Drawing.Point(0, 0);
             this.gjInform9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.gjInform9.Name = "gjInform9";
-            this.gjInform9.Size = new System.Drawing.Size(1325, 496);
+            this.gjInform9.Size = new System.Drawing.Size(1416, 496);
             this.gjInform9.TabIndex = 0;
             this.gjInform9.Load += new System.EventHandler(this.gjInform9_Load);
             // 
@@ -4658,7 +4674,7 @@
             this.xtraTabPageQX.Controls.Add(this.panelControl2);
             this.xtraTabPageQX.Name = "xtraTabPageQX";
             this.xtraTabPageQX.ShowCloseButton = DevExpress.Utils.DefaultBoolean.False;
-            this.xtraTabPageQX.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageQX.Size = new System.Drawing.Size(1416, 498);
             this.xtraTabPageQX.Text = "曲线信息管理";
             // 
             // gridControl1
@@ -4668,7 +4684,7 @@
             this.gridControl1.MainView = this.railwaybureau;
             this.gridControl1.MenuManager = this.xrDesignRibbonController1;
             this.gridControl1.Name = "gridControl1";
-            this.gridControl1.Size = new System.Drawing.Size(1325, 459);
+            this.gridControl1.Size = new System.Drawing.Size(1416, 461);
             this.gridControl1.TabIndex = 0;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.railwaybureau,
@@ -4912,7 +4928,7 @@
             this.panelControl3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl3.Location = new System.Drawing.Point(0, 37);
             this.panelControl3.Name = "panelControl3";
-            this.panelControl3.Size = new System.Drawing.Size(1325, 459);
+            this.panelControl3.Size = new System.Drawing.Size(1416, 461);
             this.panelControl3.TabIndex = 2;
             // 
             // panelControl2
@@ -4921,7 +4937,7 @@
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(1325, 37);
+            this.panelControl2.Size = new System.Drawing.Size(1416, 37);
             this.panelControl2.TabIndex = 1;
             // 
             // deleteroebtnqx
@@ -4937,10 +4953,10 @@
             // 
             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, 147);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPageQX;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1331, 525);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1422, 527);
             this.xtraTabControl1.TabIndex = 2;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPageQX,
@@ -4963,7 +4979,7 @@
             // 
             this.xtraTabPageDC.Controls.Add(this.dcInform8);
             this.xtraTabPageDC.Name = "xtraTabPageDC";
-            this.xtraTabPageDC.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageDC.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageDC.Text = "道岔信息管理";
             this.xtraTabPageDC.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint);
             // 
@@ -4973,7 +4989,7 @@
             this.dcInform8.Location = new System.Drawing.Point(0, 0);
             this.dcInform8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.dcInform8.Name = "dcInform8";
-            this.dcInform8.Size = new System.Drawing.Size(1325, 496);
+            this.dcInform8.Size = new System.Drawing.Size(1416, 496);
             this.dcInform8.TabIndex = 0;
             this.dcInform8.Load += new System.EventHandler(this.dcInform8_Load);
             // 
@@ -4983,7 +4999,7 @@
             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(1325, 496);
+            this.xtraTabPageGLData.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageGLData.Text = "功率数据管理";
             // 
             // gridControl6
@@ -4994,7 +5010,7 @@
             this.gridControl6.Name = "gridControl6";
             this.gridControl6.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit6});
-            this.gridControl6.Size = new System.Drawing.Size(1325, 448);
+            this.gridControl6.Size = new System.Drawing.Size(1416, 448);
             this.gridControl6.TabIndex = 20;
             this.gridControl6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView6});
@@ -5075,13 +5091,13 @@
             this.panelControl7.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl7.Location = new System.Drawing.Point(0, 0);
             this.panelControl7.Name = "panelControl7";
-            this.panelControl7.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl7.Size = new System.Drawing.Size(1416, 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(1131, 15);
+            this.importGLData.Location = new System.Drawing.Point(1222, 15);
             this.importGLData.Name = "importGLData";
             this.importGLData.Size = new System.Drawing.Size(72, 23);
             this.importGLData.TabIndex = 6;
@@ -5091,7 +5107,7 @@
             // 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(1217, 15);
+            this.deleteGLdata.Location = new System.Drawing.Point(1308, 15);
             this.deleteGLdata.Name = "deleteGLdata";
             this.deleteGLdata.Size = new System.Drawing.Size(72, 23);
             this.deleteGLdata.TabIndex = 5;
@@ -5104,7 +5120,7 @@
             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(1325, 496);
+            this.xtraTabPageQKData.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageQKData.Text = "缺口数据管理";
             // 
             // gridControl7
@@ -5115,7 +5131,7 @@
             this.gridControl7.Name = "gridControl7";
             this.gridControl7.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit7});
-            this.gridControl7.Size = new System.Drawing.Size(1325, 448);
+            this.gridControl7.Size = new System.Drawing.Size(1416, 448);
             this.gridControl7.TabIndex = 22;
             this.gridControl7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView7});
@@ -5206,13 +5222,13 @@
             this.panelControl8.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelControl8.Location = new System.Drawing.Point(0, 0);
             this.panelControl8.Name = "panelControl8";
-            this.panelControl8.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl8.Size = new System.Drawing.Size(1416, 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(1131, 15);
+            this.simpleButton1.Location = new System.Drawing.Point(1222, 15);
             this.simpleButton1.Name = "simpleButton1";
             this.simpleButton1.Size = new System.Drawing.Size(72, 23);
             this.simpleButton1.TabIndex = 6;
@@ -5221,7 +5237,7 @@
             // 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(1217, 15);
+            this.deleteQKdata.Location = new System.Drawing.Point(1308, 15);
             this.deleteQKdata.Name = "deleteQKdata";
             this.deleteQKdata.Size = new System.Drawing.Size(72, 23);
             this.deleteQKdata.TabIndex = 5;
@@ -5231,19 +5247,19 @@
             // xtraTabPageMTLF
             // 
             this.xtraTabPageMTLF.Name = "xtraTabPageMTLF";
-            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageMTLF.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageMTLF.Text = "密贴离缝";
             // 
             // xtraTabPageZZJH
             // 
             this.xtraTabPageZZJH.Name = "xtraTabPageZZJH";
-            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageZZJH.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageZZJH.Text = "逐枕几何";
             // 
             // xtraTabPageXXXW
             // 
             this.xtraTabPageXXXW.Name = "xtraTabPageXXXW";
-            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageXXXW.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageXXXW.Text = "线形线位";
             // 
             // xtraTabPageGL
@@ -5252,7 +5268,7 @@
             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(1325, 496);
+            this.xtraTabPageGL.Size = new System.Drawing.Size(1416, 498);
             this.xtraTabPageGL.Text = "功率分析";
             // 
             // gridControl4
@@ -5263,7 +5279,7 @@
             this.gridControl4.Name = "gridControl4";
             this.gridControl4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit4});
-            this.gridControl4.Size = new System.Drawing.Size(1325, 448);
+            this.gridControl4.Size = new System.Drawing.Size(1416, 450);
             this.gridControl4.TabIndex = 16;
             this.gridControl4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView4});
@@ -5281,7 +5297,8 @@
             this.gridColumn51,
             this.gridColumn52,
             this.gridColumn53,
-            this.gridColumn54});
+            this.gridColumn54,
+            this.gridColumn74});
             this.gridView4.GridControl = this.gridControl4;
             this.gridView4.Name = "gridView4";
             this.gridView4.OptionsSelection.MultiSelect = true;
@@ -5313,7 +5330,7 @@
             // gridColumn47
             // 
             this.gridColumn47.Caption = "开始日期";
-            this.gridColumn47.FieldName = "StartTime";
+            this.gridColumn47.FieldName = "Starttime";
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.OptionsColumn.ReadOnly = true;
             this.gridColumn47.Visible = true;
@@ -5323,7 +5340,7 @@
             // gridColumn48
             // 
             this.gridColumn48.Caption = "结束日期";
-            this.gridColumn48.FieldName = "EndTime";
+            this.gridColumn48.FieldName = "Endtime";
             this.gridColumn48.Name = "gridColumn48";
             this.gridColumn48.OptionsColumn.FixedWidth = true;
             this.gridColumn48.OptionsColumn.ReadOnly = true;
@@ -5334,17 +5351,17 @@
             // gridColumn49
             // 
             this.gridColumn49.Caption = "原始文件名";
-            this.gridColumn49.FieldName = "FileName";
+            this.gridColumn49.FieldName = "Filename";
             this.gridColumn49.Name = "gridColumn49";
             this.gridColumn49.OptionsColumn.ReadOnly = true;
             this.gridColumn49.Visible = true;
             this.gridColumn49.VisibleIndex = 5;
-            this.gridColumn49.Width = 312;
+            this.gridColumn49.Width = 113;
             // 
             // gridColumn50
             // 
             this.gridColumn50.Caption = "文件大小";
-            this.gridColumn50.FieldName = "FileSize";
+            this.gridColumn50.FieldName = "Filesize";
             this.gridColumn50.Name = "gridColumn50";
             this.gridColumn50.OptionsColumn.FixedWidth = true;
             this.gridColumn50.OptionsColumn.ReadOnly = true;
@@ -5355,25 +5372,25 @@
             // gridColumn51
             // 
             this.gridColumn51.Caption = "任务状态";
-            this.gridColumn51.FieldName = "TaskStatus";
+            this.gridColumn51.FieldName = "Taskstatus";
             this.gridColumn51.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
             this.gridColumn51.Name = "gridColumn51";
             this.gridColumn51.OptionsColumn.FixedWidth = true;
             this.gridColumn51.OptionsColumn.ReadOnly = true;
             this.gridColumn51.Visible = true;
-            this.gridColumn51.VisibleIndex = 9;
+            this.gridColumn51.VisibleIndex = 10;
             this.gridColumn51.Width = 385;
             // 
             // gridColumn52
             // 
             this.gridColumn52.Caption = "文件状态";
-            this.gridColumn52.FieldName = "FileStatus";
+            this.gridColumn52.FieldName = "Filestatus";
             this.gridColumn52.Name = "gridColumn52";
             this.gridColumn52.OptionsColumn.FixedWidth = true;
             this.gridColumn52.OptionsColumn.ReadOnly = true;
             this.gridColumn52.Visible = true;
             this.gridColumn52.VisibleIndex = 7;
-            this.gridColumn52.Width = 197;
+            this.gridColumn52.Width = 82;
             // 
             // gridColumn53
             // 
@@ -5391,6 +5408,14 @@
             this.gridColumn54.Name = "gridColumn54";
             this.gridColumn54.OptionsColumn.ReadOnly = true;
             // 
+            // gridColumn74
+            // 
+            this.gridColumn74.Caption = "文件路径";
+            this.gridColumn74.FieldName = "Srlj";
+            this.gridColumn74.Name = "gridColumn74";
+            this.gridColumn74.Visible = true;
+            this.gridColumn74.VisibleIndex = 9;
+            // 
             // repositoryItemCheckEdit4
             // 
             this.repositoryItemCheckEdit4.AutoHeight = false;
@@ -5398,19 +5423,31 @@
             // 
             // panelControl5
             // 
+            this.panelControl5.Controls.Add(this.DWGLcheckEdit);
             this.panelControl5.Controls.Add(this.DWGLdelBtn);
             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.Name = "panelControl5";
-            this.panelControl5.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl5.Size = new System.Drawing.Size(1416, 48);
             this.panelControl5.TabIndex = 12;
             // 
+            // DWGLcheckEdit
+            // 
+            this.DWGLcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.DWGLcheckEdit.Location = new System.Drawing.Point(1165, 19);
+            this.DWGLcheckEdit.MenuManager = this.xrDesignRibbonController1;
+            this.DWGLcheckEdit.Name = "DWGLcheckEdit";
+            this.DWGLcheckEdit.Properties.Caption = "浏览文件夹";
+            this.DWGLcheckEdit.Size = new System.Drawing.Size(89, 19);
+            this.DWGLcheckEdit.TabIndex = 17;
+            this.DWGLcheckEdit.Visible = false;
+            // 
             // 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(1217, 15);
+            this.DWGLdelBtn.Location = new System.Drawing.Point(1308, 15);
             this.DWGLdelBtn.Name = "DWGLdelBtn";
             this.DWGLdelBtn.Size = new System.Drawing.Size(72, 23);
             this.DWGLdelBtn.TabIndex = 5;
@@ -5420,7 +5457,7 @@
             // 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.Location = new System.Drawing.Point(1084, 15);
             this.DWGLimportfileBtn.Name = "DWGLimportfileBtn";
             this.DWGLimportfileBtn.Size = new System.Drawing.Size(75, 23);
             this.DWGLimportfileBtn.TabIndex = 0;
@@ -5442,7 +5479,7 @@
             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(1325, 496);
+            this.xtraTabPageQK.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageQK.Text = "缺口分析";
             this.xtraTabPageQK.Paint += new System.Windows.Forms.PaintEventHandler(this.xtraTabPage2_Paint_1);
             // 
@@ -5454,7 +5491,7 @@
             this.gridControl5.Name = "gridControl5";
             this.gridControl5.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit5});
-            this.gridControl5.Size = new System.Drawing.Size(1325, 448);
+            this.gridControl5.Size = new System.Drawing.Size(1416, 448);
             this.gridControl5.TabIndex = 18;
             this.gridControl5.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView5});
@@ -5590,19 +5627,31 @@
             // 
             // panelControl6
             // 
+            this.panelControl6.Controls.Add(this.DWQKcheckEdit);
             this.panelControl6.Controls.Add(this.DWQKdelBtn);
             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.Name = "panelControl6";
-            this.panelControl6.Size = new System.Drawing.Size(1325, 48);
+            this.panelControl6.Size = new System.Drawing.Size(1416, 48);
             this.panelControl6.TabIndex = 17;
             // 
+            // DWQKcheckEdit
+            // 
+            this.DWQKcheckEdit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.DWQKcheckEdit.Location = new System.Drawing.Point(1165, 19);
+            this.DWQKcheckEdit.MenuManager = this.xrDesignRibbonController1;
+            this.DWQKcheckEdit.Name = "DWQKcheckEdit";
+            this.DWQKcheckEdit.Properties.Caption = "浏览文件夹";
+            this.DWQKcheckEdit.Size = new System.Drawing.Size(89, 19);
+            this.DWQKcheckEdit.TabIndex = 18;
+            this.DWQKcheckEdit.Visible = false;
+            // 
             // 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(1217, 15);
+            this.DWQKdelBtn.Location = new System.Drawing.Point(1308, 15);
             this.DWQKdelBtn.Name = "DWQKdelBtn";
             this.DWQKdelBtn.Size = new System.Drawing.Size(72, 23);
             this.DWQKdelBtn.TabIndex = 5;
@@ -5611,7 +5660,7 @@
             // 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.Location = new System.Drawing.Point(1084, 15);
             this.DWQKimportfileBtn.Name = "DWQKimportfileBtn";
             this.DWQKimportfileBtn.Size = new System.Drawing.Size(75, 23);
             this.DWQKimportfileBtn.TabIndex = 0;
@@ -5631,7 +5680,7 @@
             // 
             this.xtraTabPageDWZS.Margin = new System.Windows.Forms.Padding(2);
             this.xtraTabPageDWZS.Name = "xtraTabPageDWZS";
-            this.xtraTabPageDWZS.Size = new System.Drawing.Size(1325, 496);
+            this.xtraTabPageDWZS.Size = new System.Drawing.Size(1416, 496);
             this.xtraTabPageDWZS.Text = "电务数据展示";
             // 
             // DevFrmMain
@@ -5639,7 +5688,7 @@
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1331, 705);
+            this.ClientSize = new System.Drawing.Size(1422, 705);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.ribbonStatusBar);
             this.Controls.Add(this.ribbon);
@@ -5719,12 +5768,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl5)).EndInit();
             this.panelControl5.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.DWGLcheckEdit.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.DWQKcheckEdit.Properties)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -6128,5 +6179,9 @@
         private DevExpress.XtraEditors.SimpleButton deleteQKdata;
         private DevExpress.XtraEditors.SimpleButton importGLData;
         private DevExpress.XtraEditors.SimpleButton simpleButton1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn74;
+        private DevExpress.XtraEditors.CheckEdit DWGLcheckEdit;
+        private DevExpress.XtraEditors.CheckEdit DWQKcheckEdit;
+        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup12;
     }
 }

+ 14 - 2
DPTools/DevFrmMain.cs

@@ -346,7 +346,7 @@ namespace Uninpho.Tools
             List<T_quekou_account> quekouList = SqlQueryable_QX.Search_QKData();
             this.gridControl7.DataSource = quekouList;
             // 初始化查询功率分析数据列表
-            List<T_dwfile_account> gl_dataList = DataAnalysisToPG.getDwfile("bny", new List<int>(), new List<string>()) as List<T_dwfile_account>;
+            List<T_dwfile_account> gl_dataList = DataAnalysisToPG.getDwfile("", new List<int>(), new List<string>()) as List<T_dwfile_account>;
             this.gridControl4.DataSource = gl_dataList;
 
             List<T_file_account> daochaListjhfx = DataAnalysisToPG.getfile("bny",new List<int>(),new List<string>()) as List<T_file_account>;
@@ -751,11 +751,23 @@ namespace Uninpho.Tools
         //导入文件
         private void DWGLopenfileBtn_Click(object sender, EventArgs e)
         {
-            ImportGLdatamanageForm frm = new ImportGLdatamanageForm();
+            List<int> indexid = new List<int>();
+            List<string> indexzt = new List<string>();
+            DWCommon.getSFZT(gridView4, ref indexid, ref indexzt);
+
+            ImportGLdatamanageForm frm = new ImportGLdatamanageForm(DWGLcheckEdit.Checked, gridView4);
             frm.StartPosition = FormStartPosition.CenterParent;
             if (frm.ShowDialog(this) == DialogResult.OK)
             {
+
             }
+            //DWCommon.OpenFile("txt", DWGLcheckEdit.Checked, gridView4);
+
+            List<T_dwfile_account> gl_dataList = DataAnalysisToPG.getDwfile("txt", indexid, indexzt) as List<T_dwfile_account>;
+            this.gridControl4.DataSource = gl_dataList;
+            DWCommon.repushSFZT(gridView4, indexid);
+
+          
         }
 
         private void DWGLdelBtn_Click(object sender, EventArgs e)

+ 10 - 13
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>17, 55</value>
+    <value>516, 17</value>
   </metadata>
   <metadata name="applicationMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>230, 55</value>
+    <value>729, 17</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>444, 93</value>
+    <value>149, 55</value>
   </metadata>
   <metadata name="xrDesignDockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>389, 55</value>
+    <value>888, 17</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>530, 17</value>
+    <value>353, 17</value>
   </metadata>
   <data name="barButtonItem2.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1974,9 +1974,6 @@
         72XvX4X+c3H5D2Igl8rkQ9k/AAAAAElFTkSuQmCC
 </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>
-  </metadata>
   <data name="barButtonItem3.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -2108,16 +2105,16 @@
     <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>583, 55</value>
+    <value>1082, 17</value>
   </metadata>
   <metadata name="galleryDropDown2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 93</value>
+    <value>1214, 17</value>
   </metadata>
   <metadata name="popupMenu2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>180, 93</value>
+    <value>1377, 17</value>
   </metadata>
   <metadata name="popupMenu3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>312, 93</value>
+    <value>17, 55</value>
   </metadata>
   <data name="barButtonItem15.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -2161,6 +2158,6 @@
 </value>
   </data>
   <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>614, 93</value>
+    <value>319, 55</value>
   </metadata>
 </root>

+ 1 - 0
DPTools/Uninpho.Railway.Tools.csproj

@@ -272,6 +272,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="components\DataAnalysis\DWCommon.cs" />
     <Compile Include="components\DataAnalysis\DataAnalysisClass.cs" />
     <Compile Include="components\DataManager\BXDBFrom.cs">
       <SubType>Form</SubType>

+ 16 - 21
DPTools/components/DWForm/ImportGLdatamanageForm.cs

@@ -13,50 +13,45 @@ using System.IO;
 using Uninpho.DBOperation.Operation;
 using System.Text.RegularExpressions;
 using System.Reflection;
+using Uninpho.Tools.components.DWForm;
+using Uninpho.Tools.components.DataAnalysis;
+using DevExpress.XtraGrid.Views.Grid;
 
 namespace Uninpho.Tools.components.DWForm
 {
     public partial class ImportGLdatamanageForm : DevExpress.XtraEditors.XtraForm
     {
-        public ImportGLdatamanageForm()
+        bool ch;
+        GridView grid;
+        public ImportGLdatamanageForm(bool ischecked, GridView GV)
         {
             InitializeComponent();
-        }
+             ch = ischecked;
+             grid = GV;
+
 
+        }
+      
        /// 浏览文件目录
         private void simpleButton2_Click(object sender, EventArgs e)
         {
-            // 创建一个OpenFileDialog实例  
-            OpenFileDialog openFileDialog = new OpenFileDialog
-            {
-                // 设置文件对话框的标题  
-                Title = "选择文件",
-
-                // 初始目录,可选  
-                InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Desktop),
+            DWCommon.OpenFile("txt", ch, grid);
+            txtindir.Text = DWCommon.lj;
 
-                // 设置过滤条件,只显示文本文件,可以根据需要修改  
-                Filter = "文本 (*.txt)|*.txt"
-            };
 
-            // 显示文件对话框并检查用户是否选择了文件  
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                // 将选择的文件路径写入文本框  
-                txtindir.Text = openFileDialog.FileName;
-            }
         }
 
         /// 导入数据
         private void newCreateBtnSon_Click(object sender, EventArgs e)
         {
-                
+            this.Close();
         }
 
+
         ///取消
         private void NewcancelBtn_Click(object sender, EventArgs e)
         {
-            this.Close();
+            this.Close();//记得改,现在取不取消都是导入成功
         }
 
         ///关联数据库

+ 387 - 0
DPTools/components/DataAnalysis/DWCommon.cs

@@ -0,0 +1,387 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Uninpho.DBOperation.Model;
+using Uninpho.DBOperation.Operation;
+using System.IO;
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid;
+using DevExpress.XtraBars;
+
+namespace Uninpho.Tools.components.DataAnalysis
+{
+  
+    class DWCommon
+    {
+        /// <summary>
+        /// 高速还是低速
+        /// 0:高速  1:低速  2:全选
+        /// </summary>
+        public static int gdsBool = 0;
+        /// <summary>
+        /// 是否进行里程修正
+        /// </summary>
+        public static bool xzlcBool = true;
+        /// <summary>
+        /// 检测车
+        /// </summary>
+        public static List<string> jccList = new List<string>();
+        public static string lj;
+        /// <summary>
+        /// 打开文件夹公共函数
+        /// </summary>
+        public static void OpenFile(string houzhui,bool ischecked,GridView GV)
+        {
+            List<T_dwfile_account> filelist = new List<T_dwfile_account>();
+            //批量
+            //if (ischecked)
+            //{
+
+            //    var dialog = new FolderBrowserDialog();
+            //    if (dialog.ShowDialog() == DialogResult.OK)
+            //    {
+            //        DirectoryInfo DirInfo = new DirectoryInfo(dialog.SelectedPath);
+            //        houzhui = "." + houzhui;
+            //        var files = from f in DirInfo.EnumerateFiles()
+            //                    where houzhui.Contains(f.Extension.ToLower())
+            //                    select f;
+
+            //        // Show results.
+            //        foreach (var f in files)
+            //        {
+            //            T_dwfile_account tfa= GLFileNameSplit1(f.FullName);
+
+            //            var isfile = DataAnalysisToPG.DWQueryToPGByNameFile(tfa.Filename) as List<T_dwfile_account>;
+            //            if (isfile.Count == 0)
+            //            {
+            //                filelist.Add(tfa);
+            //            }
+            //            else
+            //            {
+            //                if (XtraMessageBox.Show("检测到数据库内存在同名数据:\n" + tfa.Filename+",\n是否覆盖数据库内数据?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)
+            //                {
+            //                    filejiancedel(tfa);
+            //                    filelist.Add(tfa);
+            //                }
+            //            }
+            //        }
+            //        DataAnalysisToPG.GLInsertToPG(filelist);
+            //    }
+            //}
+            //else
+            //{
+            var dialog = new OpenFileDialog();
+                dialog.Multiselect = true;
+                dialog.Title = "请选择文件夹";
+                dialog.Filter = houzhui+"文件(*." + houzhui + ")|*." + houzhui;
+                if (dialog.ShowDialog() == DialogResult.OK)
+                {
+                    string[] file = dialog.FileNames;
+
+                    for (int i = 0; i < file.Length; i++)
+                    {
+                        T_dwfile_account tfa = GLFileNameSplit1(file[i]);
+                       //获取数据后
+                        var isfile = DataAnalysisToPG.DWQueryToPGByNameFile(tfa.Filename) as List<T_dwfile_account>;
+                         lj = file[i]; //传路径
+                        if (isfile.Count == 0)
+                        {
+                            filelist.Add(tfa);
+                        }
+                        else
+                        {
+                            if (XtraMessageBox.Show("检测到数据库内存在同名数据:\n" + tfa.Filename + ",\n是否覆盖数据库内数据?", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information) == DialogResult.OK)
+                            {
+                                filejiancedel(tfa);
+                                filelist.Add(tfa);
+                            }
+                        }
+
+                    }
+                    DataAnalysisToPG.GLInsertToPG(filelist);
+                }
+            //}
+
+
+        }
+    
+
+        /// 清理数据库同名数据
+        private static void filejiancedel(T_dwfile_account file)
+        {
+            lj = "";
+             
+        }
+
+        /// 解析电务功率数据
+        private static T_dwfile_account GLFileNameSplit1(string filename)
+        {
+            string ysname = Path.GetFileName(filename);
+            //string[] xlbh = HBXLSplit(filearr[2].Split('.')[0]);// 解析线路编号和行车方向
+            string wjdx = Math.Ceiling(new FileInfo(filename).Length / 1024.0 / 1024.0) + " MB";//文件大小
+            //T_luxianming_sf xlpg = DataAnalysisToPG.QueryToXlm(xlbh[0]) as T_luxianming_sf;//获取线路名
+            string lj = filename;
+            return new T_dwfile_account()
+            {
+              
+                Xianlu = "襄阳",
+                Chezhan = "三坝",
+                Starttime = "xx年xx月xx日",
+                Endtime = "xx时xx分xx秒",
+                Filename = ysname,
+                Filesize = wjdx,
+                Filestatus = "正常",
+                Taskstatus = "算法未执行",
+                Srlj = lj,
+               
+            };
+        }
+       
+        /// <summary>
+        /// 解析方向
+        /// </summary>
+        private static string getZF(string ZF)
+        {
+            string zf = ZF.Split('_')[0];
+            if (zf == "0")
+            {
+                return "反向";
+            }
+            else
+            {
+                return "正向";
+            }
+        }
+        /// <summary>
+        /// 解析时间
+        /// </summary>
+        private static string getYMDHMS(string ymd,string hms)
+        {
+            //如果这里以后修改,轮轨力输入检测日期那块也要改!!!
+            Char[] ymdcha = ymd.ToCharArray();//年月日
+            Char[] hmscha = hms.ToCharArray();//时分秒
+            string year = ymdcha[4].ToString() + ymdcha[5].ToString() + ymdcha[6].ToString() + ymdcha[7].ToString();
+            string mouth = ymdcha[2].ToString() + ymdcha[3].ToString();
+            string day = ymdcha[0].ToString() + ymdcha[1].ToString();
+            string hour = hmscha[0].ToString() + hmscha[1].ToString();
+            string minite = hmscha[2].ToString() + hmscha[3].ToString();
+            string second = hmscha[4].ToString() + hmscha[5].ToString();
+            return year+ "年"  +mouth + "月" + day + "日" + hour + "时" + minite + "分" + second + "秒";
+        }
+        private static string getYMDHMS(string ymd)
+        {
+            //如果这里以后修改,轮轨力输入检测日期那块也要改!!!
+            Char[] ymdcha = ymd.ToCharArray();//年月日
+            string year = ymdcha[0].ToString() + ymdcha[3].ToString();
+            string mouth = ymdcha[6].ToString() + ymdcha[7].ToString();
+            string day = ymdcha[4].ToString() + ymdcha[5].ToString();
+            return year + "年" + mouth + "月" + day + "日";
+        }
+        /// <summary>
+        /// 解析行别和线路编号
+        /// </summary>
+        private static string[] HBXLSplit(string arr0)
+        {
+            Char[] cha = arr0.ToCharArray();
+            string hb = "", xl = "";
+            for (int i = 0; i < cha.Length; i++)
+            {
+                if (i != cha.Length-1)
+                {
+                    xl += cha[i];
+                }
+                else
+                {
+                    if (cha[i] == 'X')
+                    {
+                        hb = "下";
+                    }
+                    else if (cha[i] == 'S')
+                    {
+                        hb = "上";
+
+                    }
+                    else
+                    {
+                        hb = "未知";
+                    }
+                }
+            }
+            return new string[] {xl,hb };
+        }
+        /// <summary>
+        /// 表前加序号
+        /// </summary>
+        /// <param name="e"></param>
+        public static void addXuHao(DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e)
+        {
+            if (e.Info.Kind == DevExpress.Utils.Drawing.IndicatorKind.Header)
+            {
+                e.Appearance.DrawBackground(e.Cache, e.Bounds);
+                e.Appearance.DrawString(e.Cache, "  序号", e.Bounds);
+              
+                e.Handled = true;
+            }
+            e.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
+            if (e.Info.IsRowIndicator)
+            {
+                if (e.RowHandle >= 0)
+                {
+                    e.Info.DisplayText = (e.RowHandle + 1).ToString().Trim();
+                }
+                else if (e.RowHandle < 0 && e.RowHandle > -1000)
+                {
+                    e.Info.DisplayText = "G" + e.RowHandle.ToString();
+                }
+            }
+        }
+        
+        /// <summary>
+        /// 自动化初始化
+        /// </summary>
+        public static void initZDHFun(BarButtonItem barButtonItem)
+        {
+            initFile(zdhSetClass.path, zdhSetClass.initStr);
+            StreamReader sr = new StreamReader(zdhSetClass.path);
+            while (!sr.EndOfStream)
+            {
+                string[] str = sr.ReadLine().Split('灬');
+                if (str[0] == "Interval")
+                {
+                    zdhSetClass.Interval = Convert.ToInt32(str[1]);
+                    continue;
+                }
+                else if (str[0] == "folder")
+                {
+                    if (Directory.Exists(str[1]))
+                    {
+                        zdhSetClass.folder = str[1];
+                    }
+                    continue;
+                }
+                else if (str[0] == "startdate")
+                {
+                    zdhSetClass.startdate = str[1];
+                    continue;
+                }
+                else if (str[0] == "taskName")
+                {
+                    zdhSetClass.taskName = str[1];
+                    continue;
+                }
+                else if (str[0] == "isStartZDH")
+                {
+                    zdhSetClass.isStartZDH = Convert.ToInt32(str[1]);
+                    continue;
+                }
+            }
+            DirectoryInitNoDelNoHidde(zdhSetClass.folder + "geoData");
+            DirectoryInitNoDelNoHidde(zdhSetClass.folder + "bnyData");
+
+            if (zdhSetClass.isStartZDH == 0)
+            {
+                barButtonItem.ImageUri.Uri = "Prev"; //Refresh // Prev
+                barButtonItem.Caption = "开启自动化";
+            }
+            else
+            {
+                barButtonItem.ImageUri.Uri = "Refresh"; //Refresh // Prev
+                barButtonItem.Caption = "重启自动化";
+            }
+        }
+        /// <summary>
+        /// 创建文件
+        /// </summary>
+        public static void initFile(string path,string data)
+        {
+            if (!File.Exists(path))
+            {
+                File.WriteAllText(path, data);
+            }
+        }
+        /// <summary>
+        /// 复制文件
+        /// </summary>
+        /// <param name="filename">原始文件路径</param>
+        /// <param name="newfilename">目的地文件路径</param>
+        public static void FileCopy(string filename,string newfilename)
+        {
+            if (File.Exists(filename))
+            {
+                if (File.Exists(newfilename))
+                {
+                    File.Delete(newfilename);
+                }
+                File.Copy(filename, newfilename);
+            }
+        }
+        /// <summary>
+        /// 按文件夹删除(删除临时文件夹)
+        /// </summary>
+        /// <param name="DirectoryPath">文件夹路径</param>
+        public static void DirectoryInit(string DirectoryPath)
+        {
+            if (Directory.Exists(DirectoryPath))
+            {
+                Directory.Delete(DirectoryPath, true); //删除文件夹及内容
+            }
+            DirectoryInfo di = Directory.CreateDirectory(DirectoryPath);
+            di.Attributes = FileAttributes.Directory | FileAttributes.Hidden;
+        }
+        public static void DirectoryInitNoDel(string DirectoryPath)
+        {
+            if (!Directory.Exists(DirectoryPath))
+            {
+                DirectoryInfo di = Directory.CreateDirectory(DirectoryPath);
+                di.Attributes = FileAttributes.Directory | FileAttributes.Hidden;
+            }
+        }
+        public static void DirectoryInitNoDelNoHidde(string DirectoryPath)
+        {
+            if (!Directory.Exists(DirectoryPath))
+            {
+                DirectoryInfo di = Directory.CreateDirectory(DirectoryPath);
+                di.Attributes = FileAttributes.Directory;
+            }
+        }
+        /// <summary>
+        /// 刷新后恢复选中
+        /// </summary>
+        /// <param name="gv"></param>
+        /// <param name="selectid"></param>
+        public static void repushSFZT(GridView gv,List<int> selectid)
+        {
+            for (int i = 0; i < gv.RowCount; i++)
+            {
+                for (int j = 0; j < selectid.Count; j++)
+                {
+                    if (gv.GetRowCellValue(i, "Id").ToString() == selectid[j].ToString())
+                    {
+                        gv.SelectRow(i);
+                        break;
+                    }
+                }
+
+            }
+        }
+        /// <summary>
+        /// 获取刷新前id和状态
+        /// </summary>
+        /// <param name="gv"></param>
+        /// <param name="selectid"></param>
+        /// <param name="selectrowzt"></param>
+        public static void getSFZT(GridView gv,ref List<int> selectid,ref List<string> selectrowzt)
+        {
+            var sele = gv.GetSelectedRows();
+            foreach (var i in sele)
+            {
+                selectid.Add(Convert.ToInt32(gv.GetRowCellValue(i, "Id").ToString()));
+                selectrowzt.Add(gv.GetRowCellValue(i, "Taskstatus").ToString());
+            }
+        }
+    }
+}

+ 3 - 3
Uninpho.DBOperation/Model/T_dwfile_account .cs

@@ -9,12 +9,12 @@ 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 Starttime { get; set; }
+        public string 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 Remark { get; set; }
         public string Taskstatus { get; set; }
         public string Srlj { get; set; }
     }

+ 24 - 8
Uninpho.DBOperation/Operation/DataAnalysisToPG.cs

@@ -54,21 +54,23 @@ namespace Uninpho.DBOperation.Operation
         /// </summary>
         public static Object getDwfile(string cxtj, List<int> suanfarunid, List<string> suanfazt)
         {
-            var obj = db.SqlQueryable<T_dwfile_account>("select * from \"t_dwfile_account\"").ToList();
+          
+            var obj = db.SqlQueryable<T_dwfile_account>("select * from \"t_dwfile_account\" ").ToList();
             for (int i = 0; i < obj.Count; i++)
             {
+
                 if (!File.Exists(obj[i].Srlj))
                 {
                     obj[i].Filestatus = "文件未找到";
                 }
 
-                ///for (int j = 0; j < suanfarunid.Count; j++)
-                ///{
-                ///    if (suanfarunid[j] == obj[i].Id)
-                ///    {
-                ///        obj[i].TaskStatus = suanfazt[j];
-                ///    }
-                ///}
+                for (int j = 0; j < suanfarunid.Count; j++)
+                {
+                    if (suanfarunid[j] == obj[i].Id)
+                    {
+                        obj[i].Taskstatus = suanfazt[j];
+                    }
+                }
             }
             return obj;
         }
@@ -186,6 +188,13 @@ namespace Uninpho.DBOperation.Operation
              db.Insertable(updateObjs).ExecuteCommand();
         }
         /// <summary>
+        /// T_dwfile_account表添加新数据
+        /// </summary>
+        public static void GLInsertToPG(List<T_dwfile_account> updateObjs)
+        {
+            db.Insertable(updateObjs).ExecuteCommand();
+        }
+        /// <summary>
         /// 密贴离缝表添加新数据
         /// </summary>
         public static string InsertMTLFListDataToPG(T_mitielifeng_filelist updateObjs)
@@ -484,6 +493,13 @@ namespace Uninpho.DBOperation.Operation
             return db.Queryable<T_file_account>().Where(it => it.Yswjm == yswjm).ToList();
         }
         /// <summary>
+        /// 按文件名查询电务文件
+        /// </summary>
+        public static Object DWQueryToPGByNameFile(string filename)
+        {
+            return db.Queryable<T_dwfile_account>().Where(it => it.Filename == filename).ToList();
+        }
+        /// <summary>
         /// 微笑算法筛选Sudu >= 100 && Zcx != "侧向"的数据
         /// </summary>
         public static Object QueryToPGByNameWXSF(string id)