检测结果打印页面修改

application/admin/view/res/data.html

@@ -24,33 +24,37 @@
         <label class="control-label col-xs-12 col-sm-2"></label>
         <table class="col-xs-12 col-sm-8 gridtable" style="text-align: center">
             <thead>
-                <tr>
-                    <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>
+            <tr>
+                <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: 15%;text-align: center">检测值</th>
+                <th class="col-xs-12 col-sm-2" style="width: 6%;text-align: center">单位</th>
+            </tr>
             </thead>
             <tbody>
             <tr>
                 <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
-                <td>溶剂残留总值</td>
+                <td>溶剂残留总量</td>
+                <td>{$judge['dis']}</td>
                 <td>{$row['dis']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
                 <td>溶剂杂质总量</td>
+                <td>{$judge['dis_impurity']}</td>
                 <td>{$row['dis_impurity']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
                 <td>苯系物总量</td>
+                <td>{$judge['ben_total']}</td>
                 <td>{$row['ben_total']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
                 <td>苯含量</td>
+                <td>{$judge['ben']}</td>
                 <td>{$row['ben']}</td>
                 <td>{$row['unit']}</td>
             </tr>

application/admin/view/res/datagc.html

@@ -208,34 +208,36 @@
         <table style="text-align: center" border="1">
             <thead>
             <tr>
-                <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>
+                <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: 15%;text-align: center">检测值</th>
+                <th class="col-xs-12 col-sm-2" style="width: 6%;text-align: center">单位</th>
             </tr>
             </thead>
             <tbody>
             <tr>
                 <td rowspan="4" colspan="2" style="font-weight: 700; text-align: center">汇总</td>
-                <td>溶剂残留总值</td>
+                <td>溶剂残留总量</td>
+                <td>{$judge['dis']}</td>
                 <td>{$row['dis']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>溶剂杂质总量</td>
+                <td>{$judge['dis_impurity']}</td>
                 <td>{$row['dis_impurity']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>苯系物总量</td>
+                <td>{$judge['ben_total']}</td>
                 <td>{$row['ben_total']}</td>
                 <td>{$row['unit']}</td>
             </tr>
             <tr>
-
                 <td>苯含量</td>
+                <td>{$judge['ben']}</td>
                 <td>{$row['ben']}</td>
                 <td>{$row['unit']}</td>
             </tr>
@@ -246,7 +248,7 @@
                 {else if}
                 <td style="font-weight: 700; text-align: center">合格</td>
                 {/if}
-                <td colspan="3">{$row['remark']}</td>
+                <td colspan="4">{$row['remark']}</td>
             </tr>
             </tbody>
         </table>