Browse Source

报告程序堆叠图BUG修正(修改数据源)

zhangjiaxin 2 months ago
parent
commit
cfcce1f868

+ 5 - 4
OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -1742,7 +1742,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             if (m_mbszclass.M_KLFXJG.b_ck_klcc_xsddt)
             {
-                HistogramChart(particleList);
+                HistogramChart(particleList, basicData);
             }
 
             if (m_mbszclass.M_KLFXJG.b_ck_klcc_dfl || m_mbszclass.M_KLFXJG.b_ck_klcc_xfl)
@@ -1846,12 +1846,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             #endregion
         }
 
-        private void HistogramChart(ParticleAnalysis particleList)
+        private void HistogramChart(ParticleAnalysis particleList, BasicData basicData)
         {
             XRPageBreak();
             List<Series> seriesList = new List<Series>();
-            DataTable dataTable = particleList.ParticleResults(TemplateClass, m_otsreport_export, ComputeMode);
-            DataTable TypeRange = particleList.TypeRange(TemplateClass, m_otsreport_export);
+			
+			DataTable dataTable = particleList.GetSubClassification(basicData); 
+			DataTable TypeRange = particleList.TypeRange(TemplateClass, m_otsreport_export);
             if(dataTable.Rows.Count==0)
             {
                 return;

+ 1 - 0
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1690,6 +1690,7 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>