Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSIncAReportApp/1-UI/OTSReportExport/Template/GBTemplate.cs

@@ -94,6 +94,7 @@ namespace OTSIncAReportApp.ReportTemplate
                 Template_Rows_A_Class.BackColor = Color.DarkGray;
                 Template.Rows.Add(Template_Rows_A_Class);
                 Template.Rows.Add(GB_Class_dataRow(HeaderData, 0));
+                
                 for (int i = 0; i < GB_List[a].Rows.Count; i++)
                 {
                     Template.Rows.Add(GB_Class_dataRow(GB_List[a], i));
@@ -106,7 +107,7 @@ namespace OTSIncAReportApp.ReportTemplate
             }
             if (listStr.Count==0)
             {
-                xrTable1.Rows.Add(GB_fpt(GBName+":此样品所有指标低于国标2.0，不需要优化冶炼工艺"));
+                xrTable1.Rows.Add(GB_fpt(GBName+":此样品所有指标低于国标2.0，不需要优化冶炼工艺",Color.Black));
             }
             else
             {
@@ -116,7 +117,7 @@ namespace OTSIncAReportApp.ReportTemplate
                     str = str + listStr[i];
                 }
                 str = str + "指标超过国标2.0：钢中夹杂物控制不佳，可尝试在工艺上改进。具体改进措施可以咨询我公司软件售后服务炼钢工艺专家团队。";
-                xrTable1.Rows.Add(GB_fpt(str));
+                xrTable1.Rows.Add(GB_fpt(str,Color.Red));
             }
 
             XRTableRow Template_Rows_A_Class_DS = new XRTableRow();
@@ -170,12 +171,13 @@ namespace OTSIncAReportApp.ReportTemplate
             return bl;
             
         }
-        private XRTableRow GB_fpt(string str)
+        private XRTableRow GB_fpt(string str, Color color)
         {
             XRTableRow XRT = new XRTableRow();
             XRTableCell XRTr = new XRTableCell();
             XRTr.WidthF = 480f;
             XRTr.Text = str;
+            XRTr.ForeColor = color;
             XRT.Controls.Add(XRTr);
             return XRT;
         }