Browse Source

修改功能未完成(导出元素排序)

zhangjiaxin 3 years ago
parent
commit
4c3db27ebc

+ 6 - 4
Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -28,13 +28,15 @@
     <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
-    <str_tb_ysfx_xsys>Al,Si,O,Ca,Mg</str_tb_ysfx_xsys>
+    <str_tb_ysfx_xsys>Al,Si,Ca,Mg,Mn,O,S</str_tb_ysfx_xsys>
     <list_str_tb_ysfx_xsys>
       <YS0>Al</YS0>
       <YS1>Si</YS1>
-      <YS2>O</YS2>
-      <YS3>Ca</YS3>
-      <YS4>Mg</YS4>
+      <YS2>Ca</YS2>
+      <YS3>Mg</YS3>
+      <YS4>Mn</YS4>
+      <YS5>O</YS5>
+      <YS6>S</YS6>
     </list_str_tb_ysfx_xsys>
     <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
     <index_cb_yscf_xstx>0</index_cb_yscf_xstx>

+ 1 - 1
Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,1.5,2,5,10,20,30" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="1,1.5,2,5,10,15,20,25,30" Version="1.1.1" />

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

@@ -1003,6 +1003,12 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
         {
             if (VerifyControlValue() == false)
                 return;
+            string[] after  = tb_ysfx_xsys.Text.Split(new char[] { ',' });
+            m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Clear();
+            for (int i=0;i< after.Length;i++)
+            {
+                m_OTSReport_Export.m_mbszclass.M_YSFXJG.list_str_tb_ysfx_xsys.Add(after[i]);
+            }
 
             SaveTemplateParameters();