From 75fc4c9919033dd03819d87cd33f14d83ab2f88b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 13 Apr 2022 17:55:10 +0800
Subject: [PATCH] fix bug

---
 .../components/bulk-detail/bulk-detail.component.html  | 10 ----------
 .../vehicle-detail/vehicle-detail.component.html       |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 789d7ca7..eceae53e 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -221,13 +221,8 @@
     </ng-template>
   </div>
 </nz-card>
-<<<<<<< HEAD
-<nz-card>
-  <nz-tabset >
-=======
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
   <nz-tabset>
->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
     <nz-tab nzTitle="风险异常检测">
      <div  *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
       <div>
@@ -241,14 +236,9 @@
      </div>
     </nz-tab>
     <nz-tab nzTitle="异常预警">
-<<<<<<< HEAD
-      <st  #st [data]="warringList" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
-      </st>
-=======
       <st #st [data]="service.$api_get_order_abnormalWarning" [columns]="logColumns3"
         [res]="{ reName: { list: 'data' } }" [req]="{params:{id:route.snapshot.params.id}}"
         [page]="{ show: false, showSize: false }"> </st>
->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
     </nz-tab>
     <nz-tab nzTitle="操作日志">
       <st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index df43a137..658fb561 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-13 17:54:13
+ * @LastEditTime : 2022-04-13 17:54:51
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->