From 61a45a642ab0c57d18af29ab6a900640bf50af67 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 08 十一月 2023 16:41:22 +0800
Subject: [PATCH] 	modified:   src/views/quality/rawMaterial/index.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-print.vue 	modified:   vue.config.js

---
 vue.config.js                                       |    2 
 src/views/quality/rawMaterial/index.vue             |    2 
 src/views/quality/rawMaterial/rawMaterial-print.vue |  656 ++++++++++++-----------------------------------------------
 3 files changed, 140 insertions(+), 520 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 4765239..1234672 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -267,7 +267,7 @@
             PrintJS({
                 printable: "printRaw",
                 type: "html",
-                maxWidth: 1200,
+                maxWidth: 900,
                 // header: "鍘熸潗鏂欐娴嬫姤鍛�",
                 style: '@page {margin: 0 5mm}',
                 targetStyles: ["*"],
diff --git a/src/views/quality/rawMaterial/rawMaterial-print.vue b/src/views/quality/rawMaterial/rawMaterial-print.vue
index 358f847..72a69d2 100644
--- a/src/views/quality/rawMaterial/rawMaterial-print.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-print.vue
@@ -71,22 +71,19 @@
                 style="width:620pt;border-collapse:collapse;border:1pt solid windowtext">
                 <tbody>
                     <tr>
-                        <td width="101" colspan="2" style="width:75.8pt;border:solid windowtext 1.0pt;
-  padding:0.2cm 2.4pt 0.2cm 2.4pt">
+                        <td width="121" colspan="2" style="width:110pt;border:solid windowtext 1.0pt;padding:0.2cm 1.4pt 0.2cm 1.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">闆朵欢鍚嶇О</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Part Description</span>
                             </p>
                         </td>
-                        <td width="127" colspan="3" style="width:95.5pt;border:solid windowtext 1.0pt;
-  border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="127" colspan="4" style="width:95.5pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center">
                                 <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif" v-text="tableData.name"></span>
                             </p>
                         </td>
-                        <td width="113" colspan="5" style="width:84.95pt;border:solid windowtext 1.0pt;
-  border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="113" colspan="4" style="width:84.95pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">鍨�</span><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">&nbsp;&nbsp;&nbsp;
@@ -94,90 +91,71 @@
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Model</span></p>
                         </td>
-                        <td width="86" colspan="4" style="width:64.65pt;border:solid windowtext 1.0pt;
-  border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="86" colspan="4" style="width:64.65pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif" v-text="tableData.specs"></span></p>
                         </td>
-                        <td width="72" colspan="2" style="width:54.35pt;border:solid windowtext 1.0pt;
-  border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="72" colspan="2" style="width:54.35pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">鍔犲伐鍗曞彿</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Order No.</span></p>
                         </td>
-                        <td width="128" colspan="3" style="width:96.0pt;border:solid windowtext 1.0pt;
-  border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="128" colspan="3" style="width:96.0pt;border:solid windowtext 1.0pt;border-left:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif" v-text="tableData.rmessage.split(',')[0]"></span></p>
                         </td>
                     </tr>
                     <tr>
-                        <td width="101" colspan="2" style="width:75.8pt;border:solid windowtext 1.0pt;
-  border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="101" colspan="2" style="width:110pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 1.4pt 0.2cm 1.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠屼华鍣�</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Inspection
                                     instrument</span></p>
                         </td>
-                        <td width="127" colspan="3" style="width:95.5pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="127" colspan="4" style="width:95.5pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif" v-text="deviceStr"></span></p>
                         </td>
-                        <td width="113" colspan="5" style="width:84.95pt;border-top:1pt solid windowtext;border-left:
-  1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="113" colspan="4" style="width:84.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠屾暟閲�</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Quantity to
                                     check</span></p>
                         </td>
-                        <td width="86" colspan="4" style="width:64.65pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="86" colspan="4" style="width:64.65pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif" v-text="tableData.number"></span></p>
                         </td>
-                        <td width="72" colspan="2" style="width:54.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="72" colspan="2" style="width:54.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">渚涜揣鍗曚綅</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Supplier</span></p>
                         </td>
-                        <td width="128" colspan="3" style="width:96.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="128" colspan="3" style="width:96.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif" v-text="tableData.supplier"></span></p>
                         </td>
                     </tr>
                     <tr>
-                        <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
-  border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 0.4pt 0.2cm 0.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠岄」鐩�</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Inspection Item</span>
                             </p>
                         </td>
-                        <td width="408" colspan="15" style="width:306.35pt;border-top:1pt solid windowtext;border-left:
-  1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="408" colspan="15" style="width:306.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">妫�楠岀粨鏋滐紙瀹炴祴鍊硷級</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Test result (Measured
                                     value)</span></p>
                         </td>
-                        <td width="74" rowspan="2" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 3.4pt 0.2cm 3.4pt">
+                        <td width="74" rowspan="2" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 3.4pt 0.2cm 3.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">鍒ゅ畾</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
@@ -185,507 +163,73 @@
                         </td>
                     </tr>
                     <tr>
-                        <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
-  border-top:1pt solid windowtext;padding:0.4cm 5.4pt 0.4cm 5.4pt">
+                        <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.4cm 5.4pt 0.4cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
                                     style="font-size:9.0pt;font-family:瀹嬩綋">鎶�鏈姹�</span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">Technical
                                     Requirement</span></p>
                         </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 4.4pt 0.2cm 4.4pt">
+                        <td width="59" colspan="2" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 4.4pt 0.2cm 4.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center">
                                 <span style="font-size:9.0pt;font-family:瀹嬩綋">鍏樊</span>
                                 <span lang="EN-US" style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">TOL</span>
                             </p>
                         </td>
-                        <td width="43" v-for="(item,index) in 14" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <td width="43" v-for="(item,index) in 13" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-size:9.0pt;font-family:&quot;Arial&quot;,sans-serif">{{item>9?item:'0'+item}}</span></p>
                         </td>
                     </tr>
+                </tbody>
+                <tbody v-for="(item,index) in projectList" :key="index">
                     <tr style="height:19.85pt">
-                        <td width="85" rowspan="9" style="width:63.95pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="85" rowspan="16" style="width:63.95pt;border:solid windowtext 1.0pt;border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span
-                                    style="font-family:瀹嬩綋">灏哄</span></p>
+                                    style="font-family:瀹嬩綋" v-text="item.rpFather"></span></p>
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">Dimension</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif"></span></p>
                         </td>
-                        <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="60" colspan="2" style="width:65.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif" v-text="item.children[0].rpName"></span></p>
                         </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
+                        <td width="59" colspan="2" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif"  v-text="item.children[0].required"></span></p>
                         </td>
-                        <td width="43" v-for="(item,index) in 14" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                        <td width="43" v-for="(val,index) in item.children[0].testValueList" :key="index" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">{{item}}</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif">{{val}}</span></p>
                         </td>
-                        <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                        <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
+                            <p v-if="item.children[0].testState==1" class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+                                    style="font-family:&quot;Arial&quot;,sans-serif">鍚堟牸</span></p>
+                            <p v-else class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
+                                    style="font-family:&quot;Arial&quot;,sans-serif">涓嶅悎鏍�</span></p>
                         </td>
                     </tr>
-                    <tr style="height:19.85pt" v-for="(item,index) in 8" :key="index">
+                    <tr style="height:19.85pt" v-for="(j,index) in (item.children.slice(1))" :key="index">
                         <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
                         border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif">{{j.rpName}}</span></p>
                         </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
+                        <td width="59" colspan="2" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif">{{j.required}}</span></p>
                         </td>
-                        <td width="59" v-for="(item,index) in 14" :key="index" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
+                        <td width="59" v-for="(testValue,index) in j.testValueList" :key="index" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                                    style="font-family:&quot;Arial&quot;,sans-serif">{{testValue}}</span></p>
                         </td>
-                        <td width="43" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                    <tr style="height:19.85pt">
-                        <td width="85" rowspan="3" style="width:63.95pt;border:solid windowtext 1.0pt;
-  border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span
-                                    style="font-family:瀹嬩綋">铻虹汗</span></p>
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">Thread</span></p>
-                        </td>
-                        <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
+                        <td width="43" colspan="1" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
                             <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                     style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
                         </td>
                     </tr>
-                    <tr style="height:19.85pt">
-                        <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                    </tr>
-                    <tr style="height:19.85pt">
-                        <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                    </tr>
-                    <tr style="height:19.85pt">
-                        <td width="85" rowspan="2" style="width:63.95pt;border:solid windowtext 1.0pt;
-  border-top:1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span
-                                    style="font-family:瀹嬩綋">绮楃硻搴�</span></p>
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">Roughness</span></p>
-                        </td>
-                        <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                    </tr>
-                    <tr style="height:19.85pt">
-                        <td width="60" colspan="2" style="width:45.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="59" style="width:44.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="43" colspan="2" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                            <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                    style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                        </td>
-                        <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" colspan="3" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" style="width:32.15pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:19.85pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                </tr>
-                <tr style="height:34.0pt">
-                    <td width="85" style="width:63.95pt;border:solid windowtext 1.0pt;border-top:
-  1pt solid windowtext;padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span
-                                style="font-family:瀹嬩綋">鏉愯川</span></p>
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">Material</span></p>
-                    </td>
-                    <td width="120" colspan="3" style="width:89.75pt;border-top:1pt solid windowtext;border-left:
-  1pt solid windowtext;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" colspan="2" style="width:32.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="45" colspan="2" style="width:33.95pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" style="width:32.2pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" colspan="3" style="width:32.35pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" style="width:32.0pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="46" colspan="2" style="width:34.55pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" colspan="2" style="width:32.4pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt;height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="43" style="width:32.3pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                    <td width="74" style="width:55.8pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:
-  solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt;
-  height:34.0pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
-                    </td>
-                </tr>
+                </tbody>
+                    <!-- bottom -->
                 <tr style="height:40.95pt">
                     <td width="145" colspan="3" style="width:109.1pt;border:solid windowtext 1.0pt;
   border-top:1pt solid windowtext;padding:0cm 5.4pt 0cm 5.4pt;height:40.95pt">
@@ -733,21 +277,20 @@
                         <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
                                 style="font-family:&quot;Arial&quot;,sans-serif" v-text="tableData.creatTime.split(' ')[0]"></span></p>
                     </td>
-                    <td width="83" colspan="3" style="width:62.25pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:none;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span
-                                style="font-family:瀹嬩綋">瀹�</span><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;
-                            </span><span style="font-family:瀹嬩綋">鏍�</span></p>
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">Audit</span></p>
+                    <td width="83" colspan="3" style="width:62.25pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <p class="MsoNormal" align="center" style="text-align:center">
+                            <span style="font-family:瀹嬩綋">瀹�</span>
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span>
+                            <span style="font-family:瀹嬩綋">鏍�</span>
+                        </p>
+                        <p class="MsoNormal" align="center" style="text-align:center">
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">Audit</span>
+                        </p>
                     </td>
-                    <td width="117" colspan="2" style="width:88.1pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;
-  border-bottom:none;border-right:solid windowtext 1.0pt;
-  padding:0.2cm 5.4pt 0.2cm 5.4pt">
-                        <p class="MsoNormal" align="center" style="text-align:center"><span lang="EN-US"
-                                style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span></p>
+                    <td width="117" colspan="2" style="width:88.1pt;border-top:1pt solid windowtext;border-left:1pt solid windowtext;border-bottom:none;border-right:solid windowtext 1.0pt;padding:0.2cm 5.4pt 0.2cm 5.4pt">
+                        <p class="MsoNormal" align="center" style="text-align:center">
+                            <span lang="EN-US" style="font-family:&quot;Arial&quot;,sans-serif">&nbsp;</span>
+                        </p>
                     </td>
                 </tr>
                 <tr height="0">
@@ -771,7 +314,6 @@
                     <td width="43" style="border:none"></td>
                     <td width="74" style="border:none"></td>
                 </tr>
-            </tbody>
         </table>
     </div>
     <p class="MsoNormal"><span lang="EN-US">&nbsp;</span></p>
@@ -792,15 +334,93 @@
     data(){
         return{
             tableData: null,
+            projectList: [],
+            deviceStr: null,
+            childrenData: [],
         }
     },
     methods:{
-
+        initData(){
+            let deviceNameList = []
+            if(this.tableData.children){
+                this.tableData.children.forEach(e => {
+                    this.projectList.push(e)
+                    if(e.children){
+                        e.children.forEach(o =>{
+                            deviceNameList.push(o.deviceName)
+                        })
+                    }
+                });
+            }
+            this.deviceStr = Array.from(new Set(deviceNameList)).join(",")
+        },
+        initProjectList(list){
+            const data = {
+                            deviceId: '',
+                            deviceName: '',
+                            required: '',
+                            rpName: '',
+                            rpUnit: '',
+                            testState: '',
+                            userName: '',
+                            testValueList: new Array(13)
+                        }
+            if(list && list.length<2){
+                list.forEach(item=>{
+                    if(item.children && item.children.length < 15){
+                        let size = 15 - item.children.length
+                        for(let j=0;j<item.children.length;j++){
+                            let arr = []
+                            if(item.children[j].testValue){
+                                arr = item.children[j].testValue.split(",")
+                            }
+                            item.children[j].testValueList = arr
+                            if(item.children[0].testValueList.length<13){
+                                let num = 13 - item.children[j].testValueList.length
+                                for(let i=0;i<num;i++){
+                                    item.children[j].testValueList.push("")
+                                }
+                            }
+                        }
+                        for(let i=0;i< size;i++){
+                            item.children.push(data)
+                        }
+                    }
+                })
+            }else{
+                let size = 0
+                list.forEach(item=>{
+                    if(item.children){
+                        size+=item.children.length
+                    }
+                })
+                if(size<15){
+                    let num = 15 - size
+                    for(let i=0;i<num;i++){
+                        list[list.length-1].children.push(data)
+                    }
+                }
+            }
+            // this.projectList = list
+            console.log("list----",list)
+        }
     },
     created(){
-        console.log("qq--",this.formData)
         this.tableData = this.formData
-        console.log("aa--",this.tableData)
+        this.initData()
+        this.initProjectList(this.projectList)
+        // console.log("aa--",this.tableData)
+    },
+    watch:{
+        formData(newVal){
+            if(newVal){
+                this.projectList = []
+                console.log(newVal)
+                this.tableData = newVal
+                this.initData()
+                this.initProjectList(this.projectList)
+            }
+        }
     }
 }
 </script>
diff --git a/vue.config.js b/vue.config.js
index 115733f..6e8a27d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
  * 閰嶇疆鍙傝��:
  * https://cli.vuejs.org/zh/config/
  */
-const url = 'http://192.168.0.23:9999'
+const url = 'http://127.0.0.1:9999'
 // const url = 'http://ztt-gateway:9999'
 const localUrl = 'http://localhost:8089'
 //const localUrl = 'http://10.88.15.95:8089'

--
Gitblit v1.9.3