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

fengxiang

2018-03-08 43f2601b8a5706a029f333204f7f52f153d61dfe

 src/assets/app-data.json

@@ -13,31 +13,10 @@
            "translate": "main_navigation",
            "group": true,
            "children": [{
                "text": "仪表盘",
                "link": "/dashboard",
                "text": "工作台",
                "link": "/dashboard/workplace",
                "icon": "icon-speedometer",
                "children": [{
                    "text": "仪表盘V1",
                    "link": "/dashboard/v1",
                    "translate": "dashboard_v1"
                }, {
                    "text": "分析页",
                    "link": "/dashboard/analysis"
                }, {
                    "text": "Monitor",
                    "link": "/dashboard/monitor",
                    "translate": "dashboard_monitor"
                }, {
                    "text": "Workplace",
                    "link": "/dashboard/workplace",
                    "translate": "dashboard_workplace"
                }]
            }, {
                "text": "快捷菜单",
                "translate": "shortcut",
                "icon": "icon-rocket",
                "shortcut_root": true,
                "children": []
                "translate": "dashboard_workplace"
            }]
        }, {
            "text": "系统模块",
@@ -73,21 +52,17 @@
                  "link": "/sensors/basic"
                }]
              }, {
                "text": "系统管理",
                "icon": "icon-note",
                "text": "数据分析",
                "icon": "icon-graph",
                "children": [
                  {
                  "text": "账户管理",
                  "link": "/systems/account"
                  },
                  {
                    "text": "组织管理",
                    "link": "/systems/organization"
                    }
                  "text": "数据查看",
                  "link": "/analysis/query"
                  }
                ]
              }, {
                "text": "报表管理",
                "icon": "icon-note",
                "icon": "icon-chart",
                "children": [
                  {
                  "text": "柱状图比较",
@@ -98,8 +73,20 @@
                  "link": "/reports/excel"
                  }
                ]
              }, {
                "text": "系统管理",
                "icon": "icon-settings",
                "children": [
                  {
                  "text": "账户管理",
                  "link": "/systems/account"
                  },
                  {
                    "text": "组织管理",
                    "link": "/systems/organization"
                    }
                ]
              }

            ]