历史监控趋势图
历史监控趋势图
解决routes冲突
Merge branch 'master' of https://github.com/xwkp2008/realTimeSys

Conflicts:
	realTimeSys/conf/routes