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/eleHistoryWarn.jsp | 149 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 111 insertions(+), 38 deletions(-)
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index c07690e..0095f5b 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>
@@ -74,7 +71,7 @@
</table>
<table class="condi-opt">
<tr>
- <input type="hidden" id="usr_id" name="bmd.mainf.usr_id" value="0" class="119001" /><!-- <s:text name="On-line_voltage" /> 鍦ㄧ嚎鐢靛帇 -->
+ <td><input type="checkbox" id="usr_id" name="bmd.mainf.usr_id" checked="checked" value="0" class="119001" /> <s:text name="On-line_voltage" /></td> <!-- 鍦ㄧ嚎鐢靛帇 -->
<td>
<input type="checkbox" id="fault_type_id" name="bmd.mainf.fault_type_id" checked="checked" value="119002" class="119002" /><s:text name="Group_voltage" /> <!-- 缁勭鐢靛帇 -->
</td>
@@ -99,6 +96,7 @@
<input type="hidden" id="master_id" name="bmd.mainf.master_id" value="0" class="119008" /><!-- 杩炴帴鏉￠樆鎶�-->
<td><input type="checkbox" id="maint_close" name="bmd.mainf.maint_close" checked="checked" value="119007" class="119007"><s:text name="Monomer_resistance" /></td> <!-- 鍗曚綋鍐呴樆 -->
<td><input type="checkbox" id='maint_done' name="bmd.mainf.maint_done" checked="checked" value="119006" class="119006"><s:text name="Temperature_monomer" /></td> <!-- 鍗曚綋娓╁害 -->
+ <td></td>
<!-- <td><input type="checkbox" checked="checked" id="hist_alm" class="1"><s:text name="Historical_alarms" /></td> --> <!-- 鍘嗗彶鍛婅 -->
<td><input type="checkbox" name="bmd.mainf.master_audit" id="master_audit" checked="checked" value="3" class="3"><s:text name="Level_thr_warn" /></td> <!-- 涓夌骇鍛婅 -->
<td><input type="checkbox" name="bmd.mainf.appoint_uid" id="appoint_uid" checked="checked" value="4" class="4"><s:text name="Level_four_warn" /></td> <!-- 鍥涚骇鍛婅 -->
@@ -147,6 +145,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");
@@ -304,24 +303,16 @@
}
- $(function(){
- //鐐瑰嚮鏌ヨ鎸夐挳
- $('#paging .search').click(function(){
- searchHistalm();
- });
- });
-
-
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){
data=data.result;
data=eval("("+data+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
@@ -380,9 +371,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 +384,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(), //鐢垫睜缁勫悕绉�
},
@@ -403,7 +395,7 @@
master_audit:$('#master_audit').is(':checked')?$('#master_audit').attr('class'):0, //涓夌骇鍛婅
num:$('#num').is(':checked')?$('#num').attr('class'):0, //涓�绾у憡璀�
BattGroupId:$('#BattGroupId').is(':checked')?$('#BattGroupId').attr('class'):0, //浜岀骇鍛婅
- usr_id:$('#usr_id').val(), //鍦ㄧ嚎鐢靛帇 119001
+ usr_id:$('#usr_id').is(':checked')?$('#usr_id').attr('class'):0, //鍦ㄧ嚎鐢靛帇 119001
fault_type_id:$('#fault_type_id').is(':checked')?$('#fault_type_id').attr('class'):0, //缁勭鐢靛帇 119002
fault_level:$('#fault_level').is(':checked')?$('#fault_level').attr('class'):0, //鍏呯數鐢垫祦 119003
record_uid:$('#record_uid').is(':checked')?$('#record_uid').attr('class'):0, //鏀剧數鐢垫祦 119004
@@ -422,11 +414,16 @@
Record_Id:$('#Record_Id').val() //瀹归噺鏇存崲鍛婅
}
};
+ //console.info(temp);
return temp;
}
+ 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;
@@ -443,6 +440,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);
}
@@ -454,10 +454,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",
@@ -475,6 +480,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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
@@ -482,27 +490,80 @@
}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(){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ var pre_home = getQueryString('home');
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -518,11 +579,14 @@
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);
}
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
- createOptions($select, optsList, true);
+ createOptions($select, optsList, false);
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
@@ -532,23 +596,27 @@
// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#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();
-
+ var pre_battid = getQueryString('battid');
$.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
@@ -567,6 +635,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);
}
@@ -574,10 +645,12 @@
createOptions($select, optsList, true);
$select.find('option').eq(0).val(0);
- searchHistalm(); // 鏌ヨ鍘嗗彶鍛婅
+ //searchHistalm(); // 鏌ヨ鍘嗗彶鍛婅
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+ isNewLoad = false;
+ layer.close(filterLoad);
});
}
--
Gitblit v1.9.1