修改报告夹杂物位置显示不对的问题（张佳鑫）

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1590,6 +1590,7 @@ namespace OTSIncAReportApp
                     {
                         if (m_mbszclass.M_JZWZB.b_ck_chart)
                         {
+                            //DEVReport.XRPageBreak();
                             DEVReport.set_incaPIC_classify();
                             DEVReport.set_incaPIC_subdivision();
                         }
@@ -1599,7 +1600,11 @@ namespace OTSIncAReportApp
                     if (ls_str.IndexOf(table["ternary_graph"].ToString()) > -1)//三元图
                     {
                         if (m_mbszclass.M_SYXT.b_ck_syxt_xsmk)
+                        {
+                            DEVReport.XRPageBreak();
                             DEVReport.InsertReportTemplateChart_Trianglediagram();
+                        }
+                           
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -597,6 +597,17 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 XRTableCellData_AreaOfInclusion(row, tCell_inca_FieldRatio, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "inca_FieldRatio");
                 xr_tbAreaOfInclusion.Rows.Add(row);
             }
+
+
+            NeueStartposition = NeueStartposition + xr_tbAreaOfInclusion.SizeF.Height + 20;
+        }
+        public void XRPageBreak()
+        {
+
+            XRPageBreak xRPage = new XRPageBreak();
+            xRPage.Name = "kllb_Page";
+            xRPage.LocationF = new PointF(0, NeueStartposition + 2);
+            this.Detail.Controls.Add(xRPage);
         }
         /// <summary>
         /// 设置插入夹杂物面积比图像
@@ -606,6 +617,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         {
             xrChart_incaClass.Visible = true;
             xrLabel_inca_pic_class.Visible = true;
+
+            //xrLabel_inca_pic_class.LocationF= new PointF(0, NeueStartposition + 2);
+            //xrChart_incaClass.LocationF = new PointF(0, NeueStartposition + 2);
             DataTable data = export_ReportTemplate.ClassificationIntegration(TemplateClass, dev_sczs_text.Text);
 
             for (int i=0;i<data.Rows.Count;i++)
@@ -649,12 +663,17 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrChart_incaClass.Legend.VerticalIndent = 5;
             this.xrChart_incaClass.Legend.Border.Color = Color.Red;//红色边框
 
+            NeueStartposition = xrChart_incaClass.LocationF.Y + xrChart_incaClass.Height+5;
         }
         public void set_incaPIC_subdivision()
         {
             xrChart_incaSubdivision.Visible = true;
             xrLabel_inca_pic_subdivision.Visible = true;
 
+            xrLabel_inca_pic_subdivision.LocationF = new PointF(xrLabel_inca_pic_subdivision.LocationF.X, NeueStartposition + 2);
+            NeueStartposition = xrLabel_inca_pic_subdivision.LocationF.Y + xrLabel_inca_pic_subdivision.Height + 2;
+            xrChart_incaSubdivision.LocationF = new PointF(xrChart_incaSubdivision.LocationF.X, NeueStartposition + 2);
+            NeueStartposition = xrChart_incaSubdivision.LocationF.Y + xrChart_incaSubdivision.Height + 2;
             DataTable data = export_ReportTemplate.subdivisionIntegration(TemplateClass);
 
             for (int i=0;i<data.Rows.Count;i++)