Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

didiyu

2019-01-05 4f39b4da8aae5c905cb35f32a2112db2c488e07f

 gx_tieta/WebRoot/eleHistoryWarn.jsp

@@ -586,7 +586,7 @@
               }

               

               // 根据数据生成下拉列表

               createOptions($select, optsList, true);

               createOptions($select, optsList, false);

            }else{

               $("#station_name").text('').html('<option>暂无可测机房站点</option>');

            }

@@ -645,7 +645,7 @@
               createOptions($select, optsList, true);

               $select.find('option').eq(0).val(0);

               

               searchHistalm();   // 查询历史告警

               //searchHistalm();   // 查询历史告警

            }else{

               $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');

            }