bug 修复

src/main/webapp/app/app.constants.ts

 export const VERSION = process.env.VERSION;
 export const DEBUG_INFO_ENABLED: boolean = !!process.env.DEBUG_INFO_ENABLED;
-export const SERVER_API_URL_COMS = '/coms';
-export const SERVER_API_URL = '/zabbixBox';
+export const SERVER_API_URL_COMS = '/comsSchool';
+export const SERVER_API_URL = '/zabbixBoxSchool';
 export const SERVER_API_URL_SCHOOL = '/zabbixBoxSchool';
 export const SERVER_API_URL_MONITOR = '/api';
 export const BUILD_TIMESTAMP = process.env.BUILD_TIMESTAMP;

src/main/webapp/app/layouts/sidebar/sidebar.component.html

@@ -8,14 +8,14 @@
 </div>
 <ul #slideUL nz-menu [nzMode]="'inline'" [nzInlineCollapsed]="isCollapsed">
     <ng-container *ngFor="let item of menuList">
-        <li nz-submenu (nzOpenChange)="openHandler(item)" [(nzOpen)]="item.checked">
+        <li nz-submenu (nzOpenChange)="openHandler(item)" *ngIf="item.hide == 0" [(nzOpen)]="item.checked">
             <span (click)="toggle()" title>
                 <i class="anticon {{item.imageUrl}}_normal"></i>
                 <span class="nav-text">{{item.name}}</span>
             </span>
             <ul>
                 <ng-container *ngFor="let child of item.children">
-                    <li class="menu-item-diy" nz-menu-item (click)="goToRoute(child)">
+                    <li class="menu-item-diy" nz-menu-item *ngIf="child.hide == 0" (click)="goToRoute(child)">
                         <span class="square"></span>{{child.name}}
                     </li>
                 </ng-container>

src/main/webapp/app/mine/mine.component.html

@@ -22,25 +22,26 @@
     <div nz-col nzSpan="8" class="text-right">
     </div>
 </div>
-<nz-table #basicTable [nzData]="dataSet" [nzFrontPagination]="true">
+<nz-table #basicTable [nzData]="dataSet" [nzFrontPagination]="true" [nzScroll]="{x:'1300px'}">
     <thead>
     <tr>
-        <th nzWidth="25%">id</th>
-        <th>名称</th>
-        <th>父级ID</th>
-        <th>code</th>
-        <th>路径URL</th>
-        <th>图标</th>
-        <th>排序</th>
-        <th nzWidth="10%">操作</th>
+        <th nzWidth="500px">id</th>
+        <th nzWidth="200px">名称</th>
+        <th nzWidth="500px">父级ID</th>
+        <th nzWidth="200px">code</th>
+        <th nzWidth="200px">路径URL</th>
+        <th nzWidth="200px">图标</th>
+        <th nzWidth="400px">显示/隐藏</th>
+        <th nzWidth="200px">排序</th>
+        <th nzWidth="400px" nzRight="0px">操作</th>
     </tr>
     </thead>
     <tbody>
     <tr *ngFor="let data of basicTable.data">
-        <td nzWidth="25%">
+        <td nzWidth="500px">
             {{data.id}}
         </td>
-        <td>
+        <td nzWidth="200px">
             <ng-container *ngIf="!editCache[data.key].edit">
                 {{data.name}}
             </ng-container>
@@ -48,7 +49,7 @@
                 <input type="text" nz-input [(ngModel)]="editCache[data.key].data.name">
             </ng-container>
         </td>
-        <td>
+        <td nzWidth="500px">
             <ng-container *ngIf="!editCache[data.key].edit">
                 {{data.parentId}}
             </ng-container>
@@ -56,7 +57,7 @@
                 <input type="text" nz-input [(ngModel)]="editCache[data.key].data.parentId">
             </ng-container>
         </td>
-        <td>
+        <td nzWidth="200px">
             <ng-container *ngIf="!editCache[data.key].edit">
                 {{data.code}}
             </ng-container>
@@ -64,7 +65,7 @@
                 <input type="text" nz-input [(ngModel)]="editCache[data.key].data.code">
             </ng-container>
         </td>
-        <td>
+        <td nzWidth="200px">
             <ng-container *ngIf="!editCache[data.key].edit">
                 {{data.url}}
             </ng-container>
@@ -72,7 +73,7 @@
                 <input type="text" nz-input [(ngModel)]="editCache[data.key].data.url">
             </ng-container>
         </td>
-        <td>
+        <td nzWidth="200px">
             <ng-container *ngIf="!editCache[data.key].edit">
                 {{data.imageUrl}}
             </ng-container>
@@ -80,7 +81,19 @@
                 <input type="text" nz-input [(ngModel)]="editCache[data.key].data.imageUrl">
             </ng-container>
         </td>
-        <td>
+        <td nzWidth="400px">
+            <ng-container *ngIf="!editCache[data.key].edit">
+                <span *ngIf="data.hide == 0">显示</span>
+                <span *ngIf="data.hide == 1">隐藏</span>
+            </ng-container>
+            <ng-container *ngIf="editCache[data.key].edit">
+                <nz-radio-group [(ngModel)]="editCache[data.key].data.hide" nzName="radiogroup">
+                    <label nz-radio nzValue="0">显示</label>
+                    <label nz-radio nzValue="1">隐藏</label>
+                </nz-radio-group>
+            </ng-container>
+        </td>
+        <td nzWidth="200px">
             <ng-container *ngIf="!editCache[data.key].edit">
                 {{data.showOrder}}
             </ng-container>
@@ -88,7 +101,7 @@
                 <input type="text" nz-input [(ngModel)]="editCache[data.key].data.showOrder">
             </ng-container>
         </td>
-        <td class="handle main-color">
+        <td nzWidth="400px" nzRight="0px"  class="handle main-color">
             <ng-container *ngIf="!editCache[data.key].edit">
                 <a (click)="startEdit(data.key)">编辑</a>
                 <nz-popconfirm [nzTitle]="'确定删除？'" (nzOnConfirm)="deleteItem(data.id)">

src/main/webapp/app/mine/mine.component.ts

@@ -26,6 +26,9 @@ export class MineComponent implements OnInit {
         this.systemSer.getMenuBySeparation().subscribe(
             (res) => {
                 if (res.errCode == 10000) {
+                    res.data.forEach(e => {
+                        e.hide += '';
+                    });
                     this.dataSet = res.data;
                     this.updateEditCache(null);
                 }