解决冲突

src/app/routes/datatable/components/datascreen/datascreen.component.ts

@@ -1,8 +1,20 @@
+import { map } from 'rxjs/operators';
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-06 19:36:34
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFSchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { DataService } from '../../services/data.service';
+import { DatatableCustomindexMapComponent } from './curve/map.component';
 
 @Component({
   selector: 'app-datatable-datascreen',
@@ -12,7 +24,10 @@ import { DataService } from '../../services/data.service';
 export class DatatableDatascreenComponent implements OnInit {
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('orderSt') private readonly orderSt!: STComponent;
+  @ViewChild('map') private readonly map!: DatatableCustomindexMapComponent;
+
   columns: STColumn[] = [];
+  chartData: any = [];
   orderColumns!: STColumn[];
   constructor(public service: DataService) { }
 
@@ -45,6 +60,9 @@ export class DatatableDatascreenComponent implements OnInit {
       { title: '货物', index: 'carStatus', className: 'text-center'},
       { title: '数量', index: 'approvalStatus', className: 'text-center' },
     ];
+    if(this.map) {
+      this.map.reRender()
+    }
   }
   initOrderST() {
     this.columns = [