From 42e09aed3e9b08199985dfbeeaa9494472c0240a Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Fri, 20 Aug 2021 15:19:50 +0800 Subject: [PATCH] 111 --- web/pages/modeltable.html | 6 ++-- web/src/x.min.js | 53 +++++++++++++++++++++--------- web/srczip/logic/analysis.js | 18 ++++++---- web/srczip/logic/dashboard.js | 1 - web/srczip/logic/kongjianshezhi.js | 2 +- web/srczip/logic/ltvmodel.js | 24 ++++++++++---- web/srczip/logic/retained.js | 8 ++++- 7 files changed, 77 insertions(+), 35 deletions(-) diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html index 2a243d3..f7bfaf8 100644 --- a/web/pages/modeltable.html +++ b/web/pages/modeltable.html @@ -7,7 +7,7 @@
-

{{d.name}}

+

{{d.name}}

@@ -57,7 +57,7 @@
-

{{d.name}}

+

{{d.name}}

@@ -143,7 +143,7 @@
-

{{d.name}}

+

{{d.name}}

diff --git a/web/src/x.min.js b/web/src/x.min.js index 60a4921..10a53be 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -2303,7 +2303,7 @@ var X = window.X || { {'title':'按小时','id':'PT1H'}, {'title':'按周','id':'P1W'}, {'title':'按月','id':'P1M'}, - // {'title':'合计','id':'total'}, + {'title':'合计','id':'total'}, ]; X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){ @@ -2634,15 +2634,21 @@ var X = window.X || { } X.api("ck/event_model","post",dataArr,function(d){ querydata = d; - if(d[0].values.length > 0 ){ - updata(); - tabledata(d); - // stackingdiagram(d); - // tabledata(d); + if(d.length > 0){ + if(d[0].values.length > 0 ){ + updata(); + tabledata(d); + // stackingdiagram(d); + // tabledata(d); + }else { + $("#analysis-echarts").empty(); + layer.msg("无数据"); + } }else { $("#analysis-echarts").empty(); layer.msg("无数据"); } + }) }; @@ -3700,7 +3706,6 @@ var X = window.X || { var cat = $(this).attr('data-cat'); var id = $(this).attr('data-id'); var gourl=''; - if(cat == 'event'){ gourl = 'analysis'; }else if(cat == 'retention'){ @@ -6430,9 +6435,9 @@ var X = window.X || { console.log(adduserarr); X.api('space/rename','post',{space_id:id,new_name:tit},function(d){ X.api('space/set_members','post',{space_id:id,members:adduserarr},function(d){ + layer.closeAll(); layer.msg('修改成功'); X.pageLogic.dashboard.freshMenu(X.DATA.projectid); - layer.closeAll(); }) }) @@ -6726,16 +6731,17 @@ var X = window.X || { events: data.events } X.api("ck/ltv_model","post",dataArr,function(d){ - - X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); - X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td"); + if(d.title.length == 0){ + layer.msg('无数据'); + return; + }else{ + X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); + X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td"); + } }) }; - $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ - X.parametersopen(data,'savereport','auto') - }); - + var baobiaodata;//已存报表 $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ console.log(d); @@ -6750,12 +6756,21 @@ var X = window.X || { data = d.query; eventdata = data.cachedata.eventdata; groupitemeventsdata = data.cachedata.groupitemeventsdata; + baobiaodata = d X.template("globalfilter","xinwei-whole",data['eventView']['filts']); retaineddata(); }; + $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ + if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){ + X.parametersopen(baobiaodata,'savereport','auto'); + }else{ + X.parametersopen(data,'savereport','auto'); + } + }); + } }; @@ -7994,7 +8009,11 @@ var X = window.X || { }; $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ - X.parametersopen(data,'savereport','auto') + if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){ + X.parametersopen(baobiaodata,'savereport','auto'); + }else{ + X.parametersopen(data,'savereport','auto'); + } }); $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ @@ -8007,6 +8026,7 @@ var X = window.X || { }) }); + var baobiaodata;//以存报表数据 function backfilldata(d){ data = d.query; eventdata = data.cachedata.eventdata; @@ -8014,6 +8034,7 @@ var X = window.X || { returnevent = data.cachedata.returnevent; filtersymbols = data.cachedata.filtersymbols; groupitemeventsdata = data.cachedata.groupitemeventsdata; + baobiaodata = d; X.template("event","initial-event",data['events'][0]); X.template("returnvisitevent","returnvisit-event",data['events'][1]); diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index c82ccb0..9280972 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -742,7 +742,7 @@ {'title':'按小时','id':'PT1H'}, {'title':'按周','id':'P1W'}, {'title':'按月','id':'P1M'}, - // {'title':'合计','id':'total'}, + {'title':'合计','id':'total'}, ]; X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){ @@ -1073,15 +1073,21 @@ } X.api("ck/event_model","post",dataArr,function(d){ querydata = d; - if(d[0].values.length > 0 ){ - updata(); - tabledata(d); - // stackingdiagram(d); - // tabledata(d); + if(d.length > 0){ + if(d[0].values.length > 0 ){ + updata(); + tabledata(d); + // stackingdiagram(d); + // tabledata(d); + }else { + $("#analysis-echarts").empty(); + layer.msg("无数据"); + } }else { $("#analysis-echarts").empty(); layer.msg("无数据"); } + }) }; diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 12b71d7..a285886 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -257,7 +257,6 @@ var cat = $(this).attr('data-cat'); var id = $(this).attr('data-id'); var gourl=''; - if(cat == 'event'){ gourl = 'analysis'; }else if(cat == 'retention'){ diff --git a/web/srczip/logic/kongjianshezhi.js b/web/srczip/logic/kongjianshezhi.js index 805ffcf..e9e3ba8 100644 --- a/web/srczip/logic/kongjianshezhi.js +++ b/web/srczip/logic/kongjianshezhi.js @@ -183,9 +183,9 @@ console.log(adduserarr); X.api('space/rename','post',{space_id:id,new_name:tit},function(d){ X.api('space/set_members','post',{space_id:id,members:adduserarr},function(d){ + layer.closeAll(); layer.msg('修改成功'); X.pageLogic.dashboard.freshMenu(X.DATA.projectid); - layer.closeAll(); }) }) diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js index f56c44e..4dd75f4 100644 --- a/web/srczip/logic/ltvmodel.js +++ b/web/srczip/logic/ltvmodel.js @@ -224,16 +224,17 @@ events: data.events } X.api("ck/ltv_model","post",dataArr,function(d){ - - X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); - X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td"); + if(d.title.length == 0){ + layer.msg('无数据'); + return; + }else{ + X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); + X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td"); + } }) }; - $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ - X.parametersopen(data,'savereport','auto') - }); - + var baobiaodata;//已存报表 $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ console.log(d); @@ -248,12 +249,21 @@ data = d.query; eventdata = data.cachedata.eventdata; groupitemeventsdata = data.cachedata.groupitemeventsdata; + baobiaodata = d X.template("globalfilter","xinwei-whole",data['eventView']['filts']); retaineddata(); }; + $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ + if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){ + X.parametersopen(baobiaodata,'savereport','auto'); + }else{ + X.parametersopen(data,'savereport','auto'); + } + }); + } }; diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js index 838dae8..0246ad0 100644 --- a/web/srczip/logic/retained.js +++ b/web/srczip/logic/retained.js @@ -500,7 +500,11 @@ }; $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ - X.parametersopen(data,'savereport','auto') + if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){ + X.parametersopen(baobiaodata,'savereport','auto'); + }else{ + X.parametersopen(data,'savereport','auto'); + } }); $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ @@ -513,6 +517,7 @@ }) }); + var baobiaodata;//以存报表数据 function backfilldata(d){ data = d.query; eventdata = data.cachedata.eventdata; @@ -520,6 +525,7 @@ returnevent = data.cachedata.returnevent; filtersymbols = data.cachedata.filtersymbols; groupitemeventsdata = data.cachedata.groupitemeventsdata; + baobiaodata = d; X.template("event","initial-event",data['events'][0]); X.template("returnvisitevent","returnvisit-event",data['events'][1]);