From f55be3227bfe7dfa13c45d014d6fc8cfc16dff42 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:08:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elewarn.jsp | 146 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 116 insertions(+), 30 deletions(-)
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index 4285093..f93d040 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -14,7 +14,7 @@
<title><s:text name="Battery_alarm_real-time_query"/></title> <!-- 鐢垫睜鍛婅瀹炴椂鏌ヨ -->
<link rel="stylesheet" type="text/css" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/elewarn.css">
-
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
</head>
<body>
<!--澶撮儴鍐呭寮�濮�-->
@@ -35,31 +35,27 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td>鐪�</td> <!-- 鐪� -->
- <td>甯�</td> <!-- 甯� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
</tr>
<tr>
<td>
- <select id="station_name1" name="bmd.binf.StationName1">
-
- </select>
+ <select id="station_name1" name="bmd.binf.StationName1"></select>
</td>
<td>
- <select id="city" name="bmd.binf.StationName2">
-
- </select>
+ <select id="city" name="bmd.binf.StationName2"></select>
</td>
<td>
- <select id="station_name" name="bmd.binf.stationName">
-
- </select>
+ <select id="county" name="bmd.binf.StationName5"></select>
</td>
<td>
- <select id="battgroup_name" name="bmd.binf.BattGroupId">
-
- </select>
+ <select id="station_name" name="bmd.binf.stationName"></select>
+ </td>
+ <td>
+ <select id="battgroup_name" name="bmd.binf.BattGroupId"></select>
</td>
</tr>
</table>
@@ -86,7 +82,7 @@
<td>
<table>
<tr>
- <input type="hidden" name="bmd.mainf.usr_id" value="0" class="119001"/> <!-- 鍦ㄧ嚎鐢靛帇 -->
+ <td><input type="checkbox" checked="checked" name="bmd.mainf.usr_id" value="119001" class="119001"/><s:text name="On-line_voltage"/></td> <!-- 鍦ㄧ嚎鐢靛帇 -->
<td><input type="checkbox" checked="checked" name="bmd.mainf.fault_type_id" value="119002" class="119002"/><s:text name="Group_voltage"/></td> <!-- 缁勭鐢靛帇 -->
<td><input type="checkbox" checked="checked" name="bmd.mainf.fault_level" value="119003" class="119003"/><s:text name="Charging_current"/></td> <!-- 鍏呯數鐢垫祦 -->
<td><input type="checkbox" checked="checked" name="bmd.mainf.record_uid" value="119004" class="119004"><s:text name="Discharge_current"/></td> <!-- 鏀剧數鐢垫祦 -->
@@ -187,6 +183,7 @@
</body>
<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");
@@ -348,14 +345,14 @@
$.post("Battalarm_dataAction!serchByCondition",$('#search_form').serialize(),function(data){
data=data.result;
data=eval("("+data+")");
- //console.info(data);
+ console.info(data);
var pagecurr=parseInt($('#pageCurr').attr('value'));
var pagesize=parseInt($('#pageSize').attr('value'));
if(data.code==1 && data.data.length>0){
data=data.data;
var index=0;
battalarmlist=new Array();
- console.info(data);
+ //console.info(data);
ArrWarnTb=new Array();
for(var i=0;i<data.length;i++){
if(i == (data.length-1)){
@@ -557,8 +554,14 @@
eleform.submit();
}
+
+ var isNewLoad = true;
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+
+ var pre_province = getQueryString("province");
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -574,7 +577,10 @@
$option.attr("value", "");
}else{
$option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
+ $option.attr("value",data.data[i-1]);
+ if(pre_province == data.data[i-1] && isNewLoad){
+ $option.attr('selected',true);
+ }
}
$select.append($option);
}
@@ -586,10 +592,15 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_city = getQueryString("city");
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -607,6 +618,9 @@
for(var i=0;i<_data.length;i++){
var __data = _data[i];
var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ if(pre_city == __data.StationName2 && isNewLoad){
+ tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);
+ }
optsList.push(tmp);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -614,27 +628,85 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_county = getQueryString("county");
+ // 鏌ヨ鍖哄幙
+ $.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);
+ if(pre_county == __data.StationName5 && isNewLoad){
+ tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);
+ }
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_home = getQueryString('home');
+ console.info(pre_home);
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -649,7 +721,10 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -658,26 +733,32 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+
findserchByBattGroupNamebystationname();
});
}
// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
+ 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(),
- StationName3: $("#station_name").val(),
+ StationName5:$("#county").val(),
+ StationName: $("#station_name").val(),
StationId: stationid
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ var pre_battid = getQueryString("battid");
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
@@ -699,6 +780,9 @@
};
var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+ if(pre_battid == _data.BattGroupId && isNewLoad){
+ tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -710,6 +794,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+ isNewLoad = false;
+ layer.close(filterLoad);
});
}
--
Gitblit v1.9.1