解决冲突

This commit is contained in:
wangshiming
2022-04-07 16:59:19 +08:00
parent 465ae51f6c
commit deec1b0bd6
3 changed files with 41 additions and 50 deletions

View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 16:37:05
* @LastEditTime : 2022-04-07 16:57:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -44,11 +44,11 @@
</nz-card>
<nz-card nzTitle="本月交易趋势">
<g2-timeline repaint='true'
[data]="monthData"
[data]="monthData2"
#timeline
[titleMap]="{ y1: '订单数', y2: '运单数' }"
[height]="200"
[delay]='500'
[delay]='200'
mask="MM月DD日"
[slider]="false"
></g2-timeline>