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

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -168,7 +168,7 @@ namespace OTSIncAReportTemplate
             #region 选择报告模板
             if (m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk == true && m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk == true && m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk == true)
             {
-                rmReport1.LoadFromFile("Resources\\ReportTemplate\\group1.rmf");
+                rmReport1.LoadFromFile("Resources\\ReportTemplate\\Inca.rmf");
             }
             else
             if (m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk == false && m_mbszclass.M_YSFXJG.b_ck_yscf_xsmk == false && m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk == true)
@@ -208,12 +208,12 @@ namespace OTSIncAReportTemplate
 
             if (m_mbszclass.M_SYXT.b_ck_syxt_xsmk)//判断三元相图是否显示
             {
-                rmReport1.FindObject("GroupHeader81").Prop["Visible"] = true;
+                rmReport1.FindObject("GroupHeader1").Prop["Visible"] = true;
                 if (m_mbszclass.M_SYXT.str_cb_syxt_mhxssl == "2")
                 {
                     DataTable ls_dt_picSYXT = list_dt.Where(aa => aa.TableName.Contains("PicSYXT2T")).ToList()[0];//一排两个三元相图
-                    rmReport1.FindObject("MasterData10").Prop["Visible"] = false;
-                    rmReport1.FindObject("MasterData96").Prop["Visible"] = true;
+                    rmReport1.FindObject("MasterData18").Prop["Visible"] = false;
+                    rmReport1.FindObject("MasterData10").Prop["Visible"] = true;
                     rmReport1.AddDataSet(ls_dt_picSYXT, "PicSYXT");//三元相图
                     ls_dt_picSYXT.Dispose();
 
@@ -221,8 +221,8 @@ namespace OTSIncAReportTemplate
                 else if (m_mbszclass.M_SYXT.str_cb_syxt_mhxssl == "3")
                 {
                     DataTable ls_dt_picSYXT3T = list_dt.Where(aa => aa.TableName.Contains("PicSYXT3T")).ToList()[0];//一排三个三元相图
-                    rmReport1.FindObject("MasterData96").Prop["Visible"] = false;
-                    rmReport1.FindObject("MasterData10").Prop["Visible"] = true;
+                    rmReport1.FindObject("MasterData10").Prop["Visible"] = false;
+                    rmReport1.FindObject("MasterData18").Prop["Visible"] = true;
                     rmReport1.AddDataSet(ls_dt_picSYXT3T, "PicSYXT3T");
                     ls_dt_picSYXT3T.Dispose();
                     //ls_dt_picSYXT3T.Clear();