From 0e25153037b06851846e80cc745e518ba07bf7af Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 13:58:16 +0800
Subject: [PATCH] 数据查询和表单模块合并,修改密码用户输入框去除

---
 src/assets/app-data.json |   42 ++++++++----------------------------------
 1 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 420b56d..30c85ad 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": "������������",
@@ -72,20 +51,15 @@
                   "text": "������������",
                   "link": "/sensors/basic"
                 }]
-              }, {
-                "text": "������������",
-                "icon": "icon-graph",
-                "children": [
-                  {
-                  "text": "������������",
-                  "link": "/analysis/query"
-                  }
-                ]
-              }, {
+              },{
                 "text": "������������",
                 "icon": "icon-chart",
                 "children": [
                   {
+                  "text": "������������",
+                  "link": "/reports/query"
+                  },
+                  {
                   "text": "���������������",
                   "link": "/reports/demo"
                   },

--
Gitblit v1.8.0