|
@@ -140,7 +140,7 @@ namespace OTSIncAReportApp.Control_ECharts
|
|
|
if (ComSel == "PSize")
|
|
|
{
|
|
|
ComSel = "PSizeCombin";
|
|
|
- m_ReportApp.dataCombin = JsonConvert.SerializeObject(GetListJsonStrByChartStruct()[0]);
|
|
|
+ m_ReportApp.dataCombin = JsonConvert.SerializeObject(GetListJsonStrByChartStruct(sel)[0]);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -973,7 +973,7 @@ namespace OTSIncAReportApp.Control_ECharts
|
|
|
DataTable dtp = particledata.GetParticleAll(filedAndParticl);
|
|
|
|
|
|
//计算分类整个表的数据
|
|
|
- DataTable dt = ClassificationIntegration(path);
|
|
|
+ DataTable dt = ClassificationIntegration(path, sel);
|
|
|
List<string> listClassificationName = new List<string>();
|
|
|
//ListName
|
|
|
for (int i = 0; i < dt.Rows.Count; i++)
|