更新国标导出窗体位置，保持屏幕中心，加载国标数据时改变鼠标状态，提示用户

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1186,50 +1186,8 @@ namespace OTSIncAReportApp
             
             DEVReport = new OTS_DEVReport(this);
             //DEVReport.Dispose();
-          
-
-            ////为防止重复打开报告后，显示数据库占用错误，先确保报告模板进程已关闭
-            //Process[] processes = Process.GetProcesses();
-            //foreach (Process proc in processes)
-            //{
-            //    if (proc.ProcessName == "OTSIncAReportTemplate")
-            //    {
-            //        DialogResult dr = MessageBox.Show(table["messagebox3"].ToString(), table["messagebox4"].ToString(), MessageBoxButtons.OK, MessageBoxIcon.Warning);
-            //        if (dr == DialogResult.OK)
-            //        {
-            //            return;
-            //        }
-            //    }
-            //}
-            ////调用模板设计器，预览
-            ////判断该测量结果文件目录中是否已经有数据库文件，有的话，直接打开，没有则进行导出数据库然后再打开
-            //if (File.Exists(m_strDBpath))
-            //{
-            //    DialogResult dr = MessageBox.Show(table["messagebox5"].ToString(), table["messagebox6"].ToString(), MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
-
-            //    if (dr == DialogResult.Yes)
-            //    {
-            //        WriteRictBox(table["messagebox7"].ToString());
-            //        //存在则直接打开报表
-            //        OpenOTSINcAreportTemplateAPP();
-            //        return;
-            //    }
-            //    if (dr == DialogResult.No)
-            //    {
-            //        //GoTo Here;
-            //        //不干预，跳转到下面执行导出操作
-            //    }
-            //    if (dr == DialogResult.Cancel)
-            //    {
-            //        //取消,返回
-            //        return;
-            //    }
-            //}
-            
-            //frmReportConditionChoose frm = new frmReportConditionChoose(m_ReportApp);
-            //frm.ShowDataDiagram(DisplayPicutureType.AnalyzeDataChart);
-            
 
+          
             m_ReportApp.m_rstDataMgr.setSelectedIndex(cbo_sjy.SelectedIndex);
             
             //重新导出报表数据

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_criterion.Designer.cs

@@ -78,7 +78,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Controls.Add(this.GB_cb_2);
             this.Controls.Add(this.GB_cb_1);
             this.Name = "OTSReport_criterion";
-            this.Text = "OTSReport_criterion";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "标准选择";
             this.ResumeLayout(false);
             this.PerformLayout();
 

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_criterion.cs

@@ -34,7 +34,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
         private void button1_Click(object sender, EventArgs e)
         {
+            Cursor.Current = Cursors.WaitCursor;
             export_Report.criterion_out(GB_Report, in_export, Sample_order, Language_dt, GB_cb_1.Checked, GB_cb_2.Checked,false,false);
+            Cursor.Current = Cursors.WaitCursor;
             this.Close();
         }
 

OTSIncAReportApp/ReportTemplate/GBReport.Designer.cs

@@ -32,7 +32,6 @@ namespace OTSIncAReportApp.ReportTemplate
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GBReport));
             this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
             this.GB_dev_ym = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.xrPageBreak1 = new DevExpress.XtraReports.UI.XRPageBreak();
@@ -60,15 +59,18 @@ namespace OTSIncAReportApp.ReportTemplate
             this.GB_dev_ckbz = new DevExpress.XtraReports.UI.XRTableCell();
             this.GB_dev_ckbz_text = new DevExpress.XtraReports.UI.XRTableCell();
             this.GB_bt = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrLine1 = new DevExpress.XtraReports.UI.XRLine();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // TopMargin
             // 
             this.TopMargin.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLine1,
             this.GB_dev_ym,
             this.xrPictureBox1});
-            this.TopMargin.HeightF = 64.58334F;
+            this.TopMargin.HeightF = 79.25F;
             this.TopMargin.Name = "TopMargin";
             // 
             // GB_dev_ym
@@ -82,13 +84,6 @@ namespace OTSIncAReportApp.ReportTemplate
             this.GB_dev_ym.Text = "标准名";
             this.GB_dev_ym.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(5F, 7F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(159.375F, 47.91667F);
-            // 
             // BottomMargin
             // 
             this.BottomMargin.Name = "BottomMargin";
@@ -310,6 +305,19 @@ namespace OTSIncAReportApp.ReportTemplate
             this.GB_bt.Text = "标准评级";
             this.GB_bt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(5F, 7F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(159.375F, 47.91667F);
+            // 
+            // xrLine1
+            // 
+            this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(5.000051F, 56.25F);
+            this.xrLine1.Name = "xrLine1";
+            this.xrLine1.SizeF = new System.Drawing.SizeF(634.9998F, 23F);
+            // 
             // GBReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -317,7 +325,7 @@ namespace OTSIncAReportApp.ReportTemplate
             this.BottomMargin,
             this.Detail});
             this.Font = new System.Drawing.Font("Arial", 9.75F);
-            this.Margins = new System.Drawing.Printing.Margins(100, 100, 65, 100);
+            this.Margins = new System.Drawing.Printing.Margins(100, 100, 79, 100);
             this.Version = "20.1";
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -356,5 +364,6 @@ namespace OTSIncAReportApp.ReportTemplate
         private DevExpress.XtraReports.UI.XRTableCell GB_dev_ckbz_text;
         private DevExpress.XtraReports.UI.XRLabel GB_bt;
         private DevExpress.XtraReports.UI.XRPageBreak xrPageBreak1;
+        private DevExpress.XtraReports.UI.XRLine xrLine1;
     }
 }