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

Merge branch 'develop'

Browse Source
This commit is contained in:
wangshiming
2022-05-07 10:38:23 +08:00
parent a47739b50c 9b07dc9d36
commit 09b7615ee0
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-05-06 17:09:51
* @LastEditTime : 2022-05-07 10:35:23
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

12
src/app/routes/datatable/components/compliance/index/curve/curve.component.ts
View File

@ -1,3 +1,13 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-28 20:27:07
* @LastEditors : Shiming
* @LastEditTime : 2022-05-07 10:16:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\index\\curve\\curve.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
import { G2MiniAreaClickItem } from '@delon/chart/mini-area';
@ -69,7 +79,7 @@ export class ComplianceCurveComponent implements OnInit,OnChanges {
this.chart.axis('proportion', {
label: {
formatter: (val: any) => {
return val*100+ ' %';
return (val*100).toFixed(0)+ ' %';
},
},
});

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-13 10:22:35
* @LastEditTime : 2022-05-07 09:46:55
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -108,7 +108,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges {
this.chart.axis('temperature', {
label: {
formatter: (val: any) => {
return val + '万';
return val;
},
},
});

6
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-19 14:01:38
* @LastEditTime : 2022-05-07 09:43:16
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -30,7 +30,7 @@
<nz-card nzTitle="2022全年交易情况">
<nz-row [nzGutter]="16">
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(allDeal?.dealAmount | currency)!" [nzTitle]="'成交额'"></nz-statistic>
<nz-statistic [nzValue]="(allDeal?.dealAmount | currency)! || 0" [nzTitle]="'成交额'"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(allDeal?.settlementAmount | currency)!" [nzTitle]="'结算额'"></nz-statistic>
@ -45,7 +45,7 @@
</nz-col>
</nz-row>
</nz-card>
<nz-card nzTitle="本月交易趋势">
<nz-card nzTitle="本年交易趋势">
<app-financetable-curve-min #curve [chartData]="chartData2"></app-financetable-curve-min>
</nz-card>
<nz-card nzTitle="实时货源" style="height: 400px">

2
src/app/routes/partner/partner-list/components/index/partner-list.component.ts
View File

@ -468,7 +468,7 @@ export class PartnerListComponent {
width: 140,
type: 'badge',
badge: {
0: { text: '启用', color: 'success' },
0: { text: '正常', color: 'success' },
1: { text: '冻结', color: 'error' }
}
},

3
src/app/routes/sys-setting/components/network-freight/new/new.component.ts
View File

@ -350,7 +350,7 @@ export class NetworkFreightNewComponent implements OnInit {
}
}
},
certificateType2: {
industry: {
type: 'string',
title: '行业',
enum: [
@ -666,6 +666,7 @@ export class NetworkFreightNewComponent implements OnInit {
'unifiedSocialCreditCode',
'enterpriseName',
'enterpriseAddressCode',
'industry',
'enterpriseAddress',
'registrationCapital',
'enterpriseRegistrationTime',