From 991ceec89711b2d4c2e06f8fffd4faf6ec09870c Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Mon, 23 Aug 2021 14:53:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/pages/modeltable.html | 20 ++++++++++++++++++++ web/src/x.min.js | 25 +++++++++---------------- web/srczip/common.js | 6 +++--- web/srczip/logic/analysis.js | 7 +++---- web/srczip/logic/distribution.js | 1 - web/srczip/logic/funnelanalysis.js | 3 +-- web/srczip/logic/ltvmodel.js | 4 +--- web/srczip/logic/retained.js | 4 +--- 8 files changed, 38 insertions(+), 32 deletions(-) diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html index f7bfaf8..1a68e6f 100644 --- a/web/pages/modeltable.html +++ b/web/pages/modeltable.html @@ -90,6 +90,11 @@
+ {{# layui.each(d.titledata, function(indexs, items) { }} @@ -99,6 +104,11 @@ {{# if(d.cat === "event"){ }} + + {{# layui.each(d.titledata, function(indexs, items) { }} + + {{# }); }} + {{# layui.each(d.condata, function(indexs, items) { }} {{# layui.each(items, function(indexss, itemss) { }} @@ -109,6 +119,11 @@ {{# } else if(d.cat === "retention"){ }} + + {{# layui.each(d.titledata, function(indexs, items) { }} + + {{# }); }} + {{# layui.each(d.condata, function(indexs, items) { }} @@ -124,6 +139,11 @@ {{# } else if(d.cat === "ltv"){ }} + + {{# layui.each(d.titledata, function(indexs, items) { }} + + {{# }); }} + {{# layui.each(d.condata, function(indexs, items) { }} {{# layui.each(items, function(indexss, itemss){ }} diff --git a/web/src/x.min.js b/web/src/x.min.js index 29b4483..0edec79 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -107,8 +107,8 @@ var X = window.X || { (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){ @@ -365,7 +365,7 @@ var X = window.X || { ranges: { '今日': [moment(), moment()], '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], - '最近7日': [moment().subtract(7, 'days'), moment().subtract(1, 'days')], + '最近7日': [moment().subtract(7, 'days'), moment().subtract(0, 'days')], '最近30日': [moment().subtract(30, 'days'), moment().subtract(1, 'days')], '上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000], '本周': [moment().startOf('week')+86400000, moment()+86400000], @@ -1617,8 +1617,7 @@ var X = window.X || { "timeParticleSize":"P1D", "endTime":"", "graphShape":"L0", - "recentDay":"1-7", - "e_days":1, + "e_days":0, "s_days":7, "groupBy":[], "uiCommonConfig":{ @@ -1654,10 +1653,10 @@ var X = window.X || { var startdate = new Date(start.format('YYYY-MM-DD')); var startmonth = Date.parse(startdate)/1000; - // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); - calculationdata(); + console.log(data); + // calculationdata(); }) var time = $("#analtsis-condition-date").val(); @@ -4182,7 +4181,6 @@ var X = window.X || { "cksql":"scatter", "endTime":"", "groupBy":[], - "recentDay":"1-7", "startTime":"", "timeParticleSize":"P1D" }, @@ -4989,8 +4987,7 @@ var X = window.X || { "endTime":"", "filts":[], "groupBy":[], - "recentDay":"1-30", - "e_days":1, + "e_days":0, "s_days":7, "relation":"and", "startTime":"", @@ -6522,8 +6519,7 @@ var X = window.X || { "endTime":"2021-06-07 23:59:59", "filts":[], "groupBy":[], - "recentDay":"1-7", - "e_days":1, + "e_days":0, "s_days":7, "relation":"and", "startTime":"2021-05-09 00:00:00", @@ -6555,7 +6551,6 @@ var X = window.X || { var startdate = new Date(start.format('YYYY-MM-DD')); var startmonth = Date.parse(startdate)/1000; - // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); retaineddata(); @@ -7525,8 +7520,7 @@ var X = window.X || { "endTime":"2021-06-07 23:59:59", "filts":[], "groupBy":[], - "recentDay":"1-7", - "e_days":1, + "e_days":0, "s_days":7, "relation":"and", "startTime":"2021-05-09 00:00:00", @@ -7561,7 +7555,6 @@ var X = window.X || { var startdate = new Date(start.format('YYYY-MM-DD')); var startmonth = Date.parse(startdate)/1000; - // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); retaineddata(); diff --git a/web/srczip/common.js b/web/srczip/common.js index 50066fd..7da7c1e 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -106,8 +106,8 @@ var X = window.X || { (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){ @@ -364,7 +364,7 @@ var X = window.X || { ranges: { '今日': [moment(), moment()], '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], - '最近7日': [moment().subtract(7, 'days'), moment().subtract(1, 'days')], + '最近7日': [moment().subtract(7, 'days'), moment().subtract(0, 'days')], '最近30日': [moment().subtract(30, 'days'), moment().subtract(1, 'days')], '上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000], '本周': [moment().startOf('week')+86400000, moment()+86400000], diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index 624cee1..2c1096f 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -23,8 +23,7 @@ "timeParticleSize":"P1D", "endTime":"", "graphShape":"L0", - "recentDay":"1-7", - "e_days":1, + "e_days":0, "s_days":7, "groupBy":[], "uiCommonConfig":{ @@ -60,10 +59,10 @@ var startdate = new Date(start.format('YYYY-MM-DD')); var startmonth = Date.parse(startdate)/1000; - // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); - calculationdata(); + console.log(data); + // calculationdata(); }) var time = $("#analtsis-condition-date").val(); diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js index a495fe6..253d45f 100644 --- a/web/srczip/logic/distribution.js +++ b/web/srczip/logic/distribution.js @@ -7,7 +7,6 @@ "cksql":"scatter", "endTime":"", "groupBy":[], - "recentDay":"1-7", "startTime":"", "timeParticleSize":"P1D" }, diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js index 0be01b0..5a394d0 100644 --- a/web/srczip/logic/funnelanalysis.js +++ b/web/srczip/logic/funnelanalysis.js @@ -10,8 +10,7 @@ "endTime":"", "filts":[], "groupBy":[], - "recentDay":"1-30", - "e_days":1, + "e_days":0, "s_days":7, "relation":"and", "startTime":"", diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js index 4dd75f4..9b904b5 100644 --- a/web/srczip/logic/ltvmodel.js +++ b/web/srczip/logic/ltvmodel.js @@ -9,8 +9,7 @@ "endTime":"2021-06-07 23:59:59", "filts":[], "groupBy":[], - "recentDay":"1-7", - "e_days":1, + "e_days":0, "s_days":7, "relation":"and", "startTime":"2021-05-09 00:00:00", @@ -42,7 +41,6 @@ var startdate = new Date(start.format('YYYY-MM-DD')); var startmonth = Date.parse(startdate)/1000; - // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); retaineddata(); diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js index 722c379..2245bee 100644 --- a/web/srczip/logic/retained.js +++ b/web/srczip/logic/retained.js @@ -10,8 +10,7 @@ "endTime":"2021-06-07 23:59:59", "filts":[], "groupBy":[], - "recentDay":"1-7", - "e_days":1, + "e_days":0, "s_days":7, "relation":"and", "startTime":"2021-05-09 00:00:00", @@ -46,7 +45,6 @@ var startdate = new Date(start.format('YYYY-MM-DD')); var startmonth = Date.parse(startdate)/1000; - // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); retaineddata();
{{items}}
{{items.date}}