diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts
index 0bcbbde..f8097f2 100644
--- a/src/app/canvas-share-data.service.ts
+++ b/src/app/canvas-share-data.service.ts
@@ -25,6 +25,11 @@ export class CanvasShareDataService {
   selectPanelPoint:any = {disposalNodeId:''}; //选择当前 数据节点
   selectPanelPointBaseData:any = {description: '', notes: '',weather: '',airTemperature: '',windDirection: '',windScale: ''}; //当前 数据节点 所对应的 天气,详情 数据节点
   //处置 节点
+
+  //预案赋能 选择 车辆
+  selectCar:any = {Id: '', WaterYield: '', Foam: '', PeopleNum: '', Tonnage: '', Assignment: '', LinkCar: '', WaterOccupy: ''}
+   //预案赋能 选择 车辆
+
   /**
   * 游戏模式
   */
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts
index a5c9acd..c0ac672 100644
--- a/src/app/navigation/navigation.component.ts
+++ b/src/app/navigation/navigation.component.ts
@@ -28,7 +28,7 @@ export class NavigationComponent implements OnInit {
     {name:'危化品', url: '/ui/dangerous'},
     {name:'类似预案', url: '/ui/similarPlans'},
     {name:'真实战例', url: '/ui/realCases'},
-    {name:'预案辅助', url: '/ui/planAssistance'}
+    {name:'预案赋能', url: '/ui/planAssistance'}
   ]
 
   ngOnInit () {
diff --git a/src/app/pipes/boolean.pipe.ts b/src/app/pipes/boolean.pipe.ts
index 56b7930..8604d14 100644
--- a/src/app/pipes/boolean.pipe.ts
+++ b/src/app/pipes/boolean.pipe.ts
@@ -1,5 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { isno , PlanTypeEnum , AuditStatusEnum , PlanLevelEnum} from '../interface'
+import {DomSanitizer} from '@angular/platform-browser'
 @Pipe({name: 'isno'})
 export class IsnoPipe implements PipeTransform {
     transform(value: boolean): string {
@@ -29,4 +30,14 @@ export class  PlanLevel implements PipeTransform {
     transform(value: number): string {
         return PlanLevelEnum[value]
     }
+}
+
+@Pipe({name: 'safeHtml'})
+export class SafeHtmlPipe implements PipeTransform {
+  constructor(private sanitizer: DomSanitizer) {
+  }
+
+  transform(html) {
+    return this.sanitizer.bypassSecurityTrustHtml(html)
+  }
 }
\ No newline at end of file
diff --git a/src/app/ui/dangerous/dangerous.component.html b/src/app/ui/dangerous/dangerous.component.html
index 5d15e2d..3a49d5b 100644
--- a/src/app/ui/dangerous/dangerous.component.html
+++ b/src/app/ui/dangerous/dangerous.component.html
@@ -7,7 +7,7 @@
         <!-- 危化品类型 -->
         <div class="type" *ngIf="istype">
             <div class="leftbox">
-
+                <div *ngFor="let item of typedata,let key = index" [title]="item.name" (click)="selectedDiv(key,item)" [ngClass]="{'divselected': key == selectedIndex}"><span>{{item.name}}</span></div>
             </div>
             <div class="rightbox">
                 <table>
@@ -18,51 +18,36 @@
                         <th>分类</th>
                         <th>查看详情</th>
                     </tr>
-                    <tr>
-                        <td>row 1, cell 1</td>
-                        <td>row 1, cell 2</td>
-                        <td>row 1, cell 1</td>
-                        <td>row 1, cell 2</td>
-                        <td (click)="openDetails()">查看详情</td>
-                    </tr>
-                    <tr>
-                        <td>row 1, cell 1</td>
-                        <td>row 1, cell 2</td>
-                        <td>row 1, cell 1</td>
-                        <td>row 1, cell 2</td>
-                        <td>查看详情</td>
-                    </tr>
-                    <tr>
-                        <td>row 1, cell 1</td>
-                        <td>row 1, cell 2</td>
-                        <td>row 1, cell 1</td>
-                        <td>row 1, cell 2</td>
-                        <td>查看详情</td>
+                    <tr *ngFor="let item of detaildata">
+                        <td>{{item.name}}</td>
+                        <td>{{item.englishname}}</td>
+                        <td>{{item.molecularformula}}</td>
+                        <td>{{item.type}}</td>
+                        <td (click)="openDetails(item)">查看详情</td>
                     </tr>
+
                 </table>
             </div>
         </div>
         <!-- 危化品分布 -->
-        <div id="size" class="size" *ngIf="!istype">
-
-        </div>
+        <app-gis  *ngIf="!istype"></app-gis>
         <!-- 详情弹出框 -->
-        <div class="openDiv" *ngIf="isOpen" cdkDragBoundary=".box" cdkDrag>
-            <div class="top">
-                <h4>name</h4> 
+        <div class="openDiv" *ngIf="isOpen" cdkDragBoundary=".box" cdkDrag >
+            <div class="top" cdkDragHandle>
+                <h4>{{detailNode.name}}</h4> 
                 <!-- <div class="btn" style="right: 33px;" title="最小化">-</div> -->
                 <div class="btn" title="关闭" (click)="closeDiv()">x</div>
             </div>
             <div class="details">
                 <div class="left">
-                    <div>品名</div>
-                    <div>理化属性</div>
-                    <div>危害特性</div>
-                    <div>灭火剂</div>
-                    <div>储运注意事项</div>
+                    <div (click)="clickNode(0)">品名</div>
+                    <div (click)="clickNode(1)">理化属性</div>
+                    <div (click)="clickNode(2)">危害特性</div>
+                    <div (click)="clickNode(3)">灭火剂</div>
+                    <div (click)="clickNode(4)">储运注意事项</div>
                 </div>
-                <div class="right">
-
+                <div class="right" [innerHTML]="detailNode.content[num].data | safeHtml">
+        
                 </div>
             </div>
         </div>
diff --git a/src/app/ui/dangerous/dangerous.component.scss b/src/app/ui/dangerous/dangerous.component.scss
index f68c763..3c70771 100644
--- a/src/app/ui/dangerous/dangerous.component.scss
+++ b/src/app/ui/dangerous/dangerous.component.scss
@@ -35,6 +35,28 @@
                 // flex: 20%;
                 width: 16%;
                 border-right: 1px solid #26b5fb;
+                div{
+                    white-space: nowrap;/*一行显示*/
+                    overflow: hidden;/*超出部分隐藏*/
+                    text-overflow: ellipsis;/*用...代替超出部分*/
+                    width: 100%;
+                    height:46px;
+                    line-height:46px;
+                    letter-spacing: 3px;
+                    font-size: 20px;
+                    color: white;
+                    // padding-left: 5px;
+                    cursor: pointer;
+                    span{
+                        margin-left: 6px;
+                    }
+                }
+                div:hover{
+                    background-color: #e6963c;
+                }
+                .divselected{
+                    background-color: #e88108;
+                }
             }
             .rightbox{
                 width: 100%;
@@ -73,14 +95,14 @@
                         border-bottom: 1px solid  #26b5fb;
                         width: 100%;
                     }
+                    tr:nth-child(2){
+                        margin-top: 8px;
+                    }
                 }
                 
             }
         }
-        .size{
-            width: 100%;
-            height: 100%;
-        }
+        
         .openDiv{
             z-index: 3000;
             width:600px;
@@ -94,12 +116,16 @@
             background: #063659;
             opacity: 0.9;
             border: 1px solid #26b5fb;
+            div{
+                float: left;
+            }
             .top{
                 width: 100%;
                 height: 32px;
                 line-height: 32px;
                 text-align: center;
-                border-bottom: 1px solid #26b5fb;
+                border-bottom: 1px solid #ff4949;
+                font-size: 18px;
                 position: relative;
                 h4{
                     color: red;
@@ -117,10 +143,11 @@
             }
             .details{
                 width: 100%;
-                height: 100%;
+                height: 468px;
+                display: flex;
                 .left{
                     height: 100%;
-                    width: 24%;
+                    flex: 2;
                     border-right:1px solid #26b5fb;
                     div{
                         width: 100%;
@@ -135,7 +162,29 @@
                         background: #041f33;
                     }
                 }
+                .right{
+                    flex: 8;
+                    height: 468px;
+                    color: white;
+                    letter-spacing: 2px;
+                    padding: 5px 8px;
+                }
             }
         }
     }
-}
\ No newline at end of file
+}
+
+.size{
+    width: 100%;
+    height: 100%;
+    position: relative;
+    z-index: 100;
+}
+#selectedBox{
+    width: 120px;
+    height: 20px;
+    position: absolute;
+    z-index: 101;
+    left: 6px;
+    top: 0;
+}
diff --git a/src/app/ui/dangerous/dangerous.component.ts b/src/app/ui/dangerous/dangerous.component.ts
index 11c0e4e..3fe0e24 100644
--- a/src/app/ui/dangerous/dangerous.component.ts
+++ b/src/app/ui/dangerous/dangerous.component.ts
@@ -12,50 +12,139 @@ export class DangerousComponent implements OnInit {
   ngOnInit(): void {
     
   }
-  //地图范围圆圈
-  circle = new AMap.Circle({
-    center: [109.656839, 23.098685],
-    radius: 500, //半径
-    strokeOpacity: 1, 
-    fillOpacity: 0.4,
-    strokeStyle: 'dashed',
-    strokeDasharray: [10, 10], 
-    // 线样式还支持 'dashed'
-    fillColor: '#1791fc',
-    zIndex: 50,
-  })
+  selectedIndex = 0
+  typedata = [
+    {name:"爆炸品",details:[
+      {name:"点火绳",englishname:"Det donating Cords",molecularformula:"无",type:"点火绳"},
+      {name:"乙二硝胺",englishname:"Ethylene Dinitramine",molecularformula:"(CH2NHNO2)2",type:"炸药及爆炸性药品"},
+      {name:"导爆锁",englishname:"Detonating Cords",molecularformula:"无",type:"起爆器材"}
+    ]},
+    {name:"气体",details:[
+      {name:"乙炔",englishname:"Acetylene",molecularformula:"C2H2",type:"易燃气体"},
+      {name:"二氟氯甲烷",englishname:"Chlorodifluoromethane",molecularformula:"CHCF2",type:"非易燃无毒气体"},
+      {name:"二氧化硫",englishname:"Sulfur die oxIde",molecularformula:"SO2",type:"毒性气体"}
+    ]},
+    {name:"易燃液体",details:[
+      {name:"2-乙基-1-丁烯",englishname:"2-Ethyl-1-butene",molecularformula:"CH3CH2(C2Hb)CCH2",type:"低闪点液体",content:[
+        {data:"2-乙基-1-丁烯"},
+        {data:"无色液体,不溶于水,能溶于乙醇丙酮和乙醚。相对密度:0.69(20℃) ,沸点:62℃ ,闪点:<-20℃, 自燃点:315℃"},
+        {data:`易燃,遇热、明火、强氧化剂,均有引起燃烧爆炸的危险。</br>其蒸气能与空气形成爆炸性混合物,遇火星易爆炸。`},
+        {data:"泡沫、二氧化碳、干粉、1211。"},
+        {data:"储存于阴凉通风仓间内,仓温不超过30℃,远离火种、热源,防止阳光直射。应与硝酸等氧化剂分仓间储存。不宜久储,以防聚合变质。搬运时应轻装轻卸,防止包装破损。"},
+      ]},
+      {name:"2-乙基丁醛",englishname:"Diethyl Acetaldehyde",molecularformula:"C212 CHCHO",type:"中闪点液体",content:[
+        {data:"2-乙基丁醛"},
+        {data:`无色液体,不溶于水。能与乙醇、乙燃醚混溶。
+        相对密度:0.8164(20℃)
+        凝固点:-89℃
+        沸点:116.8℃
+        闪点:21.1℃(开杯
+        爆炸极限:1.2%~7.7%
+        蒸气压:1.827kPa(20℃)`},
+        {data:`遇明火、高温、氧化剂,有引起燃烧爆
+        炸的危险。`},
+        {data:`泡沫、干粉、二氧化碳、砂土。`},
+        {data:`包装要密封。储存于阴凉通风
+        的仓间内,防止阳光直射,仓温不超过30℃,远离火
+        种、热源。应与酸类、氧化剂分仓间存放,切勿混储混
+        运。搬运时轻装轻卸,防止包装破损。不宜久储。若
+        触及皮肤,应及时用水冲洗。`},
+      ]},
+      {name:"乙二醇一乙醚",englishname:"Ethylene Glycol Monoethyl Ether",molecularformula:"CH2OHCH2OC2H5",type:"高闪点液体",content:[
+        {data:`乙二醇一乙醚`},
+        {data:`无色液体,几无气味。能与水和醇等
+        大多数有机溶剂混溶。稍有毒,空气中的最高容许浓
+        度为2.0×10-4。
+        相对密度:0.9360(15℃)
+        凝固点:-70
+        沸点:135.1℃
+        闪点:43℃
+        自燃点:235℃
+        爆炸极限:1.8%~14%
+        蒸气压:506.6Pa(20℃)`},
+        {data:`遇明火、高温或氧化剂,有发生燃烧
+        的危险。`},
+        {data:`泡沫、二氧化碳、砂土、干粉。`},
+        {data:`储存于阴凉通风仓间内,远离火
+        种、热源。应与氧化剂分开堆放。包装要密封,防止损
+        耗和变质。搬运时轻装轻卸,保持包装完整`},
+      ]}
+    ]},
+    {name:"易燃固体",details:[
+      {name:"N,N-二亚硝基五亚甲基四胺",englishname:"N,N- Dinitrosopentamethylene",molecularformula:"(CH2)(NO)2N",type:"一级易燃固体",content:[
+        {data:`N,N-二亚硝基五亚甲基四胺`},
+        {data:`淡黄色粉末或砂粒状固体。<span style="color: #ff6600;" >易燃,有毒</span>。易溶于丙酮,略溶于醇,微溶于氯仿,不溶于乙醚及水。<span style="color: #ff6600;" >温度≥199℃时分解,与酸或酸雾接触,将迅速起火燃烧。</span>
+        相对密度:1.4~1.4
+        熔点:200℃(分解)`},
+        {data:`遇高温、明火或与酸(无机酸、有机酸)接触,容易引起剧烈燃烧。与氧化剂混和,能成为爆炸性混合物`},
+        {data:"水、砂土。"},
+        {data:"储存于阴凉通风干燥的库房内。远离火种及热源。严禁与无机酸、有机酸、碱性物质、氧化剂混储混运。要经常检查同库混放物质观其性能是否抵触。储存期最长不超过6个月(自出厂日起)。搬运时应轻装轻卸,防止摩擦、撞击引起燃烧"},
+      ]},
+      {name:"2,4-二亚硝基间苯二酚",englishname:"2,4- Dinitrosores",molecularformula:"C6H2(OH)2(NO)2",type:"二级易燃固体",content:[
+        {data:`2,4-二亚硝基间苯二酚`},
+        {data:`从50%乙醇中析出者,呈黄褐色叶片
+        状结晶。<span style="color: #ff6600;" >易溶于乙醚和苯,难溶于冷水和乙醇。</span>遇铜铁和钴盐溶液,分别显褐色、黄绿色和黄褐色。受热剧烈分解。自甲醇及水中析出者,具有1个分子结晶水,
+        不溶于水,其熔点为162~163℃
+        熔点:168℃
+        自燃点:115℃`},
+        {data:`受热或与氧化剂接触,有燃烧爆炸的
+        危险。`},
+        {data:`砂土、二氧化碳、雾状水。`},
+        {data:`储存于阴凉通风仓间内。最高仓温不宜超过30℃。远离火种及热源。应与氧化剂分仓间存放,与金属粉末及酸类隔离堆放。搬运时应轻装轻卸,防止猛撞引起爆炸。`},
+      ]},
+      {name:"乙基膦",englishname:"Ethylphosphine",molecularformula:"C2H5PH2",type:"一级易于自燃物质",content:[
+        {data:`乙基膦`},
+        {data:`无色液体。遇水分解。
+        相对密度:<1
+        沸点:25℃`},
+        {data:`在空气中能自燃,接触溴、氯和发烟
+        硝酸会发生爆炸。遇浓硫酸会燃烧`},
+        {data:`干砂、干粉。禁止用水、泡沫`},
+        {data:`储存于阴凉干燥仓间内。<span style="color: #ff6600;" >最高仓温不超过20℃。</span>包装必须完整、密封,防止与空气接触。堆放时应与卤素、酸类、潮解性物质、氧化剂分开。远离火种、热源。搬运时轻装轻卸,保持包装完整。`},
+      ]}
+    ]},
+    {name:"氧化物和有机过氧化物",details:[
+      {name:"三氟化溴",englishname:"Bromine Trifluoride",molecularformula:"BrF3",type:"一级氧化性物质"},
+      {name:"三氧化铬(无水)",englishname:"Chromic Anhydride",molecularformula:"CrO3",type:"二级氧化性物质"},
+      {name:"2,5-二甲基-2,5-双",englishname:"2,5- Dimethyl-2",molecularformula:"C16H30O4",type:"有机过氧化物"}
+    ]},
+    {name:"毒性物质",details:[
+      {name:"二氧化硒",englishname:"Selenium dioxide",molecularformula:"SeO2",type:"一级无机毒性物质"},
+      {name:"一氯乙醛",englishname:"Chloroacetaldehyde",molecularformula:"C2H3OCl",type:"一级有机毒性物质"},
+      {name:"一氧化铅",englishname:"Lead Oxide",molecularformula:"PbO",type:"二级无机毒性物质"}
+    ]},
+    {name:"化学毒剂",details:[
+      {name:"二氧二甲胺基氰磷酸乙酯化硒",englishname:"Tabun",molecularformula:"(CH3)2 NPOCNO2H5O",type:"化学毒剂"}
+    ]},
+    {name:"生物战剂",details:[
+      {name:"炭疽杆菌",englishname:"Bacillus Anthracis",molecularformula:"无",type:"生物战剂"}
+    ]},
+    {name:"杂项危险物质",details:[
+      {name:"乙二醇",englishname:"Ethylene Glycol",molecularformula:"HOCH2CH2OH",type:"杂项危险物质"}
+    ]},
+  ]
+ 
+
+  num = 0
+  clickNode(num){
+    this.num = num
+  }
+
+
+
+
+  detaildata = this.typedata[0].details
+  selectedDiv(index,item){
+    this.selectedIndex = index
+    this.detaildata = item.details
+  }
   //类型选择
   istype = true//默认选择危化品类型
-  
   typeSelect(type){
-    if(type ==1 ){
-      this.istype = true
+    if(type == 1){
+      this.istype = true 
     }else{
       this.istype = false
-    
-      setTimeout(() => {
-        var satellite = new AMap.TileLayer.Satellite();
-        var roadNet = new AMap.TileLayer.RoadNet();
-         // 创建一个 icon
-         var viaMarker = new AMap.Marker({
-          position: new AMap.LngLat(116.38,39.92),
-          // 将一张图片的地址设置为 icon
-          icon: '//a.amap.com/jsapi_demos/static/demo-center/icons/dir-via-marker.png',
-          // 设置了 icon 以后，设置 icon 的偏移量，以 icon 的 [center bottom] 为原点
-          offset: new AMap.Pixel(-13, -30)
-      });
-        this.map = new AMap.Map('size',{
-              center: [109.656839, 23.098685],//中心点坐标
-              zoom: 16,
-              layers:[
-                  satellite,
-                  // roadNet
-              ]
-        });
-        this.circle.setMap(this.map)
-        this.map.add([viaMarker]);
-        // this.map.setFitView([ circle ])
-      }, 0);
     }
     
   }
@@ -64,7 +153,107 @@ export class DangerousComponent implements OnInit {
   closeDiv(){
     this.isOpen = false
   }
-  openDetails(){
+
+  detailNode = null
+  openDetails(item){
+    this.detailNode = item
     this.isOpen = true
+    this.num = 0
   }
+
+  
 }
+
+
+@Component({
+  selector: 'app-gis',
+  templateUrl: './gis.html',
+  styleUrls: ['./dangerous.component.scss']
+})
+export class GisComponent implements OnInit {
+
+  constructor() { }
+  map:any //地图
+  ngOnInit(): void {
+    setTimeout(() => {
+      this.creatMap()
+    }, 0);
+  }
+
+  markerIcon = new AMap.Icon({            
+    image:"//a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png",
+    size: new AMap.Size(52, 52),  //图标大小
+    imageSize: new AMap.Size(26,36)
+  }) 
+  //地图范围圆圈
+  circle = new AMap.Circle({
+    center: [109.660144, 23.100172],
+    radius: 500, //半径
+    strokeOpacity: 1, 
+    fillOpacity: 0.4,
+    strokeStyle: 'dashed',
+    strokeDasharray: [10, 10], 
+    // 线样式还支持 'dashed'
+    fillColor: '#1791fc',
+    zIndex: 50,
+  })
+
+  creatMap(){
+    var satellite = new AMap.TileLayer.Satellite();
+    var roadNet = new AMap.TileLayer.RoadNet();
+    
+    // 创建一个 icon
+    var startIcon = new AMap.Icon({
+      // 图标尺寸
+      // size: new AMap.Size(150, 60),
+      // 图标的取图地址
+      image: '../../../assets/images/fire.png',
+      // // 图标所用图片大小
+      imageSize: new AMap.Size(60, 60),
+      // // 图标取图偏移量
+      // imageOffset: new AMap.Pixel(-9, -3)
+    });
+    var viaMarker = new AMap.Marker({
+      position: new AMap.LngLat(109.660144, 23.100172),
+      icon: startIcon,
+      offset: new AMap.Pixel(-20, -30)
+    });
+    let marker1 = new AMap.Marker({
+      icon: this.markerIcon,
+      position: [109.644436,23.101842],
+      offset: new AMap.Pixel(-7, -34)
+    });
+    let marker2 = new AMap.Marker({
+      icon: this.markerIcon,
+      position: [109.666768,23.104276],
+      offset: new AMap.Pixel(0, -20)
+    });
+    let marker3 = new AMap.Marker({
+      icon: this.markerIcon,
+      position: [109.660118,23.095472],
+      offset: new AMap.Pixel(-13, -8)
+    });
+  
+    this.map = new AMap.Map('size',{
+      center: [109.661536,23.098726],//中心点坐标
+      zoom: 15.8,
+      layers:[
+        satellite,
+        roadNet
+      ]
+    });
+    this.circle.setMap(this.map);//增加范围圆圈
+    this.map.add([viaMarker]);//火源标点
+    marker1.setMap(this.map);
+    marker2.setMap(this.map);
+    marker3.setMap(this.map);
+  }
+
+  //范围选择
+  rangevalue = 500
+
+  rangeSelect(e){
+      this.circle.setRadius(Number(this.rangevalue))
+      this.circle.setMap(this.map);//增加范围圆圈
+  }
+}
\ No newline at end of file
diff --git a/src/app/ui/dangerous/gis.html b/src/app/ui/dangerous/gis.html
new file mode 100644
index 0000000..c4a8e15
--- /dev/null
+++ b/src/app/ui/dangerous/gis.html
@@ -0,0 +1,11 @@
+<div style="width: 100%;height: 100%;position: relative;">
+    <div id="size" class="size">
+        
+    </div>
+    <div id="selectedBox" class="selectedBox">
+        <select (change)="rangeSelect($event)" [(ngModel)]="rangevalue">
+            <option value="500">500米</option>
+            <option value="1000">1000米</option>
+        </select>
+    </div>
+</div>
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html
index 5abcce6..dfabde3 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.html
+++ b/src/app/ui/plan-assistance/plan-assistance.component.html
@@ -1,11 +1,95 @@
 <div class="content">
     <div class="left">
-
+        <div class="header leftHeader">到场力量</div>
+        <div class="list">
+            <div class="tableDiv">
+                <div class="tableRows" *ngFor="let item of allCarsData" (click)='selectCar(item)' [ngClass]="{selectIcon: canvasData.selectCar.Id == item.Id}">
+                    <div style="flex: 60%;display: flex;flex-direction: column;justify-content: center;align-items: center;">
+                        <p style="flex: 60%;font-size: 16px;font-weight: 550;" class="contentText">{{item.Name}}</p>
+                        <p style="flex: 40%" class="contentText">{{item.FireTeamName}}</p>
+                    </div>
+                    <div style="flex: 40%; line-height: 50px;text-align: center;color: #37f76D;" *ngIf="item.ReachTime < 1">已到场</div>
+                    <div style="flex: 40%; line-height: 50px;text-align: center;color: #fff;" *ngIf="item.ReachTime > 0">
+                       <label>{{item.ReachTime}}分钟</label>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 
     <!-- canvas -->
-    <div class="center">
-        <app-working-area #workingArea></app-working-area>
+    <div class="center" id="center">
+        <div class="header" style="position: relative;">
+            <div class="title">总平面图</div>
+            <div class="draw">
+                <label title="开始绘制" (click)='plot(0)'></label>
+                <label title="开始绘制" (click)='plot(1)'></label>
+            </div>
+            <div style="float: right;width: 66px;height: 100%;line-height: 40px;text-align: center;position: relative;">
+                <mat-icon style="color: #fff;font-size: 32px;width: 32px;height: 32px;" (click)='toggleSay()'>volume_up</mat-icon>
+                <div class="rightSpeak" *ngIf="rightSayIsShow">
+                    <div style="flex: 1;">
+                        <div class="iconButton" style="background-color: #fe9400;">冷却</div>
+                        <div class="iconButton" style="background-color: #f95e5a;">登罐</div>
+                        <div class="iconButton" style="background-color: #0676ee;">注入泡沫</div>
+                    </div>
+                    <div style="width: 100%;height: 34px;line-height: 34px;display: flex;">
+                        <mat-icon>settings_voice</mat-icon>
+                        <label class="sayBgc">按住说话</label>
+                        <mat-icon>search</mat-icon>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="canvas">
+            <!-- 底部车辆信息 -->
+            <div class="bottomWork" *ngIf="bottomIsShow">
+                <div style="flex: 30%;line-height: 30px;width: 120px;color: #fff;text-align: center;">
+                    <label>车辆属性 <mat-icon (click)="closeBottom()">highlight_off</mat-icon></label>
+                </div>
+                <div style="flex: 70%;display: flex;">
+                    <div style="flex: 90%;">
+                        <div class="publicRow" style="box-sizing: border-box;border-bottom: 1px solid #30bbec;color: #f7ae4a; font-weight: 550;">
+                            <p>载水量</p>
+                            <p>载泡沫</p>
+                            <p>载人数</p>
+                            <p>吨位</p>
+                            <p>执行任务</p>
+                            <p>连接车辆</p>
+                            <p>水源占用</p>
+                        </div>
+                        <div class="publicRow" style="color: #fff;font-size: 12px;">
+                            <p>{{canvasData.selectCar.WaterYield}}</p>
+                            <p>{{canvasData.selectCar.Foam}}</p>
+                            <p>{{canvasData.selectCar.PeopleNum}}</p>
+                            <p>{{canvasData.selectCar.Tonnage}}</p>
+                            <p>
+                                <input type="text" class="taskInput" [(ngModel)]="canvasData.selectCar.Assignment">
+                            </p>
+                            <p>{{canvasData.selectCar.LinkCar}}</p>
+                            <p>{{canvasData.selectCar.WaterOccupy}}</p>
+                        </div>
+                    </div>
+                    <div style="flex: 10%;text-align: center;line-height: 70px;">
+                        <button mat-button>发送</button>
+                    </div>
+                </div>
+            </div>
+            <!-- 底部车辆信息 -->
+            <!-- 右侧楼层区域 -->
+            <div class="showRightStorey" *ngIf="!rightIsShow" title="打开楼层/区域"><mat-icon (click)='openRight()'>keyboard_arrow_left</mat-icon></div>
+            <div class="rightStorey" [ngClass]="{closeRight: !rightIsShow,openRight: rightIsShow}">
+                <div style="flex: 10%;">
+                    <label><mat-icon (click)='closeRight()' title="关闭楼层/区域">keyboard_arrow_right</mat-icon> 楼层/区域</label>
+                </div>
+                <div style="flex: 90%;border-top: 1px solid #30bbec;padding: 1px 0;">
+                    <div style="font-size: 14px;width: 100%;height: 35px;line-height: 35px;background-color: rgba(7,89,155,0.7);"><label>厂区总平面图</label></div>
+                </div>
+            </div>
+            <!-- 右侧楼层区域 -->
+            <app-working-area #workingArea></app-working-area>
+        </div>
+
     </div>
     <!-- canvas -->
 </div>
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.scss b/src/app/ui/plan-assistance/plan-assistance.component.scss
index 379ad01..c1ea7e3 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.scss
+++ b/src/app/ui/plan-assistance/plan-assistance.component.scss
@@ -7,14 +7,230 @@
     display: flex;
 }
 
+//左右侧 header
+.header {
+    width: 100%;
+    height: 40px;
+    min-height: 40px;
+}
+.leftHeader {
+    line-height: 40px;
+    text-align: center;
+    font-size: 20px;
+    font-weight: 550;
+    color: #F7bA2A;
+    cursor: pointer;
+}
+.title {
+    display: inline-block;
+    margin: 1px 0;
+    width: 120px;
+    height: 38px;
+    line-height: 38px;
+    background: url('../../../assets/images/标签正常.png');
+    -moz-background-size:100% 100%;  
+    background-size:100% 100%;
+    font-size: 20px;
+    color: #fff;
+    padding-left: 25px;
+    cursor: pointer;
+}
+
 //左侧菜单
 .left {
     width: 300px;
     height: 100%;
-    background-color: #000;
+    min-width: 250px;
+    box-sizing: border-box;
+    padding: 1px;
+    display: flex;
+    flex-direction: column;
+    .list {
+        flex: 1;
+        overflow: hidden;
+        .tableDiv {
+            height: 100%;
+            overflow-y: auto;
+            border-left: 1px solid #30bbec;
+            border-top: 1px solid #30bbec;
+        }
+    }
+    //每一行
+    .tableRows {
+        height: 50px;
+        overflow: hidden;
+        display: flex;
+        margin: 13px 0;
+        .contentText {
+            font-size: 12px;
+            color: #fff;
+            cursor: pointer;
+            overflow: hidden;
+            text-overflow:ellipsis;
+            white-space: nowrap;
+        }
+    }
+}
+
+//选中状态
+.selectIcon {
+    background-color: rgba(13, 139, 241, 0.7);
 }
 
 //右侧工作区
 .center {
     flex: 1;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    .canvas {
+        flex: 1;
+        position: relative;
+    }
+}
+
+.mat-icon { vertical-align: middle; cursor: pointer; }
+//下方 车辆信息 UI
+.bottomWork {
+    width: 800px;
+    height: 100px;
+    position: absolute;
+    bottom: 5px;
+    left: 50%;
+    margin-left: -400px;
+    z-index: 10;
+    display: flex;
+    flex-direction: column;
+    >div{ background-color:rgba(2, 44, 73, 0.9); }
+    button { width: 50px; height: 40px; background-color: #67c23a; color: #fff; }
+    //table表格
+    .publicRow {
+        height: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        p { flex: 1; text-align: center; line-height: 35px; }
+    }
+    .taskInput {
+        width: 100px;
+        height: 24px;
+        padding-left: 5px;
+        outline: none;
+        border: none;
+        background-color:rgba(255,255,255,0);
+        background: url('../../../assets/images/输入框.png') no-repeat;
+        background-size: 100% 100%;
+        color: #fff;
+    }
+}
+
+//右侧 楼层UI
+.rightStorey {
+    width: 100px;
+    height: 250px;
+    position: absolute;
+    right: 2px;
+    top: 50%;
+    margin-top: -125px;
+    z-index: 10;
+    display: flex;
+    flex-direction: column;
+    background-color:rgba(2, 44, 73, 0.9);
+    color: #fff;
+    font-weight: 300;
+    >div {text-align: center; line-height: 25px;}
+}
+.showRightStorey {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    margin-top: -13px;
+    z-index: 10;
+    width: 26px;
+    height: 26px;
+    line-height: 26px;
+    text-align: center;
+    background-color:rgba(2, 44, 73, 0.9);
+    color: #fff;
+}
+//打开关闭右侧 楼层
+.openRight {
+    margin-right: 0px;
+    transition: margin-right 0.5s;
+}
+.closeRight {
+    margin-right: -300px;
+    transition: margin-right 0.5s;
+}
+
+//右侧语音 UI
+.rightSpeak {
+    position: absolute;
+    top: 40px;
+    left: -275px;
+    width: 310px;
+    height: 320px;
+    z-index: 11;
+    box-sizing: border-box;
+    padding: 3px;
+    border: 1px solid #30bbec;
+    background-color:rgba(2, 44, 73, 0.9);
+    color: #fff;
+    display: flex;
+    flex-direction: column;
+    .mat-icon {
+        font-size: 28px;
+        width: 28px;
+        height: 28px;
+        margin: 3px 10px;
+    }
+    .sayBgc {
+        flex: 1;
+        box-sizing: border-box;
+        background: url('../../../assets/images/输入框.png');
+        background-size: 100% 100%;
+        color: #30bbec;
+    }
+    .iconButton {
+        margin: 10px;
+        border-radius: 18px;
+        width: 70px;
+        height: 30px;
+        text-align: center;
+        line-height: 30px;
+        display: inline-block;
+        font-size: 13px;
+        color: white;
+        cursor: pointer;
+    }
+}
+
+//右侧 绘制工具
+.draw {
+    display: inline-block;
+    position: absolute;
+    width: 80px;
+    height: 38px;
+    top: 1px;
+    left: 50%;
+    margin-left: -40px;
+    padding-top: 6px;
+    label {
+        display: inline-block;
+        width: 24px;
+        height: 24px;
+        margin: 0 5px;
+        border-radius: 50%;
+        cursor: pointer;
+    }
+    :first-child {
+        background: url('../../../assets/images/route.png') no-repeat center center;
+        background-size: 16px 16px;
+        background-color: #fff;
+    }
+    :last-child {
+        background: url('../../../assets/images/direction.png') no-repeat center center;
+        background-size: 16px 16px;
+        background-color: #fff;
+    }
 }
\ No newline at end of file
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts
index 643c99c..e31df47 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.ts
+++ b/src/app/ui/plan-assistance/plan-assistance.component.ts
@@ -1,5 +1,7 @@
-import { Component, OnInit, AfterViewInit, ViewChild } from '@angular/core';
+import { Component, OnInit, AfterViewInit, ViewChild, } from '@angular/core';
 import { WorkingAreaComponent } from 'src/app/working-area/working-area.component';
+import {CanvasShareDataService} from '../../canvas-share-data.service';
+import * as ObjectID from 'bson-objectid';
 
 @Component({
   selector: 'app-plan-assistance',
@@ -7,1115 +9,6641 @@ import { WorkingAreaComponent } from 'src/app/working-area/working-area.componen
   styleUrls: ['./plan-assistance.component.scss']
 })
 export class PlanAssistanceComponent implements OnInit, AfterViewInit {
-  constructor() { }
+  constructor(public canvasData: CanvasShareDataService) { }
 
   @ViewChild('workingArea')
   workingArea: WorkingAreaComponent;
 
-
   demoData = [
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f670ceae03abe3856d87d3e',
+      Name: '消防泵房',
       Angle: 0,
-      Color: 0,
+      Color: '80',
+      Point: {
+        x: 538.0725371265185,
+        y: 790.8249488152024
+      },
+      Width: 32,
+      Border: null,
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7c0ff1bb3cf106508afaed.png',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048cae9d',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1295,
-        y: 1237
-      },
-      Name: '地上消火栓0',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      MultiPoint: null,
+      TemplateId: '5e7c0ff961550e2754d461b9',
+      FireElementId: '5e7967a80814180f1c1ecaa4',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: ''
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '位置',
+          PropertyType: 0,
+          PropertyValue: ''
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f670d5c8db9a325049fa971.jpg'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f670d638db9a325049fa972.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f670dd3e03abe3856d87d3f',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -854.3835678799273,
+        y: 688.1144590593601
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048cae9e',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 2117,
-        y: 981
-      },
-      Name: '地上消火栓1',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '1'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6711f5e03abe3856d87d43',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -539.9645631808662,
+        y: 271.248256281619
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048cae9f',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 2117,
-        y: 607
-      },
-      Name: '地上消火栓2',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '1'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67128ae03abe3856d87d44',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -563.1123674185176,
+        y: 272.12837517909185
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea0',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 2117,
-        y: 66
-      },
-      Name: '地上消火栓3',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671330e03abe3856d87d45',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -51.57937113008251,
+        y: 271.9224183841443
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea1',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 2117,
-        y: -230
-      },
-      Name: '地上消火栓4',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '3'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671341e03abe3856d87d47',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 299.11560093170795,
+        y: 5.1063714995351575
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea2',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1450,
-        y: -410
-      },
-      Name: '地上消火栓5',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '4'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671357e03abe3856d87d49',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 500.9012712134421,
+        y: 432.9232113342218
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea3',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1149,
-        y: 19
-      },
-      Name: '地上消火栓6',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '5'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67136fe03abe3856d87d4a',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 88.60901628649833,
+        y: -362.81780743424156
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea4',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1149,
-        y: 779
-      },
-      Name: '地上消火栓7',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '6'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671382e03abe3856d87d4b',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1089.647824545333,
+        y: -680.096209373906
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea5',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 991,
-        y: 1345
-      },
-      Name: '地上消火栓8',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '7'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671396e03abe3856d87d4c',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 916.5868780327887,
+        y: -357.72777959563734
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea6',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '8'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6713afe03abe3856d87d4d',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 580,
-        y: 1345
+        x: 1267.7987988964815,
+        y: -374.6945390576514
       },
-      Name: '地上消火栓9',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '9'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6713c0e03abe3856d87d4e',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1507.3371984219418,
+        y: -451.51880641310424
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea7',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '10'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f671412e03abe3856d87d4f',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: -14,
-        y: 1507
+        x: 2114.4400960509874,
+        y: -142.24993442805783
       },
-      Name: '地上消火栓10',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '11'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671425e03abe3856d87d50',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1936.2891216998387,
+        y: 278.525700229893
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea8',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f671434e03abe3856d87d51',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: -443,
-        y: 1507
+        x: 1656.3375905766052,
+        y: 275.1323483374903
       },
-      Name: '地上消火栓11',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '13'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671441e03abe3856d87d52',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1155.818186447188,
+        y: -8.212534678145914
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caea9',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '14'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f67144de03abe3856d87d53',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: -519,
-        y: 1014
+        x: 2915.2711426580545,
+        y: -347.5477239184288
       },
-      Name: '地上消火栓12',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '15'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67145be03abe3856d87d54',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 2913.5744667118533,
+        y: 185.20852318881538
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeaa',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '16'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f67146ee03abe3856d87d55',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: -196,
-        y: 1014
+        x: 2096.1298123494207,
+        y: 649.4948028638328
       },
-      Name: '地上消火栓13',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '17'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671481e03abe3856d87d56',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1901.6453605180648,
+        y: 1239.3597336930006
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeab',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '18'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f67148be03abe3856d87d57',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 136,
-        y: 1014
+        x: 1354.5242652562279,
+        y: 1235.0853501362674
       },
-      Name: '地上消火栓14',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '19'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6714ade03abe3856d87d58',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1160.7655915494565,
+        y: 783.9050578476852
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeac',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '20'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6714bde03abe3856d87d59',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 544,
-        y: 404
+        x: 993.7723947424533,
+        y: 1345.901393255869
       },
-      Name: '地上消火栓15',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '21'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6714c5e03abe3856d87d5a',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 577.8951065403974,
+        y: 1345.9013932558687
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caead',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '22'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6714d4e03abe3856d87d5b',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 86,
-        y: 404
+        x: 126.55162198821722,
+        y: 1029.7104791062238
       },
-      Name: '地上消火栓16',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '23'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6714ebe03abe3856d87d5c',
+      Name: '地上消火栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -179.95583881318612,
+        y: 1030.9615299666377
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeae',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '24'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6714ffe03abe3856d87d5d',
+      Name: '地上消火栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: -555,
-        y: 404
+        x: -435.1702143376199,
+        y: 1028.45942824581
       },
-      Name: '地上消火栓17',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7aaef87ba7ea2e4ce5a550',
+      FireElementId: '5e7967810814180f1c1ecaa2',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '25'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '牙口',
+          PropertyType: 0,
+          PropertyValue: '65*2/100'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管径',
+          PropertyType: 0,
+          PropertyValue: 'DN200'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: 'MPa',
+          PropertyName: '压力',
+          PropertyType: 2,
+          PropertyValue: '0.12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '开关类型',
+          PropertyType: 0,
+          PropertyValue: '扳手'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '管网形式',
+          PropertyType: 0,
+          PropertyValue: '环状'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6711aa8db9a325049fa973.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67158fe03abe3856d87d5e',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -5.796097596718141,
+        y: 273.14583520021273
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeaf',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f67165ce03abe3856d87d5f',
+      Name: '泡沫栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: -1542,
-        y: 702
+        x: 462.9058952959447,
+        y: 432.54246436208996
       },
-      Name: '地上消火栓18',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '3'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671670e03abe3856d87d60',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1155.2026113881834,
+        y: 36.88757093210626
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '4'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f67167ee03abe3856d87d61',
+      Name: '泡沫栓',
+      Angle: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1218.8312292956107,
+        y: -356.45297613199
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
       Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '5'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f671690e03abe3856d87d62',
+      Name: '泡沫栓',
+      Angle: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1561.5581030242533,
+        y: -469.2491624224295
+      },
       Width: 32,
-      Id: '5f67f92238f13cd2048caeb0',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '6'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f67169de03abe3856d87d63',
+      Name: '泡沫栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: -1542,
-        y: 1662
+        x: 1046.7447399550688,
+        y: -664.473331002036
       },
-      Name: '地上消火栓19',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '7'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6716bce03abe3856d87d64',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 2115.4162998093598,
+        y: -15.172207355788942
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '8'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6716c9e03abe3856d87d65',
+      Name: '泡沫栓',
+      Angle: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 2915.112338509526,
+        y: -292.8243582245628
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
       Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '9'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6716e0e03abe3856d87d66',
+      Name: '泡沫栓',
+      Angle: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1988.5158013887126,
+        y: 278.0216677369151
+      },
       Width: 32,
-      Id: '5f67f92238f13cd2048caeb1',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '11'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6716f6e03abe3856d87d67',
+      Name: '泡沫栓',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 130,
-        y: -147
+        x: 2975.3868020413206,
+        y: 191.2124158152834
       },
-      Name: '地上消火栓20',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '10'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671701e03abe3856d87d68',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1703.0254066222362,
+        y: 272.97200813738664
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb2',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 904,
-        y: -375
-      },
-      Name: '地上消火栓21',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671717e03abe3856d87d69',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 2092.983870088383,
+        y: 819.7323282038833
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb3',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1137,
-        y: -674
-      },
-      Name: '地上消火栓22',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '13'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671730e03abe3856d87d6a',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1951.9378727440935,
+        y: 1239.7359647402122
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb4',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 2922,
-        y: -349
-      },
-      Name: '地上消火栓23',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '14'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67173be03abe3856d87d6b',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1408.1271940944434,
+        y: 1236.6016092436726
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb5',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 2922,
-        y: 187
-      },
-      Name: '地上消火栓24',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '15'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671744e03abe3856d87d6c',
+      Name: '泡沫栓',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1160.4571509862274,
+        y: 942.5243236030998
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb6',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1931,
-        y: 289
-      },
-      Name: '地上消火栓25',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b3a6a0137e12020bd7f7f',
+      FireElementId: '5e796b4a0814180f1c1ecabb',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '16'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '型号',
+          PropertyType: 0,
+          PropertyValue: 'PS100-65*2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '出口',
+          PropertyType: 0,
+          PropertyValue: '法兰'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6715768db9a325049fa974.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671767e03abe3856d87d6d',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -592.1952057948927,
+        y: 271.2807226550343
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb7',
-      ImageUrl: './assets/images/地上消火栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 87,
-        y: -432
-      },
-      Name: '地上消火栓26',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '1'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671842e03abe3856d87d6e',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -97.79605019753274,
+        y: 272.1435484065131
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb8',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1361,
-        y: 1212
-      },
-      Name: '泡沫栓0',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '2'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671853e03abe3856d87d6f',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1150.6880828651256,
+        y: -69.45260716773461
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeb9',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1943,
-        y: 1212
-      },
-      Name: '泡沫栓1',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '3'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671863e03abe3856d87d70',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1152.4040527919356,
+        y: -333.2077578697689
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caeba',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 2047,
-        y: -420
-      },
-      Name: '泡沫栓2',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '4'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6718dbe03abe3856d87d71',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1456.632463331941,
+        y: -431.236912377104
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caebb',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1517,
-        y: -390
-      },
-      Name: '泡沫栓3',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '5'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f6718ece03abe3856d87d72',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 2115.794019501953,
+        y: -194.61481529043306
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caebc',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '6'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6718fce03abe3856d87d73',
+      Name: '固定水炮',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 1187,
-        y: -11
+        x: 2918.6189917603,
+        y: -79.68408241976437
       },
-      Name: '泡沫栓4',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '7'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67190ce03abe3856d87d74',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1887.6227115969486,
+        y: 278.62937888290867
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caebd',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '8'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f671916e03abe3856d87d75',
+      Name: '固定水炮',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 1187,
-        y: 815
+        x: 1609.5189625658177,
+        y: 276.4352097691058
       },
-      Name: '泡沫栓5',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '9'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671945e03abe3856d87d76',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 2095.5215915504127,
+        y: 596.2041604311792
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caebe',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 504,
-        y: 437
-      },
-      Name: '泡沫栓6',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '10'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671954e03abe3856d87d77',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1851.9430767861622,
+        y: 1238.0508628431387
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caebf',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: -1532,
-        y: 746
-      },
-      Name: '泡沫栓7',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '11'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67195de03abe3856d87d78',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1286.183169018807,
+        y: 1239.7943307666721
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caec0',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: -1532,
-        y: 1703
-      },
-      Name: '泡沫栓8',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '12'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f671978e03abe3856d87d79',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: 1159.3027504423208,
+        y: 738.1954273316667
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caec1',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
-      MultiPoint: null,
-      Point: {
-        x: 1081,
-        y: -690
-      },
-      Name: '泡沫栓9',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '13'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
     },
     {
-      TemplateId: null,
-      FloorId: null,
+      Id: '5f67198ce03abe3856d87d7a',
+      Name: '固定水炮',
       Angle: 0,
-      Color: 0,
+      Color: '#066eed80',
+      Point: {
+        x: -32.3318372843471,
+        y: 1029.7104791062238
+      },
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
       Enabled: true,
-      FillMode: 0,
-      FireElementId: 0,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
       FixedSize: false,
       CanConnection: true,
       ConnectionObjs: [],
-      Height: 32,
-      Width: 32,
-      Id: '5f67f92238f13cd2048caec2',
-      ImageUrl: './assets/images/泡沫栓.png',
-      InteractiveMode: 0,
+      Thickness: 0,
+      BuildingId: '5f6704859e91f4410005f55f',
       MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '14'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    },
+    {
+      Id: '5f6719a4e03abe3856d87d7b',
+      Name: '固定水炮',
+      Angle: 0,
+      Color: '#066eed80',
       Point: {
-        x: 2875,
-        y: -389
+        x: -276.2867550650558,
+        y: 1028.4594282458097
       },
-      Name: '泡沫栓10',
-      PropertyInfos: null,
-      Border: null,
-      DrawMode: null,
+      Width: 32,
+      Border: {
+        w: 0,
+        x: 0,
+        y: 0,
+        z: 0
+      },
+      Height: 32,
+      Enabled: true,
+      FloorId: '5f670bb79e91f4410005f564',
+      DrawMode: 0,
+      FillMode: 1,
+      GameMode: 0,
+      ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
+      CompanyId: '5f67042b9e91f4410005f55c',
+      FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Thickness: 0,
-      IsFromBuilding: false,
-      GameMode: 0
+      BuildingId: '5f6704859e91f4410005f55f',
+      MultiPoint: null,
+      TemplateId: '5e7b38610137e12020bd7f7b',
+      FireElementId: '5e7967f30814180f1c1ecaab',
+      PropertyInfos: [
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '名称/编号',
+          PropertyType: 0,
+          PropertyValue: '15'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '',
+          PropertyName: '压力',
+          PropertyType: 0,
+          PropertyValue: '0.1Mpa'
+        },
+        {
+          Tag: '',
+          Order: 0,
+          Enabled: true,
+          Visible: true,
+          Required: false,
+          RuleName: '',
+          RuleValue: '',
+          PhysicalUnit: '张',
+          PropertyName: '图片',
+          PropertyType: 4,
+          PropertyValue: '5'
+        },
+        {
+          Tag: null,
+          Order: 0,
+          Enabled: false,
+          Visible: false,
+          Required: false,
+          RuleName: null,
+          RuleValue: null,
+          PhysicalUnit: null,
+          PropertyName: '图片',
+          PropertyType: 3,
+          PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg'
+        }
+      ],
+      IsFromBuilding: true,
+      InteractiveMode: 0
+    }
+  ];
+
+  tempCarData = {
+    TemplateId: null,
+    FloorId: null,
+    Angle: 0,
+    Color: 0,
+    Enabled: true,
+    FillMode: 0,
+    FireElementId: 0,
+    FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
+    Height: 32,
+    Width: 32,
+    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
+  };
+
+  // 所有车辆信息
+  allCarsData = [
     {
       TemplateId: null,
       FloorId: null,
@@ -1125,25 +6653,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caec3',
-      ImageUrl: './assets/images/泡沫栓.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/水罐消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 2875,
-        y: 233
+        x: 1295,
+        y: 1237
       },
-      Name: '泡沫栓11',
-      PropertyInfos: null,
+      Name: '水罐消防车',
+      FireTeamName: '港北区解放路消防救援站', // 所属消防队
+      ReachTime: 0, // 到场剩余时间
+      WaterYield: '8t', // 载水量
+      Foam: '0t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '10t', // 吨位
+      Assignment: '供液', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1154,25 +6703,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caec4',
-      ImageUrl: './assets/images/泡沫栓.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 1981,
-        y: 265
+        x: 1295,
+        y: 1237
       },
-      Name: '泡沫栓12',
-      PropertyInfos: null,
+      Name: '水罐泡沫消防车',
+      FireTeamName: '港北区解放路消防救援站', // 所属消防队
+      ReachTime: 0, // 到场剩余时间
+      WaterYield: '10t', // 载水量
+      Foam: '2t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '12t', // 吨位
+      Assignment: '灭火', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1183,25 +6753,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caec5',
-      ImageUrl: './assets/images/泡沫栓.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 1570,
-        y: 265
+        x: 1295,
+        y: 1237
       },
-      Name: '泡沫栓13',
-      PropertyInfos: null,
+      Name: '水罐泡沫消防车',
+      FireTeamName: '港北区解放路消防救援站', // 所属消防队
+      ReachTime: 0, // 到场剩余时间
+      WaterYield: '4t', // 载水量
+      Foam: '1t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '6t', // 吨位
+      Assignment: '灭火', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1212,25 +6803,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caec6',
-      ImageUrl: './assets/images/泡沫栓.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/压缩空气泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 93,
-        y: -362
+        x: 1295,
+        y: 1237
       },
-      Name: '泡沫栓14',
-      PropertyInfos: null,
+      Name: '举高喷射消防车',
+      FireTeamName: '港北区解放路消防救援站', // 所属消防队
+      ReachTime: 0, // 到场剩余时间
+      WaterYield: '18t', // 载水量
+      Foam: '2t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '20t', // 吨位
+      Assignment: '灭火', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1241,25 +6853,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caec7',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/水罐消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 1892,
+        x: 1295,
         y: 1237
       },
-      Name: '固定水泡0',
-      PropertyInfos: null,
+      Name: '水罐消防车',
+      FireTeamName: '八塘消防救援站', // 所属消防队
+      ReachTime: 3, // 到场剩余时间
+      WaterYield: '12t', // 载水量
+      Foam: '0t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '14t', // 吨位
+      Assignment: '冷却', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1270,25 +6903,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caec8',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 1993,
-        y: -452
+        x: 1295,
+        y: 1237
       },
-      Name: '固定水泡1',
-      PropertyInfos: null,
+      Name: '水罐泡沫消防车',
+      FireTeamName: '八塘消防救援站', // 所属消防队
+      ReachTime: 3, // 到场剩余时间
+      WaterYield: '6t', // 载水量
+      Foam: '2t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '8t', // 吨位
+      Assignment: '冷却', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1299,25 +6953,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caec9',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: -536,
-        y: 1014
+        x: 1295,
+        y: 1237
       },
-      Name: '固定水泡2',
-      PropertyInfos: null,
+      Name: '水罐泡沫消防车',
+      FireTeamName: '八塘消防救援站', // 所属消防队
+      ReachTime: 3, // 到场剩余时间
+      WaterYield: '3t', // 载水量
+      Foam: '1t', // 载泡沫
+      PeopleNum: 8, // 载人数
+      Tonnage: '5t', // 吨位
+      Assignment: '堵截', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1328,25 +7003,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caeca',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/压缩空气泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: -354,
-        y: 1014
+        x: 1295,
+        y: 1237
       },
-      Name: '固定水泡3',
-      PropertyInfos: null,
+      Name: '举高喷射消防车',
+      FireTeamName: '八塘消防救援站', // 所属消防队
+      ReachTime: 4, // 到场剩余时间
+      WaterYield: '16t', // 载水量
+      Foam: '2t', // 载泡沫
+      PeopleNum: 4, // 载人数
+      Tonnage: '18t', // 吨位
+      Assignment: '灭火', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1357,25 +7053,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caecb',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: -22,
-        y: 1014
+        x: 1295,
+        y: 1237
       },
-      Name: '固定水泡4',
-      PropertyInfos: null,
+      Name: '水罐泡沫消防车',
+      FireTeamName: '龚州消防救援站', // 所属消防队
+      ReachTime: 11, // 到场剩余时间
+      WaterYield: '6t', // 载水量
+      Foam: '2t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '8t', // 吨位
+      Assignment: '供液', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1386,25 +7103,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caecc',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 41,
-        y: 437
+        x: 1295,
+        y: 1237
       },
-      Name: '固定水泡5',
-      PropertyInfos: null,
+      Name: '水罐泡沫消防车',
+      FireTeamName: '龚州消防救援站', // 所属消防队
+      ReachTime: 15, // 到场剩余时间
+      WaterYield: '5t', // 载水量
+      Foam: '1t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '7t', // 吨位
+      Assignment: '供液', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1415,25 +7153,46 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caecd',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: -592,
-        y: 437
+        x: 1295,
+        y: 1237
       },
-      Name: '固定水泡6',
-      PropertyInfos: null,
+      Name: '水罐泡沫消防车',
+      FireTeamName: '龚州消防救援站', // 所属消防队
+      ReachTime: 15, // 到场剩余时间
+      WaterYield: '3t', // 载水量
+      Foam: '1t', // 载泡沫
+      PeopleNum: 6, // 载人数
+      Tonnage: '5t', // 吨位
+      Assignment: '供液', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     },
     {
       TemplateId: null,
@@ -1444,76 +7203,103 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
       Height: 32,
       Width: 32,
-      Id: '5f67f92238f13cd2048caece',
-      ImageUrl: './assets/images/固定水泡.png',
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/压缩空气泡沫消防车.png',
       InteractiveMode: 0,
       MultiPoint: null,
       Point: {
-        x: 1363,
-        y: 289
+        x: 1295,
+        y: 1237
       },
-      Name: '固定水泡7',
-      PropertyInfos: null,
+      Name: '举高喷射消防车',
+      FireTeamName: '龚州消防救援站', // 所属消防队
+      ReachTime: 15, // 到场剩余时间
+      WaterYield: '18t', // 载水量
+      Foam: '2t', // 载泡沫
+      PeopleNum: 4, // 载人数
+      Tonnage: '20t', // 吨位
+      Assignment: '灭火', // 执行任务
+      LinkCar: '', // 连接车辆
+      WaterOccupy: '', // 水源占用
+      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: 0
+      GameMode: 2
     }
   ];
 
-  tempCarData = {
-    TemplateId: null,
-    FloorId: null,
-    Angle: 0,
-    Color: 0,
-    Enabled: true,
-    FillMode: 0,
-    FireElementId: 0,
-    FixedSize: false,
-      CanConnection: true,
-      ConnectionObjs: [],
-    Height: 32,
-    Width: 32,
-    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
-  };
+  bottomIsShow = false; // 底部车辆信息是否展示
+  rightIsShow = true; // 右侧楼层是否展示
+  rightSayIsShow = false; // 右侧语音是否展示
   ngOnInit(): void {
-
+    const that = this;
+    window.setTimeout(() => {
+      document.getElementById('center').oncontextmenu = function(event) {
+        that.workingArea.cancelPaint();
+        event.preventDefault();
+       };
+    });
   }
 
   ngAfterViewInit(): void {
     this.workingArea.loadDemoScene(this.demoData, 0.149);
   }
+
+  // 开始绘制
+  plot(e) {
+
+  }
+
+  // 选择 车辆
+  selectCar(e) {
+    console.log(e);
+    this.canvasData.selectCar = e;
+    this.bottomIsShow = true;
+  }
+
+  // 倒计时结束
+  handleEvent(e, item) {
+    console.log(e, item);
+  }
+
+  // 关闭 底部车辆信息
+  closeBottom() {
+    this.bottomIsShow = false;
+  }
+
+  // 打开 右侧楼层
+  openRight() {
+    this.rightIsShow = true;
+  }
+
+  // 关闭 右侧楼层
+  closeRight() {
+    this.rightIsShow = false;
+  }
+
+  // 打开 关闭 右侧语音
+  toggleSay() {
+    this.rightSayIsShow = !this.rightSayIsShow;
+  }
+
+
+
 }
diff --git a/src/app/ui/plan/collection-tools.component.html b/src/app/ui/plan/collection-tools.component.html
index 7cca24a..2fcbec8 100644
--- a/src/app/ui/plan/collection-tools.component.html
+++ b/src/app/ui/plan/collection-tools.component.html
@@ -225,17 +225,17 @@
               <!-- 消防列表树写在这里 -->
               <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
                 
-                <mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node)" class="treeNode">
+                <mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;" matTreeNodePadding cdkTreeNodePaddingIndent='26' (click)="clickTreeNode(node,$event)" class="treeNode">
                   <button mat-icon-button disabled></button>
                   <span title="{{node.name}}" [ngClass]="{'treeText': !node.isTemplate}">
                     {{node.name}}      
                   </span> 
                   <span  *ngIf="node.isTemplate">({{node.children.length}})</span>
-                  <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
+                  <span class="isLookCss" (click)="clickLookItem(node,$event)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
                 </mat-tree-node>
               
               
-                <mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node)"class="treeNode" >
+                <mat-tree-node cdkDrag cdkDragDisabled="false" [ngClass]="{'isLookPattern': !node.isLookPattern}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="clickTreeNode(node,$event)"class="treeNode" >
                   <button mat-icon-button 
                           matTreeNodeToggle
                           [attr.aria-label]="'toggle ' + node.name">
@@ -247,7 +247,7 @@
                     {{node.name}}      
                   </span>   
                   <span  *ngIf="node.isTemplate && node.isNewElement">({{node.children.length}})</span>
-                  <span class="isLookCss" (click)="clickLookItem(node)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
+                  <span class="isLookCss" (click)="clickLookItem(node,$event)"><mat-icon [ngClass]="{'icongray': node.isLook == false}">visibility</mat-icon></span>
                 </mat-tree-node>
               
               </mat-tree>
diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss
index af85a09..8af5ded 100644
--- a/src/app/ui/plan/collection-tools.component.scss
+++ b/src/app/ui/plan/collection-tools.component.scss
@@ -361,6 +361,7 @@
     .isLookCss{
       position: absolute;
       right: 6px;
+      z-index: 1000;
     }
   }
   .mat-tree{
diff --git a/src/app/ui/plan/collection-tools.component.ts b/src/app/ui/plan/collection-tools.component.ts
index 86eb500..233f1f6 100644
--- a/src/app/ui/plan/collection-tools.component.ts
+++ b/src/app/ui/plan/collection-tools.component.ts
@@ -557,7 +557,7 @@ export class planComponent implements OnInit {
   }
 
   //点击树节点
-  clickTreeNode(node){
+  clickTreeNode(node,e){
     if(this.canvasData.originalcompanyBuildingData.data[node.id]){
       this.setAssetsProperty(this.canvasData.originalcompanyBuildingData.data[node.id])
     }else if(this.canvasData.originaleveryStoreyData.data[node.id]){
@@ -583,8 +583,8 @@ export class planComponent implements OnInit {
   }
 
   //点击数节点的显示隐藏icon
-  clickLookItem(node){
-
+  clickLookItem(node,e){
+    // e.stopPropation() 
     //修改真实素材islook属性
     for(let key in this.storeyData.data){
       if(key == node.id){
@@ -615,8 +615,25 @@ export class planComponent implements OnInit {
      }
 
 
+    
+    
+    const nodes = this.treeControl.dataNodes;
+    const expandNodes = [];
+    nodes.forEach((item) => {
+      if(item.expandable && this.treeControl.isExpanded(item)){
+        expandNodes.push(item.id);
+      }
+    });
+    
+    
     this.dataSource.data = [...this.dataSource.data]
-    this.treeControl.expandAll()
+    let newNodes = this.treeControl.dataNodes;
+    newNodes = newNodes.filter(n => {
+      return expandNodes.indexOf(n.id) >= 0;
+    });
+    newNodes.forEach(item => {
+      this.treeControl.expand(item);
+    });
 
     //canvas上的素材显隐
     let iconVisibleArr:any = []
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index e7da62d..0533da8 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -48,7 +48,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatPaginatorIntl } from '@angular/material/paginator';
 import { PersonaldataComponent } from '../pages/personaldata/personaldata.component';
 import { ChangepasswordComponent } from './changepassword/changepassword.component';
-import { IsnoPipe } from '../pipes/boolean.pipe';
+import { IsnoPipe, SafeHtmlPipe } from '../pipes/boolean.pipe';
 import {ConfirmpswDirective} from './changepassword/equal-validator.directive'
 import { TimePipe } from '../pipes/time.pipe';
 import { FileUploadModule } from 'ng2-file-upload'
@@ -58,14 +58,14 @@ import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeCo
 import { saveOneDialog, saveTwoDialog } from './collection-tools/save';
 import { planComponent } from './plan/collection-tools.component';
 import { DisposalNodeComponent } from './disposal-node/disposal-node.component';
-import { DangerousComponent } from './dangerous/dangerous.component';
+import { DangerousComponent, GisComponent } from './dangerous/dangerous.component';
 import { SimilarPlansComponent } from './similar-plans/similar-plans.component';
 import { RealCasesComponent } from './real-cases/real-cases.component';
 import { PlanAssistanceComponent } from './plan-assistance/plan-assistance.component';
 
 
 @NgModule({
-  declarations: [UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, DisposalNodeComponent, DangerousComponent, SimilarPlansComponent, RealCasesComponent, PlanAssistanceComponent,planComponent],
+  declarations: [SafeHtmlPipe,GisComponent,UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent, DisposalNodeComponent, DangerousComponent, SimilarPlansComponent, RealCasesComponent, PlanAssistanceComponent,planComponent],
 
   imports: [
     CommonModule,
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index b49a02e..a570f65 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -120,6 +120,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
 
   // 是否登录
   public verificationURL = '/ui/plan'; // 验证url地址是否为验证页面
+  count = 0;
   isLogin() {
     const token = sessionStorage.getItem('token'); // 判断 是否登录状态
     if (token) {
@@ -387,6 +388,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     const floorData = this.canvasData.originaleveryStoreyData.data;
     const buildingData = this.canvasData.originalcompanyBuildingData.data;
     const floor = this.canvasData.selectStorey;
+    console.log(JSON.stringify(buildingData));
     // // key=>属性名    data[key]=>属性值
     Object.keys(floorData).forEach((key) => {
       switch (floorData[key].InteractiveMode) {
@@ -472,9 +474,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       IsFromBuilding: false,
       GameMode: 2
     };
-    const tempCar = new Car(tempData, this);
-    tempCar.setParent(this.app.stage);
-    tempCar.position.set(25, 25);
 
     const tempData2 = {
       TemplateId: null,
@@ -519,15 +518,27 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       IsFromBuilding: false,
       GameMode: 2
     };
-    const tempCar2 = new Car(tempData2, this);
-    tempCar2.setParent(this.app.stage);
-    tempCar2.position.set(25, 50);
-
-    // 开始绘制管线
-    this.beginPaintPipeline();
+    this.ShowCarIcon(tempData);
+    this.ShowCarIcon(tempData2);
+    this.ShowCarIcon(tempData);
+    this.ShowCarIcon(tempData2);
+    this.ShowCarIcon(tempData);
+    this.ShowCarIcon(tempData2);
+
+    // // 开始绘制管线
+    // this.beginPaintPipeline();
     // this.beginPaintingArrows();
   }
-
+  /**
+   * 显示车辆图标
+   * @param data
+   */
+  public ShowCarIcon(data: any) {
+    this.count++;
+    const tempCar2 = new Car(data, this);
+    tempCar2.setParent(this.app.stage);
+    tempCar2.position.set(25, this.count * 25);
+  }
   /**
    *
    * @param id 图标ID
diff --git a/src/assets/images/direction.png b/src/assets/images/direction.png
new file mode 100644
index 0000000..46e0bec
Binary files /dev/null and b/src/assets/images/direction.png differ
diff --git a/src/assets/images/route.png b/src/assets/images/route.png
new file mode 100644
index 0000000..8445226
Binary files /dev/null and b/src/assets/images/route.png differ
diff --git a/src/index.html b/src/index.html
index ebc3ab9..b039ca4 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,7 +2,7 @@
 <html lang="zh-CN">
 <head>
   <meta charset="utf-8">
-  <title>实战指挥预案</title>
+  <title>智能实战指挥平台</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">