From 95d5bc65cf444af240173d95e7984b6a5a0d40e4 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 1 Jul 2022 11:42:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=846.25?= =?UTF-8?q?=E5=8F=B7=E6=96=87=E6=A1=A3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.html | 6 ++++-- .../criminal-records/criminal-records.component.html | 6 ++++-- .../warning-statistics-list.component.html | 8 ++++---- .../get-out-of-line-details.component.html | 1 - .../get-out-of-line-details.component.scss | 5 +++-- src/app/system-management/push/push.component.html | 4 ++-- .../user/adduser/adduser.component.ts | 3 ++- .../user/edituser/edituser.component.ts | 3 ++- src/app/system-management/user/user.component.html | 12 +++--------- src/app/system-management/user/user.component.ts | 10 +++++----- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html index 54cb72c..a1c79fc 100644 --- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html @@ -203,8 +203,10 @@ 误报 - 已处置 - 未处置 + + {{item.handleStateStr}} diff --git a/src/app/pages/records/criminal-records/criminal-records.component.html b/src/app/pages/records/criminal-records/criminal-records.component.html index 7fe7735..faa2d1c 100644 --- a/src/app/pages/records/criminal-records/criminal-records.component.html +++ b/src/app/pages/records/criminal-records/criminal-records.component.html @@ -177,8 +177,10 @@ 误报 - 已处置 - 未处置 + + {{item.handleStateStr}} diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html index 78251d5..cbd828c 100644 --- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html +++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html @@ -183,7 +183,6 @@ {{item.violatedItemSnapshotObj.YearlyCheckDate ? (item.violatedItemSnapshotObj.YearlyCheckDate | date:"yyyy-MM-dd") : '/'}} - @@ -195,11 +194,12 @@ (item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}} - - 已处置 - 未处置 + + {{item.handleStateStr}} 查看 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 249f149..4b74633 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 @@ -42,7 +42,6 @@
处置内容 - 已进行误报处置 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 3eb7fe1..df1477a 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 @@ -95,7 +95,7 @@ .disposebox { width: 100%; - height: 95px; + // height: 95px; box-sizing: border-box; padding: 5px 12px; display: flex; @@ -125,10 +125,11 @@ textarea { width: 100%; - height: 40px; + height: 45px; color: #C4E2FC; border: 1px solid #91CCFF; background-color: #172c45; + margin-bottom: 12px; } span { diff --git a/src/app/system-management/push/push.component.html b/src/app/system-management/push/push.component.html index c5ad69b..1acc500 100644 --- a/src/app/system-management/push/push.component.html +++ b/src/app/system-management/push/push.component.html @@ -21,16 +21,16 @@
- + - + diff --git a/src/app/system-management/user/adduser/adduser.component.ts b/src/app/system-management/user/adduser/adduser.component.ts index fa79626..b203ec2 100644 --- a/src/app/system-management/user/adduser/adduser.component.ts +++ b/src/app/system-management/user/adduser/adduser.component.ts @@ -37,7 +37,8 @@ export class AdduserComponent implements OnInit { getAllRoles() { let params = { SkipCount: '0', - MaxResultCount: '999' + MaxResultCount: '999', + ContainsBuiltins: 'true' } this.http.get('/api/services/app/Role/GetAll', { params: params diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts index c58bd2e..ae54578 100644 --- a/src/app/system-management/user/edituser/edituser.component.ts +++ b/src/app/system-management/user/edituser/edituser.component.ts @@ -44,7 +44,8 @@ export class EdituserComponent implements OnInit { async getAllRoles() { let params = { SkipCount: '0', - MaxResultCount: '999' + MaxResultCount: '999', + ContainsBuiltins: 'true' } await new Promise((resolve, reject) => { this.http.get('/api/services/app/Role/GetAll', { diff --git a/src/app/system-management/user/user.component.html b/src/app/system-management/user/user.component.html index 86a45e2..f232869 100644 --- a/src/app/system-management/user/user.component.html +++ b/src/app/system-management/user/user.component.html @@ -2,7 +2,7 @@
- 组织机构列表 + 组织机构
@@ -14,15 +14,9 @@ 组织机构
- + - -
- {{ node.title }} -
- diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts index 4bbca97..e333b6f 100644 --- a/src/app/system-management/user/user.component.ts +++ b/src/app/system-management/user/user.component.ts @@ -31,7 +31,6 @@ export class UserComponent implements OnInit { nzSelectedKeys: any[] = [] defaultExpandedKeys = []; searchValue = ''; - nzExpandAll = false; totalCount: string //获取所有用户 usersLIst: any = [] @@ -39,7 +38,7 @@ export class UserComponent implements OnInit { OrganizationUnitId loading: boolean; getAllUsers() { - this.loading=true + this.loading = true let params = { Keyword: this.validateForm.value.search ? this.validateForm.value.search : '', SkipCount: String(this.SkipCount), @@ -53,7 +52,7 @@ export class UserComponent implements OnInit { this.usersLIst = data.result.items this.usersNum = data.result.totalCount console.log('所有用户', this.usersLIst) - this.loading=false + this.loading = false }) } SkipCount: number = 0 //0 16 32 48 @@ -68,7 +67,8 @@ export class UserComponent implements OnInit { async getAllRoles() { let params = { SkipCount: '0', - MaxResultCount: '999' + MaxResultCount: '999', + ContainsBuiltins: 'true' } await new Promise((resolve, reject) => { this.http.get('/api/services/app/Role/GetAll', { @@ -102,7 +102,7 @@ export class UserComponent implements OnInit { resolve(data) this.defaultExpandedKeys = [this.nodes[0].id] this.nzSelectedKeys = [this.nodes[0].id] - this.OrganizationUnitId=[this.nodes[0].id] + this.OrganizationUnitId = [this.nodes[0].id] this.getAllUsers() }) })
预警类别 预警/分析事件预警类别 预警推送范围 短信推送范围 操作
{{item.violationType}} {{item.eventSystemName}}{{item.violationType}} {{i}}