Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.Designer.cs

@@ -38,6 +38,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
             this.dev_yj = new DevExpress.XtraReports.UI.XRLabel();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrPageBreak6 = new DevExpress.XtraReports.UI.XRPageBreak();
+            this.xrTb_ElementAnalysis = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -172,12 +178,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_fbt = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_zbt = new DevExpress.XtraReports.UI.XRLabel();
             this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrTb_ElementAnalysis = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrPageBreak6 = new DevExpress.XtraReports.UI.XRPageBreak();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaSubdivision)).BeginInit();
@@ -188,7 +189,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // TopMargin
@@ -291,6 +291,63 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Detail.HeightF = 4297.083F;
             this.Detail.Name = "Detail";
             // 
+            // xrPageBreak6
+            // 
+            this.xrPageBreak6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2109.292F);
+            this.xrPageBreak6.Name = "xrPageBreak6";
+            this.xrPageBreak6.Visible = false;
+            // 
+            // xrTb_ElementAnalysis
+            // 
+            this.xrTb_ElementAnalysis.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTb_ElementAnalysis.BorderWidth = 0.5F;
+            this.xrTb_ElementAnalysis.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 2125.959F);
+            this.xrTb_ElementAnalysis.Name = "xrTb_ElementAnalysis";
+            this.xrTb_ElementAnalysis.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+            this.xrTb_ElementAnalysis.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow22,
+            this.xrTableRow23});
+            this.xrTb_ElementAnalysis.SizeF = new System.Drawing.SizeF(667.9998F, 49.99902F);
+            this.xrTb_ElementAnalysis.StylePriority.UseBorders = false;
+            this.xrTb_ElementAnalysis.StylePriority.UseBorderWidth = false;
+            this.xrTb_ElementAnalysis.Visible = false;
+            // 
+            // xrTableRow22
+            // 
+            this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell30});
+            this.xrTableRow22.Name = "xrTableRow22";
+            this.xrTableRow22.Weight = 1D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.BackColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell30.Multiline = true;
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseBackColor = false;
+            this.xrTableCell30.StylePriority.UseTextAlignment = false;
+            this.xrTableCell30.Text = "xrCellElementArea";
+            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell30.Weight = 2D;
+            // 
+            // xrTableRow23
+            // 
+            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell31});
+            this.xrTableRow23.Name = "xrTableRow23";
+            this.xrTableRow23.Weight = 1D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.Multiline = true;
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.StylePriority.UseTextAlignment = false;
+            this.xrTableCell31.Text = "xrCellElementArea_details";
+            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell31.Weight = 2D;
+            // 
             // xrTable2
             // 
             this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3858.25F);
@@ -326,12 +383,18 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // xrTableCell6
             // 
             this.xrTableCell6.BackColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell6.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell6.BorderWidth = 1F;
+            this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F);
             this.xrTableCell6.Multiline = true;
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.StylePriority.UseBackColor = false;
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UseBorderWidth = false;
+            this.xrTableCell6.StylePriority.UseFont = false;
             this.xrTableCell6.StylePriority.UseTextAlignment = false;
             this.xrTableCell6.Text = "xrTableCell6";
-            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell6.Weight = 1.8907547354294869D;
             // 
             // xrTableCell5
@@ -587,6 +650,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTable_kllb_surface.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable_kllb_surface.BorderWidth = 0.5F;
             this.xrTable_kllb_surface.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3274.917F);
             this.xrTable_kllb_surface.Name = "xrTable_kllb_surface";
             this.xrTable_kllb_surface.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
@@ -595,6 +659,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTableRow17});
             this.xrTable_kllb_surface.SizeF = new System.Drawing.SizeF(688F, 60F);
             this.xrTable_kllb_surface.StylePriority.UseBorders = false;
+            this.xrTable_kllb_surface.StylePriority.UseBorderWidth = false;
             this.xrTable_kllb_surface.Visible = false;
             // 
             // xrTableRow16
@@ -687,6 +752,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xr_tbAreaOfInclusion.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xr_tbAreaOfInclusion.BorderWidth = 0.5F;
             this.xr_tbAreaOfInclusion.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 2263.374F);
             this.xr_tbAreaOfInclusion.Name = "xr_tbAreaOfInclusion";
             this.xr_tbAreaOfInclusion.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
@@ -695,6 +761,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTableRow13});
             this.xr_tbAreaOfInclusion.SizeF = new System.Drawing.SizeF(667.9998F, 50F);
             this.xr_tbAreaOfInclusion.StylePriority.UseBorders = false;
+            this.xr_tbAreaOfInclusion.StylePriority.UseBorderWidth = false;
             this.xr_tbAreaOfInclusion.StylePriority.UseTextAlignment = false;
             this.xr_tbAreaOfInclusion.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xr_tbAreaOfInclusion.Visible = false;
@@ -773,6 +840,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTb_ElementAnalysisTable.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTb_ElementAnalysisTable.BorderWidth = 0.5F;
             this.xrTb_ElementAnalysisTable.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2017.542F);
             this.xrTb_ElementAnalysisTable.Name = "xrTb_ElementAnalysisTable";
             this.xrTb_ElementAnalysisTable.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
@@ -782,6 +850,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTableRow14});
             this.xrTb_ElementAnalysisTable.SizeF = new System.Drawing.SizeF(688F, 75.00012F);
             this.xrTb_ElementAnalysisTable.StylePriority.UseBorders = false;
+            this.xrTb_ElementAnalysisTable.StylePriority.UseBorderWidth = false;
             this.xrTb_ElementAnalysisTable.StylePriority.UseTextAlignment = false;
             this.xrTb_ElementAnalysisTable.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTb_ElementAnalysisTable.Visible = false;
@@ -844,91 +913,91 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrCell_Element_classify.Multiline = true;
             this.xrCell_Element_classify.Name = "xrCell_Element_classify";
             this.xrCell_Element_classify.Text = "classify";
-            this.xrCell_Element_classify.Weight = 1D;
+            this.xrCell_Element_classify.Weight = 1.3037790753120602D;
             // 
             // xrCell_Element_subdivision
             // 
             this.xrCell_Element_subdivision.Multiline = true;
             this.xrCell_Element_subdivision.Name = "xrCell_Element_subdivision";
             this.xrCell_Element_subdivision.Text = "subdivision";
-            this.xrCell_Element_subdivision.Weight = 1D;
+            this.xrCell_Element_subdivision.Weight = 1.3037790753120597D;
             // 
             // xrCell_Element_Area
             // 
             this.xrCell_Element_Area.Multiline = true;
             this.xrCell_Element_Area.Name = "xrCell_Element_Area";
             this.xrCell_Element_Area.Text = "Area";
-            this.xrCell_Element_Area.Weight = 1D;
+            this.xrCell_Element_Area.Weight = 0.94476744740508312D;
             // 
             // xrCell_Element_s1
             // 
             this.xrCell_Element_s1.Multiline = true;
             this.xrCell_Element_s1.Name = "xrCell_Element_s1";
             this.xrCell_Element_s1.Text = "xrCell_Element_s1";
-            this.xrCell_Element_s1.Weight = 1D;
+            this.xrCell_Element_s1.Weight = 0.94476744740508312D;
             // 
             // xrCell_Element_s2
             // 
             this.xrCell_Element_s2.Multiline = true;
             this.xrCell_Element_s2.Name = "xrCell_Element_s2";
             this.xrCell_Element_s2.Text = "xrCell_Element_s2";
-            this.xrCell_Element_s2.Weight = 1D;
+            this.xrCell_Element_s2.Weight = 0.94476744740508323D;
             // 
             // xrCell_Element_s3
             // 
             this.xrCell_Element_s3.Multiline = true;
             this.xrCell_Element_s3.Name = "xrCell_Element_s3";
             this.xrCell_Element_s3.Text = "xrCell_Element_s3";
-            this.xrCell_Element_s3.Weight = 1D;
+            this.xrCell_Element_s3.Weight = 0.94476744740508312D;
             // 
             // xrCell_Element_s4
             // 
             this.xrCell_Element_s4.Multiline = true;
             this.xrCell_Element_s4.Name = "xrCell_Element_s4";
             this.xrCell_Element_s4.Text = "xrCell_Element_s4";
-            this.xrCell_Element_s4.Weight = 1D;
+            this.xrCell_Element_s4.Weight = 0.94476744740508334D;
             // 
             // xrCell_Element_s5
             // 
             this.xrCell_Element_s5.Multiline = true;
             this.xrCell_Element_s5.Name = "xrCell_Element_s5";
             this.xrCell_Element_s5.Text = "xrCell_Element_s5";
-            this.xrCell_Element_s5.Weight = 1D;
+            this.xrCell_Element_s5.Weight = 0.94476744740508323D;
             // 
             // xrCell_Element_s6
             // 
             this.xrCell_Element_s6.Multiline = true;
             this.xrCell_Element_s6.Name = "xrCell_Element_s6";
             this.xrCell_Element_s6.Text = "xrCell_Element_s6";
-            this.xrCell_Element_s6.Weight = 1D;
+            this.xrCell_Element_s6.Weight = 0.94476744740508334D;
             // 
             // xrCell_Element_s7
             // 
             this.xrCell_Element_s7.Multiline = true;
             this.xrCell_Element_s7.Name = "xrCell_Element_s7";
             this.xrCell_Element_s7.Text = "xrCell_Element_s7";
-            this.xrCell_Element_s7.Weight = 1D;
+            this.xrCell_Element_s7.Weight = 0.94476744740508312D;
             // 
             // xrCell_Element_s8
             // 
             this.xrCell_Element_s8.Multiline = true;
             this.xrCell_Element_s8.Name = "xrCell_Element_s8";
             this.xrCell_Element_s8.Text = "xrCell_Element_s8";
-            this.xrCell_Element_s8.Weight = 1D;
+            this.xrCell_Element_s8.Weight = 0.94476744740508323D;
             // 
             // xrCell_Element_s9
             // 
             this.xrCell_Element_s9.Multiline = true;
             this.xrCell_Element_s9.Name = "xrCell_Element_s9";
             this.xrCell_Element_s9.Text = "xrCell_Element_s9";
-            this.xrCell_Element_s9.Weight = 1D;
+            this.xrCell_Element_s9.Weight = 0.94476744740508312D;
             // 
             // xrCell_Element_s10
             // 
             this.xrCell_Element_s10.Multiline = true;
             this.xrCell_Element_s10.Name = "xrCell_Element_s10";
             this.xrCell_Element_s10.Text = "xrCell_Element_s10";
-            this.xrCell_Element_s10.Weight = 1D;
+            this.xrCell_Element_s10.Weight = 0.94476737532504773D;
             // 
             // xrPageBreak3
             // 
@@ -1012,15 +1081,17 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTa_ParticleSizeTable.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTa_ParticleSizeTable.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 932.6249F);
+            this.xrTa_ParticleSizeTable.BorderWidth = 0.5F;
+            this.xrTa_ParticleSizeTable.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 932.6249F);
             this.xrTa_ParticleSizeTable.Name = "xrTa_ParticleSizeTable";
             this.xrTa_ParticleSizeTable.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
             this.xrTa_ParticleSizeTable.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow8,
             this.xrTableRow9,
             this.xrTableRow10});
-            this.xrTa_ParticleSizeTable.SizeF = new System.Drawing.SizeF(629.9998F, 107.2916F);
+            this.xrTa_ParticleSizeTable.SizeF = new System.Drawing.SizeF(668F, 107.2916F);
             this.xrTa_ParticleSizeTable.StylePriority.UseBorders = false;
+            this.xrTa_ParticleSizeTable.StylePriority.UseBorderWidth = false;
             this.xrTa_ParticleSizeTable.Visible = false;
             // 
             // xrTableRow8
@@ -1041,7 +1112,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_DimensionTable.StylePriority.UseTextAlignment = false;
             this.dev_DimensionTable.Text = "颗粒尺寸分析结果";
             this.dev_DimensionTable.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_DimensionTable.Weight = 10D;
+            this.dev_DimensionTable.Weight = 9.1826408944605067D;
             // 
             // xrTableRow9
             // 
@@ -1059,7 +1130,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_DimensionTable_2.StylePriority.UseTextAlignment = false;
             this.dev_DimensionTable_2.Text = "尺寸计算基于:";
             this.dev_DimensionTable_2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.dev_DimensionTable_2.Weight = 10D;
+            this.dev_DimensionTable_2.Weight = 9.1826408944605067D;
             // 
             // xrTableRow10
             // 
@@ -1079,99 +1150,115 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // dev_classify
             // 
-            this.dev_classify.Font = new System.Drawing.Font("Arial", 9F);
+            this.dev_classify.BorderWidth = 0.5F;
+            this.dev_classify.Font = new System.Drawing.Font("微软雅黑", 8F);
             this.dev_classify.Multiline = true;
             this.dev_classify.Name = "dev_classify";
+            this.dev_classify.StylePriority.UseBorderWidth = false;
             this.dev_classify.StylePriority.UseFont = false;
             this.dev_classify.StylePriority.UseTextAlignment = false;
             this.dev_classify.Text = "分类";
             this.dev_classify.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_classify.Weight = 1D;
+            this.dev_classify.Weight = 1.3746468489653694D;
             // 
             // dev_subdivision
             // 
-            this.dev_subdivision.Font = new System.Drawing.Font("Arial", 9F);
+            this.dev_subdivision.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_subdivision.Multiline = true;
             this.dev_subdivision.Name = "dev_subdivision";
             this.dev_subdivision.StylePriority.UseFont = false;
             this.dev_subdivision.StylePriority.UseTextAlignment = false;
             this.dev_subdivision.Text = "子分类";
             this.dev_subdivision.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_subdivision.Weight = 1D;
+            this.dev_subdivision.Weight = 1.3746468544467112D;
             // 
             // dev_quantity
             // 
-            this.dev_quantity.Font = new System.Drawing.Font("Arial", 9F);
+            this.dev_quantity.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_quantity.Multiline = true;
             this.dev_quantity.Name = "dev_quantity";
             this.dev_quantity.StylePriority.UseFont = false;
             this.dev_quantity.StylePriority.UseTextAlignment = false;
             this.dev_quantity.Text = "数量";
             this.dev_quantity.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_quantity.Weight = 1D;
+            this.dev_quantity.Weight = 0.75605576526438278D;
             // 
             // dev_size_1
             // 
+            this.dev_size_1.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_size_1.Multiline = true;
             this.dev_size_1.Name = "dev_size_1";
+            this.dev_size_1.StylePriority.UseFont = false;
             this.dev_size_1.StylePriority.UseTextAlignment = false;
             this.dev_size_1.Text = "dev_size_1";
             this.dev_size_1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_size_1.Weight = 1D;
+            this.dev_size_1.Weight = 0.81104165955255658D;
             // 
             // dev_size_2
             // 
+            this.dev_size_2.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_size_2.Multiline = true;
             this.dev_size_2.Name = "dev_size_2";
+            this.dev_size_2.StylePriority.UseFont = false;
             this.dev_size_2.StylePriority.UseTextAlignment = false;
             this.dev_size_2.Text = "dev_size_2";
             this.dev_size_2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_size_2.Weight = 1D;
+            this.dev_size_2.Weight = 0.81104165955255647D;
             // 
             // dev_size_3
             // 
+            this.dev_size_3.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_size_3.Multiline = true;
             this.dev_size_3.Name = "dev_size_3";
+            this.dev_size_3.StylePriority.UseFont = false;
             this.dev_size_3.StylePriority.UseTextAlignment = false;
             this.dev_size_3.Text = "dev_size_3";
             this.dev_size_3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_size_3.Weight = 1D;
+            this.dev_size_3.Weight = 0.81104165955255669D;
             // 
             // dev_size_4
             // 
+            this.dev_size_4.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_size_4.Multiline = true;
             this.dev_size_4.Name = "dev_size_4";
+            this.dev_size_4.StylePriority.UseFont = false;
             this.dev_size_4.StylePriority.UseTextAlignment = false;
             this.dev_size_4.Text = "dev_size_4";
             this.dev_size_4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_size_4.Weight = 1D;
+            this.dev_size_4.Weight = 0.81104165955255625D;
             // 
             // dev_size_5
             // 
+            this.dev_size_5.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_size_5.Multiline = true;
             this.dev_size_5.Name = "dev_size_5";
+            this.dev_size_5.StylePriority.UseFont = false;
             this.dev_size_5.StylePriority.UseTextAlignment = false;
             this.dev_size_5.Text = "dev_size_5";
             this.dev_size_5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_size_5.Weight = 1D;
+            this.dev_size_5.Weight = 0.81104165955255658D;
             // 
             // dev_size_6
             // 
+            this.dev_size_6.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_size_6.Multiline = true;
             this.dev_size_6.Name = "dev_size_6";
+            this.dev_size_6.StylePriority.UseFont = false;
             this.dev_size_6.StylePriority.UseTextAlignment = false;
             this.dev_size_6.Text = "dev_size_6";
             this.dev_size_6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_size_6.Weight = 1D;
+            this.dev_size_6.Weight = 0.81104165955255614D;
             // 
             // dev_size_7
             // 
+            this.dev_size_7.Font = new System.Drawing.Font("Arial", 8F);
             this.dev_size_7.Multiline = true;
             this.dev_size_7.Name = "dev_size_7";
+            this.dev_size_7.StylePriority.UseFont = false;
             this.dev_size_7.StylePriority.UseTextAlignment = false;
             this.dev_size_7.Text = "dev_size_7";
             this.dev_size_7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.dev_size_7.Weight = 1D;
+            this.dev_size_7.Weight = 0.81104146846870251D;
             // 
             // xrTable1
             // 
@@ -1586,61 +1673,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
             this.xrPictureBox2.Visible = false;
             // 
-            // xrTb_ElementAnalysis
-            // 
-            this.xrTb_ElementAnalysis.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTb_ElementAnalysis.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 2125.959F);
-            this.xrTb_ElementAnalysis.Name = "xrTb_ElementAnalysis";
-            this.xrTb_ElementAnalysis.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
-            this.xrTb_ElementAnalysis.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow22,
-            this.xrTableRow23});
-            this.xrTb_ElementAnalysis.SizeF = new System.Drawing.SizeF(667.9998F, 49.99902F);
-            this.xrTb_ElementAnalysis.StylePriority.UseBorders = false;
-            this.xrTb_ElementAnalysis.Visible = false;
-            // 
-            // xrTableRow22
-            // 
-            this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell30});
-            this.xrTableRow22.Name = "xrTableRow22";
-            this.xrTableRow22.Weight = 1D;
-            // 
-            // xrTableCell30
-            // 
-            this.xrTableCell30.BackColor = System.Drawing.Color.DarkGray;
-            this.xrTableCell30.Multiline = true;
-            this.xrTableCell30.Name = "xrTableCell30";
-            this.xrTableCell30.StylePriority.UseBackColor = false;
-            this.xrTableCell30.StylePriority.UseTextAlignment = false;
-            this.xrTableCell30.Text = "xrCellElementArea";
-            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell30.Weight = 2D;
-            // 
-            // xrTableRow23
-            // 
-            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell31});
-            this.xrTableRow23.Name = "xrTableRow23";
-            this.xrTableRow23.Weight = 1D;
-            // 
-            // xrTableCell31
-            // 
-            this.xrTableCell31.Multiline = true;
-            this.xrTableCell31.Name = "xrTableCell31";
-            this.xrTableCell31.StylePriority.UseTextAlignment = false;
-            this.xrTableCell31.Text = "xrCellElementArea_details";
-            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell31.Weight = 2D;
-            // 
-            // xrPageBreak6
-            // 
-            this.xrPageBreak6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2109.292F);
-            this.xrPageBreak6.Name = "xrPageBreak6";
-            this.xrPageBreak6.Visible = false;
-            // 
             // OTS_DEVReport
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1650,6 +1682,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Font = new System.Drawing.Font("Arial", 9.75F);
             this.Margins = new System.Drawing.Printing.Margins(77, 85, 73, 67);
             this.Version = "20.1";
+            ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaSubdivision)).EndInit();
@@ -1660,7 +1693,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -186,6 +186,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 list_ParticelSizeData.Add(switch_ParticleSize(subscript.Getsubscriptstring(surface_dt.Rows[i]["Class"].ToString()) , subscript.Getsubscriptstring(surface_dt.Rows[i]["Name"].ToString()), surface_dt.Rows[i]["total"].ToString(), surface_dt.Rows[i]["c1"].ToString(), surface_dt.Rows[i]["c2"].ToString(), surface_dt.Rows[i]["c3"].ToString(),
                     surface_dt.Rows[i]["c4"].ToString(), surface_dt.Rows[i]["c5"].ToString(), surface_dt.Rows[i]["c6"].ToString(), surface_dt.Rows[i]["c7"].ToString()));
             }
+            dev_classify.Text = "分类";
+            dev_classify.Font = new Font(Schriftart_chinese, dev_classify.Font.Size);
+            dev_subdivision.Text = "子分类";
+            dev_subdivision.Font = new Font(Schriftart_chinese, dev_subdivision.Font.Size);
+            dev_quantity.Text = "数量";
+            dev_quantity.Font = new Font(Schriftart_chinese, dev_quantity.Font.Size);
             dev_size_1.Text = ls_partsize_dt.Rows[0]["c1"].ToString();
             dev_size_2.Text = ls_partsize_dt.Rows[0]["c2"].ToString();
             dev_size_3.Text = ls_partsize_dt.Rows[0]["c3"].ToString();
@@ -209,6 +215,18 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 XRTableCell tCell_size_5 = new XRTableCell();
                 XRTableCell tCell_size_6 = new XRTableCell();
                 XRTableCell tCell_size_7 = new XRTableCell();
+
+                tCell_Class.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[0].WidthF;
+                tCell_Name.WidthF= xrTa_ParticleSizeTable.Rows[2].Cells[1].WidthF;
+                tCell_total.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[2].WidthF;
+                tCell_size_1.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[3].WidthF;
+                tCell_size_2.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[4].WidthF;
+                tCell_size_3.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[5].WidthF;
+                tCell_size_4.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[6].WidthF;
+                tCell_size_5.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[7].WidthF;
+                tCell_size_6.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[8].WidthF;
+                tCell_size_7.WidthF = xrTa_ParticleSizeTable.Rows[2].Cells[9].WidthF;
+
                 XRTableCellData(row, tCell_Class, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Class");
                 XRTableCellData(row, tCell_Name, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Name");
                 XRTableCellData(row, tCell_total, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_total");
@@ -222,7 +240,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 xrTa_ParticleSizeTable.Rows.Add(row);
 
             }
-
+            
             #region 大分类chart图
             // 实例化饼图对象
             Series pieSeriesClass = new Series("颗粒尺寸大分类", ViewType.Pie);
@@ -318,6 +336,26 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 XRTableCell tCell_s9 = new XRTableCell();
                 XRTableCell tCell_s10 = new XRTableCell();
 
+                tCell_classify.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[0].WidthF;
+                tCell_subdivision.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[1].WidthF;
+                tCell_area.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[2].WidthF;
+                tCell_s1.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[3].WidthF;
+                tCell_s2.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[4].WidthF;
+                tCell_s3.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[5].WidthF;
+                tCell_s4.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[6].WidthF;
+                tCell_s5.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[7].WidthF;
+                tCell_s6.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[8].WidthF;
+                tCell_s7.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[9].WidthF;
+                tCell_s8.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[10].WidthF;
+                tCell_s9.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[11].WidthF;
+                tCell_s10.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[12].WidthF;
+
+
+                //tCell_classify.WidthF = 69f; tCell_subdivision.WidthF = 69f; tCell_area.WidthF = 50f; tCell_s1.WidthF = 50f; tCell_s2.WidthF = 50f;
+                //tCell_s3.WidthF = 50f; tCell_s4.WidthF = 50f; tCell_s5.WidthF = 50f; tCell_s6.WidthF = 50f; tCell_s7.WidthF = 50f; tCell_s8.WidthF = 50f;
+                //tCell_s9.WidthF = 50f; tCell_s10.WidthF = 50f;
+
+
                 XRTableCellData_ElementAnalysis(row, tCell_classify, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "classify");
                 XRTableCellData_ElementAnalysis(row, tCell_subdivision, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "subdivision");
                 XRTableCellData_ElementAnalysis(row, tCell_area, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Area");
@@ -506,17 +544,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Color_list.Add(Color.FromArgb(247, 172, 189));
             Color_list.Add(Color.FromArgb(202, 134, 135));
             Color_list.Add(Color.FromArgb(34, 90, 31));
-            //for (int i = 0; i < TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count; i++)
-            //{
-
-            //    set_syt_pic_legend(Color_list);
-            //    set_syt_pic( TemplateClass, TemplateClass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
-
-            //    XRPageBreak xRPage = new XRPageBreak();
-            //    xRPage.LocationF = new PointF(0, LowPlace + 2);
-            //    this.Detail.Controls.Add(xRPage);
-            //}
-          
+ 
 
             for (int i = 0; i < TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count; i=i+4)
             {
@@ -659,7 +687,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                             //数据表
                             XRTable xRTable = add_XRTable_frame();
                             xRTable.Rows[0].Cells[0].Text = "图像";
+                            xRTable.Rows[0].Cells[0].Font = new Font(Schriftart_chinese, xRTable.Rows[0].Cells[0].Font.Size);
                             xRTable.Rows[0].Cells[1].Text = "分类";
+
+                            xRTable.Rows[0].Cells[1].Font = new Font(Schriftart_chinese, xRTable.Rows[0].Cells[1].Font.Size);
+
                             xRTable.Rows[0].Cells[2].Text = TemplateClass.M_KLLBXX.str_cb_kllb_chartSort_p1.ToString();
                             xRTable.Rows[0].Cells[3].Text = TemplateClass.M_KLLBXX.str_cb_kllb_chartSort_p2.ToString();
 
@@ -1030,10 +1062,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.Rows.Add(Template_Rows_4);
             Template.Rows.Add(Template_Rows_5);
             Template.SizeF = new SizeF(688f, 125);
-            Template.Rows[0].Font = new Font(Schriftart_english, 14f, FontStyle.Bold);
-            Template.Rows[2].Font = new Font(Schriftart_english, 14f, FontStyle.Bold);
-            Template.Rows[1].Font = new Font(Schriftart_english, 14f);
-            Template.Rows[3].Font = new Font(Schriftart_english, 14f);
+            //Template.Rows[0].Font = new Font(Schriftart_english, 12f, FontStyle.Bold);
+            //Template.Rows[2].Font = new Font(Schriftart_english, 12f, FontStyle.Bold);
+            Template.Rows[0].Font = new Font(Schriftart_english, 12f);
+            Template.Rows[2].Font = new Font(Schriftart_english, 12f);
+            Template.Rows[1].Font = new Font(Schriftart_english, 12f);
+            Template.Rows[3].Font = new Font(Schriftart_english, 12f);
 
             Template.Rows[0].BackColor = Color.DarkGray;
             Template.Rows[2].BackColor = Color.DarkGray;
@@ -1101,6 +1135,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             table.LocationF = new PointF(0, NeueStartposition);
             table.SendToBack();
             //table.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+
+            table.BorderWidth = 0.5f;
+
             this.Detail.Controls.Add(table);
             XRPictureBox xRPicture_pic = new XRPictureBox();
             xRPicture_pic.Name = "Picture_kllb_" + position.ToString();
@@ -1226,7 +1263,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.Rows[2].BackColor = Color.DarkGray;
             Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
             Template.SizeF = new SizeF(688f, 30);
-            Template.Font= new Font(Schriftart_english, 14f);
+            Template.Font= new Font(Schriftart_english, 12f);
             return Template;
         }
         #endregion