From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/assets/app-data.json | 67 +++++++++++++++------------------
1 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 8bfea96..76b2b22 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -1,51 +1,28 @@
{
"app": {
- "name": "Alain",
- "description": "Ng-zorro admin panel front-end framework"
+ "name": "������������������������",
+ "description": "������������������������������������������"
},
"user": {
"name": "Admin",
"avatar": "./assets/img/zorro.svg",
- "email": "cipchk@qq.com"
+ "email": "admin@qq.com"
},
"menu": [{
"text": "���������",
"translate": "main_navigation",
"group": true,
"children": [{
- "text": "���������",
- "link": "/dashboard",
+ "text": "���������",
+ "link": "/dashboard/workplace",
"icon": "icon-speedometer",
- "children": [{
- "text": "���������V1",
- "link": "/dashboard/v1",
- "translate": "dashboard_v1"
- }, {
- "text": "���������",
- "link": "/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": []
+ "translate": "dashboard_workplace"
}]
}, {
- "text": "������������",
- "link": "/",
+ "text": "������������",
"group": true,
"children": [{
"text": "������������",
- "link": "/",
"icon": "icon-user",
"children": [{
"text": "������������",
@@ -56,10 +33,9 @@
}]
}, {
"text": "������������",
- "link": "/",
"icon": "icon-grid",
"children": [{
- "text": "������������",
+ "text": "������������",
"link": "/devices/basic"
}, {
"text": "������������",
@@ -70,16 +46,36 @@
}]
}, {
"text": "���������������",
- "link": "/",
"icon": "icon-note",
"children": [{
"text": "������������",
"link": "/sensors/basic"
}]
}, {
+ "text": "������������",
+ "icon": "icon-graph",
+ "children": [
+ {
+ "text": "������������",
+ "link": "/analysis/query"
+ }
+ ]
+ }, {
+ "text": "������������",
+ "icon": "icon-chart",
+ "children": [
+ {
+ "text": "���������������",
+ "link": "/reports/demo"
+ },
+ {
+ "text": "Excel������",
+ "link": "/reports/excel"
+ }
+ ]
+ }, {
"text": "������������",
- "link": "/",
- "icon": "icon-note",
+ "icon": "icon-settings",
"children": [
{
"text": "������������",
@@ -91,7 +87,6 @@
}
]
}
-
]
--
Gitblit v1.8.0