Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-16 a2cb03002bc7b9ed76e9586947fec73ebc223215

 gx_tieta/WebRoot/ele_statistics.jsp

@@ -267,6 +267,7 @@
         var load = layer.load(1);

         //console.info($("#search_form").serialize());

         var temp = createSearchForm();

         console.info(temp);

         var json = JSON.stringify(temp);

         battinfo_list = new Array();

         $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){