diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index 800ad82..a5322c7 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -76,7 +76,7 @@ "analysisname":'', "analysis":'total_count', "filts":[],//过滤项 - "condrelation":'and', + "relation":'and', "customEvent":'', "eventNameDisplay":'',//重命名指标 "format":'float', @@ -373,7 +373,7 @@ // 且和或切换 $(document).off('click','.analysis-con-left-screen-list-right-screen-qh-tit').on("click",".analysis-con-left-screen-list-right-screen-qh-tit",function(){ - var html = $(this).html(); //condrelation筛选条件的关系 + var html = $(this).html(); //relation筛选条件的关系 var index = $(this).attr("data-index"); if(html == "且"){ $(this).html('或'); @@ -414,7 +414,7 @@ "analysisname":'', "analysis":'total_count', "filts":[],//过滤项 - "condrelation":'and', + "relation":'and', "customEvent":'', "eventNameDisplay":'',//重命名指标 "format":'float', @@ -691,7 +691,7 @@ $(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){ - var html = $(this).html(); //condrelation筛选条件的关系 + var html = $(this).html(); //relation筛选条件的关系 if(html == "且"){ $(this).html('或'); data['eventView']['relation'] = 'or'