From fae4bd828a6b81b95f53e285fcb4749fbd80c7bf Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 04 九月 2023 17:31:46 +0800
Subject: [PATCH] 增加粮情层行转换配置
---
igds-web/src/main/resources/templates/test/qualityReport02.html | 72 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/igds-web/src/main/resources/templates/test/qualityReport02.html b/igds-web/src/main/resources/templates/test/qualityReport02.html
index 58b24d3..4298818 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport02.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport02.html
@@ -2,7 +2,7 @@
<html lang='zh-cn'>
<head>
<meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
- <title>璐ㄦ鎶ュ憡(foodVariety)</title>
+ <title>璐ㄦ鎶ュ憡(灏忛害)</title>
<style>body {
text-align: center;
padding: 10px
@@ -16,7 +16,9 @@
}
.div-tit {
- padding-top: 10px
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
}
table {
@@ -40,8 +42,7 @@
</style>
</head>
<body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1>
-<div class='div-tit'><span class='sp1'></span><span class='sp1'></span><span
- class='sp1'>鍗曞彿锛歴erId</span></div>
+<div class='div-tit'>鍗曞彿锛歴erId</div>
<table cellspacing='0' cellpadding='0'>
<tr>
<td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
@@ -72,7 +73,7 @@
<td>绛夌骇</td>
<td>foodLevel</td>
<td>鐢熶骇骞撮檺</td>
- <td>scnx</td>
+ <td>foodYear</td>
</tr>
<tr>
<td>鏍峰搧鏁伴噺</td>
@@ -97,70 +98,67 @@
<td>鎵︽牱鏃堕棿</td>
<td>sampleTime</td>
<td>妫�楠屾椂闂�</td>
- <td>checkTime2</td>
+ <td>checkTime</td>
<td>鎶ュ憡鍑哄叿鏃堕棿</td>
<td>bgcjsj</td>
</tr>
<tr>
- <td rowspan="7">璐ㄦ缁撴灉</td>
- <td rowspan="4">璐ㄩ噺鎸囨爣妫�楠�</td>
+ <td rowspan="6">璐ㄦ缁撴灉</td>
+ <td rowspan="3">璐ㄩ噺鎸囨爣妫�楠�</td>
<td>鍝佺</td>
<td>foodVariety</td>
- <td>鍑虹硻鐜囷紙%锛�</td>
- <td>rough</td>
+ <td>瀹归噸锛坓/L锛�</td>
+ <td>C03_ST</td>
<td>绛夌骇</td>
<td>foodLevel</td>
</tr>
<tr>
- <td>鏁寸簿绫崇巼锛�%锛�</td>
- <td>C10_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
<td>鏉傝川锛�%锛�</td>
<td>C02_ST</td>
<td>姘村垎锛�%锛�</td>
- <td>c_perWet</td>
+ <td>C01_ST</td>
</tr>
<tr>
- <td>榛勭矑绫筹紙%锛�</td>
- <td>C11_ST</td>
- <td>璋峰绯欑背锛�%锛�</td>
- <td>C12_ST</td>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
- </tr>
- <tr>
- <td>浜掓贩鐜囷紙%锛�</td>
- <td>C13_ST</td>
- <td colspan="4"></td>
+ <td>涓嶅畬鍠勭矑锛�%锛�</td>
+ <td>C04_ST</td>
+ <td>鐢熻娊绮掞紙%锛�</td>
+ <td>C35_ST</td>
+ <td>鐢熼湁绮掞紙%锛�</td>
+ <td>C29_ST</td>
</tr>
<tr>
<td>鍌ㄥ瓨鍝佽川妫�楠�</td>
- <td>鑴傝偑閰稿�硷紙mgKOH/100g锛�</td>
- <td>C14_ST</td>
+ <td>闈㈢瓔鍚告按閲忥紙%锛�</td>
+ <td>C08_ST</td>
<td>鍝佸皾鍒嗗��</td>
- <td>C15_ST</td>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>C07_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
</tr>
<tr>
<td rowspan="2">椋熷搧瀹夊叏妫�楠�</td>
- <td>榛勬洸闇夋瘨绱� B1锛埼糶/kg锛�</td>
- <td>C17_ST</td>
+ <td>鍛曞悙姣掞紙mg/kg锛�</td>
+ <td>C27_ST</td>
+ <td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td>
+ <td>C31_ST</td>
<td>閾咃紙mg/kg锛�</td>
- <td>C18_ST</td>
- <td>闀夛紙mg/kg锛�</td>
- <td>C19_ST</td>
+ <td>C32_ST</td>
</tr>
<tr>
+ <td>闀夛紙mg/kg锛�</td>
+ <td>C25_ST</td>
<td>姹烇紙渭g/kg锛�</td>
- <td>C20_ST</td>
+ <td>C33_ST</td>
<td>鏃犳満鐮凤紙mg/kg锛�</td>
- <td>C21_ST</td>
- <td colspan="2"></td>
+ <td>C30_ST</td>
</tr>
<tr>
<td colspan="2">澶囨敞</td>
<td colspan="6">remark</td>
</tr>
</table>
+<div class='div-tit'></div>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3