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 87bb8bd..7b360b4 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 @@ -30,15 +30,16 @@ - + - + @@ -95,7 +96,7 @@
-
+
预警类别统计 @@ -107,15 +108,16 @@
+
-
+
近一个月预警统计
统计
-
+
排名
+
@@ -228,14 +231,13 @@ 处置 -->
- +
+
+ +
+
-
diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts index 9f192c7..ecf28a9 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts @@ -322,7 +322,9 @@ export class CriminalRecordsAdminComponent implements OnInit { this.mybarChart.setOption(this.baroption); this.warningType() + this.tableSpin = true this.getAllOrganization() + this.getAggregations() } defaultOrId: string @@ -408,7 +410,9 @@ export class CriminalRecordsAdminComponent implements OnInit { } //获取统计信息 + chartsSpin: boolean = false getAggregations() { + this.chartsSpin = true let ViolationIds = [] if (this.validateForm.value.type) { this.warningTypesDetails.forEach(item => { @@ -425,6 +429,7 @@ export class CriminalRecordsAdminComponent implements OnInit { ViolationIds.length != 0 ? body.violationType = ViolationIds : null this.http.post('/api/services/app/ViolateRecord/Aggregations', body).subscribe((data: any) => { this.echartsData = data.result + this.chartsSpin = false this.refreshPieData(data.result) this.refreshBarLineData(this.echartsData, 'month') }) @@ -434,7 +439,7 @@ export class CriminalRecordsAdminComponent implements OnInit { MaxResultCount: string = '50' list: any = [] totalCount: string - isSpin: boolean = false + tableSpin: boolean = false getViolateRecordList() { let ViolationIds = [] if (this.validateForm.value.event) { @@ -464,7 +469,7 @@ export class CriminalRecordsAdminComponent implements OnInit { SkipCount: this.SkipCount, MaxResultCount: this.MaxResultCount } - this.isSpin = true + this.tableSpin = true this.http.get('/api/services/app/ViolateRecord/GetAll', { params: params }).subscribe((data: any) => { @@ -473,8 +478,8 @@ export class CriminalRecordsAdminComponent implements OnInit { // this.list = data.result.items this.totalCount = data.result.totalCount console.log('违规记录列表', data) - this.isSpin = false - this.getAggregations() + this.tableSpin = false + console.log(this.list.length) }) } @@ -540,6 +545,7 @@ export class CriminalRecordsAdminComponent implements OnInit { this.list = [] this.SkipCount = '0' this.getViolateRecordList() + // this.getAggregations() } resetForm(e: MouseEvent): void { e.preventDefault(); diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index fc1bf2a..fab3faa 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -85,7 +85,7 @@
-
+
预警类别统计 @@ -97,8 +97,9 @@
+
-
+
近一个月预警统计 @@ -114,6 +115,7 @@
+
@@ -196,14 +198,13 @@ 处置 -->
- +
+
+ +
+
- \ No newline at end of file diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts index b67eacf..046983f 100644 --- a/src/app/pages/criminal-records/criminal-records.component.ts +++ b/src/app/pages/criminal-records/criminal-records.component.ts @@ -327,7 +327,7 @@ export class CriminalRecordsComponent implements OnInit { this.warningType() this.getViolateRecordList() - + this.getAggregations() } //刷新饼图图表数据 @@ -387,7 +387,9 @@ export class CriminalRecordsComponent implements OnInit { this.mybarChart.setOption(option); } //获取统计信息 + chartsSpin: boolean = false getAggregations() { + this.chartsSpin = true let ViolationIds = [] if (this.validateForm.value.type) { this.warningTypesDetails.forEach(item => { @@ -404,6 +406,7 @@ export class CriminalRecordsComponent implements OnInit { ViolationIds.length != 0 ? body.violationType = ViolationIds : null this.http.post('/api/services/app/ViolateRecord/Aggregations', body).subscribe((data: any) => { this.echartsData = data.result + this.chartsSpin = false this.refreshPieData(data.result) this.refreshBarLineData(this.echartsData, 'month') }) @@ -414,7 +417,7 @@ export class CriminalRecordsComponent implements OnInit { MaxResultCount: string = '50' list: any = [] totalCount: string - isSpin: boolean = false + tableSpin: boolean = false getViolateRecordList() { let ViolationIds = [] if (this.validateForm.value.event) { @@ -444,7 +447,7 @@ export class CriminalRecordsComponent implements OnInit { SkipCount: this.SkipCount, MaxResultCount: this.MaxResultCount } - this.isSpin = true + this.tableSpin = true this.http.get('/api/services/app/ViolateRecord/GetAll', { params: params }).subscribe((data: any) => { @@ -453,8 +456,7 @@ export class CriminalRecordsComponent implements OnInit { // this.list = data.result.items this.totalCount = data.result.totalCount console.log('违规记录列表', data) - this.isSpin = false - this.getAggregations() + this.tableSpin = false }) } ngAfterViewInit(): void { @@ -534,7 +536,7 @@ export class CriminalRecordsComponent implements OnInit { // if (!item.violateImage && !item.violateVideo) { // this.message.create('warning', '没有预警照片或视频！'); // } else { - + // } const modal = this.modal.create({ nzContent: GetOutOfLineDetailsComponent, diff --git a/src/app/pages/home-page/home-page.component.html b/src/app/pages/home-page/home-page.component.html index d630bb9..a8cdc9d 100644 --- a/src/app/pages/home-page/home-page.component.html +++ b/src/app/pages/home-page/home-page.component.html @@ -110,6 +110,7 @@
+
近30天油站排名 @@ -162,6 +163,7 @@
+
@@ -220,6 +222,7 @@
+ @@ -240,7 +243,7 @@
- +
diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts index fb2c93b..15941bd 100644 --- a/src/app/pages/home-page/home-page.component.ts +++ b/src/app/pages/home-page/home-page.component.ts @@ -454,6 +454,7 @@ export class HomePageComponent implements OnInit { } } totalCount + isSpin:boolean = false getHomeAggregation() { let organizationUnitId @@ -466,6 +467,7 @@ export class HomePageComponent implements OnInit { organizationUnitId: organizationUnitId, isContainsChildren: true } + this.isSpin = true this.http.post('/api/services/app/Home/HomeAggregation', body).subscribe((data: any) => { this.HomeAggregatioData = data.result this.totalCount = data.result.todayRecordCount @@ -474,8 +476,8 @@ export class HomePageComponent implements OnInit { { name: '摄像头数量', value: data.result.dev.cameraCount }, { name: '预警模型数量', value: data.result.dev.violationCount } ] - console.log('图表信息', data.result) - + // console.log('图表信息', data.result) + this.isSpin = false this.eventEcharts(data.result) }) diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html index 1bdbbf4..9cd92f0 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html @@ -16,7 +16,7 @@
-
+
卸油预警统计 @@ -29,8 +29,9 @@
+
-
+
近30天卸油作业总数走势 @@ -38,6 +39,7 @@
+
@@ -57,31 +59,12 @@ - - @@ -181,13 +164,13 @@ 查看
+
+
+ +
+
-
\ No newline at end of file diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts index d4c7ed3..9022167 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts @@ -89,6 +89,7 @@ export class OilUnloadingProcessListComponent implements OnInit { this.myChart = echarts.init(document.getElementById('piechart')); //柱状折线图 this.mybarChart = echarts.init(document.getElementById('barchart')); + this.tableSpin = true this.getAllOrganization() this.getAggregations() if (this.router.url.indexOf('petrolStation') != -1) { @@ -562,7 +563,9 @@ export class OilUnloadingProcessListComponent implements OnInit { }) } //获取统计信息 + chartsSpin:boolean = false getAggregations() { + this.chartsSpin = true let organizationUnitId if (this.router.url.indexOf('petrolStation') != -1) { organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id @@ -575,6 +578,7 @@ export class OilUnloadingProcessListComponent implements OnInit { } this.http.get('/api/services/app/OilUnloadingProcess/GetAllCountByDays', { params: params }).subscribe((data: any) => { console.log('统计信息', data) + this.chartsSpin = false this.echartsData = data.result this.refreshEchartsData1(this.echartsData) // this.refreshBarLineData(this.echartsData) @@ -586,7 +590,9 @@ export class OilUnloadingProcessListComponent implements OnInit { MaxResultCount: string = '50' list: any = [] totalCount: string + tableSpin:boolean = false getViolateRecordList() { + this.tableSpin = true let organizationUnitId if (this.router.url.indexOf('petrolStation') != -1) { organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id @@ -609,12 +615,11 @@ export class OilUnloadingProcessListComponent implements OnInit { this.http.get('/api/services/app/OilUnloadingProcess/GetAll', { params: params }).subscribe((data: any) => { + this.tableSpin = false this.list = this.list.concat(data.result.items); this.list = [...this.list] - // console.log('xxx',this.list) this.totalCount = data.result.totalCount console.log('获取卸油流程列表', data.result.items) - // this.getAggregations() }) } submitForm(): void { diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html index 7be968f..9370510 100644 --- a/src/app/pages/plan-admin/plan-admin.component.html +++ b/src/app/pages/plan-admin/plan-admin.component.html @@ -1,6 +1,6 @@
-
+
@@ -22,6 +22,7 @@ src="../../../assets/images/unexpand.png" alt="">
+
@@ -51,8 +52,7 @@
- - @@ -100,13 +100,6 @@ - -
\ No newline at end of file diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts index 6c4445c..60ed44e 100644 --- a/src/app/pages/plan-admin/plan-admin.component.ts +++ b/src/app/pages/plan-admin/plan-admin.component.ts @@ -18,38 +18,22 @@ export class PlanAdminComponent implements OnInit { @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent; constructor(private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { } list: any = [] - - tableHeight 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) { - console.log('需要加载数据了', event) - this.SkipCount = String(Number(this.SkipCount) + 50) - let params = { - StationName: this.validateForm.value.name, - OrganizationUnitId: String(this.OrganizationUnitId), - IsContainsChildren: 'true', - SkipCount: this.SkipCount, - MaxResultCount: this.MaxResultCount, - Sorting:' BuildingBasicInfo.Id asc' + if (this.totalCount > this.list.length) { + console.log('需要加载数据了', event) + this.SkipCount = String(Number(this.SkipCount) + 50) + await this.getGasStation() } - await new Promise((resolve, reject) => { - this.http.get('/api/services/app/GasStation/GetAll', { - params: params - }).subscribe((data: any) => { - this.list = this.list.concat(data.result.items); - this.list = [...this.list] - resolve(data) - }) - }) } }); } @@ -61,20 +45,9 @@ export class PlanAdminComponent implements OnInit { this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].updateValueAndValidity(); } - let params = { - StationName: this.validateForm.value.name, - OrganizationUnitId: String(this.OrganizationUnitId), - IsContainsChildren: 'true', - SkipCount: '0', - MaxResultCount: this.MaxResultCount, - Sorting:' BuildingBasicInfo.Id asc' - - } - this.http.get('/api/services/app/GasStation/GetAll', { - params: params - }).subscribe((data: any) => { - this.list = [...data.result.items] - }) + this.list = [] + this.SkipCount = '0' + this.getGasStation() } resetForm(e: MouseEvent): void { e.preventDefault(); @@ -83,25 +56,17 @@ export class PlanAdminComponent implements OnInit { this.validateForm.controls[key].markAsPristine(); this.validateForm.controls[key].updateValueAndValidity(); } - let params = { - StationName: this.validateForm.value.name, - OrganizationUnitId: String(this.OrganizationUnitId), - IsContainsChildren: 'true', - SkipCount: '0', - MaxResultCount: this.MaxResultCount, - Sorting:' BuildingBasicInfo.Id asc' - } - this.http.get('/api/services/app/GasStation/GetAll', { - params: params - }).subscribe((data: any) => { - this.list = [...data.result.items] - }) + this.list = [] + this.SkipCount = '0' + this.getGasStation() } //获取所有组织机构 nodes: any = [] nzExpandAll = false nzSelectedKeys: any = [] + 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 params = { OrganizationUnitId: OrganizationUnitId, @@ -122,16 +87,13 @@ export class PlanAdminComponent implements OnInit { const element = data.result.items[index]; element.key = element.id element.title = element.displayName - // if(element.parentId == OrganizationUnitId){ - // element.isLeaf = true - // } } - console.log('组织机构', data.result.items) + // console.log('组织机构', data.result.items) + this.orSpin = false this.nodes = [...this.toTree.toTree(data.result.items)] this.nzExpandedKeys = [OrganizationUnitId] this.nzSelectedKeys = [OrganizationUnitId] this.OrganizationUnitId = OrganizationUnitId - // this.nzExpandAll = true this.getGasStation() }) } @@ -163,8 +125,11 @@ export class PlanAdminComponent implements OnInit { //点击tree节点 activeNode(data: NzFormatEmitEvent): void { this.activatedNode = data.node!; - console.log(data) + // console.log(data) this.OrganizationUnitId = data.node.origin.id + + this.list = [] + this.SkipCount = '0' this.getGasStation() } @@ -173,6 +138,8 @@ export class PlanAdminComponent implements OnInit { SkipCount: string = '0' MaxResultCount: string = '100' OrganizationUnitId: any + tableSpin: boolean = false + totalCount: any //总数 async getGasStation() { let params = { StationName: this.validateForm.value.name, @@ -180,14 +147,17 @@ export class PlanAdminComponent implements OnInit { 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', { params: params }).subscribe((data: any) => { - // this.list = this.list.concat(data.result.items); - this.list = [...data.result.items] + 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/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts index ce72c52..419ed55 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts @@ -38,6 +38,7 @@ export class TodayWarningAdminComponent implements OnInit { datePickerEnd: [new Date(`${moment(new Date()).format('YYYY-MM-DD')} 23:59`)] }); this.warningType() + this.isSpin = true this.getAllOrganization() } @@ -47,7 +48,7 @@ export class TodayWarningAdminComponent implements OnInit { warningType() { this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { this.warningTypesDetails = data.result - console.log(this.warningTypesDetails) + // console.log(this.warningTypesDetails) this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType }); }) } @@ -111,7 +112,7 @@ export class TodayWarningAdminComponent implements OnInit { } else { disposalState = null } - console.log(this.validateForm.value) + // console.log(this.validateForm.value) this.isSpin = true let params = { Level: this.validateForm.value.level, diff --git a/src/theme.less b/src/theme.less index c5e88dc..34ee461 100644 --- a/src/theme.less +++ b/src/theme.less @@ -403,10 +403,19 @@ align-items: center; justify-content: center; } + .vertical-center-modal .ant-modal { top: 0; } -.ant-select-clear,.ant-select-close-icon{ +.ant-select-clear, +.ant-select-close-icon { color: white; -} \ No newline at end of file +} + +.nzspin { + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); +}