波形去  重复的点
Merge remote-tracking branch 'origin/master'

Conflicts:
	realtimeMonitor/realtimeMonitorWeb/src/main/webapp/chuguan/js/chartTool.js
波形重复点的去掉