陈鹏飞 2 years ago
parent
commit
338ecd05bd
  1. 17
      src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
  2. 1
      src/app/pages/license/update-category/update-category.component.scss
  3. 1
      src/app/pages/license/update-category/update-category.component.ts
  4. 2
      src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts
  5. 4
      src/app/pages/records/criminal-records/criminal-records.component.ts
  6. 5
      src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.html
  7. 7
      src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts
  8. 19
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html
  9. 4
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss
  10. 77
      src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts
  11. 6
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

17
src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html

@ -37,7 +37,8 @@
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
<p>证照编号: &nbsp;&nbsp;{{data.getData.licenseCode || ''}}</p> <p>证照编号: &nbsp;&nbsp;{{data.getData.licenseCode || ''}}</p>
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
<p>证照效期: &nbsp;&nbsp;{{data.getData.isLongTerm ? '长期证照' : (data.getData.validityEndTime | date:"yyyy/MM/dd")}}</p> <p>证照效期: &nbsp;&nbsp;{{data.getData.isLongTerm ? '长期证照' : (data.getData.validityEndTime |
date:"yyyy/MM/dd")}}</p>
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
<p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data.getData.handleTypesDefault)}}</p> <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data.getData.handleTypesDefault)}}</p>
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
@ -50,27 +51,29 @@
</ng-template> </ng-template>
</p> </p>
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
<p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck"></span><span *ngIf="!data.getData.isYearlyCheck"></span></p> <p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck"></span><span
*ngIf="!data.getData.isYearlyCheck">否</span></p>
</div> </div>
<div *ngIf="data.auditType == 3"> <div *ngIf="data.auditType == 3">
<p>证照名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p> <p>证照名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
<p>有无证照: &nbsp;&nbsp; <p>有无证照: &nbsp;&nbsp;
<span *ngIf="data.getData.validatyType == 0">不适用</span><span *ngIf="data.getData.validatyType == 1"></span><span *ngIf="data.getData.validatyType == 2"></span> <span *ngIf="data.getData.validatyType == 0">不适用</span><span
*ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2"></span>
</p> </p>
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
<p>说明: &nbsp;&nbsp;{{data.getData.remark}}</p> <p>说明: &nbsp;&nbsp;{{data.getData.remark}}</p>
</div> </div>
<div class="cutoffrule"></div> <div class="cutoffrule"></div>
<p [hidden]="data.getData.imageUrl === undefined">附件: &nbsp;&nbsp; <p [hidden]="data.getData.imageUrl === undefined">附件: &nbsp;&nbsp;</p>
<img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'img'" <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'img'" [src]="data.getData.imageUrl"
[src]="data.getData.imageUrl" (click)="viewImg(data.getData.imageUrl)"> (click)="viewImg(data.getData.imageUrl)">
<img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'word'" <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'word'"
src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.imageUrl)"> src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData.imageUrl)">
<img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'pdf'" <img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'pdf'"
src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.imageUrl)"> src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData.imageUrl)">
<div class="cutoffrule" [hidden]="data.getData.imageUrl === undefined"></div> <div class="cutoffrule" [hidden]="data.getData.imageUrl === undefined"></div>
<p *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment">附件副本: &nbsp;&nbsp; <p *ngIf="data.getData.hasAttachmentDefault && data.getData.attachment">附件副本: &nbsp;&nbsp;</p>
<img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'img'" <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'img'"
[src]="data.getData.attachment" (click)="viewImg(data.getData.attachment)"> [src]="data.getData.attachment" (click)="viewImg(data.getData.attachment)">
<img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'word'" <img *ngIf="data.getData.attachment && getFileType(data.getData.attachment) == 'word'"

1
src/app/pages/license/update-category/update-category.component.scss

@ -1,6 +1,7 @@
.box{ .box{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden;
} }
.tablebox{ .tablebox{
width: 100%; width: 100%;

1
src/app/pages/license/update-category/update-category.component.ts

@ -148,6 +148,7 @@ export class UpdateCategoryComponent implements OnInit {
let body = instance.data2 let body = instance.data2
if (body.isLongTerm) { if (body.isLongTerm) {
body.validityStartTime = instance.isLongTermTime || new Date() body.validityStartTime = instance.isLongTermTime || new Date()
body.validityEndTime = '9999-01-01'
} else { } else {
body.validityStartTime = instance.isNoLongTermTime[0] || new Date() body.validityStartTime = instance.isNoLongTermTime[0] || new Date()
body.validityEndTime = instance.isNoLongTermTime[1] || new Date() body.validityEndTime = instance.isNoLongTermTime[1] || new Date()

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

@ -632,7 +632,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
data.result = data.result.filter((item) => { data.result = data.result.filter((item) => {
return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒' return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒'
}) })
console.log(7894,data.result)
this.warningTypesDetails = JSON.parse(JSON.stringify(data.result)) this.warningTypesDetails = JSON.parse(JSON.stringify(data.result))
this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份 this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份
this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType }); this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });

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

@ -570,6 +570,10 @@ export class CriminalRecordsComponent implements OnInit {
warningLevelsCopy: any warningLevelsCopy: any
warningType() { warningType() {
this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
data.result = data.result.filter((item) => {
return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒'
})
this.warningTypesDetails = JSON.parse(JSON.stringify(data.result)) this.warningTypesDetails = JSON.parse(JSON.stringify(data.result))
this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份 this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份
this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType }); this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType });

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

@ -82,7 +82,10 @@
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</div> </div>
<div class="btnbox" *ngIf="!data2.handleTime"> <div *ngIf="!data2.handleTime &&!isOilStationUser" style="height: 30px;">
</div>
<div class="btnbox" *ngIf="!data2.handleTime && isOilStationUser">
<button nz-button type="submit" class="ok" (click)="ok()">确定</button> <button nz-button type="submit" class="ok" (click)="ok()">确定</button>
<button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button> <button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
</div> </div>

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

@ -21,6 +21,7 @@ export class DisposeequipmentComponent implements OnInit {
isScraped isScraped
newdata newdata
isOilStationUser
ngOnInit(): void { ngOnInit(): void {
this.data2 = JSON.parse(JSON.stringify(this.data)) this.data2 = JSON.parse(JSON.stringify(this.data))
this.copydata2 = JSON.parse(JSON.stringify(this.data)) this.copydata2 = JSON.parse(JSON.stringify(this.data))
@ -57,7 +58,11 @@ export class DisposeequipmentComponent implements OnInit {
validityEndTime: [null, [Validators.required]] validityEndTime: [null, [Validators.required]]
}); });
if (sessionStorage.getItem('isGasStation') == 'true') {
this.isOilStationUser = true
} else {
this.isOilStationUser = false
}
} }
destroyModal() { destroyModal() {

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

@ -40,16 +40,24 @@
</div> </div>
<div class="search"> <div class="search">
<form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()"> <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
<nz-form-item class="searchParams">
<nz-form-control>
<nz-select (ngModelChange)="typeChange1($event)" nzAllowClear formControlName="type"
nzPlaceHolder="请选择类型">
<nz-option nzValue="证照" nzLabel="证照"></nz-option>
<nz-option nzValue="设备" nzLabel="设备"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
<nz-form-item class="searchParams searchParamsLong"> <nz-form-item class="searchParams searchParamsLong">
<nz-form-control> <nz-form-control>
<nz-select (ngModelChange)="typeChange($event)" nzAllowClear nzAllowClear <nz-select nzAllowClear formControlName="eventSystemName" nzPlaceHolder="请选择状态">
formControlName="eventSystemName" nzPlaceHolder="请选择状态">
<nz-option *ngFor="let item of eventSystemNameOption" [nzValue]="item.id" <nz-option *ngFor="let item of eventSystemNameOption" [nzValue]="item.id"
[nzLabel]="item.name"></nz-option> [nzLabel]="item.name"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item class="searchParams searchParamsLongLong eventInput" *ngIf="isListOfData"> <nz-form-item class="searchParams searchParamsLong2 eventInput" *ngIf="isListOfData">
<nz-form-control> <nz-form-control>
<nz-select [nzMaxTagCount]="1" nzMode="multitagsple" nzAllowClear formControlName="licenseType" <nz-select [nzMaxTagCount]="1" nzMode="multitagsple" nzAllowClear formControlName="licenseType"
nzPlaceHolder="请选择证照类型"> nzPlaceHolder="请选择证照类型">
@ -118,6 +126,7 @@
<th>油站名称</th> <th>油站名称</th>
<th>证照/消防设施名称</th> <th>证照/消防设施名称</th>
<th>有效期限</th> <th>有效期限</th>
<th>状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
@ -188,6 +197,10 @@
</ng-template> </ng-template>
</td> </td>
<td nzEllipsis>
<span *ngIf="item.handleTime">已处置</span>
<span *ngIf="!item.handleTime" style="color: #FF4B65;">未处置</span>
</td>
<td> <td>
<span style="cursor: pointer;color: #36A2FF;" (click)="look(item)">查看</span> <span style="cursor: pointer;color: #36A2FF;" (click)="look(item)">查看</span>
</td> </td>

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

@ -29,6 +29,10 @@
} }
.searchParamsLong2 {
width: 200px;
}
.searchParamsLong { .searchParamsLong {
width: 250px; width: 250px;
} }

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

@ -5,13 +5,12 @@ import * as echarts from 'echarts';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import * as moment from 'moment'; import * as moment from 'moment';
import { fromEvent } from 'rxjs'; import { fromEvent } from 'rxjs';
import { debounceTime } from 'rxjs/operators'; import { debounceTime, filter } from 'rxjs/operators';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { TreeService } from 'src/app/service/tree.service'; import { TreeService } from 'src/app/service/tree.service';
import { DisposeequipmentComponent } from './disposeequipment/disposeequipment.component'; import { DisposeequipmentComponent } from './disposeequipment/disposeequipment.component';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { GetOutOfLineDetailsComponent } from '../../today-warning/get-out-of-line-details/get-out-of-line-details.component'; import { GetOutOfLineDetailsComponent } from '../../today-warning/get-out-of-line-details/get-out-of-line-details.component';
@Component({ @Component({
selector: 'app-warning-statistics-list', selector: 'app-warning-statistics-list',
templateUrl: './warning-statistics-list.component.html', templateUrl: './warning-statistics-list.component.html',
@ -79,6 +78,7 @@ export class WarningStatisticsListComponent implements OnInit {
let lastD = lw.getDate(); let lastD = lw.getDate();
this.startdate = JSON.parse(JSON.stringify(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({ this.validateForm = this.fb.group({
type: null,
eventSystemName: null, eventSystemName: null,
organization: [null], organization: [null],
licenseType: [null], licenseType: [null],
@ -127,7 +127,28 @@ export class WarningStatisticsListComponent implements OnInit {
} }
isListOfData = false isListOfData = false
typeChange(e) { typeChange1(e) {
if (e) {
if (e == '证照') {
this.isListOfData = true
this.eventSystemNameOption = [...this.eventSystemNameOptionOfLicense]
} else if (e == '设备') {
this.isListOfData = false
this.validateForm.patchValue({
licenseType: []
});
this.eventSystemNameOption = [...this.eventSystemNameOptionOfEquipment]
}
} else {
this.isListOfData = false
this.validateForm.patchValue({
licenseType: []
});
this.eventSystemNameOption = [...this.eventSystemNameOptionOfEquipment, ...this.eventSystemNameOptionOfLicense]
}
}
typeChange2(e) {
if (e) { if (e) {
let obj let obj
this.eventSystemNameOption.forEach(item => { this.eventSystemNameOption.forEach(item => {
@ -135,7 +156,7 @@ export class WarningStatisticsListComponent implements OnInit {
obj = item obj = item
} }
}) })
if (obj.name == '证照预警') { if (obj.name.indexOf('证照') != -1) {
this.isListOfData = true this.isListOfData = true
} else { } else {
this.isListOfData = false this.isListOfData = false
@ -380,7 +401,11 @@ export class WarningStatisticsListComponent implements OnInit {
defaultOrId: string defaultOrId: string
//获取所有组织机构 //获取所有组织机构
nodes: any = [] nodes: any = []
eventSystemNameOption = [] eventSystemNameOption = [] //最终展示的预警类型
eventSystemNameOptionOfEquipment = [] //最终展示的预警类型
eventSystemNameOptionOfLicense = [] //最终展示的预警类型
warningTypes = []//预警类型
getAllOrganization() { getAllOrganization() {
let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
let params = { let params = {
@ -404,16 +429,19 @@ export class WarningStatisticsListComponent implements OnInit {
datePicker: [this.startdate, this.enddate] datePicker: [this.startdate, this.enddate]
}); });
this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
console.log('预警事件', data.result)
data.result.forEach(element => { data.result.forEach(element => {
if (element.violationType == '设备监测' || element.violationType == '证照资质') { if (element.violationType == '设备监测') {
this.eventSystemNameOption.push( this.eventSystemNameOptionOfEquipment.push(
{ id: element.id, name: element.eventSystemName }
)
}
if (element.violationType == '证照资质') {
this.eventSystemNameOptionOfLicense.push(
{ id: element.id, name: element.eventSystemName } { id: element.id, name: element.eventSystemName }
) )
} }
}); });
this.eventSystemNameOption = [...this.eventSystemNameOptionOfEquipment, ...this.eventSystemNameOptionOfLicense]
this.list = [] this.list = []
this.SkipCount = '0' this.SkipCount = '0'
this.getLicenseList() this.getLicenseList()
@ -433,11 +461,12 @@ export class WarningStatisticsListComponent implements OnInit {
//获得证照预警 //获得证照预警
getLicenseList() { getLicenseList() {
this.isLoading = true this.isLoading = true
this.tableSpin = true
for (const key in this.validateForm.controls) { for (const key in this.validateForm.controls) {
this.validateForm.controls[key].markAsPristine(); this.validateForm.controls[key].markAsPristine();
this.validateForm.controls[key].updateValueAndValidity(); this.validateForm.controls[key].updateValueAndValidity();
} }
this.tableSpin = true
let organizationUnitId let organizationUnitId
if (this.router.url.indexOf('petrolStation') != -1) { if (this.router.url.indexOf('petrolStation') != -1) {
organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id organizationUnitId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id
@ -448,10 +477,26 @@ export class WarningStatisticsListComponent implements OnInit {
let ViolationIds = [] let ViolationIds = []
if (this.validateForm.value.eventSystemName) { if (this.validateForm.value.eventSystemName) {
ViolationIds.push(this.validateForm.value.eventSystemName) ViolationIds.push(this.validateForm.value.eventSystemName)
} else { }
this.eventSystemNameOption.forEach(element => { if (this.validateForm.value.type && !this.validateForm.value.eventSystemName) {
ViolationIds.push(element.id) if (this.validateForm.value.type == '证照') {
}); this.eventSystemNameOptionOfLicense.forEach(i => {
ViolationIds.push(i.id)
})
}
if (this.validateForm.value.type == '设备') {
this.eventSystemNameOptionOfEquipment.forEach(i => {
ViolationIds.push(i.id)
})
}
}
if (!this.validateForm.value.type && !this.validateForm.value.eventSystemName) {
this.eventSystemNameOptionOfLicense.forEach(i => {
ViolationIds.push(i.id)
})
this.eventSystemNameOptionOfEquipment.forEach(i => {
ViolationIds.push(i.id)
})
} }
let params = { let params = {
ViolationIds: ViolationIds, ViolationIds: ViolationIds,
@ -539,8 +584,8 @@ export class WarningStatisticsListComponent implements OnInit {
this.validateForm.controls[key].markAsPristine(); this.validateForm.controls[key].markAsPristine();
this.validateForm.controls[key].updateValueAndValidity(); this.validateForm.controls[key].updateValueAndValidity();
} }
// console.log('赋值日期', [this.startdate, this.enddate])
this.validateForm.patchValue({ this.validateForm.patchValue({
type: null,
datePicker: [this.startdate, this.enddate], datePicker: [this.startdate, this.enddate],
eventSystemName: null, eventSystemName: null,
licenseType: [], licenseType: [],

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

@ -61,8 +61,6 @@ export class GetOutOfLineDetailsComponent implements OnInit {
} }
let loginUserInfo let loginUserInfo
if (sessionStorage.getItem('isGasStation') == 'true') { if (sessionStorage.getItem('isGasStation') == 'true') {
loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation')) loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation'))
@ -72,8 +70,8 @@ export class GetOutOfLineDetailsComponent implements OnInit {
this.isOilStationUser = false this.isOilStationUser = false
} }
if (loginUserInfo.roles.find((item) => { if (loginUserInfo.permissions.find((item) => {
return item.name == 'ViolationPositiveCensorer' return item.name == 'Data.Violation.Positive.Censor'
}) && this.data.violation.violationType != '证照资质') { }) && this.data.violation.violationType != '证照资质') {
this.isMisinformation = true this.isMisinformation = true
} else { } else {

Loading…
Cancel
Save