From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/assets/app-data.json | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index 9877414..584e5e2 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -41,7 +41,7 @@
"text": "������������",
"link": "/devices/version"
}, {
- "text": "���������������",
+ "text": "������������������",
"link": "/devices/monitor-point"
}]
}, {
@@ -64,6 +64,10 @@
"link": "/reports/demo"
},
{
+ "text": "������������",
+ "link": "/reports/alarm"
+ },
+ {
"text": "������������",
"link": "/reports/excel"
}
@@ -79,7 +83,12 @@
{
"text": "������������",
"link": "/systems/organization"
- }
+ },
+ {
+ "text": "���������������",
+ "link": "/systems/registration",
+ "hide": true
+ }
]
}
]
--
Gitblit v1.8.0