diff --git a/proxy.config.json b/proxy.config.json index 340035a..dd2d252 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,13 +1,13 @@ { "/api": { - "target": "http://121.36.37.70:8906/", + "target": "http://121.36.37.70:8906", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "http://121.36.37.70:8906/", + "target": "http://121.36.37.70:8906", "secure": false, "ws": true, "logLevel": "debug" } -} +} \ No newline at end of file diff --git a/src/app/system-management/menu/menu.component.ts b/src/app/system-management/menu/menu.component.ts index 92b6a8c..a4b6f4b 100644 --- a/src/app/system-management/menu/menu.component.ts +++ b/src/app/system-management/menu/menu.component.ts @@ -74,7 +74,7 @@ export class MenuComponent implements OnInit { addOr(node?: any) { console.log(node) const modal = this.modal.create({ - nzTitle: node ? '新增组织机构' : '新增一级组织机构', + nzTitle: node ? '新增子菜单' : '新增一级菜单', nzContent: AddmenuComponent, nzViewContainerRef: this.viewContainerRef, nzWidth: 288, @@ -160,7 +160,7 @@ export class MenuComponent implements OnInit { this.message.create('warning', '请先删除所有子节点'); } else { this.modal.confirm({ - nzTitle: `确定要删除${item.title}这个机构吗?`, + nzTitle: `确定要删除${item.title}这个菜单吗?`, nzOkText: '确定', nzOkType: 'danger', nzOnOk: () => { diff --git a/src/app/system-management/role/editrole/editrole.component.html b/src/app/system-management/role/editrole/editrole.component.html index db6b31a..9cda566 100644 --- a/src/app/system-management/role/editrole/editrole.component.html +++ b/src/app/system-management/role/editrole/editrole.component.html @@ -16,12 +16,5 @@ - - 菜单 - - - - -