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

fengxiang

2018-08-03 e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef

 src/assets/app-data.json

@@ -48,11 +48,6 @@
                  "text": "企业数据",
                  "link": "/enterprise-management/enterprise-data"
                }
                ,
                {
                  "text": "超标报警",
                  "link": "/enterprise-management/standard-alarm"
                }
               ]
            },
            {
@@ -85,7 +80,7 @@
                ,
                {
                  "text": "设备状态",
                  "link": "/operation/device-status"
                  "link": "/operation/device-controller"
                }
                ,
                {