From 32a8fd3d96aafa4ce04a50a36ca145b9b188b59d Mon Sep 17 00:00:00 2001
From: username <1105965053@qq.com>
Date: Mon, 21 Sep 2020 11:08:54 +0800
Subject: [PATCH 1/9] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=A2=84=E6=A1=88?=
 =?UTF-8?q?=E8=BE=85=E5=8A=A9=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan-assistance.component.html            | 23 ++++++-
 .../plan-assistance.component.scss            | 65 ++++++++++++++++++-
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html
index 5abcce6..f994b21 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.html
+++ b/src/app/ui/plan-assistance/plan-assistance.component.html
@@ -1,11 +1,30 @@
 <div class="content">
     <div class="left">
-
+        <div class="header leftHeader">到场力量</div>
+        <div class="list">
+            <div class="tableDiv">
+                <div class="tableRows" *ngFor="let item of demoData">
+                    <div style="flex: 60%;display: flex;flex-direction: column;justify-content: center;align-items: center;overflow: hidden;">
+                        <p style="flex: 60%;font-size: 16px;" class="contentText">{{item.Name}}</p>
+                        <p style="flex: 40%" class="contentText">{{item.Name}}</p>
+                    </div>
+                    <div style="flex: 40%; line-height: 40px;text-align: center;">
+                        已到场
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 
     <!-- canvas -->
     <div class="center">
-        <app-working-area #workingArea></app-working-area>
+        <div class="header">
+            <div class="title">总平面图</div>
+        </div>
+        <div class="canvas">
+            <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..5acd36c 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.scss
+++ b/src/app/ui/plan-assistance/plan-assistance.component.scss
@@ -11,10 +11,73 @@
 .left {
     width: 300px;
     height: 100%;
-    background-color: #000;
+    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: 40px;
+        overflow: hidden;
+        display: flex;
+        margin: 5px 0;
+        .contentText {
+            font-size: 12px;
+            color: #fff;
+            cursor: pointer;
+        }
+    }
+}
+
+//选中状态
+.selectIcon {
+    background-color: rgba(7,89,155,0.7);
 }
 
 //右侧工作区
 .center {
     flex: 1;
+    box-sizing: border-box;
+    display: flex;
+    flex-direction: column;
+    .canvas {
+        flex: 1;
+    }
+}
+
+//header
+.header {
+    width: 100%;
+    height: 40px;
+    min-height: 40px;
+    cursor: pointer;
+}
+.leftHeader {
+    line-height: 40px;
+    text-align: center;
+    font-size: 20px;
+    font-weight: 550;
+    color: #F7bA2A;
+}
+.title {
+    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;
 }
\ No newline at end of file

From 292a84a3481f64996bf1f6b1248c9843a3927d1e Mon Sep 17 00:00:00 2001
From: baozw <baozw@anxin99.com>
Date: Mon, 21 Sep 2020 16:00:18 +0800
Subject: [PATCH 2/9] =?UTF-8?q?[=E5=A4=84=E7=BD=AE=E8=A6=81=E7=82=B9]?=
 =?UTF-8?q?=E5=87=BA=E7=89=88=E9=A1=B5=E9=9D=A2=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../disposal-node.component.html              |  24 +++-
 .../disposal-node.component.scss              |  84 +++++++++++++
 .../disposal-node/disposal-node.component.ts  | 110 ++++++++++++++++++
 3 files changed, 217 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/disposal-node/disposal-node.component.html b/src/app/ui/disposal-node/disposal-node.component.html
index 5f52123..2d1a5a6 100644
--- a/src/app/ui/disposal-node/disposal-node.component.html
+++ b/src/app/ui/disposal-node/disposal-node.component.html
@@ -1 +1,23 @@
-<p>disposal-node works!</p>
+<!-- 头部操作栏 -->
+<div class="headerOperate">
+    <div id="tedian" class="bigeditdeletebtn"  (click)='xianshi(1)' ngClass="buildingbtnchecked">
+      <span>火灾特点</span>
+    </div>
+    <div id="zhuyi" class="bigeditdeletebtn" (click)='xianshi(2)'  ngClass="buildingbtnchecked">
+      <span>注意事项</span>
+    </div>
+    <div id="chuzhi" class="bigeditdeletebtn"  (click)='xianshi(3)' ngClass="buildingbtnchecked">
+        <span>处置要点</span>
+      </div>
+      <div id="zuzhi" class="bigeditdeletebtn"  (click)='xianshi(4)'  ngClass="buildingbtnchecked">
+        <span (click)='this.chooseBiaoti=4'>组织指挥要点</span>
+      </div>
+    
+  </div>
+  <!--中间文字-->
+  <div class="wenzi" id="aaa">
+    <div class="scrollbar"></div>
+  </div>
+  <div style="width: 100%;">
+    <button class="button" style="float: right;margin-right: 30px;">分享</button>
+  </div>
\ No newline at end of file
diff --git a/src/app/ui/disposal-node/disposal-node.component.scss b/src/app/ui/disposal-node/disposal-node.component.scss
index e69de29..468948e 100644
--- a/src/app/ui/disposal-node/disposal-node.component.scss
+++ b/src/app/ui/disposal-node/disposal-node.component.scss
@@ -0,0 +1,84 @@
+
+.icongray{
+  color: #D9D0DC;
+}
+//头部操作栏
+.headerOperate {
+    position: relative;
+    span{
+      font-size: 18px;
+    }
+    flex: 2%;
+    display: flex;
+    align-items:center;
+    min-height: 40px;
+    box-sizing: border-box;
+    margin: 3px 0;
+  
+    .bigeditdeletebtn{
+      border:1px solid  #0E79A9;
+      margin-right: 0px;
+      height: 80%;
+      display: flex;
+      flex-direction: column;
+      // align-items:center;/*由于flex-direction: column，因此align-items代表的是水平方向*/
+      justify-content: center;
+      user-select: none;
+      //background-image: url("../../../assets/images/标签正常.png") ;
+      background-size:100% 100%;
+      color: white;
+      span{
+        padding: 13px 13px;
+        //padding-right: 18px;
+        font-size: 24px;
+      }
+    }
+    .bigeditdeletebtn:hover{
+      cursor: pointer; 
+      //background-image: url("../../../assets/images/标签经过.png") ;
+    }
+    
+  }
+  //中间文字区域
+  .wenzi{
+      overflow:auto;
+      height: 85%;
+      width: 100%;
+      line-height: 35px;
+      .h3{
+          color: #CC5D13;
+      }
+      .scrollbar{
+        width: 30px;
+        height: 300px;
+        margin: 0 auto;
+      
+    }
+    .wenzi::-webkit-scrollbar {/*滚动条整体样式*/
+        width: 10px;     /*高宽分别对应横竖滚动条的尺寸*/
+        height: 1px;
+    }
+    .wenzi::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+        border-radius: 10px;
+         //-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+        background: #CC5D13;
+    }
+    .wenzi::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        //-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+        border-radius: 10px;
+        background: #EDEDED;
+    }
+  }
+  .button {
+    border-radius: 2px;
+    background-color: #4CAF50;
+    border: none;
+    color: white;
+    padding: 15px 32px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 16px;
+    margin: 4px 2px;
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/src/app/ui/disposal-node/disposal-node.component.ts b/src/app/ui/disposal-node/disposal-node.component.ts
index ef1b830..c337470 100644
--- a/src/app/ui/disposal-node/disposal-node.component.ts
+++ b/src/app/ui/disposal-node/disposal-node.component.ts
@@ -8,8 +8,118 @@ import { Component, OnInit } from '@angular/core';
 export class DisposalNodeComponent implements OnInit {
 
   constructor() { }
+  setTimeoutObj//延时器需要清除
 
   ngOnInit(): void {
+    console.log(this.chooseBiaoti)
+    this.setTimeoutObj = window.setTimeout(()=>{
+      this.xianshi(1)
+    },0)
   }
+  ngAfterContentInit (){
+    //this.xianshi()
+  }
+  checkedBuildingIndex:number = -1
+  chooseBiaoti=1
+  
+   //鼠标移入边框变颜色
+   yiru(yirunum){
+    var tedian=document.getElementById(yirunum)
+    tedian.style.border="1px solid  #C8CE4D"
 
+   }
+   yichu(yichunum){
+    var tedian=document.getElementById(yichunum)
+    tedian.style.border="1px solid   #0E79A9"
+   }
+   //点击切换中间显示的文字
+  xianshi(biaotinum){
+   var mianban=document.getElementById('aaa')
+   var tedian=document.getElementById('tedian')
+   var zhuyi=document.getElementById('zhuyi')
+   var chuzhi=document.getElementById('chuzhi')
+   var zuzhi= document.getElementById('zuzhi')
+   var chuzhiYuanze='';
+   if(biaotinum==4){ 
+    zuzhi.style.border="1px solid  #30BBEC"
+    tedian.style.border="1px solid  #0E79A9"
+    zhuyi.style.border="1px solid  #0E79A9"
+    chuzhi.style.border="1px solid  #0E79A9"
+    chuzhiYuanze+=`<h3 style="color: #CC5D13">一、处置原则</h3>`;
+    chuzhiYuanze+='<span style="color: #FFFFFF">（一）灾情处置应坚持“</span>'
+    chuzhiYuanze+='<span style="color: #F95E5A">救人第一、科学施救</span>'
+    chuzhiYuanze+='<span style="color: #FFFFFF">”的原则，严禁在不熟悉情况时擅自行动，严禁冒险蛮干。</br></span>'
+    chuzhiYuanze+='<span style="color: #FFFFFF">（二）现场情况基本清楚，无爆炸等次生灾害风险，灾情易于辨识研判，在技术人员指导下，果断下达指令开展灭火救援行动。</br>'
+    chuzhiYuanze+='（三）燃烧物不清，现场情况不明，难于辨识研判，参战力量要与现场保持足够的安全距离；如有人员被困，且有希望抢救受困人员生命时，指挥员应视情采取救人措施。</br>'
+    chuzhiYuanze+='（四）燃烧物不清，现场情况不明，无人员受困，难以研判决策，现场指挥员应及时采取外部控灾措施，并与现场保持适当安全距离。</br>'
+    chuzhiYuanze+='（五）燃烧物已知，无人员受困，有爆炸伤亡风险，指挥员应采取依托掩体外围抑爆控灾措施，必要时建议指挥部扩大警戒、疏散范围。</br>'
+    chuzhiYuanze+='<h3 style="color: #CC5D13">二、受理报警</h3>'
+    chuzhiYuanze+='（一）危险化学品场所发生火灾爆炸，火警等级不应小于四级；危险化学品发生泄漏事故，容易导致火灾爆炸或中毒事故发生，对人员、财产威胁严重或可能出现二次污染等情况特殊、灾情严重的灾害事故，应急救援等级不应小于三级。</br>'
+    chuzhiYuanze+='（二）事故发生后，指挥中心应迅速准确受理报警，应当询问掌握报警人信息、事故单位基本情况、主要联系方式，</span>'
+    chuzhiYuanze+='<span style="color: #F95E5A">问清危险化学品的种类、数量、危害特性和储存方式，以及有无人员被困，周边受威胁危险化学品的有关情况，</br></span>'
+    chuzhiYuanze+='<span style="color: #FFFFFF">及时告知救援人员相关情况和注意事项，同时报告指挥长和全勤指挥部成员。</br>'
+    chuzhiYuanze+='（三）指挥中心要不间断与辖区消防救援站、报警群众和单位负责人联系，根据现场情况及时调派增援力量，向参战力量推送危险化学品理化性质、处置措施和注意事项，并将灾情按要求上报上级指挥中心。'
+    chuzhiYuanze+='<h3 style="color: #CC5D13">三、力量调集</h3>'
+    chuzhiYuanze+='（一）指挥中心应及时调集辖区中队、周边化工灭火救援编队到场处置，全勤指挥部和战勤保障力量遂行出动</span>'
+   }
+   else if(biaotinum==1){
+    zuzhi.style.border="1px solid  #0E79A9"
+    tedian.style.border="1px solid  #30BBEC"
+    zhuyi.style.border="1px solid  #0E79A9"
+    chuzhi.style.border="1px solid  #0E79A9"
+     chuzhiYuanze+='<span style="color: #FFFFFF">（1） 爆炸引起燃烧。油罐发生爆炸后，随即易形成稳定燃烧。爆炸后，从罐顶或裂口处流出的油品或因罐体移位流出的油品，易造成地面流淌性燃烧。</br>'
+     chuzhiYuanze+='（2） 燃烧引起爆炸。在形成稳定燃烧的油罐的邻近油罐，在热辐射的作用下易发生爆炸，扩大火势。</br>'
+     chuzhiYuanze+='（3） 火焰高，辐射热强。爆炸后在油罐破裂位置形成的稳定燃烧，其火焰高达几十米，并对其四周产生强烈的热辐射。</br>'
+     chuzhiYuanze+='（4） 易形成沸溢与喷溅。由于重质油品具有“热波特性”，对含有一定水分或有水垫层的重质油品储罐发生火灾后，如果不能及时进行冷却控制，在其“热波特性”的作用下就会使油品内的乳化水或油层下的水垫层产生过热蒸汽，而导致发生油品的沸溢或喷溅现象。</br>'
+     chuzhiYuanze+='（5） 易造成大面积燃烧。重质油品储罐发生的沸溢、喷溅现象，在其压力的作用会将大量的油品喷洒在事故区域内，瞬间即可造成大面积燃烧，同时，对在火场内的消防战斗人员、车辆及其他装置、设备造成极大的威胁。</span>'
+   }
+   else if(biaotinum==2){
+    zuzhi.style.border="1px solid  #0E79A9"
+    tedian.style.border="1px solid  #0E79A9"
+    zhuyi.style.border="1px solid  #30BBEC"
+    chuzhi.style.border="1px solid  #0E79A9"
+     chuzhiYuanze+='<span style="color: #FFFFFF">1、油罐火灾的辐射热强，参战人员应配有防高温、防辐射、防毒的防护装备。</br>'
+     chuzhiYuanze+='2、正确选择停车位置。消防车尽量停在上风或侧上风向，与燃烧油罐保持一定的安全距离。扑救重质油罐火灾时，消防车头应背向油罐，以备紧急撤离。作战行动中的部分车辆动画加上文字配音说明</br>'
+     chuzhiYuanze+='3、注意观察火场情况变化，及时发现沸溢、喷溅征兆。</br>'
+     chuzhiYuanze+='4、充分冷却，防止复燃。燃烧罐的火势被扑灭后，要继续对其实施冷却，直至使罐内油品温度降到燃点以下为止。设有保温层的原油罐可不予以冷却。轻质油品罐不会形成高温层，冷却的重点是液面以上的罐壁。救活的图片加上文字配音说明。</br>'
+     chuzhiYuanze+='5、浮顶油罐在初期火灾时，燃烧仅限于密封围堰部位，应立即启动固定泡沫灭火装置或组织泡沫管枪从固定铁梯进行强攻，消灭围堰内的火灾。作战行动中的动画加文字配音说明。</br>'
+     chuzhiYuanze+='6、注意观察和选择有利地形，尽量选取上风向处，前沿阵地的战斗人员（水枪手等）要注意利用地形地物掩护自己，并穿着铝箔隔热服。防止坍塌及爆炸对人的危害。作战行动中的动画加文字配音说明。</br>'
+     chuzhiYuanze+='7、要与工程技术人员联系，充分工艺手段灭火。</br>'
+     chuzhiYuanze+='8、火情侦察要详细、认真、全面，尤其注意关联设备和邻近装置，注意流淌火的观察和控制，防止沿沟渠蔓延。</br>'
+     chuzhiYuanze+='9、充分利用固定消防设施。</br>'
+     chuzhiYuanze+='10、灭火剂要供应充足，兵力部署要符合灭火战斗要求，集中优势兵力，一举扑灭火灾，切忌供应出现中断和零打碎敲。</br>'
+     chuzhiYuanze+='11、注意第一力量调集，调集兵力的数量要满足灭火需要，但不能过多，以免造成现场拥挤和混乱。7-11用厂区的作战行动动画做背景加上文字配音说明</span>'
+   }
+   else if(biaotinum==3){
+    zuzhi.style.border="1px solid  #0E79A9"
+    tedian.style.border="1px solid  #0E79A9"
+    zhuyi.style.border="1px solid  #0E79A9"
+    chuzhi.style.border="1px solid  #30BBEC"
+     chuzhiYuanze+='<h3 style="color: #CC5D13">1、安全防护</h3>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">①应综合考虑风力风向、工艺流程、地形地势、封闭管井等因素，</span>'
+     chuzhiYuanze+='<span style="color: #F95E5A">科学选择车辆站位和阵地设置；</span>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">②科学设置内、外观察哨，通过单位DCS系统设内观察哨，重点监测着火罐及周边邻近罐的介质、压力、温度、液位以及预警等级；通过在外部设观察哨，实时观察燃烧烟雾、火焰以及罐体外形变化、颤动声响等，确保整个作战行动安全可控；</br>'
+     chuzhiYuanze+='③实施登罐灭火作业，在</span>'
+     chuzhiYuanze+='<span style="color: #F95E5A">完成泡沫覆盖完成后，现场人员应迅速佩戴空气呼吸器，第一时间撤离，防止硫化氢中毒。</span>'
+     chuzhiYuanze+='<h3 style="color: #CC5D13">2、泡沫灭火</h3>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">①登罐灭火最佳时间；着火时间冬季在</span>'
+     chuzhiYuanze+='<span style="color: #F95E5A">60 分钟</span>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">之内，夏季在 </span>'
+     chuzhiYuanze+='<span style="color: #F95E5A">40 分钟</span>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">之内；</br>②登罐灭火作业，必须根据现场风向和液位合理布设进攻阵地，推进灭火过程还需注意风向变化，适时调整左右推进速度；</br> </span>'
+     chuzhiYuanze+='<span style="color: #F95E5A">③严禁将移动炮、车载炮、高喷臂架炮的泡沫和冷却水直接打入罐体浮盘中央，</span>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">防止出现卡盘、沉盘。对着火罐的冷却要均匀，不能留有空白点，防止温差大导致罐体变形、塌陷；</br>④泡沫灭火时，</span>'
+     chuzhiYuanze+='<span style="color: #F95E5A">应选用同一种类、比例、倍数的泡沫，</span>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">必须保证喷射的泡沫打在一侧的罐壁上，流向液面形成覆盖层，严禁不同方向同时喷射泡沫。</br>⑤固定系统操作失误，到场水罐无可利用水源，应再采取冷油循环的基础上，控制灾情。再采取紧急调集远程供水。</span>'
+     chuzhiYuanze+='<h3 style="color: #CC5D13">3、沸溢喷溅</h3>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">①由于处置方法、处置程序错误或排水不及时，重质油品通常在起火</span>'
+     chuzhiYuanze+='<span style="color: #F95E5A">3-6小时</span>'
+     chuzhiYuanze+='<span style="color: #FFFFFF">后罐内出现水垫层，随着油温传导水垫层气化出现油品沸溢，喷射时间一般晚于沸溢时间，常常先发生沸溢，间隔一段时间，再发生喷溅。现场指挥员要科学把握进攻时机，运用好浮盘中央排水和罐内紧急排水两种方法，加强储罐定时积水排放；</br>'
+     chuzhiYuanze+='②一旦发生沸溢、喷溅征兆时，如罐体颤动、发出嘶撕声、浓黑的烟变白变淡、火焰变高耀眼、油面蠕动涌涨现象明显等，应立即发生撤离信号，指挥部应事先统一撤离信号、撤离的路径方式和集结区。</span>'
+   }
+    
+    mianban.innerHTML=chuzhiYuanze
+  }
+  
+  
 }

From afdd88958fc7461fffbd761981fcf23915bc5c9b Mon Sep 17 00:00:00 2001
From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com>
Date: Mon, 21 Sep 2020 17:10:26 +0800
Subject: [PATCH 3/9] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E7=94=BB=E7=AE=A1?=
 =?UTF-8?q?=E7=BA=BF/=E7=94=BB=E7=AE=AD=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/launch.json                           |  15 +
 .../plan-assistance.component.ts              | 102 ++++++
 .../working-area/working-area.component.ts    | 310 ++++++++++--------
 src/assets/images/进攻方向.png            | Bin 0 -> 6126 bytes
 4 files changed, 297 insertions(+), 130 deletions(-)
 create mode 100644 .vscode/launch.json
 create mode 100644 src/assets/images/进攻方向.png

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..a1481f9
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:4200",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}
\ 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 e8e6fe6..643c99c 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.ts
+++ b/src/app/ui/plan-assistance/plan-assistance.component.ts
@@ -23,6 +23,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048cae9d',
@@ -50,6 +52,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048cae9e',
@@ -77,6 +81,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048cae9f',
@@ -104,6 +110,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea0',
@@ -131,6 +139,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea1',
@@ -158,6 +168,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea2',
@@ -185,6 +197,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea3',
@@ -212,6 +226,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea4',
@@ -239,6 +255,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea5',
@@ -266,6 +284,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea6',
@@ -293,6 +313,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea7',
@@ -320,6 +342,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea8',
@@ -347,6 +371,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caea9',
@@ -374,6 +400,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeaa',
@@ -401,6 +429,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeab',
@@ -428,6 +458,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeac',
@@ -455,6 +487,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caead',
@@ -482,6 +516,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeae',
@@ -509,6 +545,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeaf',
@@ -536,6 +574,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb0',
@@ -563,6 +603,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb1',
@@ -590,6 +632,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb2',
@@ -617,6 +661,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb3',
@@ -644,6 +690,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb4',
@@ -671,6 +719,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb5',
@@ -698,6 +748,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb6',
@@ -725,6 +777,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb7',
@@ -752,6 +806,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb8',
@@ -779,6 +835,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeb9',
@@ -806,6 +864,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeba',
@@ -833,6 +893,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caebb',
@@ -860,6 +922,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caebc',
@@ -887,6 +951,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caebd',
@@ -914,6 +980,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caebe',
@@ -941,6 +1009,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caebf',
@@ -968,6 +1038,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec0',
@@ -995,6 +1067,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec1',
@@ -1022,6 +1096,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec2',
@@ -1049,6 +1125,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec3',
@@ -1076,6 +1154,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec4',
@@ -1103,6 +1183,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec5',
@@ -1130,6 +1212,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec6',
@@ -1157,6 +1241,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec7',
@@ -1184,6 +1270,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec8',
@@ -1211,6 +1299,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caec9',
@@ -1238,6 +1328,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caeca',
@@ -1265,6 +1357,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caecb',
@@ -1292,6 +1386,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caecc',
@@ -1319,6 +1415,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caecd',
@@ -1346,6 +1444,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 32,
       Width: 32,
       Id: '5f67f92238f13cd2048caece',
@@ -1375,6 +1475,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
     FillMode: 0,
     FireElementId: 0,
     FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
     Height: 32,
     Width: 32,
     Id: '5f67f92238f13cd2048cae9d',
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 79a0531..a09d3ec 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -71,6 +71,14 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
    * 绘制点集合
    */
   public paintPoints: PIXI.Point[] = [];
+  /**
+   * 绘制中的管线
+   */
+  public paintingPipeline: Pipeline = null;
+  /**
+   * 绘制中的箭头
+   */
+  public paintingArrows: Arrows = null;
   /**
    * 绘制中的多点图标
    */
@@ -148,11 +156,11 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
           // 删除 选中的数据
           if (item.assetData.IsFromBuilding) {
             // console.log(this.canvasData.originaleveryStoreyData.data[item.assetData.Id]);
-            delete this.canvasData.originalcompanyBuildingData.data[item.assetData.Id];
+            delete this.canvasData.originalcompanyBuildingData?.data[item.assetData.Id];
             // console.log(this.canvasData.originalcompanyBuildingData.data[item.assetData.Id]);
           } else {
             // console.log(this.canvasData.originaleveryStoreyData.data[item.assetData.Id]);
-            delete this.canvasData.originaleveryStoreyData.data[item.assetData.Id];
+            delete this.canvasData.originaleveryStoreyData?.data[item.assetData.Id];
             // console.log(this.canvasData.originaleveryStoreyData.data[item.assetData.Id]);
           }
           // console.log(this.backgroundImage.getChildByName(item.assetData.Id));
@@ -297,6 +305,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
         this.rectToolGraphics.endFill();
         this.rectToolGraphics.closePath();
       }
+      if (this.paintingArrows !== null) {
+        this.paintingArrows.data.pointB = new PIXI.Point(this.circleShadow.position.x, this.circleShadow.position.y);
+        this.paintingArrows.refresh();
+      }
     });
   }
   /**
@@ -407,7 +419,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       const single = new SinglePointIcon(element, this);
     });
     this.setNameVisible(false, GameMode.BasicInformation);
-    this.allowEdit = true;
 
 
     const tempData = {
@@ -419,6 +430,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       FillMode: 0,
       FireElementId: 0,
       FixedSize: false,
+      CanConnection: true,
+      ConnectionObjs: [],
       Height: 45,
       Width: 45,
       Id: '5f67f92238f13cd2048cae9d',
@@ -463,6 +476,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
       Enabled: true,
       FillMode: 0,
       FireElementId: 0,
+      CanConnection: true,
+      ConnectionObjs: [],
       FixedSize: false,
       Height: 45,
       Width: 45,
@@ -500,9 +515,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     tempCar2.setParent(this.app.stage);
     tempCar2.position.set(25, 50);
 
-    this.cancelPaint();
-    this.paintMode = PaintMode.connection;
-    this.previewSinglePointIcon.texture = PIXI.Texture.from('./assets/images/水罐消防车.png');
+    // 开始绘制管线
+    // this.beginPaintPipeline();
+    this.beginPaintingArrows();
   }
 
   /**
@@ -712,8 +727,29 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
               // }
               // this.paintingIcon = new PolygonIcon(this.paintPoints, this);
               break;
-            case PaintMode.connection:
-
+            case PaintMode.Pipeline:
+              if (this.paintingPipeline !== null) {
+                this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y);
+                this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y));
+                this.paintingPipeline.assetData.MultiPoint = JSON.parse(JSON.stringify(this.paintPoints));
+                this.paintingPipeline.refresh();
+              }
+              // this.emit('backgroundScale', this.backgroundImage.scale.x);
+              break;
+            case PaintMode.Arrows:
+              if (this.paintingArrows === null) {
+                const data = {
+                   name: 'string',
+                   point: new PIXI.Point(this.circleShadow.x, this.circleShadow.y),
+                   pointA: new PIXI.Point(this.circleShadow.x, this.circleShadow.y),
+                  pointB: new PIXI.Point(this.circleShadow.x, this.circleShadow.y),
+                   source: 'assets/images/进攻方向.png',
+                };
+                this.paintingArrows = new Arrows(data, this);
+              } else {
+                this.paintingArrows.ready = true;
+                this.paintingArrows = null;
+              }
               break;
           }
         } else if (!event.currentTarget.dragging && this.selection.isMultiselection === true) {
@@ -899,6 +935,22 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     this.previewSinglePointIcon.texture = PIXI.Texture.from(this.canvasData.selectTemplateData.imageUrl);
     this.circleShadow.visible = true;
   }
+  /**
+   * 开始绘制管线
+   */
+  private beginPaintPipeline(): void {
+    this.paintMode = PaintMode.Pipeline;
+  }
+  public paintingPipelineFinish(): void {
+    if (this.paintMode === PaintMode.Pipeline) {
+      this.paintMode = PaintMode.endPaint;
+    }
+  }
+  public beginPaintingArrows(): void {
+    this.paintMode = PaintMode.Arrows;
+  }
+
+
   /**
    * 取消绘画
    */
@@ -1041,9 +1093,9 @@ enum PaintMode {
   singlePointIcon,
   lineIcon,
   polygonIcon,
-  beginPainting,
   endPaint,
-  connection
+  Pipeline,
+  Arrows
 }
 /**
  * 单点图标
@@ -1071,7 +1123,11 @@ export class SinglePointIcon extends PIXI.Container {
     + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue, this.style);
   private image = PIXI.Sprite.from(this.assetData.ImageUrl);
   // 是否可以被链接
-  canConnection: boolean;
+  canConnection = false;
+  // 链接对象
+  connectionObjs: any[] = [];
+  // 链接的管线
+  pipelines: any[] = [];
 
   constructor(public assetData: any, private workingArea: WorkingAreaComponent) {
     super();
@@ -1080,6 +1136,8 @@ export class SinglePointIcon extends PIXI.Container {
     this.y = this.assetData.Point.y;
     this.name = this.assetData.Id;
 
+    this.canConnection = this.assetData.CanConnection === undefined ? false : this.assetData.CanConnection;
+
     this.image.angle = this.assetData.Angle;
 
     this.image.x = 0;
@@ -1095,7 +1153,33 @@ export class SinglePointIcon extends PIXI.Container {
         console.log(this.assetData);
         event.stopPropagation();
         this.workingArea.selection.selectOne(this);
-        if (this.workingArea.allowEdit || this.assetData.GameMode === 2) {
+        if (this.canConnection && this.parent === this.workingArea.backgroundImage) {
+          if (this.workingArea.paintMode === PaintMode.Pipeline) {
+            if (this.workingArea.paintingPipeline === null) {
+              this.workingArea.previewLineSegment.visible = true;
+              this.workingArea.currentClickPoint.position =
+                new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y);
+              this.workingArea.paintPoints.push(new PIXI.Point(this.position.x, this.position.y));
+              const tempData = {
+                Id: ObjectID.default.generate(),
+                MultiPoint: JSON.parse(JSON.stringify(this.workingArea.paintPoints)),
+                Point: new PIXI.Point(0, 0),
+                Name: '管线',
+              };
+              this.workingArea.paintingPipeline = new Pipeline(tempData, this.workingArea);
+            } else {
+              this.workingArea.previewLineSegment.visible = false;
+              this.workingArea.currentClickPoint.position =
+                new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y);
+              this.workingArea.paintPoints.push(new PIXI.Point(this.position.x, this.position.y));
+              this.workingArea.paintingPipeline.assetData.MultiPoint = JSON.parse(JSON.stringify(this.workingArea.paintPoints));
+              this.workingArea.paintingPipeline.refresh();
+              this.workingArea.paintingPipelineFinish();
+            }
+          }
+        }
+        // 如果链接对象不为空,禁止移动
+        if ((this.workingArea.allowEdit || this.assetData.GameMode === 2) && this.connectionObjs.length === 0) {
           event.currentTarget.parent.data = event.data;
           event.currentTarget.parent.alpha = 0.5;
           event.currentTarget.parent.dragging = true;
@@ -1653,11 +1737,91 @@ export class PolygonIcon extends PIXI.Container {
 export class Car extends SinglePointIcon {
 
 }
-export class Conection extends PIXI.Container {
-
+/**
+ * 管线
+ */
+export class Pipeline extends PIXI.Graphics {
+  constructor(public assetData: any, private workingArea: WorkingAreaComponent) {
+    super();
+    this.name = this.assetData.Id;
+    this.x = this.assetData.Point.x;
+    this.y = this.assetData.Point.y;
+    this.workingArea.backgroundImage.addChild(this);
+    // 画线图标
+    this.refresh();
+    this.interactive = true;
+    this.on('mousedown', event => {
+      console.log(this.assetData);
+      event.stopPropagation();
+      this.workingArea.selection.selectOne(this);
+    });
+  }
+  /**
+   * 刷新
+   */
+  public refresh() {
+    this.clear();
+    this.lineStyle(5, 0x0000ff, 1);
+    for (let i = 0, count = this.assetData.MultiPoint.length; i < count; i++) {
+      const pointA = this.assetData.MultiPoint[i];
+      if (i === 0) {
+        this.moveTo(pointA.x, pointA.y);
+      } else {
+        this.lineTo(pointA.x, pointA.y);
+      }
+    }
+    if (this.assetData.MultiPoint.length >= 2) {
+      const pointA = this.assetData.MultiPoint[0];
+      const pointB = this.assetData.MultiPoint[this.assetData.MultiPoint.length - 1];
+      // const angle = Math.atan2((pointB.y - pointA.y), (pointB.x - pointA.x)) * (5 / Math.PI);
+      this.beginFill(0x0000ff);
+      // this.drawStar(pointB.x, pointB.y, 3, 5, 0, angle);
+      this.drawCircle(pointA.x, pointA.y, 5);
+      this.drawCircle(pointB.x, pointB.y, 5);
+      this.endFill();
+    }
+  }
+}
+/**
+ * 箭头
+ * 创建一个只有2个点组成的箭头
+ */
+export class Arrows extends PIXI.Container {
+  public data: any;
+  public icon: PIXI.TilingSprite;
+  public ready = false;
+  constructor(assetData: any, private workingArea: WorkingAreaComponent) {
+    super();
+    this.workingArea.backgroundImage.addChild(this);
+    this.data = assetData;
+    // 画线图标
+    this.icon = new PIXI.TilingSprite(PIXI.Texture.from(this.data.source), 0, 68);
+    this.addChild(this.icon);
+    this.refresh();
+    this.interactive = true;
+    this.on('mousedown', event => {
+      if (!this.ready) { return; }
+      event.stopPropagation();
+      this.workingArea.selection.selectOne(this);
+    });
+  }
+  /**
+   * 刷新
+   */
+  public refresh() {
+    const angle = Math.atan2((this.data.pointB.y - this.data.pointA.y), (this.data.pointB.x - this.data.pointA.x)) * (180 / Math.PI);
+    const a = this.data.pointB.x - this.data.pointA.x;
+    const b = this.data.pointB.y - this.data.pointA.y;
+    const distance = Math.sqrt(a * a + b * b);
+
+    this.icon.width = distance;
+    this.icon.height = 68;
+    this.icon.anchor.set(0, 0.5);
+    this.icon.x = this.data.pointA.x;
+    this.icon.y = this.data.pointA.y;
+    this.icon.angle = angle;
+  }
 }
-
-
 /**
  * 选择器
  */
@@ -1798,117 +1962,3 @@ export class PropertyInfo {
    */
   public PropertyValue: string;
 }
-/**
- * demo图标
- */
-export class DemoIcon extends PIXI.Container {
-  style = new PIXI.TextStyle({
-    fontFamily: 'Arial',
-    fontSize: 18,
-    fontStyle: 'normal',
-    fontWeight: 'bold',
-    fill: ['#000000'],
-    stroke: '#ffffff',
-    strokeThickness: 3,
-    dropShadow: true,
-    dropShadowColor: '#000000',
-    dropShadowBlur: 3,
-    dropShadowAngle: Math.PI / 6,
-    dropShadowDistance: 1,
-    wordWrap: false,
-    wordWrapWidth: 100,
-  });
-
-  private text = new PIXI.Text(this.assetData.Name
-    + '\r\n'
-    + this.assetData.PropertyInfos.find(item => item.PropertyName === '名称/编号')?.PropertyValue, this.style);
-  private image = PIXI.Sprite.from(this.assetData.ImageUrl);
-  constructor(public assetData: any, private workingArea: WorkingAreaComponent) {
-    super();
-    this.workingArea.backgroundImage.addChild(this);
-    this.x = this.assetData.Point.x;
-    this.y = this.assetData.Point.y;
-    this.name = this.assetData.Id;
-
-    this.image.angle = this.assetData.Angle;
-
-    this.image.x = 0;
-    this.image.y = 0;
-    this.image.width = this.assetData.Width;
-    this.image.height = this.assetData.Height;
-
-    this.image.alpha = 1;
-    this.image.anchor.set(0.5);
-    this.image.interactive = true;
-    this.image
-      .on('mousedown', event => {
-        event.stopPropagation();
-        this.workingArea.selection.selectOne(this);
-        if (this.workingArea.allowEdit) {
-          event.currentTarget.parent.data = event.data;
-          event.currentTarget.parent.alpha = 0.5;
-          event.currentTarget.parent.dragging = true;
-        }
-      })
-      .on('mouseup', event => {
-        if (event.currentTarget.parent.dragging) {
-          event.currentTarget.parent.alpha = 1;
-          event.currentTarget.parent.dragging = false;
-          event.currentTarget.parent.data = null;
-        }
-      })
-      .on('mouseupoutside', event => {
-        if (event.currentTarget.parent.dragging) {
-          event.currentTarget.parent.alpha = 1;
-          event.currentTarget.parent.dragging = false;
-          event.currentTarget.parent.data = null;
-        }
-      })
-      .on('mousemove', event => {
-        if (event.currentTarget.parent.dragging) {
-          const newPosition = event.currentTarget.parent.data.getLocalPosition(event.currentTarget.parent.parent);
-          event.currentTarget.parent.x = newPosition.x;
-          event.currentTarget.parent.y = newPosition.y;
-          this.assetData.Point = new PIXI.Point(this.x, this.y);
-          this.workingArea.canvasData.isChange = true;
-        }
-      })
-      .on('rightclick', event => {
-
-      })
-      .on('mouseover', event => {
-
-      });
-
-    this.workingArea.on('backgroundScale', data => {
-      if (this.assetData.FixedSize) {
-        const scale = 1 / data;
-        this.scale.set(scale);
-      }
-    });
-
-    this.text.x = this.image.x;
-    this.text.y = this.image.y - this.image.height / 2;
-    this.text.anchor.set(0.5, 1);
-
-    this.addChild(this.text);
-    this.addChild(this.image);
-  }
-  // 设置名称
-  public setNameVisible(value: boolean, mode: GameMode) {
-    if (this.assetData.GameMode === mode) {
-      this.text.visible = value;
-    }
-  }
-  // 刷新
-  public refresh() {
-    this.image.width = this.assetData.Width;
-    this.image.height = this.assetData.Height;
-    this.image.angle = this.assetData.Angle;
-    this.text.text = this.assetData.Name
-      + '\r\n'
-      + this.assetData.PropertyInfos.find(item => item.PropertyName === '名称/编号')?.PropertyValue;
-    this.text.x = this.image.x;
-    this.text.y = this.image.y - this.image.height / 2;
-  }
-}
diff --git a/src/assets/images/进攻方向.png b/src/assets/images/进攻方向.png
new file mode 100644
index 0000000000000000000000000000000000000000..914c848546abd9fbff1b80d071d2620911efb104
GIT binary patch
literal 6126
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

literal 0
HcmV?d00001


From c15047355e8cfac64c8ff6c3d44c0abbd25742dd Mon Sep 17 00:00:00 2001
From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com>
Date: Mon, 21 Sep 2020 17:18:40 +0800
Subject: [PATCH 4/9] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E7=AE=A1=E7=BA=BF=E9=93=BE=E6=8E=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/working-area/working-area.component.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index a09d3ec..a6a47e2 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -749,6 +749,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
               } else {
                 this.paintingArrows.ready = true;
                 this.paintingArrows = null;
+                this.beginPaintPipeline();
               }
               break;
           }
@@ -944,7 +945,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
   public paintingPipelineFinish(): void {
     if (this.paintMode === PaintMode.Pipeline) {
       this.paintMode = PaintMode.endPaint;
+      this.paintPoints.splice(0, this.paintPoints.length);
+      this.paintingPipeline = null;
     }
+    this.beginPaintingArrows();
   }
   public beginPaintingArrows(): void {
     this.paintMode = PaintMode.Arrows;

From d86253a4df53981b45457b9def88591fd2c8698c Mon Sep 17 00:00:00 2001
From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com>
Date: Mon, 21 Sep 2020 17:19:59 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/working-area/working-area.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index a6a47e2..72950e7 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -516,8 +516,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     tempCar2.position.set(25, 50);
 
     // 开始绘制管线
-    // this.beginPaintPipeline();
-    this.beginPaintingArrows();
+    this.beginPaintPipeline();
+    // this.beginPaintingArrows();
   }
 
   /**

From 4a69ae2f7ae951815a566c9903ff90fa81909a02 Mon Sep 17 00:00:00 2001
From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com>
Date: Mon, 21 Sep 2020 17:28:32 +0800
Subject: [PATCH 6/9] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=80=89=E4=B8=AD=E6=95=88=E6=9E=9C=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../working-area/working-area.component.ts    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 72950e7..b49a02e 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -248,19 +248,27 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
     // this.createEnterPaintEndButton();
     // this.backgroundImage.addChild(this.paintingLine);
     this.on('select', obj => {
-    if (obj instanceof MultipointIcon) {
-        obj.setPointVisiable(true);
-      } else if (obj instanceof PolygonIcon) {
-        obj.setPointVisiable(true);
+      if (this.allowEdit) {
+        if (obj instanceof MultipointIcon) {
+          obj.setPointVisiable(true);
+        } else if (obj instanceof PolygonIcon) {
+          obj.setPointVisiable(true);
+        } else {
+          obj.filters = [this.outlineFilterGreen];
+        }
       } else {
         obj.filters = [this.outlineFilterGreen];
       }
     });
     this.on('deselect', obj => {
-      if (obj instanceof MultipointIcon) {
-        obj.setPointVisiable(false);
-      } else if (obj instanceof PolygonIcon) {
-        obj.setPointVisiable(false);
+      if (this.allowEdit) {
+        if (obj instanceof MultipointIcon) {
+          obj.setPointVisiable(false);
+        } else if (obj instanceof PolygonIcon) {
+          obj.setPointVisiable(false);
+        } else {
+          obj.filters = [];
+        }
       } else {
         obj.filters = [];
       }

From 95e62c3745dd1061520b3a2f3d64cb4fd71788ba Mon Sep 17 00:00:00 2001
From: baozw <baozw@anxin99.com>
Date: Mon, 21 Sep 2020 17:42:12 +0800
Subject: [PATCH 7/9] =?UTF-8?q?[=E7=B1=BB=E4=BC=BC=E9=A2=84=E6=A1=88]?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../similar-plans.component.html              | 14 ++++++-
 .../similar-plans.component.scss              | 19 ++++++++++
 .../similar-plans/similar-plans.component.ts  | 38 +++++++++++++++++++
 3 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/similar-plans/similar-plans.component.html b/src/app/ui/similar-plans/similar-plans.component.html
index 44bcb13..5863341 100644
--- a/src/app/ui/similar-plans/similar-plans.component.html
+++ b/src/app/ui/similar-plans/similar-plans.component.html
@@ -1 +1,13 @@
-<p>similar-plans works!</p>
+<div class="leisiTable">
+    <table>
+        <thead >
+            <td style="width:40%;">单位名称</td>
+            <td style="width:10%;">始建于</td>
+            <td style="width:10%;">着火物</td>
+            <td style="width:10%;">点火位置</td>
+            <td style="width:10%;">相近度</td>
+            <td style="width:20%;">详情</td>
+        </thead>
+        <tbody id="shujubody"></tbody>
+    </table>
+</div>
diff --git a/src/app/ui/similar-plans/similar-plans.component.scss b/src/app/ui/similar-plans/similar-plans.component.scss
index e69de29..5fd855a 100644
--- a/src/app/ui/similar-plans/similar-plans.component.scss
+++ b/src/app/ui/similar-plans/similar-plans.component.scss
@@ -0,0 +1,19 @@
+.leisiTable{
+    border:1px solid  #0E79A9;
+    height: 95%;
+    width: 100%;
+    background-color: #05385E;
+    margin-top: 50px;
+    table{
+        width: 100%;
+        height: 100%;
+        thead{
+            td{
+                color:#F7BA2A;
+                height: 50px;
+                text-align:center;
+                border-bottom: 1px solid  #0E79A9;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/app/ui/similar-plans/similar-plans.component.ts b/src/app/ui/similar-plans/similar-plans.component.ts
index 5393651..ff65ba0 100644
--- a/src/app/ui/similar-plans/similar-plans.component.ts
+++ b/src/app/ui/similar-plans/similar-plans.component.ts
@@ -10,6 +10,44 @@ export class SimilarPlansComponent implements OnInit {
   constructor() { }
 
   ngOnInit(): void {
+    this.tableData()
+  }
+
+  leisiYuan=[
+    {danweiName:"广西钦州志诚化工有限公司",year:"XXXX年",zhoahuo:"XXX",weizhi:"2#储罐",xiangjin:"80%"},
+    {danweiName:"南宁交能石化有限责任公司",year:"",zhoahuo:"XXX",weizhi:"3#储罐",xiangjin:"75%"},
+    {danweiName:"广西藤县通轩立信化学有限公司",year:"",zhoahuo:"XXX",weizhi:"1#储罐",xiangjin:"70%"},
+    {danweiName:"广西田东锦盛化工科技有限公司",year:"",zhoahuo:"XXXXXX",weizhi:"12#储罐",xiangjin:"60%"},
+    {danweiName:"梧州市联溢化工有限公司",year:"",zhoahuo:"XXX",weizhi:"5#储罐",xiangjin:"50%"},
+    {danweiName:"田东石油化工钦州港油品储运库",year:"",zhoahuo:"XXX",weizhi:"4-1#储罐",xiangjin:"40%"},
+    {danweiName:"中国石油进德油库",year:"",zhoahuo:"XXX",weizhi:"3#储罐",xiangjin:"45%"},
+    {danweiName:"广西华鑫化工有限公司",year:"",zhoahuo:"XXX",weizhi:"11#储罐",xiangjin:"42%"},
+    {danweiName:"广西中油能源有限公司",year:"",zhoahuo:"XXX",weizhi:"6#储罐",xiangjin:"39%"},
+    {danweiName:"广西钦州澄星化工科技有限公司",year:"",zhoahuo:"XXX",weizhi:"5-2#储罐",xiangjin:"35%"},
+    {danweiName:"中油广西田东石油化工总厂有限公司",year:"",zhoahuo:"XXX",weizhi:"3-1#储罐",xiangjin:"35%"}
+  ]
+  tableData(){
+    var res=''
+    for(var i=0;i<this.leisiYuan.length;i++){
+      res+='<tr style="color:#FFFFFF">'
+      res+='<td style="text-align:center;">'+this.leisiYuan[i].danweiName+'</td>'
+      res+='<td style="text-align:center;">'+"" +'</td>'
+      res+='<td style="text-align:center;">'+""+'</td>'
+      res+='<td style="text-align:center;">'+this.leisiYuan[i].weizhi+'</td>'
+      if(parseFloat(this.leisiYuan[i].xiangjin)<parseFloat('50%')){
+        res+='<td style="text-align:center;">'+this.leisiYuan[i].xiangjin+'</td>'
+      }
+      else if(parseFloat(this.leisiYuan[i].xiangjin)<=parseFloat('60%')&&parseFloat(this.leisiYuan[i].xiangjin)>=parseFloat('50%')){
+        res+='<td style="text-align:center;color:#3BA9F2">'+this.leisiYuan[i].xiangjin+'</td>'
+      }
+      else{
+        res+='<td style="text-align:center;color:#28BC69">'+this.leisiYuan[i].xiangjin+'</td>'
+      }
+      res+='<td style="text-align:center;"><a href="" style="color:#CC5D13">查看详情</a></td></tr>'
+    }
+    res+='</tbody>'
+    var shuju=document.getElementById('shujubody')
+    shuju.innerHTML=res
   }
 
 }

From 3e92ad35cc7c3d0038292fa9b1937627f809273e Mon Sep 17 00:00:00 2001
From: username <1105965053@qq.com>
Date: Mon, 21 Sep 2020 18:31:16 +0800
Subject: [PATCH 8/9] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=A2=84=E6=A1=88?=
 =?UTF-8?q?=E8=B5=8B=E8=83=BD=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/canvas-share-data.service.ts          |   5 +
 src/app/navigation/navigation.component.ts    |   2 +-
 .../plan-assistance.component.html            |  81 ++-
 .../plan-assistance.component.scss            | 201 +++++-
 .../plan-assistance.component.ts              | 663 +++++++++++++++++-
 src/assets/images/direction.png               | Bin 0 -> 2132 bytes
 src/assets/images/route.png                   | Bin 0 -> 1491 bytes
 src/index.html                                |   2 +-
 8 files changed, 916 insertions(+), 38 deletions(-)
 create mode 100644 src/assets/images/direction.png
 create mode 100644 src/assets/images/route.png

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/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html
index f994b21..75c38b5 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.html
+++ b/src/app/ui/plan-assistance/plan-assistance.component.html
@@ -3,13 +3,14 @@
         <div class="header leftHeader">到场力量</div>
         <div class="list">
             <div class="tableDiv">
-                <div class="tableRows" *ngFor="let item of demoData">
-                    <div style="flex: 60%;display: flex;flex-direction: column;justify-content: center;align-items: center;overflow: hidden;">
-                        <p style="flex: 60%;font-size: 16px;" class="contentText">{{item.Name}}</p>
-                        <p style="flex: 40%" class="contentText">{{item.Name}}</p>
+                <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: 40px;text-align: center;">
-                        已到场
+                    <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;" *ngIf="item.ReachTime > 0">
+                       <label>{{item.ReachTime}}分钟</label>
                     </div>
                 </div>
             </div>
@@ -17,11 +18,75 @@
     </div>
 
     <!-- canvas -->
-    <div class="center">
-        <div class="header">
+    <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>
 
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.scss b/src/app/ui/plan-assistance/plan-assistance.component.scss
index 5acd36c..c1ea7e3 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.scss
+++ b/src/app/ui/plan-assistance/plan-assistance.component.scss
@@ -7,10 +7,40 @@
     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%;
+    min-width: 250px;
     box-sizing: border-box;
     padding: 1px;
     display: flex;
@@ -27,21 +57,24 @@
     }
     //每一行
     .tableRows {
-        height: 40px;
+        height: 50px;
         overflow: hidden;
         display: flex;
-        margin: 5px 0;
+        margin: 13px 0;
         .contentText {
             font-size: 12px;
             color: #fff;
             cursor: pointer;
+            overflow: hidden;
+            text-overflow:ellipsis;
+            white-space: nowrap;
         }
     }
 }
 
 //选中状态
 .selectIcon {
-    background-color: rgba(7,89,155,0.7);
+    background-color: rgba(13, 139, 241, 0.7);
 }
 
 //右侧工作区
@@ -52,32 +85,152 @@
     flex-direction: column;
     .canvas {
         flex: 1;
+        position: relative;
     }
 }
 
-//header
-.header {
-    width: 100%;
-    height: 40px;
-    min-height: 40px;
-    cursor: pointer;
+.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;
+    }
 }
-.leftHeader {
-    line-height: 40px;
+
+//右侧 楼层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;
-    font-size: 20px;
-    font-weight: 550;
-    color: #F7bA2A;
+    background-color:rgba(2, 44, 73, 0.9);
+    color: #fff;
 }
-.title {
-    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;
+//打开关闭右侧 楼层
+.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;
-    padding-left: 25px;
+    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 e8e6fe6..184ef01 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,12 +9,11 @@ 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,
@@ -1408,10 +1409,664 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
     GameMode: 2
   };
   ngOnInit(): void {
-
+    let that = this
+    window.setTimeout(()=>{
+      document.getElementById("center").oncontextmenu = function (event) {
+        that.workingArea.cancelPaint()
+        event.preventDefault();
+       };
+    })
   }
 
   ngAfterViewInit(): void {
     this.workingArea.loadDemoScene(this.demoData, 0.149);
   }
+
+  //所有车辆信息
+  allCarsData = [
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/水罐消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/压缩空气泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/水罐消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/压缩空气泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    },
+    {
+      TemplateId: null,
+      FloorId: null,
+      Angle: 0,
+      Color: 0,
+      Enabled: true,
+      FillMode: 0,
+      FireElementId: 0,
+      FixedSize: false,
+      Height: 32,
+      Width: 32,
+      Id: ObjectID.default.generate(),
+      ImageUrl: './assets/images/压缩空气泡沫消防车.png',
+      InteractiveMode: 0,
+      MultiPoint: null,
+      Point: {
+        x: 1295,
+        y: 1237
+      },
+      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: 2
+    }
+  ]
+
+  //开始绘制
+  plot (e) {
+    
+  }
+
+  bottomIsShow:boolean = false; //底部车辆信息是否展示
+  rightIsShow:boolean = true; //右侧楼层是否展示
+  rightSayIsShow:boolean = false; //右侧语音是否展示
+
+  //选择 车辆
+  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/assets/images/direction.png b/src/assets/images/direction.png
new file mode 100644
index 0000000000000000000000000000000000000000..46e0beceff445041959b8aaa5b4b96b405367dcd
GIT binary patch
literal 2132
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/route.png b/src/assets/images/route.png
new file mode 100644
index 0000000000000000000000000000000000000000..84452266f8986e02fc367841b8da59819f4f3094
GIT binary patch
literal 1491
zcmaJ>eN5D59KPukWMMj;@tf3=ICb{=alN~?p)kDOAyE+TZo;OEmfi~#XnVFj?;sj8
zIM@`wadU)-h|%B{(J{k}TjnrRWJ~7!%+PJl`E@h<&_tA&%<VnkoPQXbwC~%uzvuZq
zzpt(@$j?blnVMp;SW<Hr2wu3(fcMzs(eOEW(>J@}GR1TknLe$=42wFjWCyfjfaEG-
zDewX@P_?QTWLPXCqq4uqEXrHNNt$96<2Kfa5`<`rB_k^m6r~DaBE_IoR(bUAFOH*#
z9N^JHdmfP&bb&H?LA4Hi)%kv@x<X<DXjUeY5#b<#0!$H!D3z+gMR;_OmxKHGF^(dG
zCT0bX4v8wtD?nVD4iLN5fk~u|L7c3Ww6hFF&qFAJbl?PwlQc$<9Kmt~i40#T^ri<&
zIIrLt_66T~w9GVv9FB*>VQbiC)$~%FWLXv`D4e1&Xn`43swqY=)kse;2*8kZIcUn7
zio_YkVl8CyC{#KWf)dQjdqS)l!-;|^!y{r4C#?joDDk)ktqs!){+IDgYr|g^1h^L%
zT1b~*JxbCOV3@n-JBk}ZHQZudhD8x81x*SmKs9p(9)(}50Xe|24#1ESjFzJ9EaoKX
z0LGS3B*wCUbkGvz1Qe6tc^00e<~s$4%j0y}Xp(d@tj*>2&_XuFx;=u;?M`5GRl^ij
z2_$^W(DyLb{ah^P(t&7dx?j^O6J1bHrkR>irUem~D_(UcGP_V#16tUa6ED+H)B@1u
z)ga)}H3b>WGbcYo16@o3hF}S-1lTD|V&n1KoDPg7SU}k%y98Sc9mWTq%HL3*!V?%r
zFd>I4W&*GW2?}$t4gw=dz+g-<C1H@uE&&HkLuV)sCF1ecd8(BXN3cKR+b4qoU!IH>
zP~kl3aByCmFy)BF^1{trA=@9heB{EJg|CX!d+zO8?b~>eZalZKfZ(GW&`@J+`=lkw
zGoxIrdtuwVl|OW6b=R8XYwxa1%09eeT*{1NJ6b($^`qb3)-f;I)Ny&<gU8n0bz)yv
z?fI`8ns)v3{hF5BO}DG2f8NOiccdS^&sXL9KcIuhwvb=mdi>yO%a~DXm}K*QhY@+7
zc(|YGNxr)9P}Z%S*?8uS`x9#i)+Zf(@6n?EucC7Ynp0m-6O-0XZteM#`Mt3H`jlU;
zr*s{j6zlf=7*6YK@%b8jy-ECp1C}gv?dYU|I<)9s>GE^o=96x}l)dSAeW<_l<-)W3
zHRa)oYy0?$Jr~RSNBwkSS!LVEX&<>h2_;vwdq*CRJ))NuZ2qjsllJX7&#74#=B6!+
zg{<mzUTv>yEML%2Q@MS4_JOJ6d#dVse!UZZV?u9r+NH9ak(#{^e#YqbJ)dqJ+rCv!
zeKURay;pWl%-nmod0^Axl!Hss|KQ&#o8K|w>dF)KeZ8G*^g`{ToR;e5k6+q%DZTM#
zbn4oi=98JH&Thf(wDmcXoZqcmb;i5ue7Vxr|69kbKBF9^XPsuRUD<r&Ev`%8CNdl5
z)YM-*8a;HSb%es&E1HD68(UBQ+x76y>71Fz#!Ty78Y_)uw2T}0Yen6<7bjb$ooW2A
Tg&w;z{+rEp=L;S4SJwOoTuCM?

literal 0
HcmV?d00001

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">

From b34af8b0f3cb02e55fbd5c1b3670ee728eabf695 Mon Sep 17 00:00:00 2001
From: username <1105965053@qq.com>
Date: Mon, 21 Sep 2020 18:33:48 +0800
Subject: [PATCH 9/9] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20css=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/ui/plan-assistance/plan-assistance.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html
index 75c38b5..dfabde3 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.html
+++ b/src/app/ui/plan-assistance/plan-assistance.component.html
@@ -9,7 +9,7 @@
                         <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;" *ngIf="item.ReachTime > 0">
+                    <div style="flex: 40%; line-height: 50px;text-align: center;color: #fff;" *ngIf="item.ReachTime > 0">
                        <label>{{item.ReachTime}}分钟</label>
                     </div>
                 </div>