-
+
+
+
+
+ 站点管理
+ 更新类证照
+ 档案类证照
+
+
+
-
-
+
-
-
-
-
- |
-
-
- 加油站名称
- |
- 区域 |
- 所属公司 |
- 联系人 |
- 联系电话 |
- 油站等级 |
- 经营品类 |
- 油机数量 |
- 车道数量 |
- 油罐容积 |
- 操作 |
-
-
-
-
-
-
- 
- |
- {{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.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 {
