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 fe67121..0fe3787 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 @@ -228,6 +228,7 @@ 处置 --> + + +
+
+ \ No newline at end of file diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.scss b/src/app/pages/today-warning-admin/today-warning-admin.component.scss index 50e2df7..473dd55 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.scss +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.scss @@ -102,17 +102,14 @@ margin-bottom: 12px; background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%); box-sizing: border-box; - padding-left: 20px; - padding-right: 60px; - + white-space: nowrap; div { font-size: 15px; text-align: left; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - display: flex; - align-items: center; button { font-size: 15px; @@ -121,7 +118,15 @@ color: #91CCFF; } } - + .imgbox{ + span{ + img{ + width: 30%; + height: 30%; + margin-left: 15px; + } + } + } .propsm { display: inline-block; width: 38px; @@ -208,7 +213,6 @@ overflow-y: auto; box-sizing: border-box; padding: 16px 35px 16px 36px; - .listitem { height: 40px; line-height: 40px; 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 e4d9c77..01e11e0 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 @@ -25,7 +25,7 @@ export class TodayWarningAdminComponent implements OnInit { validateForm!: FormGroup; constructor(private http: HttpClient, private fb: FormBuilder, private router: Router, private toTree: TreeService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private navChangeService: NavChangeService, private message: NzMessageService) { } - + isSpin:boolean = false ngOnInit(): void { this.validateForm = this.fb.group({ level: [null], @@ -112,13 +112,14 @@ export class TodayWarningAdminComponent implements OnInit { disposalState = null } console.log(this.validateForm.value) + this.isSpin = true let params = { Level: this.validateForm.value.level, ViolationIds: ViolationIds, ViolateArea: this.validateForm.value.area, organizationUnitId: this.validateForm.value.organization, - ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null, - // ViolateTime: ['2021-10-27', '2021-11-26'], + // ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null, + ViolateTime: ['2021-10-27', '2021-11-26'], IsHandled: disposalState, IsContainsChildren: 'true', SkipCount: '0', @@ -130,7 +131,7 @@ export class TodayWarningAdminComponent implements OnInit { this.list = data.result.items this.totalCount = data.result.totalCount console.log('预警列表', this.list) - + this.isSpin = false let obj = { name: '改变数量', num: this.totalCount @@ -171,6 +172,7 @@ export class TodayWarningAdminComponent implements OnInit { isVisible = false look(item) { + console.log(item) const modal = this.modal.create({ nzContent: GetOutOfLineDetailsComponent, nzWrapClassName: "vertical-center-modal", @@ -188,7 +190,7 @@ export class TodayWarningAdminComponent implements OnInit { }, nzFooter: null, nzOnOk: async () => { - + console.log(99999,instance.content) } }); 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 878aa06..7c68539 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 @@ -5,7 +5,7 @@ 预警截图
-
+
预警视频
@@ -23,16 +23,24 @@
-
+
处置内容 - 提交 - 已处置 + 提交
+
+
+ 处置内容 + 已处置 +
+
+ {{content}} +
+
\ No newline at end of file diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss index 8d6c8ee..c89cc5d 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss @@ -93,10 +93,13 @@ } } - + .disposebox2{ + height: 40px; + } .imgbox { flex: 1; display: flex; + align-items: center; width: 100%; .imglist { @@ -147,6 +150,8 @@ .vediobox { flex: 1; width: 100%; + display: flex; + align-items: center; video{ max-height: 500px; } 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 fb97bce..2401989 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 @@ -38,6 +38,7 @@ export class GetOutOfLineDetailsComponent implements OnInit { this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => { this.message.create('success', '处置成功！'); this.data.handleTime = new Date() + this.data.handleRecord = this.content }) } } diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html index befdc06..0a26e89 100644 --- a/src/app/pages/today-warning/today-warning.component.html +++ b/src/app/pages/today-warning/today-warning.component.html @@ -76,9 +76,9 @@ -
+
-
+
@@ -109,7 +109,7 @@ 预警类型: {{item.violation.violationType}}
- 预警信息: {{item.violation.violationName}} + 预警信息: {{item.violation.eventSystemName}}
区域: {{item.violateArea}} @@ -117,7 +117,7 @@
摄像头: {{item.cameraNo}}
-
+
{{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
@@ -128,11 +128,12 @@ 已处置
-
+
- - 已处置 +
+
\ No newline at end of file diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss index ad0c680..fb6333f 100644 --- a/src/app/pages/today-warning/today-warning.component.scss +++ b/src/app/pages/today-warning/today-warning.component.scss @@ -113,6 +113,14 @@ color: #91CCFF; } } + .imgbox{ + span{ + img{ + width: 30%; + height: 80%; + } + } + } } .dispositioned { diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts index 7e68090..6c0df6a 100644 --- a/src/app/pages/today-warning/today-warning.component.ts +++ b/src/app/pages/today-warning/today-warning.component.ts @@ -54,6 +54,7 @@ export class TodayWarningComponent implements OnInit { list: any = [ ] totalCount: string //预警总数 + isSpin:boolean = false getEarlyWarningList() { let ViolationIds = [] if (this.validateForm.value.type) { @@ -74,20 +75,21 @@ export class TodayWarningComponent implements OnInit { ViolationIds: ViolationIds, ViolateArea: this.validateForm.value.area, organizationUnitId: JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id, - ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null, + // ViolateTime: (this.validateForm.value.datePickerEnd && this.validateForm.value.datePickerStart) ? [moment(this.validateForm.value.datePickerStart).format('yyyy-MM-DD HH:mm:ss'), moment(this.validateForm.value.datePickerEnd).format('yyyy-MM-DD HH:mm:ss')] : null, IsHandled: disposalState, - // ViolateTime: ['2021-10-27', '2021-11-26'], + ViolateTime: ['2021-10-27', '2021-11-26'], IsContainsChildren: 'true', SkipCount: '0', MaxResultCount: '9999' } + this.isSpin = true this.http.get('/api/services/app/ViolateRecord/GetAll', { params: params }).subscribe((data: any) => { this.list = data.result.items this.totalCount = data.result.totalCount console.log('预警列表', this.list) - + this.isSpin = false let obj = { name: '改变数量', num: this.totalCount