Merge branch 'newMonitor' of http://120.77.246.153:7990/scm/ew/ewater-web into newMonitor
# Conflicts:
# src/css/modules/monitor.css
# src/css/modules/rightPanel.css
# src/modules/rightPanel/rightPanel.html
# src/modules/rightPanel/statistics/index.js
