From a5c98d113edcd0bc48f0f2dc55936596e03f3a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Wed, 16 Jun 2021 10:42:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=B6=88=E9=98=B2?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/canvas-share-data.service.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index 0fbc484..da9bb5d 100644 --- a/src/app/canvas-share-data.service.ts +++ b/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控制室'], + ['消防控制室', '消防控制室'], ]); /** * 向其他组件发送信息 * From 4d48d1c6134c43c382a98adbcf0217492bce8e46 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 16 Jun 2021 11:43:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF=E7=94=B5=E8=AF=9D=E5=8F=B7?= =?UTF-8?q?=E7=A0=81=E5=8F=98=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit/basicinfo/basicinfo.component.ts | 2 +- .../create-plan-online-five.component.ts | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts index 97b224e..93f7410 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.ts +++ b/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, diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index 4648c18..f079d4d 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/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