From f047b77624fd1b58bed9e80751b37eb002264305 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Sat, 16 Dec 2017 16:28:08 +0800 Subject: [PATCH] updates --- src/app/routes/devices/devices.module.ts | 30 ++ src/app/routes/devices/basic-info/basic-info.component.ts | 15 + src/app/routes/users/installer/installer.component.html | 3 src/app/routes/users/users.module.ts | 27 ++ src/assets/i18n/en.json | 3 src/app/routes/users/installer/installer.component.ts | 15 + src/assets/i18n/zh-CN.json | 8 src/assets/app-data.json | 424 ++-------------------------------- src/app/routes/devices/version/version.component.ts | 15 + src/app/routes/routes.ts | 81 +++--- src/app/routes/devices/version/version.component.html | 3 src/app/routes/devices/monitor-point/monitor-point.component.ts | 15 + src/app/routes/devices/basic-info/basic-info.component.html | 3 src/app/routes/users/receiver/receiver.component.html | 3 src/app/routes/users/receiver/receiver.component.ts | 15 + src/app/routes/devices/monitor-point/monitor-point.component.html | 3 16 files changed, 232 insertions(+), 431 deletions(-) diff --git a/src/app/routes/devices/basic-info/basic-info.component.html b/src/app/routes/devices/basic-info/basic-info.component.html new file mode 100644 index 0000000..9a6cd4f --- /dev/null +++ b/src/app/routes/devices/basic-info/basic-info.component.html @@ -0,0 +1,3 @@ +<p> + basic-info works! +</p> diff --git a/src/app/routes/devices/basic-info/basic-info.component.ts b/src/app/routes/devices/basic-info/basic-info.component.ts new file mode 100644 index 0000000..434f272 --- /dev/null +++ b/src/app/routes/devices/basic-info/basic-info.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-basic-info', + templateUrl: './basic-info.component.html', + styles: [] +}) +export class BasicInfoComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/routes/devices/devices.module.ts b/src/app/routes/devices/devices.module.ts new file mode 100644 index 0000000..7a2c0f9 --- /dev/null +++ b/src/app/routes/devices/devices.module.ts @@ -0,0 +1,30 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { BasicInfoComponent } from './basic-info/basic-info.component'; +import { VersionComponent } from './version/version.component'; +import { MonitorPointComponent } from './monitor-point/monitor-point.component'; +import {RouterModule, Routes} from '@angular/router'; + +const routes: Routes = [ + { + path: '', + children: [ + { path: 'basic', component: BasicInfoComponent }, + { path: 'version', component: VersionComponent }, + { path: 'monitor-point', component: MonitorPointComponent } + ] + } +]; + +@NgModule({ + imports: [ + CommonModule, + RouterModule.forChild(routes) + ], + declarations: [ + BasicInfoComponent, + VersionComponent, + MonitorPointComponent + ] +}) +export class DevicesModule { } diff --git a/src/app/routes/devices/monitor-point/monitor-point.component.html b/src/app/routes/devices/monitor-point/monitor-point.component.html new file mode 100644 index 0000000..7fd487b --- /dev/null +++ b/src/app/routes/devices/monitor-point/monitor-point.component.html @@ -0,0 +1,3 @@ +<p> + monitor-point works! +</p> diff --git a/src/app/routes/devices/monitor-point/monitor-point.component.ts b/src/app/routes/devices/monitor-point/monitor-point.component.ts new file mode 100644 index 0000000..9ada8ef --- /dev/null +++ b/src/app/routes/devices/monitor-point/monitor-point.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-monitor-point', + templateUrl: './monitor-point.component.html', + styles: [] +}) +export class MonitorPointComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/routes/devices/version/version.component.html b/src/app/routes/devices/version/version.component.html new file mode 100644 index 0000000..169791c --- /dev/null +++ b/src/app/routes/devices/version/version.component.html @@ -0,0 +1,3 @@ +<p> + version works! +</p> diff --git a/src/app/routes/devices/version/version.component.ts b/src/app/routes/devices/version/version.component.ts new file mode 100644 index 0000000..3297984 --- /dev/null +++ b/src/app/routes/devices/version/version.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-version', + templateUrl: './version.component.html', + styles: [] +}) +export class VersionComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/routes/routes.ts b/src/app/routes/routes.ts index 8bfbb54..c256c6c 100644 --- a/src/app/routes/routes.ts +++ b/src/app/routes/routes.ts @@ -1,22 +1,22 @@ import { LayoutComponent } from '../layout/layout.component'; import { LayoutFullScreenComponent } from '../layout/fullscreen/fullscreen.component'; -import { LoginComponent } from './pages/login/login.component'; -import { LockComponent } from './pages/lock/lock.component'; -import { RegisterComponent } from './pages/register/register.component'; -import { ForgetComponent } from './pages/forget/forget.component'; -import { MaintenanceComponent } from './pages/maintenance/maintenance.component'; -import { Page404Component } from './pages/404/404.component'; -import { Page500Component } from './pages/500/500.component'; +// import { LoginComponent } from './pages/login/login.component'; +// import { LockComponent } from './pages/lock/lock.component'; +// import { RegisterComponent } from './pages/register/register.component'; +// import { ForgetComponent } from './pages/forget/forget.component'; +// import { MaintenanceComponent } from './pages/maintenance/maintenance.component'; +// import { Page404Component } from './pages/404/404.component'; +// import { Page500Component } from './pages/500/500.component'; import { DashboardV1Component } from './dashboard/v1/v1.component'; import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component'; import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component'; import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component'; -import { CallbackComponent } from './callback/callback.component'; -// pro -import { ProUserLayoutComponent } from '../layout/pro/user/user.component'; -import { ProUserLoginComponent } from './pro/user/login/login.component'; -import { ProUserRegisterComponent } from './pro/user/register/register.component'; -import { ProUserRegisterResultComponent } from './pro/user/register-result/register-result.component'; +// import { CallbackComponent } from './callback/callback.component'; +// // pro +// import { ProUserLayoutComponent } from '../layout/pro/user/user.component'; +// import { ProUserLoginComponent } from './pro/user/login/login.component'; +// import { ProUserRegisterComponent } from './pro/user/register/register.component'; +// import { ProUserRegisterResultComponent } from './pro/user/register-result/register-result.component'; export const routes = [ { @@ -25,19 +25,16 @@ children: [ { path: '', redirectTo: 'dashboard/v1', pathMatch: 'full' }, { path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' }, + + + { path: 'users', loadChildren: './users/users.module#UsersModule' }, + { path: 'devices', loadChildren: './devices/devices.module#DevicesModule' }, + { path: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } }, { path: 'dashboard/analysis', component: DashboardAnalysisComponent, data: { translate: 'dashboard_analysis' } }, { path: 'dashboard/monitor', component: DashboardMonitorComponent, data: { translate: 'dashboard_monitor' } }, - { path: 'dashboard/workplace', component: DashboardWorkplaceComponent, data: { translate: 'dashboard_workplace' } }, - { path: 'widgets', loadChildren: './widgets/widgets.module#WidgetsModule' }, - { path: 'elements', loadChildren: './elements/elements.module#ElementsModule' }, - { path: 'forms', loadChildren: './forms/forms.module#FormsModule' }, - { path: 'charts', loadChildren: './charts/charts.module#ChartsModule' }, - { path: 'tables', loadChildren: './tables/tables.module#TablesModule' }, - { path: 'maps', loadChildren: './maps/maps.module#MapsModule' }, - { path: 'logics', loadChildren: './logics/logics.module#LogicsModule' }, - { path: 'extras', loadChildren: './extras/extras.module#ExtrasModule' }, - { path: 'pro', loadChildren: './pro/pro.module#ProModule' } + { path: 'dashboard/workplace', component: DashboardWorkplaceComponent, data: { translate: 'dashboard_workplace' } } + ] }, // ������������ @@ -48,24 +45,24 @@ { path: '', loadChildren: './data-v/data-v.module#DataVModule' } ] }, - // pro ���������������������������������������������������������������Angular������������������������������������������������������ - { - path: 'pro/user', - component: ProUserLayoutComponent, - children: [ - { path: 'login', component: ProUserLoginComponent }, - { path: 'register', component: ProUserRegisterComponent }, - { path: 'register-result', component: ProUserRegisterResultComponent } - ] - }, - // ���������������Layout - { path: 'callback/:type', component: CallbackComponent }, - { path: 'register', component: RegisterComponent, data: { translate: 'register' } }, - { path: 'login', component: LoginComponent, data: { title: 'login' } }, - { path: 'forget', component: ForgetComponent, data: { translate: 'forget' } }, - { path: 'lock', component: LockComponent, data: { translate: 'lock' } }, - { path: 'maintenance', component: MaintenanceComponent }, - { path: '404', component: Page404Component }, - { path: '500', component: Page500Component }, + // // pro ���������������������������������������������������������������Angular������������������������������������������������������ + // { + // path: 'pro/user', + // component: ProUserLayoutComponent, + // children: [ + // { path: 'login', component: ProUserLoginComponent }, + // { path: 'register', component: ProUserRegisterComponent }, + // { path: 'register-result', component: ProUserRegisterResultComponent } + // ] + // }, + // // ���������������Layout + // { path: 'callback/:type', component: CallbackComponent }, + // { path: 'register', component: RegisterComponent, data: { translate: 'register' } }, + // { path: 'login', component: LoginComponent, data: { title: 'login' } }, + // { path: 'forget', component: ForgetComponent, data: { translate: 'forget' } }, + // { path: 'lock', component: LockComponent, data: { translate: 'lock' } }, + // { path: 'maintenance', component: MaintenanceComponent }, + // { path: '404', component: Page404Component }, + // { path: '500', component: Page500Component }, { path: '**', redirectTo: 'dashboard' } ]; diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html new file mode 100644 index 0000000..afe0b7b --- /dev/null +++ b/src/app/routes/users/installer/installer.component.html @@ -0,0 +1,3 @@ +<p> + installer works! +</p> diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts new file mode 100644 index 0000000..08b11e7 --- /dev/null +++ b/src/app/routes/users/installer/installer.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-installer', + templateUrl: './installer.component.html', + styles: [] +}) +export class InstallerComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/routes/users/receiver/receiver.component.html b/src/app/routes/users/receiver/receiver.component.html new file mode 100644 index 0000000..6965932 --- /dev/null +++ b/src/app/routes/users/receiver/receiver.component.html @@ -0,0 +1,3 @@ +<p> + receiver works! +</p> diff --git a/src/app/routes/users/receiver/receiver.component.ts b/src/app/routes/users/receiver/receiver.component.ts new file mode 100644 index 0000000..055c834 --- /dev/null +++ b/src/app/routes/users/receiver/receiver.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-receiver', + templateUrl: './receiver.component.html', + styles: [] +}) +export class ReceiverComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/routes/users/users.module.ts b/src/app/routes/users/users.module.ts new file mode 100644 index 0000000..a3cd480 --- /dev/null +++ b/src/app/routes/users/users.module.ts @@ -0,0 +1,27 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { InstallerComponent } from './installer/installer.component'; +import {RouterModule, Routes} from '@angular/router'; +import { ReceiverComponent } from './receiver/receiver.component'; + +const routes: Routes = [ + { + path: '', + children: [ + { path: 'installer', component: InstallerComponent }, + { path: 'receiver', component: ReceiverComponent } + ] + } +]; + +@NgModule({ + imports: [ + CommonModule, + RouterModule.forChild(routes) + ], + declarations: [ + InstallerComponent, + ReceiverComponent + ] +}) +export class UsersModule { } diff --git a/src/assets/app-data.json b/src/assets/app-data.json index 817647b..db4e206 100644 --- a/src/assets/app-data.json +++ b/src/assets/app-data.json @@ -1,408 +1,54 @@ { "app": { - "name": "Alain", - "description": "Ng-zorro admin panel front-end framework" + "name": "������������", + "description": "���������������������������������" }, "user": { - "name": "Admin", + "name": "���������", "avatar": "./assets/img/zorro.svg", - "email": "cipchk@qq.com" + "email": "23420800@qq.com" }, "menu": [{ - "text": "���������", + "text": "������������", "translate": "main_navigation", "group": true, "children": [{ - "text": "���������", - "translate": "dashboard", + "text": "������", + "translate": "home", "link": "/dashboard", - "icon": "icon-speedometer", - "children": [{ - "text": "���������V1", - "link": "/dashboard/v1", - "translate": "dashboard_v1" - }, { - "text": "���������", - "link": "/dashboard/analysis", - "translate": "dashboard_analysis" - }, { - "text": "Monitor", - "link": "/dashboard/monitor", - "translate": "dashboard_monitor" - }, { - "text": "Workplace", - "link": "/dashboard/workplace", - "translate": "dashboard_workplace" - }] - }, { - "text": "������������", - "translate": "shortcut", - "icon": "icon-rocket", - "shortcut_root": true, - "children": [] - }, { - "text": "���������", - "translate": "widgets", - "link": "/widgets", - "icon": "icon-grid", - "badge": 2 - }] - }, { - "text": "������", - "translate": "component", - "group": true, - "children": [{ - "text": "������������", - "translate": "elements", - "link": "/elements", - "icon": "icon-chemistry", - "acl": "role-a", - "children": [{ - "text": "������", - "link": "/elements/buttons", - "translate": "buttons", - "shortcut": true - }, { - "text": "Notification", - "link": "/elements/notification", - "translate": "notification", - "shortcut": true - }, { - "text": "Modal", - "link": "/elements/modal", - "translate": "modal" - }, { - "text": "SweetAlert", - "link": "/elements/sweetalert", - "translate": "sweetalert" - }, { - "text": "Tree Antd", - "link": "/elements/tree-antd", - "translate": "tree-antd" - }, { - "text": "Sortable", - "link": "/elements/sortable", - "translate": "sortable" - }, { - "text": "Spin", - "link": "/elements/spin", - "translate": "spin" - }, { - "text": "Dropdown", - "link": "/elements/dropdown", - "translate": "dropdown" - }, { - "text": "Grid", - "link": "/elements/grid", - "translate": "grid" - }, { - "text": "Grid Masonry", - "link": "/elements/gridmasonry", - "translate": "gridmasonry" - }, { - "text": "Typography", - "link": "/elements/typography", - "translate": "typography" - }, { - "text": "Font Icons", - "link": "/elements/iconsfont", - "translate": "iconsfont" - }, { - "text": "Colors", - "link": "/elements/colors", - "translate": "colors" - }] - }, { - "text": "������", - "translate": "forms", - "link": "/forms", - "icon": "icon-note", - "acl": "role-a", - "children": [{ - "text": "������", - "link": "/forms/standard", - "translate": "standard" - }, { - "text": "������", - "link": "/forms/extended", - "translate": "extended" - }, { - "text": "������", - "link": "/forms/validation", - "translate": "validation" - }, { - "text": "������", - "link": "/forms/upload", - "translate": "upload", - "shortcut": true - }, { - "text": "������������", - "link": "/forms/cropper", - "translate": "cropper" - }] - }, { - "text": "Charts", - "translate": "charts", - "link": "/charts", - "icon": "icon-graph", - "acl": "role-a", - "children": [{ - "text": "G2", - "link": "/charts/g2" - }] - }, { - "text": "������", - "translate": "tables", - "link": "/tables", - "icon": "icon-grid", - "acl": "role-b", - "children": [{ - "text": "������", - "link": "/tables/standard", - "translate": "standard" - }, { - "text": "Full", - "link": "/tables/full", - "translate": "full" - }] - }, { - "text": "������", - "translate": "maps", - "link": "/maps", - "icon": "icon-map", - "acl": "role-b", - "children": [{ - "text": "QQ", - "link": "/maps/qq", - "translate": "qq" - }, { - "text": "Baidu", - "link": "/maps/baidu", - "translate": "baidu" - }] - }] - }, { - "text": "Pro", - "translate": "pro", - "group": true, - "children": [{ - "text": "Form Page", - "translate": "form", - "link": "/pro/form", - "icon": "icon-note", - "children": [{ - "text": "Step Form", - "link": "/pro/form/step-form", - "translate": "step-form" - }, { - "text": "Advanced Form", - "link": "/pro/form/advanced-form", - "translate": "advanced-form" - }] - }, { - "text": "List", - "translate": "pro-list", - "link": "/pro/list", - "icon": "icon-grid", - "children": [{ - "text": "Table List", - "link": "/pro/list/table-list", - "translate": "pro-table-list" - }, { - "text": "Basic List", - "link": "/pro/list/basic-list", - "translate": "pro-basic-list" - }, { - "text": "Card List", - "link": "/pro/list/card-list", - "translate": "pro-card-list" - }, { - "text": "Cover Card List", - "link": "/pro/list/cover-card-list", - "translate": "pro-cover-card-list" - }, { - "text": "Filter Card List", - "link": "/pro/list/filter-card-list", - "translate": "pro-filter-card-list" - }, { - "text": "Search", - "link": "/pro/list/search", - "translate": "pro-search" - }] - }, { - "text": "Profile", - "translate": "pro-profile", - "link": "/pro/profile", - "icon": "icon-book-open", - "children": [{ - "text": "Basic", - "link": "/pro/profile/basic", - "translate": "pro-profile-basic" - }, { - "text": "Advanced", - "link": "/pro/profile/advanced", - "translate": "pro-profile-advanced" - }] - }, { - "text": "Result", - "translate": "pro-result", - "link": "/pro/result", - "icon": "icon-check", - "children": [{ - "text": "Success", - "link": "/pro/result/success", - "translate": "pro-result-success" - }, { - "text": "Fail", - "link": "/pro/result/fail", - "translate": "pro-result-fail" - }] - }, { - "text": "Exception", - "translate": "pro-exception", - "link": "/pro/exception", - "icon": "icon-fire", - "children": [{ - "text": "403", - "link": "/pro/exception/403" - }, { - "text": "404", - "link": "/pro/exception/404" - }, { - "text": "500", - "link": "/pro/exception/500" - }] - }, { - "text": "User", - "translate": "pro-user", - "link": "/pro/user", + "icon": "icon-cup" + }, { + "text": "������������", + "translate": "user_management", + "link": "/dashboard", "icon": "icon-user", "children": [{ - "text": "login", - "link": "/pro/user/login", - "translate": "pro-login" + "text": "������������", + "link": "/users/installer", + "translate": "user_management_install" }, { - "text": "register", - "link": "/pro/user/register", - "translate": "pro-register" - }, { - "text": "register result", - "link": "/pro/user/register-result", - "translate": "pro-register-result" - }] - }] - }, { - "text": "More", - "translate": "more", - "group": true, - "children": [{ - "text": "Common Logics", - "translate": "logics", - "link": "/logics", - "icon": "icon-compass", - "children": [{ - "text": "ACL", - "link": "/logics/acl", - "translate": "acl" - }, - { - "text": "Route Guard", - "link": "/logics/guard", - "translate": "guard", - "acl": "admin" - }, - { - "text": "Down File", - "link": "/logics/downfile", - "translate": "downfile", - "shortcut": true + "text": "������������", + "link": "/users/receiver", + "translate": "user_management_receive" }] }, { - "text": "Report", - "translate": "report", - "icon": "anticon anticon-cloud-o", - "children": [{ - "text": "Relation", - "link": "/data-v/relation", - "translate": "relation", - "target": "_blank", - "shortcut": true - }] - }, { - "text": "Pages", - "translate": "pages", - "link": "/pages", - "icon": "icon-doc", - "acl": "admin", - "children": [{ - "text": "Login", - "link": "/login", - "translate": "m-login" - }, { - "text": "Register", - "link": "/register", - "translate": "m-register" - }, { - "text": "Forget", - "link": "/forget", - "translate": "m-forget" - }, { - "text": "Lock", - "link": "/lock", - "translate": "m-lock" - }, { - "text": "404", - "link": "/404" - }, { - "text": "500", - "link": "/500" - }, { - "text": "Maintenance", - "link": "/maintenance", - "translate": "maintenance" - }] - }, { - "text": "Extras", - "translate": "extras", - "link": "/extras", - "icon": "icon-cup", - "children": [{ - "text": "Blog", - "link": "/extras/blog", - "translate": "blog", - "children": [{ - "text": "List", - "link": "/extras/blog/list", - "translate": "list", - "badge": 1, - "badge_dot": true - },{ - "text": "Comment", - "link": "/extras/blog/comment", - "translate": "comment" - },{ - "text": "Post", - "link": "/extras/blog/post", - "translate": "post" - },{ - "text": "WebSite", - "externalLink": "//github.com/cipchk/ng-alain", - "target": "_blank", - "translate": "website" - }] - }, { - "text": "Help Center", - "link": "/extras/helpcenter", - "translate": "helpcenter" - }, { - "text": "Settings", - "link": "/extras/settings", - "translate": "settings" - }, { - "text": "Poi", - "link": "/extras/poi", - "translate": "poi" - }] + "text": "������������", + "translate": "device_management", + "link": "/dashboard", + "icon": "icon-grid", + "children": [{ + "text": "������������", + "link": "/devices/basic", + "translate": "device_management_info" + }, { + "text": "������������", + "link": "/devices/version", + "translate": "device_management_version" + }, { + "text": "���������������", + "link": "/devices/monitor-point", + "translate": "device_management_point" + }] }] }] } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 262c53d..0c09f52 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -1,5 +1,8 @@ { "home": "Home", + + + "settings": "Settings", "profile": "Profile", "login": "Login", diff --git a/src/assets/i18n/zh-CN.json b/src/assets/i18n/zh-CN.json index 2488a5e..fb9b2f8 100644 --- a/src/assets/i18n/zh-CN.json +++ b/src/assets/i18n/zh-CN.json @@ -1,5 +1,13 @@ { "home": "������", + "user_management": "������������", + "user_management_install": "������������", + "user_management_receive": "������������", + "device_management": "������������", + "device_management_info": "������������", + "device_management_version": "������������", + "device_management_point": "���������������", + "settings": "������", "profile": "������������", "login": "������", -- Gitblit v1.8.0