Browse Source

临时提交

zhangjiaxin 1 year ago
parent
commit
31a0cbcf37

+ 2 - 2
Bin/x64/Debug/Config/ReportTemplate/CleannessA_Template/ReportTemplateConfig.xml

@@ -12,7 +12,7 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>ReportIdentification.bmp</LOGName>
-    <StandardLibraryName>CleannessNew.db</StandardLibraryName>
+    <StandardLibraryName>NoSTDDB.db</StandardLibraryName>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -34,7 +34,7 @@
     <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
-    <str_cb_klcc_ljb>lj.psf</str_cb_klcc_ljb>
+    <str_cb_klcc_ljb>j4.psf</str_cb_klcc_ljb>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>

+ 10 - 18
Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -1,9 +1,10 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>夹杂物报告</str_tb_ZBT>
-    <str_tb_FBT>xxx有限公司</str_tb_FBT>
+    <str_tb_ZBT>Cleanness Re</str_tb_ZBT>
+    <str_tb_FBT>有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
+    <str_tb_CKBZ>
+    </str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -11,7 +12,6 @@
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
     <LOGName>ReportIdentification.bmp</LOGName>
-    <StandardLibraryName>Baohuzha.db</StandardLibraryName>
   </M_SY>
   <M_YMYJ>
     <str_tb_ymwb>锂电异物分析报告</str_tb_ymwb>
@@ -22,7 +22,7 @@
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
     <index_cb_klcc_jsfs>3</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>2</index_cb_klcc_ljb>
+    <index_cb_klcc_ljb>1</index_cb_klcc_ljb>
     <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
     <index_cb_jzwfl_xstx>0</index_cb_jzwfl_xstx>
@@ -39,7 +39,7 @@
     <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,C,S,N,O,Fe,Ti,Mn,Ca,Ce,La,Mg</str_tb_ysfx_xsys>
+    <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
     <list_str_tb_ysfx_xsys>
       <YS0>Al</YS0>
       <YS1>Si</YS1>
@@ -50,10 +50,10 @@
       <YS6>Fe</YS6>
       <YS7>Ti</YS7>
       <YS8>Mn</YS8>
-      <YS9>Ca</YS9>
-      <YS10>Ce</YS10>
-      <YS11>La</YS11>
-      <YS12>Mg</YS12>
+      <YS9>Mg</YS9>
+      <YS10>Ca</YS10>
+      <YS11>Ce</YS11>
+      <YS12>La</YS12>
     </list_str_tb_ysfx_xsys>
     <b_ck_yscf_xsmk>True</b_ck_yscf_xsmk>
     <index_cb_yscf_xstx>0</index_cb_yscf_xstx>
@@ -72,18 +72,10 @@
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al₂O₃</MB0>
       <MB1>CaO.SiO₂.Al₂O₃</MB1>
-      <MB2>MnO.S.Al₂O₃</MB2>
-      <MB3>CaO.TiN.Al₂O₃</MB3>
-      <MB4>CaO.CaS.Al₂O₃</MB4>
-      <MB5>MnS.CaS.Al₂O₃</MB5>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
       <MBIndex1>2</MBIndex1>
-      <MBIndex2>3</MBIndex2>
-      <MBIndex3>4</MBIndex3>
-      <MBIndex4>6</MBIndex4>
-      <MBIndex5>7</MBIndex5>
     </list_lbv_syxt_mblb_index>
     <str_cb_syxt_ljb>lj.psf</str_cb_syxt_ljb>
   </M_SYXT>