From 1ba26dc38889664c29201acbfe6cfa63b8dd85ca Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Wed, 22 Jun 2022 11:17:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 4 ++-- src/app/system-management/menu/menu.component.html | 10 +++++----- src/app/system-management/menu/menu.component.ts | 3 ++- .../role/editrole/editrole.component.html | 7 +++++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/proxy.config.json b/proxy.config.json index b147575..340035a 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,11 +1,11 @@ { "/api": { - "target": "http://39.106.78.171:8906", + "target": "http://121.36.37.70:8906/", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "http://39.106.78.171:8906", + "target": "http://121.36.37.70:8906/", "secure": false, "ws": true, "logLevel": "debug" diff --git a/src/app/system-management/menu/menu.component.html b/src/app/system-management/menu/menu.component.html index d684dd0..8b26bf4 100644 --- a/src/app/system-management/menu/menu.component.html +++ b/src/app/system-management/menu/menu.component.html @@ -1,9 +1,9 @@
- 组织机构列表 + 菜单列表 - {{totalCount}}个单位 + {{totalCount}}个
- +
- 组织机构 + 菜单名称 操作
+ + 菜单 + + + + +
From 2bd898bde382428b495478216f9152bc5cc0b00b Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Wed, 22 Jun 2022 14:40:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 6 +++--- src/app/system-management/menu/menu.component.ts | 4 ++-- .../role/editrole/editrole.component.html | 7 ------- 3 files changed, 5 insertions(+), 12 deletions(-) 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 @@ - - 菜单 - - - - -