Ver código fonte

修改从测量打开报告的错误

cxs 1 ano atrás
pai
commit
12c303442a

+ 1 - 1
OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -159,7 +159,7 @@ namespace OTSIncAReportApp
             List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, particleSizeDistribution, averageElementComposition };
             ResultFile resultinfo = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResultId()];
             //var Systype = ((Dictionary<string, object>)((Dictionary<string, object>)((Dictionary<string, object>)(Dictionary<string, object>)resultinfo.ResultInfo["Sample"])["Members"])["MsrParams"])["SysType"].ToString();
-            var Systype = m_ReportApp.m_RptConfigFile.Systype;
+            var Systype = RptConfigFile.GetRptConfig().Systype;
 
             if (Systype == OTS_SysType_ID.IncA)
             {

+ 2 - 5
OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -325,9 +325,6 @@ namespace OTSIncAReportApp
         /// <param name="e"></param>
         private void OTSReportApp_Load(object sender, EventArgs e)
         {
-           
-           
-
             log = NLog.LogManager.GetCurrentClassLogger();
 
             //------------- initialize the HMI of the main form.
@@ -392,8 +389,8 @@ namespace OTSIncAReportApp
             {
                 rbHelp.Enabled = true;
             }
-            m_RptConfigFile = RptConfigFile.GetRptConfig();         //报表程序的配置文件
-            this.Text = "ReportApp(" + m_RptConfigFile.Systype.ToString() + ")";
+            m_RptConfigFile =RptConfigFile.GetRptConfig();         //报表程序的配置文件
+            this.Text = "ReportApp(" + m_rstDataMgr.m_RptConfigFile.Systype.ToString() + ")";
         }
 
         #endregion