From e4b8ad94cc1f48b2e47c022f19e70cc68b1e925b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 19 七月 2023 18:10:23 +0800
Subject: [PATCH] 机械通风作业信息记录卡
---
igds-web/src/main/resources/templates/test/TStockChange.html | 9
igds-web/src/main/resources/templates/test/TAiry.html | 323 ++++++++++++++++++++++++++
igds-web/src/main/resources/templates/test/TAiry01.html | 330 +++++++++++++++++++++++++++
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java | 1
4 files changed, 662 insertions(+), 1 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
index 60ab6c5..1ac4a38 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
@@ -50,7 +50,6 @@
SecCameraDto cameraParam = new SecCameraDto();
cameraParam.setId(param.getId());
cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
- cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
if (camera == null) {
diff --git a/igds-web/src/main/resources/templates/test/TAiry.html b/igds-web/src/main/resources/templates/test/TAiry.html
new file mode 100644
index 0000000..17fd93f
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/TAiry.html
@@ -0,0 +1,323 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>鏈烘閫氶浣滀笟淇℃伅璁板綍鍗�</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
+ }
+
+ .sp1 {
+ width: 60%;
+ text-align: left;
+ float: left;
+ padding-bottom: 10px;
+ padding-left: 20px;
+ }
+
+ .sp2 {
+ width: 38%;
+ text-align: left;
+ float: left;
+ padding-bottom: 10px;
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+ </style>
+</head>
+<body><h1 class='tit'>鏈烘閫氶浣滀笟淇℃伅璁板綍鍗�</h1>
+<div class='div-tit'>缂栫爜锛歴erId</div>
+<div class='div-tit'><span class="sp1">閫氶浣滀笟鍗曚綅锛�</span><span class="sp2">閫氶浣滀笟鏃舵锛�</span></div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td rowspan="8" width='8%'>鍩虹閰嶇疆</td>
+ <td rowspan="3" width='7%'>浠撴埧</td>
+ <td rowspan="2" width='7%'>浠撳彿</td>
+ <td rowspan="2" width='7%'>浠撳瀷</td>
+ <td colspan="6" width='43%'>骞虫埧浠撳昂瀵革紙绫筹級</td>
+ <td colspan="4" width='28%'>绛掑紡浠撳昂瀵革紙绫筹級</td>
+ </tr>
+ <tr>
+ <td colspan="2">闀垮害锛堜粨鍐咃級</td>
+ <td colspan="2">瀹藉害锛堜粨鍐咃級</td>
+ <td colspan="2">璁捐瀛樼伯绾块珮搴�</td>
+ <td colspan="2">鐩村緞锛堝唴寰勶級</td>
+ <td colspan="2">璁捐瀛樼伯绾块珮搴�</td>
+ </tr>
+ <tr>
+ <td>CH</td>
+ <td>CX</td>
+ <td colspan="2">PNLength</td>
+ <td colspan="2">PNWidth</td>
+ <td colspan="2">PNHeight</td>
+ <td colspan="2">TNDiameter</td>
+ <td colspan="2">TNHeight</td>
+ </tr>
+ <tr>
+ <td rowspan="3">绮爢</td>
+ <td rowspan="2">鍝佺鏁伴噺</td>
+ <td rowspan="2">瀛旈殭搴︼紙%锛�</td>
+ <td colspan="6">闀挎柟浣撶伯鍫嗗昂瀵革紙绫筹級</td>
+ <td colspan="4">鍦嗘煴浣撶伯鍫嗗昂瀵革紙绫筹級</td>
+ </tr>
+ <tr>
+ <td colspan="2">闀垮害</td>
+ <td colspan="2">瀹藉害</td>
+ <td colspan="2">绮爢楂樺害</td>
+ <td colspan="2">鐩村緞</td>
+ <td colspan="2">绮爢楂樺害</td>
+ </tr>
+ <tr>
+ <td>foodNumber</td>
+ <td>KXD</td>
+ <td colspan="2">CDLength</td>
+ <td colspan="2">CDWidth</td>
+ <td colspan="2">CDHeight</td>
+ <td colspan="2">YDDiameter</td>
+ <td colspan="2">YDHeight</td>
+ </tr>
+ <tr>
+ <td rowspan="2">閫氶绯荤粺閰嶇疆</td>
+ <td>閫氶绫诲瀷</td>
+ <td>椋庣綉绫诲瀷</td>
+ <td colspan="2">椋庣綉璁剧疆鏂瑰紡</td>
+ <td colspan="2">涓婚閬撴埅闈㈢Н锛堢背 2锛�</td>
+ <td colspan="2">椋庣綉寮�瀛旂巼锛�%锛�</td>
+ <td colspan="2">绌烘皵閫斿緞姣�</td>
+ <td colspan="2">閫氶鍙ｈ缃釜鏁帮紙涓級</td>
+ </tr>
+ <tr>
+ <td>TFType</td>
+ <td>FWType</td>
+ <td colspan="2">FWSetType</td>
+ <td colspan="2">ZFDArea</td>
+ <td colspan="2">FWKKL</td>
+ <td colspan="2">KQTJB</td>
+ <td colspan="2">TFKSZGS</td>
+ </tr>
+ <tr>
+ <td rowspan="10">闄嶆俯閫氶锛堝惈娑堥櫎鍙戠儹锛変綔涓�</td>
+ <td rowspan="2">閫氶鏈烘閰嶇疆</td>
+ <td colspan="2">閫氶鏈哄瀷鍙�</td>
+ <td colspan="2">閫氶鏈哄彴鏁帮紙鍙帮級</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍏ㄥ帇(KPa)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍔熺巼(Kw)</td>
+ <td colspan="2">閫侀鏂瑰紡</td>
+ </tr>
+ <tr>
+ <td colspan="2">TFJXH</td>
+ <td colspan="2">TFJNumber</td>
+ <td colspan="2">DTFJEDQY</td>
+ <td colspan="2">DTFJEDFL</td>
+ <td colspan="2">DTFJEDGL</td>
+ <td colspan="2">SFFS</td>
+ </tr>
+ <tr>
+ <td rowspan="2">杩愯宸ヨ壓鍙傛暟</td>
+ <td colspan="2">鍗曞彴椋庢満瀹炴祴椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満杞村姛鐜�(kw)</td>
+ <td colspan="2">鎬婚閲�(m3/h)</td>
+ <td colspan="2">鍗曚綅閫氶閲�(m3/t.h)</td>
+ <td colspan="2">瀹炴祴绯荤粺闃诲姏(KPa)</td>
+ <td colspan="2">鎬昏�楃數閲�(kw)</td>
+ </tr>
+ <tr>
+ <td colspan="2">TFJXH</td>
+ <td colspan="2">TFJNumber</td>
+ <td colspan="2">DTFJEDQY</td>
+ <td colspan="2">DTFJEDFL</td>
+ <td colspan="2">DTFJEDGL</td>
+ <td colspan="2">SFFS</td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟杩囩▼</td>
+ <td colspan="3">绗竴闃舵</td>
+ <td colspan="3">绗簩闃舵</td>
+ <td colspan="3">绗笁闃舵</td>
+ <td colspan="3">绗洓闃舵</td>
+ </tr>
+ <tr>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ </tr>
+ <tr>
+ <td>WTemperature1</td>
+ <td>TEQPJLW1</td>
+ <td>WJobDuration1</td>
+ <td>WTemperature2</td>
+ <td>TEQPJLW2</td>
+ <td>WJobDuration2</td>
+ <td>WTemperature3</td>
+ <td>TEQPJLW3</td>
+ <td>WJobDuration3</td>
+ <td>WTemperature4</td>
+ <td>TEQPJLW4</td>
+ <td>WJobDuration4</td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟璇勪环</td>
+ <td colspan="2">闄嶆俯缁撴灉</td>
+ <td colspan="2">闄嶆俯鑳借�楄瘎浠�</td>
+ <td colspan="2">淇濇按鏁堟灉璇勪环</td>
+ <td colspan="6">閫氶闄嶆俯鍧囧寑鎬ц瘎浠�</td>
+ </tr>
+ <tr>
+ <td>浣滀笟鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>缁撴潫鍚庡钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>闄嶆俯骞呭害锛堚剝锛�</td>
+ <td>鍚ㄧ伯闄嶆俯鑳借�楋紙kw/鈩�.T锛�</td>
+ <td>澶辨按鐜囷紙%锛�</td>
+ <td>璇勪环缁撴灉</td>
+ <td colspan="2">鏁翠粨</td>
+ <td colspan="2">涓婂眰</td>
+ <td>涓眰</td>
+ <td>涓嬪眰</td>
+ </tr>
+ <tr>
+ <td>ZYQPJLW</td>
+ <td>JSHPJLW</td>
+ <td>JWFD</td>
+ <td>DLJWNH</td>
+ <td>SSL</td>
+ <td>PJJG</td>
+ <td colspan="2">WWhole</td>
+ <td colspan="2">WUpper</td>
+ <td>WMesosphere</td>
+ <td>WLower</td>
+ </tr>
+ <tr>
+ <td rowspan="10">闄嶆按閫氶锛堝惈娑堥櫎缁撻湶锛変綔涓�</td>
+ <td rowspan="2">閫氶鏈烘閰嶇疆</td>
+ <td colspan="2">閫氶鏈哄瀷鍙�</td>
+ <td colspan="2">閫氶鏈哄彴鏁帮紙鍙帮級</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍏ㄥ帇(KPa)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍔熺巼(Kw)</td>
+ <td colspan="2">閫侀鏂瑰紡</td>
+ </tr>
+ <tr>
+ <td colspan="2">STFJXH</td>
+ <td colspan="2">STFJNumber</td>
+ <td colspan="2">SDTFJEDQY</td>
+ <td colspan="2">SDTFJEDFL</td>
+ <td colspan="2">SDTFJEDGL</td>
+ <td colspan="2">SSFFS</td>
+ </tr>
+ <tr>
+ <td rowspan="2">杩愯宸ヨ壓鍙傛暟</td>
+ <td colspan="2">鍗曞彴椋庢満瀹炴祴椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満杞村姛鐜�(kw)</td>
+ <td colspan="2">鎬婚閲�(m3/h)</td>
+ <td colspan="2">鍗曚綅閫氶閲�(m3/t.h)</td>
+ <td colspan="2">瀹炴祴绯荤粺闃诲姏(KPa)</td>
+ <td colspan="2">鎬昏�楃數閲�(kw)</td>
+ </tr>
+ <tr>
+ <td colspan="2">STFJXH</td>
+ <td colspan="2">STFJNumber</td>
+ <td colspan="2">SDTFJEDQY</td>
+ <td colspan="2">SDTFJEDFL</td>
+ <td colspan="2">SDTFJEDGL</td>
+ <td colspan="2">SSFFS</td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟杩囩▼</td>
+ <td colspan="3">绗竴闃舵</td>
+ <td colspan="3">绗簩闃舵</td>
+ <td colspan="3">绗笁闃舵</td>
+ <td colspan="3">绗洓闃舵</td>
+ </tr>
+ <tr>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ </tr>
+ <tr>
+ <td>STemperature1</td>
+ <td>airHumidity1</td>
+ <td>SJobDuration1</td>
+ <td>STemperature2</td>
+ <td>airHumidity2</td>
+ <td>SJobDuration2</td>
+ <td>STemperature3</td>
+ <td>airHumidity3</td>
+ <td>SJobDuration3</td>
+ <td>STemperature4</td>
+ <td>airHumidity4</td>
+ <td>SJobDuration4</td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟璇勪环</td>
+ <td colspan="2">闄嶆按鏁堟灉</td>
+ <td colspan="2">闄嶆按鑳借�楄瘎浠�</td>
+ <td colspan="2">淇濇按鏁堟灉璇勪环</td>
+ <td colspan="6">閫氶闄嶆按鍧囧寑鎬у垎鏋�</td>
+ </tr>
+ <tr>
+ <td>浣滀笟鍓嶅钩鍧囨按鍒嗭紙%锛�</td>
+ <td>缁撴潫鍚庡钩鍧囨按鍒嗭紙%锛�</td>
+ <td>闄嶆按骞呭害锛�%锛�</td>
+ <td>鍚ㄧ伯闄嶆俯鑳借�楋紙kw/1%.T锛�</td>
+ <td colspan="2">鏁翠粨</td>
+ <td colspan="2">涓婂眰</td>
+ <td colspan="2">涓眰</td>
+ <td colspan="2">涓嬪眰</td>
+ </tr>
+ <tr>
+ <td>ZYQPJSF</td>
+ <td>JSHPJSF</td>
+ <td>JSFD</td>
+ <td>DLJSNH</td>
+ <td colspan="2">SWhole</td>
+ <td colspan="2">SUpper</td>
+ <td colspan="2">SMesosphere</td>
+ <td colspan="2">SLower</td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/TAiry01.html b/igds-web/src/main/resources/templates/test/TAiry01.html
new file mode 100644
index 0000000..884bf1b
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/TAiry01.html
@@ -0,0 +1,330 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>鏈烘閫氶浣滀笟淇℃伅璁板綍鍗�</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
+ }
+
+ .sp {
+ width: 73%;
+ font-weight: bold;
+ text-align: right;
+ }
+
+ .sp1 {
+ width: 60%;
+ text-align: left;
+ float: left;
+ padding-bottom: 10px;
+ padding-left: 20px;
+ }
+
+ .sp2 {
+ width: 38%;
+ text-align: left;
+ float: left;
+ padding-bottom: 10px;
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+ </style>
+</head>
+<body><h1 class='tit'>鏈烘閫氶浣滀笟淇℃伅璁板綍鍗�</h1>
+<div class="sp">缂栫爜:</div>
+<div class='div-tit'><span class="sp1">閫氶浣滀笟鍗曚綅锛�</span><span class="sp2">閫氶浣滀笟鏃舵锛�</span></div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td rowspan="8" width='8%'>鍩虹閰嶇疆</td>
+ <td rowspan="3" width='7%'>浠撴埧</td>
+ <td rowspan="2" width='7%'>浠撳彿</td>
+ <td rowspan="2" width='7%'>浠撳瀷</td>
+ <td colspan="6" width='43%'>骞虫埧浠撳昂瀵革紙绫筹級</td>
+ <td colspan="4" width='28%'>绛掑紡浠撳昂瀵革紙绫筹級</td>
+ </tr>
+ <tr>
+ <td colspan="2">闀垮害锛堜粨鍐咃級</td>
+ <td colspan="2">瀹藉害锛堜粨鍐咃級</td>
+ <td colspan="2">璁捐瀛樼伯绾块珮搴�</td>
+ <td colspan="2">鐩村緞锛堝唴寰勶級</td>
+ <td colspan="2">璁捐瀛樼伯绾块珮搴�</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td rowspan="3">绮爢</td>
+ <td rowspan="2">鍝佺鏁伴噺</td>
+ <td rowspan="2">瀛旈殭搴︼紙%锛�</td>
+ <td colspan="6">闀挎柟浣撶伯鍫嗗昂瀵革紙绫筹級</td>
+ <td colspan="4">鍦嗘煴浣撶伯鍫嗗昂瀵革紙绫筹級</td>
+ </tr>
+ <tr>
+ <td colspan="2">闀垮害</td>
+ <td colspan="2">瀹藉害</td>
+ <td colspan="2">绮爢楂樺害</td>
+ <td colspan="2">鐩村緞</td>
+ <td colspan="2">绮爢楂樺害</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td rowspan="2">閫氶绯荤粺閰嶇疆</td>
+ <td>閫氶绫诲瀷</td>
+ <td>椋庣綉绫诲瀷</td>
+ <td colspan="2">椋庣綉璁剧疆鏂瑰紡</td>
+ <td colspan="2">涓婚閬撴埅闈㈢Н锛堢背 2锛�</td>
+ <td colspan="2">椋庣綉寮�瀛旂巼锛�%锛�</td>
+ <td colspan="2">绌烘皵閫斿緞姣�</td>
+ <td colspan="2">閫氶鍙ｈ缃釜鏁帮紙涓級</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td rowspan="10">闄嶆俯閫氶锛堝惈娑堥櫎鍙戠儹锛変綔涓�</td>
+ <td rowspan="2">閫氶鏈烘閰嶇疆</td>
+ <td colspan="2">閫氶鏈哄瀷鍙�</td>
+ <td colspan="2">閫氶鏈哄彴鏁帮紙鍙帮級</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍏ㄥ帇(KPa)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍔熺巼(Kw)</td>
+ <td colspan="2">閫侀鏂瑰紡</td>
+ </tr>
+ <tr>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td rowspan="2">杩愯宸ヨ壓鍙傛暟</td>
+ <td colspan="2">鍗曞彴椋庢満瀹炴祴椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満杞村姛鐜�(kw)</td>
+ <td colspan="2">鎬婚閲�(m3/h)</td>
+ <td colspan="2">鍗曚綅閫氶閲�(m3/t.h)</td>
+ <td colspan="2">瀹炴祴绯荤粺闃诲姏(KPa)</td>
+ <td colspan="2">鎬昏�楃數閲�(kw)</td>
+ </tr>
+ <tr>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟杩囩▼</td>
+ <td colspan="3">绗竴闃舵</td>
+ <td colspan="3">绗簩闃舵</td>
+ <td colspan="3">绗笁闃舵</td>
+ <td colspan="3">绗洓闃舵</td>
+ </tr>
+ <tr>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>姘旀俯锛堚剝锛�</td>
+ <td>閫氶鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟璇勪环</td>
+ <td colspan="2">闄嶆俯缁撴灉</td>
+ <td colspan="2">闄嶆俯鑳借�楄瘎浠�</td>
+ <td colspan="2">淇濇按鏁堟灉璇勪环</td>
+ <td colspan="6">閫氶闄嶆俯鍧囧寑鎬ц瘎浠�</td>
+ </tr>
+ <tr>
+ <td>浣滀笟鍓嶅钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>缁撴潫鍚庡钩鍧囩伯娓╋紙鈩冿級</td>
+ <td>闄嶆俯骞呭害锛堚剝锛�</td>
+ <td>鍚ㄧ伯闄嶆俯鑳借�楋紙kw/鈩�.T锛�</td>
+ <td>澶辨按鐜囷紙%锛�</td>
+ <td>璇勪环缁撴灉</td>
+ <td colspan="2">鏁翠粨</td>
+ <td colspan="2">涓婂眰</td>
+ <td>涓眰</td>
+ <td>涓嬪眰</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td rowspan="10">闄嶆按閫氶锛堝惈娑堥櫎缁撻湶锛変綔涓�</td>
+ <td rowspan="2">閫氶鏈烘閰嶇疆</td>
+ <td colspan="2">閫氶鏈哄瀷鍙�</td>
+ <td colspan="2">閫氶鏈哄彴鏁帮紙鍙帮級</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍏ㄥ帇(KPa)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満棰濆畾鍔熺巼(Kw)</td>
+ <td colspan="2">閫侀鏂瑰紡</td>
+ </tr>
+ <tr>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td rowspan="2">杩愯宸ヨ壓鍙傛暟</td>
+ <td colspan="2">鍗曞彴椋庢満瀹炴祴椋庨噺(m3/h)</td>
+ <td colspan="2">鍗曞彴椋庢満杞村姛鐜�(kw)</td>
+ <td colspan="2">鎬婚閲�(m3/h)</td>
+ <td colspan="2">鍗曚綅閫氶閲�(m3/t.h)</td>
+ <td colspan="2">瀹炴祴绯荤粺闃诲姏(KPa)</td>
+ <td colspan="2">鎬昏�楃數閲�(kw)</td>
+ </tr>
+ <tr>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟杩囩▼</td>
+ <td colspan="3">绗竴闃舵</td>
+ <td colspan="3">绗簩闃舵</td>
+ <td colspan="3">绗笁闃舵</td>
+ <td colspan="3">绗洓闃舵</td>
+ </tr>
+ <tr>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ <td>骞冲潎姘旀俯锛堚剝锛�</td>
+ <td>骞冲潎姘旀箍锛�%锛�</td>
+ <td>浣滀笟鏃堕暱锛坔锛�</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td rowspan="3">浣滀笟璇勪环</td>
+ <td colspan="2">闄嶆按鏁堟灉</td>
+ <td colspan="2">闄嶆按鑳借�楄瘎浠�</td>
+ <td colspan="2">淇濇按鏁堟灉璇勪环</td>
+ <td colspan="6">閫氶闄嶆按鍧囧寑鎬у垎鏋�</td>
+ </tr>
+ <tr>
+ <td>浣滀笟鍓嶅钩鍧囨按鍒嗭紙%锛�</td>
+ <td>缁撴潫鍚庡钩鍧囨按鍒嗭紙%锛�</td>
+ <td>闄嶆按骞呭害锛�%锛�</td>
+ <td>鍚ㄧ伯闄嶆俯鑳借�楋紙kw/1%.T锛�</td>
+ <td colspan="2">鏁翠粨</td>
+ <td colspan="2">涓婂眰</td>
+ <td colspan="2">涓眰</td>
+ <td colspan="2">涓嬪眰</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ <td colspan="2"></td>
+ </tr>
+</table>
+<div class='div-tit'><span class="sp1">閫氶浣滀笟璐熻矗浜猴細</span><span class="sp2">閫氶浣滀笟浜哄憳锛�</span></div>
+</body>
+</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/TStockChange.html b/igds-web/src/main/resources/templates/test/TStockChange.html
index 8ac8f3b..9656fa6 100644
--- a/igds-web/src/main/resources/templates/test/TStockChange.html
+++ b/igds-web/src/main/resources/templates/test/TStockChange.html
@@ -114,6 +114,15 @@
<td>emptyJby</td>
</tr>
<tr>
+ <td>鍑�閲嶏紙鍚級</td>
+ <td>netWeight</td>
+ <td colspan="6"></td>
+ </tr>
+ <tr>
+ <td>鍏朵粬鎵ｉ噸璇存槑</td>
+ <td colspan="7">deOtherInfo</td>
+ </tr>
+ <tr>
<td>澶囨敞</td>
<td colspan="8">remark</td>
</tr>
--
Gitblit v1.9.3