解决冲突

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-07 18:28:03
+ * @LastEditTime : 2022-04-07 19:24:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -67,7 +67,6 @@ export class DatatableDatascreenComponent implements OnInit {
     this.initST();
     this.initOrderST();
     this.initData();
-    this.genData2();
     // this.initLineData();
   }
   setTime() {
@@ -123,38 +122,6 @@ export class DatatableDatascreenComponent implements OnInit {
   initPillarData(){
         this.curve.reRender()
   }
-  public genData2(): G2TimelineData[] {
-    let value1: any[] = [];
-    this.monthData2 =[];
-     this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => {
-      if (res) {       
-        // var data1 = new Date('2022.1.1')
-        // var time1 = data1.getTime(); 
-        // console.log(time1);
-           
-        var data2 = new Date('2022.2.1')
-        var time2 = data2.getTime(); 
-        console.log(time2);
-
-        var data3 = new Date('2022.3.1')
-        res.forEach((element: any,i:any) => {
-          console.log(element);
-          console.log(new Date().getTime() + 1000 * 60 * 60 * 24 * 2);
-          console.log(time2);
-          value1.push({
-            time:'Feb',
-            y1: element?.y1,
-            y2: element?.y2
-          });
-        });
-        this.monthData2 = res;
-        console.log(this.monthData2);
-
-      }
-    });
-   console.log(this.monthData2);
-     return value1;
-  }
   /**
    * 初始化数据列表
    */
@@ -170,9 +137,10 @@ export class DatatableDatascreenComponent implements OnInit {
   initOrderST() {
     this.orderColumns = [
       { title: '运单号', index: 'wayCode', className: 'text-center', width: '120px' },
+      { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' },
       { title: '货主', index: 'shipperName', className: 'text-center', width: '70px' },
       { title: '时间', index: 'createTime', className: 'text-center', width: '200px' },
-      { title: '风险等级', index: 'warningType', className: 'text-center', width: '90px' }
+      { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '90px' }
     ];
   }