From 28b56132966e1d016410cddbb922bc5a6f2e72cd Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 27 Sep 2022 16:47:59 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/home/home.module.ts                   |   5 +-
 .../task-details/task-details.component.html  | 295 +++++++++---------
 .../task-details/task-details.component.ts    | 179 ++++++++++-
 src/app/pipe/pipe.ts                          |   9 +
 4 files changed, 325 insertions(+), 163 deletions(-)

diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts
index f26661e..28016bb 100644
--- a/src/app/home/home.module.ts
+++ b/src/app/home/home.module.ts
@@ -73,7 +73,7 @@ import { ChatWindowComponent } from './commonComponents/chat-window/chat-window.
 import { AngularDraggableModule } from 'angular2-draggable';
 import { HomeComponent } from './statistic-analysis/home/home.component';
 import { UploadComponent } from './task/station-task-execution/upload/upload.component';
-import { fileName } from '../pipe/pipe';
+import { chineseNumbers, fileName } from '../pipe/pipe';
 import { TaskDetailsPagesComponent } from './task/station-task-execution/task-details/task-details.component';
 @NgModule({
   declarations: [
@@ -117,7 +117,8 @@ import { TaskDetailsPagesComponent } from './task/station-task-execution/task-de
     ChatWindowComponent,
     HomeComponent,
     UploadComponent,
-    fileName
+    fileName,
+    chineseNumbers
   ],
   imports: [
     CommonModule,
diff --git a/src/app/home/task/station-task-execution/task-details/task-details.component.html b/src/app/home/task/station-task-execution/task-details/task-details.component.html
index 47994fd..691d102 100644
--- a/src/app/home/task/station-task-execution/task-details/task-details.component.html
+++ b/src/app/home/task/station-task-execution/task-details/task-details.component.html
@@ -160,12 +160,14 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt"><span style="font-family:仿宋_GB2312; font-size:12pt"
                 *ngIf="exerciseData.data.data.from[0].form">
-                {{exerciseData.data.data.from[0].form.mode}}
+                {{exerciseData.data.data.from[0].form.marshalling}}
               </span></p>
           </td>
           <td rowspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[0].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[0].form && exerciseData.data.data.from[0].form.imgShow"
                 [src]="exerciseData.data.data.from[0].form ? exerciseData.data.data.from[0].form.imgShow : ''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -210,7 +212,7 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt"><span style="font-family:仿宋_GB2312; font-size:12pt"
                 *ngIf="exerciseData.data.data.from[0].form">
-                {{exerciseData.data.data.from[0].form.marshalling}}
+                {{exerciseData.data.data.from[0].form.mode}}
               </span>
             </p>
           </td>
@@ -229,15 +231,17 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt">
               <span style="font-family:仿宋_GB2312; font-size:12pt" *ngIf="exerciseData.data.data.from[1].form">
-                {{exerciseData.data.data.from[1].form.mode}}
+                {{exerciseData.data.data.from[1].form.marshalling}}
               </span>
             </p>
           </td>
           <td rowspan="4"
             style="border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img *ngIf="exerciseData.data.data.from[1].form"
-                [src]="exerciseData.data.data.from[1].form ? exerciseData.data.data.from[1].imgShow :''" width="100"
-                height="100" alt="newlogo"
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[1].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[1].form && exerciseData.data.data.from[1].form.imgShow"
+                [src]="exerciseData.data.data.from[1].form ? exerciseData.data.data.from[1].form.imgShow :''"
+                width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
             </p>
           </td>
@@ -290,11 +294,14 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt"><span style="font-family:仿宋_GB2312; font-size:12pt"
-                *ngIf="exerciseData.data.data.from[3].form">{{exerciseData.data.data.from[3].form.mode}}</span></p>
+                *ngIf="exerciseData.data.data.from[3].form">{{exerciseData.data.data.from[3].form.marshalling}}</span>
+            </p>
           </td>
           <td rowspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img *ngIf="exerciseData.data.data.from[3].form"
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[3].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[3].form && exerciseData.data.data.from[3].form.imgShow"
                 [src]="exerciseData.data.data.from[3].form ? exerciseData.data.data.from[3].form.imgShow : ''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -349,11 +356,14 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt"><span style="font-family:仿宋_GB2312; font-size:12pt"
-                *ngIf="exerciseData.data.data.from[4].form">{{exerciseData.data.data.from[4].form.mode}}</span></p>
+                *ngIf="exerciseData.data.data.from[4].form">{{exerciseData.data.data.from[4].form.marshalling}}</span>
+            </p>
           </td>
           <td rowspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img *ngIf="exerciseData.data.data.from[4].form"
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[4].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[4].form && exerciseData.data.data.from[4].form.imgShow"
                 [src]="exerciseData.data.data.from[4].form ? exerciseData.data.data.from[4].form.imgShow : ''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -408,11 +418,14 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt"><span style="font-family:仿宋_GB2312; font-size:12pt"
-                *ngIf="exerciseData.data.data.from[5].form">{{exerciseData.data.data.from[5].form.mode}}</span></p>
+                *ngIf="exerciseData.data.data.from[5].form">{{exerciseData.data.data.from[5].form.marshalling}}</span>
+            </p>
           </td>
           <td rowspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img *ngIf="exerciseData.data.data.from[5].form"
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[5].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[5].form && exerciseData.data.data.from[5].form.imgShow"
                 [src]="exerciseData.data.data.from[5].form ? exerciseData.data.data.from[5].form.imgShow : ''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -467,11 +480,14 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt"><span style="font-family:仿宋_GB2312; font-size:12pt"
-                *ngIf="exerciseData.data.data.from[2].form">{{exerciseData.data.data.from[5].form.mode}}</span></p>
+                *ngIf="exerciseData.data.data.from[2].form">{{exerciseData.data.data.from[5].form.marshalling}}</span>
+            </p>
           </td>
           <td rowspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img *ngIf="exerciseData.data.data.from[2].form"
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[2].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[2].form && exerciseData.data.data.from[2].form.imgShow"
                 [src]="exerciseData.data.data.from[2].form ? exerciseData.data.data.from[2].form.imgShow :''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -526,11 +542,14 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:183.6pt">
             <p style="margin:0pt"><span style="font-family:仿宋_GB2312; font-size:12pt"
-                *ngIf="exerciseData.data.data.from[6].form">{{exerciseData.data.data.from[6].form.mode}}</span></p>
+                *ngIf="exerciseData.data.data.from[6].form">{{exerciseData.data.data.from[6].form.marshalling}}</span>
+            </p>
           </td>
           <td rowspan="3"
             style="border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt"><img *ngIf="exerciseData.data.data.from[6].form"
+            <p style="margin:0pt">
+              <img (click)="viewImg(exerciseData.data.data.from[6].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[6].form && exerciseData.data.data.from[6].form.imgShow"
                 [src]="exerciseData.data.data.from[6].form ? exerciseData.data.data.from[6].form.imgShow :''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -578,7 +597,9 @@
           </td>
           <td rowspan="2"
             style="border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img *ngIf="exerciseData.data.data.from[7].form"
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[7].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[7].form &&  exerciseData.data.data.from[7].form.imgShow"
                 [src]="exerciseData.data.data.from[7].form ? exerciseData.data.data.from[7].form.imgShow :''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -615,7 +636,9 @@
           </td>
           <td rowspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:82.1pt">
-            <p style="margin:0pt; text-align:center"><img *ngIf="exerciseData.data.data.from[8].form"
+            <p style="margin:0pt; text-align:center">
+              <img (click)="viewImg(exerciseData.data.data.from[8].form.imgShow)"
+                *ngIf="exerciseData.data.data.from[8].form && exerciseData.data.data.from[8].form.imgShow"
                 [src]="exerciseData.data.data.from[8].form ? exerciseData.data.data.from[8].form.imgShow :''"
                 width="100" height="100" alt="newlogo"
                 style="-aw-left-pos:0pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:0pt; -aw-wrap-type:inline" />
@@ -686,11 +709,8 @@
           <td colspan="20"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:1pt; padding-left:5.4pt; padding-right:5.4pt; vertical-align:middle; width:477.65pt">
             <p style="margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:22pt; font-weight:bold">泰富特钢悬架有限公司</span><span
-                style="font-family:宋体; font-size:22pt; font-weight:bold">基本情况{{xxx ? '牛牛牛' :
-                                '嘤嘤嘤'}}</span></p>
-
-
+                style="font-family:宋体; font-size:22pt; font-weight:bold">{{company}}</span><span
+                style="font-family:宋体; font-size:22pt; font-weight:bold">基本情况</span></p>
           </td>
         </tr>
         <tr style="height:18.4pt">
@@ -708,7 +728,7 @@
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:1pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:101.05pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">泰富特钢悬架有限公司</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.name}}</span></p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
@@ -718,7 +738,7 @@
           <td colspan="7"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:1pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:88.5pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">泰富路中段</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.address}}</span></p>
           </td>
           <td
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:1pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:36.15pt">
@@ -728,7 +748,7 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:1pt; padding-left:5.03pt; padding-right:4.9pt; vertical-align:middle; width:66pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">13335180877</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.basicInfo.phone}}</span></p>
           </td>
         </tr>
         <tr style="height:22.3pt">
@@ -740,7 +760,7 @@
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:101.05pt">
             <p style="margin:0pt; text-align:center"><span
-                style="font-family:'Times New Roman'; font-size:9pt">260</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.basicInfo.peoplenum}}</span></p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
@@ -750,7 +770,8 @@
           <td colspan="7"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:88.5pt">
             <p style="margin:0pt; text-align:center"><span
-                style="font-family:'Times New Roman'; font-size:9pt">12</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.basicInfo.buildingheight}}</span>
+            </p>
           </td>
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
@@ -759,7 +780,8 @@
           </td>
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:65.6pt">
-            <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">1</span>
+            <p style="margin:0pt; text-align:center"><span
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.basicInfo.cengshu}}</span>
             </p>
           </td>
         </tr>
@@ -772,7 +794,7 @@
           <td
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:35.45pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">钢结构</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.jiegou}}</span></p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:54.8pt">
@@ -782,7 +804,7 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">120000</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.basicInfo.zhandimianji}}</span></p>
           </td>
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
@@ -792,7 +814,7 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">24000</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.basicInfo.zongmianji}}</span></p>
           </td>
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
@@ -802,7 +824,7 @@
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:65.6pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">钢材悬架生产</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.xingzhi}}</span></p>
           </td>
         </tr>
         <tr style="height:16.9pt">
@@ -814,25 +836,28 @@
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:101.05pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">东：</span><span style="font-family:宋体; font-size:9pt">玉凯路</span>
+                style="font-family:宋体; font-size:9pt">东：</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.pilin.dong}}</span>
             </p>
           </td>
           <td colspan="7"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:87.5pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">南</span><span style="font-family:宋体; font-size:9pt">：</span><span
-                style="font-family:宋体; font-size:9pt">泰富街</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.pilin.nan}}</span></p>
           </td>
           <td colspan="5"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:90.5pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">西：</span><span style="font-family:宋体; font-size:9pt">玉皇路</span>
+                style="font-family:宋体; font-size:9pt">西：</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.pilin.xi}}</span>
             </p>
           </td>
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:65.6pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">北：</span><span style="font-family:宋体; font-size:9pt">空地</span></p>
+                style="font-family:宋体; font-size:9pt">北：</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.pilin.bei}}</span></p>
           </td>
         </tr>
         <tr style="height:21.45pt">
@@ -844,7 +869,7 @@
           <td colspan="18"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:377.05pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">府前街，玉凯路，泰富路</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.basicInfo.luxian}}</span></p>
           </td>
         </tr>
         <tr style="height:22.3pt">
@@ -866,7 +891,10 @@
           </td>
           <td colspan="17"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:330.8pt">
-            <p style="margin:0pt; text-align:center"><span style="font-family:宋体; font-size:9pt">厂区北侧</span>
+            <p style="margin:0pt; text-align:center">
+              <span style="font-family:宋体; font-size:9pt" *ngIf="kongzhishi.data">
+                {{kongzhishi.data.addres}}
+              </span>
             </p>
           </td>
         </tr>
@@ -884,7 +912,8 @@
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:54.8pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">2</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[0].data[0].value}}</span>
+            </p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
@@ -894,7 +923,8 @@
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">厂区中部</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.listdata[0].data[1].value}}</span>
+            </p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
@@ -904,7 +934,8 @@
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">300</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[0].data[2].value}}</span>
+            </p>
           </td>
           <td
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:28.65pt">
@@ -915,7 +946,7 @@
           <td
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:26.15pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">市政供水</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.listdata[0].data[3].value}}</span></p>
           </td>
         </tr>
         <tr style="height:21.45pt">
@@ -927,7 +958,8 @@
           <td colspan="10"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:153.1pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">2</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[0].data[4].value}}</span>
+            </p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
@@ -937,7 +969,7 @@
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:112.95pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">南侧，东侧各一个</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.listdata[0].data[5].value}}</span></p>
           </td>
         </tr>
         <tr style="height:29.5pt">
@@ -952,8 +984,9 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:35.45pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">有（</span><span
-                style="font-family:宋体; font-size:9pt">）</span><br /><span
-                style="font-family:宋体; font-size:9pt">无（</span><span style="font-family:宋体; font-size:9pt">√</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[0].isHave ? '√' :
+                ''}}）</span><br /><span style="font-family:宋体; font-size:9pt">无（</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[0].isHave ? '' : '√'}}</span><span
                 style="font-family:宋体; font-size:9pt">）</span></p>
           </td>
           <td colspan="3"
@@ -965,8 +998,9 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">有（</span><span
-                style="font-family:宋体; font-size:9pt">）</span><br /><span
-                style="font-family:宋体; font-size:9pt">无（</span><span style="font-family:宋体; font-size:9pt">√</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[1].isHave ? '√' :
+                ''}}）</span><br /><span style="font-family:宋体; font-size:9pt">无（</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[1].isHave ? '' : '√'}}</span><span
                 style="font-family:宋体; font-size:9pt">）</span></p>
           </td>
           <td colspan="4"
@@ -978,8 +1012,9 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">有（</span><span
-                style="font-family:宋体; font-size:9pt">）</span><br /><span
-                style="font-family:宋体; font-size:9pt">无（</span><span style="font-family:宋体; font-size:9pt">√</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[2].isHave ? '√' :
+                ''}}）</span><br /><span style="font-family:宋体; font-size:9pt">无（</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[2].isHave ? '' : '√'}}</span><span
                 style="font-family:宋体; font-size:9pt">）</span></p>
           </td>
           <td colspan="2"
@@ -991,8 +1026,9 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:65.6pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">有（</span><span
-                style="font-family:宋体; font-size:9pt">）</span><br /><span
-                style="font-family:宋体; font-size:9pt">无（</span><span style="font-family:宋体; font-size:9pt">√</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[3].isHave ? '√' :
+                ''}}）</span><br /><span style="font-family:宋体; font-size:9pt">无（</span><span
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.radiodata[3].isHave ? '' : '√'}}</span><span
                 style="font-family:宋体; font-size:9pt">）</span></p>
           </td>
         </tr>
@@ -1005,8 +1041,7 @@
           <td colspan="5"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:130.4pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">20</span><span
-                style="font-family:宋体; font-size:9pt">个</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt"></span></p>
           </td>
           <td colspan="5"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:53pt">
@@ -1015,8 +1050,11 @@
           </td>
           <td colspan="8"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:172.05pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">厂区四周</span></p>
+            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0">
+              <span style="font-family:宋体; font-size:9pt" *ngIf="shiwaixiaohuoshuan.data">
+                {{shiwaixiaohuoshuan.data.addres}}
+              </span>
+            </p>
           </td>
         </tr>
         <tr style="height:28.05pt">
@@ -1034,20 +1072,21 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:41.5pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">数量：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[1].data[0].value}}</span>
+            </p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:40.9pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">扬程：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span><span
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[1].data[1].value}}</span><span
                 style="font-family:'Times New Roman'; font-size:9pt">m</span></p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:39.2pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">流量</span><span style="font-family:宋体; font-size:9pt">：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span><span
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[1].data[2].value}}</span><span
                 style="font-family:'Times New Roman'; font-size:9pt">L/S</span></p>
           </td>
           <td colspan="4"
@@ -1059,12 +1098,13 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.25pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">数量：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[1].data[3].value}}</span>
+            </p>
           </td>
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:65.6pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">无</span></p>
+                style="font-family:宋体; font-size:9pt">{{planData.data.other.listdata[1].data[4].value}}</span></p>
           </td>
         </tr>
         <tr style="height:26.1pt">
@@ -1077,20 +1117,21 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:41.5pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">数量：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[2].data[0].value}}</span>
+            </p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:40.9pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">扬程：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span><span
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[2].data[1].value}}</span><span
                 style="font-family:'Times New Roman'; font-size:9pt">m</span></p>
           </td>
           <td colspan="3"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:39.2pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">流量：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span><span
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[2].data[2].value}}</span><span
                 style="font-family:'Times New Roman'; font-size:9pt">L/S</span></p>
           </td>
           <td colspan="4"
@@ -1102,12 +1143,14 @@
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.25pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
                 style="font-family:宋体; font-size:9pt">数量：</span><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[2].data[3].value}}</span>
+            </p>
           </td>
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:65.6pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[2].data[4].value}}</span>
+            </p>
           </td>
         </tr>
         <tr style="height:26.1pt">
@@ -1120,7 +1163,10 @@
           </td>
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:82.25pt">
-            <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">0</span>
+            <p style="margin:0pt; text-align:center"><span
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[3].data[0].value}}
+                <span *ngIf="planData.data.other.listdata[3].data[0].value">,</span>
+                {{planData.data.other.listdata[3].data[1].value}}</span>
             </p>
           </td>
           <td colspan="4"
@@ -1133,8 +1179,10 @@
           <td colspan="6"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:82.05pt">
             <p style="margin:0pt; text-align:center"><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span><span
-                style="font-family:宋体; font-size:9pt">，无</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[4].data[0].value}}
+                <span
+                  *ngIf="planData.data.other.listdata[4].data[0].value">,</span>{{planData.data.other.listdata[4].data[1].value}}</span>
+            </p>
           </td>
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:57.55pt">
@@ -1146,8 +1194,9 @@
           <td colspan="2"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:65.6pt">
             <p style="margin:0pt; text-align:center"><span
-                style="font-family:'Times New Roman'; font-size:9pt">8</span><span
-                style="font-family:宋体; font-size:9pt">，厂区四周</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[5].data[0].value}}<span
+                  *ngIf="planData.data.other.listdata[5].data[0].value">,</span>{{planData.data.other.listdata[5].data[1].value}}</span>
+            </p>
           </td>
         </tr>
         <tr style="height:26.1pt">
@@ -1158,9 +1207,8 @@
           </td>
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:101.05pt">
-            <p style="margin:0pt; text-align:center"><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span><span
-                style="font-family:宋体; font-size:9pt">个</span></p>
+            <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt"></span>
+            </p>
           </td>
           <td colspan="4"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:63.3pt">
@@ -1170,16 +1218,17 @@
           <td colspan="10"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:191.1pt">
             <p style="margin:0pt; text-align:center"><span
-                style="font-family:'Times New Roman'; font-size:9pt">0</span><span
-                style="font-family:宋体; font-size:9pt">，无</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">{{planData.data.other.listdata[6].data[0].value}}<span
+                  *ngIf="planData.data.other.listdata[6].data[0].value">,</span>{{planData.data.other.listdata[6].data[1].value}}</span>
+            </p>
           </td>
         </tr>
-        <ng-container *ngFor="let xb of yyy">
+        <ng-container *ngFor="let item of planData.data.key;let key = index">
           <tr style="height:35.1pt">
             <td rowspan="2"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:1pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; height:35.1pt; padding-left:4.9pt; padding-right:5.03pt; vertical-align:middle; width:30.05pt; writing-mode:tb-rl">
               <p style="line-height:12pt; margin:0pt 5.65pt; orphans:0; text-align:center; widows:0">
-                <span style="font-family:宋体; font-size:9pt">重点部位情况（一）</span>
+                <span style="font-family:宋体; font-size:9pt">重点部位情况（{{key | chineseNumbers}}）</span>
               </p>
             </td>
             <td
@@ -1190,7 +1239,7 @@
             <td
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:35.45pt">
               <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                  style="font-family:宋体; font-size:9pt">物质存储仓库</span></p>
+                  style="font-family:宋体; font-size:9pt">{{item.data[0].value}}</span></p>
             </td>
             <td colspan="3"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:54.8pt">
@@ -1200,7 +1249,7 @@
             <td colspan="3"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
               <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                  style="font-family:宋体; font-size:9pt">厂区东侧厂房</span></p>
+                  style="font-family:宋体; font-size:9pt">{{item.data[1].value}}</span></p>
             </td>
             <td colspan="4"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
@@ -1210,7 +1259,7 @@
             <td colspan="3"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
               <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                  style="font-family:宋体; font-size:9pt">钢结构</span></p>
+                  style="font-family:宋体; font-size:9pt">{{item.data[2].value}}</span></p>
             </td>
             <td colspan="2"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
@@ -1220,7 +1269,7 @@
             <td colspan="2"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:65.6pt">
               <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                  style="font-family:宋体; font-size:9pt">存储漆类，油类</span></p>
+                  style="font-family:宋体; font-size:9pt">{{item.data[3].value}}</span></p>
             </td>
           </tr>
           <tr style="height:31.75pt">
@@ -1232,79 +1281,12 @@
             <td colspan="18"
               style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:377.05pt">
               <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                  style="font-family:宋体; font-size:9pt">油类，漆类易燃，有毒</span></p>
+                  style="font-family:宋体; font-size:9pt">{{item.data[4].value}}</span></p>
             </td>
           </tr>
         </ng-container>
 
 
-
-
-
-
-
-
-
-        <tr style="height:35.1pt">
-          <td rowspan="2"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:1pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; height:35.1pt; padding-left:4.9pt; padding-right:5.03pt; vertical-align:middle; width:30.05pt; writing-mode:tb-rl">
-            <p style="line-height:12pt; margin:0pt 5.65pt; orphans:0; text-align:center; widows:0">
-              <span style="font-family:宋体; font-size:9pt">重点部位情况（二）</span>
-            </p>
-          </td>
-          <td
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">重点部位名称</span></p>
-          </td>
-          <td
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:35.45pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">淬火油池</span></p>
-          </td>
-          <td colspan="3"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:54.8pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">重点部位所在位置</span></p>
-          </td>
-          <td colspan="3"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">厂区中部</span></p>
-          </td>
-          <td colspan="4"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">建筑结构</span></p>
-          </td>
-          <td colspan="3"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">钢结构</span></p>
-          </td>
-          <td colspan="2"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">使用性质</span></p>
-          </td>
-          <td colspan="2"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:65.6pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">淬火</span></p>
-          </td>
-        </tr>
-        <tr style="height:31.75pt">
-          <td
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">主要危险性</span></p>
-          </td>
-          <td colspan="18"
-            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:377.05pt">
-            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:宋体; font-size:9pt">高温</span></p>
-          </td>
-        </tr>
         <tr style="height:56pt">
           <td
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:30.05pt">
@@ -1315,12 +1297,15 @@
           </td>
           <td colspan="19"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:436.8pt">
-            <p style="margin:0pt; text-align:center"><span
-                style="font-family:'Times New Roman'; font-size:9pt">&#xa0;</span></p>
+            <p style="margin:0pt; text-align:center">
+              <span style="font-family:'Times New Roman'; font-size:9pt">
+                {{planData.data.zhongdiantishi}}
+              </span>
+            </p>
           </td>
         </tr>
 
       </table>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/home/task/station-task-execution/task-details/task-details.component.ts b/src/app/home/task/station-task-execution/task-details/task-details.component.ts
index 6aa3b29..cf620ec 100644
--- a/src/app/home/task/station-task-execution/task-details/task-details.component.ts
+++ b/src/app/home/task/station-task-execution/task-details/task-details.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { MethodService } from 'src/app/service/method.service';
 declare var $: any
+import Viewer from 'viewerjs';
 @Component({
   selector: 'app-task-details',
   templateUrl: './task-details.component.html',
@@ -112,7 +113,138 @@ export class TaskDetailsPagesComponent implements OnInit {
   /**
    * 救援预案信息
    */
-  planData: any
+  planData: any = {
+    data: {
+      basicInfo: {
+        name: '',
+        address: '',
+        people: '',
+        phone: '',
+        peoplenum: '',
+        buildingheight: '',
+        cengshu: '',
+        jiegou: '',
+        zhandimianji: '',
+        zongmianji: '',
+        xingzhi: '',
+        pilin: {
+          dong: '',
+          xi: '',
+          nan: '',
+          bei: ''
+        },
+        luxian: '',
+        time: ''
+      },
+      other: {
+        listdata: [{
+          name: '消防水源',
+          data: [
+            { name: '消防水池数量', velue: '' },
+            { name: '消防水池位置', velue: '' },
+            { name: '总容量(平方米)', velue: '' },
+            { name: '补给方式', velue: '' },
+            { name: '室外其他水源', velue: '' },
+            { name: '室外其他水源位置', velue: '' }
+          ]
+        },
+        {
+          name: '消防栓泵',
+          data: [
+            { name: '数量', velue: '' },
+            { name: '扬程（m）', velue: '' },
+            { name: '流量(L/S)', velue: '' },
+            { name: '水泵接合器数量', velue: '' },
+            { name: '水泵接合器位置', velue: '' }
+          ]
+        },
+        {
+          name: '喷淋泵',
+          data: [
+            { name: '数量', velue: '' },
+            { name: '扬程（m）', velue: '' },
+            { name: '流量(L/S)', velue: '' },
+            { name: '水泵接合器数量', velue: '' },
+            { name: '水泵接合器位置', velue: '' },
+          ]
+
+
+        },
+        {
+          name: '消防电梯',
+          data: [
+            { name: '数量', velue: '' },
+            { name: '位置', velue: '' },
+          ]
+        },
+        {
+          name: '疏散电梯',
+          data: [
+            { name: '数量', velue: '' },
+            { name: '位置', velue: '' },
+          ]
+        },
+        {
+          name: '安全出口',
+          data: [
+            { name: '数量', velue: '' },
+            { name: '位置', velue: '' },
+          ]
+        },
+        {
+          name: '标准层室内消火栓',
+          data: [
+            { name: '数量', velue: '' },
+            { name: '位置', velue: '' },
+          ]
+        }
+
+        ],
+        radiodata: [{
+          name: '自动报警系统',
+          isHave: null
+        },
+        {
+          name: '自动喷水系统',
+          isHave: null
+        },
+        {
+          name: '应急广播系统',
+          isHave: null
+        },
+        {
+          name: '放排烟系统',
+          isHave: null
+        }
+        ]
+      },
+      key: [
+
+      ],
+      zhongdiantishi: ''
+    }
+  }
+
+  /**
+   * 消防控制室
+   */
+
+  kongzhishi = {
+    data: {
+      addres: ''
+    }
+  }
+
+  /**
+   * 室外消火栓
+   */
+  shiwaixiaohuoshuan = {
+    data: {
+      addres: ''
+    }
+  }
+
+
 
   company: string
   organization: string
@@ -123,9 +255,25 @@ export class TaskDetailsPagesComponent implements OnInit {
     let taskId = this.route.snapshot.queryParams.id
     this.methodService.getTaskDetails(taskId).then((data: any) => {
       let obj = JSON.parse(data.resultData)
-      this.exerciseData = this.methodService.getTaskDetailsItem('实战演练', obj.form)
-      console.log('实战演练详情', this.exerciseData)
-      this.planData = this.methodService.getTaskDetailsItem('数字化预案', obj.form)
+      console.log('所有数据', obj)
+
+
+      let exerciseData = this.methodService.getTaskDetailsItem('实战演练', obj.form)
+      if (exerciseData.data.data) {
+        this.exerciseData = this.methodService.getTaskDetailsItem('实战演练', obj.form)
+      }
+      // console.log('实战演练详情', this.exerciseData)
+
+      let planData = this.methodService.getTaskDetailsItem('数字化预案', obj.form)
+      if (planData.data) {
+        this.planData = this.methodService.getTaskDetailsItem('数字化预案', obj.form)
+      }
+      // console.log('数字化预案详情', this.planData)
+
+      this.kongzhishi = this.methodService.getTaskDetailsItem('消防控制室', obj.form)
+      this.shiwaixiaohuoshuan = this.methodService.getTaskDetailsItem('室外消火栓', obj.form)
+      // console.log('消防控制室详情', this.kongzhishi)
+      // console.log('室外消火栓详情', this.shiwaixiaohuoshuan)
     })
 
   }
@@ -135,9 +283,28 @@ export class TaskDetailsPagesComponent implements OnInit {
     window.history.back()
   }
 
-  xxx = true
-  yyy = [1]
   download(type) {
     type == 1 ? $("#tablebox").wordExport('演练卡') : $("#tablebox2").wordExport('数字化预案');
   }
+
+   //查看图片
+   viewImg(url) {
+    let dom = document.getElementById(`viewerjs`)
+    let pObjs = dom.childNodes;
+    let node = document.createElement("img")
+    node.style.display = "none";
+    node.src = url;
+    node.id = 'img'
+    dom.appendChild(node)
+
+    setTimeout(() => {
+      let viewer = new Viewer(document.getElementById(`viewerjs`), {
+        hidden: () => {
+          dom.removeChild(pObjs[0]);
+          viewer.destroy();
+        }
+      });
+      node.click();
+    }, 0);
+  }
 }
diff --git a/src/app/pipe/pipe.ts b/src/app/pipe/pipe.ts
index 4b83e67..4186498 100644
--- a/src/app/pipe/pipe.ts
+++ b/src/app/pipe/pipe.ts
@@ -7,3 +7,12 @@ export class fileName implements PipeTransform {
         return a
     }
 }
+
+
+@Pipe({ name: 'chineseNumbers' })
+export class chineseNumbers implements PipeTransform {
+    transform(value: any): string {
+        let arr = ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十']
+        return arr[value]
+    }
+}