Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-13 ef5b73ea0b7aed593312f728638d84b5358458ae

 src/assets/app-data.json

@@ -27,17 +27,7 @@
            {
              "text": "环境管理",
              "icon": "icon-directions",
              "children": [
                {
                  "text": "考核指标",
                  "link": "/"
                }
                ,
                {
                  "text": "分析",
                  "link": "/"
                }
              ]
              "link": "/environment/management"
            },
            {
              "text": "污染管控",
@@ -75,7 +65,7 @@
                        "link": "/statistics/calendar"
                }, {
                        "text": "站点数据分析",
                        "link": "/statistics/monitorpoint"
                        "link": "/reports/query2"
                }]
            },
            {