From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/equipWarn1.jsp | 156 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 127 insertions(+), 29 deletions(-)
diff --git a/gx_tieta/WebRoot/equipWarn1.jsp b/gx_tieta/WebRoot/equipWarn1.jsp
index 9ad9bd4..9efbf68 100644
--- a/gx_tieta/WebRoot/equipWarn1.jsp
+++ b/gx_tieta/WebRoot/equipWarn1.jsp
@@ -21,6 +21,7 @@
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
<link rel="stylesheet" href="css/nocontent.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/loading.js"></script>
<style type="text/css">
@@ -92,30 +93,40 @@
<tr class="fWeight">
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Alarm"/><s:text name="Type"/></td> <!-- 鍛婅绫诲瀷 -->
</tr>
<tr>
<td>
- <select id="station_name1" name="station_name1">
- </select>
+ <select id="station_name1" name="station_name1"></select>
</td>
<td>
- <select id="city" name="station_name2">
- </select>
+ <select id="city" name="station_name2"></select>
</td>
<td>
- <select id="station_name" name="station_name">
- </select>
+ <select id="county" name="station_name5"></select>
+ </td>
+ <td>
+ <select id="station_name" name="station_name"></select>
</td>
<td style="width: 15%">
<select id="alarm_type">
<option value="0">鍏ㄩ儴</option>
<option value="119020">閫氫俊鏁呴殰</option>
- <option value="618501">缁х數鍣ㄥ憡璀�</option>
+ <!-- <option value="618501">缁х數鍣ㄥ憡璀�</option>
<option value="618502">閫氳鍛婅</option>
<option value="618503">璁惧杩囨俯鍛婅</option>
<option value="618504">浜屾瀬绠1鍛婅</option>
+ <option value="119023">缁埅涓嶈冻鍛婅</option>
+ <option value="119024">鍩虹珯鍋滅數鍛婅</option>
+ <option value="119025">鍩虹珯鍙戠數鍛婅</option>
+ <option value="119026">鍩虹珯鎺夌珯鍛婅</option>
+ <option value="119027">鍩虹珯寮�闂ㄥ憡璀�</option> -->
+ <option value ="119028">璁惧楂樻俯鍛婅</option>
+ <option value ="119032">璁惧SD鍗℃晠闅�</option>
+ <option value ="119033">閲囬泦绾垮憡璀�</option>
+
</select>
</td>
</tr>
@@ -168,10 +179,11 @@
<script type="text/javascript" src="js/nocontent.js"></script>
<script type="text/javascript" src="js/createTab.js"></script>
<script type="text/javascript" src="js/right-menu.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page={
pageCurr:1,
- pageSize:14,
+ pageSize:16,
pageAll:0,
};
var arrTh = new Array(); // 琛ㄦ牸鐨勫ご閮�
@@ -188,7 +200,7 @@
// 鏍规嵁琛ㄦ牸鐨勫ご閮ㄧ敓鎴愯〃鏍奸�夐」鍜岃〃鏍肩殑鐘舵�佹暟缁�
$(function() {
- searchDevAlarm();
+ //searchDevAlarm();
centerDiv($('#cardOption'));
// 閬嶅巻琛ㄦ牸澶撮儴鐢熸垚鐘舵�佹暟缁�
@@ -230,10 +242,7 @@
$(function() {
createAllTbl(tblHd, tblBd, arrTh, arrTd,arrTh, tblStatus); // 鐢熸垚榛樿琛ㄦ牸
$('#paging .search').click(function() {
- searchDevAlarm();
- //loading.showLoading();
-
- //loading.hideLoading();
+ searchDevAlarm(true);
});
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
@@ -484,12 +493,15 @@
var alarm_list;
var num_list = new Array();
//鏌ヨ璁惧瀹炴椂鍛婅
- function searchDevAlarm(){
+ function searchDevAlarm(isLoad){
var temp = createSearchParam();
num_list = new Array();
arrTd = new Array();
var alreadylist = new Array();
-
+ var load;
+ if(isLoad) {
+ load = layer.load(1);
+ }
$.ajax({
type:"post",
url: "Batt_devalarm_dataAction!serchByInfo",
@@ -548,12 +560,13 @@
}
});
}
-
+ layer.close(load);
window.clearTimeout(alarm_timer);
alarm_timer = window.setTimeout("searchDevAlarm()", 4000);
},
error:function(){
+ layer.close(load);
alarm_list = new Array();
createAllTbl(tblHd, tblBd, arrTh, arrTd,num_list,tblStatus);
window.clearTimeout(alarm_timer);
@@ -567,6 +580,7 @@
var temp = {
stationName1:$('#station_name1').val(),
stationName2:$('#city').val(),
+ stationName5:$('#county').val(),
stationName:$('#station_name').val(),
alm_type:$('#alarm_type').val(),
page:{
@@ -574,7 +588,7 @@
pageCurr:Page.pageCurr, //褰撳墠椤�
}
};
- console.log(temp);
+ //console.log(temp);
return temp;
}
@@ -723,6 +737,13 @@
case 618503:return "璁惧杩囨俯鍛婅";
case 618504:return "浜屾瀬绠1鍛婅";
case 119023:return "缁埅涓嶈冻鍛婅";
+ case 119024:return "鍩虹珯鍋滅數鍛婅";
+ case 119025:return "鍩虹珯鍙戠數鍛婅";
+ case 119026:return "鍩虹珯鎺夌珯鍛婅";
+ case 119027:return "鍩虹珯寮�闂ㄥ憡璀�";
+ case 119028:return "璁惧楂樻俯鍛婅";
+ case 119032:return "璁惧SD鍗℃晠闅�";
+ case 119033:return "閲囬泦绾垮憡璀�";
}
}
return "閫氫俊鏁呴殰";
@@ -776,7 +797,7 @@
}else{
alert("纭鍛婅澶辫触");
}
- searchDevAlarm();
+ searchDevAlarm(true);
loading.hideLoading();
},
@@ -817,7 +838,7 @@
}else{
alert("鍙栨秷鍛婅澶辫触");
}
- searchDevAlarm();
+ searchDevAlarm(true);
loading.hideLoading();
},
error:function(){
@@ -854,7 +875,7 @@
}else{
alert("鍒犻櫎鍛婅澶辫触");
}
- searchDevAlarm();
+ searchDevAlarm(true);
loading.hideLoading();
},
error:function(){
@@ -876,8 +897,12 @@
return undefined;
}
+ var isNewLoad = true;
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
+ var pre_province = getQueryString('province');
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -894,6 +919,9 @@
}else{
$option.text(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);
}
@@ -905,10 +933,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",
@@ -926,6 +959,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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -933,27 +969,84 @@
}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');
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -969,6 +1062,9 @@
StationId: __data.StationId
};
var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ if(pre_home == __data.StationName && isNewLoad){
+ tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);
+ }
optsList.push(tmp);
}
@@ -977,18 +1073,20 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
- searchDevAlarm();
+ isNewLoad = false;
+ layer.close(filterLoad);
+ searchDevAlarm(true);
});
}
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#station_name').change(function(){
- searchDevAlarm();
+ searchDevAlarm(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#alarm_type').change(function(){
- searchDevAlarm();
+ searchDevAlarm(true);
});
</script>
</body>
--
Gitblit v1.9.1