陈鹏飞 2 years ago
parent
commit
450eb24b78
  1. 4
      src/app/pages/audit/audit-ing/audit-ing.component.html
  2. 14
      src/app/pages/home-page/home-page.component.ts
  3. 30
      src/app/pages/home/home.component.ts
  4. 16
      src/app/pages/plan-admin/oil-station-list/oil-station-list.component.scss
  5. 11
      src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts
  6. 2
      src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts
  7. 2
      src/app/pages/records/criminal-records/criminal-records.component.ts
  8. 5
      src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
  9. 4
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
  10. 6
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts
  11. 2
      src/app/pages/today-warning-admin/today-warning-admin.component.ts
  12. 2
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html
  13. 4
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
  14. 2
      src/app/pages/today-warning/today-warning.component.ts

4
src/app/pages/audit/audit-ing/audit-ing.component.html

@ -5,9 +5,9 @@
<thead> <thead>
<tr> <tr>
<th [nzWidth]="'16%'"> <th [nzWidth]="'16%'">
<span style="margin-left: 30px;">审批信息</span> <span style="margin-left: 30px;">审批类型</span>
</th> </th>
<th>审批类型</th> <th>审批信息</th>
<th>油站名称</th> <th>油站名称</th>
<th [nzWidth]="'16%'">区域名称</th> <th [nzWidth]="'16%'">区域名称</th>
<th>公司名称</th> <th>公司名称</th>

14
src/app/pages/home-page/home-page.component.ts

@ -464,16 +464,16 @@ export class HomePageComponent implements OnInit {
this.userdata = JSON.parse(sessionStorage.getItem('userdata')) this.userdata = JSON.parse(sessionStorage.getItem('userdata'))
// 饼图 // 饼图
this.warningechartpieAll = echarts.init(document.getElementById('eventechartpieAll'),null,{devicePixelRatio:2}); this.warningechartpieAll = echarts.init(document.getElementById('eventechartpieAll'), null, { devicePixelRatio: 2 });
// this.equipmentechart = echarts.init(document.getElementById('equipmentechart')); // this.equipmentechart = echarts.init(document.getElementById('equipmentechart'));
// 预警饼图 // 预警饼图
this.warningechartpie = echarts.init(document.getElementById('eventechartpie'),null,{devicePixelRatio:2}); this.warningechartpie = echarts.init(document.getElementById('eventechartpie'), null, { devicePixelRatio: 2 });
// 预警线图 // 预警线图
this.warningechartbar = echarts.init(document.getElementById('eventechartline')); this.warningechartbar = echarts.init(document.getElementById('eventechartline'));
// 卸油饼图 // 卸油饼图
this.oilchartpie = echarts.init(document.getElementById('oilechartpie'),null,{devicePixelRatio:2}); this.oilchartpie = echarts.init(document.getElementById('oilechartpie'), null, { devicePixelRatio: 2 });
// 卸油线图 // 卸油线图
this.oilchartbar = echarts.init(document.getElementById('oilechartline')); this.oilchartbar = echarts.init(document.getElementById('oilechartline'));
@ -757,7 +757,10 @@ export class HomePageComponent implements OnInit {
look(item) { look(item) {
console.log('消息item', item) console.log('消息item', item)
if (item.notification.data.eventSystemName == '灭火器维护') { if (item.notification.data.eventSystemName == '设备报废临期提醒' || item.notification.data.eventSystemName == '设备报废逾期报警'
|| item.notification.data.eventSystemName == '设备维保临期提醒'
|| item.notification.data.eventSystemName == '设备维保逾期报警'
) {
this.isOpenModel = true this.isOpenModel = true
let copydata = item.notification.data let copydata = item.notification.data
copydata.violatedItemSnapshotObj = JSON.parse(copydata.violatedItemSnapshot) copydata.violatedItemSnapshotObj = JSON.parse(copydata.violatedItemSnapshot)
@ -876,9 +879,6 @@ export class HomePageComponent implements OnInit {
this.readMess(item.notification.id) this.readMess(item.notification.id)
} }
} }
//标记为已读 //标记为已读

30
src/app/pages/home/home.component.ts

@ -68,11 +68,11 @@ export class HomeComponent implements OnInit {
{ name: '资产类证照管理', url: '/system/fileOfLicense' }, { name: '资产类证照管理', url: '/system/fileOfLicense' },
{ name: '菜单管理', url: '/system/menu' }, { name: '菜单管理', url: '/system/menu' },
] ]
xitongguanli=false xitongguanli = false
userMenu=[] userMenu = []
tap=[] tap = []
menuList1=[] menuList1 = []
menuList2=[] menuList2 = []
selectedItem selectedItem
routerChange(item) { routerChange(item) {
if (item.name == this.selectedItem) { if (item.name == this.selectedItem) {
@ -84,10 +84,10 @@ export class HomeComponent implements OnInit {
} }
ngOnInit(): void { ngOnInit(): void {
let a= sessionStorage.getItem('userdata') let a = sessionStorage.getItem('userdata')
this.userMenu=JSON.parse(a).menus this.userMenu = JSON.parse(a).menus
for (let index = 0; index < this.userMenu.length; index++) { for (let index = 0; index < this.userMenu.length; index++) {
let a=this.userMenu[index].name let a = this.userMenu[index].name
this.tap.push(a) this.tap.push(a)
} }
@ -101,7 +101,7 @@ export class HomeComponent implements OnInit {
this.isGasStationNav = true this.isGasStationNav = true
for (let index = 0; index < this.menu2.length; index++) { for (let index = 0; index < this.menu2.length; index++) {
for (let k = 0; k < this.tap.length; k++) { for (let k = 0; k < this.tap.length; k++) {
if (this.tap[k]==this.menu2[index].name) { if (this.tap[k] == this.menu2[index].name) {
this.menuList1.push(this.menu2[index]) this.menuList1.push(this.menu2[index])
} }
@ -112,14 +112,14 @@ export class HomeComponent implements OnInit {
this.isGasStationBack = false this.isGasStationBack = false
for (let index = 0; index < this.menu1.length; index++) { for (let index = 0; index < this.menu1.length; index++) {
for (let k = 0; k < this.tap.length; k++) { for (let k = 0; k < this.tap.length; k++) {
if (this.tap[k]==this.menu1[index].name) { if (this.tap[k] == this.menu1[index].name) {
this.menuList1.push(this.menu1[index]) this.menuList1.push(this.menu1[index])
} }
} }
} }
for (let index = 0; index < this.tap.length; index++) { for (let index = 0; index < this.tap.length; index++) {
if (this.tap[index]=="系统管理") { if (this.tap[index] == "系统管理") {
this.xitongguanli=true this.xitongguanli = true
} }
} }
@ -246,7 +246,7 @@ export class HomeComponent implements OnInit {
console.log('推送信息后获取信息', data) console.log('推送信息后获取信息', data)
setTimeout(() => { setTimeout(() => {
let copydata = data.result let copydata = data.result
if (item.notification.data.properties.EventSystemName == '灭火器维护') { if (copydata.violation.violationType == '设备监测') {
copydata.violatedItemSnapshotObj = JSON.parse(copydata.violatedItemSnapshot) copydata.violatedItemSnapshotObj = JSON.parse(copydata.violatedItemSnapshot)
const modal = this.modal.create({ const modal = this.modal.create({
nzContent: DisposeequipmentComponent, nzContent: DisposeequipmentComponent,
@ -453,9 +453,9 @@ export class HomeComponent implements OnInit {
} }
navChange2() { navChange2() {
for (let index = 0; index < this.menu3.length; index++) { for (let index = 0; index < this.menu3.length; index++) {
let url="" let url = ""
for (let k = 0; k < this.tap.length; k++) { for (let k = 0; k < this.tap.length; k++) {
if (this.tap[k]==this.menu3[index].name) { if (this.tap[k] == this.menu3[index].name) {
this.menuList2.push(this.menu3[index]) this.menuList2.push(this.menu3[index])
} }

16
src/app/pages/plan-admin/oil-station-list/oil-station-list.component.scss

@ -1,3 +1,13 @@
.box {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
overflow: hidden;
box-sizing: border-box;
padding-bottom: 12px;
}
.search { .search {
box-sizing: border-box; box-sizing: border-box;
padding-left: 38px; padding-left: 38px;
@ -50,12 +60,6 @@
} }
} }
.box {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.tablebox { .tablebox {
flex: 1; flex: 1;

11
src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts

@ -23,12 +23,11 @@ export class OilStationListComponent implements OnInit {
tableScrollHeight tableScrollHeight
resizeListener resizeListener
ngOnInit(): void { ngOnInit(): void {
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' this.tableScrollHeight = '100px'
console.log('tableScrollHeight', this.tableScrollHeight)
// 页面监听 // 页面监听
this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
}); });
this.validateForm = this.fb.group({ this.validateForm = this.fb.group({
name: [null] name: [null]
@ -143,6 +142,10 @@ export class OilStationListComponent implements OnInit {
this.list = [...this.list] this.list = [...this.list]
this.tableSpin = false this.tableSpin = false
this.isLoading = false this.isLoading = false
setTimeout(() => {
let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight
this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 10) + 'px'
}, 0);
resolve(data) resolve(data)
}) })
}) })

2
src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts

@ -696,7 +696,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
look(item) { look(item) {
console.log('点击item', item) console.log('点击item', item)
if (item.violation.eventSystemName == '灭火器维护') { if (item.violation.violationType == '设备监测') {
item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot) item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot)
const modal = this.modal.create({ const modal = this.modal.create({
nzContent: DisposeequipmentComponent, nzContent: DisposeequipmentComponent,

2
src/app/pages/records/criminal-records/criminal-records.component.ts

@ -653,7 +653,7 @@ export class CriminalRecordsComponent implements OnInit {
} }
look(item) { look(item) {
if (item.violation.eventSystemName == '灭火器维护') { if (item.violation.violationType == '设备监测') {
item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot) item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot)
const modal = this.modal.create({ const modal = this.modal.create({
nzContent: DisposeequipmentComponent, nzContent: DisposeequipmentComponent,

5
src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html

@ -12,6 +12,9 @@
<p *ngIf="!data2.handleTime && isScrap" style="color: red;text-align: center;margin-top: 12px;">报废<span <p *ngIf="!data2.handleTime && isScrap" style="color: red;text-align: center;margin-top: 12px;">报废<span
*ngIf="data2.numberOfTimes == 2">临期预警</span><span *ngIf="data2.numberOfTimes == 3">逾期预警</span> *ngIf="data2.numberOfTimes == 2">临期预警</span><span *ngIf="data2.numberOfTimes == 3">逾期预警</span>
</p> </p>
<p *ngIf="data2.handleTime && (isScraped == '维保' || isScraped == '报废')" style="text-align: center;color: #91CCFF;"> <p *ngIf="data2.handleTime && (isScraped == '维保' || isScraped == '报废')" style="text-align: center;color: #91CCFF;">
<br> <br>
<span *ngIf="isScraped == '维保'" style="color: green;">已处置<br></span> <span *ngIf="isScraped == '维保'" style="color: green;">已处置<br></span>
@ -27,6 +30,7 @@
</p> </p>
<p *ngIf=" !data2.handleTime && isScrap" style="text-align: center;color: #91CCFF;"> <p *ngIf=" !data2.handleTime && isScrap" style="text-align: center;color: #91CCFF;">
<span>油站名称:{{data2.gasStation.stationName}}</span><br>
<span>器材名称:{{data2.violatedItemSnapshotObj.name}}</span><br> <span>器材名称:{{data2.violatedItemSnapshotObj.name}}</span><br>
<span>存放地点:{{data2.violatedItemSnapshotObj.storageLocation}}<br></span> <span>存放地点:{{data2.violatedItemSnapshotObj.storageLocation}}<br></span>
<span>有效期至:{{data2.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}}</span> <span>有效期至:{{data2.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}}</span>
@ -34,6 +38,7 @@
<form nz-form [formGroup]="validateForm" class="form"> <form nz-form [formGroup]="validateForm" class="form">
<div *ngIf=" !data2.handleTime && !isScrap"> <div *ngIf=" !data2.handleTime && !isScrap">
<p>油站名称: {{data2.gasStation.stationName}}</p>
<p>消防器材名称</p> <p>消防器材名称</p>
<nz-form-item> <nz-form-item>
<nz-form-control> <nz-form-control>

4
src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html

@ -156,7 +156,7 @@
{{item.gasStation.stationName ? item.gasStation.stationName : '/'}} {{item.gasStation.stationName ? item.gasStation.stationName : '/'}}
</td> </td>
<td nzEllipsis> <td nzEllipsis>
<ng-container *ngIf="item.violation.eventSystemName == '证照预警'; else elseTemplate3"> <ng-container *ngIf="item.violation.violationType == '证照资质'; else elseTemplate3">
{{item.violatedItemSnapshotObj.validityLicenseType.licenseName ? {{item.violatedItemSnapshotObj.validityLicenseType.licenseName ?
item.violatedItemSnapshotObj.validityLicenseType.licenseName : '/'}} item.violatedItemSnapshotObj.validityLicenseType.licenseName : '/'}}
</ng-container> </ng-container>
@ -165,7 +165,7 @@
</ng-template> </ng-template>
</td> </td>
<td> <td>
<ng-container *ngIf="item.violation.eventSystemName == '证照预警'; else elseTemplate"> <ng-container *ngIf="item.violation.violationType == '证照资质'; else elseTemplate">
<ng-container *ngIf="item.desc == '有效期'; else elseTemplate1"> <ng-container *ngIf="item.desc == '有效期'; else elseTemplate1">
{{item.violatedItemSnapshotObj.validityEndTime ? {{item.violatedItemSnapshotObj.validityEndTime ?
(item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}} (item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}}

6
src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts

@ -585,10 +585,10 @@ export class WarningStatisticsListComponent implements OnInit {
let option1 let option1
let option2 let option2
data.result.forEach(element => { data.result.forEach(element => {
if (element.eventSystemName == '证照预警') { if (element.violationType == '证照资质') {
option1 = element.id option1 = element.id
} }
if (element.eventSystemName == '灭火器维护') { if (element.violationType == '设备监测') {
option2 = element.id option2 = element.id
} }
}); });
@ -747,7 +747,7 @@ export class WarningStatisticsListComponent implements OnInit {
} }
look(item) { look(item) {
console.log(item) console.log(item)
if (item.violation.eventSystemName == '证照预警') { if (item.violation.violationType == '证照资质') {
const modal = this.modal.create({ const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent, nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal", nzWrapClassName: "vertical-center-modal",

2
src/app/pages/today-warning-admin/today-warning-admin.component.ts

@ -252,7 +252,7 @@ export class TodayWarningAdminComponent implements OnInit {
isVisible = false isVisible = false
look(item) { look(item) {
if (item.violation.eventSystemName == '灭火器维护') { if (item.violation.violationType == '设备监测') {
item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot) item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot)
const modal = this.modal.create({ const modal = this.modal.create({
nzContent: DisposeequipmentComponent, nzContent: DisposeequipmentComponent,

2
src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html

@ -5,7 +5,7 @@
预警截图 预警截图
<div class="border"></div> <div class="border"></div>
</div> </div>
<div *ngIf="data.violation && data.violation.eventSystemName != '灭火器维护' && data.violation.eventSystemName != '证照预警'" <div *ngIf="data.violation && data.violation.violationType != '设备监测' && data.violation.violationType != '证照资质'"
(click)="contentType('video')" [ngClass]="{'selected': selectedType == 'video'}"> (click)="contentType('video')" [ngClass]="{'selected': selectedType == 'video'}">
预警视频 预警视频
<div class="border"></div> <div class="border"></div>

4
src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

@ -30,7 +30,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
isLicenseWarning = false isLicenseWarning = false
ngOnInit(): void { ngOnInit(): void {
if (this.data.violation.eventSystemName == '证照预警') { if (this.data.violation.violationType == '证照资质') {
this.isLicenseWarning = true this.isLicenseWarning = true
} else { } else {
this.isLicenseWarning = false this.isLicenseWarning = false
@ -69,7 +69,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
if (loginUserInfo.roles.find((item) => { if (loginUserInfo.roles.find((item) => {
return item.name == 'ViolationPositiveCensorer' return item.name == 'ViolationPositiveCensorer'
}) && this.data.violation.eventSystemName != '证照预警') { }) && this.data.violation.violationType != '证照资质') {
this.isMisinformation = true this.isMisinformation = true
} else { } else {
this.isMisinformation = false this.isMisinformation = false

2
src/app/pages/today-warning/today-warning.component.ts

@ -217,7 +217,7 @@ export class TodayWarningComponent implements OnInit {
look(item) { look(item) {
if (item.violation.eventSystemName == '灭火器维护') { if (item.violation.violationType == '设备监测') {
item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot) item.violatedItemSnapshotObj = JSON.parse(item.violatedItemSnapshot)
const modal = this.modal.create({ const modal = this.modal.create({
nzContent: DisposeequipmentComponent, nzContent: DisposeequipmentComponent,

Loading…
Cancel
Save