解决冲突

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 18:02:07
+ * @LastEditTime : 2022-04-07 18:30:12
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -42,17 +42,8 @@
         </nz-col>
       </nz-row>
     </nz-card>
-    <nz-card nzTitle="本月交易趋势">
-      <!-- <g2-timeline 
-        [data]="monthData2"
-        #timeline
-        [titleMap]="{ y1: '订单数', y2: '运单数' }"
-        [height]="200"
-        [delay]='200' 
-        mask="MM"
-        [slider]="false"
-      ></g2-timeline> -->
-      <app-financetable-curve-min #curve [chartData]='chartData2'></app-financetable-curve-min>
+    <nz-card nzTitle="本月交易趋势" >
+      <app-financetable-curve-min  #curve [chartData]='chartData2'></app-financetable-curve-min>
     </nz-card>
     <nz-card nzTitle="实时货源">
       <st