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

src/app/working-area/working-area.component.ts

@@ -430,105 +430,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       const single = new SinglePointIcon(element, this);
     });
     this.setNameVisible(false, GameMode.BasicInformation);
-
-
-    const tempData = {
-      TemplateId: null,
-      FloorId: null,
-      Angle: 0,
-      Color: 0,
-      Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
-      FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
-      Height: 45,
-      Width: 45,
-      Id: '5f67f92238f13cd2048cae9d',
-      ImageUrl: './assets/images/泡沫消防车.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1295,
-        y: 1237
-      },
-      Name: '',
-      PropertyInfos: [
-        {
-          Enabled: true,
-          Order: 0,
-          PhysicalUnit: '',
-          PropertyName: '名称/编号',
-          PropertyType: 0,
-          PropertyValue: '',
-          Required: false,
-          RuleName: '',
-          RuleValue: '',
-          Tag: '',
-          Visible: true
-        }
-      ],
-      Border: null,
-      DrawMode: null,
-      Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 2
-    };
-
-    const tempData2 = {
-      TemplateId: null,
-      FloorId: null,
-      Angle: 0,
-      Color: 0,
-      Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
-      CanConnection: true,
-      ConnectionObjs: [],
-      FixedSize: false,
-      Height: 45,
-      Width: 45,
-      Id: '5f67f92238f13cd2048cae9d',
-      ImageUrl: './assets/images/水罐消防车.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1295,
-        y: 1237
-      },
-      Name: '',
-      PropertyInfos: [
-        {
-          Enabled: true,
-          Order: 0,
-          PhysicalUnit: '',
-          PropertyName: '名称/编号',
-          PropertyType: 0,
-          PropertyValue: '',
-          Required: false,
-          RuleName: '',
-          RuleValue: '',
-          Tag: '',
-          Visible: true
-        }
-      ],
-      Border: null,
-      DrawMode: null,
-      Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 2
-    };
-    this.ShowCarIcon(tempData);
-    this.ShowCarIcon(tempData2);
-    this.ShowCarIcon(tempData);
-    this.ShowCarIcon(tempData2);
-    this.ShowCarIcon(tempData);
-    this.ShowCarIcon(tempData2);
-
-    // // 开始绘制管线
-    // this.beginPaintPipeline();
-    this.beginPaintingArrows();
   }
   /**
    * 显示车辆图标
@@ -769,7 +670,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
               } else {
                 this.paintingArrows.ready = true;
                 this.paintingArrows = null;
-                this.beginPaintPipeline();
               }
               break;
           }
@@ -968,7 +868,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       this.paintPoints.splice(0, this.paintPoints.length);
       this.paintingPipeline = null;
     }
-    this.beginPaintingArrows();
   }
   public beginPaintingArrows(): void {
     this.paintMode = PaintMode.Arrows;