leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

111

Browse Source
This commit is contained in:
罗松柏 2021-08-20 15:19:50 +08:00
parent dcdb26e433
commit 42e09aed3e
7 changed files with 77 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pages/modeltable.html
View File

@ -7,7 +7,7 @@
<div class="layui-card"> <div class="layui-card">
<div class="row-top controlhover"> <div class="row-top controlhover">
<div class="row-tit"> <div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}">{{d.name}}</a></p> <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
</div> </div>
<div class="control"> <div class="control">
<div class="action-box" > <div class="action-box" >
@ -57,7 +57,7 @@
<div class="layui-card"> <div class="layui-card">
<div class="row-top controlhover"> <div class="row-top controlhover">
<div class="row-tit"> <div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}">{{d.name}}</a></p> <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
</div> </div>
<div class="control"> <div class="control">
<div class="action-box" > <div class="action-box" >
@ -143,7 +143,7 @@
<div class="layui-card"> <div class="layui-card">
<div class="row-top controlhover"> <div class="row-top controlhover">
<div class="row-tit"> <div class="row-tit">
<p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}">{{d.name}}</a></p> <p><a href="javascript:;" class="gobaobiaoinfo" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.name}}</a></p>
<div class="tishi" title="活跃用户可以通过“登录.触发用户数”来进行计算，即有登录行为的用户的去重数."> <div class="tishi" title="活跃用户可以通过“登录.触发用户数”来进行计算，即有登录行为的用户的去重数.">
<img src="./static/img/tishi.png" /> <img src="./static/img/tishi.png" />
</div> </div>

53
web/src/x.min.js vendored
View File

@ -2303,7 +2303,7 @@ var X = window.X || {
{'title':'按小时','id':'PT1H'}, {'title':'按小时','id':'PT1H'},
{'title':'按周','id':'P1W'}, {'title':'按周','id':'P1W'},
{'title':'按月','id':'P1M'}, {'title':'按月','id':'P1M'},
// {'title':'合计','id':'total'}, {'title':'合计','id':'total'},
]; ];
X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){ X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
@ -2634,15 +2634,21 @@ var X = window.X || {
} }
X.api("ck/event_model","post",dataArr,function(d){ X.api("ck/event_model","post",dataArr,function(d){
querydata = d; querydata = d;
if(d[0].values.length > 0 ){ if(d.length > 0){
updata(); if(d[0].values.length > 0 ){
tabledata(d); updata();
// stackingdiagram(d); tabledata(d);
// tabledata(d); // stackingdiagram(d);
// tabledata(d);
}else {
$("#analysis-echarts").empty();
layer.msg("无数据");
}
}else { }else {
$("#analysis-echarts").empty(); $("#analysis-echarts").empty();
layer.msg("无数据"); layer.msg("无数据");
} }
}) })
}; };
@ -3700,7 +3706,6 @@ var X = window.X || {
var cat = $(this).attr('data-cat'); var cat = $(this).attr('data-cat');
var id = $(this).attr('data-id'); var id = $(this).attr('data-id');
var gourl=''; var gourl='';
if(cat == 'event'){ if(cat == 'event'){
gourl = 'analysis'; gourl = 'analysis';
}else if(cat == 'retention'){ }else if(cat == 'retention'){
@ -6430,9 +6435,9 @@ var X = window.X || {
console.log(adduserarr); console.log(adduserarr);
X.api('space/rename','post',{space_id:id,new_name:tit},function(d){ 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){ X.api('space/set_members','post',{space_id:id,members:adduserarr},function(d){
layer.closeAll();
layer.msg('修改成功'); layer.msg('修改成功');
X.pageLogic.dashboard.freshMenu(X.DATA.projectid); X.pageLogic.dashboard.freshMenu(X.DATA.projectid);
layer.closeAll();
}) })
}) })
@ -6726,16 +6731,17 @@ var X = window.X || {
events: data.events events: data.events
} }
X.api("ck/ltv_model","post",dataArr,function(d){ X.api("ck/ltv_model","post",dataArr,function(d){
if(d.title.length == 0){
X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); layer.msg('无数据');
X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td"); 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(){ var baobiaodata;//已存报表
X.parametersopen(data,'savereport','auto')
});
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ $(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){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); console.log(d);
@ -6750,12 +6756,21 @@ var X = window.X || {
data = d.query; data = d.query;
eventdata = data.cachedata.eventdata; eventdata = data.cachedata.eventdata;
groupitemeventsdata = data.cachedata.groupitemeventsdata; groupitemeventsdata = data.cachedata.groupitemeventsdata;
baobiaodata = d
X.template("globalfilter","xinwei-whole",data['eventView']['filts']); X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
retaineddata(); 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(){ $(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(){ $(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){ function backfilldata(d){
data = d.query; data = d.query;
eventdata = data.cachedata.eventdata; eventdata = data.cachedata.eventdata;
@ -8014,6 +8034,7 @@ var X = window.X || {
returnevent = data.cachedata.returnevent; returnevent = data.cachedata.returnevent;
filtersymbols = data.cachedata.filtersymbols; filtersymbols = data.cachedata.filtersymbols;
groupitemeventsdata = data.cachedata.groupitemeventsdata; groupitemeventsdata = data.cachedata.groupitemeventsdata;
baobiaodata = d;
X.template("event","initial-event",data['events'][0]); X.template("event","initial-event",data['events'][0]);
X.template("returnvisitevent","returnvisit-event",data['events'][1]); X.template("returnvisitevent","returnvisit-event",data['events'][1]);

18
web/srczip/logic/analysis.js
View File

@ -742,7 +742,7 @@
{'title':'按小时','id':'PT1H'}, {'title':'按小时','id':'PT1H'},
{'title':'按周','id':'P1W'}, {'title':'按周','id':'P1W'},
{'title':'按月','id':'P1M'}, {'title':'按月','id':'P1M'},
// {'title':'合计','id':'total'}, {'title':'合计','id':'total'},
]; ];
X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){ X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
@ -1073,15 +1073,21 @@
} }
X.api("ck/event_model","post",dataArr,function(d){ X.api("ck/event_model","post",dataArr,function(d){
querydata = d; querydata = d;
if(d[0].values.length > 0 ){ if(d.length > 0){
updata(); if(d[0].values.length > 0 ){
tabledata(d); updata();
// stackingdiagram(d); tabledata(d);
// tabledata(d); // stackingdiagram(d);
// tabledata(d);
}else {
$("#analysis-echarts").empty();
layer.msg("无数据");
}
}else { }else {
$("#analysis-echarts").empty(); $("#analysis-echarts").empty();
layer.msg("无数据"); layer.msg("无数据");
} }
}) })
}; };

1
web/srczip/logic/dashboard.js
View File

@ -257,7 +257,6 @@
var cat = $(this).attr('data-cat'); var cat = $(this).attr('data-cat');
var id = $(this).attr('data-id'); var id = $(this).attr('data-id');
var gourl=''; var gourl='';
if(cat == 'event'){ if(cat == 'event'){
gourl = 'analysis'; gourl = 'analysis';
}else if(cat == 'retention'){ }else if(cat == 'retention'){

2
web/srczip/logic/kongjianshezhi.js
View File

@ -183,9 +183,9 @@
console.log(adduserarr); console.log(adduserarr);
X.api('space/rename','post',{space_id:id,new_name:tit},function(d){ 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){ X.api('space/set_members','post',{space_id:id,members:adduserarr},function(d){
layer.closeAll();
layer.msg('修改成功'); layer.msg('修改成功');
X.pageLogic.dashboard.freshMenu(X.DATA.projectid); X.pageLogic.dashboard.freshMenu(X.DATA.projectid);
layer.closeAll();
}) })
}) })

24
web/srczip/logic/ltvmodel.js
View File

@ -224,16 +224,17 @@
events: data.events events: data.events
} }
X.api("ck/ltv_model","post",dataArr,function(d){ X.api("ck/ltv_model","post",dataArr,function(d){
if(d.title.length == 0){
X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); layer.msg('无数据');
X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td"); 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(){ var baobiaodata;//已存报表
X.parametersopen(data,'savereport','auto')
});
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){ $(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){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); console.log(d);
@ -248,12 +249,21 @@
data = d.query; data = d.query;
eventdata = data.cachedata.eventdata; eventdata = data.cachedata.eventdata;
groupitemeventsdata = data.cachedata.groupitemeventsdata; groupitemeventsdata = data.cachedata.groupitemeventsdata;
baobiaodata = d
X.template("globalfilter","xinwei-whole",data['eventView']['filts']); X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
retaineddata(); 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');
}
});
} }
}; };

8
web/srczip/logic/retained.js
View File

@ -500,7 +500,11 @@
}; };
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ $(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(){ $(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){ function backfilldata(d){
data = d.query; data = d.query;
eventdata = data.cachedata.eventdata; eventdata = data.cachedata.eventdata;
@ -520,6 +525,7 @@
returnevent = data.cachedata.returnevent; returnevent = data.cachedata.returnevent;
filtersymbols = data.cachedata.filtersymbols; filtersymbols = data.cachedata.filtersymbols;
groupitemeventsdata = data.cachedata.groupitemeventsdata; groupitemeventsdata = data.cachedata.groupitemeventsdata;
baobiaodata = d;
X.template("event","initial-event",data['events'][0]); X.template("event","initial-event",data['events'][0]);
X.template("returnvisitevent","returnvisit-event",data['events'][1]); X.template("returnvisitevent","returnvisit-event",data['events'][1]);