From ea82b18ad3ef50f1bf08653bab59ad92b173ca2d Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 6 May 2022 10:04:24 +0800
Subject: [PATCH 1/2] fix bug

---
 .../bulk-detail-change/bulk-detail-change.component.html    | 2 +-
 .../bulk-detail-change/bulk-detail-change.component.ts      | 4 ++--
 .../components/bulk-detail/bulk-detail.component.html       | 4 ++--
 .../components/bulk-detail/bulk-detail.component.ts         | 4 ++--
 .../vehicle-detail-change.component.html                    | 2 +-
 .../vehicle-detail-change.component.ts                      | 4 ++--
 .../components/vehicle-detail/vehicle-detail.component.html | 2 +-
 .../components/vehicle-detail/vehicle-detail.component.ts   | 4 ++--
 .../modal/vehicle/view-track/view-track.component.html      | 2 +-
 .../modal/vehicle/view-track/view-track.component.ts        | 4 ++--
 .../components/bulk-detail/bulk-detail.component.html       | 2 +-
 .../components/bulk-detail/bulk-detail.component.ts         | 4 ++--
 .../components/vehicle-detail/vehicle-detail.component.html | 4 ++--
 .../components/vehicle-detail/vehicle-detail.component.ts   | 6 +++---
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index b5a9f198..3f826f85 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -288,7 +288,7 @@
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
       </amap-path-simplifier>
-      <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
+      <st [scroll]="{ y: '350px' }" #st [data]="addressItems"  [noResult]='"暂无停车信息"'  [columns]="logColumns2" [ps]="0"
         [page]="{ show: false, showSize: false }" size="small" class="map_st">
       </st>
       <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index f4a60d20..e0a0057f 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -76,8 +76,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
   schema: SFSchema = {};
   ui: SFUISchema = {};
   logColumns2: STColumn[] = [
-    { title: '时间', index: 'parkBte' },
-    { title: '地点', index: 'parkAdr' }
+    { title: '停车时间', index: 'parkBte' },
+    { title: '停车地点', index: 'parkAdr' }
   ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
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 427b94f6..de78de28 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-21 15:33:15
+ * @LastEditTime : 2022-05-06 10:02:52
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -287,7 +287,7 @@
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
       </amap-path-simplifier>
-      <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
+      <st [scroll]="{ y: '350px' }" [noResult]='"暂无停车信息"' #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
         [page]="{ show: false, showSize: false }" size="small" class="map_st">
       </st>
       <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
index a54ddc67..98957f4b 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@@ -40,8 +40,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   modalTitle: string = '';
   isVisible = false;
   logColumns2: STColumn[] = [
-    { title: '时间', index: 'parkBte' },
-    { title: '地点', index: 'parkAdr' }
+    { title: '停车时间', index: 'parkBte' },
+    { title: '停车地点', index: 'parkAdr' }
   ];
   logColumns3: STColumn[] = [
     { title: '时间', index: 'warningTime' },
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index 4cd328fd..873829d3 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -322,7 +322,7 @@
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
       </amap-path-simplifier>
-      <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
+      <st [scroll]="{ y: '350px' }" #st [data]="addressItems"  [noResult]='"暂无停车信息"'  [columns]="logColumns2" [ps]="0"
         [page]="{ show: false, showSize: false }" size="small" class="map_st">
       </st>
       <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index 7e1f5a25..ee919886 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -90,8 +90,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   mapList: any[] = []; //地图点位数据组
   addressItems: any[] = []; //打点地址数据组
   logColumns2: STColumn[] = [
-    { title: '时间', index: 'parkBte' },
-    { title: '地点', index: 'parkAdr' }
+    { title: '停车时间', index: 'parkBte' },
+    { title: '停车地点', index: 'parkAdr' }
   ];
   constructor(
     private route: ActivatedRoute,
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 62179383..7a96dafd 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
@@ -290,7 +290,7 @@
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
       </amap-path-simplifier>
-      <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
+      <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2"  [noResult]='"暂无停车信息"'  [ps]="0"
         [page]="{ show: false, showSize: false }" size="small" class="map_st">
       </st>
       <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
index c0f99450..abc951a5 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -46,8 +46,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
   approvalLsit: any;
   isVisible = false;
   logColumns2: STColumn[] = [
-    { title: '时间', index: 'parkBte', width: 120, className: 'text-center' },
-    { title: '地点', index: 'parkAdr' }
+    { title: '停车时间', index: 'parkBte', width: 120, className: 'text-center' },
+    { title: '停车地点', index: 'parkAdr' }
   ];
   logColumns3: STColumn[] = [
     { title: '时间', index: 'warningTime' },
diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
index b37da5ec..b2e78101 100644
--- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
+++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html
@@ -12,7 +12,7 @@
   <div nz-col [nzSpan]="24">
     <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
     </amap-path-simplifier>
-    <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
+    <st [scroll]="{ y: '350px' }" #st [data]="addressItems"  [noResult]='"暂无停车信息"'  [columns]="logColumns2" [ps]="0"
       [page]="{ show: false, showSize: false }" size="small" class="map_st">
     </st>
     <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
index 30bd5b74..b053449b 100644
--- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts
@@ -28,8 +28,8 @@ export class OneCarOrderViewtrackComponent implements OnInit {
   mapList: any[] = []; //地图点位数据组
   addressItems: any[] = []; //打点地址数据组
   logColumns2: STColumn[] = [
-    { title: '时间', index: 'parkBte', width: 120, className: 'text-center' },
-    { title: '地点', index: 'parkAdr',width: 120,className: 'text-center'  }
+    { title: '停车时间', index: 'parkBte', width: 120, className: 'text-center' },
+    { title: '停车地点', index: 'parkAdr',width: 120,className: 'text-center'  }
   ];
   pois: any[] = [];
 
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index bff8ed33..c62d42f6 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -274,7 +274,7 @@
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
       </amap-path-simplifier>
-      <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
+      <st [scroll]="{ y: '350px' }" #st [data]="addressItems"  [noResult]='"暂无停车信息"'  [columns]="logColumns2" [ps]="0"
         [page]="{ show: false, showSize: false }" size="small" class="map_st">
       </st>
       <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
index 9adba23c..9b8121a9 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
@@ -38,8 +38,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
   modalTitle: string = '';
   unLoadingPlaceVOList: any = [];
   logColumns2: STColumn[] = [
-    { title: '时间', index: 'parkBte' },
-    { title: '地点', index: 'parkAdr' }
+    { title: '停车时间', index: 'parkBte' },
+    { title: '停车地点', index: 'parkAdr' }
   ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'costCodeLabel' },
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index eaaba227..8174c36f 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-04-06 15:37:30
+ * @LastEditTime : 2022-05-06 10:04:19
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@@ -272,7 +272,7 @@
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">
       </amap-path-simplifier>
-      <st [scroll]="{ y: '350px' }" #st [data]="addressItems" [columns]="logColumns2" [ps]="0"
+      <st [scroll]="{ y: '350px' }" #st [data]="addressItems"  [noResult]='"暂无停车信息"'  [columns]="logColumns2" [ps]="0"
         [page]="{ show: false, showSize: false }" size="small" class="map_st">
       </st>
       <nz-radio-group [(ngModel)]="trajectory" (ngModelChange)="trajectoryChange($event)" class="map_radio">
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
index 8cf59d1b..fb2e7200 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-04-01 11:11:14
+ * @LastEditTime : 2022-05-06 09:55:19
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
@@ -36,8 +36,8 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
   imges: any;
   unLoadingPlaceVOList: any = [];
   logColumns2: STColumn[] = [
-    { title: '时间', index: 'parkBte' },
-    { title: '地点', index: 'parkAdr' }
+    { title: '停车时间', index: 'parkBte' },
+    { title: '停车地点', index: 'parkAdr' }
   ];
   modalcontent: any;
   modalTitle: string = '';

From 77dc933e7c1204e3b45c2f74e273693e35590968 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 6 May 2022 10:08:29 +0800
Subject: [PATCH 2/2] fix bug

---
 .../vehicle/components/audit/detail/detail.component.html | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html
index d4af99da..40eb67d3 100644
--- a/src/app/routes/vehicle/components/audit/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html
@@ -7,7 +7,7 @@
   </ng-template>
   <ng-template #content>
     <sv-container col="3" class="new-sv-container">
-      <h2>车牌号66：{{ detailData?.carNo }}
+      <h2>车牌号：{{ detailData?.carNo }}
       </h2>
       <sv-title style="font-weight: 700">
         <!-- <span *ngIf="detailData?.approvalStatus === 1 || detailData?.approvalStatus === '1'">未上传</span>
@@ -47,11 +47,7 @@
     <div class="mb-xs common-order-header" nz-row>
       <div style="display: flex;">
         <button nz-button nzType="primary" nzSize="small" nzDanger>{{ carStatus[detailData?.approvalStatus] }}</button>
-        <div style="display: flex;align-items: center; ">
-          <b class="ml-md" style="font-size: 18px;padding-right: 10px;">车牌号: {{ detailData?.carNo }}</b>
-          <div  *ngIf="detailData.networkStatus"> <span style="height: 5px; width: 5px; border-radius: 50%; background-color: green;display: inline-block;"></span> 已入网</div>
-          <div *ngIf="!detailData.networkStatus"><span style="height: 5px; width: 5px; border-radius: 50%; background-color: red;display: inline-block;"></span>未入网</div>
-        </div>
+        <b class="ml-md" style="font-size: 18px;padding-right: 10px;">车牌号: {{ detailData?.carNo }}</b>
       </div>
       <div>
         <ng-container *ngIf="!isEdit">