From 94bc63394cfff0a98efbca51ab50c1410f2b607c Mon Sep 17 00:00:00 2001
From: username <1105965053@qq.com>
Date: Tue, 22 Sep 2020 15:26:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=80=92=E8=AE=A1?=
 =?UTF-8?q?=E6=97=B6=E5=8A=A8=E6=80=81=E6=A0=B7=E5=BC=8F=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan-assistance.component.html               |  3 ++-
 .../plan-assistance.component.scss               | 11 +++++++++++
 .../plan-assistance/plan-assistance.component.ts | 16 ++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html
index 8e9cf2c..bb72e02 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.html
+++ b/src/app/ui/plan-assistance/plan-assistance.component.html
@@ -1,4 +1,5 @@
 <div class="content">
+    <!-- [ngClass]="{closeLeft: !rightIsShow,openLeft: rightIsShow}" -->
     <div class="left">
         <div class="header leftHeader">到场力量</div>
         <div class="list">
@@ -11,7 +12,7 @@
                     <div class="countdown" style="color: #37f76D;" *ngIf="item.ReachTime < 1">已到场</div>
                     <div class="countdown" *ngIf="item.ReachTime > 0">
                         <label [ngClass]="{smallFive: item.ReachTime<=300,bigTen: item.ReachTime>300}">
-                            <countdown #key [config]="{leftTime: item.ReachTime,notify: [299],format: 'm分钟'}" (event)="handleEvent($event,item)"></countdown>
+                            <countdown #key [config]="{leftTime: item.ReachTime,notify: [299],format: 'm:ss内到场'}" (event)="handleEvent($event,item)"></countdown>
                         </label>
                     </div>
                 </div>
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.scss b/src/app/ui/plan-assistance/plan-assistance.component.scss
index 397937a..dcef206 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.scss
+++ b/src/app/ui/plan-assistance/plan-assistance.component.scss
@@ -12,6 +12,7 @@
     width: 100%;
     height: 40px;
     min-height: 40px;
+    overflow: hidden;
 }
 .leftHeader {
     line-height: 40px;
@@ -77,6 +78,16 @@
         }
     }
 }
+//打开关闭左侧 车辆
+.openLeft {
+    width: 300px;
+    transition: width 0.5s;
+}
+.closeLeft {
+    width: 0px;
+    min-width: 0px;
+    transition: width 0.5s;
+}
 
 //选中状态
 .selectIcon {
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts
index 58791b3..3a6ccd1 100644
--- a/src/app/ui/plan-assistance/plan-assistance.component.ts
+++ b/src/app/ui/plan-assistance/plan-assistance.component.ts
@@ -6866,7 +6866,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '水罐消防车',
       FireTeamName: '八塘消防救援站', // 所属消防队
-      ReachTime: 240, // 到场剩余时间
+      ReachTime: 237, // 到场剩余时间
       WaterYield: '12t', // 载水量
       Foam: '0t', // 载泡沫
       PeopleNum: 6, // 载人数
@@ -6916,7 +6916,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '水罐泡沫消防车',
       FireTeamName: '八塘消防救援站', // 所属消防队
-      ReachTime: 240, // 到场剩余时间
+      ReachTime: 249, // 到场剩余时间
       WaterYield: '6t', // 载水量
       Foam: '2t', // 载泡沫
       PeopleNum: 6, // 载人数
@@ -6966,7 +6966,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '水罐泡沫消防车',
       FireTeamName: '八塘消防救援站', // 所属消防队
-      ReachTime: 240, // 到场剩余时间
+      ReachTime: 277, // 到场剩余时间
       WaterYield: '3t', // 载水量
       Foam: '1t', // 载泡沫
       PeopleNum: 8, // 载人数
@@ -7016,7 +7016,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '举高喷射消防车',
       FireTeamName: '八塘消防救援站', // 所属消防队
-      ReachTime: 300, // 到场剩余时间
+      ReachTime: 310, // 到场剩余时间
       WaterYield: '16t', // 载水量
       Foam: '2t', // 载泡沫
       PeopleNum: 4, // 载人数
@@ -7066,7 +7066,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '水罐泡沫消防车',
       FireTeamName: '龚州消防救援站', // 所属消防队
-      ReachTime: 660, // 到场剩余时间
+      ReachTime: 666, // 到场剩余时间
       WaterYield: '6t', // 载水量
       Foam: '2t', // 载泡沫
       PeopleNum: 6, // 载人数
@@ -7116,7 +7116,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '水罐泡沫消防车',
       FireTeamName: '龚州消防救援站', // 所属消防队
-      ReachTime: 720, // 到场剩余时间
+      ReachTime: 721, // 到场剩余时间
       WaterYield: '5t', // 载水量
       Foam: '1t', // 载泡沫
       PeopleNum: 6, // 载人数
@@ -7166,7 +7166,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '水罐泡沫消防车',
       FireTeamName: '龚州消防救援站', // 所属消防队
-      ReachTime: 960, // 到场剩余时间
+      ReachTime: 978, // 到场剩余时间
       WaterYield: '3t', // 载水量
       Foam: '1t', // 载泡沫
       PeopleNum: 6, // 载人数
@@ -7216,7 +7216,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
       },
       Name: '举高喷射消防车',
       FireTeamName: '龚州消防救援站', // 所属消防队
-      ReachTime: 960, // 到场剩余时间
+      ReachTime: 999, // 到场剩余时间
       WaterYield: '18t', // 载水量
       Foam: '2t', // 载泡沫
       PeopleNum: 4, // 载人数