Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-07 18:31:33 +08:00
parent 7b0f2d49b5 617896a85b
commit 1c1bfad35e
9 changed files with 151 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/datatable/components/datascreen/curve/curve.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-07 17:57:23
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 18:24:57
* @LastEditTime : 2022-04-07 18:30:46
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -76,7 +76,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges {
this.chart = new Chart({
container: el,
autoFit: true,
height: 500,
height: 200,
});
let value: any = []
this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {

15
src/app/routes/datatable/components/datascreen/datascreen.component.html
View File

@ -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

18
src/app/routes/datatable/components/datascreen/datascreen.component.ts
View File

@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
* @Author : Shiming
* @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 18:02:02
* @LastEditTime : 2022-04-07 18:28:03
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -106,16 +106,6 @@ export class DatatableDatascreenComponent implements OnInit {
}
});
}
// initLineData() {
// this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
// this.monthData = res;
// if (this.timeline) {
// console.log(this.timeline);
// // 等待组件渲染
// setTimeout(() => this.timeline.changeData(), 100);
// }
// });
// }
public genData(): G2MiniAreaData[] {
let value: any = [];
this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
@ -131,13 +121,7 @@ export class DatatableDatascreenComponent implements OnInit {
return value;
}
initPillarData(){
this.service.request(this.service.$api_getTradingTrend).subscribe(res => {
if (res) {
this.chartData2 = res
this.curve.reRender()
}
})
}
public genData2(): G2TimelineData[] {
let value1: any[] = [];