From e86e4f95fcca349107237f8f4161b9c91e279af1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 28 Feb 2018 11:16:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/assets/app-data.json | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 3a0906f..d6cbdf9 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -40,7 +40,7 @@
"children": []
}]
}, {
- "text": "������������",
+ "text": "������������",
"group": true,
"children": [{
"text": "������������",
@@ -58,7 +58,7 @@
"link": "/devices",
"icon": "icon-grid",
"children": [{
- "text": "������������",
+ "text": "������������",
"link": "/devices/basic"
}, {
"text": "������������",
@@ -89,6 +89,20 @@
"link": "/systems/organization"
}
]
+ }, {
+ "text": "������������",
+ "link": "/reports",
+ "icon": "icon-note",
+ "children": [
+ {
+ "text": "���������������",
+ "link": "/reports/demo"
+ },
+ {
+ "text": "Excel������",
+ "link": "/reports/excel"
+ }
+ ]
}
]
--
Gitblit v1.8.0