updates

沈斌

2017-12-16 f047b77624fd1b58bed9e80751b37eb002264305

updates

 src/app/routes/devices/basic-info/basic-info.component.html

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

 src/app/routes/devices/basic-info/basic-info.component.ts

New file
@@ -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() {
  }

}

 src/app/routes/devices/devices.module.ts

New file
@@ -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 { }

 src/app/routes/devices/monitor-point/monitor-point.component.html

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

 src/app/routes/devices/monitor-point/monitor-point.component.ts

New file
@@ -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() {
  }

}

 src/app/routes/devices/version/version.component.html

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

 src/app/routes/devices/version/version.component.ts

New file
@@ -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() {
  }

}

 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' }
];

 src/app/routes/users/installer/installer.component.html

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

 src/app/routes/users/installer/installer.component.ts

New file
@@ -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() {
  }

}

 src/app/routes/users/receiver/receiver.component.html

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

 src/app/routes/users/receiver/receiver.component.ts

New file
@@ -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() {
  }

}

 src/app/routes/users/users.module.ts

New file
@@ -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 { }

 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"
          }]
        }]
    }]
}

 src/assets/i18n/en.json

@@ -1,5 +1,8 @@
{
    "home": "Home",



    "settings": "Settings",
    "profile": "Profile",
    "login": "Login",

 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": "登录",