From 3405162e3d5512abf34411a9580222107500b3d5 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 11 Jul 2022 15:57:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E7=BC=96?=
=?UTF-8?q?=E8=BE=91=E7=94=A8=E6=88=B7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/http-interceptors/base-interceptor.ts | 4 ++--
src/app/pages/login/login.component.ts | 2 +-
.../user/adduser/adduser.component.html | 4 ++--
.../user/edituser/edituser.component.html | 8 ++++----
.../user/edituser/edituser.component.ts | 17 ++++++++++++++---
.../system-management/user/user.component.ts | 2 +-
6 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/app/http-interceptors/base-interceptor.ts b/src/app/http-interceptors/base-interceptor.ts
index 2092a45..01196cb 100644
--- a/src/app/http-interceptors/base-interceptor.ts
+++ b/src/app/http-interceptors/base-interceptor.ts
@@ -84,13 +84,13 @@ export class BaseInterceptor implements HttpInterceptor {
}
if (error.status === 500) {
if(error.error.error.message){
- this.message.create('error', `${error.error.error.message}`);
+ this.message.create('error', `${error.error.error.details || error.error.error.message}`);
}else{
this.message.create('error', `状态500`);
}
}
if (error.status === 404) {
- this.message.create('error', `实体未找到!${error.error.error.message}`);
+ this.message.create('error', `${error.error.error.message}`);
}
if (error.error instanceof ErrorEvent) {
// 发生客户端或网络错误。相应处理。
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index a8f8ca0..cf4e0fa 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -179,7 +179,7 @@ export class LoginComponent implements OnInit {
},
(err) => {
this.isLoading = false;
- this.message.create('error', err.error.error.details);
+ // this.message.create('error', err.error.error.details);
}
)
}
diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html
index b76cbba..45c5db3 100644
--- a/src/app/system-management/user/adduser/adduser.component.html
+++ b/src/app/system-management/user/adduser/adduser.component.html
@@ -35,7 +35,7 @@
- 角色
+ 角色
@@ -44,7 +44,7 @@
- 预警接收级别
+ 预警接收级别
diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html
index fa67c46..a1fb0c6 100644
--- a/src/app/system-management/user/edituser/edituser.component.html
+++ b/src/app/system-management/user/edituser/edituser.component.html
@@ -35,18 +35,18 @@
- 角色
+ 角色
-
+
- 预警接收级别
+ 预警接收级别
-
+
diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts
index 56445ba..3af3660 100644
--- a/src/app/system-management/user/edituser/edituser.component.ts
+++ b/src/app/system-management/user/edituser/edituser.component.ts
@@ -19,12 +19,22 @@ export class EdituserComponent implements OnInit {
constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { }
ngOnInit(): void {
+ console.log(this.data)
+ let roleData1 = []
+ let roleData2 = []
+ this.data.roleNames.forEach(element => {
+ if (element.indexOf('LEVEL') != -1) {
+ roleData2.push(element)
+ }else{
+ roleData1.push(element)
+ }
+ });
this.validateForm = this.fb.group({
account: [null, [Validators.required]],
name: [null, [Validators.required]],
organization: [null, [Validators.required]],
- role: [null],
- role2: [null],
+ role: [roleData1],
+ role2: [roleData2],
phonenum: [null, [Validators.required]]
});
if (this.listOfData.length == 0) {
@@ -57,12 +67,13 @@ export class EdituserComponent implements OnInit {
})
})
}
+
//获取角色列表
async getAllRoles2() {
let params = {
SkipCount: '0',
MaxResultCount: '999',
- IsViolationRoles:'true'
+ IsViolationRoles: 'true'
}
await new Promise((resolve, reject) => {
this.http.get('/api/services/app/Role/GetAll', {
diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts
index 64f1cd4..170a71d 100644
--- a/src/app/system-management/user/user.component.ts
+++ b/src/app/system-management/user/user.component.ts
@@ -102,7 +102,7 @@ export class UserComponent implements OnInit {
let params = {
SkipCount: '0',
MaxResultCount: '999',
- IsViolationRoles:'true'
+ IsViolationRoles: 'true'
}
await new Promise((resolve, reject) => {
this.http.get('/api/services/app/Role/GetAll', {