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 |  128 +++++++++++++++++++++++++-----------------
 1 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/src/assets/app-data.json b/src/assets/app-data.json
index db4e206..9c5afad 100644
--- a/src/assets/app-data.json
+++ b/src/assets/app-data.json
@@ -1,54 +1,80 @@
 {
-    "app": {
-        "name": "������������",
-        "description": "���������������������������������"
-    },
-    "user": {
-        "name": "���������",
-        "avatar": "./assets/img/zorro.svg",
-        "email": "23420800@qq.com"
-    },
-    "menu": [{
-        "text": "������������",
-        "translate": "main_navigation",
-        "group": true,
-        "children": [{
-            "text": "������",
-            "translate": "home",
-            "link": "/dashboard",
-            "icon": "icon-cup"
-          }, {
-            "text": "������������",
-            "translate": "user_management",
-            "link": "/dashboard",
-            "icon": "icon-user",
-            "children": [{
-                "text": "������������",
-                "link": "/users/installer",
-                "translate": "user_management_install"
-            }, {
-                "text": "������������",
-                "link": "/users/receiver",
-                "translate": "user_management_receive"
-            }]
-        }, {
-          "text": "������������",
-          "translate": "device_management",
-          "link": "/dashboard",
-          "icon": "icon-grid",
-          "children": [{
-            "text": "������������",
-            "link": "/devices/basic",
-            "translate": "device_management_info"
-          }, {
-            "text": "������������",
-            "link": "/devices/version",
-            "translate": "device_management_version"
-          }, {
-            "text": "���������������",
-            "link": "/devices/monitor-point",
-            "translate": "device_management_point"
-          }]
-        }]
+  "app": {
+  "name": "������������",
+  "description": "���������������������������������"
+},
+  "user": {
+  "name": "���������",
+  "avatar": "./assets/img/zorro.svg",
+  "email": "23420800@qq.com"
+},
+  "menu": [{
+  "text": "������������",
+  "translate": "main_navigation",
+  "group": true,
+  "children": [{
+    "text": "������",
+    "translate": "home",
+    "link": "/dashboard",
+    "icon": "icon-cup"
+  }, {
+    "text": "������������",
+    "translate": "user_management",
+    "link": "/",
+    "icon": "icon-user",
+    "children": [{
+      "text": "������������",
+      "link": "/users/installer",
+      "translate": "user_management_install"
+    }, {
+      "text": "������������",
+      "link": "/users/alarm-user",
+      "translate": "user_management_alarm-user"
     }]
+  }, {
+    "text": "������������",
+    "translate": "device_management",
+    "link": "/",
+    "icon": "icon-grid",
+    "children": [{
+      "text": "������������",
+      "link": "/devices/basic",
+      "translate": "device_management_info"
+    }, {
+      "text": "������������",
+      "link": "/devices/version",
+      "translate": "device_management_version"
+    }, {
+      "text": "���������������",
+      "link": "/devices/monitor-point",
+      "translate": "device_management_point"
+    }]
+  }, {
+    "text": "���������������",
+    "translate": "sensor_management",
+    "link": "/",
+    "icon": "icon-note",
+    "children": [{
+      "text": "������������",
+      "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