From 1d720cd0736b198a1a275d6cb7ff169d27ae92af Mon Sep 17 00:00:00 2001 From: 81041 <81041@192.168.10.23> Date: 星期四, 01 十一月 2018 09:56:34 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/eleAnalyse.jsp | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) 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')); } -- Gitblit v1.9.1