From 33bf2ee0febbf7399002216f0a12ae7303f850b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期五, 02 十一月 2018 10:09:49 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elegroup.jsp | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index a3e0ccd..50e87c5 100644
--- a/gx_tieta/WebRoot/elegroup.jsp
+++ b/gx_tieta/WebRoot/elegroup.jsp
@@ -70,6 +70,7 @@
<tr class="fWeight">
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
</tr>
@@ -79,6 +80,9 @@
</td>
<td>
<select id="city" name=""></select>
+ </td>
+ <td>
+ <select id="county" name=""></select>
</td>
<td>
<select id="station_name" name=""></select>
@@ -103,8 +107,9 @@
<select name="addType" id="addType">
<option value="0">鍏ㄧ渷鏈烘埧</option>
<option value="1">鍏ㄥ競鏈烘埧</option>
- <option value="2">鍗曚釜鏈烘埧</option>
- <option value="3">鐢垫睜缁�</option>
+ <option value="2">鍏ㄥ競鍖�/鍘挎埧</option>
+ <option value="3">鍗曚釜鏈烘埧</option>
+ <option value="4">鐢垫睜缁�</option>
</select>
<a href="javasscript:;" class="tool-btn" id="toolBtnAdd" title="娣诲姞"><i class="fa fa-plus"></i></a>
<a href="javasscript:;" class="tool-btn" id="toolBtnApply" title="搴旂敤"><i class="fa fa-sticky-note-o"></i></a>
@@ -153,7 +158,8 @@
<div id="tb-right-menu">
<a href="javascript:;" class="apply"><s:text name="Apply"/></a> <!-- 搴旂敤 -->
<a href="javascript:;" class="add-province">娣诲姞鍏ㄧ渷鏈烘埧</a> <!-- 娣诲姞鍏ㄧ渷鏈烘埧 -->
- <a href="javascript:;" class="add-city">娣诲姞鍏ㄥ競鏈烘埧</a> <!-- 娣诲姞鍏ㄥ競鏈烘埧 -->
+ <a href="javascript:;" class="add-city">娣诲姞鍏ㄥ競鏈烘埧</a>
+ <a href="javascript:;" class="add-county">娣诲姞鍏ㄥ尯/鍘挎満鎴�</a> <!-- 娣诲姞鍏ㄥ競鏈烘埧 -->
<a href="javascript:;" class="add-station"><s:text name="Add_all_Chartere_room_batt_group"/></a> <!-- 娣诲姞鏁翠釜鏈烘埧鐢垫睜缁� -->
<a href="javascript:;" class="add-batt"><s:text name="Add_single_batt_group"/></a> <!-- 娣诲姞鍗曚釜鐢垫睜缁� -->
<!--<a href="javascript:;" class="add-weihuqu"><s:text name="Add_maintenance_area_batt_group"/></a> 娣诲姞鏁翠釜缁存姢鍖虹數姹犵粍 -->
@@ -997,9 +1003,48 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
+ }
+
+ // 鏌ヨ鍖�/鍘�
+ function findCounty() {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5_all",
+ 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();
+ }
+ });
}
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
@@ -1009,6 +1054,11 @@
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
+ findCounty();
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
findStationNamebyStationname1();
});
@@ -1016,7 +1066,8 @@
function findStationNamebyStationname1(){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
@@ -1057,6 +1108,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
StationName: $("#station_name").val(),
StationId: stationid
};
@@ -1396,6 +1448,7 @@
binf={
BattGroupId: 0, // 鐢垫睜缁刬d
StationName: '', // 鏈烘埧鍚嶇О
+ StationName5: '', // 鍖�/鍘�
StationName2: '', // 甯�
StationName1: province, // 鐪�
};
@@ -1437,7 +1490,51 @@
binf={
BattGroupId: 0, // 鐢垫睜缁刬d
StationName: '', // 鏈烘埧鍚嶇О
+ StationName5: '', // 鍖�/鍘�
StationName2: city, // 甯�
+ StationName1: '', // 鐪�
+ };
+ //console.log(binf);
+ var json=window.JSON.stringify(binf);
+ $.post('BattInfAction!serchBatt','result='+json,function(data){
+ var model=eval("("+data.result+")");
+ //console.info(model);
+ if(model.code==1 && model.data.length>0){
+ //var stationid=0;
+ for(var i=0;i<model.data.length;i++){
+ var batt=model.data[i];
+ //console.info(batt);
+ myRoom.push(batt.StationName);
+ myRoomVal.push(batt.StationId);
+ singleELeGroup.push(batt.StationName);
+ singleELeGroup.push(batt.BattGroupName);
+ singleEleVal.push(batt.StationId);
+ singleEleVal.push(batt.BattGroupId);
+ }
+ //console.info(singleELeGroup);
+ addRedLi(myRoom,myRoomVal,singleELeGroup,singleEleVal);
+ }
+ });
+ }else{
+ layer.msg('璇烽�夋嫨甯�!'); //璇峰厛閫夋嫨甯�
+ }
+ });
+
+ // 娣诲姞鏁翠釜鍖�/鍘跨殑鏈烘埧
+ $('#tb-right-menu .add-county').click(function() {
+ //鑾峰彇鍖呮満鎴垮悕绉板拰鏂板鐢垫睜缁勫悕绉�
+ var myRoom=new Array();
+ var myRoomVal=new Array();
+ var singleELeGroup=new Array();
+ var singleEleVal=new Array();
+ var county = $('#county').attr('value');
+ if(county.length>0 && $('#lbottom .li-con li.b8cfe5').text().length>0){
+ var binf=new Object();
+ binf={
+ BattGroupId: 0, // 鐢垫睜缁刬d
+ StationName: '', // 鏈烘埧鍚嶇О
+ StationName5: county, // 鍖�/鍘�
+ StationName2: '', // 甯�
StationName1: '', // 鐪�
};
//console.log(binf);
@@ -1462,7 +1559,7 @@
}
});
}else{
- layer.msg('璇烽�夋嫨甯�!'); //璇峰厛閫夋嫨甯�
+ layer.msg('璇烽�夋嫨鍖�/鍘�!'); //璇峰厛閫夋嫨鍖�/鍘�
}
});
@@ -1474,6 +1571,7 @@
binf={
BattGroupId: battgrouid, // 鐢垫睜缁刬d
StationName: '', // 鏈烘埧鍚嶇О
+ StationName5: '', // 鍖�/鍘�
StationName2: '', // 甯�
StationName1: '', // 鐪�
};
@@ -1514,6 +1612,7 @@
binf={
BattGroupId: 0, // 鐢垫睜缁刬d
StationName: stationname, // 鏈烘埧鍚嶇О
+ StationName5: '', // 鍖�/鍘�
StationName2: '', // 甯�
StationName1: '', // 鐪�
};
@@ -1894,9 +1993,12 @@
$('#tb-right-menu .add-city').click();
break;
case '2':
- $('#tb-right-menu .add-station').click();
+ $('#tb-right-menu .add-county').click();
break;
case '3':
+ $('#tb-right-menu .add-station').click();
+ break;
+ case '4':
$('#tb-right-menu .add-batt').click();
break;
--
Gitblit v1.9.1