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

This commit is contained in:
Taric Xin
2022-03-25 16:01:27 +08:00
9 changed files with 217 additions and 134 deletions

View File

@ -1,6 +1,16 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-23 14:24:05
* @LastEditors : Shiming
* @LastEditTime : 2022-03-25 15:47:50
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div class="imgBox">
<ng-container *ngFor="let item of imgList; let i = index">
<ng-container *ngIf="item; else elseTemplate">
<ng-container *ngIf="item;">
<img nz-image [nzSrc]="item" />
</ng-container>
<ng-template #elseTemplate>

View File

@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-12-09 17:36:13
* @LastEditTime: 2021-12-10 14:12:24
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-03-25 15:43:12
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\shared\components\imagelist\imagelist.component.ts
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.ts
*/
import { Component, Input, OnInit } from '@angular/core';
import { ModalHelper, _HttpClient } from '@delon/theme';
@ -26,13 +26,20 @@ export class ImageListComponent implements OnInit {
private nzImageService: NzImageService
) {}
ngOnInit(): void {}
ngOnInit(): void {
}
showImg(index: any) {
const params = {
imgList: this.imgList,
index
};
const images = this.imgList.map((url: string) => ({ src: url }));
const images = this.imgList.map((url: string) => {
if(url) {
console.log(url);
({ src: url })
}
});
this.nzImageService.preview(images);
// this.modal.create(ImageViewComponent, { params }).subscribe(res => {});
}