From 495b5e2b0b04529db593dc0a988e70f581a2e1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 30 Mar 2022 17:15:49 +0800 Subject: [PATCH 1/5] - --- .../fund-info/fund-info.component.html | 2 +- .../fund-reporting.component.html | 22 ++++-- .../fund-reporting.component.ts | 75 ++++++++----------- .../order-reporting.component.html | 2 +- .../verify-result.component.html | 2 +- .../reporting/services/reporting.service.ts | 4 +- .../order-reporting.component.html | 4 +- .../verify-result.component.html | 2 +- .../services/tax-management.service.ts | 4 +- 9 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html index 4f50f097..ab8abf9d 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html @@ -1,5 +1,5 @@ - diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index d2d66960..07ad3e63 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -25,25 +25,33 @@ - - + + {{item?.billStatusLabel}} + + {{item?.billStatusLabel}} {{item?.billStatusLabel}} - + + + {{item?.orderCode}} + + + {{item?.wayBillCode}} {{item?.billStatusLabel}} {{item?.billStatusLabel}} - -
{{item?.amount | currency :' '}}
+ +
{{item?.tolalAmount | currency :' '}}
 - -
{{item?.amount | currency :' '}}
+ +
{{item?.payAmount | currency :' '}}
 diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index 3db9b481..fd6157e3 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -94,22 +94,22 @@ export class DatatableFundReportingComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, - resourceCode: { + orderCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, + wayBillCode: { type: 'string', title: '运单号', ui: { placeholder: '请输入', }, }, - resourceCode1: { + serialNumberCode: { type: 'string', title: '流水单号', ui: { placeholder: '请输入', }, }, - driverName: { + carrier: { title: '承运司机', type: 'string', ui: { @@ -118,7 +118,7 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, - carNo: { + carNumber: { title: '车牌号', type: 'string', maxLength: 9, @@ -129,7 +129,7 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, - carNo1: { + payee: { title: '车队长', type: 'string', maxLength: 9, @@ -140,7 +140,7 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, - serviceType: { + uploadStatus: { title: '上传状态', type: 'string', ui: { @@ -153,7 +153,7 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, - serviceType1: { + verifyStatus: { title: '本地校验', type: 'string', ui: { @@ -177,19 +177,7 @@ export class DatatableFundReportingComponent implements OnInit { allowClear: true } }, - externalResourceCode: { - title: '货主', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, - - - createTime1: { + transactionTime: { title: '交易时间', type: 'string', ui: { @@ -201,7 +189,7 @@ export class DatatableFundReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime: { + uploadTime: { title: '上传时间', type: 'string', ui: { @@ -227,38 +215,39 @@ export class DatatableFundReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, - { title: '流水单号', render: 'freightDetails', className: 'text-center', width: '150px', }, + { title: '上传状态', render: 'uploadStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'verifyStatus', className: 'text-center', width: '120px', }, + { title: '流水单号', index: 'serialNumberCode', className: 'text-center', width: '150px', }, { title: '订单号', - render: 'billComplianceVOS', + render: 'orderCode', className: 'text-center', width: '150px', }, - { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, - + { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', }, { title: '网络货运人', - render: 'serviceType', + index: 'ltdName', className: 'text-center', width: '180px', }, - { title: '实际承运人名称', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '实际承运人证件号码', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '车牌号', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '车牌颜色', render: 'driver', className: 'text-center', width: '180px' }, - { title: '总金额', render: 'amount', className: 'text-center', width: '250px' }, + { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '200px' }, + { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '120px' }, + { title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' }, + { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, + { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '250px' }, - { title: '付款方式', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '车队长', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '收款账户', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '收款银行', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '银行流水号', render: 'driver', className: 'text-center', width: '150px' }, - { title: '实际支付金额', render: 'total', className: 'text-center', width: '150px' }, - { title: '交易时间', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, - { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '付款方式', index: 'payType', className: 'text-center', width: '180px' }, + { title: '车队长', index: 'payee', className: 'text-center', width: '250px' }, + { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '200px' }, + + { title: '收款银行', index: 'bankTypeLabel', className: 'text-center', width: '200px' }, + + { title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '150px' }, + { title: '实际支付金额', render: 'payAmount', className: 'text-center', width: '150px' }, + { title: '交易时间', index: 'transactionTime', className: 'text-center', width: '150px' }, + { title: '上传次数', index: 'uploadFrequency', className: 'text-center', width: '120px' }, + { title: '上传时间', index: 'uploadTime', className: 'text-center', width: '180px' }, ]; } diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index e3ac3ddb..b16b7973 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -25,7 +25,7 @@ - diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index e155b1bd..8d3df409 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -5,7 +5,7 @@
- diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index 1343c918..bc10de77 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -6,11 +6,13 @@ import { BaseService } from '@shared'; }) export class ReportingService extends BaseService { - $api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 $api_upload_setting_save = ``; // 修改上传设置 + + $api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`; constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 32d82bd3..5ab12419 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -1,5 +1,5 @@ - diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html index e155b1bd..8d3df409 100644 --- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html @@ -5,7 +5,7 @@
- diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index 93821ee1..d60ef650 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2021-12-27 10:30:56 @@ -24,7 +24,7 @@ export class TaxManagementService extends BaseService { public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; - $api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 From f4d53b86fd17755ea3681bd481a7eddf370d2eff Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 30 Mar 2022 18:39:42 +0800 Subject: [PATCH 2/5] fix bug --- proxy.conf.js | 2 +- .../busiindex/busiindex.component.html | 13 ++- .../busiindex/busiindex.component.less | 10 ++ .../busiindex/busiindex.component.ts | 51 +++++++++- .../busiindex/curve/curve.component.spec.ts | 24 ----- .../busiindex/curve/curve.component.ts | 49 +++++----- .../busiindex/curve2/curve.component.html | 1 + .../busiindex/curve2/curve.component.less | 0 .../busiindex/curve2/curve.component.ts | 92 +++++++++++++++++++ .../busiindex/pillar/pillar.component.spec.ts | 24 ----- .../busiindex/pillar/pillar.component.ts | 24 ++--- .../operationtable/pie/pie.component.spec.ts | 24 ----- src/app/routes/datatable/datatable.module.ts | 8 +- 13 files changed, 201 insertions(+), 121 deletions(-) delete mode 100644 src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.spec.ts create mode 100644 src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.html create mode 100644 src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.less create mode 100644 src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.ts delete mode 100644 src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.spec.ts delete mode 100644 src/app/routes/datatable/components/operationtable/pie/pie.component.spec.ts diff --git a/proxy.conf.js b/proxy.conf.js index 67c15ee2..10071e14 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html index f8c1a030..2ed7ccb3 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html @@ -37,12 +37,21 @@
+
- +
+
环比(%) +
+ + +
- +
+
业绩量(元) +
+
diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.less b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.less index 32c6893e..af1850ca 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.less +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.less @@ -9,3 +9,13 @@ display: inline-block; margin: 0 0 0 10px; } +.title{ + display: flex; + align-items: center; + .box{ + width: 8px; + height: 8px; + margin-right: 10px; + border-radius: 100px; + } +} 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 bfe52480..af0711a4 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -1,8 +1,10 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, OnInit, ViewChild, NgZone } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; import { DatePipe, _HttpClient } from '@delon/theme'; import { differenceInCalendarDays } from 'date-fns'; import { DataService } from '../../../services/data.service'; +import { Chart } from '@antv/g2'; +import { BusitableCurveComponent } from './curve2/curve.component'; @Component({ selector: 'app-datatable-busiindex', @@ -13,6 +15,7 @@ import { DataService } from '../../../services/data.service'; }) export class DatatableBusiindexComponent implements OnInit { @ViewChild('st') private readonly st!: STComponent; + @ViewChild('curve') private readonly curve!: BusitableCurveComponent; type = 1; mode = 'year'; date: any = null; @@ -23,7 +26,9 @@ export class DatatableBusiindexComponent implements OnInit { timeNext: any = ['2022-01-01 00:00:00'] dateFormat = 'yyyy-MM-dd'; today = new Date(); - chartData: any = [] + chainRatio: any = [] + chartData: any = {} + el: any; columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, @@ -58,7 +63,7 @@ export class DatatableBusiindexComponent implements OnInit { return { ...params }; } - constructor(public service: DataService, private datePipe: DatePipe) { } + constructor(public service: DataService, private datePipe: DatePipe, private ngZone: NgZone) { } ngOnInit(): void { this.initData() } @@ -73,9 +78,14 @@ export class DatatableBusiindexComponent implements OnInit { time: this.timeNext, type }; - this.service.getPerformanceReportHistogram(params).subscribe(res => { + this.service.request(this.service.$api_performanceReportHistogram, params).subscribe(res => { if (res) { + this.chainRatio = res.chainRatio this.chartData = res + setTimeout(() => { + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 1000); + } }) } @@ -122,4 +132,37 @@ export class DatatableBusiindexComponent implements OnInit { } + render(el: ElementRef): void { + this.el = el.nativeElement + + } + + private init(el: HTMLElement): void { + const chart = new Chart({ + container: el, + autoFit: true, + height: 500, + }); + + chart.data(this.chainRatio); + chart.scale({ + year: { + range: [0, 1], + }, + value: { + min: 0, + nice: true, + }, + }); + + chart.tooltip({ + showCrosshairs: true, // 展示 Tooltip 辅助线 + shared: true, + }); + + chart.line().position('time*value').label('value'); + chart.point().position('time*value'); + + chart.render(); + } } diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.spec.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.spec.ts deleted file mode 100644 index cd009e56..00000000 --- a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DatatableDataindexComponent } from './dataindex.component'; - -describe('DatatableDataindexComponent', () => { - let component: DatatableDataindexComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DatatableDataindexComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DatatableDataindexComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); 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 35dbdcdb..c1a6e85e 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 @@ -1,4 +1,4 @@ -import { Component, ElementRef, Input, NgZone, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; import { G2MiniAreaClickItem } from '@delon/chart/mini-area'; import DataSet from '@antv/data-set'; import { Chart } from '@antv/g2'; @@ -8,8 +8,9 @@ import { DataService } from 'src/app/routes/datatable/services/data.service'; templateUrl: './curve.component.html', styleUrls: ['./curve.component.less'] }) -export class busitableCurveComponent implements OnInit { - @Input() chartData: any = {} +export class BusitableCurveComponent implements OnInit, OnChanges { + @Input() chartData: any; + el: any; constructor(private service: DataService, private ngZone: NgZone) { } @@ -18,7 +19,14 @@ export class busitableCurveComponent implements OnInit { } + ngOnChanges(changes: SimpleChanges): void { + if (this.chartData) { + setTimeout(() => { + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 2000) + } + } handleClick(data: G2MiniAreaClickItem): void { @@ -26,32 +34,19 @@ export class busitableCurveComponent implements OnInit { } render(el: ElementRef): void { - this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); + this.el = el.nativeElement + // this.ngZone.runOutsideAngular(() => this.init(this.el)); } private init(el: HTMLElement): void { - const data = [ - { month: '01月', value: 3 }, - { month: '02月', value: 4 }, - { month: '03月', value: 3.5 }, - { month: '04月', value: 5 }, - { month: '05月', value: 4.9 }, - { month: '06月', value: 6 }, - { month: '07月', value: 7 }, - { month: '08月', value: 9 }, - { month: '09月', value: 13 }, - { month: '10月', value: 13 }, - { month: '11月', value: 13 }, - { month: '12月', value: 13 }, - ]; const chart = new Chart({ container: el, autoFit: true, height: 500, }); - - chart.data(data); + + chart.data(this.chartData); chart.scale({ - month: { + year: { range: [0, 1], }, value: { @@ -59,16 +54,16 @@ export class busitableCurveComponent implements OnInit { nice: true, }, }); - + chart.tooltip({ showCrosshairs: true, // 展示 Tooltip 辅助线 shared: true, }); - - chart.line().position('month*value').label('value'); - //chart.point().position('month*value'); - + + chart.line().position('time*value').label('value'); + chart.point().position('time*value'); + chart.render(); -} + } } \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.html b/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.html new file mode 100644 index 00000000..0640a4d4 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.less b/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.ts b/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.ts new file mode 100644 index 00000000..a02dff78 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/curve2/curve.component.ts @@ -0,0 +1,92 @@ +import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; +import { G2MiniAreaClickItem } from '@delon/chart/mini-area'; +import DataSet from '@antv/data-set'; +import { Chart } from '@antv/g2'; +import { DataService } from 'src/app/routes/datatable/services/data.service'; +@Component({ + selector: 'app-busitable-curve', + templateUrl: './curve.component.html', + styleUrls: ['./curve.component.less'] +}) +export class BusitableCurveComponent implements OnInit, OnChanges { + @Input() chartData: any ; + el: any; + constructor(private service: DataService, private ngZone: NgZone) { + + } + ngOnChanges(changes: SimpleChanges): void { + if(this.chartData){ + setTimeout(()=>{ + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 3000) + + } + } + + ngOnInit(): void { + this.initData() + } + initData(){ + this.service.request(this.service.$api_operationalReportWaybillStatusDistribution).subscribe(res => { + if (res) { + this.chartData = res + this.ngZone.runOutsideAngular(() => this.init(this.el)); + } + }) + } + render(el: ElementRef): void { + this.el = el.nativeElement + } + private init(el: HTMLElement): void { + const ds = new DataSet(); + const dv = ds.createView().source(this.chartData); + dv.transform({ + type: 'map', + callback: row => { + row.year = parseInt(row.year, 10); + return row; + } + }).transform({ + type: 'regression', + method: 'polynomial', + fields: ['year', 'value'], + bandwidth: 0.1, + as: ['Year', 'Value'] + }); + + const chart = new Chart({ + container: el, + autoFit: true, + height: 500, + padding: [20, 40], + }); + + const view1 = chart.createView(); + view1.data(this.chartData); + view1.scale('price', { + nice: true, + }); + view1.tooltip({ + showMarkers: false, + shared: true, + }); + + view1 + .interval() + .position('month*price') + .color('name') + .adjust([ + { + type: 'dodge', + marginRatio: 0, + }, + ]); + + + // chart.interaction('active-region'); + chart.render(); + + } +} + + diff --git a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.spec.ts b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.spec.ts deleted file mode 100644 index cd009e56..00000000 --- a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DatatableDataindexComponent } from './dataindex.component'; - -describe('DatatableDataindexComponent', () => { - let component: DatatableDataindexComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DatatableDataindexComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DatatableDataindexComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.ts b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.ts index b651b086..f7460ec9 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.ts @@ -6,25 +6,27 @@ import { DataService } from 'src/app/routes/datatable/services/data.service'; templateUrl: './pillar.component.html', styleUrls: ['./pillar.component.less'] }) -export class busitablePillarComponent implements OnInit { +export class BusitablePillarComponent implements OnInit, OnChanges { + el: any; @Input() chartData: any ; constructor(private service: DataService, private ngZone: NgZone) { } - ngOnInit(): void { - this.initData() - } - initData(){ - this.service.request(this.service.$api_performanceReportHistogram).subscribe(res => { - if (res) { - this.chartData = res.performance + ngOnChanges(changes: SimpleChanges): void { + if(this.chartData){ + setTimeout(()=>{ this.ngZone.runOutsideAngular(() => this.init(this.el)); - } - }) + }, 1000) + + } + } + + ngOnInit(): void { + } render(el: ElementRef): void { - this.el = el + this.el = el.nativeElement } diff --git a/src/app/routes/datatable/components/operationtable/pie/pie.component.spec.ts b/src/app/routes/datatable/components/operationtable/pie/pie.component.spec.ts deleted file mode 100644 index cd009e56..00000000 --- a/src/app/routes/datatable/components/operationtable/pie/pie.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DatatableDataindexComponent } from './dataindex.component'; - -describe('DatatableDataindexComponent', () => { - let component: DatatableDataindexComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DatatableDataindexComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DatatableDataindexComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index cb63fd77..0f4f2574 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -21,9 +21,9 @@ import { DatatableMancustomtableComponent } from './components/customtable/mancu import { DatatablePartnertableComponent } from './components/customtable/partnertable/partnertable.component'; import { DatatableBusiindexComponent } from './components/busitable/busiindex/busiindex.component'; import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component'; -import { busitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; -import { busitablePillarComponent } from './components/busitable/busiindex/pillar/pillar.component'; +import { BusitablePillarComponent } from './components/busitable/busiindex/pillar/pillar.component'; import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component'; +import { BusitableCurveComponent } from './components/busitable/busiindex/curve2/curve.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -46,9 +46,9 @@ const COMPONENTS: Type[] = [ DatatablePartnertableComponent, DatatableBusiindexComponent, DatatableMantableComponent, - busitableCurveComponent, - busitablePillarComponent, + BusitablePillarComponent, DatatableFundReportingComponent, + BusitableCurveComponent, DatatableReportingFundInfoComponent] From d34c9f21a83877057706c9652a6034f63179bc7e Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 30 Mar 2022 18:42:53 +0800 Subject: [PATCH 3/5] fix bug --- .../routes/tax-management/services/tax-management.service.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index d60ef650..07033423 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -22,6 +22,8 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util'; export class TaxManagementService extends BaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + public $api_order_reporting_page = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 From 18f9769662cabdd60249ece3ad957ca2c603ed03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 30 Mar 2022 19:21:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../individual-income.component.html | 27 +++++-------------- .../services/tax-management.service.ts | 2 +- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index de71d3e2..8f9d0783 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -1,5 +1,5 @@ - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="false"> {{ item?.billStatusLabel }} {{ item?.billStatusLabel }} @@ -79,7 +65,8 @@ - +
司机姓名：张三/13812345678
是否确认要将该司机的起征点同步调整为超过15万？
diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index d60ef650..ef736e9a 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -24,7 +24,7 @@ export class TaxManagementService extends BaseService { public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; - $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 From 1fc6bb90eba346cdb9202a5efa873c7677b74db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 30 Mar 2022 20:14:23 +0800 Subject: [PATCH 5/5] - --- .../components/order-reporting/order-reporting.component.html | 2 +- .../order-reporting/verify-result/verify-result.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 95304139..5ce02b5a 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -35,7 +35,7 @@ - diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html index 8d3df409..91c1d871 100644 --- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html @@ -5,7 +5,7 @@
-