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);

@@ -133,16 +130,9 @@
            for(i=0;i<a;i++){

            arr.push({'station_name1':b,'city':b+i,'stationName3':b+i+1,'note':b+i+2,'question':'hahaha哈哈卡卡卡卡卡卡卡卡'+i});

            }

            return arr

                   return arr

            }

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

                searchStationHistRecord();

            });

@@ -151,28 +141,21 @@
                //$('#detailsOpts').data('data', param);

                

                // 请求获取当前省下的市

	
                // 显示面板

                layer.open({

                    type: 2,

                    title: '<span style="font-weight:bold">>>问题添加</span>',

                    area: ['600px', '400px'],

                    fixed: false, //不固定

                    maxmin: true,

                    content: 'iframe/batt-fault-manage-add.html'

                });

                

                            // 显示面板

                            layer.open({

                                type: 2,

                                title: '<span style="font-weight:bold">>>问题添加</span>',

                                area: ['600px', '400px'],

                                fixed: false, //不固定

                                maxmin: true,

                                content: 'iframe/batt-fault-manage-add.html'

                            });

				
            }

            
            
            
            
			
            }		
        });    

        

		 
		
		
	
        

    </script>

  </body>