Browse Source

修改解决报告编辑界面打不开的问题

zhangjiaxin 3 năm trước cách đây
mục cha
commit
6d64513910

+ 1 - 1
Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -88,7 +88,7 @@
       <YS7>Mn</YS7>
     </list_str_tb_lllb_sxys>
     <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
-    <b_ck_kllb_fdtx>True</b_ck_kllb_fdtx>
+    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
     <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
   </M_KLLBXX>
   <M_address>

+ 1 - 1
OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -750,7 +750,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     list_str = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.GetPartSizeFileList();
                     break;
                 case OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE://数据类型,全部颗粒,分析颗粒
-                    //list_str = m_OTSReport_Export.m_ReportApp.m_DataMgrFun.GetDataSourceTypeList();
+                    list_str = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.ParticleRange();
                     break;
                 case OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE://三元相图模板
                     list_str = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.GetTriTemplateNameList();

+ 5 - 1
OTSIncAReportApp/2-CommonFunction/OTSDataMgrFunction/ResultDataMgr.cs

@@ -259,7 +259,11 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
             List<string> ret_list = new List<string>() { "DMAX", "DMIN", "CIRCLE", "FERET" };
             return ret_list;
         }
-
+        public List<string> ParticleRange()
+        {
+            List<string> pr_str = new List<string>() { "全部颗粒","选择颗粒" };
+            return pr_str;
+        }
 
 
         #endregion