diff --git a/proxy.config.json b/proxy.config.json index e61e510..8129e12 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://10.81.73.39:8000/", + "target": "http://121.36.37.70:8201/", "生产": "http://10.81.73.39:8000/", "测试": "http://121.36.37.70:8201/", "生产2": "http://183.194.244.232:8088/", diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 72cdf68..1fa15b9 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -121,7 +121,6 @@ export class KeyUnitManagementComponent implements OnInit { // } // }); - if (e.direction == "asc") { //从小到大排序 data.sort(function (a, b) { @@ -651,7 +650,6 @@ export class KeyUnitManagementComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = "top"; config.duration = 3000; - //console.log(this.deleteAll) if (this.verifyState == 0 || this.verifyState == 3) { this.snackBar.open("审核中,不能删除", "确定", config); } else { @@ -665,12 +663,6 @@ export class KeyUnitManagementComponent implements OnInit { if (selectedunitArr.length == 0) { this.snackBar.open("请先选择要删除的单位", "确定", config); } - /* if(selectedunitArr.length != 1 && selectedunitArr.length != 0){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('只能选择一个单位删除','确定',config); - } */ if (this.deleteAll.length == 1) { //带着id跳到删除页面 let isTrue = confirm("重点单位删除需审核员审核,审核通过方可删除"); @@ -759,8 +751,9 @@ export class KeyUnitManagementComponent implements OnInit { data: element, }); dialogRef.afterClosed().subscribe((result) => { - //console.log(result); - element.name = result; + if (result) { + element.name = result; + } }); } @@ -1033,12 +1026,13 @@ export class upname { .subscribe( (data: any) => { this.snackBar.open("修改名字成功", "确定", config); + this.dialogRef.close(this.unitname); }, (err) => { this.snackBar.open(err, "确定", config); + this.dialogRef.close(); } ); - this.dialogRef.close(this.unitname); } } }