+
+
-
+
@@ -143,7 +143,7 @@
{{item.gasStation.companyName}}
-
+
{{item.gasStation.locationName}}
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index b6d67f7..2f2cfcd 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -38,6 +38,7 @@ import { NzTimePickerModule } from 'ng-zorro-antd/time-picker';
import { NzProgressModule } from 'ng-zorro-antd/progress';
import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
import { NzBadgeModule } from 'ng-zorro-antd/badge';
+import { NzRadioModule } from 'ng-zorro-antd/radio';
import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component';
import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component';
import { EquipmentInfoComponent } from './equipment-info/equipment-info.component';
@@ -56,11 +57,12 @@ import { OilUnloadingProcessListComponent } from './oil-unloading-process-list/o
import { ChangePasswordComponent } from './change-password/change-password.component';
import { FacilitySortPipe } from './facility-sort.pipe';
import { WarningStatisticsListComponent } from './warning-statistics-list/warning-statistics-list.component';
+import { DisposeequipmentComponent } from './warning-statistics-list/disposeequipment/disposeequipment.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],
+ declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
+ TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
+ AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent],
imports: [
@@ -99,9 +101,10 @@ import { WarningStatisticsListComponent } from './warning-statistics-list/warnin
NzProgressModule,
NzNotificationModule,
NzPopconfirmModule,
- NzBadgeModule
+ NzBadgeModule,
+ NzRadioModule
],
- entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent,DispositionComponent,OilUnloadingProcessComponent,ChangePasswordComponent],
+ entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
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 2b72f1f..d366cb3 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
@@ -16,6 +16,7 @@ import 'linqjs';
import { DispositionComponent } from '../disposition/disposition.component';
import { NzMessageService } from 'ng-zorro-antd/message';
import { listRefreshService } from '../../service/listRefresh.service';
+import { DisposeequipmentComponent } from '../warning-statistics-list/disposeequipment/disposeequipment.component';
@Component({
selector: 'app-today-warning-admin',
templateUrl: './today-warning-admin.component.html',
@@ -192,28 +193,101 @@ export class TodayWarningAdminComponent implements OnInit {
isVisible = false
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 == '灭火器维护') {
+ item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot)
+ const modal = this.modal.create({
+ nzContent: DisposeequipmentComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: 380,
+ 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 () => {
+ if (instance.isScrap) {
+ let body = {
+ id: item.violatedItemSnapshotObj.id,
+ isScrapped: true,
+ organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
+ }
+ this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
+ // item.violatedItemSnapshotObj = data.result
+ let body = {
+ id: item.id,
+ handleRecord: '报废成功！'
+ }
+ this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
+ this.message.create('success', '报废成功！');
+ item.handleTime = new Date()
+ return true
+ })
+ })
+ } else {
+ if (instance.validateForm.valid) {
+ await new Promise(resolve => {
+ let body = {
+ id: item.violatedItemSnapshotObj.id,
+ name: instance.validateForm.value.name,
+ specification: instance.validateForm.value.specification,
+ productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
+ purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
+ }
+ this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
+ // item.violatedItemSnapshotObj = data.result
+ let body = {
+ id: item.id,
+ handleRecord: '维保成功！'
+ }
+ this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
+ resolve(data)
+ this.message.create('success', '维保成功！');
+ item.handleTime = new Date()
+ return true
+ })
+ })
+ })
+ } else {
+ this.message.create('warning', '请填写完整！');
+ return false
+ }
+ }
+ }
+ });
+ const instance = modal.getContentComponent();
+ } else {
+ 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();
+ }
+
}
diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts
index c5b086e..b164462 100644
--- a/src/app/pages/today-warning/today-warning.component.ts
+++ b/src/app/pages/today-warning/today-warning.component.ts
@@ -11,6 +11,7 @@ import * as moment from 'moment';
import { DispositionComponent } from '../disposition/disposition.component';
import { NzMessageService } from 'ng-zorro-antd/message';
import { listRefreshService } from '../../service/listRefresh.service';
+import { DisposeequipmentComponent } from '../warning-statistics-list/disposeequipment/disposeequipment.component';
@Component({
selector: 'app-today-warning',
templateUrl: './today-warning.component.html',
@@ -139,27 +140,101 @@ export class TodayWarningComponent implements OnInit {
look(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 () => {
+ if (item.violation.eventSystemName == '灭火器维护') {
+ item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot)
+ const modal = this.modal.create({
+ nzContent: DisposeequipmentComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: 380,
+ 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 () => {
+ if (instance.isScrap) {
+ let body = {
+ id: item.violatedItemSnapshotObj.id,
+ isScrapped: true,
+ organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
+ }
+ this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
+ // item.violatedItemSnapshotObj = data.result
+ let body = {
+ id: item.id,
+ handleRecord: '报废成功！'
+ }
+ this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
+ this.message.create('success', '报废成功！');
+ item.handleTime = new Date()
+ return true
+ })
+ })
+ } else {
+ if (instance.validateForm.valid) {
+ await new Promise(resolve => {
+ let body = {
+ id: item.violatedItemSnapshotObj.id,
+ name: instance.validateForm.value.name,
+ specification: instance.validateForm.value.specification,
+ productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
+ purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
+ }
+ this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
+ // item.violatedItemSnapshotObj = data.result
+ let body = {
+ id: item.id,
+ handleRecord: '维保成功！'
+ }
+ this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
+ resolve(data)
+ this.message.create('success', '维保成功！');
+ item.handleTime = new Date()
+ return true
+ })
+ })
+ })
+ } else {
+ this.message.create('warning', '请填写完整！');
+ return false
+ }
+ }
+ }
+ });
+ const instance = modal.getContentComponent();
+ } else {
+ 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 () => {
+
+ }
+ });
+ const instance = modal.getContentComponent();
+ }
- }
- });
- const instance = modal.getContentComponent();
}
dispose(item) {
diff --git a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
new file mode 100644
index 0000000..91046aa
--- /dev/null
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
@@ -0,0 +1,69 @@
+
- 证照预警统计
+ 预警统计
- 返回
@@ -34,7 +33,7 @@
- 近30天证照预警走势
+ 近30天预警走势
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.scss b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.scss
new file mode 100644
index 0000000..1f1fb6a
--- /dev/null
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.scss
@@ -0,0 +1,89 @@
+#disposeequipment {
+ .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;
+ }
+ }
+ .radiobox{
+ label{
+ color: white;
+ }
+ display: flex;
+ justify-content: center;
+ margin-top: 12px;
+ }
+ .form {
+ box-sizing: border-box;
+ padding: 0 17px;
+
+ p {
+ margin-bottom: 0;
+ color: #C4E2FC;
+ margin: 16px 0;
+ }
+
+ nz-form-item {
+ margin-bottom: 0;
+
+ input {
+ color: rgba(145, 204, 255, 0.95) !important;
+ }
+ }
+
+ nz-date-picker {
+ background-color: #143c61;
+ width: 100%;
+ }
+
+ .btnbox {
+ width: 100%;
+ margin-top: 24px;
+ margin-bottom: 17px;
+ 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.4);
+ }
+
+ .cancel {
+ border: 1px solid #C4E2FC;
+ background: #0c1e38;
+ color: rgba(99, 102, 105, 0.6);
+ box-shadow: 0 0 3px 0 #fff inset;
+ }
+ }
+ }
+
+}
diff --git a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts
new file mode 100644
index 0000000..f474da1
--- /dev/null
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts
@@ -0,0 +1,46 @@
+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';
+@Component({
+ selector: 'app-disposeequipment',
+ templateUrl: './disposeequipment.component.html',
+ styleUrls: ['./disposeequipment.component.scss']
+})
+export class DisposeequipmentComponent implements OnInit {
+
+ @Input() data?: any;
+
+ validateForm!: FormGroup;
+ constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
+
+ radioValue = "A"
+ data2
+ ngOnInit(): void {
+ this.validateForm = this.fb.group({
+ name: [null, [Validators.required]],
+ specification: [null, [Validators.required]],
+ buytime: [null, [Validators.required]],
+ prodtime: [null, [Validators.required]],
+ validitytime: [null, [Validators.required]]
+ });
+ this.data2 = JSON.parse(JSON.stringify(this.data))
+ }
+
+ destroyModal() {
+ this.modal.destroy({ data: 'this the result data' });
+ }
+ ok() {
+ this.modal.triggerOk()
+ }
+ //是否报废
+ isScrap = false
+ ngModelChange(e) {
+ console.log(e)
+ if (e == 'A') {
+ this.isScrap = false
+ } else {
+ this.isScrap = true
+ }
+ }
+}
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 9463535..45e884d 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
@@ -19,13 +19,12 @@
+
+
+
+ 处置消防器材
+
+
+ 已处置成功（维保）
+已处置成功（报废）
+ +
- 证照预警统计
+ 预警统计
{{num}}
总数
- 近30天证照预警走势
+ 近30天预警走势
-
-
+
-
+
-
- 油站名称
-
-
- 公司名称
-
-
- 区域
+ 证件名称
- 卸油开始时间
+ 证件编号
- 卸油结束时间
+ 所属油站
- 操作前准备预警节点数量
+ 有效期限
+
+
+ 是/否年审
- 操作中准备预警节点数量
+ 年审日期
- 全流程准备预警节点数量
+ 年审机构
-
- 状态
+
+
+ 联系电话
操作
@@ -134,43 +129,90 @@
-
-
+
- {{item.gasStation.stationName}}
-
-
- {{item.gasStation.companyName}}
+
+
+ {{item.violatedItemSnapshotObj.name}}
-
- {{item.gasStation.locationName}}
+
+
+ {{item.violatedItemSnapshotObj.code}}
- {{item.startTime ? (item.startTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
+ {{item.gasStation.stationName}}
- {{item.endTime ? (item.endTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
+ {{item.violatedItemSnapshotObj.startTime |
+ date:"yyyy-MM-dd"}}至{{item.violatedItemSnapshotObj.endTime | date:"yyyy-MM-dd"}}
+
+
+ {{item.violatedItemSnapshotObj.hasAnnualInspection ? '是' : '否'}}
- {{item.proccessBeforeCount}}
+ {{item.violatedItemSnapshotObj.annualInspectionTime | date:"yyyy-MM-dd"}}
- {{item.proccessingCount}}
+ {{item.violatedItemSnapshotObj.annualInspectionOrganizationName}}
- {{item.allProccessCount}}
+ {{item.gasStation.leaderContact}}
-
- 合规
-
-
- 预警
-
+ 查看
+
+
+
+
+
+
+
+
+
+
+ 消防器材名称
+
+
+ 所属油站
+
+
+ 规格
+
+
+ 购入日期
+
+
+ 出厂日期（生产日期）
+
+
+ 有效期
+
+
+ 操作
+
+
+
+
+ {{item.violatedItemSnapshotObj.name}}
+
+
+ {{item.gasStation.stationName}}
+
+
+ {{item.violatedItemSnapshotObj.specification}}
+
+
+ {{item.violatedItemSnapshotObj.purchaseDate | date:"yyyy-MM-dd"}}
+
+
+ {{item.violatedItemSnapshotObj.productionDate | date:"yyyy-MM-dd"}}
+
+
+ {{item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}}
- 查看
+ 处置
diff --git a/src/app/pages/warning-statistics-list/warning-statistics-list.component.scss b/src/app/pages/warning-statistics-list/warning-statistics-list.component.scss
index 833bcf1..09a98b6 100644
--- a/src/app/pages/warning-statistics-list/warning-statistics-list.component.scss
+++ b/src/app/pages/warning-statistics-list/warning-statistics-list.component.scss
@@ -267,6 +267,8 @@
border: 1px solid rgba(35, 217, 255, 0.4);
box-shadow: 0 0 3px 0 rgba(35, 217, 255, 0.4) inset;
color: #23D9FF;
+
+
}
.tbody {
@@ -289,6 +291,9 @@
color: #36A2FF;
cursor: pointer;
}
+ .grey{
+ color: grey!important;
+ }
}
}
}
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 289d99b..8b51c92 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
@@ -10,6 +10,8 @@ import { debounceTime } from 'rxjs/operators';
import { Router } from '@angular/router';
import { OilUnloadingProcessComponent } from '../oil-unloading-process/oil-unloading-process.component';
import { TreeService } from 'src/app/service/tree.service';
+import { DisposeequipmentComponent } from './disposeequipment/disposeequipment.component';
+import { NzMessageService } from 'ng-zorro-antd/message';
@Component({
selector: 'app-warning-statistics-list',
@@ -19,47 +21,10 @@ import { TreeService } from 'src/app/service/tree.service';
export class WarningStatisticsListComponent implements OnInit {
validateForm!: FormGroup;
- constructor(private toTree: TreeService, private http: HttpClient, private fb: FormBuilder, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private element: ElementRef) { }
+ constructor(private toTree: TreeService, private message: NzMessageService, private http: HttpClient, private fb: FormBuilder, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private element: ElementRef) { }
myChart: any //左侧饼图
mybarChart: any //柱状图
-
-
- getThirtyDays() {
- //获取当前日期
- let myDate = new Date();
- var nowY = myDate.getFullYear();
- var nowM = myDate.getMonth() + 1;
- var nowD = myDate.getDate();
- var enddateStr = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
- var enddate = new Date(enddateStr);
-
-
- //获取三十天前日期
- var lw = new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
- var lastY = lw.getFullYear();
- var lastM = lw.getMonth() + 1;
- var lastD = lw.getDate();
- var startdateStr = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
- var startDate = new Date(startdateStr);
-
- const dateList = []
- while (true) {
- startDate.setDate(startDate.getDate() + 1)
- if (startDate.getTime() <= enddate.getTime()) {
- if (startDate.getDate() < 10) {
- // startDate.getFullYear() 获取年，此处没加上年份
- dateList.push((startDate.getMonth() + 1) + '.0' + startDate.getDate())
- } else {
- dateList.push((startDate.getMonth() + 1) + '.' + startDate.getDate())
- }
- } else {
- break
- }
- }
- return dateList;
- }
-
isEcharts: boolean = true
isEchartsShow() {
this.isEcharts = !this.isEcharts
@@ -74,18 +39,19 @@ export class WarningStatisticsListComponent implements OnInit {
let nowY = myDate.getFullYear();
let nowM = myDate.getMonth() + 1;
let nowD = myDate.getDate();
- this.enddate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
+ this.enddate = JSON.parse(JSON.stringify(nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD)));//当前日期
//获取三十天前日期
let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
let lastY = lw.getFullYear();
let lastM = lw.getMonth() + 1;
let lastD = lw.getDate();
- this.startdate = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
+ this.startdate = JSON.parse(JSON.stringify(lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD)));//三十天之前日期
this.validateForm = this.fb.group({
- // state: [null],
+ state: ['0'],
organization: [null],
datePicker: [[this.startdate, this.enddate]]
});
+
// 饼图
this.myChart = echarts.init(document.getElementById('piechart'));
//柱状折线图
@@ -99,6 +65,7 @@ export class WarningStatisticsListComponent implements OnInit {
this.isOrShow = true
}
}
+
//刷新饼图图表数据
num
echartsData: any
@@ -199,7 +166,7 @@ export class WarningStatisticsListComponent implements OnInit {
},
series: [
{
- name: '证照预警事件',
+ name: '预警事件',
data: [],
type: 'bar',
itemStyle: {
@@ -220,7 +187,7 @@ export class WarningStatisticsListComponent implements OnInit {
barWidth: '25%'
},
{
- name: '证照预警事件',
+ name: '预警事件',
data: [],
type: 'line',
symbol: 'circle',
@@ -240,7 +207,7 @@ export class WarningStatisticsListComponent implements OnInit {
}
],
legend: {
- data: ['证照预警事件'],
+ data: ['预警事件'],
textStyle: {
color: '#fff'
},
@@ -436,103 +403,70 @@ export class WarningStatisticsListComponent implements OnInit {
}
};
isgoback: boolean = false
+ //获取统计信息
+ chartsSpin: boolean = false
+ getAggregations() {
+ this.chartsSpin = true
+ let organizationUnitId
+ if (this.router.url.indexOf('petrolStation') != -1) {
+ organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id
+ } else {
+ organizationUnitId = JSON.parse(sessionStorage.getItem('userdata')).organization.id
+ }
+ let params: any = {
+ OrganizationUnitId: organizationUnitId,
+ IsContainsChildren: 'true'
+ }
+ this.http.get('/api/services/app/ViolateRecord/LicenseSummary', { params: params }).subscribe((data: any) => {
+ this.chartsSpin = false
+ this.echartsData = data.result
+ this.refreshEchartsData1(this.echartsData)
+ })
+ }
refreshEchartsData1(data) {
- this.num = data.totalCount
+ console.log('echarts信息', data)
//饼图
- this.oilchartpieOptionPieData1 = [
- { name: '消防器材预警', value: data.notCorrectCount },
- { name: '证照预警', value: data.correctCount },
- ]
+ let totalCount = 0
+ data.violationList.forEach(element => {
+ element.name = element.eventSystemName
+ element.value = element.count
+ totalCount += element.count
+ });
+ this.num = totalCount
+ this.oilchartpieOptionPieData1 = data.violationList
this.oilchartpieOption.series[0].data = this.oilchartpieOptionPieData1
this.myChart.setOption(this.oilchartpieOption);
this.myChart.off('legendselectchanged')
this.myChart.off('click')
- this.myChart.on('legendselectchanged', (params) => {
- this.myChart.setOption({
- legend: { selected: { [params.name]: true } }
- })
- if (params.name == '预警事件') {
- this.isgoback = true
- this.refreshEchartsData2(this.echartsData)
- this.validateForm.patchValue({
- state: '0'
- });
- this.list = []
- this.SkipCount = '0'
- this.getViolateRecordList()
- }
- });
this.myChart.on('click', (params) => {
- if (params.name == '预警事件') {
- this.isgoback = true
- this.refreshEchartsData2(this.echartsData)
- this.validateForm.patchValue({
- state: '0'
- });
- this.list = []
- this.SkipCount = '0'
- this.getViolateRecordList()
+ if (params.name == '证照预警') {
+ console.log('点击myChart')
+ // this.validateForm.patchValue({
+ // state: '0'
+ // });
+ // this.list = []
+ // this.SkipCount = '0'
+ // this.getViolateRecordList()
}
});
//柱状图
let monthArr = []
let valuedata = []
- data.list.forEach(element => {
+ data.timeList.forEach(element => {
monthArr.push(moment(element.key).format('MM.DD'))
- valuedata.push(element.totalCount)
+ valuedata.push(element.count)
});
this.oilchartbarOption.xAxis.data = monthArr
this.oilchartbarOption.series[0].data = valuedata
this.oilchartbarOption.series[1].data = valuedata
this.mybarChart.setOption(this.oilchartbarOption);
}
- refreshEchartsData2(data) {
- this.num = Number(data.proccessBeforeCount + data.proccessingCount + data.allProccessCount)
- //饼图
- this.oilchartpieOptionPieData2 = [
- { name: '事前准备', value: data.proccessBeforeCount },
- { name: '事中操作', value: data.proccessingCount },
- { name: '全程检测', value: data.allProccessCount }
- ]
- this.oilchartpieOption2.series[0].data = this.oilchartpieOptionPieData2
- this.myChart.setOption(this.oilchartpieOption2);
-
- //柱状图
- let monthArr = []
- let valuedataBefore = []
- let valuedataIng = []
- let valuedataAll = []
- data.list.forEach(element => {
- monthArr.push(moment(element.key).format('MM.DD'))
- valuedataBefore.push(element.proccessBeforeCount)
- valuedataIng.push(element.proccessingCount)
- valuedataAll.push(element.allProccessCount)
- });
- this.oilchartbarOption2.xAxis.data = monthArr
- this.oilchartbarOption2.series[0].name = '事前准备'
- this.oilchartbarOption2.series[0].data = valuedataBefore
- this.oilchartbarOption2.series[1].name = '事中操作'
- this.oilchartbarOption2.series[1].data = valuedataIng
- this.oilchartbarOption2.series[2].name = '全程监测'
- this.oilchartbarOption2.series[2].data = valuedataAll
- this.mybarChart.setOption(this.oilchartbarOption2);
- }
- goback() {
- this.isgoback = false
- this.myChart.clear();
- this.mybarChart.clear();
- this.refreshEchartsData1(this.echartsData)
- this.validateForm.patchValue({
- state: null
- });
- this.list = []
- this.SkipCount = '0'
- this.getViolateRecordList()
- }
-
+ //预警类型接口
+ licenseId
+ equipmentId
defaultOrId: string
//获取所有组织机构
nodes: any = []
@@ -558,41 +492,37 @@ export class WarningStatisticsListComponent implements OnInit {
this.validateForm.patchValue({
datePicker: [this.startdate, this.enddate]
});
- this.list = []
- this.SkipCount = '0'
- this.getViolateRecordList()
- })
- }
- //获取统计信息
- chartsSpin: boolean = false
- getAggregations() {
- this.chartsSpin = true
- let organizationUnitId
- if (this.router.url.indexOf('petrolStation') != -1) {
- organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id
- } else {
- organizationUnitId = JSON.parse(sessionStorage.getItem('userdata')).organization.id
- }
- let params: any = {
- OrganizationUnitId: organizationUnitId,
- IsContainsChildren: 'true'
- }
- 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)
+ this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+ console.log('预警事件', data.result)
+ data.result.forEach(element => {
+ if (element.eventSystemName == '证照预警') {
+ this.licenseId = element.id
+ }
+ if (element.eventSystemName == '灭火器维护') {
+ this.equipmentId = element.id
+ }
+ });
+ this.list = []
+ this.SkipCount = '0'
+ this.getLicenseList()
+ })
+
})
}
+
//获得卸油记录列表
SkipCount: string = '0'
MaxResultCount: string = '50'
list: any = []
totalCount: string
tableSpin: boolean = false
- getViolateRecordList() {
+ //获得证照预警
+ getLicenseList() {
+ for (const key in this.validateForm.controls) {
+ this.validateForm.controls[key].markAsPristine();
+ this.validateForm.controls[key].updateValueAndValidity();
+ }
this.tableSpin = true
let organizationUnitId
if (this.router.url.indexOf('petrolStation') != -1) {
@@ -600,29 +530,49 @@ export class WarningStatisticsListComponent implements OnInit {
} else {
organizationUnitId = this.validateForm.value.organization
}
- let IsCorrect = null
- if (this.validateForm.value.state) {
- this.validateForm.value.state == '0' ? IsCorrect = 'false' : IsCorrect = 'true'
+ let ViolationIds = []
+ if (this.validateForm.value.state == '0') {
+ ViolationIds = [this.licenseId]
+ } else {
+ ViolationIds = [this.equipmentId]
}
+ console.log('查询日期', this.validateForm.value.datePicker)
let params = {
- IsCorrect: IsCorrect,
- StartTime: moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'),
- EndTime: moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD'),
+ 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',
- OrganizationUnitId: organizationUnitId,
- SkipCount: this.SkipCount,
- MaxResultCount: this.MaxResultCount
+ SkipCount: '0',
+ MaxResultCount: '9999'
}
- this.http.get('/api/services/app/OilUnloadingProcess/GetAll', {
+ this.http.get('/api/services/app/ViolateRecord/GetAll', {
params: params
}).subscribe((data: any) => {
this.tableSpin = false
+ data.result.items.forEach(element => {
+ element.violatedItemSnapshotObj = JSON.parse(element.violatedItemSnapshot)
+ });
this.list = this.list.concat(data.result.items);
this.list = [...this.list]
this.totalCount = data.result.totalCount
- console.log('获取卸油流程列表', data.result.items)
+ console.log('证照预警列表', data.result.items)
})
}
+
+ 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) {
this.validateForm.controls[i].markAsDirty();
@@ -631,24 +581,22 @@ export class WarningStatisticsListComponent implements OnInit {
this.list = []
this.SkipCount = '0'
- this.getViolateRecordList()
+
+ this.getLicenseList()
+
}
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();
}
- console.log(JSON.parse(sessionStorage.getItem('userdata')).organization.id)
- // this.validateForm.value.organization = JSON.parse(sessionStorage.getItem('userdata')).organization.id
+ console.log('赋值日期', [this.startdate, this.enddate])
this.validateForm.patchValue({
- organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
- datePicker: [this.startdate, this.enddate]
+ datePicker: [this.startdate, this.enddate],
+ state: '0',
+ organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id
});
- this.list = []
- this.SkipCount = '0'
- this.getViolateRecordList()
}
ngAfterViewInit(): void {
fromEvent(this.element.nativeElement.querySelector(`#tbody`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe((event: any) => { //监听 DOM 滚动事件
@@ -656,17 +604,19 @@ export class WarningStatisticsListComponent implements OnInit {
if (this.totalCount > this.list.length) {
console.log('需要加载数据了', event)
this.SkipCount = String(Number(this.SkipCount) + 50)
- this.getViolateRecordList()
+ this.getLicenseList()
}
}
});
}
look(item) {
+ console.log(item)
const modal = this.modal.create({
- nzContent: OilUnloadingProcessComponent,
+ nzContent: GetOutOfLineDetailsComponent,
+ nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
- nzWidth: 1000,
+ nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
nzBodyStyle: {
'border': '1px solid #6d9cc7',
'border-radius': '0px',
@@ -679,19 +629,95 @@ export class WarningStatisticsListComponent implements OnInit {
},
nzFooter: null,
nzOnOk: async () => {
-
+ console.log(99999, instance.content)
}
});
const instance = modal.getContentComponent();
}
+ //处置消防设施
+ dispose(item) {
+ const modal = this.modal.create({
+ nzContent: DisposeequipmentComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: 380,
+ 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 () => {
+ if (instance.isScrap) {
+ let body = {
+ id: item.violatedItemSnapshotObj.id,
+ name: instance.validateForm.value.name,
+ specification: instance.validateForm.value.specification,
+ productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
+ purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ isScrapped: true,
+ organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
+ }
+ this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
+ let body = {
+ id: item.id,
+ handleRecord: '报废成功！'
+ }
+ this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
+ this.message.create('success', '报废成功！');
+ item.handleTime = new Date()
+ return true
+ })
+ })
+ } else {
+ if (instance.validateForm.valid) {
+ await new Promise(resolve => {
+ let body = {
+ id: item.violatedItemSnapshotObj.id,
+ name: instance.validateForm.value.name,
+ specification: instance.validateForm.value.specification,
+ productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
+ purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
+ }
+ this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
+ // item.violatedItemSnapshotObj = data.result
+ let body = {
+ id: item.id,
+ handleRecord: '维保成功！'
+ }
+ this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => {
+ resolve(data)
+ this.message.create('success', '维保成功！');
+ item.handleTime = new Date()
+ return true
+ })
+ })
+ })
+ } else {
+ this.message.create('warning', '请填写完整！');
+ return false
+ }
+ }
+ }
+ });
+ const instance = modal.getContentComponent();
+ }
goOilList() {
if (this.router.url.indexOf('petrolStation') != -1) {
this.router.navigate(['/records/petrolStation/oliunloadinglist'])
} else {
this.router.navigate(['/records/oliunloadinglist'])
}
-
+
}
gorecordList() {
if (this.router.url.indexOf('petrolStation') != -1) {
diff --git a/src/theme.less b/src/theme.less
index 34ee461..6091c84 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -148,7 +148,8 @@
//深蓝色input
#login,
#equipmentInfo,
-#addequipment {
+#addequipment,
+#disposeequipment {
nz-input-group,
input {
@@ -191,7 +192,8 @@
#warningbox,
#warningboxadmin,
#addequipment,
-#stationPlanBox {
+#stationPlanBox,
+#disposeequipment {
::-webkit-input-placeholder {
/* WebKit browsers */
color: #345d85;