فهرست منبع

修复报告导出时分类方案,无标准库更正为夹杂物标准库

zhangjiaxin 2 سال پیش
والد
کامیت
1a3175b22c
2فایلهای تغییر یافته به همراه5 افزوده شده و 3 حذف شده
  1. 4 2
      OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs
  2. 1 1
      OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

+ 4 - 2
OTSIncAReportApp/1-UI/Control_Grids/ResultGrid.cs

@@ -167,7 +167,8 @@ namespace OTSIncAReportGrids
             keyValues.Add(table["col5"].ToString(), filedCount.ToString());
             keyValues.Add(table["col12"].ToString(), Math.Round(Magnification, 2).ToString());
             string LibraryName = "";
-            if ("NoSTDDB"== ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
+            if ("NoSTDDB"== ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString() ||
+                "NoSTDDB.db" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
             {
                 LibraryName = "OTSIncASysSTD";
             }
@@ -258,7 +259,8 @@ namespace OTSIncAReportGrids
             keyValues.Add(table["col5"].ToString(), all_FiledCount.ToString());
 
             string LibraryName = "";
-            if ("NoSTDDB" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
+            if ("NoSTDDB" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString()||
+                "NoSTDDB.db" == ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)resfile.ResultInfo["Sample"])["Members"])["MsrParams"])["STDName"].ToString())
             {
                 LibraryName = "OTSIncASysSTD";
             }

+ 1 - 1
OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -261,7 +261,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             pieSeriesClass.ValueDataMembers.AddRange(new string[] { "total" });
             (pieSeriesClass.Label as PieSeriesLabel).Position = PieSeriesLabelPosition.Inside;
             //显示百分比
-            pieSeriesClass.PointOptions.PointView = PointView.ArgumentAndValues;
+            pieSeriesClass.PointOptions.PointView = PointView.ArgumentAndValues; 
             pieSeriesClass.PointOptions.ValueNumericOptions.Format = NumericFormat.Percent;
             //设置数据源
             pieSeriesClass.DataSource = dt_class_dt;