From 7dabaa37d4b4081eb5410b0dee4a837e82c80b1e Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sat, 16 Apr 2022 17:09:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E8=AF=AF?= =?UTF-8?q?=E6=8A=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.ts | 10 ++++- src/app/pages/home/home.component.ts | 2 +- .../today-warning-admin.component.ts | 14 +++++-- .../get-out-of-line-details.component.html | 2 +- .../get-out-of-line-details.component.ts | 38 +++++++++++++------ .../today-warning/today-warning.component.ts | 10 ++++- .../system-management/role/role.component.ts | 10 ++++- .../user/adduser/adduser.component.ts | 8 +++- .../user/edituser/edituser.component.ts | 12 ++++-- .../system-management/user/user.component.ts | 14 +++++-- 10 files changed, 91 insertions(+), 29 deletions(-) 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 7d0c97f..85cb19e 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 @@ -685,7 +685,15 @@ export class CriminalRecordsAdminComponent implements OnInit { }, nzFooter: null, nzOnOk: async () => { - + console.log('误报处理') + for (let index = 0; index < this.list.length; index++) { + const element = this.list[index]; + if (element.id == item.id) { + this.list.splice(index, 1) + this.totalCount = String(Number(this.totalCount) - 1) + this.SkipCount = String(Number(this.SkipCount) - 1) + } + } } }); const instance = modal.getContentComponent(); diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 2255548..d0d97c1 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -283,7 +283,7 @@ export class HomeComponent implements OnInit { nzComponentParams: { data: copydata }, - nzFooter: null, + nzFooter: null }); const instance = modal.getContentComponent(); } 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 5bf9863..87c6258 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 @@ -49,10 +49,10 @@ export class TodayWarningAdminComponent implements OnInit { } //更新处置状态 if (message.type == 'updatehandleTime') { - console.log('更新处置状态',message) + console.log('更新处置状态', message) console.log(this.list) this.list.forEach(element => { - if(element.id == message.data){ + if (element.id == message.data) { element.handleTime = new Date() } }); @@ -302,7 +302,15 @@ export class TodayWarningAdminComponent implements OnInit { }, nzFooter: null, nzOnOk: async () => { - console.log(99999, instance.content) + console.log('误报处理') + for (let index = 0; index < this.list.length; index++) { + const element = this.list[index]; + if (element.id == item.id) { + this.list.splice(index, 1) + this.totalCount = String(Number(this.totalCount) - 1) + // this.SkipCount = String(Number(this.SkipCount) - 1) + } + } } }); const instance = modal.getContentComponent(); diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html index 6bb2cc3..8f8773a 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html @@ -27,7 +27,7 @@
处置内容
- 误报 提交 已处置 diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts index 21b3c33..86d8359 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts @@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalService } from 'ng-zorro-antd/modal'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @Component({ selector: 'app-get-out-of-line-details', templateUrl: './get-out-of-line-details.component.html', @@ -11,19 +11,37 @@ import { NzModalService } from 'ng-zorro-antd/modal'; export class GetOutOfLineDetailsComponent implements OnInit { @Input() data: any - constructor(private fb: FormBuilder, private http: HttpClient, private message: NzMessageService, private modal: NzModalService) { } + constructor(private fb: FormBuilder, private http: HttpClient, private message: NzMessageService, private modal: NzModalService, private initialModal: NzModalRef) { } imgUrl: string vedioUrl: string content details + + + isMisinformation: boolean = false//误报按钮的显隐 ngOnInit(): void { console.log(this.data) this.details = this.data.content1 this.imgUrl = this.data.violateImage this.vedioUrl = this.data.violateVideo this.content = this.data.handleRecord + + let loginUserInfo + if (sessionStorage.getItem('isGasStation') == 'true') { + loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation')) + } else { + loginUserInfo = JSON.parse(sessionStorage.getItem('userdata')) + } + + if (loginUserInfo.roles.find((item) => { + return item.name == 'ViolationPositiveChecker' + }) && this.data.violation.eventSystemName != '证照预警') { + this.isMisinformation = true + } else { + this.isMisinformation = false + } } @@ -54,18 +72,14 @@ export class GetOutOfLineDetailsComponent implements OnInit { nzOnOk: () => { let body = { id: this.data.id, - handleRecord: this.content ? this.content : '此条预警为误报', - isFalsePositive: true + positive: false } - this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => { + this.http.post('/api/services/app/ViolateRecord/CheckViolateRecord', body).subscribe(data => { this.message.create('success', '处置成功！'); - this.data.handleTime = new Date() - if (this.content) { - this.data.handleRecord = this.content - } else { - this.data.handleRecord = '此条预警为误报' - this.content = '此条预警为误报' - } + // this.data.handleTime = new Date() + this.initialModal.triggerOk() + }, err => { + this.message.create('warning', '处置失败，请联系管理员！'); }) }, diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts index 763ba24..c2e3942 100644 --- a/src/app/pages/today-warning/today-warning.component.ts +++ b/src/app/pages/today-warning/today-warning.component.ts @@ -249,7 +249,15 @@ export class TodayWarningComponent implements OnInit { }, nzFooter: null, nzOnOk: async () => { - + console.log('误报处理') + for (let index = 0; index < this.list.length; index++) { + const element = this.list[index]; + if (element.id == item.id) { + this.list.splice(index, 1) + this.totalCount = String(Number(this.totalCount) - 1) + // this.SkipCount = String(Number(this.SkipCount) - 1) + } + } } }); const instance = modal.getContentComponent(); diff --git a/src/app/system-management/role/role.component.ts b/src/app/system-management/role/role.component.ts index 39ae8ee..d9f42a9 100644 --- a/src/app/system-management/role/role.component.ts +++ b/src/app/system-management/role/role.component.ts @@ -18,7 +18,7 @@ export class RoleComponent implements OnInit { ngOnInit(): void { this.getAllRoles() - this.loadMore() + this.loadMore() } listOfData: any[] = []; @@ -26,7 +26,13 @@ export class RoleComponent implements OnInit { //获取角色列表 getAllRoles() { - this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => { + let params = { + SkipCount: '0', + MaxResultCount: '999' + } + this.http.get('/api/services/app/Role/GetAll', { + params: params + }).subscribe((data: any) => { console.log('角色列表', data.result.items) this.listOfData = data.result.items }) diff --git a/src/app/system-management/user/adduser/adduser.component.ts b/src/app/system-management/user/adduser/adduser.component.ts index ed57586..fa79626 100644 --- a/src/app/system-management/user/adduser/adduser.component.ts +++ b/src/app/system-management/user/adduser/adduser.component.ts @@ -35,7 +35,13 @@ export class AdduserComponent implements OnInit { //获取角色列表 getAllRoles() { - this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => { + let params = { + SkipCount: '0', + MaxResultCount: '999' + } + this.http.get('/api/services/app/Role/GetAll', { + params: params + }).subscribe((data: any) => { console.log('角色列表', data.result.items) this.listOfData = data.result.items }) diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts index 3b03612..c58bd2e 100644 --- a/src/app/system-management/user/edituser/edituser.component.ts +++ b/src/app/system-management/user/edituser/edituser.component.ts @@ -28,10 +28,10 @@ export class EdituserComponent implements OnInit { // Promise.all([this.getAllRoles(), this.getAllOrganization()]).then(()=>{ // this.modal.containerInstance.config.nzOkLoading = false // }) - if(this.listOfData.length == 0){ + if (this.listOfData.length == 0) { this.getAllRoles() } - if(this.nodes.length == 0){ + if (this.nodes.length == 0) { this.getAllOrganization() } } @@ -42,8 +42,14 @@ export class EdituserComponent implements OnInit { //获取角色列表 async getAllRoles() { + let params = { + SkipCount: '0', + MaxResultCount: '999' + } await new Promise((resolve, reject) => { - this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => { + this.http.get('/api/services/app/Role/GetAll', { + params: params + }).subscribe((data: any) => { resolve(data) this.listOfData = data.result.items }) diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts index 9da47ef..018bcf5 100644 --- a/src/app/system-management/user/user.component.ts +++ b/src/app/system-management/user/user.component.ts @@ -52,11 +52,17 @@ export class UserComponent implements OnInit { this.getAllUsers() } - listOfData:any = [] + listOfData: any = [] //获取角色列表 async getAllRoles() { + let params = { + SkipCount: '0', + MaxResultCount: '999' + } await new Promise((resolve, reject) => { - this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => { + this.http.get('/api/services/app/Role/GetAll', { + params: params + }).subscribe((data: any) => { resolve(data) this.listOfData = data.result.items }) @@ -153,8 +159,8 @@ export class UserComponent implements OnInit { // nzOkLoading: true, nzComponentParams: { data: data, - listOfData:this.listOfData, - nodes:this.nodes + listOfData: this.listOfData, + nodes: this.nodes }, nzOnOk: async () => { if (instance.validateForm.valid) {