From e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 16:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/assets/app-data.json | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 3e82812..1edc88b 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -48,11 +48,6 @@
"text": "������������",
"link": "/enterprise-management/enterprise-data"
}
- ,
- {
- "text": "������������",
- "link": "/enterprise-management/standard-alarm"
- }
]
},
{
@@ -85,7 +80,7 @@
,
{
"text": "������������",
- "link": "/operation/device-status"
+ "link": "/operation/device-controller"
}
,
{
@@ -97,12 +92,23 @@
{
"text": "������������",
"icon": "icon-flag",
- "link": "/sand-table"
+ "children":[
+ {
+ "text": "���������������������",
+ "link": "/raise-dust/real-time"
+ },{
+ "text": "���������������������",
+ "link": "/raise-dust/statistical-query"
+ },{
+ "text": "������������",
+ "link": "/raise-dust/image-grabbing"
+ }
+ ]
},
{
"text": "������������",
"icon": "icon-people",
- "link": "/raise-dust"
+ "link": "/sand-table"
}
]
}
--
Gitblit v1.8.0