diff --git a/proxy.config.json b/proxy.config.json
index 8129e12..1016789 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
{
"/api": {
- "target": "http://121.36.37.70:8201/",
+ "target": "http://218.75.214.31:28085/",
"生产": "http://10.81.73.39:8000/",
"测试": "http://121.36.37.70:8201/",
"生产2": "http://183.194.244.232:8088/",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index f5fbc97..e5a06fa 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -20,12 +20,13 @@ export class AppComponent {
private injector: Injector
) {
global.injector = injector;
- }
+ }
isMaskLayerShow: boolean = false;
ngOnInit(): void {
- console.log("更新日期2024.1.12");
+ console.log("更新日期2024.5.27");
+
//监听遮罩层
this.maskLayerService.getMessage().subscribe((message: any) => {
this.isMaskLayerShow = message;
@@ -54,4 +55,7 @@ export class AppComponent {
this.token.startUp();
}
}
+
+
+
}
diff --git a/src/app/ui/usermanagement/seeInformation.html b/src/app/ui/usermanagement/seeInformation.html
index a627ce7..f7349ee 100644
--- a/src/app/ui/usermanagement/seeInformation.html
+++ b/src/app/ui/usermanagement/seeInformation.html
@@ -1,4 +1,4 @@
-查看用户
+查看用户
@@ -11,13 +11,13 @@
所属机构:
{{data.organizationName}}
- 所属角色:
+ 所属角色:
{{item}}
- 创建时间:
- {{data.creationTime|date:'yyyy-MM-dd'}}
+ 创建时间:
+ {{data.creationTime | date:'yyyy-MM-dd'}}
- 是否禁用:
+ 是否禁用:
否
是
diff --git a/src/app/ui/usermanagement/usermanagement.component.ts b/src/app/ui/usermanagement/usermanagement.component.ts
index f9d2d46..3e117b6 100644
--- a/src/app/ui/usermanagement/usermanagement.component.ts
+++ b/src/app/ui/usermanagement/usermanagement.component.ts
@@ -29,6 +29,7 @@ export class UsermanagementComponent implements OnInit {
public snackBar: MatSnackBar,
private tree: TreeService
) {}
+
private _transformer = (node, level: number) => {
//初始化tree
return {
@@ -59,7 +60,7 @@ export class UsermanagementComponent implements OnInit {
async ngOnInit() {
await this.getAllMechanism();
- console.log(88888, this.treedata);
+
this.userMechanism = this.treedata[0].id;
this.initData();
@@ -136,6 +137,7 @@ export class UsermanagementComponent implements OnInit {
Name: this.userLogin || "",
RealName: this.userName || "",
OrganizationId: this.userMechanism || "",
+ HasChildren: "true",
PageNumber: "1",
};
this.http.get("/api/Users", { params: data }).subscribe((data: any[]) => {
@@ -152,6 +154,7 @@ export class UsermanagementComponent implements OnInit {
Name: this.userLogin || "",
RealName: this.userName || "",
OrganizationId: this.userMechanism || "",
+ HasChildren: "true",
PageNumber: String(this.pageNumber),
};
this.http.get("/api/Users", { params: data }).subscribe((data: any[]) => {