From 7c26164dc8a00a230e074d320f3b2614c9080340 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Mar 2018 08:52:41 +0800
Subject: [PATCH] 默认中文，登录页面title设置，菜单面包屑无效链接去除
---
src/app/routes/routes-routing.module.ts | 2 +-
src/app/core/i18n/i18n.service.ts | 5 +++--
src/assets/app-data.json | 5 -----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/app/core/i18n/i18n.service.ts b/src/app/core/i18n/i18n.service.ts
index 651d62a..5ddd4c6 100644
--- a/src/app/core/i18n/i18n.service.ts
+++ b/src/app/core/i18n/i18n.service.ts
@@ -10,9 +10,10 @@
private _default = 'zh-CN';
+ //������������������ ��������� by fx
private _langs = [
- { code: 'en', text: 'English' },
- { code: 'zh-CN', text: '������' }
+ { code: 'zh-CN', text: '������' },
+ { code: 'en', text: 'English' }
];
constructor(
diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts
index 016b94a..4cb980b 100644
--- a/src/app/routes/routes-routing.module.ts
+++ b/src/app/routes/routes-routing.module.ts
@@ -37,7 +37,7 @@
path: 'passport',
component: LayoutPassportComponent,
children: [
- { path: 'login', component: UserLoginComponent }
+ {data:{title:'������������'}, path: 'login', component: UserLoginComponent }
]
}, // passport
{
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 4e0c959..b19eb23 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -44,7 +44,6 @@
"group": true,
"children": [{
"text": "������������",
- "link": "/users",
"icon": "icon-user",
"children": [{
"text": "������������",
@@ -55,7 +54,6 @@
}]
}, {
"text": "������������",
- "link": "/devices",
"icon": "icon-grid",
"children": [{
"text": "������������",
@@ -69,7 +67,6 @@
}]
}, {
"text": "���������������",
- "link": "/sensors",
"icon": "icon-note",
"children": [{
"text": "������������",
@@ -77,7 +74,6 @@
}]
}, {
"text": "������������",
- "link": "/systems",
"icon": "icon-note",
"children": [
{
@@ -91,7 +87,6 @@
]
}, {
"text": "������������",
- "link": "/reports",
"icon": "icon-note",
"children": [
{
--
Gitblit v1.8.0