Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html

@@ -4,7 +4,8 @@
             <div class="item" [ngClass]="{'selectedItem': selectedItem == '封面'}" (click)="clickTitleItem('封面')">
                 1.封面
             </div>
-            <div class="item" *ngFor="let item of planTemplateData;let key = index" (click)="clickTitleItem(item)" [ngClass]="{'selectedItem': selectedItem == item.groupName}">
+            <div class="item" *ngFor="let item of planTemplateData;let key = index" (click)="clickTitleItem(item)"
+                [ngClass]="{'selectedItem': selectedItem == item.groupName}">
                 {{key + 2}}.{{item.groupName}}
             </div>
         </div>
@@ -27,14 +28,14 @@
                 <p class="planNum">
                     预案编号: <input type="text" name="" id="">
                 </p>
-                <h1>民航大厦</h1>
+                <h1>{{planName}}</h1>
-                <ul>
+                <ul *ngIf="unitData">
                     <li>
                         <div>
                             对象名称：
                         </div>
                         <div>
-                            民航大厦
+                            {{unitData.name}}
                         </div>
                     </li>
                     <li>
@@ -42,12 +43,12 @@
                             单位性质：
                         </div>
                         <div>
-                            高层公共建筑
+                            {{unitData.buildingTypes[0].name}}
                         </div>
                     </li>
                     <li>
                         <div>
-                            *预案级别：
+                            <span class="redspan">*</span>预案级别：
                         </div>
                         <div>
                             V级
@@ -55,7 +56,7 @@
                     </li>
                     <li>
                         <div>
-                            *灾害类型：
+                            <span class="redspan">*</span>灾害类型：
                         </div>
                         <div>
                             <select ngModel="0">
@@ -70,7 +71,7 @@
                             防火级别：
                         </div>
                         <div>
-                            二级+
+
                         </div>
                     </li>
                     <li>
@@ -78,7 +79,7 @@
                             防火管辖：
                         </div>
                         <div>
-                            上海市某某区某消防大队
+                            {{unitData.organizationName}}
                         </div>
                     </li>
                     <li>
@@ -86,7 +87,7 @@
                             灭火责任队站：
                         </div>
                         <div>
-                            上海市某某区某消防救援大队
+
                         </div>
                     </li>
                     <li>

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss

@@ -3,6 +3,9 @@
     height: 100%;
     transform: translate(0, 0);
     background: #f2f4f5;
+    .redspan{
+        color: red;
+    }
     .titlebox {
         width: 100%;
         height: 50px;

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-06-16 13:56:54
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-16 16:26:51
+ * @LastEditTime: 2021-06-17 10:01:26
  */
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
@@ -19,21 +19,29 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
 
   constructor(private http: HttpClient, private route: ActivatedRoute) { }
 
+
+  planName: string //预案名称
   ngOnInit(): void {
+    this.planName = this.route.snapshot.queryParams.planName
     this.getTemplateData()
+    this.getUnitData()
   }
 
+
   //获得单位信息
+  unitData:any
   getUnitData() {
-    // let paramsdata:any = {
+    let paramsdata: any = {
-    //   Name: this.route.snapshot.queryParams.unitId || '',
+      Name: this.route.snapshot.queryParams.unitName || '',
-    // }
+    }
-    // this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
+    this.http.get("/api/Companies", { params: paramsdata }).subscribe((data: any) => {
-    //   this.allKeyUnitInfo = data
+      data.items.forEach(element => {
-    //   data.items.forEach( (item,index) => {
+        if (element.id == this.route.snapshot.queryParams.companyId) {
-    //     item.integrity = this.wanzhengduArr[index]
+          this.unitData = element
-    //   })
+          console.log('单位列表信息', this.unitData)
-    // })
+        }
+      });
+    })
   }
 
 
@@ -41,7 +49,6 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
 
   selectedItem: string = '封面'
   clickTitleItem(item) {
-    //console.log(item,key)
     item == '封面' ? this.selectedItem = '封面' : this.selectedItem = item.groupName
   }
   planTemplateData: any
@@ -60,3 +67,14 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
   }
 
 }
+
+
+export interface unitData {
+  name: string,
+  organizationName: number,
+  buildingTypes: buildingTypes[]
+}
+export interface buildingTypes {
+  id: string,
+  name: string,
+}