diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html index bb72e02..9bdf0ac 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.html +++ b/src/app/ui/plan-assistance/plan-assistance.component.html @@ -1,7 +1,7 @@
-
到场力量
+
到场力量
@@ -69,8 +69,8 @@

-

{{canvasData.selectCar.LinkCar}}

-

{{canvasData.selectCar.WaterOccupy}}

+

{{canvasData.selectCar.LinkCar}}

+

{{canvasData.selectCar.WaterOccupy}}

diff --git a/src/app/ui/plan-assistance/plan-assistance.component.scss b/src/app/ui/plan-assistance/plan-assistance.component.scss index dcef206..78e6f57 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.scss +++ b/src/app/ui/plan-assistance/plan-assistance.component.scss @@ -12,7 +12,6 @@ width: 100%; height: 40px; min-height: 40px; - overflow: hidden; } .leftHeader { line-height: 40px; @@ -135,7 +134,16 @@ display: flex; align-items: center; justify-content: center; - p { flex: 1; text-align: center; line-height: 35px; } + p { + color: #fff; + flex: 1; + text-align: center; + line-height: 35px; + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; + cursor: pointer; + } } .taskInput { width: 100px; diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 5494f4b..07b884c 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -7364,11 +7364,6 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { } ]; - bottomIsShow = false; // 底部车辆信息是否展示 - rightIsShow = true; // 右侧楼层是否展示 - rightSayIsShow = false; // 右侧语音是否展示 - selectCarID = ''; // 选中车辆 样式 - ngOnInit(): void { const that = this; window.setTimeout(() => { @@ -7387,8 +7382,12 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { this.workingArea.on('select', obj => { // 选中素材属性注入函数 if (obj && obj.assetData && obj.assetData.ReachTime != undefined) { + this.selectCarID = JSON.parse(JSON.stringify( obj.assetData.Id || '' )); //选中样式 赋值ID + let linkCar = this.canvasData.getLinkCarName(obj) //连接车辆 + let waterOccupy = this.canvasData.getWaterOccupyName(obj) //水源占用 + obj.assetData.LinkCar = linkCar //连接车辆 + obj.assetData.WaterOccupy = waterOccupy //水源占用 this.canvasData.selectCar = obj.assetData; - this.selectCarID = JSON.parse(JSON.stringify( obj.assetData.Id || '' )); this.bottomIsShow = true; } }); @@ -7399,6 +7398,11 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }); } + bottomIsShow:boolean = false; // 底部车辆信息是否展示 + rightIsShow:boolean = true; // 右侧楼层是否展示 + rightSayIsShow:boolean = false; // 右侧语音是否展示 + selectCarID:string = ''; // 选中车辆ID 选中效果css + // 开始绘制 plot(e) { e == 0 ? this.workingArea.beginPaintingArrows() : this.workingArea.beginPaintPipeline();