diff --git a/web/src/x.min.js b/web/src/x.min.js index a4522ee..25355e7 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -13513,20 +13513,20 @@ var X = window.X || { 'filts':[], 'relation':'and' }; - // if(reportid){ - // data = reportid; - // if(reportid.relation == 'and'){ - // $('.screen-left-qei').html("且"); - // }else { - // $('.screen-left-qei').html("或"); - // } - // if(reportid['filts'].length > 1){ - // $('.screen-left-qei').show(); - // } - // X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){ - // renderdate(); - // }); - // } + if(reportid){ + data = reportid; + if(reportid.relation == 'and'){ + $('.screen-left-qei').html("且"); + }else { + $('.screen-left-qei').html("或"); + } + if(reportid['filts'].length > 1){ + $('.screen-left-qei').show(); + } + X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){ + renderdate(); + }); + } var my_event,load_filter_props,filter_map; X.api("data_auth/my_event","get",{},function(d){ @@ -13535,9 +13535,9 @@ var X = window.X || { load_filter_props = val; X.api("data_auth/filter_map","get",{},function(d){ filter_map = d; - // if(!reportid){ + if(!reportid){ updatascreencon(); - // } + } }) }) }); diff --git a/web/srczip/logic/screen.js b/web/srczip/logic/screen.js index ba7b16a..b68510f 100644 --- a/web/srczip/logic/screen.js +++ b/web/srczip/logic/screen.js @@ -13,20 +13,20 @@ 'filts':[], 'relation':'and' }; - // if(reportid){ - // data = reportid; - // if(reportid.relation == 'and'){ - // $('.screen-left-qei').html("且"); - // }else { - // $('.screen-left-qei').html("或"); - // } - // if(reportid['filts'].length > 1){ - // $('.screen-left-qei').show(); - // } - // X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){ - // renderdate(); - // }); - // } + if(reportid){ + data = reportid; + if(reportid.relation == 'and'){ + $('.screen-left-qei').html("且"); + }else { + $('.screen-left-qei').html("或"); + } + if(reportid['filts'].length > 1){ + $('.screen-left-qei').show(); + } + X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){ + renderdate(); + }); + } var my_event,load_filter_props,filter_map; X.api("data_auth/my_event","get",{},function(d){ @@ -35,9 +35,9 @@ load_filter_props = val; X.api("data_auth/filter_map","get",{},function(d){ filter_map = d; - // if(!reportid){ + if(!reportid){ updatascreencon(); - // } + } }) }) });