This commit is contained in:
罗松柏 2021-07-30 14:38:18 +08:00
parent 34ca2b32d8
commit 8685ceab6d
9 changed files with 152 additions and 85 deletions

View File

@ -726,7 +726,7 @@
{{# layui.each(d.condata, function(indexs, items) { }} {{# layui.each(d.condata, function(indexs, items) { }}
<tr > <tr >
{{# layui.each(items, function(indexss, itemss){ }} {{# layui.each(items, function(indexss, itemss){ }}
<td>{{indexss}}</td> <td>{{itemss}}</td>
{{# }); }} {{# }); }}
</tr> </tr>
{{# }); }} {{# }); }}

View File

@ -12,6 +12,7 @@
<option value="0" selected="">全部报表</option> <option value="0" selected="">全部报表</option>
<option value="event">事件分析</option> <option value="event">事件分析</option>
<option value="retention">留存分析</option> <option value="retention">留存分析</option>
<option value="ltv">LTV模型</option>
<option value="funnel">漏斗分析</option> <option value="funnel">漏斗分析</option>
<option value="4">属性分析</option> <option value="4">属性分析</option>
<option value="trace">路径分析</option> <option value="trace">路径分析</option>

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

@ -423,12 +423,16 @@ var X = window.X || {
X.eventtable=function(data,callback){ X.eventtable=function(data,callback){
var titledata,condata = []; var titledata,condata = [];
for(let i in data){ for(let i in data){
if(data[i]['groups']['length'] == 0){ if(data[i]['values'].length > 0 ){
titledata= $.extend(true,[],data[0]['date_range']) ; if(data[i]['groups']['length'] == 0){
titledata.unshift('指标','阶段总和'); titledata= $.extend(true,[],data[0]['date_range']) ;
condata.push(data[i].values[0]); titledata.unshift('指标','阶段总和');
condata[i].unshift(data[i]['event_name'],data[i]['sum']); condata.push(data[i].values[0]);
// console.log(condata); condata[i].unshift(data[i]['event_name'],data[i]['sum']);
// console.log(condata);
}
}else {
layer.msg('查询数据为空');
} }
} }
var dataArr = { var dataArr = {
@ -769,6 +773,8 @@ var X = window.X || {
setContentByUrl(url,id); setContentByUrl(url,id);
} }
X.DATA['eventid'] = ""; X.DATA['eventid'] = "";
X.DATA['ltvid'] = "";
X.DATA['retentionid'] = "";
}; };
@ -3512,12 +3518,12 @@ var X = window.X || {
gourl = 'analysis'; gourl = 'analysis';
}else if(cat == 'retention'){ }else if(cat == 'retention'){
gourl = 'retained'; gourl = 'retained';
layer.msg('暂未处理当前逻辑'); // layer.msg('暂未处理当前逻辑');
return; // return;
}else if(cat == 'ltv'){ }else if(cat == 'ltv'){
gourl = 'ltvmodel'; gourl = 'ltvmodel';
layer.msg('暂未处理当前逻辑'); // layer.msg('暂未处理当前逻辑');
return; // return;
} }
X.gourl(gourl,'conetnt');//跳到对应的分析页面 X.gourl(gourl,'conetnt');//跳到对应的分析页面
X.DATA[cat+'id'] = id; X.DATA[cat+'id'] = id;
@ -5719,6 +5725,7 @@ var X = window.X || {
{title:'全部',id:'0'}, {title:'全部',id:'0'},
{title:'事件',id:'event'}, {title:'事件',id:'event'},
{title:'留存',id:'retention'}, {title:'留存',id:'retention'},
{title:'ltv',id:'ltv'},
{title:'漏斗',id:'funnel'}, {title:'漏斗',id:'funnel'},
{title:'属性',id:'0'}, {title:'属性',id:'0'},
{title:'分布',id:'scatter'}, {title:'分布',id:'scatter'},
@ -5731,8 +5738,7 @@ var X = window.X || {
}) })
toadddataprocessing(); toadddataprocessing();
}) })
} };
function updatalist(title){ function updatalist(title){
console.log(title); console.log(title);
@ -5748,7 +5754,7 @@ var X = window.X || {
} }
X.laytpldata('#to-be-added-baobiao-dot',screendata,'.to-be-added-baobiao'); X.laytpldata('#to-be-added-baobiao-dot',screendata,'.to-be-added-baobiao');
} };
// 搜索 // 搜索
$(document).off('click','.kanbanadmin-ss input').on('blur','.kanbanadmin-ss input',function(){ $(document).off('click','.kanbanadmin-ss input').on('blur','.kanbanadmin-ss input',function(){
@ -5763,7 +5769,7 @@ var X = window.X || {
} }
} }
X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao"); X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao");
}) });
//添加报表 //添加报表
$(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){ $(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
@ -5772,7 +5778,7 @@ var X = window.X || {
X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao'); X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao'); X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
toadddataprocessing(); toadddataprocessing();
}) });
// 修改报表类型 // 修改报表类型
$(document).off('click','.to-added-table').on('click','.to-added-table',function(){ $(document).off('click','.to-added-table').on('click','.to-added-table',function(){
@ -5784,8 +5790,7 @@ var X = window.X || {
layer.msg('修改为表格展示',{time: 1000}); layer.msg('修改为表格展示',{time: 1000});
} }
} }
}) });
$(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){ $(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){
var obj = $(this); var obj = $(this);
@ -5797,7 +5802,7 @@ var X = window.X || {
layer.msg('修改为图表展示',{time: 1000}); layer.msg('修改为图表展示',{time: 1000});
} }
} }
}) });
$(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){ $(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){
var obj = $(this); var obj = $(this);
@ -5819,7 +5824,7 @@ var X = window.X || {
} }
} }
}) })
}) });
//渲染已添加报表 //渲染已添加报表
function toadddataprocessing(){ function toadddataprocessing(){
@ -6240,6 +6245,15 @@ var X = window.X || {
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){ X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
groupitemeventsdata = val; groupitemeventsdata = val;
//从数据看板点击进来触发事件
if(X.DATA.ltvid && X.DATA.ltvid != ''){
var report_idarr = [];
report_idarr.push(X.DATA.ltvid);
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
})
}
}) })
}); });
@ -6394,18 +6408,22 @@ var X = window.X || {
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); console.log(d);
if(d){ if(d){
data = d.query; backfilldata(d);
eventdata = data.cachedata.eventdata;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
retaineddata();
} }
}) })
}); });
function backfilldata(d){
data = d.query;
eventdata = data.cachedata.eventdata;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
retaineddata();
};
} }
}; };
@ -7120,9 +7138,20 @@ var X = window.X || {
groupitemeventsdata[0] = val; groupitemeventsdata[0] = val;
groupitemeventsdata[1] = val; groupitemeventsdata[1] = val;
//初始事件 //初始事件
console.log(data['events'][0]); // console.log(data['events'][0]);
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]);
//从数据看板点击进来触发事件
if(X.DATA.retentionid && X.DATA.retentionid != ''){
var report_idarr = [];
report_idarr.push(X.DATA.retentionid);
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
})
}
}) })
}) })
@ -7524,26 +7553,30 @@ var X = window.X || {
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); console.log(d);
if(d){ if(d){
data = d.query; backfilldata(d);
eventdata = data.cachedata.eventdata;
initialevent = data.cachedata.initialevent;
returnevent = data.cachedata.returnevent;
filtersymbols = data.cachedata.filtersymbols;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("event","initial-event",data['events'][0]);
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
analysisdown();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
retaineddata();
} }
}) })
}); });
function backfilldata(d){
data = d.query;
eventdata = data.cachedata.eventdata;
initialevent = data.cachedata.initialevent;
returnevent = data.cachedata.returnevent;
filtersymbols = data.cachedata.filtersymbols;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("event","initial-event",data['events'][0]);
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
analysisdown();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
retaineddata();
};
function updata(d){ function updata(d){
var title = $(".select-chart").attr("title"); var title = $(".select-chart").attr("title");
if(title == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)} if(title == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)}

View File

@ -45,6 +45,8 @@
setContentByUrl(url,id); setContentByUrl(url,id);
} }
X.DATA['eventid'] = ""; X.DATA['eventid'] = "";
X.DATA['ltvid'] = "";
X.DATA['retentionid'] = "";
}; };

View File

@ -422,12 +422,16 @@ var X = window.X || {
X.eventtable=function(data,callback){ X.eventtable=function(data,callback){
var titledata,condata = []; var titledata,condata = [];
for(let i in data){ for(let i in data){
if(data[i]['groups']['length'] == 0){ if(data[i]['values'].length > 0 ){
titledata= $.extend(true,[],data[0]['date_range']) ; if(data[i]['groups']['length'] == 0){
titledata.unshift('指标','阶段总和'); titledata= $.extend(true,[],data[0]['date_range']) ;
condata.push(data[i].values[0]); titledata.unshift('指标','阶段总和');
condata[i].unshift(data[i]['event_name'],data[i]['sum']); condata.push(data[i].values[0]);
// console.log(condata); condata[i].unshift(data[i]['event_name'],data[i]['sum']);
// console.log(condata);
}
}else {
layer.msg('查询数据为空');
} }
} }
var dataArr = { var dataArr = {

View File

@ -255,12 +255,12 @@
gourl = 'analysis'; gourl = 'analysis';
}else if(cat == 'retention'){ }else if(cat == 'retention'){
gourl = 'retained'; gourl = 'retained';
layer.msg('暂未处理当前逻辑'); // layer.msg('暂未处理当前逻辑');
return; // return;
}else if(cat == 'ltv'){ }else if(cat == 'ltv'){
gourl = 'ltvmodel'; gourl = 'ltvmodel';
layer.msg('暂未处理当前逻辑'); // layer.msg('暂未处理当前逻辑');
return; // return;
} }
X.gourl(gourl,'conetnt');//跳到对应的分析页面 X.gourl(gourl,'conetnt');//跳到对应的分析页面
X.DATA[cat+'id'] = id; X.DATA[cat+'id'] = id;

View File

@ -23,6 +23,7 @@
{title:'全部',id:'0'}, {title:'全部',id:'0'},
{title:'事件',id:'event'}, {title:'事件',id:'event'},
{title:'留存',id:'retention'}, {title:'留存',id:'retention'},
{title:'ltv',id:'ltv'},
{title:'漏斗',id:'funnel'}, {title:'漏斗',id:'funnel'},
{title:'属性',id:'0'}, {title:'属性',id:'0'},
{title:'分布',id:'scatter'}, {title:'分布',id:'scatter'},
@ -35,8 +36,7 @@
}) })
toadddataprocessing(); toadddataprocessing();
}) })
} };
function updatalist(title){ function updatalist(title){
console.log(title); console.log(title);
@ -52,7 +52,7 @@
} }
X.laytpldata('#to-be-added-baobiao-dot',screendata,'.to-be-added-baobiao'); X.laytpldata('#to-be-added-baobiao-dot',screendata,'.to-be-added-baobiao');
} };
// 搜索 // 搜索
$(document).off('click','.kanbanadmin-ss input').on('blur','.kanbanadmin-ss input',function(){ $(document).off('click','.kanbanadmin-ss input').on('blur','.kanbanadmin-ss input',function(){
@ -67,7 +67,7 @@
} }
} }
X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao"); X.laytpldata("#to-be-added-baobiao-dot",screendata,".to-be-added-baobiao");
}) });
//添加报表 //添加报表
$(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){ $(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
@ -76,7 +76,7 @@
X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao'); X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao'); X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
toadddataprocessing(); toadddataprocessing();
}) });
// 修改报表类型 // 修改报表类型
$(document).off('click','.to-added-table').on('click','.to-added-table',function(){ $(document).off('click','.to-added-table').on('click','.to-added-table',function(){
@ -88,8 +88,7 @@
layer.msg('修改为表格展示',{time: 1000}); layer.msg('修改为表格展示',{time: 1000});
} }
} }
}) });
$(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){ $(document).off('click','.to-added-chart').on('click','.to-added-chart',function(){
var obj = $(this); var obj = $(this);
@ -101,7 +100,7 @@
layer.msg('修改为图表展示',{time: 1000}); layer.msg('修改为图表展示',{time: 1000});
} }
} }
}) });
$(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){ $(document).off('click','.kanbanadmin-menu').on('click','.kanbanadmin-menu',function(){
var obj = $(this); var obj = $(this);
@ -123,7 +122,7 @@
} }
} }
}) })
}) });
//渲染已添加报表 //渲染已添加报表
function toadddataprocessing(){ function toadddataprocessing(){

View File

@ -47,6 +47,15 @@
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){ X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
groupitemeventsdata = val; groupitemeventsdata = val;
//从数据看板点击进来触发事件
if(X.DATA.ltvid && X.DATA.ltvid != ''){
var report_idarr = [];
report_idarr.push(X.DATA.ltvid);
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
})
}
}) })
}); });
@ -201,18 +210,22 @@
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); console.log(d);
if(d){ if(d){
data = d.query; backfilldata(d);
eventdata = data.cachedata.eventdata;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
retaineddata();
} }
}) })
}); });
function backfilldata(d){
data = d.query;
eventdata = data.cachedata.eventdata;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
retaineddata();
};
} }
}; };

View File

@ -79,9 +79,20 @@
groupitemeventsdata[0] = val; groupitemeventsdata[0] = val;
groupitemeventsdata[1] = val; groupitemeventsdata[1] = val;
//初始事件 //初始事件
console.log(data['events'][0]); // console.log(data['events'][0]);
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]);
//从数据看板点击进来触发事件
if(X.DATA.retentionid && X.DATA.retentionid != ''){
var report_idarr = [];
report_idarr.push(X.DATA.retentionid);
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
backfilldata(d[0]);
})
}
}) })
}) })
@ -483,26 +494,30 @@
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){ X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
console.log(d); console.log(d);
if(d){ if(d){
data = d.query; backfilldata(d);
eventdata = data.cachedata.eventdata;
initialevent = data.cachedata.initialevent;
returnevent = data.cachedata.returnevent;
filtersymbols = data.cachedata.filtersymbols;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("event","initial-event",data['events'][0]);
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
analysisdown();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
retaineddata();
} }
}) })
}); });
function backfilldata(d){
data = d.query;
eventdata = data.cachedata.eventdata;
initialevent = data.cachedata.initialevent;
returnevent = data.cachedata.returnevent;
filtersymbols = data.cachedata.filtersymbols;
groupitemeventsdata = data.cachedata.groupitemeventsdata;
X.template("event","initial-event",data['events'][0]);
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
analysisdown();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
retaineddata();
};
function updata(d){ function updata(d){
var title = $(".select-chart").attr("title"); var title = $(".select-chart").attr("title");
if(title == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)} if(title == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)}