Merge remote-tracking branch 'origin/develop' into develop

沈斌

2017-12-20 b5ce833799753acd0944e6901b8101f03263e1fa

Merge remote-tracking branch 'origin/develop' into develop

 .gitignore

@@ -19,10 +19,6 @@

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
@@ -40,3 +36,4 @@
# System Files
.DS_Store
Thumbs.db
.angulardoc.json

 src/app/routes/routes.ts

@@ -16,6 +16,7 @@
            { path: 'users', loadChildren: './users/users.module#UsersModule' },
            { path: 'devices', loadChildren: './devices/devices.module#DevicesModule' },
            { path: 'sensors', loadChildren: './sensors/sensors.module#SensorsModule' },
            { path: 'systems', loadChildren: './systems/systems.module#SystemsModule' },

            { path: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } },
            { path: 'dashboard/analysis', component: DashboardAnalysisComponent, data: { translate: 'dashboard_analysis' } },

 src/app/routes/systems/account/account.component.html

New file
@@ -0,0 +1,3 @@
<p>
  account works!
</p>

 src/app/routes/systems/account/account.component.ts

New file
@@ -0,0 +1,25 @@
import { Component, OnInit } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { ModalHelper } from '@delon/theme';
import { HttpClient } from '@angular/common/http';
import * as moment from 'moment';

@Component({
  selector: 'app-account',
  templateUrl: './account.component.html',
  styles: []
})
export class AccountComponent implements OnInit {

  constructor(
    public http: HttpClient,
    public msgSrv: NzMessageService,
    private modalHelper: ModalHelper) { 
  
  }

  ngOnInit() {
    
  }

}

 src/app/routes/systems/systems.module.ts

New file
@@ -0,0 +1,32 @@
import { Component, OnInit } from '@angular/core';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule, Routes } from '@angular/router';
import { SharedModule } from '@shared/shared.module';

import { AccountComponent } from './account/account.component';

const routes: Routes = [
  {
    path: '',
    children: [
      { path: 'account', component: AccountComponent }
    ]
  }
];

const COMPONENTS_NOROUNT = [  ];

@NgModule({
  imports: [
    CommonModule,
    SharedModule,
    RouterModule.forChild(routes)
  ],
  declarations: [
    ...COMPONENTS_NOROUNT,
    AccountComponent
  ],
  entryComponents: COMPONENTS_NOROUNT
})
export class SystemsModule { }

 src/assets/app-data.json

@@ -59,6 +59,16 @@
      "link": "/sensors/basic",
      "translate": "device_management_info"
    }]
  }, {
    "text": "系统管理",
    "translate": "system_management",
    "link": "/",
    "icon": "icon-note",
    "children": [{
      "text": "账户管理",
      "link": "/systems/account",
      "translate": "system_management_account"
    }]
  }]
}]
}

 src/assets/i18n/zh-CN.json

@@ -11,6 +11,9 @@
    "sensor_management": "传感器管理",
    "sensor_management_info": "基本信息",

    "system_management":"系统管理",
    "system_management_account":"账户管理",
	
    "settings": "设置",
    "profile": "个人资料",
    "login": "登录",