Merge pull request #21 from JohnCny/master

merge
Merge pull request #22 from JohnCny/master

merge
[mod]非标准监测页面重做
Merge pull request #30 from qkhj/master

merge
Merge pull request #31 from wangxu2013/master

[mod]非标准监测页面重做
Merge pull request #23 from JohnCny/master

merge
[mod]非标准监测保存
Merge pull request #32 from wangxu2013/master

[mod]非标准监测保存
Merge pull request #24 from JohnCny/master

merge
[add]非标准监测
Merge pull request #33 from tanwh/master

[add]非标准监测
[mod]bug修改(基本情况页面建议期限与数据库格式不一致保存报错)
Merge pull request #34 from wangxu2013/master

[mod]bug修改(基本情况页面建议期限与数据库格式不一致保存报错)
Merge pull request #12 from JohnCny/master

merge