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

README.md

@@ -1,8 +1,6 @@
-# AX.Angular4PlanPlatform
+智能实战指挥平台-前端项目
 
-上海数字化预案编制管理平台前端项目。此项目在 Angular 框架基础上编写。
-
-后续开发都基于此。
+   ---广西 演示
 
 项目初始化：npm install
 

src/app/canvas-share-data.service.ts

@@ -27,7 +27,7 @@ export class CanvasShareDataService {
   // 处置 节点
 
   // 预案赋能 选择 车辆
-  selectCar: any = {Id: '', WaterYield: '', Foam: '', PeopleNum: '', Tonnage: '', Assignment: '', LinkCar: '', WaterOccupy: ''};
+  selectCar: any = {Id: '', WaterYield: '', Foam: '', PeopleNum: '', Tonnage: '', Assignment: '', LinkCar: [], WaterOccupy: []};
    // 预案赋能 选择 车辆
 
   /**

src/app/ui/collection-tools/collection-tools.component.scss

@@ -204,11 +204,13 @@
 }
 .functionalDomain {
   flex: 98%;
+  overflow: hidden;
   .functionalDomainContent {
     display: flex;
     position: relative;
     width: 100%;
     height: 100%;
+    overflow: hidden;
   }
   .functionalDomainLeft {
     flex: 1;

src/app/ui/plan-assistance/plan-assistance.component.scss

@@ -135,7 +135,6 @@
         align-items: center;
         justify-content: center;
         p { 
-            color: #fff;
             flex: 1;
             text-align: center;
             line-height: 35px;