Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

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

@@ -56,7 +56,8 @@ export class CanvasShareDataService {
       if (item.Name === '毗邻') {
         const adjoin = new CompanyAdjoinInfo();
         adjoin.AssetId = item.Id;
-        adjoin.ImageUrls = []
+        adjoin.Id = '';
+        adjoin.ImageUrls = [];
         adjoin.CompanyId = sessionStorage.getItem('companyId');
         item.PropertyInfos.forEach(element => {
           if (element.PropertyName === '方向') {
@@ -82,8 +83,9 @@ export class CanvasShareDataService {
       if (item.Name === '毗邻') {
         const adjoin = new BuildingAdjoinInfo();
         adjoin.AssetId = item.Id;
+        adjoin.Id = '';
         adjoin.BuildingId = this.selectStorey.buildingId;
-        adjoin.ImageUrls = []
+        adjoin.ImageUrls = [];
         item.PropertyInfos.forEach(element => {
           if (element.PropertyName === '方向') {
             adjoin.Direction = Number(element.PropertyValue);
@@ -107,8 +109,9 @@ export class CanvasShareDataService {
       const item = this.originalcompanyBuildingData.data[key];
       if (item.Name === '重点部位') {
         const important = new CompanyImportantLocationInfo();
-        important.Id = item.Id;
-        important.ImageUrls = []
+        important.AssetId = item.Id;
+        important.Id = '';
+        important.ImageUrls = [];
         important.CompanyId = sessionStorage.getItem('companyId');
         item.PropertyInfos.forEach(element => {
           if (element.PropertyName === '名称/编号') {
@@ -139,8 +142,9 @@ export class CanvasShareDataService {
       const item = this.originalcompanyBuildingData.data[key];
       if (item.Name === '重点部位') {
         const important = new BuildingImportantLocationInfo();
-        important.Id = item.Id;
-        important.ImageUrls = []
+        important.AssetId = item.Id;
+        important.Id = '';
+        important.ImageUrls = [];
         important.BuildingId = this.selectStorey.buildingId;
         item.PropertyInfos.forEach(element => {
           if (element.PropertyName === '名称/编号') {
@@ -240,6 +244,7 @@ export class BuildingImportantLocationInfo {
   public Nature: string;
   public Hazards: string;
   public ImageUrls: string[];
+  public AssetId: string;
 }
 /**
  * 单位重点部位
@@ -253,6 +258,7 @@ export class CompanyImportantLocationInfo {
   public Nature: string;
   public Hazards: string;
   public ImageUrls: string[];
+  public AssetId: string;
 }
 /**
  * 单位消防素材信息