解决冲突

src/app/routes/datatable/components/datascreen/curve/map.component.html

@@ -0,0 +1 @@
+<g2-custom delay="100" (render)="render($event)"></g2-custom>

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

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-06 19:15:39
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <!-- 页头 -->
 <!-- <page-header-wrapper [title]="'运营报表'"></page-header-wrapper> -->
 <div nz-row [nzGutter]="16">
@@ -32,12 +42,13 @@
     </nz-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="8">
-    <div>
-
+    <!-- <div>
+   
     </div>
     <nz-card nzTitle="本月发货量排名">
-
-    </nz-card>
+  
+    </nz-card> -->
+    <app-datatable-customindex-map #map [chartData]="chartData"></app-datatable-customindex-map>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="8">
     <nz-card nzTitle="今日交易情况">
@@ -62,11 +73,11 @@
 
     </nz-card>
     <nz-card nzTitle="实时运单风控">
-      <st #st multiSort bordered [columns]="orderColumns" [ps]="20" [data]="service.$api_listShipperReportPage"
+      <!-- <st #st multiSort bordered [columns]="orderColumns" [ps]="20" [data]="service.$api_listShipperReportPage"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
       [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
       [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
-    </st>
+    </st> -->
     </nz-card>
   </div>
 </div>

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 = [