优化检测打印功能

application/admin/view/res/data.html

@@ -25,48 +25,41 @@
         <table class="col-xs-12 col-sm-8 gridtable" style="text-align: center">
             <thead>
                 <tr>
-                    <th class="col-xs-12 col-sm-2"></th>
+                    <th colspan="2" class="col-xs-12 col-sm-2"></th>
                     <th class="col-xs-12 col-sm-2">化合物</th>
                     <th class="col-xs-12 col-sm-2">浓度</th>
                     <th class="col-xs-12 col-sm-2">单位</th>
+
                 </tr>
             </thead>
             <tbody>
             <tr>
-                <td rowspan="4" style="font-weight: 700; text-align: center">汇总</td>
+                <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
                 <td>溶剂残留总值</td>
                 <td>{$row['dis']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>溶剂杂质总量</td>
                 <td>{$row['dis_impurity']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>苯系物总量</td>
                 <td>{$row['ben_total']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>苯含量</td>
                 <td>{$row['ben']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
+                <td>判定</td>
                 {if $row['judge'] == '0'}
-                <td style="font-weight: 700; text-align: center">
-                    判定
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    不合格</td>
+                <td>不合格</td>
                 {else if}
-                <td style="font-weight: 700; text-align: center">
-                    判定
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    合格</td>
+                <td>合格</td>
                 {/if}
                 <td colspan="3">{$row['remark']}</td>
             </tr>
@@ -179,7 +172,7 @@
     <table style="text-align: center" border="1">
         <thead>
         <tr>
-            <th class="col-xs-12 col-sm-2" style="width: 20%;text-align: center"></th>
+            <th  colspan="2"  class="col-xs-12 col-sm-2" style="width: 20%;text-align: center"></th>
             <th class="col-xs-12 col-sm-2" style="width: 10%;text-align: center">化合物</th>
             <th class="col-xs-12 col-sm-2" style="width: 15%;text-align: center">浓度</th>
             <th class="col-xs-12 col-sm-2" style="width: 6%;text-align: center">单位</th>
@@ -187,7 +180,7 @@
         </thead>
         <tbody>
         <tr>
-            <td rowspan="4" style="font-weight: 700; text-align: center">汇总</td>
+            <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
             <td>溶剂残留总值</td>
             <td>{$row['dis']}</td>
             <td>{$row['unit']}</td>
@@ -208,16 +201,11 @@
             <td>{$row['unit']}</td>
         </tr>
         <tr>
+            <td>判定</td>
             {if $row['judge'] == '0'}
-            <td style="font-weight: 700; text-align: center">
-                判定
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                不合格</td>
+            <td>不合格</td>
             {else if}
-            <td style="font-weight: 700; text-align: center">
-                判定
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                合格</td>
+            <td>合格</td>
             {/if}
             <td colspan="3">{$row['remark']}</td>
         </tr>

application/admin/view/res/datagc.html

@@ -25,7 +25,7 @@
         <table class="col-xs-12 col-sm-8 gridtable" style="text-align: center">
             <thead>
             <tr>
-                <th class="col-xs-12 col-sm-2"></th>
+                <th colspan="2"  class="col-xs-12 col-sm-2"></th>
                 <th class="col-xs-12 col-sm-2">化合物</th>
                 <th class="col-xs-12 col-sm-2">浓度</th>
                 <th class="col-xs-12 col-sm-2">单位</th>
@@ -33,19 +33,17 @@
             </thead>
             <tbody>
             <tr>
-                <td rowspan="4" style="font-weight: 700; text-align: center">汇总</td>
+                <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
                 <td>溶剂残留总值</td>
                 <td>{$row['dis']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>溶剂杂质总量</td>
                 <td>{$row['dis_impurity']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>苯系物总量</td>
                 <td>{$row['ben_total']}</td>
                 <td>{$row['unit']}</td>
@@ -57,16 +55,11 @@
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
+                <td>判定</td>
                 {if $row['judge'] == '0'}
-                <td style="font-weight: 700; text-align: center">
-                    判定
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    不合格</td>
+                <td>不合格</td>
                 {else if}
-                <td style="font-weight: 700; text-align: center">
-                    判定
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    合格</td>
+                <td>合格</td>
                 {/if}
                 <td colspan="3">{$row['remark']}</td>
             </tr>
@@ -210,7 +203,7 @@
         <table style="text-align: center" border="1">
             <thead>
             <tr>
-                <th class="col-xs-12 col-sm-2" style="width: 20%;text-align: center"></th>
+                <th colspan="2"  class="col-xs-12 col-sm-2" style="width: 20%;text-align: center"></th>
                 <th class="col-xs-12 col-sm-2" style="width: 10%;text-align: center">化合物</th>
                 <th class="col-xs-12 col-sm-2" style="width: 15%;text-align: center">浓度</th>
                 <th class="col-xs-12 col-sm-2" style="width: 8%;text-align: center">单位</th>
@@ -218,7 +211,7 @@
             </thead>
             <tbody>
             <tr>
-                <td rowspan="4" style="font-weight: 700; text-align: center">汇总</td>
+                <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
                 <td>溶剂残留总值</td>
                 <td>{$row['dis']}</td>
                 <td>{$row['unit']}</td>
@@ -242,16 +235,11 @@
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
+                <td>判定</td>
                 {if $row['judge'] == '0'}
-                <td style="font-weight: 700; text-align: center">
-                    判定
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    不合格</td>
+                <td>不合格</td>
                 {else if}
-                <td style="font-weight: 700; text-align: center">
-                    判定
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    合格</td>
+                <td>合格</td>
                 {/if}
                 <td colspan="3">{$row['remark']}</td>
             </tr>