Merge branch 'lizhongdev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into lizhongdev

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -219,15 +219,15 @@ namespace OTSIncAReportTemplate
             }
             else
             {
-                DataTable dataTable = new DataTable();
-                rmReport1.AddDataSet(dataTable, "PicSYXT2T");//三元相图
-                rmReport1.AddDataSet(dataTable, "PicSYXT3T");
-                dataTable.Dispose();
-                dataTable.Clear();
-                rmReport1.FindObject("GroupHeader81").Prop["Visible"] = false;
-                rmReport1.FindObject("MasterData96").Prop["Visible"] = false;
-                rmReport1.FindObject("MasterData10").Prop["Visible"] = false;
-                rmReport1.DeletePage(3);
+                //DataTable dataTable = new DataTable();
+                //rmReport1.AddDataSet(dataTable, "PicSYXT2T");//三元相图
+                //rmReport1.AddDataSet(dataTable, "PicSYXT3T");
+                //dataTable.Dispose();
+                //dataTable.Clear();
+                //rmReport1.FindObject("GroupHeader81").Prop["Visible"] = false;
+                //rmReport1.FindObject("MasterData96").Prop["Visible"] = false;
+                //rmReport1.FindObject("MasterData10").Prop["Visible"] = false;
+                //rmReport1.DeletePage(3);
             }
 
 
@@ -321,8 +321,8 @@ namespace OTSIncAReportTemplate
                     //ls_dt_elementname.Clear();
                     ls_dt_element.Dispose();
                     //ls_dt_element.Clear();
-                    rmReport1.FindObject("MasterData3").Prop["Visible"] = true;
-                    rmReport1.FindObject("MasterData42").Prop["Visible"] = true;
+                    //rmReport1.FindObject("MasterData3").Prop["Visible"] = true;
+                    //rmReport1.FindObject("MasterData42").Prop["Visible"] = true;
                 }
                 else
                 {