From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 18 一月 2019 17:30:50 +0800 Subject: [PATCH] 未审批可更改 --- gx_tieta/WebRoot/ele_statistics.jsp | 486 ++++++++++++++++++++++------------------------------- 1 files changed, 203 insertions(+), 283 deletions(-) diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp index 72d80f5..ba40519 100644 --- a/gx_tieta/WebRoot/ele_statistics.jsp +++ b/gx_tieta/WebRoot/ele_statistics.jsp @@ -13,7 +13,7 @@ <title><s:text name="Batt_information_query"/></title> <link href="css/basic.css" type="text/css" rel="stylesheet" /> <link href="css/ele_statistics.css" type="text/css" rel="stylesheet"> - + <link href="src/css/layui.css" type="text/css" rel="stylesheet"> </head> <body> @@ -35,8 +35,12 @@ <!-- 缁存姢鍖轰俊鎭� --> <table> <tr class="fWeight"> - <!-- 缁存姢鍖� --> - <td><s:text name="Maintenance_area"/></td> + <!-- 鐪� --> + <td>鐪�</td> + <!-- 甯� --> + <td>甯�</td> + <!-- 鍖�/鍘� --> + <td>鍖�/鍘�</td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� --> <td><s:text name="Computer_site"/></td> <!-- 钃勭數姹犵粍 --> @@ -56,6 +60,13 @@ <td> <select id="station_name1" name="bd.binf.StationName1"> </select> + </td> + <td> + <select id="city" name="bd.binf.StatioName2"> + </select> + </td> + <td> + <select id="county" name="bd.binf.StatioName5"></select> </td> <td> <select id="station_name" name="bd.binf.StationName"> @@ -180,9 +191,9 @@ </div> <!-- 鍙抽敭鑿滃崟鍐呭 --> <div id="right-menu"> - <a href="" onclick="jumpPage()" target="_blank"><s:text name="Check_battery_test_record"/></a> <!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 --> - <a href="" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name="Check_battery_statistical_analysis_queries"/></a> <!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� --> - <a href="" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name="Check_battery_monomer_record_behind"/></a> <!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 --> + <a href="javascript:;" onclick="jumpPage()" target="_blank"><s:text name="Check_battery_test_record"/></a> <!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 --> + <a href="javascript:;" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name="Check_battery_statistical_analysis_queries"/></a> <!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� --> + <a href="javascript:;" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name="Check_battery_monomer_record_behind"/></a> <!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 --> <a href="eleBrdwMaint.jsp" target="_blank"><s:text name="Check_abnormal_battery_maintenance_record"/></a> <!-- 鏌ョ湅寮傚父鐢垫睜缁存姢璁板綍 --> </div> @@ -205,6 +216,7 @@ </body> <script type="text/javascript" src="js/ele_statistics.js"></script> <script type="text/javascript" src="js/createTab.js"></script> +<script type="text/javascript" src="src/layui.all.js"></script> <script type="text/javascript"> var permits; <% Object obj=session.getAttribute("permits"); @@ -242,24 +254,29 @@ var battinfo_list = new Array(); var formjson; $(document).ready(function(){ + $(window).resize(function() { + setTblWidth($('#tbHead'), $('#maintence_infor')); + }); + $("#container a").eq(0).click(function(){ var jsontemp = $("#search_form").serialize(); if(jsontemp != formjson){ $('#pageCurr').val(1); formjson = jsontemp; } - loading.showLoading(); + 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){ //alert(123); data=eval("("+data.result+")"); + //console.info(data); if(data.code==1 && data.data.length>0){ data=data.data; battinfo_list = data; - console.info(data); //console.info(Pmodel); arr=new Array(); index=0; @@ -276,50 +293,6 @@ arr[index++]=data[i].BattProducer; //鐢垫睜鍝佺墝 arr[index++]=data[i].BattProductDate.substr(0,10); //鐢垫睜鐢熶骇鏃ユ湡 arr[index++]=data[i].BattInUseDate.substr(0,10); //鐢垫睜瀹夎鏃ユ湡 - /* if(data[i].tmodel.code==1 && data[i].tmodel.data.length>0){ - - //console.info(data[i].tmodel+"&&"); - arr[index++]=data[i].tmodel.sum; //鏀剧數鎬昏褰曟暟 - arr[index++]=data[i].tmodel.newsum; //鏂板鏀剧數娴嬭瘯娆℃暟 - arr[index++]=data[i].tmodel.data[0].test_starttime; //鏂板鏀剧數鏃堕棿 - }else{ - - arr[index++]=data[i].amodel.sum; //鏀剧數鎬昏褰曟暟 - arr[index++]=data[i].amodel.newsum; //鏂板鏀剧數娴嬭瘯娆℃暟 - arr[index++]='-'; //鏂板鏀剧數鏃堕棿 - } - if(data[i].mmodel.code>0 && data[i].mmodel.data.length>0){ - arr[index++]=data[i].mmodel.sum; //鐢垫睜寮傚父缁存姢娆℃暟 - arr[index++]=data[i].mmodel.data[0].maint_done_time; //鏈�杩戠淮鎶ゆ椂闂� - }else{ - arr[index++]=data[i].mmodel.sum; //鐢垫睜寮傚父缁存姢娆℃暟 - arr[index++]='-'; //鏈�杩戠淮鎶ゆ椂闂� - } - arr[index++]=data[i].amodel.sum; //鍛婅璁板綍鎬绘暟 - arr[index++]=data[i].amodel.newsum; //鏂板鍛婅璁板綍鏉℃暟 - - - if(data[i].tmodel.code!=0 && data[i].tmodel.data.length>0){ - //console.info(data[i].tmodel.data[0].test_cap); - arr[index++]=Math.round(GetMonomerCap(data[i].data.binf.MonCapStd,GetHourRate(data[i].data.binf.MonCapStd,data[i].tmodel.data[0].test_curr),data[i].tmodel.data[0].test_cap,data[i].tmodel.data[0].max_monvol,data[i].tmodel.data[0].min_monvol,data[i].data.binf.MonVolStd,CapType_Real)); - }else{ - arr[index++]=0; //瀹為檯瀹归噺棰勪及 - - } - if(data[i].smodel.code!=0){ - arr[index++]=0; - arr[index++]=0; - arr[index++]=0; - }else{ - arr[index++]=0; - arr[index++]=0; - arr[index++]=0; - } - if(data[i].umodel.code==1){ - arr[index++]=data[i].umodel.msg; //鍖呮満浜� - }else{ - arr[index++]=" "; - } */ } var arraytd=new Array(); @@ -362,11 +335,13 @@ $('#tbHead').text(''); $('#maintence_infor').text(''); //alert(newArrTd); - //alert(ArrayTh); + //alert(ArrayTh); + //createFullTbl($('#tbHead')); createTable('tbHead','tbFixed',ArrayTh.length,ArrayTh,newArrTd); createTable('maintence_infor','eleTab',ArrayTh.length,ArrayTh,newArrTd); setTblSize($('#tbHead'), $('#maintenced_infor')); + setTblWidth($('#tbHead'), $('#maintence_infor')); //榧犳爣鐐瑰嚮琛ㄦ牸瑙﹀彂浜嬩欢 $('#maintence_infor .eleTab tbody tr').mousedown(function(e){ $('#maintence_infor .eleTab tbody tr').css('background-color',''); @@ -409,10 +384,11 @@ $('#pageCurr').val(1); $('#maintence_infor').text(''); } - loading.hideLoading(); + + layer.close(load); }).error(function(){ noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒"); - loading.hideLoading(); + layer.close(load); }); }); }); @@ -554,9 +530,12 @@ function jumpPage(){ if(Page!=undefined){ var batt = battinfo_list[trIndex]; - console.info(batt); + //console.info(batt); + var url = skipUrl("charge-test.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId); + //console.info(url); + window.open(url); //this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId); - $('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId); + //$('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId); } } @@ -566,7 +545,9 @@ var batt = battinfo_list[trIndex]; //console.info(batt); //this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId); - $(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId); + var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId); + window.open(url); + //$(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId); } } @@ -576,12 +557,16 @@ var batt = battinfo_list[trIndex]; //console.info(batt); //this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId); - $(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0"); + var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId); + window.open(url); + //$(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0"); } } - + // 鐪�-甯�-鏈烘埧-鐢垫睜缁� + var filterLoad; $(document).ready(function(){ + filterLoad = layer.load(); //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷 $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){ data=data.result; @@ -604,265 +589,198 @@ }else{ $("#station_name1").text('').html('<option>鏆傛棤绠$悊鐨勭淮鎶ゅ尯</option>'); } - findStationNamebyStationname1(); + findCity(); }); }); - //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣 + // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯� + function findCity(isLoad) { + var data = { + StationName1: $("#station_name1").val() + }; + + // 鏄惁娣诲姞绛夊緟 + if(isLoad) { + filterLoad = layer.load(); + } + // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競 + $.ajax({ + type: "post", + url: "BattInfAction!serchStationName2", + async:true, + dataType:'json', + data:"json = "+JSON.stringify(data), + success: function(data){ + var rs = JSON.parse(data.result); + var $select = $("#city"); + if(rs.code == 1) { + var _data= rs.data; + // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁 + var optsList = []; + for(var i=0;i<_data.length;i++){ + var __data = _data[i]; + var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data); + optsList.push(tmp); + } + // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃 + createOptions($select, optsList, true); + }else { + $select.text('').html('<option>鏆傛棤鍙祴甯�</option>'); + } + findCounty(); + } + }); + } + + // 鏌ヨ鍖�/鍘� + function findCounty(isLoad) { + var tmp = { + StationName1:$("#station_name1").val(), + StationName2:$("#city").val(), + }; + // 鏄惁娣诲姞绛夊緟 + if(isLoad) { + filterLoad = layer.load(); + } + // 鏌ヨ鍖哄幙 + $.ajax({ + type: 'post', + async: true, + url: "BattInfAction!serchStationName5", + data: "json="+JSON.stringify(tmp), + success:function(data) { + var rs = JSON.parse(data.result); + var $select = $("#county"); + if(rs.code==1){ + var _data = rs.data; + // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁 + var optsList = []; + for(var i=0;i<_data.length;i++){ + var __data = _data[i]; + var _attr = { + StationId: __data.StationId + }; + var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr); + optsList.push(tmp); + } + + // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃 + createOptions($select, optsList, true); + }else{ + $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>'); + } + findStationNamebyStationname1(); + } + }); + } + + //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯� $('#station_name1').change(function(){ - findStationNamebyStationname1(); + findCity(true); }); - //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐� - function findStationNamebyStationname1(){ - var user = { - UNote:$("#station_name1 option:selected").val() + //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣 + $('#city').change(function(){ + findCounty(true); + }); + + //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣 + $('#county').change(function(){ + findStationNamebyStationname1(true); + }); + + //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐� + function findStationNamebyStationname1(isLoad){ + var tmp = { + StationName1:$("#station_name1").val(), + StationName2:$("#city").val(), + StationName5: $("#county").val() }; + // 鏄惁娣诲姞绛夊緟 + if(isLoad) { + filterLoad = layer.load(); + } //var selectvalue=$("#station_name1 option:selected").val(); //alert(selectvalue); - $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){ - //console.info(data); - data=data.result; - data=eval("("+data+")"); - if(data.code==1 && data.data.length>0){ + $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){ + var rs = JSON.parse(data.result); + if(rs.code==1){ + var _data = rs.data; var $select = $("#station_name"); - $select.text(''); - for(var i=0;i<=data.data.length;i++){ - var $option=$("<option></option>"); - if(i==0){ - $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)"); - $option.attr("value", ""); - }else{ - $option.text(data.data[i-1]); - $option.attr("value",data.data[i-1]); - } - $select.append($option); + // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁 + var optsList = []; + for(var i=0;i<_data.length;i++){ + var __data = _data[i]; + var _attr = { + StationId: __data.StationId + }; + var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr); + optsList.push(tmp); } + + // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃 + createOptions($select, optsList, true); }else{ - $("#station_name").text('').html('<option>鏆傛棤绠$悊鐨勬満鎴跨珯鐐�</option>'); + $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>'); } findserchByBattGroupNamebystationname(); }); } $('#station_name').change(function(){ - findserchByBattGroupNamebystationname(); + findserchByBattGroupNamebystationname(true); }); - //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍 - function findserchByBattGroupNamebystationname(){ - var user = { - UNote:$("#station_name1 option:selected").val(), - UName:$("#station_name option:selected").val() + //鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍 + function findserchByBattGroupNamebystationname(isLoad){ + var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):''; + // 鏄惁娣诲姞绛夊緟 + if(isLoad) { + filterLoad = layer.load(); + } + // 鏋勯�犳煡璇㈡潯浠� + var tmp = { + StationName1:$("#station_name1").val(), + StationName2:$("#city").val(), + StationName5: $("#county").val(), + StationName: $("#station_name").val(), + StationId: stationid }; //var station_name1=$("#station_name1 option:selected").val(); //var station_name=$("#station_name option:selected").val(); - $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){ + $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){ data=data.result; //console.info(data); data=eval("("+data+")"); //console.info(data); if(data.code==1 && data.data.length>0){ var $select = $("#battgroup_name"); - $select.text(''); - for(var i=0;i<=data.data.length;i++){ - $option=$("<option></option>"); - if(i!=0){ - $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>"); - $option.attr("value",data.data[i-1].BattGroupId); - $option.attr("stationname",data.data[i-1].StationName); - }else{ - $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�"); - $option.attr("value", "0"); - } - $select.append($option); - } - }else{ - $("#battgroup_name").text('').html('<option>鏆傛棤绠$悊鐨勮搫鐢垫睜缁�</option>'); - } - }); - } - - /* $(document).ready(function(){ - //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷 - $.post("BattInfAction_serchByStation",null,function(data){ - data=data.result; - data=eval("("+data+")"); - //console.info(data); - if(data.code==1 && data.data.length>0){ - var $select = $("#station_name1"); - $select.text(''); - for(var i=0;i<=data.data.length;i++){ - $option=$("<option></option>"); - if(i==0){ - $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)"); - $option.attr("value", ""); - }else{ - $option.text(data.data[i-1].StationName1); - $option.attr("value",data.data[i-1].StationName1); - } - $select.append($option); - } - } - findStationNamebyStationname1(); - }); - - //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣 - $('#station_name1').change(function(){ - - findStationNamebyStationname1(); - }); - - //鏌ヨ鐢垫睜鍝佺墝 - $.post("BattInfAction_serchByBattProducer",null,function(data){ - data=data.result; - data=eval("("+data+")"); - if(data.code==1 && data.data.length>0){ - var $select = $("#batt_producer"); - $select.text(''); - for(var i=0;i<=data.data.length;i++){ - var $option=$("<option></option>"); - if(i!=0){ - $option.text(data.data[i-1].BattProducer); - $option.attr("value", data.data[i-1].BattProducer); - }else{ - $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�"); - $option.attr("value", ""); - } - $select.append($option); - } - } - }); - - - //鏌ヨ鍗曚綋鐢靛帇 - $.post("BattInfAction_serchByMonVolStd",null,function(data){ - data=data.result; - data=eval("("+data+")"); - if(data.code==1 && data.data.length>0){ - var $select = $("#monvol_std"); - $select.text(''); - //console.info(data) - for(var i=0;i<=data.data.length;i++){ - var $option=$("<option></option>"); - if(i!=0){ - $option.text(data.data[i-1].MonVolStd); - $option.attr("value", data.data[i-1].MonVolStd); - }else{ - $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�"); - $option.attr("value", 0); - } - $select.append($option); - } - } - }); - - //鏌ヨ鐢垫睜瀹归噺 - $.post("BattInfAction_serchByMonCapStd",null,function(data){ - data=data.result; - data=eval("("+data+")"); - if(data.code==1 && data.data.length>0){ - var $select = $("#moncap_std"); - $select.text(''); - //console.info(data) - for(var i=0;i<=data.data.length;i++){ - var $option=$("<option></option>"); - if(i!=0){ - $option.text(data.data[i-1].MonCapStd); - $option.attr("value", data.data[i-1].MonCapStd); - }else{ - $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�"); - $option.attr("value", 0); - } - $select.append($option); - } - } - }); - - //鏌ヨ鍖呮満浜� - $.post("User_infAction_searchAll",null,function(data){ - data=data.result; - data=eval("("+data+")"); - //console.info(data); - if(data.code==1 && data.data.length>0){ - var $select = $("#baojiren"); - $select.text(''); - //console.info(data) - for(var i=0;i<=data.data.length;i++){ - var $option=$("<option></option>"); - if(i!=0){ - $option.text(data.data[i-1].UName); - $option.attr("value", data.data[i-1].UName); - }else{ - $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�"); - $option.attr("value", "0"); - } - $select.append($option); - } - } - }); - }); - - //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐� - function findStationNamebyStationname1(){ - var selectvalue=$("#station_name1 option:selected").val(); - //alert(selectvalue); - $.post("BattInfAction_serchByStationName","bif.StationName1="+selectvalue,function(data){ - //console.info(data); - data=data.result; - data=eval("("+data+")"); - if(data.code==1 && data.data.length>0){ - var $select = $("#station_name"); - $select.text(''); + // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁 + var optsList = []; for(var i=0;i<data.data.length;i++){ - var $option=$("<option></option>"); - if(i==0){ - $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>)"); - $option.attr("value", ""); - }else{ - $option.text(data.data[i-1].StationName); - $option.attr("value",data.data[i-1].StationName); - } - $select.append($option); + var _data = data.data[i]; + var _attr = { + stationname: _data.StationName, + dev_id: _data.FBSDeviceId, + batt_num: _data.GroupIndexInFBSDevice+1 + }; + var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>"; + var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr); + optsList.push(tmp); } + + // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃 + createOptions($select, optsList, true); + $select.find('option').eq(0).val(0); + }else{ + $("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>'); } - findserchByBattGroupNamebystationname(); + + layer.close(filterLoad); }); } - - $('#station_name').change(function(){ - findserchByBattGroupNamebystationname(); - }); - - //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍 - function findserchByBattGroupNamebystationname(){ - var station_name1=$("#station_name1 option:selected").val(); - var station_name=$("#station_name option:selected").val(); - - $.post("BattInfAction_serchByBattGroupName","bif.StationName1="+station_name1+"&bif.StationName="+station_name,function(data){ - data=data.result; - //console.info(data); - data=eval("("+data+")"); - //console.info(data.data); - if(data.code==1 && data.data.length>0){ - var $select = $("#battgroup_name"); - $select.text(''); - for(var i=0;i<=data.data.length;i++){ - $option=$("<option></option>"); - if(i!=0){ - $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>"); - $option.attr("value",data.data[i-1].BattGroupId); - }else{ - $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.sum+"<s:text name='Species'/>锛�"); - $option.attr("value", "0"); - } - $select.append($option); - } - } - }); - } */ //椤甸潰鍔犺浇鏃跺垵濮嬪寲鏃堕棿 $(document).ready(function(){ @@ -1077,6 +995,8 @@ }, binf:{ StationName1:$('#station_name1').val(), + StationName2:$('#city').val(), + StationName5:$('#county').val(), StationName:$('#station_name').val(), BattGroupId:$('#battgroup_name').val(), BattProducer:$('#batt_producer').val(), -- Gitblit v1.9.1