diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index 0563578..34a2e75 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -67,18 +67,27 @@ export class CanvasShareDataService { [ 'DCS控制室', 'DCS控制室'] ]); - public getLinkCar(car: any) { - if (car.assetData.Type === 1) { - car.assetData.Pipelines.forEach(pipeline => { - const icon = pipeline.assetData.LinkedObjects.find((i: this) => i !== this); - console.log(icon.assetData.Type); - if (icon.assetData.Type === 0) { - car.assetData.WaterOccupy.push(icon.assetData.Name); - } else if (icon.assetData.Type === 1) { - car.assetData.LinkCar.push(icon.assetData.Name); + + public getLinkCar(car: any): any[] { + const linkCar = []; + car.assetData.Pipelines.forEach(pipeline => { + const icon = pipeline.assetData.LinkedObjects.find(i => i.assetData !== car); + if (icon.assetData.Type === 1) { + linkCar.push(icon.assetData.Name); } }); - } + return linkCar; + } + + public getWaterOccupy(car: any): any[] { + const waterOccupy = []; + car.assetData.Pipelines.forEach(pipeline => { + const icon = pipeline.assetData.LinkedObjects.find(i => i.assetData !== car); + if (icon.assetData.Type === 0) { + car.assetData.WaterOccupy.push(icon.assetData.Name); + } + }); + return waterOccupy; } /** * 向其他组件发送信息 *