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 | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index b19eb23..420b56d 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -73,21 +73,17 @@
"link": "/sensors/basic"
}]
}, {
- "text": "������������",
- "icon": "icon-note",
+ "text": "������������",
+ "icon": "icon-graph",
"children": [
{
- "text": "������������",
- "link": "/systems/account"
- },
- {
- "text": "������������",
- "link": "/systems/organization"
- }
+ "text": "������������",
+ "link": "/analysis/query"
+ }
]
}, {
"text": "������������",
- "icon": "icon-note",
+ "icon": "icon-chart",
"children": [
{
"text": "���������������",
@@ -98,8 +94,20 @@
"link": "/reports/excel"
}
]
+ }, {
+ "text": "������������",
+ "icon": "icon-settings",
+ "children": [
+ {
+ "text": "������������",
+ "link": "/systems/account"
+ },
+ {
+ "text": "������������",
+ "link": "/systems/organization"
+ }
+ ]
}
-
]
--
Gitblit v1.8.0