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

fengxiang

2018-07-16 09d02da80ec5bd59836427007169fdd03738e393

 src/assets/app-data.json

@@ -65,7 +65,7 @@
                        "link": "/statistics/calendar"
                }, {
                        "text": "站点数据分析",
                        "link": "/statistics/monitorpoint"
                        "link": "/reports/query2"
                }]
            },
            {