From 8c68efcf508e58107ff965db0325ff823c364e59 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 11:53:45 +0800
Subject: [PATCH] 电池关注添加区/县条件
---
gx_tieta/WebRoot/js/base.js | 5 +-
gx_tieta/WebRoot/batt-attention.jsp | 78 ++++++++++++++++++++++++++++++++------
2 files changed, 68 insertions(+), 15 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-attention.jsp b/gx_tieta/WebRoot/batt-attention.jsp
index a559668..2e9c248 100644
--- a/gx_tieta/WebRoot/batt-attention.jsp
+++ b/gx_tieta/WebRoot/batt-attention.jsp
@@ -36,6 +36,7 @@
<tr>
<th><s:text name="Maintenance_area"/><!-- 鐪� --></th>
<th>甯�<!-- 甯� --></th>
+ <th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
<th><s:text name="Computer_site"/><!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� --></th>
<th><s:text name="Battery_name"/><!-- 钃勭數姹犵粍鍚嶇О --></th>
<th><s:text name="Single_number"/><!-- 鍗曚綋缂栧彿 --></th>
@@ -50,6 +51,9 @@
<td>
<select id="city">
</select>
+ </td>
+ <td>
+ <select id="county"></select>
</td>
<td>
<select id="station_name">
@@ -121,6 +125,7 @@
<script type="text/javascript" src="js/query.js"></script>
<script type="text/javascript" src="js/loading.js"></script>
<script type="text/javascript" src="js/rightmenu.js"></script>
+ <script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript">
var Page = {
pageCurr:1,
@@ -147,7 +152,7 @@
'鍗曚綋瀹归噺鐧惧垎姣�'
]; */
arrTh = [
- '<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>', '<s:text name="Battery_name"/>',
+ '<s:text name="Computer_name"/>', '<s:text name="Battery_name"/>',
'<s:text name="Single_number"/>', '<s:text name="Monomer"/><s:text name="real_time"/><s:text name="Voltage"/>', '<s:text name="Monomer"/><s:text name="Actual_capacity"/>',
'<s:text name="Monomer"/><s:text name="Percent_total_capacity"/>'
];
@@ -210,11 +215,10 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- console.info(model);
+ //console.info(model);
if(model.code == 1){
attentionlist = model.data;
for(var i=0;i<model.data.length;i++){
- arrTd.push(model.data[i].StationName1); //缁存姢鍖�
arrTd.push(model.data[i].StationName); //鏈烘埧鍚嶇О
arrTd.push(model.data[i].BattGroupName); //鐢垫睜缁勫悕绉�
arrTd.push(model.data[i].MonNum); //鍗曚綋缂栧彿
@@ -245,10 +249,11 @@
pageSize:Page.pageSize
},
binf:{
- StationName:$('#station_name').val(), //鏈烘埧鍚�
- StationName2:$('#city').val(), //甯�
- StationName1:$('#station_name1').val(), //鐪�
- BattGroupId:battgroupId==''?0:battgroupId, //鐢垫睜缁勫悕绉�
+ StationName:$('#station_name').val(), // 鏈烘埧鍚�
+ StationName1:$('#station_name1').val(), // 鐪�
+ StationName2:$('#city').val(), // 甯�
+ StationName5: $('#county').val(), // 鍖�/鍘�
+ BattGroupId:battgroupId==''?0:battgroupId, //鐢垫睜缁勫悕绉�
MonNum:$('#Single_number').val()
}
};
@@ -312,7 +317,7 @@
// 鐐瑰嚮鍙栨秷鍏虫敞瑙﹀彂浜嬩欢
$('body').on('click', '#rightMenu .remove-attention', function() {
- console.info(trIndex);
+ //console.info(trIndex);
cancelAttention(attentionlist[trIndex]);
});
@@ -321,8 +326,9 @@
$('body').on('click', '#rightMenu .check-battmon', function() {
//console.info(trIndex);
var batt = attentionlist[trIndex];
- console.info(batt);
- window.open("eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&battmon_num="+batt.MonNum+"&stationId="+batt.StationId);
+ //console.info(batt);
+ //window.open("eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&battmon_num="+batt.MonNum+"&stationId="+batt.StationId);
+ window.open(skipUrl('eleMonomer.jsp', batt.StationName1, batt.StationName2, batt.StationName5, batt.StationName))
});
});
@@ -382,9 +388,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",
+ 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();
+ }
+ });
}
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
@@ -394,6 +439,11 @@
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
+ findCounty();
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
findStationNamebyStationname1();
});
@@ -401,7 +451,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);
@@ -430,6 +481,7 @@
});
}
+ // 鍒囨崲鏈烘埧鏇存柊鐢垫睜缁�
$('#station_name').change(function(){
findserchByBattGroupNamebystationname();
});
@@ -441,6 +493,7 @@
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
StationName: $("#station_name").val(),
StationId: stationid
};
@@ -486,7 +539,6 @@
//褰撻�夋嫨钃勭數姹犵粍鏃�
var battgroup_id = $('#battgroup_name').val();
var OSingle_number = $('#Single_number');
-
if(battgroup_id== ''){
var $option = $("<option></option>");
$option.html("<s:text name='All'/><s:text name='Select'/>(<s:text name='Common'/>0<s:text name='Section'/>)");
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 7598d6e..99c3c01 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -424,7 +424,7 @@
//鏍规嵁stationid鏌ヨ鍩虹珯鐨勪俊鎭�
function findStationInfoByStation(temp){
- //console.info(temp);
+ console.info(JSON.stringify(temp));
$.ajax({
type:"post",
url: "Battinf_exAction!serchByCondition",
@@ -433,9 +433,10 @@
data:"json="+JSON.stringify(temp),
success: function(data){
var model = eval('('+data.result+')');
+ console.log(model);
if(model.code == 1 && model.data.length>0){
var station = model.data[0];
- console.info(station);
+ //console.info(station);
$('#station_stationid_ex').text(temp.StationId_ex); //绔欑偣id
$('#station_stationname').text(station.stationName); //鏈烘埧鍚嶇О
$('#station_stationid').text(station.stationId); //鏈烘埧鍚嶇О
--
Gitblit v1.9.1