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

src/app/canvas-share-data.service.ts

@@ -37,8 +37,8 @@ export class CanvasShareDataService {
   allNodeMarkers: any = { highlightMarkers: {}, markers: {} }; // 灾情 标签信息
   selectPanelPoint: DisposalNodeData = new DisposalNodeData(); // 当前数据节点
   selectPanelPointBaseData: any = { description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: '' }; // 当前 数据节点 对应 父级节点
-  
+
-  isInheritSky:any; //缓存 节点 天气
+  isInheritSky: any; //缓存 节点 天气
   customizeDisposalNode: any; // 新建 自定义数据节点 底图+名称
   // 处置 节点
 
@@ -79,7 +79,8 @@ export class CanvasShareDataService {
     ['泡沫发生器', '泡沫发生器'],
     ['消防管网', '消防管网'],
     ['泡沫管网', '消防管网'],
-    ['DCS控制室', 'DCS控制室']
+    ['DCS控制室', 'DCS控制室'],
+    ['消防控制室', '消防控制室'],
   ]);
 
   /** * 向其他组件发送信息 *

src/app/key-unit/basicinfo/basicinfo.component.ts

@@ -931,7 +931,7 @@ export class BasicinfoComponent implements OnInit {
         name: this.unitinfo.name,
         usci: value.creditcode,
         contacts: value.linkman,
-        phone: value.linkphone,
+        phone: String(value.linkphone),
         address: value.unitaddress,
         imageUrl: this.imgsrc,
         location: this.markerPosition,

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

@@ -1,5 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-create-plan-online-five',
@@ -8,12 +9,28 @@ import { Component, OnInit } from '@angular/core';
 })
 export class CreatePlanOnlineFiveComponent implements OnInit {
 
-  constructor(private http: HttpClient) { }
+  constructor(private http: HttpClient, private route: ActivatedRoute) { }
 
   ngOnInit(): void {
     this.getTemplateData()
   }
 
+  //获得单位信息
+  getUnitData(){
+    // let paramsdata:any = {
+    //   Name: this.route.snapshot.queryParams.unitId || '',
+    // }
+    // this.http.get("/api/Companies",{params:paramsdata}).subscribe((data:any)=>{
+    //   this.allKeyUnitInfo = data
+    //   data.items.forEach( (item,index) => {
+    //     item.integrity = this.wanzhengduArr[index]
+    //   })
+    // })
+  }
+
+
+
+
   selectedItem:string = '封面'
   clickTitleItem(item){
     item == '封面' ? this.selectedItem = '封面' : this.selectedItem = item.groupName