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

1

Browse Source
This commit is contained in:
罗松柏 2022-08-18 23:22:38 +08:00
parent cf8c4e7131
commit c1de105c89
6 changed files with 194 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pages/funnelanalysis.html
View File

@ -37,7 +37,7 @@
<!-- 伸缩按钮 -->
<div class="analysis-con-left-shrink"></div>
<form class="layui-form" action="">
<form class="layui-form" action="" lay-filter="funnelanalysis-example">s
<div class="layui-form-item" style=" position: absolute; right: 10px; top: 10px;">
<label class="layui-form-label" style="padding: 0 15px;">开关</label>
<div class="layui-input-block">

8
web/pages/modeltable.html
View File

@ -191,11 +191,9 @@
{{# layui.each(d.condata, function(indexs, items) { }}
<tr >
<td>{{items.title}}</td>
{{# layui.each(items.data, function(indexss, itemss){ }}
{{# layui.each(items, function(indexss, itemss){ }}
<td>
<p>{{itemss.n}}</p>
<p>{{itemss.p}}%</p>
<p>{{itemss}}</p>
</td>
{{# }); }}
</tr>
@ -310,7 +308,7 @@
<div class="data-box">
<div style="display: flex; align-items: center;">
{{# if(d.daydata != false ){ }}
{{# if(d.daydata != false && d.sameday != undefined){ }}
<div class="data-num">{{d.sameday}}<span></span></div>
{{# } }}
<div class="proportion">

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

@ -1232,7 +1232,6 @@ var X = window.X || {
titledata:data.title,
condata:data.value
}
console.log('45465465456',dataArr)
callback && callback(dataArr);
};
@ -1254,8 +1253,7 @@ var X = window.X || {
mean:0,
sameday: 0
}
// console.log(xAxisData);
// console.log(seriesdata);
callback && callback(dataArr);
};
@ -1343,66 +1341,67 @@ var X = window.X || {
var arr = {};
var seriesData = [];
var xAxisdata = [];
if(jQuery.isEmptyObject(data.date_data)){
var arr = []
for(let i in data['summary_values']){
var index = data['summary_values'][i]['p'].length - 1;
arr.push(data['summary_values'][i]['p'][index]);
}
seriesData = {
type: 'line',
data: arr
}
}else {
var arr =[];
for(let i in data['date_data']){
xAxisdata.push(i);
for(let j in data['date_data'][i]){
if(arr[j]){
arr[j][i] = data['date_data'][i][j]['p1'];
}else {
arr[j]=[];
arr[j][i] = data['date_data'][i][j]['p1'];
}
}
}
var ydata = {};
for(let j in arr){
if(!ydata[j]){
ydata[j] = [];
}
for( let i in xAxisdata ){
ydata[j].push(0);
for(let z in arr[j]){
if(xAxisdata[i] == z){
var index = arr[j][z].length - 1;
ydata[j][i] =arr[j][z][index];
}
}
}
}
}
xAxisdata.unshift('总体');
var tabdata = [];
for(let i in ydata){
var arr = {
'title': i,
'data':[]
}
for(let j in ydata[i]){
var nrr = {
n:'',
p:ydata[i][j]
console.log(544565645,data)
if(data.switch_test){
if(jQuery.isEmptyObject(data.date_data)){
var arr = []
for(let i in data['summary_values']){
var index = data['summary_values'][i]['p'].length - 1;
arr.push(data['summary_values'][i]['p'][index]);
}
arr['data'].push(nrr);
}
tabdata.push(arr);
seriesData = {
type: 'line',
data: arr
}
}else {
var arr =[];
for(let i in data['date_data']){
xAxisdata.push(i);
for(let j in data['date_data'][i]){
if(arr[j]){
arr[j][i] = data['date_data'][i][j]['p1'];
}else {
arr[j]=[];
arr[j][i] = data['date_data'][i][j]['p1'];
}
}
}
var ydata = {};
for(let j in arr){
if(!ydata[j]){
ydata[j] = [];
}
for( let i in xAxisdata ){
ydata[j].push(0);
for(let z in arr[j]){
if(xAxisdata[i] == z){
var index = arr[j][z].length - 1;
ydata[j][i] =arr[j][z][index];
}
}
}
}
}
xAxisdata.unshift('分类');
var tabdata =[];
for(let j in data.level){
var arr = []
arr.push(data.level[j])
for(let i in data.date_data){
arr.push(data.date_data[i]['总体']['n'][j])
}
tabdata.push(arr)
}
}else {
xAxisdata = data.level;
tabdata = data.list
}
var date = data['start_date'] + " - " + data['end_date'];
var dataArr = {
titledata: xAxisdata,
@ -9643,7 +9642,8 @@ var X = window.X || {
"startTime":"",
"statType":"retention",
"timeParticleSize":"P1D",
"windows_gap":7
"windows_gap":7,
"switchTest": true
},
"events":[
@ -9694,6 +9694,7 @@ var X = window.X || {
$(".single-eventName").html(data['single'][0]['analysisDesc'])
}
switchTest = this.checked
data['eventView']['switchTest'] = this.checked
});
X.api("data_auth/my_event","get",{},function(d){
@ -9782,19 +9783,34 @@ var X = window.X || {
var timearr = time.split(" ");
data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
console.log(11111111,data)
if(data['eventView']['switchTest']){
$(".funnelanalysis-screen-box").show();
$(".single-box").hide();
X.template("funnel","funnel-event",data['events'],function(){
var drr = [];
if(data['events'].length > 2){
$(".analysis-del").show();
}else {
$(".analysis-del").hide();
}
});
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
renderdate();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
}else {
$(".funnelanalysis-screen-box").hide();
$(".single-box").show();
switchTest = false
$(".single-eventName").html(data.events[0]['eventName'])
$(".single-analysisDesc").html(data.events[0]['analysisDesc'])
layui.form.val('funnelanalysis-example', {
"open": false // "name": "value"
});
}
X.template("funnel","funnel-event",data['events'],function(){
var drr = [];
if(data['events'].length > 2){
$(".analysis-del").show();
}else {
$(".analysis-del").hide();
}
});
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
renderdate();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
retaineddata();
}
};
@ -10314,7 +10330,7 @@ var X = window.X || {
events: data.single
}
X.api("ck/guide_model","post",dataArr,function(d){
X.api("ck/funnel_model","post",dataArr,function(d){
if(d != "查无数据"){
console.log(d)
updata2(d)
@ -14723,6 +14739,10 @@ var X = window.X || {
return false;
}
if(!data.eventView['switchTest']){
data.events = data.single
}
if(data.saveas == 0 ){
data['query']['eventView']['date_type'] = tabval.date_type;
var arr = {

119
web/srczip/common.js
View File

@ -1231,7 +1231,6 @@ var X = window.X || {
titledata:data.title,
condata:data.value
}
console.log('45465465456',dataArr)
callback && callback(dataArr);
};
@ -1253,8 +1252,7 @@ var X = window.X || {
mean:0,
sameday: 0
}
// console.log(xAxisData);
// console.log(seriesdata);
callback && callback(dataArr);
};
@ -1342,66 +1340,67 @@ var X = window.X || {
var arr = {};
var seriesData = [];
var xAxisdata = [];
if(jQuery.isEmptyObject(data.date_data)){
var arr = []
for(let i in data['summary_values']){
var index = data['summary_values'][i]['p'].length - 1;
arr.push(data['summary_values'][i]['p'][index]);
}
seriesData = {
type: 'line',
data: arr
}
}else {
var arr =[];
for(let i in data['date_data']){
xAxisdata.push(i);
for(let j in data['date_data'][i]){
if(arr[j]){
arr[j][i] = data['date_data'][i][j]['p1'];
}else {
arr[j]=[];
arr[j][i] = data['date_data'][i][j]['p1'];
}
}
}
var ydata = {};
for(let j in arr){
if(!ydata[j]){
ydata[j] = [];
}
for( let i in xAxisdata ){
ydata[j].push(0);
for(let z in arr[j]){
if(xAxisdata[i] == z){
var index = arr[j][z].length - 1;
ydata[j][i] =arr[j][z][index];
}
}
}
}
}
xAxisdata.unshift('总体');
var tabdata = [];
for(let i in ydata){
var arr = {
'title': i,
'data':[]
}
for(let j in ydata[i]){
var nrr = {
n:'',
p:ydata[i][j]
console.log(544565645,data)
if(data.switch_test){
if(jQuery.isEmptyObject(data.date_data)){
var arr = []
for(let i in data['summary_values']){
var index = data['summary_values'][i]['p'].length - 1;
arr.push(data['summary_values'][i]['p'][index]);
}
arr['data'].push(nrr);
}
tabdata.push(arr);
seriesData = {
type: 'line',
data: arr
}
}else {
var arr =[];
for(let i in data['date_data']){
xAxisdata.push(i);
for(let j in data['date_data'][i]){
if(arr[j]){
arr[j][i] = data['date_data'][i][j]['p1'];
}else {
arr[j]=[];
arr[j][i] = data['date_data'][i][j]['p1'];
}
}
}
var ydata = {};
for(let j in arr){
if(!ydata[j]){
ydata[j] = [];
}
for( let i in xAxisdata ){
ydata[j].push(0);
for(let z in arr[j]){
if(xAxisdata[i] == z){
var index = arr[j][z].length - 1;
ydata[j][i] =arr[j][z][index];
}
}
}
}
}
xAxisdata.unshift('分类');
var tabdata =[];
for(let j in data.level){
var arr = []
arr.push(data.level[j])
for(let i in data.date_data){
arr.push(data.date_data[i]['总体']['n'][j])
}
tabdata.push(arr)
}
}else {
xAxisdata = data.level;
tabdata = data.list
}
var date = data['start_date'] + " - " + data['end_date'];
var dataArr = {
titledata: xAxisdata,

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

@ -16,7 +16,8 @@
"startTime":"",
"statType":"retention",
"timeParticleSize":"P1D",
"windows_gap":7
"windows_gap":7,
"switchTest": true
},
"events":[
@ -67,6 +68,7 @@
$(".single-eventName").html(data['single'][0]['analysisDesc'])
}
switchTest = this.checked
data['eventView']['switchTest'] = this.checked
});
X.api("data_auth/my_event","get",{},function(d){
@ -155,19 +157,34 @@
var timearr = time.split(" ");
data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
console.log(11111111,data)
if(data['eventView']['switchTest']){
$(".funnelanalysis-screen-box").show();
$(".single-box").hide();
X.template("funnel","funnel-event",data['events'],function(){
var drr = [];
if(data['events'].length > 2){
$(".analysis-del").show();
}else {
$(".analysis-del").hide();
}
});
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
renderdate();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
}else {
$(".funnelanalysis-screen-box").hide();
$(".single-box").show();
switchTest = false
$(".single-eventName").html(data.events[0]['eventName'])
$(".single-analysisDesc").html(data.events[0]['analysisDesc'])
layui.form.val('funnelanalysis-example', {
"open": false // "name": "value"
});
}
X.template("funnel","funnel-event",data['events'],function(){
var drr = [];
if(data['events'].length > 2){
$(".analysis-del").show();
}else {
$(".analysis-del").hide();
}
});
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
renderdate();
});
X.template("grouped","shushi",data['eventView']['groupBy']);
retaineddata();
}
};
@ -687,7 +704,7 @@
events: data.single
}
X.api("ck/guide_model","post",dataArr,function(d){
X.api("ck/funnel_model","post",dataArr,function(d){
if(d != "查无数据"){
console.log(d)
updata2(d)

4
web/srczip/logic/savereport.js
View File

@ -25,6 +25,10 @@
return false;
}
if(!data.eventView['switchTest']){
data.events = data.single
}
if(data.saveas == 0 ){
data['query']['eventView']['date_type'] = tabval.date_type;
var arr = {