From 42ac7e8242e0e6fa51816449f4d73f5e80114b9a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 10:08:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/assets/app-data.json | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 3a0906f..420b56d 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -1,12 +1,12 @@
{
"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": "���������",
@@ -40,11 +40,10 @@
"children": []
}]
}, {
- "text": "������������",
+ "text": "������������",
"group": true,
"children": [{
"text": "������������",
- "link": "/users",
"icon": "icon-user",
"children": [{
"text": "������������",
@@ -55,10 +54,9 @@
}]
}, {
"text": "������������",
- "link": "/devices",
"icon": "icon-grid",
"children": [{
- "text": "������������",
+ "text": "������������",
"link": "/devices/basic"
}, {
"text": "������������",
@@ -69,16 +67,36 @@
}]
}, {
"text": "���������������",
- "link": "/sensors",
"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": "/systems",
- "icon": "icon-note",
+ "icon": "icon-settings",
"children": [
{
"text": "������������",
@@ -90,7 +108,6 @@
}
]
}
-
]
--
Gitblit v1.8.0