From 7a36a1e479a06771628363615e2eb103b01a8c0c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 09:39:06 +0800
Subject: [PATCH] 修复bug
---
gx_tieta/WebRoot/eleAnalyse.jsp | 35 +++++---
gx_tieta/WebRoot/eleMonomer.jsp | 119 ++++++++++++++---------------
gx_tieta/.settings/org.jboss.tools.jst.web.xml | 68 ++++++++--------
gx_tieta/WebRoot/ele_statistics.jsp | 10 ++
4 files changed, 120 insertions(+), 112 deletions(-)
diff --git a/gx_tieta/.settings/org.jboss.tools.jst.web.xml b/gx_tieta/.settings/org.jboss.tools.jst.web.xml
index 7ad3e7b..f101a28 100644
--- a/gx_tieta/.settings/org.jboss.tools.jst.web.xml
+++ b/gx_tieta/.settings/org.jboss.tools.jst.web.xml
@@ -9,73 +9,73 @@
<file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
<file-system NAME="fuguang" location="%eclipse.project%" model-entity="FileSystemFolder"/>
<file-system NAME="lib-javaee.jar"
- location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jsf-impl.jar"
- location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jsf-api.jar"
- location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jstl-1.2.jar"
- location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-c3p0-0.9.5.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-mchange-commons-java-0.2.9.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-resources.jar"
- location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-dnsns.jar"
- location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-localedata.jar"
- location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-sunjce_provider.jar"
- location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse10\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-beanutils-1.7.0.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-codec-1.10.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-collections-3.1.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-dbcp-1.2.1.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-fileupload-1.2.2.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-io-2.0.1.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-lang-2.5.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-pool-1.2.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-dom4j-1.6.1.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-ezmorph-1.0.3.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-freemarker-2.3.16.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-gson-2.2.4.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-javassist-3.11.0.GA.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-json-lib-2.1-jdk15.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-mysql-connector-java-5.1.33-bin.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-ognl-3.0.1.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-poi-3.10.1-20140818.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-sqljdbc.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-struts2-core-2.2.3.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-struts2-json-plugin-2.2.3.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-struts2-sunspoter-stream-1.0.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-xwork-core-2.2.3.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jacob.jar"
- location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
+ location="E:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
<web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">
<module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>
diff --git a/gx_tieta/WebRoot/eleAnalyse.jsp b/gx_tieta/WebRoot/eleAnalyse.jsp
index 7ae0033..352499e 100644
--- a/gx_tieta/WebRoot/eleAnalyse.jsp
+++ b/gx_tieta/WebRoot/eleAnalyse.jsp
@@ -545,6 +545,24 @@
});
createPictable();
+
+ //鐐瑰嚮鏇茬嚎閫夋嫨澶嶉�夋瀵硅〃鏍煎唴鐨勫閫夋鍏ㄩ儴閫変腑
+ $('#tabEchartCon .tbFixed').on('click','table thead input',function(){
+ if($(this).is(':checked'))
+ {
+ console.info($('#tabEchartCon .secCured table tbody input[type="checkbox"]').length);
+ $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',true);
+ }else{
+ console.info(false);
+ $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',false);
+ }
+ });
+
+ $('#tabEchartCon .left .secCurve').on('click', 'input[type="checkbox"]', function(){
+ createPicByTable();
+ createMyTable(tbl_data);
+ });
+
//鐢熸垚鏇茬嚎琛ㄦ牸閫夐」
function createPictable(){
var ArrLineTh=["<s:text name='BatteryID'/>","<input type='checkbox' checked='checked'/><s:text name='Curve_to_choose'/>"]; /* 鐢垫睜缁処D 鏇茬嚎閫夋嫨 */
@@ -559,21 +577,8 @@
}
createCard($('#tabEchartCon .tbFixed'),ArrLineTh,ArrLineTd);
createCard($('#tabEchartCon .secCurve'),ArrLineTh,ArrLineTd);
- //鐐瑰嚮鏇茬嚎閫夋嫨澶嶉�夋瀵硅〃鏍煎唴鐨勫閫夋鍏ㄩ儴閫変腑
- $('#tabEchartCon .tbFixed').on('click','table thead input',function(){
- if($(this).is(':checked'))
- {
- console.info($('#tabEchartCon .secCured table tbody input[type="checkbox"]').length);
- $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',true);
- }else{
- console.info(false);
- $('#tabEchartCon .secCured table tbody input[type="checkbox"]').prop('checked',false);
- }
- });
- $('#tabEchartCon .left .secCurve input[type="checkbox"]').click(function(){
- createPicByTable();
- createMyTable(tbl_data);
- });
+
+ setTblWidth($('#tabEchartCon .tbFixed'), $('#tabEchartCon .secCurve'));
}
diff --git a/gx_tieta/WebRoot/eleMonomer.jsp b/gx_tieta/WebRoot/eleMonomer.jsp
index b63ff5f..6f897d6 100644
--- a/gx_tieta/WebRoot/eleMonomer.jsp
+++ b/gx_tieta/WebRoot/eleMonomer.jsp
@@ -426,56 +426,17 @@
});
});
- //鐢熸垚宸︿晶鐨勭數姹犵紪鍙疯〃鏍�
- function createMonTab(){
- $('#tabEchartCon .tbFixed').text('');
- $('#tabEchartCon .secCurve').text('');
- if(MonNumlist!=null && MonNumlist!=undefined && MonNumlist.length>0){
- ArrLineTd=new Array();
- for(var i=0,index=0;i<MonNumlist.length;i++){
- if(MonNumlist[i]!=undefined){
- ArrLineTd[index++]=[MonNumlist[i],"<input type='checkbox' checked='checked' value='"+MonNumlist[i]+"'>"];
- }
- }
- createCard($('#tabEchartCon .tbFixed'),ArrLineTh,ArrLineTd);
- createCard($('#tabEchartCon .secCurve'),ArrLineTh,ArrLineTd);
+ //鐐瑰嚮鏇茬嚎琛ㄦ牸鐨勫ご閮ㄧ殑澶嶉�夋tbody鍐呯殑澶嶉�夋鍏ㄨ閫変腑鎴栧彇娑�
+ $('#tabEchartCon').on('click', ' .tbFixed thead input[type="checkbox"]', function(){
+ if($(this).is(':checked'))
+ {
+ $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',true);
}else{
- createCard($('#tabEchartCon .tbFixed'),ArrLineTh,[]);
- createCard($('#tabEchartCon .secCurve'),ArrLineTh,[]);
+ $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',false);
}
-
-
- //鐐瑰嚮鏇茬嚎琛ㄦ牸鐨勫ご閮ㄧ殑澶嶉�夋tbody鍐呯殑澶嶉�夋鍏ㄨ閫変腑鎴栧彇娑�
- $('#tabEchartCon .tbFixed thead input[type="checkbox"]').click(function(){
- if($(this).is(':checked'))
- {
- $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',true);
- }else{
- $('#tabEchartCon .secCurve tbody input[type="checkbox"]').prop('checked',false);
- }
- });
-
- //console.info(MonVollist);
-
- if(Radiostatus==0){
- getListByCheckbox(MonVollist);
- }else if(Radiostatus==1){
- getListByCheckbox(RealCaplist);
- }else if(Radiostatus==2){
- getListByCheckbox(Voltagelist);
- }else if(Radiostatus==3){
- getListByCheckbox(Conductlist);
- }else if(Radiostatus==4){
- getListByCheckbox(Conductpercentlist);
- }else if(Radiostatus==5){
- getListByCheckbox(Resistancelist);
- }else if(Radiostatus==6){
- getListByCheckbox(Templist);
- }else if(Radiostatus==7){
- getListByCheckbox(ConnOhmlist);
- }
-
- $('#tabEchartCon input[type="checkbox"]').click(function(){
+ });
+
+ $('#tabEchartCon').on('click', 'input[type="checkbox"]', function(){
if(Radiostatus==0){
//鍏呮斁鐢垫祴璇�
getListByCheckbox(MonVollist);
@@ -495,7 +456,46 @@
getListByCheckbox(ConnOhmlist);
}
- });
+ });
+
+ //鐢熸垚宸︿晶鐨勭數姹犵紪鍙疯〃鏍�
+ function createMonTab(){
+ $('#tabEchartCon .tbFixed').text('');
+ $('#tabEchartCon .secCurve').text('');
+ if(MonNumlist!=null && MonNumlist!=undefined && MonNumlist.length>0){
+ ArrLineTd=new Array();
+ for(var i=0,index=0;i<MonNumlist.length;i++){
+ if(MonNumlist[i]!=undefined){
+ ArrLineTd[index++]=[MonNumlist[i],"<input type='checkbox' checked='checked' value='"+MonNumlist[i]+"'>"];
+ }
+ }
+ createCard($('#tabEchartCon .tbFixed'),ArrLineTh,ArrLineTd);
+ createCard($('#tabEchartCon .secCurve'),ArrLineTh,ArrLineTd);
+ }else{
+ createCard($('#tabEchartCon .tbFixed'),ArrLineTh,[]);
+ createCard($('#tabEchartCon .secCurve'),ArrLineTh,[]);
+ }
+
+ setTblWidth($('#tabEchartCon .tbFixed'), $('#tabEchartCon .secCurve'));
+
+
+ if(Radiostatus==0){
+ getListByCheckbox(MonVollist);
+ }else if(Radiostatus==1){
+ getListByCheckbox(RealCaplist);
+ }else if(Radiostatus==2){
+ getListByCheckbox(Voltagelist);
+ }else if(Radiostatus==3){
+ getListByCheckbox(Conductlist);
+ }else if(Radiostatus==4){
+ getListByCheckbox(Conductpercentlist);
+ }else if(Radiostatus==5){
+ getListByCheckbox(Resistancelist);
+ }else if(Radiostatus==6){
+ getListByCheckbox(Templist);
+ }else if(Radiostatus==7){
+ getListByCheckbox(ConnOhmlist);
+ }
}
var OconEchart = document.getElementById('conEchart');
@@ -843,7 +843,7 @@
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
- layer.close(filterLoad);
+ searchBattMonNum();
});
}
@@ -862,11 +862,13 @@
$option.attr("value", 0);
OSingle_number.text('');
OSingle_number.append($option);
+ layer.close(filterLoad);
}else{
- //console.info(battgroup_id);
+ console.info(battgroup_id);
$.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){
data=data.result;
data=eval("("+data+")");
+ console.log(data);
if(data.code==1 && data.data.length>0){
data=data.data[0];
OSingle_number.text('');
@@ -886,9 +888,8 @@
OSingle_number.append($option);
}
}
- if(mon_num != undefined){
- searchMonomer();
- }
+ layer.close(filterLoad);
+ searchMonomer();
});
}
}
@@ -936,7 +937,8 @@
//鍒涘缓绛夊緟鐨勬妗�
loading.showLoading($('#main'));
- var battgroupid=$('#battgroup_name').attr('value');
+ var monNum = $('#Single_number').val()?$('#Single_number').val():0;
+ console.log($("#search_form").serialize());
var temp ={
binf:{
StationName1:$('#station_name1').val(),
@@ -944,7 +946,7 @@
StationName5: $('#county').val(),
StationName:$('#station_name').val(),
BattGroupId:$('#battgroup_name').val(),
- MonNum:$('#Single_number').val(),
+ MonNum: monNum,
},
tdata:{
test_type:$('#test_type').val()
@@ -1179,11 +1181,6 @@
//console.info(ArrTd);
eleform.submit();
}
-
- //褰撻�夋嫨鐢垫睜缁勬椂涔熸煡璇�
- $('#battgroup_name').change(function(){
- searchMonomer();
- });
//鎷栧姩婊戝潡鏀瑰彉瀹瑰櫒鐨勫ぇ灏�
$(document).ready(function(){
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 9367c0d..32e491d 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);
@@ -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','');
--
Gitblit v1.9.1