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

hdw

2018-10-31 8cb69e21ae105a3209528767d1d54eeff357b95c

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

 gx_tieta/WebRoot/batt-fault-manage.jsp

@@ -117,9 +117,6 @@
            

            // 生成表格数据

            table.render(tOptions);

			
		
			
             $(document).ready(function(){

                console.info(1111);

                tOptions.data=getData(100,0);

@@ -135,13 +132,6 @@
            }

            return arr

            }

			
			
			
			
			
			
			
            

            $(document).on('click','.addbtn',function(){

                searchStationHistRecord();

@@ -163,14 +153,7 @@
                            });

                

            }

            
            
            
            
			
        });