From ef0d9a4480f35f34d4c41b9b09876f9e9e02c947 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期五, 02 十一月 2018 09:21:56 +0800
Subject: [PATCH] 修改添加全区全市全省电池组的方法serchbatt
---
gx_tieta/WebRoot/eleHistoryWarn.jsp | 349 +++++++++++++++++++++++++++++----------------------------
1 files changed, 177 insertions(+), 172 deletions(-)
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index 589a0c0..64fbd46 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -17,6 +17,7 @@
<link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
<link rel="stylesheet" href="css/sidebar.css" />
<link rel="stylesheet" href="css/confirm.css" />
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css">
.b8cfe5 {
background-color: #b8cfe5 !important;
@@ -40,26 +41,28 @@
<table>
<tbody>
<tr>
- <th><s:text name="Maintenance_area"/></th> <!-- 缁存姢鍖� -->
+ <th>鐪�</th> <!-- 鐪� -->
+ <th>甯�</th> <!-- 甯� -->
+ <th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
<th><s:text name="Computer_site"/></th> <!-- 鏈烘埧绔欑偣 -->
<th><s:text name="Battery"/></th> <!-- 钃勭數姹犵粍 -->
<th colspan="2" style="width: 30%;"><s:text name="Alarm"/><s:text name="Start_date"/></th> <!-- 寮�濮嬪憡璀︽棩鏈� -->
</tr>
<tr>
<td>
- <select name="" id="station_name1">
-
- </select>
+ <select name="" id="station_name1"></select>
</td>
<td>
- <select name="" id="station_name">
-
- </select>
+ <select name="" id="city"></select>
</td>
<td>
- <select name="" id="battgroup_name">
-
- </select>
+ <select name="" id="county"></select>
+ </td>
+ <td>
+ <select name="" id="station_name"></select>
+ </td>
+ <td>
+ <select name="" id="battgroup_name"></select>
</td>
<td><input type="text" id="startalm" readonly="readonly" name="bmd.adata.alm_start_time" value="2000-1-1" /></td>
<td><input type="text" id="endTalm" readonly="readonly" name="bmd.adata.alm_start_time1" /></td>
@@ -141,6 +144,7 @@
<script type="text/javascript" src="js/myConfirm.js"></script>
<script type="text/javascript" src="js/myinterval.js"></script>
<script type="text/javascript" src="js/pageUtil.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -309,7 +313,7 @@
var formjson;
//鏌ヨ鍘嗗彶鍛婅璁板綍
function searchHistalm(){
- loading.showLoading();
+ var load = layer.load(1);
var json = JSON.stringify(createSearchForm());
//console.info(json);
$.post("Battalarm_data_historyAction!serchByInfo","json="+json,function(data){
@@ -374,9 +378,9 @@
}
$('#tbHead').text('');
createFullTbl($('.tbl-header'), $('.tbl-body'), ArrWarnTh, ArrWarnTb);
- loading.hideLoading();
+ layer.close(load);
}).error(function(){
- loading.hideLoading();
+ layer.close(load);
noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒");
});
}
@@ -386,7 +390,9 @@
var temp={
page:Page,
binf:{
- StationName1:$('#station_name1').val(), //缁存姢鍖�
+ StationName1:$('#station_name1').val(), // 鐪�
+ StationName2:$('#city').val(),
+ StationName5:$('#county').val(), // 甯�
StationName:$('#station_name').val(), //鏈烘埧鍚嶇О
BattGroupId:$('#battgroup_name').val(), //鐢垫睜缁勫悕绉�
},
@@ -418,7 +424,10 @@
return temp;
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -441,201 +450,197 @@
}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);
});
- var isNewload = true;
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#county").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);
- isNewload = false;
- }
- }
- $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'):'';
+ // 鏋勯�犳煡璇㈡潯浠�
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
+ StationName: $("#station_name").val(),
+ StationId: stationid
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//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);
}
- searchHistalm(); //鍔犺浇瀹岀數姹犵粍灏辨煡璇㈠憡璀�
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ $select.find('option').eq(0).val(0);
+
+ searchHistalm(); // 鏌ヨ鍘嗗彶鍛婅
}else{
- $("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+ $("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
-
- /* $(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++) {
- var $option = $("<option></option>");
- if (i == 0) {
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+ data.sum+ "<s:text name='Species'/>)");
- $option.val("");
- } else {
- $option.text(data.data[i - 1].StationName1);
- $option.val(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.text("<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);
- if(stationid != undefined && stationid == data.data[i-1].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();
- if(station_name.length == 0){
- var $select = $("#battgroup_name");
- $select.text('');
- var $option = $("<option></option>");
- $option.html("<s:text name='All'/>");
- $option.attr("value", "0");
- $select.append($option);
- searchHistalm();
- }else{
- $.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.innerHTML = "鍏ㄩ儴钃勭數姹犵粍锛堝叡" + data.sum + "缁勶級";
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>" + data.sum + "<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
- }
- searchHistalm();
- }
- });
- }
- } */
-
+ // 鏇存柊鐢垫睜缁勫悕绉版煡璇㈠巻鍙插憡璀�
$('#battgroup_name').on("change",function(){
searchHistalm();
});
--
Gitblit v1.9.1