Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git ...

xufenglei

2018-01-11 e4cadb22394599a2f508078ff5b1e8889944475e

Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git into develop

 src/assets/app-data.json

@@ -41,10 +41,11 @@
            }]
        }, {
            "text": "系统管理",
            "link": "/",
            "group": true,
            "children": [{
                "text": "用户管理",
                "link": "/users",
                "link": "/",
                "icon": "icon-user",
                "children": [{
                  "text": "安装用户",
@@ -55,7 +56,7 @@
                }]
              }, {
                "text": "设备管理",
                "link": "/devices",
                "link": "/",
                "icon": "icon-grid",
                "children": [{
                  "text": "基本信息",
@@ -69,7 +70,7 @@
                }]
              }, {
                "text": "传感器管理",
                "link": "/sensors",
                "link": "/",
                "icon": "icon-note",
                "children": [{
                  "text": "基本信息",
@@ -77,7 +78,7 @@
                }]
              }, {
                "text": "系统管理",
                "link": "/systems",
                "link": "/",
                "icon": "icon-note",
                "children": [
                  {