Kaynağa Gözat

补充提交重构报告导出代码文件

zhangjiaxin 1 ay önce
ebeveyn
işleme
b7a333587e

+ 9 - 7
OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -1429,14 +1429,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 row["Area"] = dt.Rows[i]["Area"].ToString();
 				 ddt.Rows.Add(row);
 			}
+            if (m_mbszclass.M_JZWZB.b_ck_surfaceNumber || m_mbszclass.M_JZWZB.b_ck_surfaceArea)
+            {
+				XRPageBreak();
+				//图表填充参数
+				if (m_mbszclass.M_JZWZB.b_ck_surfaceNumber)
+					ChartFillingParameters("数量占比图", ddt, "NameSun", "sun", particleSizeTableCreation, m_mbszclass, m_mbszclass.M_KLFXJG.SubdivisionGraphicSelection);
+				if (m_mbszclass.M_JZWZB.b_ck_surfaceArea)
+					ChartFillingParameters("面积占比图", ddt, "NameArea", "Area", particleSizeTableCreation, m_mbszclass, m_mbszclass.M_KLFXJG.SubdivisionGraphicSelection);
+			}
 
-			XRPageBreak();
-            //图表填充参数
-            if (m_mbszclass.M_JZWZB.b_ck_surfaceNumber)
-                ChartFillingParameters("数量占比图", ddt, "NameSun", "sun", particleSizeTableCreation, m_mbszclass, m_mbszclass.M_KLFXJG.SubdivisionGraphicSelection);
-            if (m_mbszclass.M_JZWZB.b_ck_surfaceArea)
-				ChartFillingParameters("面积占比图", ddt, "NameArea", "Area", particleSizeTableCreation, m_mbszclass, m_mbszclass.M_KLFXJG.SubdivisionGraphicSelection);
-	
 		}
 		/// <summary>
 		/// 图表填充参数