Commit d3f18324 authored by hj's avatar hj

更新提交

parent aeff2849
...@@ -77,7 +77,7 @@ class ChemicalsMsdsService ...@@ -77,7 +77,7 @@ class ChemicalsMsdsService
} }
$msds_html = str_replace($dl, $dlHtml, $msds_html); $msds_html = str_replace($dl, $dlHtml, $msds_html);
} }
if($key == 1 || $key == 3 || $key == 4){ if($key == 2 || $key == 4){
preg_match_all('/<dt>(?<cTitle>[\s\S]*?)<\/dt>[\s]*?<dd[\s\S]*?>(?<cContent>[\s\S]*?)<\/dd>/i', $dl, $ddContent); preg_match_all('/<dt>(?<cTitle>[\s\S]*?)<\/dt>[\s]*?<dd[\s\S]*?>(?<cContent>[\s\S]*?)<\/dd>/i', $dl, $ddContent);
if($ddContent){ if($ddContent){
$dlHtml = ''; $dlHtml = '';
...@@ -104,7 +104,7 @@ class ChemicalsMsdsService ...@@ -104,7 +104,7 @@ class ChemicalsMsdsService
//file_put_contents('./test.html', $msds_html); file_put_contents('./test.html', $msds_html);
//$msds_html = file_get_contents('./test.html'); //$msds_html = file_get_contents('./test.html');
$this->getPdfApp()->loadHTML($msds_html, 'utf-8'); $this->getPdfApp()->loadHTML($msds_html, 'utf-8');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment