解决冲突

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-07 18:30:12
+ * @LastEditTime : 2022-04-07 19:51:32
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -165,6 +165,9 @@
         [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }"
         [loading]="service.http.loading"
       >
+      <ng-template st-row="carNo" let-item let-index="index">
+        {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }}
+      </ng-template>
       </st>
     </nz-card>
   </div>

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 19:24:15
+ * @LastEditTime : 2022-04-07 19:48:19
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -136,11 +136,11 @@ export class DatatableDatascreenComponent implements OnInit {
   }
   initOrderST() {
     this.orderColumns = [
-      { title: '运单号', index: 'wayCode', className: 'text-center', width: '120px' },
+      { title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' },
       { 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: 'warningTypeLabel', className: 'text-center', width: '90px' }
+      { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' }
     ];
   }
 

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

@@ -4,8 +4,8 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 17:57:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 15:48:36
+ * @LastEditTime : 2022-04-07 19:44:32
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\map.component.html
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<g2-custom delay="200" (render)="render($event)"></g2-custom>
+<g2-custom delay="200" (render)="render($event)" ></g2-custom>

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

@@ -116,27 +116,32 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges {
       }).transform({
         type: 'map',
         callback: (obj: { trend: string; value: number }) => {
-          
+          if(obj.value < 500) {
-          obj.trend = obj.value > 100 ? '蓝色地区' : '灰色地区';
+            obj.trend = '500以下';
+          } else if(obj.value >= 500 && obj.value < 1200){
+            obj.trend = '500-1000';
+          } else if(obj.value >= 1200 ){
+            obj.trend = '>1000';
+          }
           return obj;
         }
       });
     this.userView = this.chart.createView();
     this.userView.data(this.userDv.rows);
-    // this.userView.scale({
+    this.userView.scale({
-    //   trend: {
+      trend: {
-    //     alias: '蓝色地区数量'
+        alias: '蓝色地区数量'
-    //   }
+      }
-    // });
+    });
     console.log(this.userView);
     console.log('45545');
     
-    this.userView.polygon().position('longitude*latitude').color('trend', ['#c7daf3', '#1779f3']).tooltip('').style({fillOpacity: 0.85 })
+    this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('name*trend*value').style({fillOpacity: 0.85 })
-      // .animate({
+      .animate({
-      //   leave: {
+        leave: {
-      //     animation: 'fade-out'
+          animation: 'fade-out'
-      //   }
+        }
-      // });
+      });
       this.userView.interaction('element-active');
       this.chart.render();