From fd77d548a62649faabcecd1c33352aa28cf8fead Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 12:03:30 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele_statistics.jsp | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 9367c0d..41aaa58 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -254,13 +254,17 @@
var battinfo_list = new Array();
var formjson;
$(document).ready(function(){
+ $(window).resize(function() {
+ setTblWidth($('#tbHead'), $('#maintence_infor'));
+ });
+
$("#container a").eq(0).click(function(){
var jsontemp = $("#search_form").serialize();
if(jsontemp != formjson){
$('#pageCurr').val(1);
formjson = jsontemp;
}
- var load = layer.load();
+ var load = layer.load(1);
//console.info($("#search_form").serialize());
var temp = createSearchForm();
var json = JSON.stringify(temp);
@@ -268,7 +272,7 @@
$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
//alert(123);
data=eval("("+data.result+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
battinfo_list = data;
@@ -330,11 +334,13 @@
$('#tbHead').text('');
$('#maintence_infor').text('');
//alert(newArrTd);
- //alert(ArrayTh);
+ //alert(ArrayTh);
+ //createFullTbl($('#tbHead'));
createTable('tbHead','tbFixed',ArrayTh.length,ArrayTh,newArrTd);
createTable('maintence_infor','eleTab',ArrayTh.length,ArrayTh,newArrTd);
setTblSize($('#tbHead'), $('#maintenced_infor'));
+ setTblWidth($('#tbHead'), $('#maintence_infor'));
//榧犳爣鐐瑰嚮琛ㄦ牸瑙﹀彂浜嬩欢
$('#maintence_infor .eleTab tbody tr').mousedown(function(e){
$('#maintence_infor .eleTab tbody tr').css('background-color','');
@@ -523,7 +529,10 @@
function jumpPage(){
if(Page!=undefined){
var batt = battinfo_list[trIndex];
- console.info(batt);
+ //console.info(batt);
+ var url = skipUrl("charge-test.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ //console.info(url);
+ window.open(url);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
//$('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
}
@@ -535,7 +544,9 @@
var batt = battinfo_list[trIndex];
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
+ var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
+ //$(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
}
}
@@ -545,7 +556,9 @@
var batt = battinfo_list[trIndex];
//console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0");
+ var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
+ //$(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0");
}
}
--
Gitblit v1.9.1