From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/assets/app-data.json | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index e370228..9c5afad 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -28,8 +28,8 @@
"translate": "user_management_install"
}, {
"text": "������������",
- "link": "/users/receiver",
- "translate": "user_management_receive"
+ "link": "/users/alarm-user",
+ "translate": "user_management_alarm-user"
}]
}, {
"text": "������������",
@@ -59,6 +59,22 @@
"link": "/sensors/basic",
"translate": "device_management_info"
}]
+ }, {
+ "text": "������������",
+ "translate": "system_management",
+ "link": "/",
+ "icon": "icon-note",
+ "children": [
+ {
+ "text": "������������",
+ "link": "/systems/account",
+ "translate": "system_management_account"
+ },
+ {
+ "text": "������������",
+ "link": "/systems/organization"
+ }
+ ]
}]
}]
}
--
Gitblit v1.8.0