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

fengxiang

2018-04-16 780f76a3e8dd68abe6b007006f85a76991ea2c54

 src/assets/app-data.json

@@ -51,25 +51,20 @@
                  "text": "基本信息",
                  "link": "/sensors/basic"
                }]
              }, {
                "text": "数据分析",
                "icon": "icon-graph",
                "children": [
                  {
                  "text": "数据查看",
                  "link": "/analysis/query"
                  }
                ]
              }, {
              },{
                "text": "报表管理",
                "icon": "icon-chart",
                "children": [
                  {
                  "text": "柱状图比较",
                  "text": "数据查询",
                  "link": "/reports/query"
                  },
                  {
                  "text": "报表展示",
                  "link": "/reports/demo"
                  },
                  {
                  "text": "Excel导出",
                  "text": "数据导出",
                  "link": "/reports/excel"
                  }
                ]
@@ -84,7 +79,12 @@
                  {
                    "text": "组织管理",
                    "link": "/systems/organization"
                    }
                    },
                   {
                      "text": "注册码管理",
                      "link": "/systems/registration",
                      "hide": true
                   }
                ]
              }
            ]