From e4609e7ea92f3939802fafc15fd784213ed00b5f Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 20 七月 2023 21:06:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/src/main/resources/templates/test/TAiry.html | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/igds-web/src/main/resources/templates/test/TAiry.html b/igds-web/src/main/resources/templates/test/TAiry.html
index 17fd93f..e2957d3 100644
--- a/igds-web/src/main/resources/templates/test/TAiry.html
+++ b/igds-web/src/main/resources/templates/test/TAiry.html
@@ -70,8 +70,8 @@
<td colspan="2">璁捐瀛樼伯绾块珮搴�</td>
</tr>
<tr>
- <td>CH</td>
- <td>CX</td>
+ <td>siloNumber</td>
+ <td>deptType</td>
<td colspan="2">PNLength</td>
<td colspan="2">PNWidth</td>
<td colspan="2">PNHeight</td>
@@ -131,12 +131,12 @@
<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>
+ <td colspan="2">WTFJXH</td>
+ <td colspan="2">WTFJNumber</td>
+ <td colspan="2">WDTFJEDQY</td>
+ <td colspan="2">WDTFJEDFL</td>
+ <td colspan="2">WDTFJEDGL</td>
+ <td colspan="2">windType</td>
</tr>
<tr>
<td rowspan="2">杩愯宸ヨ壓鍙傛暟</td>
@@ -148,12 +148,12 @@
<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>
+ <td colspan="2">WYXGYCS</td>
+ <td colspan="2">WDTFJSCFL</td>
+ <td colspan="2">WDTFJZGL</td>
+ <td colspan="2">WZFL</td>
+ <td colspan="2">WSCXTZL</td>
+ <td colspan="2">WZHDL</td>
</tr>
<tr>
<td rowspan="3">浣滀笟杩囩▼</td>
@@ -231,6 +231,7 @@
<td colspan="2">鍗曞彴椋庢満棰濆畾鍔熺巼(Kw)</td>
<td colspan="2">閫侀鏂瑰紡</td>
</tr>
+
<tr>
<td colspan="2">STFJXH</td>
<td colspan="2">STFJNumber</td>
@@ -249,12 +250,12 @@
<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>
+ <td colspan="2">SYXGYCS</td>
+ <td colspan="2">SDTFJSCFL</td>
+ <td colspan="2">SDTFJZGL</td>
+ <td colspan="2">SZFL</td>
+ <td colspan="2">SSCXTZL</td>
+ <td colspan="2">SZHDL</td>
</tr>
<tr>
<td rowspan="3">浣滀笟杩囩▼</td>
--
Gitblit v1.9.3