Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-13 19:16:59
+ * @LastEditTime: 2022-01-13 20:33:22
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -83,7 +83,7 @@
       {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
     </sv>
     <sv label="车型车长载重">
-      {{i?.carModelLabel}},{{i?.carLengthLabel}}米,{{i?.carLoad ? i?.carLoad +'吨': ''}}
+      {{i?.goodsInfoList?.[0]?.carModel}},{{i?.carLength}}米,{{i?.carLoad ? i?.carLoad +'吨': ''}} 
     </sv>
   </sv-container>
   <div class="mt-md" >

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -49,6 +49,25 @@
         <label *ngIf="userIdentityDetail?.certificationStatus===2" style="color: #ff4d4f;" class="ml-md"><i nz-icon
             nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回
         </label>
+        <label  *ngIf="faceStatus == 1" style="color: #bec8c8; position: relative;
+        bottom: 2px;" class="ml-md"><i nz-icon
+          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已发起</i>
+        </label>
+        <label *ngIf="faceStatus == 0" style="color: #bec8c8;  position: relative;
+        bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：无</i>
+        </label>
+        <label *ngIf="faceStatus == 2"  style="color: #bec8c8;   position: relative;
+        bottom: 2px;" class="ml-md"><i nz-icon
+          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：进行中</i>
+        </label>
+        <label  *ngIf="faceStatus == 3" style="color: #52c41a;     position: relative;
+        bottom: 2px;" class="ml-md"><i nz-icon
+          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已成功</i>
+        </label>
+        <label  *ngIf="faceStatus == 4" style="color: #ff4d4f;     position: relative;
+        bottom: 2px;" class="ml-md"><i nz-icon
+          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已失败;失败原因：{{facetext}}</i>
+        </label>
         <div style="float: right;">
           <ng-container *ngIf="isEditUser; else elseTemplate">
             <button [disabled]="service.http.loading" nz-button (click)="reset(0)">

src/app/routes/usercenter/components/driver/detail/detail.component.ts

@@ -20,6 +20,8 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   detailData: any;
   userDetail: any;
   contencarModel: any;
+  facetext: any;
+  faceStatus: any = 0;
   userIdentityDetail: any = {};
   tempalateUserIdentityDetail = { ...this.userIdentityDetail };
   driverDetail: any = {
@@ -82,6 +84,16 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
         this.contencarModel = res;
       }
     });
+    // 获取人脸识别结果
+    this.service.request(this.service.$api_getFaceFlowQuery, { id: this.route.snapshot.params.id }).subscribe(res => {
+    console.log(res)
+    if(res) {
+      this.faceStatus = res.status
+      if(res.status == 4) {
+        this.facetext= res.failReason
+        }
+    }
+    });
     // 获取用户个人信息
     this.service.request(this.service.$api_get_user_identity, { id: this.route.snapshot.params.id }).subscribe(res => {
       if (res) {

src/app/routes/usercenter/services/usercenter.service.ts

@@ -107,6 +107,8 @@ export class UsermanageService extends ShipperBaseService {
   $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard';
   // 获取字典
   $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue';
+  // 获取个人刷脸结果
+  $api_getFaceFlowQuery = '/api/mdc/pbc/factorsVerify/getFaceFlowQuery';
 
   constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) {
     super(injector,eaCacheSrv);