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/eleMonomer.jsp | 119 +++++++++++++++++++++++++++++------------------------------
1 files changed, 58 insertions(+), 61 deletions(-)
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(){
--
Gitblit v1.9.1