From d53fe2390628caa2ac99424c6961dc6a92aa47ca Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Jul 2018 13:19:05 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

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

diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 519303e..874920b 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -22,37 +22,12 @@
             {
               "text": "������������",
               "icon": "icon-pie-chart",
-              "children": [
-                  {
-                    "text": "������",
-                    "link": "/"
-                  }
-                  ,
-                  {
-                    "text": "������",
-                    "link": "/"
-                  }
-                  ,
-                  {
-                    "text": "������������",
-                    "link": "/"
-                  }
-              ]
+              "link": "/forecasting-warning"
             },
             {
               "text": "������������",
               "icon": "icon-directions",
-              "children": [
-                {
-                  "text": "������������",
-                  "link": "/"
-                }
-                ,
-                {
-                  "text": "������",
-                  "link": "/"
-                }
-              ]
+              "link": "/environment/management"
             },
             {
               "text": "������������",
@@ -61,21 +36,22 @@
             },
             {
               "text": "������������������",
+              "group": true,
               "icon": "icon-puzzle",
                "children": [
                 {
-                  "text": "gis������",
-                  "link": "/"
+                  "text": "GIS������",
+                  "link": "/enterprise-management/gis-show"
                 }
                 ,
                 {
                   "text": "������������",
-                  "link": "/"
+                  "link": "/enterprise-management/enterprise-data"
                 }
                 ,
                 {
                   "text": "������������",
-                  "link": "/"
+                  "link": "/enterprise-management/standard-alarm"
                 }
                ]
             },
@@ -84,17 +60,17 @@
               "icon": "icon-note",
                 "children": [{
                         "text": "������������",
-                        "link": "/"
+                        "link": "/statistics/analysis"
                 }, {
                         "text": "������������",
-                        "link": "/"
+                        "link": "/statistics/calendar"
                 }, {
                         "text": "������������������",
-                        "link": "/"
+                        "link": "/reports/query2"
                 }]
             },
             {
-              "text": "������������",
+              "text": "������������",
               "icon": "icon-support",
               "link": "/"
             },

--
Gitblit v1.8.0