From 7679d5cd27eab516299a11cc945772c777cb9614 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:49:20 +0800 Subject: [PATCH 1/5] fix bug --- .../partner-list/components/index/partner-list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 2d7a60ef..427c6c58 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -468,7 +468,7 @@ export class PartnerListComponent { width: 140, type: 'badge', badge: { - 0: { text: '启用', color: 'success' }, + 0: { text: '正常', color: 'success' }, 1: { text: '冻结', color: 'error' } } }, From b1fd90dd0d7cb657f3f1d6611edefbc5972f076e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 09:59:14 +0800 Subject: [PATCH 2/5] fix bug --- .../datascreen/curve/curve.component.ts | 4 ++-- .../datascreen/datascreen.component.html | 6 +++--- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts index b6cd6e92..d0552d34 100644 --- a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts @@ -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; }, }, }); diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index e66a7862..8142b1e1 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -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 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 018efd10..d54aba9f 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -38,12 +38,12 @@
  • 新增企业
    • - + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 2d8995c3..d415d0bd 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -468,14 +468,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服人员', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ]; From c6f2356b07576690fa0eb752c4e66f67edecdf7f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:16:36 +0800 Subject: [PATCH 3/5] fix bug --- .../compliance/index/curve/curve.component.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts b/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts index 0dbacb97..20d3cb1a 100644 --- a/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts +++ b/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts @@ -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)+ ' %'; }, }, }); From 6c9148677564a391ccf27c67132783cdbe1aea70 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:37:22 +0800 Subject: [PATCH 4/5] fix bug --- proxy.conf.js | 2 +- .../components/network-freight/new/new.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 1bd3c8df..28ccca86 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -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. */ diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index 5792a7bf..fc135f18 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -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', From 9b07dc9d36ccfec76b078c38d329c828e005903b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 10:38:07 +0800 Subject: [PATCH 5/5] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index d54aba9f..018efd10 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -38,12 +38,12 @@
  • 新增企业
    • -
  • + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index d415d0bd..2d8995c3 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -468,14 +468,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服人员', click: item => this.showService(item) }, - { - text: '修改合伙人', - click: item => this.editPartner(item) - }, - { - text: '修改渠道销售', - click: item => this.editSale(item) - } + // { + // text: '修改合伙人', + // click: item => this.editPartner(item) + // }, + // { + // text: '修改渠道销售', + // click: item => this.editSale(item) + // } ] } ];