shaojiahao
/
TheCommandPlatform-Anxin
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/TheCommandPlatform-Anxin

develop
陈鹏飞 4 years ago
parent
ed16d30102 78e002543e
commit
93c772f992
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/app/canvas-share-data.service.ts

4
src/app/canvas-share-data.service.ts
Unescape View File

@ -71,7 +71,7 @@ export class CanvasShareDataService {
public getLinkCarName(car: any): any[] { public getLinkCarName(car: any): any[] {
const linkCar = []; const linkCar = [];
car.assetData.Pipelines.forEach(pipeline => { car.assetData.Pipelines.forEach(pipeline => {
const icon = pipeline.assetData.LinkedObjects.find(i => i.assetData !== car); const icon = pipeline.assetData.LinkedObjects.find(i => i !== car);
if (icon.assetData.Type === 1) { if (icon.assetData.Type === 1) {
linkCar.push(icon.assetData.Name); linkCar.push(icon.assetData.Name);
} }
@ -82,7 +82,7 @@ export class CanvasShareDataService {
public getWaterOccupyName(car: any): any[] { public getWaterOccupyName(car: any): any[] {
const waterOccupy = []; const waterOccupy = [];
car.assetData.Pipelines.forEach(pipeline => { car.assetData.Pipelines.forEach(pipeline => {
const icon = pipeline.assetData.LinkedObjects.find(i => i.assetData !== car); const icon = pipeline.assetData.LinkedObjects.find(i => i !== car);
if (icon.assetData.Type === 0) { if (icon.assetData.Type === 0) {
car.assetData.WaterOccupy.push(icon.assetData.Name); car.assetData.WaterOccupy.push(icon.assetData.Name);
} }

Write Preview
Loading…
Cancel
Save