Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

proxy.config.json

@@ -10,4 +10,4 @@
     "ws": true,
     "logLevel": "debug"
   }
-}
+}

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"

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
@@ -73,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,
@@ -159,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: () => {