From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/assets/app-data.json |   57 ++++++++++++++++++++++-----------------------------------
 1 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index b19eb23..76b2b22 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -13,31 +13,10 @@
             "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": "������������",
@@ -73,21 +52,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 +73,20 @@
                   "link": "/reports/excel"
                   }
                 ]
+              }, {
+                "text": "������������",
+                "icon": "icon-settings",
+                "children": [
+                  {
+                  "text": "������������",
+                  "link": "/systems/account"
+                  },
+                  {
+                    "text": "������������",
+                    "link": "/systems/organization"
+                    }
+                ]
               }
-
             ]
 
 

--
Gitblit v1.8.0