From 3f0db36e47fc108144908351b8b37150fa82c2d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Thu, 15 Apr 2021 15:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A5=BC=E5=B1=82=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/canvas-share-data.service.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts
index 4fef136..401ff23 100644
--- a/src/app/canvas-share-data.service.ts
+++ b/src/app/canvas-share-data.service.ts
@@ -23,24 +23,23 @@ export class CanvasShareDataService {
   selectTemplateData: any; // 选择当前 模板数据
 
   // 总平面图/建筑 楼层
-  selectStorey:any = {area: '', details: ''}; // 选择当前 楼层 数据
-  originalcompanyBuildingData:any; // 单位/建筑 数据
-  originaleveryStoreyData:any; // 总平面图/楼层/区域 楼层数据
+  selectStorey: any = { area: '', details: '' }; // 选择当前 楼层 数据
+  originalcompanyBuildingData: any; // 单位/建筑 数据
+  originaleveryStoreyData: any; // 总平面图/楼层/区域 楼层数据
   // 总平面图/建筑 楼层
 
   // 处置 节点
-  allDisposalNode:any = []; // 所有 处置节点
-  allNodeMarkers:any = { highlightMarkers:{}, markers:{} }; // 灾情 标签信息
-  selectPanelPoint:DisposalNodeData = new DisposalNodeData(); // 当前数据节点
-  selectPanelPointBaseData:any = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''}; // 当前 数据节点 对应 父级节点
-  isInheritSky:any; //缓存 节点 天气
-  customizeDisposalNode:any; // 新建 自定义数据节点 底图+名称
+  allDisposalNode: any = []; // 所有 处置节点
+  allNodeMarkers: any = { highlightMarkers: {}, markers: {} }; // 灾情 标签信息
+  selectPanelPoint: DisposalNodeData = new DisposalNodeData(); // 当前数据节点
+  selectPanelPointBaseData: any = { description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: '' }; // 当前 数据节点 对应 父级节点
+  customizeDisposalNode: any; // 新建 自定义数据节点 底图+名称
   // 处置 节点
 
   /**
   * 游戏模式
   */
-  gameMode:GameMode = GameMode.BasicInformation;
+  gameMode: GameMode = GameMode.BasicInformation;
 
   facilityAssetsName = new Map<string, string>([
     ['消防水池', '消防水池'],
@@ -263,6 +262,7 @@ export class CanvasShareDataService {
         important.Id = '';
         important.ImageUrls = [];
         important.BuildingId = this.selectStorey.buildingId;
+        important.BuildingAreaId = item.FloorId;
         item.PropertyInfos.forEach(element => {
           if (element.PropertyName === '名称/编号') {
             important.Name = element.PropertyValue;
@@ -409,6 +409,7 @@ export class BuildingAdjoinInfo {
  */
 export class BuildingImportantLocationInfo {
   public BuildingId: string;
+  public BuildingAreaId: string;
   public Id: string;
   public Name: string;
   public Position: string;