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] =?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 @@
 <div class="orbox" id="orbox">
     <div class="topbox">
       <div class="lefttop">
-        <span>组织机构列表</span>
+        <span>菜单列表</span>
         <span><img style="vertical-align: top;" src="../../../assets/images/icon/orgrey.png" alt="">
-          {{totalCount}}个单位</span>
+          {{totalCount}}个</span>
       </div>
       <div class="righttop">
         <!-- <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
@@ -16,15 +16,15 @@
             <button style="display: none;" type="submit"></button>
           </nz-form-item>
         </form> -->
-        <nz-input-group nzPrefixIcon="search">
+        <!-- <nz-input-group nzPrefixIcon="search">
           <input type="text" nz-input placeholder="请输入单位" [(ngModel)]="searchValue" />
-        </nz-input-group>
+        </nz-input-group> -->
         <button nz-button nzType="primary" (click)="addOr()"><i nz-icon nzType="plus-circle"
             nzTheme="outline"></i>新增</button>
       </div>
     </div>
     <div class="treeTitle">
-      <span>组织机构</span>
+      <span>菜单名称</span>
       <span>操作</span>
     </div>
     <nz-tree [nzHideUnMatched]='true' [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
diff --git a/src/app/system-management/menu/menu.component.ts b/src/app/system-management/menu/menu.component.ts
index 3438330..92b6a8c 100644
--- a/src/app/system-management/menu/menu.component.ts
+++ b/src/app/system-management/menu/menu.component.ts
@@ -45,7 +45,8 @@ export class MenuComponent implements OnInit {
     let OrganizationUnitId = sessionStorage.getItem('isGasStation') == 'true' ? JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id : JSON.parse(sessionStorage.getItem('userdata')).organization.id
     let params = {
       OrganizationUnitId: OrganizationUnitId,
-      IsContainsChildren: "true"
+      IsContainsChildren: "true",
+      MaxResultCount:"999"
     }
     this.http.get('/api/services/app/Menu/GetAll', {
       params: params
diff --git a/src/app/system-management/role/editrole/editrole.component.html b/src/app/system-management/role/editrole/editrole.component.html
index 9cda566..db6b31a 100644
--- a/src/app/system-management/role/editrole/editrole.component.html
+++ b/src/app/system-management/role/editrole/editrole.component.html
@@ -16,5 +16,12 @@
         </nz-select>
       </nz-form-control>
     </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="菜单">菜单</nz-form-label>
+      <nz-form-control>
+        <nz-tree-select formControlName="menus" [nzNodes]="nodes" nzShowSearch nzCheckable nzPlaceHolder="请选择菜单">
+        </nz-tree-select>
+      </nz-form-control>
+    </nz-form-item>
   </form>
 </div>