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

1

Browse Source
This commit is contained in:
罗松柏 2021-08-27 11:06:59 +08:00
parent a4efd88c7a
commit 7eaa4ec9ea
9 changed files with 158 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pages/modeltable.html
View File

@ -76,7 +76,7 @@
<div class="condition-box controlhover">
<div class="time-cond">
<span class="model-times" id="times{{d.id}}">过去7天</span>
<span class="model-times" id="times{{d.id}}">{{d.date}}</span>
<div class="xian"></div>
<span class="model-screenlist">按天</span>
{{# if(d.cat === "retention"){ }}
@ -206,7 +206,7 @@
<div class="condition-box controlhover">
<div class="time-cond">
<span class="model-times" id="times{{d.id}}">过去7天</span>
<span class="model-times" id="times{{d.id}}">{{d.date}}</span>
<div class="xian"></div>
<span class="model-screenlist">按天</span>
{{# if(d.cat === "retention"){ }}

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

@ -96,9 +96,9 @@ var X = window.X || {
'retention':[
{'title':'当日','id':'1'},
{'title':'次日','id':'2'},
{'title':'7日','id':'7'},
{'title':'7日','id':'P1W'},
{'title':'14日','id':'14'},
{'title':'30日','id':'30'}
{'title':'30日','id':'P1M'}
],
'distribution':[
{'title':'按天','id':'P1D'},
@ -106,14 +106,18 @@ var X = window.X || {
{'title':'按月','id':'P1M'},
{'title':'合计','id':'total'}
]
}
},
'retentionlist' : [
{'title':'留存','id':0},
{'title':'流失','id':1},
]
},
};
(function(){
// var ipurl = "http://10.0.0.77:7889/api/v1/";
var ipurl = "http://139.159.159.3:9865/api/v1/";
var ipurl = "http://10.0.0.77:7889/api/v1/";
// var ipurl = "http://139.159.159.3:9865/api/v1/";
//设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
X.loginCache = function(data){
@ -315,6 +319,7 @@ var X = window.X || {
type: 1,
title: false,
closeBtn: 0,
// shade:,
shadeClose: true,
offset: [deviationtop,deviationleft],
url: url,
@ -629,10 +634,10 @@ var X = window.X || {
mean:mean,
sameday: sameday,
wowtype:wowtype,
wow: 0,
chain_ratio: 0,
// wow: Math.abs(data[0]['wow']),//环比
// chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
// wow: 0,
// chain_ratio: 0,
wow: Math.abs(data[0]['wow']),//环比
chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
chain_ratiotype:chain_ratiotype
}
@ -2100,12 +2105,12 @@ var X = window.X || {
X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["event_name"]},function(d){
var arr = {
"columnDesc":d[0]['category'][0]['title'],//事件中文显示
"columnDesc":d[0]['category'][0]['title'],//事件中文显示
"columnName":d[0]['category'][0]['id'],//事件id
"comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
"comparator":d[0]['category'][0]['category'][0]['id'],//符号id
"data_type":d[0]['category'][0]['data_type'],
"ftv":'',//条件
"ftv":[],//条件
"strftv":'',//字符串显示条件
"tableType": d[0]['id']
} //筛选数据
@ -2275,7 +2280,7 @@ var X = window.X || {
"columnName":screentypedata[i]['category'][index]['id'],//事件id
'data_type':screentypedata[i]['category'][index]['data_type'],//类型
'tableType': screentypedata[i]['id'],
"ftv":'',//条件
"ftv":[],//条件
"section":''//区间
}
break;
@ -4028,6 +4033,23 @@ var X = window.X || {
});
});
// $(document).off('click',".kanben-retained-type").on('click',".kanben-retained-type",function(d){
// var obj = $(this);
// var offset = obj.offset();
// X.parametersopen(X['DATA']['retentionlist'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
// var retentiontype = d.id;
// var modelid = "retention"+eventdata.id;
// X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
// for(let i in val){
// if(val[i]['report_id'] == eventdata.id){
// X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
// }
// }
// })
// })
// })
},
@ -4068,6 +4090,7 @@ var X = window.X || {
},
modeldata:function(d,val,type){
console.log('aaa',val);
var eventdata = [];
if(d['model'] == "event"){
// 事件分析
@ -4268,10 +4291,47 @@ var X = window.X || {
//设置时间
X.daterender(".model-times",function(start, end, label){
// console.log(eventdata);
// console.log('times'+eventdata.id);
var id = 'times'+eventdata.id;
$("#"+id).html('111');
var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
$("#"+id).html(startTime + ' - ' + endTime);
var reportid = [];
reportid.push(eventdata.id);
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
};
query['eventView']['startTime'] = startTime;
query['eventView']['endTime'] = endTime;
var sameday = Date.parse(new Date()) / 1000; //当天时间戳
var enddate = new Date(end.format('YYYY-MM-DD'));
var endmonth = Date.parse(enddate)/1000;
var startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000;
query['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
query['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
X.api("ck/"+ eventdata.cat +"_model","post",query,function(val){
var bbsetdata = {
graph_size:eventdata['modelsize'],
graph_type:eventdata['modeltype'],
model:eventdata['cat'],
name:eventdata['name'],
report_id:eventdata['id'],
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val);
// console.log(modeldata);
//渲染模板和数据
X.template("modeltable",'model'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata);
});
})
})
});
X.laydropdown(".model-screenlist",X['DATA']['screenlist'][eventdata.cat],function(d){
@ -4845,7 +4905,7 @@ var X = window.X || {
"column_id": "#account_id",//事件id
'data_type': "string",//类型
'table_type': "event",
"ftv":'',//条件
"ftv":"",//条件
"section":''//区间
};
data['eventView']['groupBy'].push(arr);
@ -5706,7 +5766,7 @@ var X = window.X || {
"column_id": "#account_id",//事件id
'data_type': "string",//类型
'table_type': "event",
"ftv":'',//条件
"ftv":"",//条件
"section":''//区间
};
data['eventView']['groupBy'].push(arr);
@ -8319,7 +8379,7 @@ var X = window.X || {
"column_id": "#account_id",//事件id
'data_type': "string",//类型
'tableType': "event",
"ftv":'',//条件
"ftv":"",//条件
"section":''//区间
};
data['eventView']['groupBy'].push(arr);
@ -9000,7 +9060,7 @@ var X = window.X || {
"comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
"comparator":d[0]['category'][0]['category'][0]['id'],//符号id
"data_type":d[0]['category'][0]['data_type'],
"ftv":'',//条件
"ftv":[],//条件
"strftv":'',//字符串显示条件
"tableType": d[0]['id']
} //筛选数据

19
web/srczip/common.js
View File

@ -95,9 +95,9 @@ var X = window.X || {
'retention':[
{'title':'当日','id':'1'},
{'title':'次日','id':'2'},
{'title':'7日','id':'7'},
{'title':'7日','id':'P1W'},
{'title':'14日','id':'14'},
{'title':'30日','id':'30'}
{'title':'30日','id':'P1M'}
],
'distribution':[
{'title':'按天','id':'P1D'},
@ -105,7 +105,11 @@ var X = window.X || {
{'title':'按月','id':'P1M'},
{'title':'合计','id':'total'}
]
}
},
'retentionlist' : [
{'title':'留存','id':0},
{'title':'流失','id':1},
]
},
};
@ -314,6 +318,7 @@ var X = window.X || {
type: 1,
title: false,
closeBtn: 0,
// shade:,
shadeClose: true,
offset: [deviationtop,deviationleft],
url: url,
@ -628,10 +633,10 @@ var X = window.X || {
mean:mean,
sameday: sameday,
wowtype:wowtype,
wow: 0,
chain_ratio: 0,
// wow: Math.abs(data[0]['wow']),//环比
// chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
// wow: 0,
// chain_ratio: 0,
wow: Math.abs(data[0]['wow']),//环比
chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
chain_ratiotype:chain_ratiotype
}

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

@ -345,12 +345,12 @@
X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["event_name"]},function(d){
var arr = {
"columnDesc":d[0]['category'][0]['title'],//事件中文显示
"columnDesc":d[0]['category'][0]['title'],//事件中文显示
"columnName":d[0]['category'][0]['id'],//事件id
"comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
"comparator":d[0]['category'][0]['category'][0]['id'],//符号id
"data_type":d[0]['category'][0]['data_type'],
"ftv":'',//条件
"ftv":[],//条件
"strftv":'',//字符串显示条件
"tableType": d[0]['id']
} //筛选数据
@ -520,7 +520,7 @@
"columnName":screentypedata[i]['category'][index]['id'],//事件id
'data_type':screentypedata[i]['category'][index]['data_type'],//类型
'tableType': screentypedata[i]['id'],
"ftv":'',//条件
"ftv":[],//条件
"section":''//区间
}
break;

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

@ -325,6 +325,23 @@
});
});
// $(document).off('click',".kanben-retained-type").on('click',".kanben-retained-type",function(d){
// var obj = $(this);
// var offset = obj.offset();
// X.parametersopen(X['DATA']['retentionlist'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
// var retentiontype = d.id;
// var modelid = "retention"+eventdata.id;
// X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
// for(let i in val){
// if(val[i]['report_id'] == eventdata.id){
// X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
// }
// }
// })
// })
// })
},
@ -365,6 +382,7 @@
},
modeldata:function(d,val,type){
console.log('aaa',val);
var eventdata = [];
if(d['model'] == "event"){
// 事件分析
@ -565,10 +583,47 @@
//设置时间
X.daterender(".model-times",function(start, end, label){
// console.log(eventdata);
// console.log('times'+eventdata.id);
var id = 'times'+eventdata.id;
$("#"+id).html('111');
var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
$("#"+id).html(startTime + ' - ' + endTime);
var reportid = [];
reportid.push(eventdata.id);
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
var query = {
eventView:val[0]['query']['eventView'],
events:val[0]['query']['events'],
};
query['eventView']['startTime'] = startTime;
query['eventView']['endTime'] = endTime;
var sameday = Date.parse(new Date()) / 1000; //当天时间戳
var enddate = new Date(end.format('YYYY-MM-DD'));
var endmonth = Date.parse(enddate)/1000;
var startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000;
query['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
query['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
X.api("ck/"+ eventdata.cat +"_model","post",query,function(val){
var bbsetdata = {
graph_size:eventdata['modelsize'],
graph_type:eventdata['modeltype'],
model:eventdata['cat'],
name:eventdata['name'],
report_id:eventdata['id'],
}
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val);
// console.log(modeldata);
//渲染模板和数据
X.template("modeltable",'model'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata);
});
})
})
});
X.laydropdown(".model-screenlist",X['DATA']['screenlist'][eventdata.cat],function(d){

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

@ -293,7 +293,7 @@
"column_id": "#account_id",//事件id
'data_type': "string",//类型
'table_type': "event",
"ftv":'',//条件
"ftv":"",//条件
"section":''//区间
};
data['eventView']['groupBy'].push(arr);

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

@ -358,7 +358,7 @@
"column_id": "#account_id",//事件id
'data_type': "string",//类型
'table_type': "event",
"ftv":'',//条件
"ftv":"",//条件
"section":''//区间
};
data['eventView']['groupBy'].push(arr);

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

@ -438,7 +438,7 @@
"column_id": "#account_id",//事件id
'data_type': "string",//类型
'tableType': "event",
"ftv":'',//条件
"ftv":"",//条件
"section":''//区间
};
data['eventView']['groupBy'].push(arr);

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

@ -222,7 +222,7 @@
"comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
"comparator":d[0]['category'][0]['category'][0]['id'],//符号id
"data_type":d[0]['category'][0]['data_type'],
"ftv":'',//条件
"ftv":[],//条件
"strftv":'',//字符串显示条件
"tableType": d[0]['id']
} //筛选数据