Browse Source

[完善]档案类证照统计列表点击详情;完善收起展开表格的高度

beijing
邵佳豪 3 years ago
parent
commit
5eb87eb1b1
  1. 6
      src/app/pages/criminal-records-admin/criminal-records-admin.component.scss
  2. 4
      src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
  3. 2
      src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss
  4. 4
      src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
  5. 2
      src/app/pages/plan-admin/file-license-list/file-license-list.component.html
  6. 39
      src/app/pages/plan-admin/file-license-list/file-license-list.component.ts
  7. 2
      src/app/pages/warning-statistics-list/warning-statistics-list.component.scss
  8. 6
      src/app/pages/warning-statistics-list/warning-statistics-list.component.ts

6
src/app/pages/criminal-records-admin/criminal-records-admin.component.scss

@ -74,7 +74,6 @@
display: flex;
flex-direction: column;
overflow: hidden;
.title {
width: 100%;
height: 64px;
@ -140,10 +139,11 @@
}
.chartsbox {
height: 350px;
width: 100%;
display: flex;
justify-content: center;
.chartname {
position: absolute;
left: 20px;
@ -255,7 +255,7 @@
flex: 1;
box-sizing: border-box;
padding: 0 36px;
overflow: hidden;
img {
width: 36px;
}

4
src/app/pages/criminal-records-admin/criminal-records-admin.component.ts

@ -284,6 +284,10 @@ export class CriminalRecordsAdminComponent implements OnInit {
isEcharts: boolean = true
isEchartsShow() {
this.isEcharts = !this.isEcharts
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
}, 0);
}
startdate
enddate

2
src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss

@ -249,7 +249,7 @@
flex: 1;
box-sizing: border-box;
padding: 0 36px;
overflow: hidden;
img {
width: 36px;
}

4
src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts

@ -63,6 +63,10 @@ export class OilUnloadingProcessListComponent implements OnInit {
isEcharts: boolean = true
isEchartsShow() {
this.isEcharts = !this.isEcharts
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
}, 0);
}
startdate
enddate

2
src/app/pages/plan-admin/file-license-list/file-license-list.component.html

@ -67,7 +67,7 @@
*ngFor="let i of item;let k = index" [nzLeft]=" k <=2 ? (k*120 +60)+'px' : false">
<ng-container *ngIf="i.value; else elseTemplate">
<ng-container *ngIf="i.value.validityType; else elseTemplate">
<span>
<span (click)="lookDetails(i.value)" style="cursor: pointer;">
{{i.value.validityType}}
</span>
</ng-container>

39
src/app/pages/plan-admin/file-license-list/file-license-list.component.ts

@ -12,6 +12,7 @@ import 'linqjs';
import { DetailsUpdateCategoryComponent } from '../../license/update-category/details-update-category/details-update-category.component';
import { NzModalService } from 'ng-zorro-antd/modal';
import { NzMessageService } from 'ng-zorro-antd/message';
import { DetailsFileCategoryComponent } from '../../license/file-category/details-file-category/details-file-category.component';
@Component({
selector: 'app-file-license-list',
@ -50,6 +51,7 @@ export class FileLicenseListComponent implements OnInit {
ngOnDestroy(): void {
this.resizeListener.unsubscribe()
}
//获取所有组织机构
nodes: any = []
async getAllOrganization() {
@ -79,8 +81,6 @@ export class FileLicenseListComponent implements OnInit {
}
ngAfterViewInit(): void {
fromEvent(this.element.nativeElement.querySelector(`.ant-table-body`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe(async (event: any) => { //监听 DOM 滚动事件
if (event.target.scrollHeight - (event.target.scrollTop + event.target.clientHeight) <= 10) {
@ -102,6 +102,7 @@ export class FileLicenseListComponent implements OnInit {
this.SkipCount = '0'
this.getStationLicenses()
}
resetForm(e: MouseEvent): void {
e.preventDefault();
this.validateForm.reset();
@ -192,6 +193,40 @@ export class FileLicenseListComponent implements OnInit {
this.getStationLicenses()
}
lookDetails(i) {
console.log(i)
let params = {
Id: i.licenseId
}
this.http.get('/api/services/app/StationFileLicense/Get', { params: params }).subscribe((data: any) => {
console.log('证照信息', data)
const modal = this.modal.create({
nzContent: DetailsFileCategoryComponent,
nzViewContainerRef: this.viewContainerRef,
nzWidth: 450,
nzBodyStyle: {
'border': '1px solid #91CCFF',
'border-radius': '0px',
'padding': '7px',
'box-shadow': '0 0 8px 0 #fff',
'background-image': 'linear-gradient(#003665, #000f25)'
},
nzComponentParams: {
data: data.result
},
nzFooter: null,
nzClosable: false,
nzOnOk: async () => {
}
});
const instance = modal.getContentComponent();
modal.afterClose.subscribe(result => { });
})
}
exportExcel() {
// console.log(this.validateForm)

2
src/app/pages/warning-statistics-list/warning-statistics-list.component.scss

@ -251,7 +251,7 @@
flex: 1;
box-sizing: border-box;
padding: 0 36px;
overflow: hidden;
img {
width: 36px;
}

6
src/app/pages/warning-statistics-list/warning-statistics-list.component.ts

@ -28,6 +28,10 @@ export class WarningStatisticsListComponent implements OnInit {
isEcharts: boolean = true
isEchartsShow() {
this.isEcharts = !this.isEcharts
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
}, 0);
}
startdate
enddate
@ -620,7 +624,7 @@ export class WarningStatisticsListComponent implements OnInit {
ViolationIds.push(element.id)
});
}
console.log('xxx',this.validateForm.value.licenseType)
console.log('xxx', this.validateForm.value.licenseType)
let params = {
ViolationIds: ViolationIds,
organizationUnitId: organizationUnitId,

Loading…
Cancel
Save