From b5ce833799753acd0944e6901b8101f03263e1fa Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 20 Dec 2017 14:44:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
.gitignore | 5 --
src/app/routes/systems/systems.module.ts | 32 ++++++++++++++++
src/app/routes/routes.ts | 1
src/assets/i18n/zh-CN.json | 3 +
src/app/routes/systems/account/account.component.ts | 25 ++++++++++++
src/assets/app-data.json | 10 +++++
src/app/routes/systems/account/account.component.html | 3 +
7 files changed, 75 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 54bfd20..03e50e6 100644
--- a/.gitignore
+++ b/.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
diff --git a/src/app/routes/routes.ts b/src/app/routes/routes.ts
index cbcc97c..047905b 100644
--- a/src/app/routes/routes.ts
+++ b/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' } },
diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
new file mode 100644
index 0000000..e3b28d5
--- /dev/null
+++ b/src/app/routes/systems/account/account.component.html
@@ -0,0 +1,3 @@
+<p>
+ account works!
+</p>
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
new file mode 100644
index 0000000..42b2af6
--- /dev/null
+++ b/src/app/routes/systems/account/account.component.ts
@@ -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() {
+
+ }
+
+}
diff --git a/src/app/routes/systems/systems.module.ts b/src/app/routes/systems/systems.module.ts
new file mode 100644
index 0000000..d645b78
--- /dev/null
+++ b/src/app/routes/systems/systems.module.ts
@@ -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 { }
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index e370228..48c82b3 100644
--- a/src/assets/app-data.json
+++ b/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"
+ }]
}]
}]
}
diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json
index 44d7e46..c785dae 100644
--- a/src/assets/i18n/zh-CN.json
+++ b/src/assets/i18n/zh-CN.json
@@ -11,6 +11,9 @@
"sensor_management": "���������������",
"sensor_management_info": "������������",
+ "system_management":"������������",
+ "system_management_account":"������������",
+
"settings": "������",
"profile": "������������",
"login": "������",
--
Gitblit v1.8.0