* 修改图表中存在的问题
Merge branch 'master' of https://github.com/supersky07/pageMonitor

Conflicts:
	app/js/modules/enp/enpCtrl.js
	app/js/modules/fans/fansCtrl.js
	app/js/modules/media/mediaCtrl.js

去掉基调图标中的错误，解决之前的冲突