From dcd7d3bd37bb53063ee14e576e524d524120b159 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 11 May 2022 17:02:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=9B=B4=E6=96=B0=E8=AF=81?= =?UTF-8?q?=E7=85=A7=20=E7=BB=9F=E8=AE=A1=E8=A1=A8=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oil-station-list.component.html | 2 +- .../update-license-list.component.html | 60 +++++------- .../update-license-list.component.scss | 23 ++++- .../update-license-list.component.ts | 95 ++++++++++++++----- 4 files changed, 116 insertions(+), 64 deletions(-) diff --git a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html index b4e7bd7..ad0cf83 100644 --- a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html +++ b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html @@ -4,7 +4,7 @@ - + diff --git a/src/app/pages/plan-admin/update-license-list/update-license-list.component.html b/src/app/pages/plan-admin/update-license-list/update-license-list.component.html index 866bbb2..70b6bb8 100644 --- a/src/app/pages/plan-admin/update-license-list/update-license-list.component.html +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.html @@ -15,7 +15,7 @@ - + @@ -37,47 +37,33 @@ [nzScroll]="{ y:tableScrollHeight }" [nzNoResult]='null' nzTableLayout="fixed"> - -
- -
加油站名称 + 序号 + + {{item.name}} - 区域 - 所属公司 - 联系人 - 联系电话 - 油站等级 - 经营品类 - 油机数量 - 车道数量 - 油罐容积 - 操作 + - -
- -
- {{item.stationName}} - - {{item.locationName}} - {{item.companyName}} - {{item.leaderName}} - {{item.leaderContact}} - {{item.stationLevel}} - {{item.sellVariety}} - {{item.gasStationCount}} - {{item.laneCount}} - - {{item.tankVolume}} - {{item.tankVolume ? 'm³' : null}} - - - 查看 + {{key + 1}} + + + + + + {{i.value.endDate | date:"yyyy-MM-dd"}} + + + + {{i.value}} + + + + + / + + diff --git a/src/app/pages/plan-admin/update-license-list/update-license-list.component.scss b/src/app/pages/plan-admin/update-license-list/update-license-list.component.scss index 1a029fe..06cfc17 100644 --- a/src/app/pages/plan-admin/update-license-list/update-license-list.component.scss +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.scss @@ -8,22 +8,26 @@ display: flex; justify-content: space-between; align-items: center; - .legendbox{ + + .legendbox { display: flex; align-items: center; color: #FFFFFF; flex: 1; - .legendItem{ + + .legendItem { display: flex; align-items: center; margin-right: 12px; - div{ + + div { width: 8px; height: 8px; margin-right: 3px; } } } + form { flex: 1; height: 32px; @@ -60,3 +64,16 @@ align-items: center; overflow: hidden; } + + +.green { + color: #4BFFD4; +} + +.yellow { + color: #FFBD4B; +} + +.red { + color: #FF4B65; +} diff --git a/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts b/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts index d33506c..2f5a97e 100644 --- a/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; +import { Component, OnInit, ViewChild, ElementRef, ViewContainerRef } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { TreeService } from 'src/app/service/tree.service'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; @@ -8,6 +8,9 @@ import { Router } from '@angular/router'; import { NavChangeService } from 'src/app/service/navChange.service'; import { fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; +import 'linqjs'; +import { DetailsUpdateCategoryComponent } from '../../license/update-category/details-update-category/details-update-category.component'; +import { NzModalService } from 'ng-zorro-antd/modal'; @Component({ selector: 'app-update-license-list', templateUrl: './update-license-list.component.html', @@ -16,11 +19,13 @@ import { debounceTime } from 'rxjs/operators'; export class UpdateLicenseListComponent implements OnInit { validateForm!: FormGroup; - constructor(private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { } + constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { } tableScrollHeight ngOnInit(): void { + + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' console.log('tableScrollHeight', this.tableScrollHeight) @@ -35,12 +40,14 @@ export class UpdateLicenseListComponent implements OnInit { this.tableSpin = true } 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) { if (this.totalCount > this.list.length) { console.log('需要加载数据了', event) this.SkipCount = String(Number(this.SkipCount) + 50) - await this.getGasStation() + await this.getStationLicenses() } } }); @@ -53,7 +60,7 @@ export class UpdateLicenseListComponent implements OnInit { } this.list = [] this.SkipCount = '0' - this.getGasStation() + this.getStationLicenses() } resetForm(e: MouseEvent): void { e.preventDefault(); @@ -64,25 +71,13 @@ export class UpdateLicenseListComponent implements OnInit { } this.list = [] this.SkipCount = '0' - this.getGasStation() + this.getStationLicenses() } look(item) { - let gastionobj = { - organization: { - displayName: item.stationName, - isGasStation: true, - id: item.organizationUnitId - } - } - sessionStorage.setItem('userdataOfgasstation', JSON.stringify(gastionobj)) - this.router.navigate(['/todaywarning/petrolStation']) - let obj = { - name: 'oilstation' - } - this.navChangeService.sendMessage(obj);//发布一条消息 + } tableSpin: boolean @@ -93,24 +88,43 @@ export class UpdateLicenseListComponent implements OnInit { orId list: any = [] - async getGasStation() { + async getStationLicenses() { let params = { StationName: this.validateForm.value.name, OrganizationUnitId: String(sessionStorage.getItem('planAdminOrid')), IsContainsChildren: 'true', SkipCount: this.SkipCount, MaxResultCount: this.MaxResultCount, - Sorting: ' BuildingBasicInfo.Id asc' + // Sorting: ' BuildingBasicInfo.Id asc' } this.tableSpin = true await new Promise((resolve, reject) => { - this.http.get('/api/services/app/GasStation/GetAll', { + this.http.get('/api/services/app/StationValidityLicense/GetStationLicenses', { params: params }).subscribe((data: any) => { this.totalCount = data.result.totalCount - this.list = this.list.concat(data.result.items); + let arr = [] + data.result.data.forEach(element => { + let keyArr = Object.keys(element); + let valueArr = Object.values(element); + let newElement = (keyArr as any).zip(valueArr, (a, b) => { return { name: a, value: b } }); + arr.push(newElement) + }); + + //排序 + + this.list = this.list.concat(arr); this.list = [...this.list] + console.log('证照表格', this.list) this.tableSpin = false + + setTimeout(() => { + let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px' + }, 0); + + + resolve(data) }) }) @@ -118,6 +132,41 @@ export class UpdateLicenseListComponent implements OnInit { //父组件调用子组件方法 public onChildMethod() { - this.getGasStation() + this.getStationLicenses() + } + + + lookDetails(i) { + console.log(i) + let params = { + Id: i.licenseId + } + this.http.get('/api/services/app/StationValidityLicense/Get', { params: params }).subscribe(data => { + console.log('证照信息', data) + const modal = this.modal.create({ + nzContent: DetailsUpdateCategoryComponent, + 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 + }, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + + } + }); + const instance = modal.getContentComponent(); + modal.afterClose.subscribe(result => { }); + }) + + } }