From f1488d0443bc9aeca47af48bd5ad0e60ec1cda02 Mon Sep 17 00:00:00 2001
From: jingbowen <970029315@qq.com>
Date: Wed, 10 Aug 2022 19:04:56 +0800
Subject: [PATCH] =?UTF-8?q?word=E6=B7=BB=E5=8A=A0=E9=87=8D=E7=82=B9?=
 =?UTF-8?q?=E9=83=A8=E4=BD=8D=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unit-details/unit-details.component.html  | 140 +++++++++++++-
 .../unit-details/unit-details.component.ts    | 173 +++++++++++++++---
 2 files changed, 283 insertions(+), 30 deletions(-)

diff --git a/src/app/home/basic-info/unit-details/unit-details.component.html b/src/app/home/basic-info/unit-details/unit-details.component.html
index 4a349a2..566f2f3 100644
--- a/src/app/home/basic-info/unit-details/unit-details.component.html
+++ b/src/app/home/basic-info/unit-details/unit-details.component.html
@@ -15,7 +15,7 @@
           <nz-form-label [nzSpan]="7" nzRequired nzFor="单位名称">单位名称</nz-form-label>
           <nz-form-control [nzSpan]="12">
             <nz-input-group>
-              <input nz-input type="text" formControlName="unit" placeholder="请输入单位名称" />
+              <input nz-input type="text" formControlName="companyName" placeholder="请输入单位名称" />
             </nz-input-group>
           </nz-form-control>
         </nz-form-item> -->
@@ -23,7 +23,7 @@
           <nz-form-label [nzSpan]="7" nzFor="消防安全责任人">消防安全责任人</nz-form-label>
           <nz-form-control [nzSpan]="12">
             <nz-input-group>
-              <input nz-input type="text" formControlName="name" placeholder="请输入消防安全责任人" />
+              <input nz-input type="text" formControlName="directorName" placeholder="请输入消防安全责任人" />
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
@@ -31,7 +31,7 @@
           <nz-form-label [nzSpan]="7" nzFor="联系方式">联系方式</nz-form-label>
           <nz-form-control [nzSpan]="12">
             <nz-input-group>
-              <input nz-input type="text" formControlName="iphone" placeholder="请输入联系方式" />
+              <input nz-input type="text" formControlName="directorPhone" placeholder="请输入联系方式" />
             </nz-input-group>
           </nz-form-control>
         </nz-form-item> -->
@@ -39,14 +39,14 @@
           <nz-form-label [nzSpan]="7" nzFor="单位地址">单位地址</nz-form-label>
           <nz-form-control [nzSpan]="12">
             <nz-input-group>
-              <input nz-input type="text" formControlName="addr" placeholder="请输入单位地址" />
+              <input nz-input type="text" formControlName="address" placeholder="请输入单位地址" />
             </nz-input-group>
           </nz-form-control>
         </nz-form-item> -->
         <nz-form-item>
           <nz-form-label nzRequired [nzSpan]="7" nzFor="所属救援站">所属救援站</nz-form-label>
           <nz-form-control [nzSpan]="12">
-            <nz-select formControlName="role" nzPlaceHolder="请选择所属救援站">
+            <nz-select formControlName="organizationId" nzPlaceHolder="请选择所属救援站">
               <nz-option *ngFor="let item of jiuyuanzhan" [nzValue]="item.id" [nzLabel]="item.name">
               </nz-option>
             </nz-select>
@@ -55,7 +55,7 @@
         <nz-form-item>
           <nz-form-label [nzSpan]="7" nzFor="所属大队">所属大队</nz-form-label>
           <nz-form-control [nzSpan]="12">
-            <nz-select formControlName="role2" nzPlaceHolder="请选择所属大队">
+            <nz-select formControlName="relatedOrganizationId" nzPlaceHolder="请选择所属大队">
               <nz-option *ngFor="let item of dadui" [nzValue]="item.id" [nzLabel]="item.name">
               </nz-option>
             </nz-select>
@@ -65,14 +65,14 @@
           <nz-form-label nzRequired [nzSpan]="7" nzFor="使用性质">使用性质</nz-form-label>
           <nz-form-control [nzSpan]="12">
             <nz-input-group>
-              <input nz-input type="text" formControlName="nature" placeholder="请输入使用性质" />
+              <input nz-input type="text" formControlName="useNature" placeholder="请输入使用性质" />
             </nz-input-group>
           </nz-form-control>
         </nz-form-item> -->
         <nz-form-item>
           <nz-form-label [nzSpan]="7" nzFor="建筑类型">建筑类型</nz-form-label>
           <nz-form-control [nzSpan]="12">
-            <nz-select formControlName="role4" nzPlaceHolder="请选择建筑类型">
+            <nz-select formControlName="buildingTypeId" nzPlaceHolder="请选择建筑类型">
               <nz-option *ngFor="let item of listOfData2" [nzValue]="item.id" [nzLabel]="item.name">
               </nz-option>
             </nz-select>
@@ -91,7 +91,7 @@
           <td colspan="20"
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:1pt; padding-left:5.4pt; padding-right:5.4pt; vertical-align:middle; width:477.65pt">
             <p style="margin:0pt; orphans:0; text-align:center; widows:0"><a name="_目录"><span
-                  style="font-family:宋体; font-size:22pt; font-weight:bold; color: #000;">山东小满园餐饮有限公司</span><span
+                  style="font-family:宋体; font-size:22pt; font-weight:bold; color: #000;">{{datas.basicInfo.name}}</span><span
                   style="font-family:宋体; font-size:22pt; font-weight:bold; color: #000;">基本情况</span></a></p>
           </td>
         </tr>
@@ -608,6 +608,128 @@
             </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">
+                      <input
+                      [(ngModel)]="datas.KeyParts[0].keyparts" nz-input style="width:50px" type="text">
+                    </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"><input
+                      [(ngModel)]="datas.KeyParts[0].keypartsposition" nz-input style="width:120px" type="text"></span></p>
+          </td>
+          <td colspan="4"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">建筑结构</span></p>
+          </td>
+          <td colspan="3"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">钢结构</span></p>
+          </td>
+          <td colspan="2"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">使用性质</span></p>
+          </td>
+          <td colspan="2"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:65.6pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">存储漆类，油类</span></p>
+          </td>
+      </tr>
+      <tr style="height:31.75pt">
+          <td
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">主要危险性</span></p>
+          </td>
+          <td colspan="18"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:377.05pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">油类，漆类易燃，有毒</span></p>
+          </td>
+      </tr>
+      <tr style="height:35.1pt">
+          <td rowspan="2"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:1pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; height:35.1pt; padding-left:4.9pt; padding-right:5.03pt; vertical-align:middle; width:30.05pt; writing-mode:tb-rl">
+              <p style="line-height:12pt; margin:0pt 5.65pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">重点部位情况（二）</span></p>
+          </td>
+          <td
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">重点部位名称</span></p>
+          </td>
+          <td
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:35.45pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">淬火油池</span></p>
+          </td>
+          <td colspan="3"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:54.8pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">重点部位所在位置</span></p>
+          </td>
+          <td colspan="3"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">厂区中部</span></p>
+          </td>
+          <td colspan="4"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">建筑结构</span></p>
+          </td>
+          <td colspan="3"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">钢结构</span></p>
+          </td>
+          <td colspan="2"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">使用性质</span></p>
+          </td>
+          <td colspan="2"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:65.6pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">淬火</span></p>
+          </td>
+      </tr>
+      <tr style="height:31.75pt">
+          <td
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">主要危险性</span></p>
+          </td>
+          <td colspan="18"
+              style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:377.05pt">
+              <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                      style="font-family:宋体; font-size:9pt">高温</span></p>
+          </td>
+      </tr>
         <tr style="height:56pt">
           <td
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:30.05pt">
diff --git a/src/app/home/basic-info/unit-details/unit-details.component.ts b/src/app/home/basic-info/unit-details/unit-details.component.ts
index 74f5dac..339a99d 100644
--- a/src/app/home/basic-info/unit-details/unit-details.component.ts
+++ b/src/app/home/basic-info/unit-details/unit-details.component.ts
@@ -64,6 +64,16 @@ export class UnitDetailsComponent implements OnInit {
       indoorHydrant:"",
       standardIndoorHydrant:""
     },
+    KeyParts:[
+      {
+      keyparts:"222",
+      keypartsposition:"333",
+      },
+      {
+        keyparts:"222",
+        keypartsposition:"333",
+      }
+    ],
     tips:""
   }
   aaa = true
@@ -72,20 +82,20 @@ export class UnitDetailsComponent implements OnInit {
   zhidui=[]
   dadui=[]
   jiuyuanzhan=[]
-  id='62f209e9f63e69362ed3239e'
+  id=""
   ngOnInit(): void {
-    console.log(this.router);
-    
+      console.log(this.datas.KeyParts);
+      
+      this.id=this.router['browserUrlTree'].queryParams.id
       this.validateForm = this.fb.group({
-        unit: [null, [Validators.required]],
-        name: [null],
-        iphone: [null],
-        addr: [null],
-        role: [null],
-        role2: [null],
-        nature: [null],
-        role4: [null],
-        phonenum: [null]
+        companyName: [null, [Validators.required]],
+        directorName: [null],
+        directorPhone: [null],
+        address: [null],
+        organizationId: [null],
+        relatedOrganizationId: [null],
+        useNature: [null],
+        buildingTypeId: [null]
       });
       this.getAllOrganization()
       this.getCompanies()
@@ -587,6 +597,124 @@ export class UnitDetailsComponent implements OnInit {
             style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.standardIndoorHydrant+`</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">物质存储仓库</span></p>
+                </td>
+                <td colspan="3"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:54.8pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">重点部位所在位置</span></p>
+                </td>
+                <td colspan="3"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">厂区东侧厂房</span></p>
+                </td>
+                <td colspan="4"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">建筑结构</span></p>
+                </td>
+                <td colspan="3"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">钢结构</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">使用性质</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:65.6pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">存储漆类，油类</span></p>
+                </td>
+            </tr>
+            <tr style="height:31.75pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">主要危险性</span></p>
+                </td>
+                <td colspan="18"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:377.05pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">油类，漆类易燃，有毒</span></p>
+                </td>
+            </tr>
+            <tr style="height:35.1pt">
+                <td rowspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:1pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; height:35.1pt; padding-left:4.9pt; padding-right:5.03pt; vertical-align:middle; width:30.05pt; writing-mode:tb-rl">
+                    <p style="line-height:12pt; margin:0pt 5.65pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">重点部位情况（二）</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">重点部位名称</span></p>
+                </td>
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:35.45pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">淬火油池</span></p>
+                </td>
+                <td colspan="3"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:54.8pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">重点部位所在位置</span></p>
+                </td>
+                <td colspan="3"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:42.15pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">厂区中部</span></p>
+                </td>
+                <td colspan="4"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:34.55pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">建筑结构</span></p>
+                </td>
+                <td colspan="3"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:43.15pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">钢结构</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:36.55pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">使用性质</span></p>
+                </td>
+                <td colspan="2"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:65.6pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">淬火</span></p>
+                </td>
+            </tr>
+            <tr style="height:31.75pt">
+                <td
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; padding-left:5.4pt; padding-right:5.03pt; vertical-align:middle; width:48.95pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">主要危险性</span></p>
+                </td>
+                <td colspan="18"
+                    style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:377.05pt">
+                    <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+                            style="font-family:宋体; font-size:9pt">高温</span></p>
+                </td>
+            </tr>
     <tr style="height:56pt">
       <td
         style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:30.05pt">
@@ -651,16 +779,19 @@ export class UnitDetailsComponent implements OnInit {
     this.http.get('/api/Companies/'+this.id).subscribe((data: any) => {
       console.log(data);
       this.datas=JSON.parse(data.data)
+      this.datas.basicInfo.name=data.companyName
+      this.datas.basicInfo.addr=data.address
+      this.datas.basicInfo.phone=data.directorPhone
+      this.datas.basicInfo.nature=data.useNature
       this.validateForm.patchValue({
-        unit: [data.companyName, [Validators.required]],
-        name: [data.directorName],
-        iphone: [data.directorPhone],
-        addr: [data.address],
-        role: [data.organizationId],
-        role2: [null],
-        nature: [null],
-        role4: [null],
-        phonenum: [null]})
+        companyName: [data.companyName, [Validators.required]],
+        directorName: [data.directorName],
+        directorPhone: [data.directorPhone],
+        address: [data.address],
+        organizationId: [data.organizationId],
+        relatedOrganizationId: [data.relatedOrganizationId],
+        useNature: [data.useNature],
+        buildingTypeId: [data.buildingTypeId]})
       
     })
   }