diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index 6a27ee0b..3ddc4d37 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -106,7 +106,7 @@ export class DatatableBusiindexComponent implements OnInit { } else if(this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] } else{ - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + ' 00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); } diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts index 00d9e8b5..a8bf9f8b 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts @@ -53,7 +53,13 @@ export class BusitableCurveComponent implements OnInit, OnChanges { nice: true, }, }); - + this.chart.axis('value', { + label: { + formatter: (val: any) => { + return val; + }, + }, + }); this.chart.tooltip({ showCrosshairs: true, // 展示 Tooltip 辅助线 shared: true, diff --git a/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts b/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts index ddb0569b..1a5e9ae1 100644 --- a/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts +++ b/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-06 14:32:03 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-18 14:25:25 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\busitable\\pillar\\pillar.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { Chart } from '@antv/g2'; import { DataService } from 'src/app/routes/datatable/services/data.service'; @@ -45,10 +55,16 @@ export class BusitablePillarComponent implements OnInit, OnChanges { this.chart.data(this.chartData); + const itemTpl = ` +
+ 业绩量:  {value} +
+` this.chart.tooltip({ + showTitle: true, showMarkers: false, - }); - + itemTpl: itemTpl + }); this.chart.interval().position('time*number'); this.chart.render(); } diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 6504791e..4c3acb07 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -324,7 +324,7 @@ export class OrderManagementBulkComponent implements OnInit { } } }, - enterpriseInfoId: { + enterpriseInfoName: { type: 'string', title: '网络货运人', ui: { diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index b24ecb46..5da24657 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -299,7 +299,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme placeholder: '请选择' } }, - enterpriseInfoId: { + enterpriseInfoName: { type: 'string', title: '网络货运人', ui: {