解决冲突
This commit is contained in:
		| @ -12,7 +12,7 @@ | ||||
| <!-- <page-header-wrapper [title]="'运营报表'"></page-header-wrapper> --> | ||||
| <div nz-row [nzGutter]="24"> | ||||
|   <div nz-col class="gutter-row" [nzSpan]="8"> | ||||
|     <nz-card nzTitle="2022全年交易情况"> | ||||
|     <nz-card nzTitle=""> | ||||
|       <nz-row [nzGutter]="16"> | ||||
|         <nz-col [nzSpan]="12"> | ||||
|           <nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'成交额'"></nz-statistic> | ||||
|  | ||||
| @ -5,7 +5,7 @@ import { map } from 'rxjs/operators'; | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-04-06 10:57:56 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-04-07 01:48:44 | ||||
|  * @LastEditTime : 2022-04-07 09:30:20 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -56,8 +56,15 @@ export class DatatableDatascreenComponent implements OnInit { | ||||
|   ngOnInit(): void { | ||||
|     this.initST() | ||||
|     this.initOrderST() | ||||
|     this.initData() | ||||
|     this.initLineData() | ||||
|   } | ||||
|   initData(){ | ||||
|     this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => { | ||||
|       console.log(res); | ||||
|        | ||||
|     }) | ||||
|   } | ||||
|   initLineData(){ | ||||
|     for (let i = 0; i < 20; i += 1) { | ||||
|       this.chartData.push({ | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-27 10:30:56 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-04-06 13:47:25 | ||||
|  * @LastEditTime : 2022-04-07 09:30:16 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\services\\data.service.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -66,6 +66,24 @@ export class DataService extends BaseService { | ||||
|   $api_statistics_totalAdd = `/api/mdc/cuc/statistics/totalAdd`; | ||||
|  | ||||
|  | ||||
|   // 数据大屏-本年全年交易情况 | ||||
|   $api_getAnnualTransactions = `/api/sdc/reportDataLargeScreen/getAnnualTransactions`; | ||||
|   // 数据大屏-客户统计(货主,合伙人,司机,车辆) | ||||
|   $api_getCustomerStatistics = `/api/sdc/reportDataLargeScreen/getCustomerStatistics`; | ||||
|   // 数据大屏-实时货源 | ||||
|   $api_getRealTimeSupply = `/api/sdc/reportDataLargeScreen/getRealTimeSupply`; | ||||
|   // 数据大屏-实时运单风控 | ||||
|   $api_getRealTimeWaybillRiskControl = `/api/sdc/reportDataLargeScreen/getRealTimeWaybillRiskControl`; | ||||
|   // 数据大屏-本月发货量排名 | ||||
|   $api_getShipmentRanking = `/api/sdc/reportDataLargeScreen/getShipmentRanking`; | ||||
|   // 数据大屏-今日交易情况 | ||||
|   $api_getTradingToday = `/api/sdc/reportDataLargeScreen/getTradingToday`; | ||||
|   // 数据大屏-本月交易趋势 | ||||
|   $api_getTradingTrend = `/api/sdc/reportDataLargeScreen/getTradingTrend`; | ||||
|   // 数据大屏-交易额(今日,本月,累计) | ||||
|   $api_getTransactionAmount = `/api/sdc/reportDataLargeScreen/getTransactionAmount`; | ||||
|  | ||||
|  | ||||
|  | ||||
|   constructor(public injector: Injector) { | ||||
|     super(injector); | ||||
|  | ||||
		Reference in New Issue
	
	Block a user