From 9834e917769dbdfa2b634f174e0ee8c32ddf539a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期六, 19 一月 2019 11:34:36 +0800
Subject: [PATCH] bug
---
gx_tieta/WebRoot/eleAssess.jsp | 252 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 194 insertions(+), 58 deletions(-)
diff --git a/gx_tieta/WebRoot/eleAssess.jsp b/gx_tieta/WebRoot/eleAssess.jsp
index 9ebb19a..cf5ad4f 100644
--- a/gx_tieta/WebRoot/eleAssess.jsp
+++ b/gx_tieta/WebRoot/eleAssess.jsp
@@ -15,6 +15,7 @@
<link href="css/basic.css" type="text/css" rel="stylesheet" />
<link href="css/ele_statistics.css" type="text/css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="css/eleAssess.css" />
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/frame.js"></script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/base.js"></script>
@@ -42,8 +43,12 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <!-- 缁存姢鍖� -->
- <td><s:text name="Maintenance_area"/></td>
+ <!-- 鐪� -->
+ <td>鐪�</td>
+ <!-- 甯� -->
+ <td>甯�</td>
+ <!-- 鍖�/鍘� -->
+ <td>鍖�/鍘�</td>
<!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Computer_site"/></td>
<!-- 钃勭數姹犵粍 -->
@@ -69,6 +74,14 @@
<tr>
<td>
<select id="station_name1" name="bd.binf.StationName1">
+ </select>
+ </td>
+ <td>
+ <select id="city" name="bd.binf.StationName2">
+ </select>
+ </td>
+ <td>
+ <select id="county" name="bd.binf.StationName5">
</select>
</td>
<td>
@@ -195,9 +208,9 @@
</div>
<!-- 鍙抽敭鑿滃崟鍐呭 -->
<div id="right-menu">
- <a href="" onclick="jumpPage()" target="_blank"><s:text name='Check_battery_test_record'/><!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 --></a>
- <a href="" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name='Check_battery_statistical_analysis_queries'/><!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� --></a>
- <a href="" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name='Check_battery_monomer_record_behind'/><!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 --></a>
+ <a href="javascript:void(0);" onclick="jumpPage()" target="_blank"><s:text name='Check_battery_test_record'/><!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 --></a>
+ <a href="javascript:void(0);" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name='Check_battery_statistical_analysis_queries'/><!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� --></a>
+ <a href="javascript:void(0);" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name='Check_battery_monomer_record_behind'/><!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 --></a>
<a href="eleBrdwMaint.jsp" target="_blank"><s:text name='Check_abnormal_battery_maintenance_record'/><!-- 鏌ョ湅寮傚父鐢垫睜缁存姢璁板綍 --></a>
</div>
@@ -218,6 +231,7 @@
<div id="allTransShade"></div>
<div id="allShade"></div>
</body>
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -249,8 +263,8 @@
var lastjson;
$(document).ready(function(){
$("#container a").eq(0).click(function(){
- $('#maintence_infor').scrollTop(0);
- $('#maintence_infor').scrollLeft(0);
+ $('#maintence_infor').scrollTop(0);
+ $('#maintence_infor').scrollLeft(0);
createWait($('#maintence_infor'));
$('#allTransShade').show();
var newjson = $("#search_form").serialize();
@@ -531,10 +545,12 @@
//鏍规嵁鍙抽敭閫変腑鐨勭數姹犵粍璺宠浆鍒扮數姹犳祴璇曢〉闈�
function jumpPage(){
if(Page!=undefined){
- var batt = battinfo_list[trIndex];
+ var batt = battinfo_list[trIndex].data;
console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ //$('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ var url = skipUrl('charge-test.jsp',batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
}
@@ -542,24 +558,31 @@
//鏍规嵁鍙抽敭閫変腑鐨勭數姹犵粍璺宠浆鍒扮數姹犵粍缁熻鍒嗘瀽鏌ヨ椤甸潰
function jumpBattgroupStatic(dom){
if(battinfo_list!=undefined && battinfo_list.length>0){
- var batt = battinfo_list[trIndex];
+ var batt = battinfo_list[trIndex].data;
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ //$(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId);
+ var url = skipUrl('eleAnalyse.jsp',batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
}
//鏍规嵁鍙抽敭閫変腑鐨勭數姹犵粍璺宠浆鍒扮數姹犲崟浣撶粺璁″垎鏋愭煡璇㈤〉闈�
function jumpBattmonomertatic(dom){
if(battinfo_list!=undefined && battinfo_list.length>0){
- var batt = battinfo_list[trIndex];
+ var batt = battinfo_list[trIndex].data;
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId+"&battmon_num=0");
+ //$(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.data.BattGroupId+"&stationId="+batt.data.StationId+"&battmon_num=0");
+ var url = skipUrl('eleMonomer.jsp',batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -582,84 +605,195 @@
}else{
$("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
}
- findStationNamebyStationname1();
+ findCity();
});
});
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ // 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
+ function findCity(isLoad) {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ 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(){
- findStationNamebyStationname1();
+ findCity();
});
- //鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var user = {
- UNote:$("#station_name1 option:selected").val()
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ function findStationNamebyStationname1(isLoad){
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
- //console.info(data);
- data=data.result;
- data=eval("("+data+")");
- if(data.code==1 && data.data.length>0){
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
var $select = $("#station_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- var $option=$("<option></option>");
- if(i==0){
- $option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
- $option.attr("value", "");
- }else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
}else{
- $("#station_name").text('').html('<option>鏆傛棤绠＄悊鐨勬満鎴跨珯鐐�</option>');
+ $("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
findserchByBattGroupNamebystationname();
});
}
+ // 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
- //鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
- var user = {
- UNote:$("#station_name1 option:selected").val(),
- UName:$("#station_name option:selected").val()
+ //鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
+ 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();
- $.post("User_battgroup_baojigroup_battgroupAction!serchBattgroupidInGroup","json="+JSON.stringify(user),function(data){
+ $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
data=eval("("+data+")");
//console.info(data);
if(data.code==1 && data.data.length>0){
var $select = $("#battgroup_name");
- $select.text('');
- for(var i=0;i<=data.data.length;i++){
- $option=$("<option></option>");
- if(i!=0){
- $option.text(data.data[i-1].BattGroupName+"-"+data.data[i-1].MonCount+"<s:text name='Section'/>");
- $option.attr("value",data.data[i-1].BattGroupId);
- $option.attr("stationname",data.data[i-1].StationName);
- }else{
- $option.html("<s:text name='All'/>锛�<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>锛�");
- $option.attr("value", "0");
- }
- $select.append($option);
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<data.data.length;i++){
+ var _data = data.data[i];
+ var _attr = {
+ stationname: _data.StationName,
+ dev_id: _data.FBSDeviceId,
+ batt_num: _data.GroupIndexInFBSDevice+1
+ };
+ var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";
+ var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);
+ optsList.push(tmp);
}
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ $select.find('option').eq(0).val(0);
}else{
- $("#battgroup_name").text('').html('<option>鏆傛棤绠＄悊鐨勮搫鐢垫睜缁�</option>');
+ $("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
@@ -873,6 +1007,8 @@
},
binf:{
StationName1:$('#station_name1').val(),
+ StationName2:$('#city').val(),
+ StationName5: $('#county').val(),
StationName:$('#station_name').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#batt_producer').val(),
--
Gitblit v1.9.1