diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html new file mode 100644 index 0000000..4b680ee --- /dev/null +++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html @@ -0,0 +1 @@ +

audit-inform-time works!

diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.scss b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts new file mode 100644 index 0000000..059841e --- /dev/null +++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-audit-inform-time', + templateUrl: './audit-inform-time.component.html', + styleUrls: ['./audit-inform-time.component.scss'] +}) +export class AuditInformTimeComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html new file mode 100644 index 0000000..4715ade --- /dev/null +++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html @@ -0,0 +1,37 @@ +
+
+
+ 处置 +
+ +
+ +
+

山东省某中化公司-淄博区域-淄博市第十六加油站

+
+

证件名称:   营业执照

+
+

证件编号:   Z201800041501

+
+

证件有效期:   2018.12.02—2025.01.12

+
+

办理类型:   年度公示

+
+

有效期类型:   1523天

+
+

是否年检:   是

+
+

证件图片:   

+
+

审批意见：

+ +
+ + +
+
+ + +
\ No newline at end of file diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.scss b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.scss new file mode 100644 index 0000000..b951afb --- /dev/null +++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.scss @@ -0,0 +1,91 @@ +.box { + .title { + font-family: sybold; + width: 100%; + height: 48px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + display: flex; + align-items: center; + position: relative; + + .titlecontent { + width: 100%; + height: 32px; + line-height: 32px; + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%); + text-align: center; + color: #91CCFF; + font-size: 16px; + } + + i { + position: absolute; + right: 12px; + color: #fff; + font-size: 18px; + cursor: pointer; + } + } + + .content { + box-sizing: border-box; + padding: 0 15px; + // max-height: 580px; + // overflow-y: auto; + + .circle { + width: 8px; + height: 8px; + background: linear-gradient(180deg, #36A2FF 0%, #FFFFFF 100%); + opacity: 1; + } + + .recordP { + display: flex; + justify-content: space-between; + align-items: center; + } + + .btnbox { + width: 100%; + margin: 10px 0; + display: flex; + justify-content: flex-end; + + button { + border-radius: 0px; + color: #91CCFF; + } + + button:nth-child(2) { + margin-left: 16px; + } + + .ok { + + background: rgba(0, 129, 255, 0.24); + } + + .cancel { + border: 1px solid #C4E2FC; + + background: rgba(255, 75, 101, 0.24); + + color: #C4E2FC; + // box-shadow: 0 0 3px 0 #fff inset; + } + } + } + + p { + margin-bottom: 0; + color: #C4E2FC; + margin: 12px 0; + + img { + width: 88px; + height: 56px; + cursor: pointer; + } + } +} diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.ts b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.ts new file mode 100644 index 0000000..42d0e24 --- /dev/null +++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.ts @@ -0,0 +1,51 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { HttpClient } from '@angular/common/http'; +import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service'; +import Viewer from 'viewerjs'; + + +@Component({ + selector: 'app-audit-dispose', + templateUrl: './audit-dispose.component.html', + styleUrls: ['./audit-dispose.component.scss'] +}) +export class AuditDisposeComponent implements OnInit { + + @Input() data?: any; + constructor(private modal: NzModalRef) { } + + + ngOnInit(): void { + } + + + destroyModal() { + this.modal.destroy(); + } + ok() { + this.modal.triggerOk() + } + //查看图片 + viewImg(url) { + // url.split('?')[0] + let dom = document.getElementById(`viewerjs`) + let pObjs = dom.childNodes; + let node = document.createElement("img") + node.style.display = "none"; + node.src = url; + node.id = 'img' + dom.appendChild(node) + setTimeout(() => { + let viewer = new Viewer(document.getElementById(`viewerjs`), { + hidden: () => { + dom.removeChild(pObjs[0]); + viewer.destroy(); + } + }); + node.click(); + }, 0); + } + +} diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.html b/src/app/pages/audit/audit-ing/audit-ing.component.html new file mode 100644 index 0000000..1536bd2 --- /dev/null +++ b/src/app/pages/audit/audit-ing/audit-ing.component.html @@ -0,0 +1,39 @@ +
+
+ + + + + 审批类型 + + 审批信息 + 加油站名称 + 区域 + 省公司 + 提交时间 + 审批状态 + 操作 + + + + + + 审批类型 + + 审批信息 + 加油站名称 + 区域 + 省公司 + 提交时间 + 审批状态 + + 处置 + 详情 + + + + + +
+
\ No newline at end of file diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.scss b/src/app/pages/audit/audit-ing/audit-ing.component.scss new file mode 100644 index 0000000..aaca580 --- /dev/null +++ b/src/app/pages/audit/audit-ing/audit-ing.component.scss @@ -0,0 +1,15 @@ +.box { + width: 100%; + height: 100%; +} + +.tablebox { + width: 100%; + height: 100%; + + .operation { + span { + margin-right: 6px; + } + } +} diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.ts b/src/app/pages/audit/audit-ing/audit-ing.component.ts new file mode 100644 index 0000000..78e6ac7 --- /dev/null +++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts @@ -0,0 +1,54 @@ +import { Component, OnInit, ViewContainerRef } from '@angular/core'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { Observable, fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import { AuditDisposeComponent } from './audit-dispose/audit-dispose.component'; +@Component({ + selector: 'app-audit-ing', + templateUrl: './audit-ing.component.html', + styleUrls: ['./audit-ing.component.scss'] +}) +export class AuditIngComponent implements OnInit { + + constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef) { } + tableSpin = false + list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + + tableScrollHeight + ngOnInit(): void { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + // 页面监听 + fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + }); + } + + + + dispose(item) { + console.log('item', item) + const modal = this.modal.create({ + nzContent: AuditDisposeComponent, + nzViewContainerRef: this.viewContainerRef, + nzWidth: 600, + 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: item + }, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + + } + }); + const instance = modal.getContentComponent(); + modal.afterClose.subscribe(result => { }); + } + +} diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.html b/src/app/pages/audit/audit-nav/audit-nav.component.html new file mode 100644 index 0000000..509ec51 --- /dev/null +++ b/src/app/pages/audit/audit-nav/audit-nav.component.html @@ -0,0 +1,18 @@ +
+
+
+ +
+
+ {{item}} +
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.scss b/src/app/pages/audit/audit-nav/audit-nav.component.scss new file mode 100644 index 0000000..454084c --- /dev/null +++ b/src/app/pages/audit/audit-nav/audit-nav.component.scss @@ -0,0 +1,76 @@ +.audit { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; +} + +.title { + width: 100%; + height: 64px; + box-sizing: border-box; + padding: 0 28px; + margin: 13px 0; + position: relative; + + .titlebox { + width: 100%; + height: 100%; + display: flex; + align-items: center; + + img { + width: 65px; + height: 65px; + } + + .nav { + flex: 1; + height: 48px; + display: flex; + align-items: center; + justify-content: center; + // background-image: linear-gradient(to right, #002147, #033565, #064e8e, #064e8e, #033565, #002147); + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.32) 50%, rgba(35, 153, 255, 0) 100%); + + .navitem { + width: 100%; + height: 32px; + display: flex; + align-items: center; + // background-image: linear-gradient(to right, #002147, #0f5ca0, #1c88e6, #1c88e6, #0f5ca0, #002147); + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.8) 50%, rgba(35, 153, 255, 0) 100%); + + span { + margin-left: 25px; + color: #bce0ff; + font-size: 20px; + font-family: titlefont; + cursor: pointer; + } + + span:nth-child(1) { + margin-left: 12px; + } + + .grey { + color: #68829F; + } + } + + } + } + + .packup { + position: absolute; + right: 33px; + top: 16px; + cursor: pointer; + } +} + +.content { + flex: 1; + box-sizing: border-box; + padding: 0 40px 20px 40px; +} diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.ts b/src/app/pages/audit/audit-nav/audit-nav.component.ts new file mode 100644 index 0000000..e787789 --- /dev/null +++ b/src/app/pages/audit/audit-nav/audit-nav.component.ts @@ -0,0 +1,21 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-audit-nav', + templateUrl: './audit-nav.component.html', + styleUrls: ['./audit-nav.component.scss'] +}) +export class AuditNavComponent implements OnInit { + + constructor() { } + + + navList = ['审批', '历史纪录', '通知时间'] + selectedItem = '审批' + selectNav(item) { + this.selectedItem = item + } + ngOnInit(): void { + } + +} diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html new file mode 100644 index 0000000..7842d37 --- /dev/null +++ b/src/app/pages/audit/audit-record/audit-record.component.html @@ -0,0 +1 @@ +

audit-record works!

diff --git a/src/app/pages/audit/audit-record/audit-record.component.scss b/src/app/pages/audit/audit-record/audit-record.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts new file mode 100644 index 0000000..263b4eb --- /dev/null +++ b/src/app/pages/audit/audit-record/audit-record.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-audit-record', + templateUrl: './audit-record.component.html', + styleUrls: ['./audit-record.component.scss'] +}) +export class AuditRecordComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index b5e5c4d..3df6368 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -94,7 +94,7 @@ --> - + diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index 3579eb5..d31c94d 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -72,7 +72,7 @@ - + diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 3d367ba..a99a790 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -19,6 +19,9 @@
  • 预警记录
    • +
  • + 审批 +
  • diff --git a/src/app/pages/license/nav-bar/nav-bar.component.scss b/src/app/pages/license/nav-bar/nav-bar.component.scss index dc9bf17..71c53c0 100644 --- a/src/app/pages/license/nav-bar/nav-bar.component.scss +++ b/src/app/pages/license/nav-bar/nav-bar.component.scss @@ -42,7 +42,7 @@ background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.8) 50%, rgba(35, 153, 255, 0) 100%); span { - margin-left: 10px; + margin-left: 25px; color: #bce0ff; font-size: 20px; font-family: titlefont; diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts index 9d8f0a9..297ba2a 100644 --- a/src/app/pages/pages-routing.module.ts +++ b/src/app/pages/pages-routing.module.ts @@ -15,6 +15,7 @@ import { init3DGuard } from './init3D.guard'; import { WarningStatisticsListComponent } from './warning-statistics-list/warning-statistics-list.component'; import { NavBarComponent } from './license/nav-bar/nav-bar.component'; import { MisinformationListComponent } from './misinformation-list/misinformation-list.component'; +import { AuditNavComponent } from './audit/audit-nav/audit-nav.component'; const routes: Routes = [ { path: 'homepage', component: HomePageComponent }, @@ -32,7 +33,9 @@ const routes: Routes = [ { path: 'oliStationInfo', component: OilStationInfoComponent }, { path: 'license/petrolStation', component: NavBarComponent }, { path: 'records/misinformationList', component: MisinformationListComponent }, - { path: 'records/petrolStation/misinformationList', component: MisinformationListComponent } + { path: 'records/petrolStation/misinformationList', component: MisinformationListComponent }, + { path: 'audit', component: AuditNavComponent } + ]; @NgModule({ diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 076b4da..de22d3d 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -71,11 +71,19 @@ import { DetailsFileCategoryComponent } from './license/file-category/details-fi import { NzTimelineModule } from 'ng-zorro-antd/timeline'; import { PdfWordLookComponent } from './license/pdf-word-look/pdf-word-look.component'; import { MisinformationListComponent } from './misinformation-list/misinformation-list.component'; +import { OilStationListComponent } from './plan-admin/oil-station-list/oil-station-list.component'; +import { UpdateLicenseListComponent } from './plan-admin/update-license-list/update-license-list.component'; +import { FileLicenseListComponent } from './plan-admin/file-license-list/file-license-list.component'; +import { AuditNavComponent } from './audit/audit-nav/audit-nav.component'; +import { AuditIngComponent } from './audit/audit-ing/audit-ing.component'; +import { AuditRecordComponent } from './audit/audit-record/audit-record.component'; +import { AuditInformTimeComponent } from './audit/audit-inform-time/audit-inform-time.component'; +import { AuditDisposeComponent } from './audit/audit-ing/audit-dispose/audit-dispose.component'; @NgModule({ declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, - AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent,PdfWordLookComponent, MisinformationListComponent], + AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent,PdfWordLookComponent, MisinformationListComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent], imports: [ @@ -119,7 +127,7 @@ import { MisinformationListComponent } from './misinformation-list/misinformatio NzToolTipModule, NzTimelineModule ], - entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent], + entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent,AuditDisposeComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html new file mode 100644 index 0000000..7f0f14f --- /dev/null +++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html @@ -0,0 +1 @@ +

    file-license-list works!

    diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.scss b/src/app/pages/plan-admin/file-license-list/file-license-list.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts new file mode 100644 index 0000000..78c6d9d --- /dev/null +++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-file-license-list', + templateUrl: './file-license-list.component.html', + styleUrls: ['./file-license-list.component.scss'] +}) +export class FileLicenseListComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} 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 new file mode 100644 index 0000000..b4e7bd7 --- /dev/null +++ b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html @@ -0,0 +1,77 @@ +
    +
    + +
    +
    + + + + +
    + +
    加油站名称 + + 区域 + 所属公司 + 联系人 + 联系电话 + 油站等级 + 经营品类 + 油机数量 + 车道数量 + 油罐容积 + 操作 + + + + + +
    + +
    + {{item.stationName}} + + {{item.locationName}} + {{item.companyName}} + {{item.leaderName}} + {{item.leaderContact}} + {{item.stationLevel}} + {{item.sellVariety}} + {{item.gasStationCount}} + {{item.laneCount}} + + {{item.tankVolume}} + {{item.tankVolume ? 'm³' : null}} + + + 查看 + + + +     + +
    +
    \ No newline at end of file diff --git a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.scss b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.scss new file mode 100644 index 0000000..4248759 --- /dev/null +++ b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.scss @@ -0,0 +1,43 @@ +.search { + box-sizing: border-box; + padding-left: 22px; + padding-right: 33px; + width: 100%; + height: 32px; + margin: 12px 0; + + form { + width: 100%; + height: 32px; + display: flex; + justify-content: flex-end; + + input { + background: none; + border: 1px solid #91ccff; + color: #fff; + } + + .searchParams { + width: 22%; + } + + .btn { + width: 5%; + margin-left: 16px; + } + } +} +.box{ + width: 100%; + height: 100%; + display: flex; + flex-direction: column; +} +.tablebox { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; +} diff --git a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts new file mode 100644 index 0000000..7d81460 --- /dev/null +++ b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts @@ -0,0 +1,123 @@ +import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { TreeService } from 'src/app/service/tree.service'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown'; +import { NzFormatEmitEvent, NzTreeComponent, NzTreeNode } from 'ng-zorro-antd/tree'; +import { Router } from '@angular/router'; +import { NavChangeService } from 'src/app/service/navChange.service'; +import { fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; + +@Component({ + selector: 'app-oil-station-list', + templateUrl: './oil-station-list.component.html', + styleUrls: ['./oil-station-list.component.scss'] +}) +export class OilStationListComponent 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) { } + + tableScrollHeight + + ngOnInit(): void { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + + console.log('tableScrollHeight', this.tableScrollHeight) + // 页面监听 + fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + }); + this.validateForm = this.fb.group({ + name: [null] + }); + + 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() + } + } + }); + } + + submitForm(): void { + for (const i in this.validateForm.controls) { + this.validateForm.controls[i].markAsDirty(); + this.validateForm.controls[i].updateValueAndValidity(); + } + this.list = [] + this.SkipCount = '0' + this.getGasStation() + } + resetForm(e: MouseEvent): void { + e.preventDefault(); + this.validateForm.reset(); + for (const key in this.validateForm.controls) { + this.validateForm.controls[key].markAsPristine(); + this.validateForm.controls[key].updateValueAndValidity(); + } + this.list = [] + this.SkipCount = '0' + this.getGasStation() + } + + + + 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 + totalCount: any //总数 + //获取点击组织机构的所有加油站 + SkipCount: string = '0' + MaxResultCount: string = '100' + + orId + list: any = [] + async getGasStation() { + let params = { + StationName: this.validateForm.value.name, + OrganizationUnitId: String(sessionStorage.getItem('planAdminOrid')), + IsContainsChildren: 'true', + SkipCount: this.SkipCount, + MaxResultCount: this.MaxResultCount, + Sorting: ' BuildingBasicInfo.Id asc' + } + this.tableSpin = true + await new Promise((resolve, reject) => { + this.http.get('/api/services/app/GasStation/GetAll', { + params: params + }).subscribe((data: any) => { + this.totalCount = data.result.totalCount + this.list = this.list.concat(data.result.items); + this.list = [...this.list] + this.tableSpin = false + resolve(data) + }) + }) + } + + //父组件调用子组件方法 + public onChildMethod() { + this.getGasStation() + } +} diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html index 4384100..7209128 100644 --- a/src/app/pages/plan-admin/plan-admin.component.html +++ b/src/app/pages/plan-admin/plan-admin.component.html @@ -26,80 +26,25 @@
    • - +
    + +
    +
    + 站点管理 + 更新类证照 + 档案类证照 +
    +
    +
    -
    - +
    +
    -
    - - - - -
    - -
    加油站名称 - - 区域 - 所属公司 - 联系人 - 联系电话 - 油站等级 - 经营品类 - 油机数量 - 车道数量 - 油罐容积 - 操作 - - - - - -
    - -
    - {{item.stationName}} - - {{item.locationName}} - {{item.companyName}} - {{item.leaderName}} - {{item.leaderContact}} - {{item.stationLevel}} - {{item.sellVariety}} - {{item.gasStationCount}} - {{item.laneCount}} - - {{item.tankVolume}} - {{item.tankVolume ? 'm³' : null}} - - - 查看 - - - -     - +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/app/pages/plan-admin/plan-admin.component.scss b/src/app/pages/plan-admin/plan-admin.component.scss index 79ecb13..a973d33 100644 --- a/src/app/pages/plan-admin/plan-admin.component.scss +++ b/src/app/pages/plan-admin/plan-admin.component.scss @@ -9,12 +9,61 @@ .title { width: 100%; height: 48px; + + .titlebox { + width: 100%; + height: 100%; + display: flex; + align-items: center; + box-sizing: border-box; + padding-left: 12px; + + img { + width: 65px; + height: 65px; + } + + .content { + flex: 1; + height: 48px; + display: flex; + align-items: center; + // background-image: linear-gradient(to right, #002147, #033565, #064e8e, #064e8e, #033565, #002147); + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.32) 50%, rgba(35, 153, 255, 0) 100%); + + .contentitem { + width: 100%; + height: 32px; + display: flex; + align-items: center; + // background-image: linear-gradient(to right, #002147, #0f5ca0, #1c88e6, #1c88e6, #0f5ca0, #002147); + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.8) 50%, rgba(35, 153, 255, 0) 100%); + + .grey { + color: #6585a1; + } + + .selectedItem { + color: #bce0ff; + } + + span { + // + font-size: 20px; + font-family: titlefont; + margin-right: 20px; + cursor: pointer; + } + } + + } + } + } .orbox { height: 100%; - width: 360px; - margin-right: 40px; + width: 300px; display: flex; flex-direction: column; @@ -25,7 +74,7 @@ background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%); margin-top: 12px; box-sizing: border-box; - padding: 18px 12px; + padding: 12px 8px; nz-tree { background: none; @@ -37,59 +86,15 @@ .stationList { flex: 1; - display: flex; - flex-direction: column; - - .search { - box-sizing: border-box; - padding-left: 22px; - padding-right: 33px; - width: 100%; - height: 32px; - margin-top: 14px; - margin-bottom: 22px; - - form { - width: 100%; - height: 32px; - display: flex; - justify-content: flex-end; - - input { - background: none; - border: 1px solid #91ccff; - color: #fff; - } - - .searchParams { - width: 22%; - } - .btn { - width: 5%; - margin-left: 16px; - } - } - } - .tablebox { - flex: 1; + .tabbox { + width: 100%; + height: 100%; display: flex; flex-direction: column; - align-items: center; - overflow: hidden; - - .pagination { - margin-top: 26px; - display: flex; - align-items: center; - justify-content: center; - } - - ::-webkit-scrollbar { - width: 0px; - } } + } @@ -102,6 +107,27 @@ .title { width: 100%; height: 42px; + + .titlebox { + img { + width: 46px; + height: 46px; + } + + .content { + height: 36px; + + .contentitem { + height: 25px; + + span { + margin-left: 6px; + font-size: 16px; + } + } + + } + } } .orbox { @@ -148,11 +174,32 @@ .title { width: 100%; height: 33px; + + .titlebox { + img { + width: 36px; + height: 36px; + } + + .content { + height: 28px; + + .contentitem { + height: 20px; + + span { + margin-left: 6px; + font-size: 13px; + } + } + + } + } } .orbox { width: 250px; - margin-right:23px; + margin-right: 23px; .or { margin-top: 5px; @@ -182,10 +229,11 @@ } } } - .tablebox{ - nz-table{ - th{ - font-size: 10px!important; + + .tablebox { + nz-table { + th { + font-size: 10px !important; } } } diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts index 641d9a6..acc9bb1 100644 --- a/src/app/pages/plan-admin/plan-admin.component.ts +++ b/src/app/pages/plan-admin/plan-admin.component.ts @@ -8,58 +8,52 @@ import { Router } from '@angular/router'; import { NavChangeService } from 'src/app/service/navChange.service'; import { fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; +import { OilStationListComponent } from './oil-station-list/oil-station-list.component'; +import { UpdateLicenseListComponent } from './update-license-list/update-license-list.component'; +import { FileLicenseListComponent } from './file-license-list/file-license-list.component'; @Component({ selector: 'app-plan-admin', templateUrl: './plan-admin.component.html', styleUrls: ['./plan-admin.component.scss'] }) export class PlanAdminComponent implements OnInit { - validateForm!: FormGroup; + @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; + @ViewChild('child') oilStationListComponent!: OilStationListComponent;; + @ViewChild('child2') updateLicenseListComponent!: UpdateLicenseListComponent;; + @ViewChild('child3') fileLicenseListComponent!: FileLicenseListComponent;; constructor(private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { } - list: any = [] + ngOnInit(): void { - this.validateForm = this.fb.group({ - name: [null] - }); - this.tableSpin = true this.getAllOrganization() } - 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() - } - } - }); - } + //选择右侧tab页 + selectedTab = 0 + selectTab(index) { + this.selectedTab = index - submitForm(): void { - for (const i in this.validateForm.controls) { - this.validateForm.controls[i].markAsDirty(); - this.validateForm.controls[i].updateValueAndValidity(); + if (this.selectedTab == 0) { + console.log('选择tab') + setTimeout(() => { + this.oilStationListComponent.list = [] + this.oilStationListComponent.SkipCount = '0' + this.oilStationListComponent.onChildMethod() + }, 0); } - this.list = [] - this.SkipCount = '0' - this.getGasStation() - } - resetForm(e: MouseEvent): void { - e.preventDefault(); - this.validateForm.reset(); - for (const key in this.validateForm.controls) { - this.validateForm.controls[key].markAsPristine(); - this.validateForm.controls[key].updateValueAndValidity(); + if (this.selectedTab == 1) { + console.log('选择tab') + setTimeout(() => { + this.updateLicenseListComponent.list = [] + this.updateLicenseListComponent.SkipCount = '0' + this.updateLicenseListComponent.onChildMethod() + }, 0); } - this.list = [] - this.SkipCount = '0' - this.getGasStation() } + + //获取所有组织机构 nodes: any = [] nzExpandAll = false @@ -67,7 +61,7 @@ export class PlanAdminComponent implements OnInit { orSpin: boolean = false getAllOrganization() { this.orSpin = true - let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id + let OrganizationUnitId = JSON.parse(sessionStorage.getItem('userdata')).organization.id let params = { OrganizationUnitId: OrganizationUnitId, IsContainsChildren: "true" @@ -93,75 +87,42 @@ export class PlanAdminComponent implements OnInit { this.nodes = [...this.toTree.toTree(data.result.items)] this.nzExpandedKeys = [OrganizationUnitId] this.nzSelectedKeys = [OrganizationUnitId] - this.OrganizationUnitId = OrganizationUnitId - this.getGasStation() + + sessionStorage.setItem('planAdminOrid', OrganizationUnitId) + this.oilStationListComponent.onChildMethod() }) } - tableheight() { - return (document.getElementById('tablebox').clientHeight - 42) + 'px' - } - - 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);//发布一条消息 - } nzExpandedKeys: any = [] activatedNode?: NzTreeNode; //点击tree节点 activeNode(data: NzFormatEmitEvent): void { this.activatedNode = data.node!; - // console.log(data) - this.OrganizationUnitId = data.node.origin.id - - this.list = [] - this.SkipCount = '0' - this.getGasStation() + sessionStorage.setItem('planAdminOrid', data.node.origin.id) + if (this.selectedTab == 0) { + console.log('选择tab') + setTimeout(() => { + this.oilStationListComponent.list = [] + this.oilStationListComponent.SkipCount = '0' + this.oilStationListComponent.onChildMethod() + }, 0); + } + if (this.selectedTab == 1) { + console.log('选择tab') + setTimeout(() => { + this.updateLicenseListComponent.list = [] + this.updateLicenseListComponent.SkipCount = '0' + this.updateLicenseListComponent.onChildMethod() + }, 0); + } } - //获取点击组织机构的所有加油站 - SkipCount: string = '0' - MaxResultCount: string = '100' - OrganizationUnitId: any - tableSpin: boolean = false - totalCount: any //总数 - async getGasStation() { - let params = { - StationName: this.validateForm.value.name, - OrganizationUnitId: String(this.OrganizationUnitId), - IsContainsChildren: 'true', - SkipCount: this.SkipCount, - MaxResultCount: this.MaxResultCount, - Sorting: ' BuildingBasicInfo.Id asc' - } - this.tableSpin = true - await new Promise((resolve, reject) => { - this.http.get('/api/services/app/GasStation/GetAll', { - params: params - }).subscribe((data: any) => { - this.totalCount = data.result.totalCount - this.list = this.list.concat(data.result.items); - this.list = [...this.list] - this.tableSpin = false - resolve(data) - }) - }) - } + + + 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 new file mode 100644 index 0000000..866bbb2 --- /dev/null +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.html @@ -0,0 +1,87 @@ +
    +
    +
    +
    +
    办理提醒 +
    +
    +
    临期提醒 +
    +
    +
    逾期提醒 +
    +
    + +
    +
    + + + + +
    + +
    加油站名称 + + 区域 + 所属公司 + 联系人 + 联系电话 + 油站等级 + 经营品类 + 油机数量 + 车道数量 + 油罐容积 + 操作 + + + + + +
    + +
    + {{item.stationName}} + + {{item.locationName}} + {{item.companyName}} + {{item.leaderName}} + {{item.leaderContact}} + {{item.stationLevel}} + {{item.sellVariety}} + {{item.gasStationCount}} + {{item.laneCount}} + + {{item.tankVolume}} + {{item.tankVolume ? 'm³' : null}} + + + 查看 + + + +     + +
    +
    \ No newline at end of file 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 new file mode 100644 index 0000000..1a029fe --- /dev/null +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.scss @@ -0,0 +1,62 @@ +.search { + box-sizing: border-box; + padding-left: 38px; + padding-right: 35px; + width: 100%; + height: 32px; + margin: 12px 0; + display: flex; + justify-content: space-between; + align-items: center; + .legendbox{ + display: flex; + align-items: center; + color: #FFFFFF; + flex: 1; + .legendItem{ + display: flex; + align-items: center; + margin-right: 12px; + div{ + width: 8px; + height: 8px; + margin-right: 3px; + } + } + } + form { + flex: 1; + height: 32px; + display: flex; + justify-content: flex-end; + + input { + background: none; + border: 1px solid #91ccff; + color: #fff; + } + + .searchParams { + width: 35%; + } + + .btn { + margin-left: 16px; + } + } +} + +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; +} + +.tablebox { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; +} 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 new file mode 100644 index 0000000..d33506c --- /dev/null +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts @@ -0,0 +1,123 @@ +import { Component, OnInit, ViewChild, ElementRef } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { TreeService } from 'src/app/service/tree.service'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown'; +import { NzFormatEmitEvent, NzTreeComponent, NzTreeNode } from 'ng-zorro-antd/tree'; +import { Router } from '@angular/router'; +import { NavChangeService } from 'src/app/service/navChange.service'; +import { fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +@Component({ + selector: 'app-update-license-list', + templateUrl: './update-license-list.component.html', + styleUrls: ['./update-license-list.component.scss'] +}) +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) { } + + tableScrollHeight + + ngOnInit(): void { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + + console.log('tableScrollHeight', this.tableScrollHeight) + // 页面监听 + fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + }); + this.validateForm = this.fb.group({ + name: [null] + }); + + 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() + } + } + }); + } + + submitForm(): void { + for (const i in this.validateForm.controls) { + this.validateForm.controls[i].markAsDirty(); + this.validateForm.controls[i].updateValueAndValidity(); + } + this.list = [] + this.SkipCount = '0' + this.getGasStation() + } + resetForm(e: MouseEvent): void { + e.preventDefault(); + this.validateForm.reset(); + for (const key in this.validateForm.controls) { + this.validateForm.controls[key].markAsPristine(); + this.validateForm.controls[key].updateValueAndValidity(); + } + this.list = [] + this.SkipCount = '0' + this.getGasStation() + } + + + + 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 + totalCount: any //总数 + //获取点击组织机构的所有加油站 + SkipCount: string = '0' + MaxResultCount: string = '100' + + orId + list: any = [] + async getGasStation() { + let params = { + StationName: this.validateForm.value.name, + OrganizationUnitId: String(sessionStorage.getItem('planAdminOrid')), + IsContainsChildren: 'true', + SkipCount: this.SkipCount, + MaxResultCount: this.MaxResultCount, + Sorting: ' BuildingBasicInfo.Id asc' + } + this.tableSpin = true + await new Promise((resolve, reject) => { + this.http.get('/api/services/app/GasStation/GetAll', { + params: params + }).subscribe((data: any) => { + this.totalCount = data.result.totalCount + this.list = this.list.concat(data.result.items); + this.list = [...this.list] + this.tableSpin = false + resolve(data) + }) + }) + } + + //父组件调用子组件方法 + public onChildMethod() { + this.getGasStation() + } +} diff --git a/src/theme.less b/src/theme.less index eb9a8eb..aef831b 100644 --- a/src/theme.less +++ b/src/theme.less @@ -377,8 +377,7 @@ } .ant-tree .ant-tree-node-content-wrapper { - padding: 2px 20px; - // margin-left: 30px; + padding: 2px 15px; } nz-tree {