Merge branch 'develop'

This commit is contained in:
wangshiming
2022-04-22 15:16:26 +08:00
2 changed files with 14 additions and 5 deletions

View File

@ -18,7 +18,8 @@
<div class="modal-title">查看协议</div> <div class="modal-title">查看协议</div>
</div> </div>
<div class="text-center"> <div class="text-center">
<div class="text-center"><img [src]="i?.carProtocal" /></div> <!-- <div class="text-center"><img [src]="i?.carProtocal" /></div> -->
<div class="text-center"> <img (click)="showImg(i?.carProtocal)" [src]="i?.carProtocal" style="width: 200px;height: 160px;" /></div>
</div> </div>
<div *nzModalFooter> <div *nzModalFooter>
<button *ngIf="i?.auditStatusEnum == 20 || i?.auditStatusEnum == 30" nz-button nzType="default" (click)="cancel()">取消</button> <button *ngIf="i?.auditStatusEnum == 20 || i?.auditStatusEnum == 30" nz-button nzType="default" (click)="cancel()">取消</button>

View File

@ -1,13 +1,14 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-12-07 17:30:18 * @Date: 2021-12-07 17:30:18
* @LastEditTime: 2022-01-18 16:36:27 * @LastEditTime : 2022-04-22 15:15:49
* @LastEditors: Please set LastEditors * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\list\\img-view\\img-view.component.ts
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { _HttpClient } from '@delon/theme'; import { _HttpClient } from '@delon/theme';
import { NzImageService } from 'ng-zorro-antd/image';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { VehicleService } from '../../../services/vehicle.service'; import { VehicleService } from '../../../services/vehicle.service';
@ -20,7 +21,7 @@ export class VehicleImgViewComponent implements OnInit {
record: any = {}; record: any = {};
i: any; i: any;
constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public http: _HttpClient, public service: VehicleService) {} constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public http: _HttpClient, public service: VehicleService, private nzImageService: NzImageService) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.i); console.log(this.i);
@ -42,6 +43,13 @@ export class VehicleImgViewComponent implements OnInit {
} }
}) })
} }
showImg(url: any) {
const params = {
imgList: [url],
index: 0
};
this.nzImageService.preview([{ src: url }]);
}
// 通过 // 通过
okCancel() { okCancel() {
const params ={ const params ={