From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/batt-attention.jsp | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 20 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-attention.jsp b/gx_tieta/WebRoot/batt-attention.jsp
index a559668..fdadaf0 100644
--- a/gx_tieta/WebRoot/batt-attention.jsp
+++ b/gx_tieta/WebRoot/batt-attention.jsp
@@ -15,6 +15,7 @@
<link rel="stylesheet" type="text/css" href="css/query.css">
<link rel="stylesheet" type="text/css" href="css/nocontent.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
</head>
<body>
@@ -36,6 +37,7 @@
<tr>
<th><s:text name="Maintenance_area"/><!-- 鐪� --></th>
<th>甯�<!-- 甯� --></th>
+ <th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
<th><s:text name="Computer_site"/><!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� --></th>
<th><s:text name="Battery_name"/><!-- 钃勭數姹犵粍鍚嶇О --></th>
<th><s:text name="Single_number"/><!-- 鍗曚綋缂栧彿 --></th>
@@ -50,6 +52,9 @@
<td>
<select id="city">
</select>
+ </td>
+ <td>
+ <select id="county"></select>
</td>
<td>
<select id="station_name">
@@ -121,6 +126,8 @@
<script type="text/javascript" src="js/query.js"></script>
<script type="text/javascript" src="js/loading.js"></script>
<script type="text/javascript" src="js/rightmenu.js"></script>
+ <script type="text/javascript" src="pages/js/common.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page = {
pageCurr:1,
@@ -147,7 +154,7 @@
'鍗曚綋瀹归噺鐧惧垎姣�'
]; */
arrTh = [
- '<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>', '<s:text name="Battery_name"/>',
+ '<s:text name="Computer_name"/>', '<s:text name="Battery_name"/>',
'<s:text name="Single_number"/>', '<s:text name="Monomer"/><s:text name="real_time"/><s:text name="Voltage"/>', '<s:text name="Monomer"/><s:text name="Actual_capacity"/>',
'<s:text name="Monomer"/><s:text name="Percent_total_capacity"/>'
];
@@ -210,11 +217,10 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- console.info(model);
+ //console.info(model);
if(model.code == 1){
attentionlist = model.data;
for(var i=0;i<model.data.length;i++){
- arrTd.push(model.data[i].StationName1); //缁存姢鍖�
arrTd.push(model.data[i].StationName); //鏈烘埧鍚嶇О
arrTd.push(model.data[i].BattGroupName); //鐢垫睜缁勫悕绉�
arrTd.push(model.data[i].MonNum); //鍗曚綋缂栧彿
@@ -245,10 +251,11 @@
pageSize:Page.pageSize
},
binf:{
- StationName:$('#station_name').val(), //鏈烘埧鍚�
- StationName2:$('#city').val(), //甯�
- StationName1:$('#station_name1').val(), //鐪�
- BattGroupId:battgroupId==''?0:battgroupId, //鐢垫睜缁勫悕绉�
+ StationName:$('#station_name').val(), // 鏈烘埧鍚�
+ StationName1:$('#station_name1').val(), // 鐪�
+ StationName2:$('#city').val(), // 甯�
+ StationName5: $('#county').val(), // 鍖�/鍘�
+ BattGroupId:battgroupId==''?0:battgroupId, //鐢垫睜缁勫悕绉�
MonNum:$('#Single_number').val()
}
};
@@ -312,7 +319,7 @@
// 鐐瑰嚮鍙栨秷鍏虫敞瑙﹀彂浜嬩欢
$('body').on('click', '#rightMenu .remove-attention', function() {
- console.info(trIndex);
+ //console.info(trIndex);
cancelAttention(attentionlist[trIndex]);
});
@@ -321,12 +328,16 @@
$('body').on('click', '#rightMenu .check-battmon', function() {
//console.info(trIndex);
var batt = attentionlist[trIndex];
- console.info(batt);
- window.open("eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&battmon_num="+batt.MonNum+"&stationId="+batt.StationId);
+ //console.info(batt);
+ //window.open("eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&battmon_num="+batt.MonNum+"&stationId="+batt.StationId);
+ window.open(skipUrl('eleMonomer.jsp', batt.StationName1, batt.StationName2, batt.StationName5, batt.StationName))
});
});
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -354,10 +365,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -382,26 +397,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(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val()
};
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
@@ -430,17 +493,23 @@
});
}
+ // 鍒囨崲鏈烘埧鏇存柊鐢垫睜缁�
$('#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'):'';
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
StationName: $("#station_name").val(),
StationId: stationid
};
@@ -478,22 +547,27 @@
});
}
+ // 鏌ヨ鐢垫睜鍗曚綋
$('#battgroup_name').change(function(){
searchBattMonNum();
});
- function searchBattMonNum(){
+ function searchBattMonNum(isLoad){
//褰撻�夋嫨钃勭數姹犵粍鏃�
var battgroup_id = $('#battgroup_name').val();
var OSingle_number = $('#Single_number');
-
if(battgroup_id== ''){
var $option = $("<option></option>");
$option.html("<s:text name='All'/><s:text name='Select'/>(<s:text name='Common'/>0<s:text name='Section'/>)");
$option.attr("value", 0);
OSingle_number.text('');
OSingle_number.append($option);
+ layer.close(filterLoad);
}else{
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏍规嵁鐢垫睜缁刬d鏌ヨ鍗曚綋鏁伴噺
$.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){
data=data.result;
@@ -513,6 +587,7 @@
OSingle_number.append($option);
}
}
+ layer.close(filterLoad);
});
}
}
--
Gitblit v1.9.1