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

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

@@ -250,9 +250,10 @@
 
   <sv-container col="3" class="mt16">
     <sv-title>关联企业</sv-title>
-    <!-- <st #st [bordered]="true" [columns]="columns" [data]="detailData.goodsList" [ngStyle]="{ margin: '1rem 0' }"
+    <st #st [columns]="columns" [data]="service.$api_get_driver_projects" size="small"
-        multiSort size="small" [page]="{ show: false }">
+      [req]="{ method: 'POST', allInBody: true, params: {appUserId:route.snapshot.params.id} }" [page]="{ show: false }"
-      </st> -->
+      style="width: 100%;">
+    </st>
   </sv-container>
 </nz-card>
 
@@ -296,7 +297,7 @@
     </ng-container>
     <div *ngIf="data[key]" (mouseover)="data[hover]=true" (mouseleave)="data[hover]=false"
       (click)="$event.cancelBubble=true" class="image-hover">
-      <img [src]="data[key]" style="width: 200px;height: 160px;" (click)="showImg(data[key])"/>
+      <img [src]="data[key]" style="width: 200px;height: 160px;" (click)="showImg(data[key])" />
       <div class="mask" *ngIf="data[hover] && status"></div>
       <div class="mask-over" *ngIf="data[hover] && status">
         <i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data,key,key2)"></i>

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

@@ -25,6 +25,11 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   tempalateDriverData = { ...this.driverDetail };
   licenseDetail: any = {};
   tempalateLicenseDetail = { ...this.licenseDetail };
+  columns: STColumn[] = [
+    { title: '企业名称', className: 'text-center', index: 'enterpriseName' },
+    { title: '项目名称', className: 'text-center', index: 'projectName' },
+    { title: '角色', className: 'text-center', index: 'roleName' }
+  ];
   carList: any = [];
 
   @ViewChild('redectModal', { static: false })
@@ -41,7 +46,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   constructor(
     private nzModalService: NzModalService,
     public service: UsermanageService,
-    private route: ActivatedRoute,
+    public route: ActivatedRoute,
     private datePipe: DatePipe
   ) {}
 
@@ -50,21 +55,13 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   }
   initData() {
     // 获取司机头部信息
-    this.service
+    this.service.request(this.service.$api_get_user_detail, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
-      .request(this.service.$api_get_user_detail, {
-        appUserId: this.route.snapshot.params.id
-      })
-      .subscribe(res => {
       if (res) {
         this.userDetail = res;
       }
     });
     // 获取用户个人信息
-    this.service
+    this.service.request(this.service.$api_get_user_identity, { id: this.route.snapshot.params.id }).subscribe(res => {
-      .request(this.service.$api_get_user_identity, {
-        id: this.route.snapshot.params.id
-      })
-      .subscribe(res => {
       if (res) {
         this.userIdentityDetail = res;
         this.tempalateUserIdentityDetail = { ...this.userIdentityDetail };

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

@@ -67,6 +67,8 @@ export class UsermanageService extends BaseService {
   $api_get_driver_practice_seniority = '/api/mdc/cuc/driver/getDriversPracticeSeniority';
   // 司机详情查看-载具信息
   $api_get_driver_car_license = '/api/mdc/cuc/driver/getUserCarLicense';
+  // 司机详情查看-获取用户关联的企业项目角色信息
+  $api_get_driver_projects = '/api/mdc/cuc/user/getEnterpriceProjectInfo';
 
   // 修改实名认证-运营管理后台
   $api_update_driver_identity = '/api/mdc/cuc/identityInfo/operatorAlterIdentity';