sv
Merge branch 'meteorite' into meteorite-nj005
Merge branch 'meteorite' into meteorite-nj005
增加统计报告的分页显示
trend趋势报告中查询条件，运行情况等完善
统计报告分页的修改/
add sendoption of warnerruler,and complete some
删除了部分多余代码
Merge remote-tracking branch 'origin/meteorite' into meteorite-nj04
modify some about html
fix up some conflict
添加以及编辑监视器的逻辑简化和冗余代码剔除
update the monitor add bug
fix statistical,trend.
1 .完成监视添加相关bug修复。
2. 监视器编辑的两次异步信息获取。反馈至页面。善待完成
modify alertlog and read some data about
修复由监视器 文件修改带来的bug
Merge branch 'meteorite-nj04' into meteorite
Merge branch 'meteorite-nj005' into meteorite
Merge branch 'meteorite-hu' into meteorite