[完善]完善打印功能；完善下载单位基本信息表格

proxy.config.json

@@ -1,11 +1,11 @@
 {
   "/api": {
-    "target": "https://fx.anxincloud.cn",
+    "target": "https://121.36.37.70:8204",
     "secure": false,
     "changeOrigin": true
   },
   "/hubs": {
-    "target": "https://fx.anxincloud.cn",
+    "target": "https://121.36.37.70:8204",
     "secure": false,
     "ws": true,
     "logLevel": "debug"

src/app/home/basic-info/add-unit/add-unit.component.html

@@ -4,7 +4,7 @@
       <nz-form-label [nzSm]="7" [nzXs]="24" nzRequired nzFor="单位名称">单位名称</nz-form-label>
       <nz-form-control>
         <nz-input-group>
-          <input nz-input type="text" formControlName="unitname" placeholder="请输入单位名称" (ngModelChange)="xxx()"/>
+          <input nz-input type="text" formControlName="unitname" placeholder="请输入单位名称" (ngModelChange)="xxx()" />
         </nz-input-group>
         <div class="error-message"
           *ngIf="validateForm.controls['unitname'].invalid && !validateForm.controls['unitname'].errors.required">
@@ -72,14 +72,24 @@
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label nzRequired [nzSm]="7" [nzXs]="24" nzFor="使用性质">使用性质</nz-form-label>
+      <nz-form-label nzRequired [nzSm]="7" [nzXs]="24" nzFor="单位级别">单位级别</nz-form-label>
       <nz-form-control>
-        <nz-select formControlName="nature" nzAllowClear nzPlaceHolder="请选择使用性质">
+        <nz-select formControlName="companyLevel" nzAllowClear nzPlaceHolder="请选择单位级别">
           <nz-option nzValue="一般单位" nzLabel="一般单位"></nz-option>
           <nz-option nzValue="重点单位" nzLabel="重点单位"></nz-option>
+          <nz-option nzValue="其他单位" nzLabel="其他单位"></nz-option>
+          <nz-option nzValue="九小场所" nzLabel="九小场所"></nz-option>
         </nz-select>
       </nz-form-control>
     </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSm]="7" [nzXs]="24" nzFor="使用性质">使用性质</nz-form-label>
+      <nz-form-control>
+        <nz-input-group>
+          <input nz-input type="text" formControlName="nature" placeholder="请输入使用性质" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSm]="7" [nzXs]="24" nzFor="单位类型">单位类型</nz-form-label>
       <nz-form-control>

src/app/home/basic-info/add-unit/add-unit.component.ts

@@ -23,7 +23,8 @@ export class AddUnitComponent implements OnInit {
       addr: [null],
       orStation: [null, [Validators.required]],
       orDa: [null],
-      nature: [null, [Validators.required]],
+      companyLevel: [null, [Validators.required]],
+      nature: [null],
       unittype: [null]
     });
   }
@@ -31,7 +32,7 @@ export class AddUnitComponent implements OnInit {
     this.modal.destroy({ data: 'this the result data' });
   }
 
-  xxx(){
+  xxx() {
     console.log(this.validateForm.controls['unitname'])
   }
 }

src/app/home/basic-info/unit-details/unit-details.component.html

@@ -31,9 +31,10 @@
         <nz-form-item>
           <nz-form-label [nzSpan]="7" nzFor="所属大队">所属大队</nz-form-label>
           <nz-form-control [nzSpan]="12">
-            <nz-tree-select [nzNodes]="nodes" nzShowSearch nzPlaceHolder="所属大队" formControlName="relatedOrganizationId"
+            <nz-select formControlName="relatedOrganizationId" nzPlaceHolder="所属大队">
-              [nzDropdownClassName]="'maxHeightTreeSelect'" [nzAllowClear]="false">
+              <nz-option *ngFor="let item of battalionList" [nzValue]="item.id" [nzLabel]="item.name">
-            </nz-tree-select>
+              </nz-option>
+            </nz-select>
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
@@ -172,7 +173,7 @@
   </div>
   <div [ngClass]="{'form': disableds}">
     <div class="formbox" *ngIf="index == 1">
-      <button nz-button nzType="primary" *ngIf="!disableds" (click)="download(1)">下载文档</button>
+      <button nz-button nzType="primary" *ngIf="!disableds" (click)="exportClick()">下载文档</button>
       <div id="tablebox4">
         <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin: 0 auto; ">
           <tr style="height:18.4pt">
@@ -2174,7 +2175,7 @@
 
     </div>
     <div class="formbox" *ngIf="index == 4 && isHaveLastTask">
-      <button nz-button nzType="primary" *ngIf="!disableds" (click)="print()">打印表格</button>
+      <button nz-button nzType="primary" *ngIf="!disableds" (click)="print()" [nzLoading]="isprintLoading">打印表格</button>
       <iframe id="iframe1" style="display: none"></iframe>
       <div id="tablebox3">
         <p style="margin:0pt; orphans:0; text-align:center; widows:0">

src/app/home/basic-info/unit-details/unit-details.component.scss

@@ -59,16 +59,20 @@
     padding-left: 10px;
     display: flex;
     justify-content: space-between;
-    .tabbtn{
+
+    .tabbtn {
       display: flex;
-      .bule{
+
+      .bule {
         cursor: pointer;
         color: #000;
       }
-      .line{
+
+      .line {
         margin: 0 10px;
       }
-      .selected{
+
+      .selected {
         color: #2196F3;
       }
     }
@@ -238,7 +242,8 @@
     width: 100%;
     margin: 0 auto;
     position: relative;
-    button{
+
+    button {
       position: absolute;
       right: 15%;
       top: 50px;

src/app/home/basic-info/unit-details/unit-details.component.ts

@@ -16,6 +16,7 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { OperationLogComponent } from './operation-log/operation-log.component';
 
 declare var $: any
+declare var Print: any
 @Component({
   selector: 'app-unit-details',
   templateUrl: './unit-details.component.html',
@@ -467,6 +468,7 @@ export class UnitDetailsComponent implements OnInit {
       adminPhone: [null]
     });
     this.getAllOrganization()
+    this.getAllOrganization2()
     this.getCompanies()
     this.getBuildingTypes()
   }
@@ -757,30 +759,74 @@ export class UnitDetailsComponent implements OnInit {
 
 
   exportClick() {
-    let alarm = ""
+
-    let spray = ""
+    let keyHtml = ''
-    let broadcast = ""
+
-    let smoke = ""
+    if (this.datas.key.length != 0) {
-    if (this.datas.facilities.system.alarm) {
+      this.datas.key.forEach((item, key) => {
-      alarm = "有"
+        keyHtml += `<tr style="height:35.1pt">
-    } else {
+    <td rowspan="2"
-      alarm = "无"
+        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
-    if (this.datas.facilities.system.spray) {
+                style="font-family:宋体; font-size:9pt">重点部位情况（`+ key + `）</span></p>
-      spray = "有"
+    </td>
-    } else {
+    <td
-      spray = "无"
+        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
-    if (this.datas.facilities.system.broadcast) {
+                style="font-family:宋体; font-size:9pt">重点部位名称</span></p>
-      broadcast = "有"
+    </td>
-    } else {
+    <td
-      broadcast = "无"
+        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
-    if (this.datas.facilities.system.smoke) {
+                style="font-family:宋体; font-size:9pt">`+ item.data[0].value + `</span></p>
-      smoke = "有"
+    </td>
-    } else {
+    <td colspan="3"
-      smoke = "无"
+        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">`+ 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">
+        <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">`+ 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">
+        <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">`+ item.data[3].value + `</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">`+ item.data[4].value + `</span></p>
+    </td>
+</tr>`
+      });
     }
+
+
     let box = `<table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin: 0 auto; ">
     <tr style="height:18.4pt">
       <td colspan="20"
@@ -814,7 +860,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.basicInfo.addr + `</span>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.address + `</span>
       </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">
@@ -835,7 +881,7 @@ export class UnitDetailsComponent implements OnInit {
       </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:101.05pt">
-        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.basicInfo.total + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -844,7 +890,7 @@ export class UnitDetailsComponent implements OnInit {
       </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; 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">`+ this.datas.basicInfo.height + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -853,7 +899,7 @@ export class UnitDetailsComponent implements OnInit {
       </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">`+ this.datas.basicInfo.layer + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.basicInfo.cengshu + `</span></p>
       </td>
     </tr>
     <tr style="height:4pt">
@@ -865,7 +911,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.basicInfo.structure + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.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">
@@ -875,7 +921,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.basicInfo.coveredArea + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -885,7 +931,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.basicInfo.builtUpArea + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -895,7 +941,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.basicInfo.nature + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.xingzhi + `</span></p>
       </td>
     </tr>
     <tr style="height:16.9pt">
@@ -907,22 +953,22 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.basicInfo.east + `</span></p>
+            style="font-family:宋体; font-size:9pt">东：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.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">`+ this.datas.basicInfo.south + `</span></p>
+            style="font-family:宋体; font-size:9pt">南：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.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">`+ this.datas.basicInfo.west + `</span></p>
+            style="font-family:宋体; font-size:9pt">西：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.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">`+ this.datas.basicInfo.north + `</span></p>
+            style="font-family:宋体; font-size:9pt">北：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.pilin.bei + `</span></p>
       </td>
     </tr>
     <tr style="height:21.45pt">
@@ -934,7 +980,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.basicInfo.routeAndTime + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.luxian + `</span></p>
       </td>
     </tr>
     <tr style="height:22.3pt">
@@ -955,7 +1001,7 @@ export class UnitDetailsComponent implements OnInit {
       </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">`+ this.datas.facilities.controlPosition + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:宋体; font-size:9pt">`+ this.datas.ewai.kongzhishiweizhi + `</span></p>
       </td>
     </tr>
     <tr style="height:22.3pt">
@@ -972,7 +1018,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.poolNumbe + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -982,7 +1028,7 @@ export class UnitDetailsComponent implements OnInit {
       <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:'Times New Roman'; font-size:9pt">`+ this.datas.facilities.poolPosition + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -992,7 +1038,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.poolCapacity + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -1002,7 +1048,7 @@ export class UnitDetailsComponent implements OnInit {
       <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;  vertical-align:middle; width:26.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">`+ this.datas.facilities.supplyMode + `</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[0].data[3].value + `</span></p>
           </td>
     </tr>
     <tr style="height:21.45pt">
@@ -1014,7 +1060,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.waterSources + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -1024,7 +1070,7 @@ export class UnitDetailsComponent implements OnInit {
       <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:'Times New Roman'; font-size:9pt">`+ this.datas.facilities.waterSourcesPosition + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[0].data[5].value + `</span></p>
       </td>
     </tr>
     <tr style="height:29.5pt">
@@ -1037,7 +1083,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">
-          `+ alarm + `
+          `+ (this.datas.other.radiodata[0].isHave ? '有' : '无') + `
         </p>
       </td>
       <td colspan="3"
@@ -1048,7 +1094,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">
-        `+ spray + `
+        `+ (this.datas.other.radiodata[1].isHave ? '有' : '无') + `
         </p>
       </td>
       <td colspan="4"
@@ -1059,7 +1105,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">
-        `+ broadcast + `
+        `+ (this.datas.other.radiodata[2].isHave ? '有' : '无') + `
         </p>
       </td>
       <td colspan="2"
@@ -1070,7 +1116,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">
-        `+ smoke + `
+        `+ (this.datas.other.radiodata[3].isHave ? '有' : '无') + `
         </p>
       </td> 
     </tr>
@@ -1083,7 +1129,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.hydrantsNumber + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.ewai.shiwaishuliang + `</span><span
             style="font-family:宋体; font-size:9pt">个</span></p>
       </td>
       <td colspan="5"
@@ -1094,7 +1140,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.hydrantsPosition + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.ewai.shiwaiweizhi + `</span></p>
       </td>
     </tr>
     <tr style="height:28.05pt">
@@ -1112,20 +1158,20 @@ export class UnitDetailsComponent implements OnInit {
         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">`+ this.datas.facilities.pumpNumber + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.pumpRange + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.pumpFlow + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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"
@@ -1137,12 +1183,12 @@ export class UnitDetailsComponent implements OnInit {
         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"></span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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:'Times New Roman'; font-size:9pt">`+ this.datas.facilities.pumpAdapter + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[1].data[4].value + `</span></p>
       </td>
     </tr>
     <tr style="height:26.1pt">
@@ -1155,20 +1201,20 @@ export class UnitDetailsComponent implements OnInit {
         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">`+ this.datas.facilities.SprayPumpNumber + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.SprayPumpRange + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.SprayPumpFlow + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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"
@@ -1180,12 +1226,12 @@ export class UnitDetailsComponent implements OnInit {
         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"></span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.SprayPumpAdapter + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[2].data[4].value + `</span></p>
       </td>
     </tr>
     <tr style="height:26.1pt">
@@ -1198,7 +1244,7 @@ export class UnitDetailsComponent implements OnInit {
       </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">`+ this.datas.facilities.elevator + `</span>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[3].data[0].value + ',' + this.datas.other.listdata[3].data[1].value + `</span>
         </p>
       </td>
       <td colspan="4"
@@ -1211,7 +1257,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.stairs + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[4].data[0].value + ',' + this.datas.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">
@@ -1223,7 +1269,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.Export + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[5].data[0].value + ',' + this.datas.other.listdata[5].data[1].value + `</span></p>
       </td>
     </tr>
     <tr style="height:26.1pt">
@@ -1235,7 +1281,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.indoorHydrant + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.ewai.shineishuliang + `</span><span
             style="font-family:宋体; font-size:9pt">个</span></p>
       </td>
       <td colspan="4"
@@ -1246,127 +1292,10 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.facilities.standardIndoorHydrant + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[6].data[0].value + ',' + this.datas.other.listdata[6].data[1].value + `</span></p>
       </td>
     </tr>
-    <tr style="height:35.1pt">
+    `+ keyHtml + `
-                <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">`+ this.datas.KeyParts[0].keyparts + `</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">`+ this.datas.KeyParts[0].keypartsposition + `</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">`+ this.datas.KeyParts[0].buildingstructure + `</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">`+ this.datas.KeyParts[0].useNature + `</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">`+ this.datas.KeyParts[0].danger + `</span></p>
-                </td>
-            </tr>
-            <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">`+ this.datas.KeyParts[1].keyparts + `</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">`+ this.datas.KeyParts[1].keypartsposition + `</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">`+ this.datas.KeyParts[1].buildingstructure + `</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">`+ this.datas.KeyParts[1].useNature + `</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">`+ this.datas.KeyParts[1].danger + `</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">
@@ -1378,7 +1307,7 @@ export class UnitDetailsComponent implements OnInit {
       <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">`+ this.datas.tips + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.zhongdiantishi + `</span></p>
       </td>
     </tr>
     <tr style="height:0pt">
@@ -1408,15 +1337,16 @@ export class UnitDetailsComponent implements OnInit {
       style="font-family:Calibri; font-size:10.5pt">&#xa0;</span></p>`
 
     const htmlString = `<!DOCTYPE html>
-<html lang="en">
+      <html lang="en">
-<head>
+      <head>
-  <meta charset="UTF-8">
+        <meta charset="UTF-8">
-  <title>Document</title>
+        <title>Document</title>
-</head>
+      </head>
-<body>
+      <body>
-  `+ box + `
+        `+ box + `
-</body>
+      </body>
-</html>`
+      </html>`
+    console.log(htmlString)
     const fileData = asBlob(htmlString).then((data: any) => {
       saveAs(data, this.datas.basicInfo.name + '基本信息.docx') // 保存为docx文件
     })
@@ -1474,7 +1404,7 @@ export class UnitDetailsComponent implements OnInit {
     let xxx = num3 / 11
 
     this.integrity = Math.floor(xxx * 100) / 100
-    console.log('完整度',this.integrity)
+    console.log('完整度', this.integrity)
     let body = {
       id: this.id,
       usci: this.validateForm.value.code,
@@ -1526,9 +1456,9 @@ export class UnitDetailsComponent implements OnInit {
           }
         }
       }
-      this.datas.basicInfo.name = data.companyName
+      // this.datas.basicInfo.name = data.companyName
-      this.datas.basicInfo.address = data.address
+      // this.datas.basicInfo.address = data.address
-      this.datas.basicInfo.xingzhi = data.useNature
+      // this.datas.basicInfo.xingzhi = data.useNature
       this.integrity = data.integrity
       this.imageUrl = data.imageFile
       console.log('当前单位信息2', this.datas);
@@ -1578,6 +1508,26 @@ export class UnitDetailsComponent implements OnInit {
   }
 
 
+  //获得所有大队
+  battalionList = []
+  getAllOrganization2() {
+    let params = {
+      ContainsChildren: "true",
+      PageNumber: 1,
+      PageSize: 9999,
+      code: '0000'
+    }
+    this.http.get('/api/Organizations', {
+      params: params
+    }).subscribe((data: any) => {
+      console.log('组织机构2222', data.items)
+      data.items.forEach(element => {
+        element.level == 'battalion' ? this.battalionList.push(element) : null
+      });
+    })
+  }
+
+
   looklog() {
     const modal = this.modal.create({
       nzTitle: '操作日志',
@@ -1592,25 +1542,19 @@ export class UnitDetailsComponent implements OnInit {
     });
   }
 
+  isprintLoading = false
   print() {
-    const iframe: any = document.getElementById("iframe1");//获取iframe的window对象
+    this.isprintLoading = true
-    const iwindow: any = iframe.contentWindow;
+    Print('#tablebox3', {
-    // iwindow.document.body.innerText = "";//先清空iframe原先的内容
+      onStart: () => {
-    const printhtml: any = window.document.getElementById('tablebox3');
+        console.log('onStart', this)
-    if (iwindow.document.readyState == "complete") {
+        this.isprintLoading = false
-      const stylArr: Array<any> = [];
+      },
-      Object.assign(stylArr, window.document.getElementsByTagName('style'));
+      onEnd: () => {
-      // 内容加上去
+        console.log('onEnd', new Date())
-      iwindow.document.write(printhtml.innerHTML);
+        this.isprintLoading = false
-      // 样式加上去
-      for (let i = 0; i < stylArr.length; i++) {
-        const style = document.createElement('style');
-        style.innerHTML = stylArr[i].innerHTML;
-        iwindow.document.getElementsByTagName("head")[0].appendChild(style);
       }
-    }
+    })
-    iwindow.print();
-    iwindow.close();
   }
   download(type) {
     if (type == 1) {

src/app/home/basic-info/unit-edit/unit-edit.component.ts

@@ -72,10 +72,9 @@ export class UnitEditComponent implements OnInit {
   nodes: any = []
   getAllOrganization(){
     let params = {
-      // OrganizationUnitId: OrganizationUnitId,
+      ContainsChildren: "true",
-      // IsContainsChildren: "true"
+      PageNumber: 1,
-      ContainsChildren: true,
+      PageSize: 9999
-      pageSize: 9999
     }
     this.http.get('/api/Organizations', {
       params: params

src/app/home/basic-info/unit/unit.component.ts

@@ -36,7 +36,6 @@ export class UnitComponent implements OnInit {
   getAllOrganization() {
     let organizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId
     let params = {
-      OrganizationId: organizationId || '',
       ContainsChildren: "true",
       PageNumber: 1,
       PageSize: 9999
@@ -159,6 +158,7 @@ export class UnitComponent implements OnInit {
               organizationId: instance.validateForm.value.orStation || null,
               relatedOrganizationId: instance.validateForm.value.orDa || null,
               buildingTypeId: instance.validateForm.value.unittype || null,
+              companyLevel: instance.validateForm.value.companyLevel,
               useNature: instance.validateForm.value.nature,
               data: null,
               integrity: integrity.toFixed(2)
@@ -233,31 +233,73 @@ export class UnitComponent implements OnInit {
       this.message.create('warning', '该单位未保存过数据');
       return
     }
+    let keyHtml = ''
 
-    let alarm = ""
+    if (this.datas.key.length != 0) {
-    let spray = ""
+      this.datas.key.forEach((item, key) => {
-    let broadcast = ""
+        keyHtml += `<tr style="height:35.1pt">
-    let smoke = ""
+    <td rowspan="2"
-    if (this.datas.facilities.system.alarm) {
+        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">
-      alarm = "有"
+        <p style="line-height:12pt; margin:0pt 5.65pt; orphans:0; text-align:center; widows:0"><span
-    } else {
+                style="font-family:宋体; font-size:9pt">重点部位情况（`+ key + `）</span></p>
-      alarm = "无"
+    </td>
-    }
+    <td
-    if (this.datas.facilities.system.spray) {
+        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">
-      spray = "有"
+        <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-    } else {
+                style="font-family:宋体; font-size:9pt">重点部位名称</span></p>
-      spray = "无"
+    </td>
-    }
+    <td
-    if (this.datas.facilities.system.broadcast) {
+        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">
-      broadcast = "有"
+        <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-    } else {
+                style="font-family:宋体; font-size:9pt">`+ item.data[0].value + `</span></p>
-      broadcast = "无"
+    </td>
-    }
+    <td colspan="3"
-    if (this.datas.facilities.system.smoke) {
+        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">
-      smoke = "有"
+        <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-    } else {
+                style="font-family:宋体; font-size:9pt">重点部位所在位置</span></p>
-      smoke = "无"
+    </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">`+ 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">
+        <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">`+ 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">
+        <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">`+ item.data[3].value + `</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">`+ item.data[4].value + `</span></p>
+    </td>
+</tr>`
+      });
     }
+
+
     let box = `<table cellspacing="0" cellpadding="0" style="border-collapse:collapse; margin: 0 auto; ">
     <tr style="height:18.4pt">
       <td colspan="20"
@@ -291,7 +333,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.basicInfo.addr + `</span>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.address + `</span>
       </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">
@@ -312,7 +354,7 @@ export class UnitComponent implements OnInit {
       </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:101.05pt">
-        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.basicInfo.total + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -321,7 +363,7 @@ export class UnitComponent implements OnInit {
       </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; 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">`+ this.datas.basicInfo.height + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -330,7 +372,7 @@ export class UnitComponent implements OnInit {
       </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">`+ this.datas.basicInfo.layer + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.basicInfo.cengshu + `</span></p>
       </td>
     </tr>
     <tr style="height:4pt">
@@ -342,7 +384,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.basicInfo.structure + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.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">
@@ -352,7 +394,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.basicInfo.coveredArea + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -362,7 +404,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.basicInfo.builtUpArea + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -372,7 +414,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.basicInfo.nature + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.xingzhi + `</span></p>
       </td>
     </tr>
     <tr style="height:16.9pt">
@@ -384,22 +426,22 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.basicInfo.east + `</span></p>
+            style="font-family:宋体; font-size:9pt">东：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.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">`+ this.datas.basicInfo.south + `</span></p>
+            style="font-family:宋体; font-size:9pt">南：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.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">`+ this.datas.basicInfo.west + `</span></p>
+            style="font-family:宋体; font-size:9pt">西：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.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">`+ this.datas.basicInfo.north + `</span></p>
+            style="font-family:宋体; font-size:9pt">北：</span><span style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.pilin.bei + `</span></p>
       </td>
     </tr>
     <tr style="height:21.45pt">
@@ -411,7 +453,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.basicInfo.routeAndTime + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.basicInfo.luxian + `</span></p>
       </td>
     </tr>
     <tr style="height:22.3pt">
@@ -432,7 +474,7 @@ export class UnitComponent implements OnInit {
       </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">`+ this.datas.facilities.controlPosition + `</span></p>
+        <p style="margin:0pt; text-align:center"><span style="font-family:宋体; font-size:9pt">`+ this.datas.ewai.kongzhishiweizhi + `</span></p>
       </td>
     </tr>
     <tr style="height:22.3pt">
@@ -449,7 +491,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.poolNumbe + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -459,7 +501,7 @@ export class UnitComponent implements OnInit {
       <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:'Times New Roman'; font-size:9pt">`+ this.datas.facilities.poolPosition + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -469,7 +511,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.poolCapacity + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -477,10 +519,10 @@ export class UnitComponent implements OnInit {
             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:1pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:26.15pt">
+            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;  vertical-align:middle; width:26.15pt">
-        <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-            style="font-family:'Times New Roman'; font-size:9pt"`+ this.datas.facilities.supplyMode + `</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[0].data[3].value + `</span></p>
-      </td>
+          </td>
     </tr>
     <tr style="height:21.45pt">
       <td
@@ -491,7 +533,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.waterSources + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">
@@ -501,7 +543,7 @@ export class UnitComponent implements OnInit {
       <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:'Times New Roman'; font-size:9pt">`+ this.datas.facilities.waterSourcesPosition + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[0].data[5].value + `</span></p>
       </td>
     </tr>
     <tr style="height:29.5pt">
@@ -514,7 +556,7 @@ export class UnitComponent implements OnInit {
       <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">
-          `+ alarm + `
+          `+ (this.datas.other.radiodata[0].isHave ? '有' : '无') + `
         </p>
       </td>
       <td colspan="3"
@@ -525,7 +567,7 @@ export class UnitComponent implements OnInit {
       <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">
-        `+ spray + `
+        `+ (this.datas.other.radiodata[1].isHave ? '有' : '无') + `
         </p>
       </td>
       <td colspan="4"
@@ -536,7 +578,7 @@ export class UnitComponent implements OnInit {
       <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">
-        `+ broadcast + `
+        `+ (this.datas.other.radiodata[2].isHave ? '有' : '无') + `
         </p>
       </td>
       <td colspan="2"
@@ -547,7 +589,7 @@ export class UnitComponent implements OnInit {
       <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">
-        `+ smoke + `
+        `+ (this.datas.other.radiodata[3].isHave ? '有' : '无') + `
         </p>
       </td> 
     </tr>
@@ -560,7 +602,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.hydrantsNumber + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.ewai.shiwaishuliang + `</span><span
             style="font-family:宋体; font-size:9pt">个</span></p>
       </td>
       <td colspan="5"
@@ -571,7 +613,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.hydrantsPosition + `</span></p>
+            style="font-family:宋体; font-size:9pt">`+ this.datas.ewai.shiwaiweizhi + `</span></p>
       </td>
     </tr>
     <tr style="height:28.05pt">
@@ -589,20 +631,20 @@ export class UnitComponent implements OnInit {
         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">`+ this.datas.facilities.pumpNumber + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.pumpRange + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.pumpFlow + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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"
@@ -614,12 +656,12 @@ export class UnitComponent implements OnInit {
         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"></span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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:'Times New Roman'; font-size:9pt">`+ this.datas.facilities.pumpAdapter + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[1].data[4].value + `</span></p>
       </td>
     </tr>
     <tr style="height:26.1pt">
@@ -632,20 +674,20 @@ export class UnitComponent implements OnInit {
         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">`+ this.datas.facilities.SprayPumpNumber + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.SprayPumpRange + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.SprayPumpFlow + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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"
@@ -657,12 +699,12 @@ export class UnitComponent implements OnInit {
         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"></span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.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">`+ this.datas.facilities.SprayPumpAdapter + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[2].data[4].value + `</span></p>
       </td>
     </tr>
     <tr style="height:26.1pt">
@@ -675,7 +717,7 @@ export class UnitComponent implements OnInit {
       </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">`+ this.datas.facilities.elevator + `</span>
+        <p style="margin:0pt; text-align:center"><span style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[3].data[0].value + ',' + this.datas.other.listdata[3].data[1].value + `</span>
         </p>
       </td>
       <td colspan="4"
@@ -688,7 +730,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.stairs + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[4].data[0].value + ',' + this.datas.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">
@@ -700,7 +742,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.Export + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[5].data[0].value + ',' + this.datas.other.listdata[5].data[1].value + `</span></p>
       </td>
     </tr>
     <tr style="height:26.1pt">
@@ -712,7 +754,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.indoorHydrant + `</span><span
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.ewai.shineishuliang + `</span><span
             style="font-family:宋体; font-size:9pt">个</span></p>
       </td>
       <td colspan="4"
@@ -723,127 +765,10 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.facilities.standardIndoorHydrant + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.other.listdata[6].data[0].value + ',' + this.datas.other.listdata[6].data[1].value + `</span></p>
       </td>
     </tr>
-    <tr style="height:35.1pt">
+    `+ keyHtml + `
-                <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">`+ this.datas.KeyParts[0].keyparts + `</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">`+ this.datas.KeyParts[0].keypartsposition + `</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">`+ this.datas.KeyParts[0].buildingstructure + `</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">`+ this.datas.KeyParts[0].useNature + `</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">`+ this.datas.KeyParts[0].danger + `</span></p>
-                </td>
-            </tr>
-            <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">`+ this.datas.KeyParts[1].keyparts + `</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">`+ this.datas.KeyParts[1].keypartsposition + `</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">`+ this.datas.KeyParts[1].buildingstructure + `</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">`+ this.datas.KeyParts[1].useNature + `</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">`+ this.datas.KeyParts[1].danger + `</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">
@@ -855,7 +780,7 @@ export class UnitComponent implements OnInit {
       <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">`+ this.datas.tips + `</span></p>
+            style="font-family:'Times New Roman'; font-size:9pt">`+ this.datas.zhongdiantishi + `</span></p>
       </td>
     </tr>
     <tr style="height:0pt">
@@ -884,6 +809,7 @@ export class UnitComponent implements OnInit {
   <p style="margin:0pt; orphans:0; text-align:justify; widows:0"><span style="-aw-bookmark-end:_目录"></span><span
       style="font-family:Calibri; font-size:10.5pt">&#xa0;</span></p>`
 
+
     const htmlString = `<!DOCTYPE html>
 <html lang="en">
 <head>

src/app/home/system-management/or/or.component.ts

@@ -46,8 +46,10 @@ export class OrComponent implements OnInit {
   allOrList: any
   getAllOrganization() {
     let params = {
-      ContainsChildren: true,
+      ContainsChildren: "true",
-      pageSize: 9999
+      PageNumber: 1,
+      PageSize: 9999,
+      code:'0000'
     }
     let organizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId
     this.http.get('/api/Organizations', {

src/app/home/system-management/user/user.component.html

@@ -6,19 +6,14 @@
     </div>
     <div class="searchbox">
         <div class="search">
+            <input type="text" nz-input placeholder="登录账号" [(ngModel)]="searchForm.Username" />
             <input type="text" nz-input placeholder="用户姓名" [(ngModel)]="searchForm.name" />
             <nz-tree-select [nzExpandedKeys]="expandKeys" [nzNodes]="nodes" nzShowSearch nzPlaceHolder="所属机构"
-                [(ngModel)]="searchForm.or" [nzExpandedIcon]="multiExpandedIconTpl"
+                [(ngModel)]="searchForm.or" [nzDropdownClassName]="'maxHeightTreeSelect'" [nzAllowClear]="false">
-                [nzDropdownClassName]="'maxHeightTreeSelect'" [nzAllowClear]="false"></nz-tree-select>
+            </nz-tree-select>
-            <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+            <nz-select [(ngModel)]="searchForm.RoleName" nzPlaceHolder="角色">
-                <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+                <nz-option *ngFor="let item of this.roleList" [nzValue]="item.name" [nzLabel]="item.name"></nz-option>
-
+            </nz-select>
-                </ng-container>
-                <ng-template #elseTemplate>
-                    <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'"
-                        class="ant-tree-switcher-line-icon"></i>
-                </ng-template>
-            </ng-template>
             <button (click)="search()" nz-button nzType="primary"><i nz-icon nzType="search"
                     nzTheme="outline"></i>查询</button>
             <button (click)="reset()" nz-button nzType="default"><i nz-icon nzType="reload"

src/app/home/system-management/user/user.component.scss

@@ -4,7 +4,7 @@
   display: flex;
   flex-direction: column;
   color: #303133;
-
+  overflow: hidden;
   .header {
     width: 100%;
     height: 56px;
@@ -22,6 +22,7 @@
   }
 
   .searchbox {
+    width: 100%;
     height: 70px;
     display: flex;
     justify-content: space-between;
@@ -29,18 +30,18 @@
     align-items: center;
 
     .search {
-      width: 50%;
       display: flex;
 
       input,
-      nz-tree-select {
+      nz-tree-select,
+      nz-select {
         text-align: left;
-        width: 250px;
+        width: 200px;
-        margin-right: 16px;
+        margin-right: 12px;
       }
 
       button {
-        margin-right: 16px;
+        margin-right: 12px;
       }
     }
   }
@@ -50,7 +51,7 @@
     box-sizing: border-box;
     padding: 18px;
     padding-top: 0px;
-
+    overflow: auto;
     .operation {
       a {
         margin-right: 16px;

src/app/home/system-management/user/user.component.ts

@@ -16,6 +16,8 @@ export class UserComponent implements OnInit {
 
   constructor(private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient, private toTree: TreeService) { }
   searchForm = {
+    Username: '',
+    RoleName: '',
     name: '',
     or: ''
   }
@@ -54,6 +56,8 @@ export class UserComponent implements OnInit {
   async getAllUsers() {
     this.isLoading = true
     let params = {
+      Username: this.searchForm.Username,
+      RoleName: this.searchForm.RoleName,
       Name: this.searchForm.name,
       OrganizationId: this.searchForm.or,
       PageNumber: this.PageNumber,
@@ -79,6 +83,8 @@ export class UserComponent implements OnInit {
   reset() {
     this.PageNumber = 1
     this.searchForm = {
+      Username: '',
+      RoleName: '',
       name: '',
       or: JSON.parse(sessionStorage.getItem('userData')).organizationId
     }
@@ -91,20 +97,25 @@ export class UserComponent implements OnInit {
   getAllOrganization() {
     let organizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId
     let params = {
-      OrganizationId: organizationId || '',
       ContainsChildren: "true",
       PageNumber: 1,
-      PageSize: 9999
+      PageSize: 9999,
+      code:'0000'
     }
     this.http.get('/api/Organizations', {
       params: params
     }).subscribe((data: any) => {
+      console.log(data.items)
       data.items.forEach(element => {
+
         if (element.id == organizationId) {
           element.parentId = null
         }
         element.key = element.id
         element.title = element.name
+        if (element.level == 'squadron') {
+          element.isLeaf = true
+        }
       });
       this.nodes = [...this.toTree.toTree(data.items)]
       this.searchForm.or = JSON.parse(sessionStorage.getItem('userData')).organizationId

src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.html

@@ -103,7 +103,7 @@
                             </div>
                             <div class="info">
                                 <span class="assistant" nz-tooltip [nzTooltipTitle]="titleTemplate">
-                                    <ng-container *ngIf="i.relatedTaskId; else elseTemplate">
+                                    <ng-container *ngIf="i.relatedTaskId && i.relatedTask; else elseTemplate">
                                         <span *ngFor="let o of i.relatedTask.supervisors">
                                             {{o.name}}
                                         </span>
@@ -121,7 +121,7 @@
                                     </ng-template>
                                 </span>
                                 <ng-template #titleTemplate let-thing>
-                                    <ng-container *ngIf="i.relatedTaskId; else elseTemplate">
+                                    <ng-container *ngIf="i.relatedTaskId && i.relatedTask; else elseTemplate">
                                         <span style="margin-right: 6px;" *ngFor="let o of i.relatedTask.supervisors">
                                             {{o.name}}
                                         </span>

src/app/home/task/da-monthly-task-overview/da-monthly-task-overview.component.ts

@@ -350,8 +350,9 @@ export class DaMonthlyTaskOverviewComponent implements OnInit {
   stationData = []
   getAllStation() {
     let params = {
-      ContainsChildren: true,
+      ContainsChildren: "true",
-      pageSize: 9999
+      PageNumber: 1,
+      PageSize: 9999
     }
     this.http.get('/api/Organizations', {
       params: params

src/app/home/task/da-oneself-plan/da-oneself-plan.component.html

@@ -157,7 +157,7 @@
                                     </div>
                                     <div class="flexcol flexcolassistant">
                                         <span class="assistant ellipsi" nz-tooltip [nzTooltipTitle]="titleTemplate">
-                                            <ng-container *ngIf="i.relatedTaskId; else elseTemplate">
+                                            <ng-container *ngIf="i.relatedTaskId && i.relatedTask; else elseTemplate">
                                                 <span *ngFor="let o of i.relatedTask.supervisors">
                                                     {{o.name}}
                                                 </span>
@@ -176,7 +176,7 @@
                                             <span></span>
                                         </span>
                                         <ng-template #titleTemplate let-thing>
-                                            <ng-container *ngIf="i.relatedTaskId; else elseTemplate">
+                                            <ng-container *ngIf="i.relatedTaskId && i.relatedTask; else elseTemplate">
                                                 <span style="margin-right: 6px;"
                                                     *ngFor="let o of i.relatedTask.supervisors">
                                                     {{o.name}}

src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts

@@ -133,8 +133,9 @@ export class DaOneselfPlanComponent implements OnInit {
   stationData = []
   getAllStation() {
     let params = {
-      ContainsChildren: true,
+      ContainsChildren: "true",
-      pageSize: 9999
+      PageNumber: 1,
+      PageSize: 9999
     }
     this.http.get('/api/Organizations', {
       params: params

src/app/home/task/station-task-apply/apply/apply.component.ts

@@ -46,13 +46,6 @@ export class ApplyComponent implements OnInit {
     this.newTree = this.nodes
     this.getCompanies()
     this.getAllOrganization()
-
-    // Promise.all([this.getCompanies(), this.getAllOrganization()])
-    //   .then((results) => {
-    //     let arr = [...JSON.parse(JSON.stringify(this.allOrList)), ...JSON.parse(JSON.stringify(this.unitList))]
-    //     let nodes = [...this.toTree.toTree(arr)]
-    //     this.unitPopover.nodes = JSON.parse(JSON.stringify(nodes))
-    //   });
   }
 
 
@@ -64,8 +57,9 @@ export class ApplyComponent implements OnInit {
 
   async getAllOrganization() {
     let params = {
-      ContainsChildren: true,
+      ContainsChildren: "true",
-      pageSize: 9999
+      PageNumber: 1,
+      PageSize: 9999
     }
     return new Promise<void>((resolve, reject) => {
       this.http.get('/api/Organizations', {
@@ -78,7 +72,6 @@ export class ApplyComponent implements OnInit {
           element.disableCheckbox = true
           element.datatype = '机构'
           element.level == 'squadron' ? element.disableCheckbox = false : null
-
         });
         data.items.forEach(element => {
           if (element.id == JSON.parse(sessionStorage.getItem('userData')).organizationId) {
@@ -88,7 +81,6 @@ export class ApplyComponent implements OnInit {
         this.allOrList = JSON.parse(JSON.stringify(data.items))
         this.nodes = [...this.toTree.toTree(JSON.parse(JSON.stringify(data.items)))]
         this.unitPopover.nodes = JSON.parse(JSON.stringify(this.nodes))
-        console.log(6666, data.items)
         resolve(data)
       })
     })

src/app/home/task/station-task-apply/station-task-apply.component.html

@@ -120,7 +120,7 @@
                         </div>
                         <div class="flexcol flexcolassistant">
                             <span class="assistant" nz-tooltip [nzTooltipTitle]="titleTemplate">
-                                <ng-container *ngIf="item.relatedTaskId; else elseTemplate">
+                                <ng-container *ngIf="item.relatedTaskId && item.relatedTask; else elseTemplate">
                                     <span *ngFor="let o of item.relatedTask.supervisors">
                                         {{o.name}}
                                     </span>
@@ -138,7 +138,7 @@
                                 </ng-template>
                             </span>
                             <ng-template #titleTemplate let-thing>
-                                <ng-container *ngIf="item.relatedTaskId; else elseTemplate">
+                                <ng-container *ngIf="item.relatedTaskId && item.relatedTask; else elseTemplate">
                                     <span style="margin-right: 6px;" *ngFor="let o of item.relatedTask.supervisors">
                                         {{o.name}}
                                     </span>

src/app/home/task/station-task-apply/station-task-apply.component.ts

@@ -115,8 +115,10 @@ export class StationTaskApplyComponent implements OnInit {
   nodes: any = []
   async getAllOrganization() {
     let params = {
+      ContainsChildren: "true",
       PageNumber: 1,
-      PageSize: 9999
+      PageSize: 9999,
+      code:'0000'
     }
     var p = new Promise<void>((resolve, reject) => {
       this.http.get('/api/Organizations', {

src/app/home/task/station-task-execution/dist/station-task-execution.component.js

@@ -155,6 +155,7 @@ var StationTaskExecutionComponent = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 params = {
+                    ContainsChildren: "true",
                     PageNumber: 1,
                     PageSize: 9999
                 };

src/app/home/task/station-task-execution/station-task-execution.component.html

@@ -126,7 +126,7 @@
                         </div>
                         <div class="flexcol flexcolassistant">
                             <span class="assistant" nz-tooltip [nzTooltipTitle]="titleTemplate">
-                                <ng-container *ngIf="item.relatedTaskId; else elseTemplate">
+                                <ng-container *ngIf="item.relatedTaskId && item.relatedTask; else elseTemplate">
                                     <span *ngFor="let o of item.relatedTask.supervisors">
                                         {{o.name}}
                                     </span>
@@ -146,7 +146,7 @@
                             </span>
                             <ng-template #titleTemplate let-thing>
 
-                                <ng-container *ngIf="item.relatedTaskId; else elseTemplate">
+                                <ng-container *ngIf="item.relatedTaskId && item.relatedTask; else elseTemplate">
                                     <span *ngFor="let i of item.relatedTask.assistantOrganizations">
                                         {{i.name}}
                                     </span>

src/app/home/task/station-task-execution/station-task-execution.component.ts

@@ -140,6 +140,7 @@ export class StationTaskExecutionComponent implements OnInit {
   nodes: any = []
   async getAllOrganization() {
     let params = {
+      ContainsChildren: "true",
       PageNumber: 1,
       PageSize: 9999
     }

src/app/home/task/station-task-execution/task-details/task-details.component.html

@@ -1,6 +1,7 @@
 <div class="bigbox">
   <div class="btnbox">
     <button class="goback" nz-button nzType="primary" (click)="goback()">返回</button>
+    <button nz-button nzType="primary" (click)="print()" *ngIf="tabnum == 0" [nzLoading]="isprintLoading">打印表格</button>
     <button nz-button nzType="primary" (click)="download(1)" *ngIf="tabnum == 1">下载演练卡</button>
     <button nz-button nzType="primary" (click)="download(2)" *ngIf="tabnum == 2">下载数字化预案</button>
   </div>

src/app/home/task/station-task-execution/task-details/task-details.component.ts

@@ -3,6 +3,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { MethodService } from 'src/app/service/method.service';
 declare var $: any
+declare var Print: any
 import Viewer from 'viewerjs';
 @Component({
   selector: 'app-task-details',
@@ -327,6 +328,22 @@ export class TaskDetailsPagesComponent implements OnInit {
     type == 1 ? $("#tablebox").wordExport('演练卡') : $("#tablebox2").wordExport('数字化预案');
   }
 
+  isprintLoading = false
+  print() {
+    this.isprintLoading = true
+    Print('#tablebox3', {
+      onStart: () => {
+        console.log('onStart', this)
+        this.isprintLoading = false
+      },
+      onEnd: () => {
+        console.log('onEnd', new Date())
+        this.isprintLoading = false
+      }
+    })
+  }
+
+
   //查看图片
   viewImg(url) {
     let dom = document.getElementById(`viewerjs`)

src/app/home/task/station-weekly-plan/station-weekly-plan.component.html

@@ -200,7 +200,7 @@
                                     </div>
                                     <div class="flexcol flexcolassistant">
                                         <span class="assistant" nz-tooltip [nzTooltipTitle]="titleTemplate">
-                                            <ng-container *ngIf="i.relatedTaskId; else elseTemplate">
+                                            <ng-container *ngIf="i.relatedTaskId && i.relatedTask; else elseTemplate">
                                                 <span *ngFor="let o of i.relatedTask.supervisors">
                                                     {{o.name}}
                                                 </span>
@@ -218,7 +218,7 @@
                                             </ng-template>
                                         </span>
                                         <ng-template #titleTemplate let-thing>
-                                            <ng-container *ngIf="i.relatedTaskId; else elseTemplate">
+                                            <ng-container *ngIf="i.relatedTaskId && i.relatedTask; else elseTemplate">
                                                 <span *ngFor="let o of i.relatedTask.supervisors">
                                                     {{o.name}}
                                                 </span>

src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts

@@ -136,8 +136,9 @@ export class StationWeeklyPlanComponent implements OnInit {
   allOrList: any
   getAllStation() {
     let params = {
-      ContainsChildren: true,
+      ContainsChildren: "true",
-      pageSize: 9999
+      PageNumber: 1,
+      PageSize: 9999
     }
     this.http.get('/api/Organizations', {
       params: params

src/app/home/task/zhi-audit/zhi-audit.component.ts

@@ -86,8 +86,9 @@ export class ZhiAuditComponent implements OnInit {
   nodes
   getAllOrganization() {
     let params = {
-      ContainsChildren: true,
+      ContainsChildren: "true",
-      pageSize: 9999
+      PageNumber: 1,
+      PageSize: 9999
     }
     this.http.get('/api/Organizations', {
       params: params

src/app/home/task/zhi-indicators/zhi-indicators.component.ts

@@ -301,8 +301,10 @@ export class ZhiIndicatorsComponent implements OnInit {
   nodes
   async getAllOrganization() {
     let params = {
-      ContainsChildren: true,
+      ContainsChildren: "true",
-      pageSize: 9999
+      PageNumber: 1,
+      PageSize: 9999,
+      code:'0000'
     }
     return new Promise<void>((resolve, reject) => {
       this.http.get('/api/Organizations', {

src/assets/wordexport/jquery.print.js

@@ -0,0 +1,115 @@
+(function (window, document) {
+  var Print = function (dom, options) {
+    if (!(this instanceof Print)) return new Print(dom, options);
+    this.options = this.extend({
+        noPrint: ".no-print",
+        onStart: function () {},
+        onEnd: function () {}
+      },
+      options
+    );
+    if (typeof dom === "string") {
+      this.dom = document.querySelector(dom);
+    } else {
+      this.dom = dom;
+    }
+    this.init();
+  };
+  Print.prototype = {
+    init: function () {
+      var content = this.getStyle() + this.getHtml();
+      this.writeIframe(content);
+    },
+    extend: function (obj, obj2) {
+      for (var k in obj2) {
+        obj[k] = obj2[k];
+      }
+      return obj;
+    },
+    getStyle: function () {
+    //   var str = "",
+    //     styles = document.querySelectorAll("style,link");
+    //   for (var i = 0; i < styles.length; i++) {
+    //     str += styles[i].outerHTML;
+    //   }
+    //   str +=
+    //     "<style>" +
+    //     (this.options.noPrint ? this.options.noPrint : ".no-print") +
+    //     "{display:none;}</style>";
+    //   return str;
+    },
+    getHtml: function () {
+      var inputs = document.querySelectorAll("input");
+      var textareas = document.querySelectorAll("textarea");
+      var selects = document.querySelectorAll("select");
+      for (var k in inputs) {
+        if (inputs[k].type == "checkbox" || inputs[k].type == "radio") {
+          if (inputs[k].checked == true) {
+            inputs[k].setAttribute("checked", "checked");
+          } else {
+            inputs[k].removeAttribute("checked");
+          }
+        } else if (inputs[k].type == "text") {
+          inputs[k].setAttribute("value", inputs[k].value);
+        }
+      }
+      for (var k2 in textareas) {
+        if (textareas[k2].type == "textarea") {
+          textareas[k2].innerHTML = textareas[k2].value;
+        }
+      }
+      for (var k3 in selects) {
+        if (selects[k3].type == "select-one") {
+          var child = selects[k3].children;
+          for (var i in child) {
+            if (child[i].tagName == "OPTION") {
+              if (child[i].selected == true) {
+                child[i].setAttribute("selected", "selected");
+              } else {
+                child[i].removeAttribute("selected");
+              }
+            }
+          }
+        }
+      }
+      return this.dom.outerHTML;
+    },
+    writeIframe: function (content) {
+      var w,
+        doc,
+        iframe = document.createElement("iframe"),
+        f = document.body.appendChild(iframe);
+      iframe.id = "myIframe";
+      iframe.style = "position:absolute;width:0;height:0;top:-10px;left:-10px;";
+      w = f.contentWindow || f.contentDocument;
+      doc = f.contentDocument || f.contentWindow.document;
+      doc.open();
+      doc.write(content);
+      doc.close();
+      this.toPrint(w, function () {
+        document.body.removeChild(iframe);
+      });
+    },
+    toPrint: function (w, cb) {
+      var _this = this;
+      w.onload = function () {
+        try {
+          setTimeout(function () {
+            w.focus();
+            typeof _this.options.onStart === "function" &&
+              _this.options.onStart();
+            if (!w.document.execCommand("print", false, null)) {
+              w.print();
+            }
+            typeof _this.options.onEnd === "function" && _this.options.onEnd();
+            w.close();
+            cb && cb();
+          });
+        } catch (err) {
+          console.log("err", err);
+        }
+      };
+    }
+  };
+  window.Print = Print;
+})(window, document);

src/index.html

@@ -13,9 +13,11 @@
   <app-root></app-root>
   <div id="viewerjs" style="display:none"></div>
 </body>
+
 <script type="text/javascript" src="/assets/wordexport/jquery.js"></script>
 <script type="text/javascript" src="/assets/wordexport/FileSaver.js"></script>
 <script type="text/javascript" src="/assets/wordexport/jquery.wordexport.js"></script>
+<script type="text/javascript" src="/assets/wordexport/jquery.print.js"></script>
 <script src='https://webapi.amap.com/maps?v=2.0&key=e4b359dc7b03f9418b7497f807131346'></script>
 <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>