Merge remote-tracking branch 'origin/master_cj'

src/app/extra/login/login.component.ts

@@ -35,7 +35,7 @@ export class LoginComponent implements OnInit {
       if (data.constructor === Object) {
         if (data.code === 1) {
           window.sessionStorage.setItem('_AMap_AMap.MapInner', data.message);
-          this.router.navigate(['app/home']);
+          this.router.navigate(['app/deviceCenter/gatewayMgr']);
           this.getCurUser();
         } else {
           this.message.error(data.message);

src/app/layout/leftmenu/leftmenu.component.html

 <div class="menuPart">
   <div class="menuFirst" *ngFor="let item of dataArr">
-    <div class="first-floor textStyle1 whenHover" [title]="item.name | translate" *ngIf="(item.child && item.child.length > 0) || item.type" (click)="selectFirstFloor(item)" [ngClass]="{'isSelectedFirst': isSelected[0] === item.name, 'isSelectedSecond': isSelected[0] === item.name && item.type === 1}">
-      <i [class]="item.icon" [ngClass]="{'iconLeft': !isCollapsed,'iconLeftCos': isCollapsed}"></i>
-      <span *ngIf="!isCollapsed">{{item.name | translate}}</span>
-      <i class="io iconRight" [ngClass]="{'i-xia': !isOpen[item.name] && !item.type && !isCollapsed,'i-shang': isOpen[item.name] && !item.type && !isCollapsed, 'i-you': isCollapsed && !item.type}"></i>
-    </div>
-    <div *ngIf="isOpen[item.name] && !isCollapsed" class="menuSecond whenHover">
-      <div class="second-floor whenHover textStyle2" [title]="one.name | translate" *ngFor="let one of item.child"
-           (click)="selectSecondFloor(item.name, one.name)"
-           [ngClass]="{'isSelectedSecond': isSelected[0] === item.name && isSelected[1] === one.name}">{{one.name | translate}}
+    <ng-container *ngIf="item.isDisplay">
+      <div class="first-floor textStyle1 whenHover" [title]="item.name | translate" *ngIf="(item.child && item.child.length > 0) || item.type" (click)="selectFirstFloor(item)" [ngClass]="{'isSelectedFirst': isSelected[0] === item.name, 'isSelectedSecond': isSelected[0] === item.name && item.type === 1}">
+        <i [class]="item.icon" [ngClass]="{'iconLeft': !isCollapsed,'iconLeftCos': isCollapsed}"></i>
+        <span *ngIf="!isCollapsed">{{item.name | translate}}</span>
+        <i class="io iconRight" [ngClass]="{'i-xia': !isOpen[item.name] && !item.type && !isCollapsed,'i-shang': isOpen[item.name] && !item.type && !isCollapsed, 'i-you': isCollapsed && !item.type}"></i>
       </div>
-    </div>
-    <div *ngIf="isCollapsed && item.child.length > 0" class="menuSecondCos" [ngClass]="{'isCos': isCollapsed}">
-      <div class="handleTheLeft">
-        <div class="second-floor-cos whenHover textStyle2" *ngFor="let one of item.child"
+      <div *ngIf="isOpen[item.name] && !isCollapsed" class="menuSecond whenHover">
+        <div class="second-floor whenHover textStyle2" [title]="one.name | translate" *ngFor="let one of item.child"
              (click)="selectSecondFloor(item.name, one.name)"
              [ngClass]="{'isSelectedSecond': isSelected[0] === item.name && isSelected[1] === one.name}">{{one.name | translate}}
         </div>
       </div>
-    </div>
+      <div *ngIf="isCollapsed && item.child.length > 0" class="menuSecondCos" [ngClass]="{'isCos': isCollapsed}">
+        <div class="handleTheLeft">
+          <div class="second-floor-cos whenHover textStyle2" *ngFor="let one of item.child"
+               (click)="selectSecondFloor(item.name, one.name)"
+               [ngClass]="{'isSelectedSecond': isSelected[0] === item.name && isSelected[1] === one.name}">{{one.name | translate}}
+          </div>
+        </div>
+      </div>
+    </ng-container>
   </div>
 </div>

src/app/layout/leftmenu/leftmenu.component.ts

@@ -27,23 +27,37 @@ export class LeftmenuComponent implements OnInit, OnDestroy {
     name: 'home',
     icon: 'io i-shouye',
     type: 1,
-    child: []
+    child: [],
+    isDisplay: false
   }, {
     name: 'deviceCenter',
     icon: 'io i-shebei',
     type: 0,
-    child: [{name: 'gatewayMgr'}, {name: 'sensorMgr'}, {name: 'moduleMgr'},
-      {name: 'topicModuleMgr'}]
+    child: [
+      {name: 'gatewayMgr',isDisplay: true}, 
+      {name: 'sensorMgr',isDisplay: true}, 
+      {name: 'moduleMgr',isDisplay: true},
+      {name: 'topicModuleMgr',isDisplay: true}
+    ]
   }, {
     name: 'systemMgr',
     icon: 'io i-shezhi',
     type: 0,
-    child: [{name: 'influxdbMgr'}, {name: 'userCenter'}, {name: 'customCenter'}, {name: 'partMgr'}, {name: 'areaMgr'}, {name: 'logMgr'}]
+    child: [
+      {name: 'influxdbMgr',isDisplay: true}, 
+      {name: 'userCenter',isDisplay: true}, 
+      {name: 'customCenter',isDisplay: true}, 
+      {name: 'partMgr',isDisplay: true}, 
+      {name: 'areaMgr',isDisplay: true},
+       {name: 'logMgr',isDisplay: true}]
   }, {
     name: 'dataCenter',
     icon: 'io i-ico_data',
     type: 0,
-    child: [{name: 'currentData'}, {name: 'dataSum'}, {name: 'historyData'}]
+    child: [
+      {name: 'currentData',isDisplay: true},
+       {name: 'dataSum',isDisplay: true}, 
+       {name: 'historyData',isDisplay: true}]
   }];
   isOpen = {monitoring: false, deviceManage: false, pileManage: false, moduleCenter: false, systemSet: false};
   isSelected = ['', ''];

src/app/service/permission.ts

@@ -89,7 +89,7 @@ export class PermissionService {
     const funcCheckJson = JSON.stringify(this.functions);
     window.sessionStorage.setItem(encodeURIComponent('_AMap_AMap.InterEnterKey'), this.transform(funcCheckJson));
     if (permissionCheckJson.indexOf('home') && type === 'login') {
-      this.router.navigate(['app/home']);
+      this.router.navigate(['app/deviceCenter/gatewayMgr']);
     } else {
       this.router.navigate(['extra/login']);
     }