From ba218bd17ed9b3bf1f330294714850a09ac71c17 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 13 Jul 2018 11:11:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/assets/app-data.json | 44 ++++++++++++++------------------------------
1 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 921a5c0..2937ade 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -22,42 +22,17 @@
{
"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": "������������",
"icon": "icon-chemistry",
- "link": "/"
+ "link": "/pollution/management"
},
{
"text": "������������������",
@@ -82,7 +57,16 @@
{
"text": "������������",
"icon": "icon-note",
- "link": "/"
+ "children": [{
+ "text": "������������",
+ "link": "/statistics/analysis"
+ }, {
+ "text": "������������",
+ "link": "/statistics/calendar"
+ }, {
+ "text": "������������������",
+ "link": "/statistics/monitorpoint"
+ }]
},
{
"text": "������������",
@@ -95,7 +79,7 @@
"children": [
{
"text": "������������",
- "link": "/maintenance/data-check"
+ "link": "/reports/query"
}
,
{
--
Gitblit v1.8.0