From 97db75238a96a75f41bafd469548c2a84ba37080 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期五, 28 九月 2018 14:31:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/dischargeplan.jsp | 257 +++++++++++++++++++-------------------------------
1 files changed, 99 insertions(+), 158 deletions(-)
diff --git a/gx_tieta/WebRoot/dischargeplan.jsp b/gx_tieta/WebRoot/dischargeplan.jsp
index ec7ed63..5bfa3ad 100644
--- a/gx_tieta/WebRoot/dischargeplan.jsp
+++ b/gx_tieta/WebRoot/dischargeplan.jsp
@@ -40,7 +40,8 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td><s:text name="Maintenance_area"/></td> <!-- 缁存姢鍖� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
<td><s:text name="Test"/><s:text name="Status"/></td> <!-- 娴嬭瘯鐘舵�� -->
@@ -49,9 +50,10 @@
</tr>
<tr>
<td>
- <select id="station_name1" name="station_name1">
-
- </select>
+ <select id="station_name1" name="station_name1"></select>
+ </td>
+ <td>
+ <select id="city" name="station_name2"></select>
</td>
<td>
<select id="station_name" name="station_name">
@@ -616,6 +618,7 @@
$('#start-discharge-end-date').val(new Date().format('yyyy-MM-dd'));
$('#end-discharge-end-date').val(new Date().format('yyyy-MM-dd'));
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
@@ -639,196 +642,134 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity() {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.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>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
+ findCity();
+ });
+
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
findStationNamebyStationname1();
});
- var isNewload = true;
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val()
};
- var stationid = getQueryString("stationId");
//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]);
- if(stationid!=undefined && stationid == data.data[i-1].StationId && isNewload){
- $option.attr("selected",true);
- }
- }
- $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();
});
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
+ //鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
function findserchByBattGroupNamebystationname(){
- var user = {
- UNote:$("#station_name1 option:selected").val(),
- UName:$("#station_name option:selected").val()
+ var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").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);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ 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);
}
- var dischargestate = (parseInt(getQueryString("discharge-state")));
- if(dischargestate >= 0 && isNewload){
- $('#discharge-state option[value = "'+dischargestate+'"]').attr('selected','selected');
- isNewload = false;
- }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ $select.find('option').eq(0).val(0);
searchDischarge();
}else{
- $("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+ $("#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();
- });
-
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var stationid = getQueryString("stationId");
- 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("");
- 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].StationName);
- $option.attr("value",data.data[i].StationName);
- if(stationid!=undefined && stationid == data.data[i].StationId){
- $option.attr("selected",true);
- }
- //}
- $select.append($option);
- }
- findserchByBattGroupNamebystationname();
- }
- });
- }
- });
-
- $("#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);
- }
- var dischargestate = (parseInt(getQueryString("discharge-state")));
- if(dischargestate >= 0){
- $('#discharge-state option[value = "'+dischargestate+'"]').attr('selected','selected');
- searchDischarge();
- }
- }
- });
- } */
-
+
$('#export_table').click(function(){
//console.info($('#tbHead .tbFixed thead th').length);
exprotTable($('#tbHead table thead th'),$('#tbHead table tbody td'),$('#export_excel'),$('#table_th_arr'),$('#table_td_arr'));
@@ -848,8 +789,7 @@
}
eleTh_Text.attr('value',ArrTh);
eleTd_Text.attr('value',ArrTd);
- //console.info(ArrTh);
- //console.info(ArrTd);
+
eleform.submit();
}
@@ -857,6 +797,7 @@
var temp = {
binf:{
StationName:$('#station_name').val(),
+ StationName2:$('#city').val(),
StationName1:$('#station_name1').val(),
BattGroupId:$('#battgroup_name').val(),
},
--
Gitblit v1.9.1