From ef0af2a1df028812b29291c5c42b1d64226d69f8 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 05 十一月 2018 15:49:43 +0800
Subject: [PATCH] 添加重新启动功能
---
gx_tieta/WebRoot/eleHistoryWarn.jsp | 107 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 24 deletions(-)
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index c07690e..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;
@@ -42,30 +43,26 @@
<tr>
<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="city">
-
- </select>
+ <select name="" id="city"></select>
</td>
<td>
- <select name="" id="station_name">
-
- </select>
+ <select name="" id="county"></select>
</td>
<td>
- <select name="" id="battgroup_name">
-
- </select>
+ <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>
@@ -147,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");
@@ -315,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){
@@ -380,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("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒");
});
}
@@ -393,7 +391,8 @@
page:Page,
binf:{
StationName1:$('#station_name1').val(), // 鐪�
- StationName2:$('#city').val(), // 甯�
+ StationName2:$('#city').val(),
+ StationName5:$('#county').val(), // 甯�
StationName:$('#station_name').val(), //鏈烘埧鍚嶇О
BattGroupId:$('#battgroup_name').val(), //鐢垫睜缁勫悕绉�
},
@@ -426,7 +425,9 @@
}
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -454,10 +455,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -482,26 +487,74 @@
}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();
+ }
+ // 鏌ヨ鍖哄幙
+ $.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(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
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);
@@ -532,20 +585,24 @@
// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#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(),
+ 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();
@@ -578,6 +635,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
--
Gitblit v1.9.1