From 7044e3f8d31e8cb4182acd8aeee33a90be5e6e66 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 21 Feb 2022 14:42:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E8=AD=A6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=A1=A8=E6=A0=BC=E5=8F=98=E5=8C=96=EF=BC=9B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BA=8F=E5=8F=B7=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.html | 31 ++--- .../criminal-records.component.html | 15 +- .../pages/home-page/home-page.component.html | 10 +- .../pages/home-page/home-page.component.scss | 12 +- .../oil-unloading-process-list.component.html | 20 +-- .../warning-statistics-list.component.html | 131 ++++++------------ .../warning-statistics-list.component.ts | 99 ++++++------- 7 files changed, 140 insertions(+), 178 deletions(-) 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 b9d7056..891e4e3 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 @@ -151,11 +151,13 @@
-
- +
+ 序号
-
- 预警级别 +
+ + 预警级别 +
预警类型 @@ -168,9 +170,6 @@
管理区域 -
-
-
加油站 @@ -192,14 +191,15 @@
-
-
- - - - +
+
+ {{key + 1}}
-
+
+ + + + Ⅰ级 Ⅱ级 Ⅲ级 @@ -217,9 +217,6 @@
{{item.gasStation.locationName}}
-
- -
{{item.gasStation.stationName}}
diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index 5c33b51..16da2bd 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -127,10 +127,11 @@
-
+
+ 序号
- 预警级别 + 预警级别
预警类型 @@ -158,14 +159,16 @@
-
-
+
+
+ {{key + 1}} + +
+
-
-
Ⅰ级 Ⅱ级 Ⅲ级 diff --git a/src/app/pages/home-page/home-page.component.html b/src/app/pages/home-page/home-page.component.html index eb5a26f..09d7ae1 100644 --- a/src/app/pages/home-page/home-page.component.html +++ b/src/app/pages/home-page/home-page.component.html @@ -195,7 +195,7 @@ 摄像头（个）
-
+
@@ -264,15 +264,13 @@
累计卸油总车次
- {{HomeAggregatioData.ouViolationType.ouTotalCount}}
@@ -280,10 +278,8 @@
累计卸油预警车次
- {{HomeAggregatioData.ouViolationType.ouNotCorrectCount}}
-
diff --git a/src/app/pages/home-page/home-page.component.scss b/src/app/pages/home-page/home-page.component.scss index 6e31fa8..2bcbd41 100644 --- a/src/app/pages/home-page/home-page.component.scss +++ b/src/app/pages/home-page/home-page.component.scss @@ -400,13 +400,13 @@ padding: 12px 0; .numlistbox { - height: 56px; + height: 64px; width: 61%; display: flex; img { - width: 56px; - height: 56px; + width: 64px; + height: 64px; margin-right: 24px; } @@ -423,10 +423,10 @@ } .lightspan { - font-size: 30px; + font-size: 32px; font-weight: 600; - line-height: 30px; - margin-bottom: 5px; + line-height: 32px; + margin-bottom: 12px; } .lightspan1 { 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 562d67f..fd460bf 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 @@ -100,10 +100,11 @@
- -
- 油站名称 +
+ 序号 +
+
+ 油站名称
公司名称 @@ -134,11 +135,12 @@
-
- -
- {{item.gasStation.stationName}} +
+
+ {{key + 1}} +
+
+ {{item.gasStation.stationName}}
{{item.gasStation.companyName}} diff --git a/src/app/pages/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/warning-statistics-list/warning-statistics-list.component.html index 45e884d..7657780 100644 --- a/src/app/pages/warning-statistics-list/warning-statistics-list.component.html +++ b/src/app/pages/warning-statistics-list/warning-statistics-list.component.html @@ -50,10 +50,10 @@
-
+
-
- 证件名称 +
+ 序号
- 证件编号 + 预警类别
-
- 所属油站 +
+ 预警内容
- 有效期限 + 公司名称
-
- 是/否年审 +
+ 区域名称
- 年审日期 + 所属油站
- 年审机构 + 证照/消防设施名称
- 联系电话 + 有效期限
操作
-
-
- {{item.violatedItemSnapshotObj.name}} +
+
+ {{key+1}}
- {{item.violatedItemSnapshotObj.code}} + + 办理提醒 + 临期提醒 + 逾期报警 + + + / +
-
- {{item.gasStation.stationName}} +
+ + {{item.desc}}办理提醒 + {{item.desc}}临期提醒 + {{item.desc}}逾期报警 + + + / +
- {{item.violatedItemSnapshotObj.startTime | - date:"yyyy-MM-dd"}}至{{item.violatedItemSnapshotObj.endTime | date:"yyyy-MM-dd"}} -
-
- {{item.violatedItemSnapshotObj.hasAnnualInspection ? '是' : '否'}} + {{item.gasStation.companyName ? item.gasStation.companyName : '/'}}
- {{item.violatedItemSnapshotObj.annualInspectionTime | date:"yyyy-MM-dd"}} + {{item.gasStation.locationName ? item.gasStation.locationName : '/'}}
- {{item.violatedItemSnapshotObj.annualInspectionOrganizationName}} + {{item.gasStation.stationName ? item.gasStation.stationName : '/'}}
- {{item.gasStation.leaderContact}} -
-
- 查看 -
-
-
-
- -
-
-
-
-
-
-
-
-
- 消防器材名称 -
-
- 所属油站 -
-
- 规格 -
-
- 购入日期 -
-
- 出厂日期（生产日期） -
-
- 有效期 -
-
- 操作 -
-
-
-
-
- {{item.violatedItemSnapshotObj.name}} -
-
- {{item.gasStation.stationName}} + {{item.violatedItemSnapshotObj.name ? item.violatedItemSnapshotObj.name : '/'}}
- {{item.violatedItemSnapshotObj.specification}} -
-
- {{item.violatedItemSnapshotObj.purchaseDate | date:"yyyy-MM-dd"}} -
-
- {{item.violatedItemSnapshotObj.productionDate | date:"yyyy-MM-dd"}} -
-
- {{item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}} + {{item.violatedItemSnapshotObj.validityEndTime ? + (item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}}
- 处置 + 查看
diff --git a/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts b/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts index 6622146..4c0e47e 100644 --- a/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts +++ b/src/app/pages/warning-statistics-list/warning-statistics-list.component.ts @@ -47,7 +47,7 @@ export class WarningStatisticsListComponent implements OnInit { let lastD = lw.getDate(); this.startdate = JSON.parse(JSON.stringify(lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD)));//三十天之前日期 this.validateForm = this.fb.group({ - state: ['0'], + eventSystemName: null, organization: [null], datePicker: [[this.startdate, this.enddate]] }); @@ -470,6 +470,7 @@ export class WarningStatisticsListComponent implements OnInit { defaultOrId: string //获取所有组织机构 nodes: any = [] + eventSystemNameOption = [] getAllOrganization() { let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id let params = { @@ -494,14 +495,20 @@ export class WarningStatisticsListComponent implements OnInit { }); this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { console.log('预警事件', data.result) + let option1 + let option2 data.result.forEach(element => { if (element.eventSystemName == '证照预警') { - this.licenseId = element.id + option1 = element.id } if (element.eventSystemName == '灭火器维护') { - this.equipmentId = element.id + option2 = element.id } }); + this.eventSystemNameOption = [ + { id: option1, name: '证照预警' }, + { id: option2, name: '消防设施预警' }, + ] this.list = [] this.SkipCount = '0' this.getLicenseList() @@ -530,20 +537,23 @@ export class WarningStatisticsListComponent implements OnInit { } else { organizationUnitId = this.validateForm.value.organization } + let ViolationIds = [] - if (this.validateForm.value.state == '0') { - ViolationIds = [this.licenseId] + console.log(456, this.validateForm.value) + if (this.validateForm.value.eventSystemName) { + ViolationIds.push(this.validateForm.value.eventSystemName) } else { - ViolationIds = [this.equipmentId] + this.eventSystemNameOption.forEach(element => { + ViolationIds.push(element.id) + }); } - console.log('查询日期', this.validateForm.value.datePicker) let params = { ViolationIds: ViolationIds, organizationUnitId: organizationUnitId, ViolateTime: (this.validateForm.value.datePicker[0] && this.validateForm.value.datePicker[1]) ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD HH:mm:ss')] : null, IsContainsChildren: 'true', - SkipCount: '0', - MaxResultCount: '9999' + SkipCount: this.SkipCount, + MaxResultCount: '50' } this.http.get('/api/services/app/ViolateRecord/GetAll', { params: params @@ -559,19 +569,6 @@ export class WarningStatisticsListComponent implements OnInit { }) } - isLicenseTable = true - tableChange($event) { - console.log('走了几遍') - this.SkipCount = '0' - this.list = [] - if ($event == 0) { - this.isLicenseTable = true - } else { - this.isLicenseTable = false - } - this.getLicenseList() - } - submitForm(): void { for (const i in this.validateForm.controls) { @@ -581,10 +578,9 @@ export class WarningStatisticsListComponent implements OnInit { this.list = [] this.SkipCount = '0' - this.getLicenseList() - } + resetForm(e: MouseEvent): void { e.preventDefault(); for (const key in this.validateForm.controls) { @@ -594,9 +590,12 @@ export class WarningStatisticsListComponent implements OnInit { console.log('赋值日期', [this.startdate, this.enddate]) this.validateForm.patchValue({ datePicker: [this.startdate, this.enddate], - state: '0', + eventSystemName: null, organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id }); + this.list = [] + this.SkipCount = '0' + this.getLicenseList() } ngAfterViewInit(): void { fromEvent(this.element.nativeElement.querySelector(`#tbody`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe((event: any) => { //监听 DOM 滚动事件 @@ -612,32 +611,36 @@ export class WarningStatisticsListComponent implements OnInit { } look(item) { console.log(item) - const modal = this.modal.create({ - nzContent: GetOutOfLineDetailsComponent, - nzWrapClassName: "vertical-center-modal", - nzViewContainerRef: this.viewContainerRef, - nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200, - nzBodyStyle: { - 'border': '1px solid #6d9cc7', - 'border-radius': '0px', - 'padding': '0px', - 'box-shadow': '0 0 8px 0 #fff', - 'background': '#000D21', - }, - nzComponentParams: { - data: item - }, - nzFooter: null, - nzOnOk: async () => { - console.log(99999, instance.content) - } - }); - const instance = modal.getContentComponent(); + if (item.violation.eventSystemName == '证照预警') { + const modal = this.modal.create({ + nzContent: GetOutOfLineDetailsComponent, + nzWrapClassName: "vertical-center-modal", + nzViewContainerRef: this.viewContainerRef, + nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200, + nzBodyStyle: { + 'border': '1px solid #6d9cc7', + 'border-radius': '0px', + 'padding': '0px', + 'box-shadow': '0 0 8px 0 #fff', + 'background': '#000D21', + }, + nzComponentParams: { + data: item + }, + nzFooter: null, + nzOnOk: async () => { + console.log(99999, instance.content) + } + }); + const instance = modal.getContentComponent(); + } else { + this.dispose(item) + } + } //处置消防设施 dispose(item) { - console.log(item) const modal = this.modal.create({ nzContent: DisposeequipmentComponent, nzViewContainerRef: this.viewContainerRef, @@ -715,6 +718,8 @@ export class WarningStatisticsListComponent implements OnInit { }); const instance = modal.getContentComponent(); } + + goOilList() { if (this.router.url.indexOf('petrolStation') != -1) { this.router.navigate(['/records/petrolStation/oliunloadinglist'])