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 15:33:04 +08:00
parent d2e8926ca6
commit 5f9f2e3861
3 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
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 14:59:12
* @LastEditTime : 2022-04-07 15:16:53
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -30,7 +30,7 @@ export class DatatableDatascreenComponent implements OnInit {
@ViewChild('orderSt') private readonly orderSt!: STComponent;
@ViewChild('map') private readonly map!: DatatableCustomindexMapComponent;
columns: STColumn[] = [];
chartData: G2TimelineData[] = [];
chartData: any[] = [];
orderColumns: STColumn[] = [];
allDeal: any;
headDeal: any;
@ -77,6 +77,20 @@ export class DatatableDatascreenComponent implements OnInit {
this.service.request(this.service.$api_getTradingToday).subscribe((res: any) => {
this.todaysDeal = res
})
let value: any = []
this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => {
if(res) {
res.forEach((element: any) => {
value.push({
name: element.province,
value: element.weight,
});
});
console.log(value);
this.chartData = value
this.map.reRender()
}
})
}
initLineData(){
this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
@ -88,7 +102,17 @@ export class DatatableDatascreenComponent implements OnInit {
// y2: Math.floor(Math.random() * 100) + 10,
// });
// }
})
})
this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
this.monthData = res
// for (let i = 0; i < 20; i += 1) {
// this.monthData.push({
// time: new Date().getTime() + 1000 * 60 * 60 * 24 * i,
// y1: Math.floor(Math.random() * 100) + 1000,
// y2: Math.floor(Math.random() * 100) + 10,
// });
// }
})
let value: any = []
this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
console.log(res);