解决冲突

2022-04-07 19:51:54 +08:00
parent df9fda1057
commit f0cfb3b874
4 changed files with 28 additions and 20 deletions
--- 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-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>