fix bug

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 11:38:39
+ * @LastEditTime : 2022-04-14 14:40:51
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/datatable/components/customtable/customindex/customindex.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 13:20:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 20:24:20
+ * @LastEditTime : 2022-04-14 14:37:25
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -12,19 +12,19 @@
 <page-header-wrapper [title]="'客户报表'"></page-header-wrapper>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total" [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || 0" [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total" [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total || 0" [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total" [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total || 0" [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total" [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total || 0" [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
 </div>

src/app/routes/datatable/components/customtable/customindex/customindex.component.ts

@@ -38,7 +38,7 @@ export class DatatableCustomindexComponent implements OnInit {
     { title: '未激活用户数', index: 'notActivationTotal', className: 'text-center' },
     { title: '沉默用户数', index: 'silentTotal', className: 'text-center' },
     { title: '流失用户数', index: 'drainTotal', className: 'text-center' },
-    { title: '流失率', index: 'drainRate', className: 'text-center',format: (item: any) => {return (item?.drainRate)*100 + '%'  }}
+    { title: '流失率', index: 'drainRate', className: 'text-center',format: (item: any) => {return ((item?.drainRate)*100).toFixed(2) + '%'  }}
   ];
   hzData: any;
   hhrData: any;

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-13 15:20:32
+ * @LastEditTime : 2022-04-14 14:25:03
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -22,7 +22,7 @@
   <h1 style="display: flex; justify-content: center; align-items: center;margin: 0; padding: 0;font-size: 25px;font-weight: 700;">实时交易监控</h1>
 
 </div>
-<div nz-row [nzGutter]="24">
+<div nz-row [nzGutter]="24" >
   <div nz-col class="gutter-row" nzXs="12" nzSm="12" nzMd="12" nzLg="12" nzXl="8" nzXXl="8">
     <nz-card nzTitle="2022全年交易情况">
       <nz-row [nzGutter]="16">
@@ -45,13 +45,12 @@
     <nz-card nzTitle="本月交易趋势" >
       <app-financetable-curve-min  #curve [chartData]='chartData2'></app-financetable-curve-min>
     </nz-card>
-    <nz-card nzTitle="实时货源">
+    <nz-card nzTitle="实时货源" style="height: 400px;">
       <st
         #st
         multiSort
-        bordered
         [columns]="columns"
-        [scroll]="{ y: '320px' }"
+        [scroll]="{ y: '350px' }"
         [data]="service.$api_getRealTimeSupply"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
         [res]="{ reName: { list: 'data' } }"
@@ -85,11 +84,13 @@
           <nz-statistic [nzValue]="(headDeal?.cumulativeAmount | currency)!" [nzTitle]="'累计交易额'"></nz-statistic>
         </nz-col>
       </nz-row>
-    </nz-card>
+    </nz-card >
-      <app-datatable-customindex-map style="max-height: 680px" #map [chartData]="chartData"></app-datatable-customindex-map>
+   <div style="min-height: 550px;">
-    <nz-card>
+    <app-datatable-customindex-map style="max-height: 680px" #map [chartData]="chartData"></app-datatable-customindex-map>
+   </div>
+    <nz-card >
       <nz-row [nzGutter]="24">
-        <g2-bar #bar height="310" [delay]='500' repaint='true' [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
+        <g2-bar #bar height="350" [delay]='200' repaint='true' [title]="'本月发货量排名'" [data]="salesData2"  (ready)='genData()'></g2-bar>
       </nz-row>
     </nz-card>
   </div>
@@ -152,12 +153,11 @@
         </nz-col>
       </nz-row>
     </nz-card>
-    <nz-card nzTitle="实时运单风控">
+    <nz-card nzTitle="实时运单风控" style="height: 400px;">
       <st
         #st
         multiSort
-        bordered
+       [scroll]="{y: '400px'}"
-       [scroll]="{y: '290px'}"
         [columns]="orderColumns"
         [data]="service.$api_getRealTimeWaybillRiskControl"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"

src/app/routes/datatable/components/datascreen/datascreen.component.less

@@ -5,7 +5,11 @@
             font-weight: bold;
         }
         .nz-statistic-number,.ant-statistic-content-value {
-            font-size: 20px;
+            font-size: 14px;
+        }
+        .ant-table-thead > tr > th, .ant-table-tbody > tr > td, .ant-table tfoot > tr > th, .ant-table tfoot > tr > td {
+            padding: 0;
+            font-size: 12px;
         }
     }
 }

src/app/routes/datatable/components/datascreen/datascreen.component.ts

@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-13 10:25:50
+ * @LastEditTime : 2022-04-14 14:05:01
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -127,20 +127,20 @@ export class DatatableDatascreenComponent implements OnInit {
    */
   initST() {
     this.columns = [
-      { title: '序号', render: 'index', className: 'text-center', width: '70px', },
+      { title: '序号', render: 'index', className: 'text-center', },
-      { title: '发货地', index: 'loadAddress', className: 'text-center', width: '90px' },
+      { title: '发货地', index: 'loadAddress', className: 'text-center', },
-      { title: '卸货地', index: 'dischargeAddress', className: 'text-center', width: '90px' },
+      { title: '卸货地', index: 'dischargeAddress', className: 'text-center',},
-      { title: '货物', index: 'goodsName', className: 'text-center', width: '90px' },
+      { title: '货物', index: 'goodsName', className: 'text-center',  },
-      { title: '数量', render: 'weight', className: 'text-center', width: '120px' }
+      { title: '数量', render: 'weight', className: 'text-center',}
     ];
   }
   initOrderST() {
     this.orderColumns = [
-      { title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' },
+      { title: '运单号', index: 'wayCode', className: 'text-center',  },
-      { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' },
+      { title: '司机/车辆', index: 'carNo', className: 'text-center',  },
-      { title: '货主', index: 'shipperName', className: 'text-center', width: '200px' },
+      { title: '货主', index: 'shipperName', className: 'text-center',  },
-      { title: '时间', index: 'createTime', className: 'text-center', width: '200px' },
+      { title: '时间', index: 'createTime', className: 'text-center',  },
-      { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' }
+      { title: '异常预警', index: 'warningTypeLabel', className: 'text-center',}
     ];
   }
 

src/app/routes/datatable/components/datascreen/map/map.component.ts

@@ -95,8 +95,8 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte
      if(res) {
       res.forEach((element: any) => {
         value.push({
-          name: element.province,
+          '省份': element.province,
-          value: element.weight,
+          '订单数': element.weight,
        });
        });
        console.log(value);
@@ -107,17 +107,19 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) {
   }
     this.userDv = this.ds.createView().source(this.userData).transform({
         geoDataView: this.worldMap,
-        field: 'name',
+        field: '省份',
         type: 'geo.region',
         as: ['longitude', 'latitude']
       }).transform({
         type: 'map',
-        callback: (obj: { trend: string; value: number }) => {
+        callback: (obj: { trend: string; 订单数: number }) => {
-          if(obj.value < 500) {
+          console.log(obj);
+          
+          if(obj.订单数 < 500) {
             obj.trend = '500以下';
-          } else if(obj.value >= 500 && obj.value < 1000){
+          } else if(obj.订单数 >= 500 && obj.订单数 < 1000){
             obj.trend = '500-1000';
-          } else if(obj.value >= 1000 ){
+          } else if(obj.订单数 >= 1000 ){
             obj.trend = '>1000';
           }
           return obj;
@@ -127,13 +129,13 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) {
     this.userView.data(this.userDv.rows);
     this.userView.scale({
       trend: {
-        alias: '蓝色地区数量'
+        alias: '订单交易数量'
       }
     });
     console.log(this.userView);
     console.log('45545');
     
-    this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('name*trend*value').style({fillOpacity: 0.85 })
+    this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('省份*订单数').style({fillOpacity: 0.85 })
       .animate({
         leave: {
           animation: 'fade-out'

src/app/routes/insurance-management/services/insurance-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-11 15:13:24
+ * @LastEditTime : 2022-04-14 11:43:13
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -55,34 +55,17 @@ export class InsuranceManagementService extends ShipperBaseService {
     // }
     // a.remove();
   }
-  // getReceiptUrl(url: string, params: any) {
+  getReceiptUrl(url: string, params: any) {
-  //   const { bankType, snglFlgCd } = params;
+    const { bankType, snglFlgCd } = params;
-  //   if (url) {
+    if (url) {
-  //     if (params?.bankType === '1') {
+      if (params?.bankType === '1') {
-  //       window.open(params?.receiptUrl);
+        window.open(params?.receiptUrl);
-  //     } else if (params?.bankType === '2') {
+      } else if (params?.bankType === '2') {
-  //       window.open(url);
+        window.open(url);
-  //       // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte);
+        // this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte);
-  //     }
+      }
-  //   } else {
+    }
-  //     this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => {
+  }
-  //       if (res?.receiptUrl) {
-  //         if (bankType === '1') {
-  //           window.open(res?.receiptUrl);
-  //         } else if (bankType === '2') {
-  //           window.open(res?.receiptUrl);
-  //           // this.downloadFile(this.$api_download_receipt_apply_byte, {
-  //           //   bankType,
-  //           //   receiptUrl: res.receiptUrl,
-  //           //   bankSerialNumber: snglFlgCd
-  //           // });
-  //         }
-  //       } else {
-  //         this.msgSrv.warning(res.statusMsg || '获取回单失败');
-  //       }
-  //     });
-  //   }
-  // }
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/order-management/components/risk/risk.component.ts

@@ -201,7 +201,7 @@ export class OrderManagementRiskComponent implements OnInit {
             }
           } as SFSelectWidgetSchema
         },
-        shipperId: {
+        shipperAppUserName: {
           type: 'string',
           title: '托运人',
           ui: {
@@ -218,7 +218,7 @@ export class OrderManagementRiskComponent implements OnInit {
               if (str) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: str })
-                  .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                  .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.enterpriseName } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);