Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

Bin/x64/Debug/Config/ConfigTemplate/IncA/ReportTemplateConfig.xml

@@ -154,9 +154,10 @@
       <YS1>Fe</YS1>
     </list_str_kllb_qcys>
     <str_kllb_qcys>C,Fe</str_kllb_qcys>
-    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
+    <str_kllb_DeleteClass>SiC,FeO</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
-      <YS0>misc</YS0>
+      <YS0>SiC</YS0>
+      <YS1>FeO</YS1>
     </list_str_kllb_DeleteClass>
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
@@ -164,7 +165,7 @@
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
   </M_address>
   <M_JZWZB>
-    <b_ck_surface>True</b_ck_surface>
-    <b_ck_chart>True</b_ck_chart>
+    <b_ck_surface>False</b_ck_surface>
+    <b_ck_chart>False</b_ck_chart>
   </M_JZWZB>
 </XmlConfig>

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -30,6 +30,9 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         UserLibraryData userLibrary;
         DataTable userLibraryData;
         DataTable m_bt_DBData = new DataTable();
+        /// <summary>
+        /// 三元图列表
+        /// </summary>
         List<string> TemplateList;
         frmReportConditionChoose m_condition;
 

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -81,6 +81,9 @@ namespace OTSIncAReportApp
         /// </summary>
         public class c_TemplateClass
         {
+            /// <summary>
+            /// 配置文件路径
+            /// </summary>
             public DZ M_DZ { get; set; }
 
             #region 属性
@@ -627,7 +630,7 @@ namespace OTSIncAReportApp
 
             m_mbszclass = new c_TemplateClass();
 
-            //读取配置文件中的模板
+            //读取配置文件中的模板路径
             LoadMBSZClass();
 
             LoadRouteclass();
@@ -1806,6 +1809,39 @@ namespace OTSIncAReportApp
                 //m_mbszclass.M_KLLBXX.str_cb_kllb_chartSort_p3 = Convert.ToString(xmlutil.Read("M_KLLBXX", "str_cb_kllb_chartSort_p3"));//帧图表列中第三个可选参数
                 //m_mbszclass.M_KLLBXX.index_cb_kllb_chartSort_p3 = Convert.ToInt32(xmlutil.Read("M_KLLBXX", "index_cb_kllb_chartSort_p3"));
                 m_mbszclass.M_KLLBXX.list_int_kllb_number= Convert.ToInt32(xmlutil.Read("M_KLLBXX", "list_int_kllb_number"));//保存显示颗粒数量
+
+                m_mbszclass.M_KLLBXX.str_kllb_qcys = Convert.ToString(xmlutil.Read("M_KLLBXX", "str_kllb_qcys"));
+                m_mbszclass.M_KLLBXX.list_str_kllb_qcys.Clear();
+                for (int i = 0; i < 100; i++)                              //取得所有元素列表
+                {
+                    string str = xmlutil.Read("M_KLLBXX", "list_str_kllb_qcys", "YS" + i.ToString());
+                    if (str == null)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        m_mbszclass.M_KLLBXX.list_str_kllb_qcys.Add(str);
+                    }
+                }
+                m_mbszclass.M_KLLBXX.str_kllb_DeleteClass = Convert.ToString(xmlutil.Read("M_KLLBXX", "str_kllb_DeleteClass"));
+                m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Clear();
+                for (int i = 0; i < 100; i++)                              //取得所有元素列表
+                {
+                    string str = xmlutil.Read("M_KLLBXX", "list_str_kllb_DeleteClass", "YS" + i.ToString());
+                    if (str == null)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Add(str);
+                    }
+                }
+
+                //夹杂物占比
+                m_mbszclass.M_JZWZB.b_ck_surface = Convert.ToBoolean(xmlutil.Read("M_JZWZB", "b_ck_surface"));//夹杂物占比表
+                m_mbszclass.M_JZWZB.b_ck_chart = Convert.ToBoolean(xmlutil.Read("M_JZWZB", "b_ck_chart"));//夹杂物占比图
             }
         }