Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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 });
   }

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,

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 = `
+        <div style="padding: 15px; color: red">
+            业绩量:&nbsp;&nbsp;{value}
+        </div>
+`
     this.chart.tooltip({
+      showTitle: true,
       showMarkers: false,
-    });
-
+      itemTpl: itemTpl
+  });
     this.chart.interval().position('time*number');
     this.chart.render();
   }

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: {

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: {