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

src/app/routes/vehicle/components/audit/detail/detail.component.html

@@ -1,5 +1,5 @@
 <!-- 页头 -->
-<page-header-wrapper [logo]="logo" title="车辆详情" [content]="content">
+<page-header-wrapper [logo]="logo" title="车辆详情" [content]="content" [ngClass]="{'affix': scrollTop>210}">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
       <i nz-icon nzType="left" nzTheme="outline"></i>

src/app/routes/vehicle/components/audit/detail/detail.component.less

@@ -106,9 +106,37 @@
     letter-spacing: 0.7px;
   }
 }
+
 input {
   width: 200px;
 }
+
 .sv__container {
   padding-top: 10px;
+}
+
+::ng-deep {
+  .affix {
+    position: fixed;
+    top     : 20px !important;
+    right   : 25px;
+    left    : 25px;
+    z-index : 999 !important;
+  }
+
+  .alain-pro__menu-side .alain-pro__main {
+    .affix {
+      position: fixed;
+      top     : 20px !important;
+      right   : 25px;
+      left    : 250px;
+      z-index : 999 !important;
+    }
+  }
+
+  .aside-collapsed.alain-pro__menu-side .alain-pro__main {
+    .affix {
+      left: 106px;
+    }
+  }
 }

src/app/routes/vehicle/components/audit/detail/detail.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import { STColumn, STComponent } from '@delon/abc/st';
@@ -15,13 +15,14 @@ import { EADateUtil } from '@shared';
 import { VehicleImgViewComponent } from '../../list/img-view/img-view.component';
 import { VehicleComponentsListEditComponent } from '../../list/edit/edit.component';
 import { NzImageService } from 'ng-zorro-antd/image';
+import { fromEvent, Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-Vehicle-components-Audit-detail',
   templateUrl: './detail.component.html',
   styleUrls: ['./detail.component.less']
 })
-export class VehicleComponentsAuditDetailComponent implements OnInit {
+export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy  {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('redectModal', { static: false }) redectModal!: any;
   columns!: STColumn[];
@@ -34,6 +35,10 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
   approvalOpinion = '';
   uploadURl = apiConf.waterFileUpload;
   disabledUpload = false;
+
+  
+  scrollTop = 0;
+  subscribeScoll!: Subscription;
   constructor(
     public service: VehicleService,
     private route: ActivatedRoute,
@@ -41,11 +46,17 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
     private modal: ModalHelper,
     private nzImageService: NzImageService
   ) {}
+  ngOnDestroy(): void {
+    this.subscribeScoll.unsubscribe();
+  }
 
   ngOnInit() {
     this.getSelectList();
     this.getDetailList();
     this.initST();
+    this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
+      this.scrollTop = document.documentElement.scrollTop;
+    });
   }
 
   initST() {