From cf5c675983c2490de0f15d6b8c8956b4d370ff70 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 5 May 2022 16:01:48 +0800
Subject: [PATCH] fix bug

---
 proxy.conf.js                                 |  4 +-
 .../audit/detail/detail.component.html        | 11 +++--
 .../list/detail/detail.component.html         | 48 ++++++++++++++++---
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index e26e2071..91fa74fc 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-05 13:51:19
+ * @LastEditTime : 2022-05-05 15:22:17
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
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 b7e927f4..d1d93b68 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,8 @@
   </ng-template>
   <ng-template #content>
     <sv-container col="3" class="new-sv-container">
-      <h2>车牌号：{{ detailData?.carNo }}</h2>
+      <h2>车牌号66：{{ detailData?.carNo }}
+      </h2>
       <sv-title style="font-weight: 700">
         <!-- <span *ngIf="detailData?.approvalStatus === 1 || detailData?.approvalStatus === '1'">未上传</span>
         <span *ngIf="detailData?.approvalStatus === 0 || detailData?.approvalStatus === '0'">草稿</span>
@@ -44,9 +45,13 @@
 <nz-card [class]="isEdit ? 'edit-box' : 'readOnly-box'" [ngClass]="'mb0'" [nzBorderless]="true">
   <div>
     <div class="mb-xs common-order-header" nz-row>
-      <div>
+      <div style="display: flex;">
         <button nz-button nzType="primary" nzSize="small" nzDanger>{{ carStatus[detailData?.approvalStatus] }}</button>
-        <b class="ml-md" style="font-size: 18px">车牌号: {{ detailData?.carNo }}</b>
+        <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>
       </div>
       <div>
         <ng-container *ngIf="!isEdit">
diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html
index 513c7e00..05b2c479 100644
--- a/src/app/routes/vehicle/components/list/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.html
@@ -23,8 +23,9 @@
 
       <sv-container col="3">
         <sv-title style="font-weight: 700">车辆基础信息</sv-title>
-        <sv label="车牌号">
-          <input
+        <sv label="车牌号" col="1">
+          <div style="display: flex;">
+            <input
             nz-input
             type="text"
             [(ngModel)]="detailData.carNo"
@@ -32,6 +33,12 @@
             [nzBorderless]="!isEdit"
             [placeholder]="isEdit ? '' : '-'"
           />
+          <div style="display: flex;">
+            <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>
+          </div>
+      
         </sv>
         <sv label="车牌颜色">
           <!-- <input nz-input type="text" [(ngModel)]="detailData.carNoColor" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@@ -46,7 +53,7 @@
             <nz-option *ngFor="let i of contenCarNoColor" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
           </nz-select>
         </sv>
-        <sv label="车型">
+        <sv label="车辆类型">
           <!-- <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
             [placeholder]="isEdit?'':'-'"> -->
           <nz-select
@@ -160,6 +167,16 @@
     </sv-container>
 
     <sv-container col="3">
+      <sv label="发动机号码">
+        <input
+        nz-input
+        type="text"
+        [(ngModel)]="detailData.engineNo"
+        [readonly]="!isEdit"
+        [nzBorderless]="!isEdit"
+        [placeholder]="isEdit ? '' : '-'"
+      />
+      </sv>
       <sv label="行驶证到期日">
         <nz-date-picker
           [(ngModel)]="detailData.driverLicenseEndTime"
@@ -241,6 +258,16 @@
           [placeholder]="isEdit ? '' : '-'"
         />
       </sv>
+      <sv label="报废日期">
+        <nz-date-picker
+        [(ngModel)]="detailData.scrapTime"
+        [nzDisabled]="!isEdit"
+        [nzPlaceHolder]="isEdit ? '' : '-'"
+        [nzBorderless]="!isEdit"
+        [nzSuffixIcon]="isEdit ? 'calendar' : ''"
+      >
+      </nz-date-picker>
+      </sv>
       <sv label="总质量">
         <input
           nz-input
@@ -262,7 +289,6 @@
           [placeholder]="isEdit ? '' : '-'"
         />
       </sv>
-     
     </sv-container>
     <sv-container col="1">
       <sv label="行驶证照片">
@@ -284,7 +310,17 @@
     </sv-container>
     <nz-divider></nz-divider>
     <sv-container col="3" class="mt16">
-      <sv-title style="font-weight: 700">道路运输证信息</sv-title>
+      <sv-title style="font-weight: 700">
+        <p style="margin-bottom: 0">
+          道路运输证信息
+          <label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
+              nzTheme="fill" class="mr-xs"></i>验证不通过
+          </label>
+          <label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon nzType="check-circle"
+              nzTheme="fill" class="mr-xs"></i>验证通过
+          </label>
+        </p>
+      </sv-title>
       <sv label="道路运输证号">
         <input
           nz-input
@@ -348,7 +384,7 @@
       #st
       [bordered]="true"
       [columns]="columns"
-      [scroll]="{x: '1200px'}"
+      [scroll]="{ x: '1200px' }"
       [data]="service.$api_get_queryDriverByCarId"
       [req]="{ method: 'POST', allInBody: true, params: reqParams }"
       [res]="{ reName: { list: 'data', total: 'data' } }"