From 771eec85546f95996d1a86f4358d472a347127ba Mon Sep 17 00:00:00 2001
From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com>
Date: Tue, 22 Sep 2020 15:17:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=20=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=BD=A6=E8=BE=86/=E6=B0=B4=E6=BA=90?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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;
   }
   /**
    * 向其他组件发送信息 *