111
This commit is contained in:
parent
dcdb26e433
commit
42e09aed3e
@ -7,7 +7,7 @@
|
||||
<div class="layui-card">
|
||||
<div class="row-top controlhover">
|
||||
<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 class="control">
|
||||
<div class="action-box" >
|
||||
@ -57,7 +57,7 @@
|
||||
<div class="layui-card">
|
||||
<div class="row-top controlhover">
|
||||
<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 class="control">
|
||||
<div class="action-box" >
|
||||
@ -143,7 +143,7 @@
|
||||
<div class="layui-card">
|
||||
<div class="row-top controlhover">
|
||||
<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="活跃用户可以通过“登录.触发用户数”来进行计算,即有登录行为的用户的去重数.">
|
||||
<img src="./static/img/tishi.png" />
|
||||
</div>
|
||||
|
39
web/src/x.min.js
vendored
39
web/src/x.min.js
vendored
@ -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,6 +2634,7 @@ var X = window.X || {
|
||||
}
|
||||
X.api("ck/event_model","post",dataArr,function(d){
|
||||
querydata = d;
|
||||
if(d.length > 0){
|
||||
if(d[0].values.length > 0 ){
|
||||
updata();
|
||||
tabledata(d);
|
||||
@ -2643,6 +2644,11 @@ var X = window.X || {
|
||||
$("#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){
|
||||
|
||||
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]);
|
||||
|
@ -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,6 +1073,7 @@
|
||||
}
|
||||
X.api("ck/event_model","post",dataArr,function(d){
|
||||
querydata = d;
|
||||
if(d.length > 0){
|
||||
if(d[0].values.length > 0 ){
|
||||
updata();
|
||||
tabledata(d);
|
||||
@ -1082,6 +1083,11 @@
|
||||
$("#analysis-echarts").empty();
|
||||
layer.msg("无数据");
|
||||
}
|
||||
}else {
|
||||
$("#analysis-echarts").empty();
|
||||
layer.msg("无数据");
|
||||
}
|
||||
|
||||
})
|
||||
};
|
||||
|
||||
|
@ -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'){
|
||||
|
@ -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();
|
||||
})
|
||||
})
|
||||
|
||||
|
@ -224,16 +224,17 @@
|
||||
events: data.events
|
||||
}
|
||||
X.api("ck/ltv_model","post",dataArr,function(d){
|
||||
|
||||
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');
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
};
|
||||
|
@ -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]);
|
||||
|
Loading…
Reference in New Issue
Block a user