解决冲突

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

@@ -4,14 +4,15 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 14:59:07
+ * @LastEditTime : 2022-04-07 16:16:57
  * @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 style="display: flex; justify-content: center; align-items: center">
-  <h1>运多星网络货运平台实时交易监控</h1>
+<div >
+  <h1 style="display: flex; justify-content: center; align-items: center;margin: 0; padding: 0; font-size: 25px;font-weight: 700;">运多星网络货运平台</h1>
+  <h1 style="display: flex; justify-content: center; align-items: center;margin: 0; padding: 0;font-size: 25px;font-weight: 700;">实时交易监控</h1>
 </div>
 <div nz-row [nzGutter]="24">
   <div nz-col class="gutter-row" [nzSpan]="8">
@@ -34,10 +35,12 @@
       </nz-row>
     </nz-card>
     <nz-card nzTitle="本月交易趋势">
-      <g2-timeline
+      <g2-timeline repaint='true'
         [data]="monthData"
+        #timeline
         [titleMap]="{ y1: '订单数', y2: '运单数' }"
         [height]="200"
+        [delay]='500' 
         mask="MM月DD日"
         [slider]="false"
       ></g2-timeline>
@@ -86,7 +89,7 @@
     <app-datatable-customindex-map style="max-height: 600px" #map [chartData]="chartData"></app-datatable-customindex-map>
     <nz-card>
       <nz-row [nzGutter]="24">
-        <g2-bar height="200" [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
+        <g2-bar #bar height="200" [delay]='500' repaint='true' [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
       </nz-row>
     </nz-card>
   </div>