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

修改时间问题

Browse Source
This commit is contained in:
罗松柏 2021-08-23 14:53:01 +08:00
parent d86f087c46
commit 991ceec897
8 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/pages/modeltable.html
View File

@ -90,6 +90,11 @@
<div class="table-box"> <div class="table-box">
<table class="table-fenxi-box"> <table class="table-fenxi-box">
<thead> <thead>
<!-- <colgroup>
{{# layui.each(d.titledata, function(indexs, items) { }}
<col />
{{# }); }}
</colgroup> -->
<tr class="table-fenxi-th"> <tr class="table-fenxi-th">
{{# layui.each(d.titledata, function(indexs, items) { }} {{# layui.each(d.titledata, function(indexs, items) { }}
<th>{{items}}</th> <th>{{items}}</th>
@ -99,6 +104,11 @@
{{# if(d.cat === "event"){ }} {{# if(d.cat === "event"){ }}
<tbody class="table-fenxi-td"> <tbody class="table-fenxi-td">
<colgroup>
{{# layui.each(d.titledata, function(indexs, items) { }}
<col />
{{# }); }}
</colgroup>
{{# 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) { }}
@ -109,6 +119,11 @@
</tbody> </tbody>
{{# } else if(d.cat === "retention"){ }} {{# } else if(d.cat === "retention"){ }}
<tbody class="table-fenxi-td"> <tbody class="table-fenxi-td">
<colgroup>
{{# layui.each(d.titledata, function(indexs, items) { }}
<col />
{{# }); }}
</colgroup>
{{# layui.each(d.condata, function(indexs, items) { }} {{# layui.each(d.condata, function(indexs, items) { }}
<tr > <tr >
<td>{{items.date}}</td> <td>{{items.date}}</td>
@ -124,6 +139,11 @@
</tbody> </tbody>
{{# } else if(d.cat === "ltv"){ }} {{# } else if(d.cat === "ltv"){ }}
<tbody class="table-fenxi-td"> <tbody class="table-fenxi-td">
<colgroup>
{{# layui.each(d.titledata, function(indexs, items) { }}
<col />
{{# }); }}
</colgroup>
{{# 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){ }}

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

@ -107,8 +107,8 @@ var X = window.X || {
(function(){ (function(){
// var ipurl = "http://10.0.0.77:7889/api/v1/"; var ipurl = "http://10.0.0.77:7889/api/v1/";
var ipurl = "http://139.159.159.3:9865/api/v1/"; // var ipurl = "http://139.159.159.3:9865/api/v1/";
//设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失 //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
X.loginCache = function(data){ X.loginCache = function(data){
@ -365,7 +365,7 @@ var X = window.X || {
ranges: { ranges: {
'今日': [moment(), moment()], '今日': [moment(), moment()],
'昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], '昨日': [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')], '最近30日': [moment().subtract(30, 'days'), moment().subtract(1, 'days')],
'上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000], '上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000],
'本周': [moment().startOf('week')+86400000, moment()+86400000], '本周': [moment().startOf('week')+86400000, moment()+86400000],
@ -1617,8 +1617,7 @@ var X = window.X || {
"timeParticleSize":"P1D", "timeParticleSize":"P1D",
"endTime":"", "endTime":"",
"graphShape":"L0", "graphShape":"L0",
"recentDay":"1-7", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"groupBy":[], "groupBy":[],
"uiCommonConfig":{ "uiCommonConfig":{
@ -1654,10 +1653,10 @@ var X = window.X || {
var startdate = new Date(start.format('YYYY-MM-DD')); var startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000; 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']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
calculationdata(); console.log(data);
// calculationdata();
}) })
var time = $("#analtsis-condition-date").val(); var time = $("#analtsis-condition-date").val();
@ -4182,7 +4181,6 @@ var X = window.X || {
"cksql":"scatter", "cksql":"scatter",
"endTime":"", "endTime":"",
"groupBy":[], "groupBy":[],
"recentDay":"1-7",
"startTime":"", "startTime":"",
"timeParticleSize":"P1D" "timeParticleSize":"P1D"
}, },
@ -4989,8 +4987,7 @@ var X = window.X || {
"endTime":"", "endTime":"",
"filts":[], "filts":[],
"groupBy":[], "groupBy":[],
"recentDay":"1-30", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"relation":"and", "relation":"and",
"startTime":"", "startTime":"",
@ -6522,8 +6519,7 @@ var X = window.X || {
"endTime":"2021-06-07 23:59:59", "endTime":"2021-06-07 23:59:59",
"filts":[], "filts":[],
"groupBy":[], "groupBy":[],
"recentDay":"1-7", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"relation":"and", "relation":"and",
"startTime":"2021-05-09 00:00:00", "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 startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000; 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']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
retaineddata(); retaineddata();
@ -7525,8 +7520,7 @@ var X = window.X || {
"endTime":"2021-06-07 23:59:59", "endTime":"2021-06-07 23:59:59",
"filts":[], "filts":[],
"groupBy":[], "groupBy":[],
"recentDay":"1-7", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"relation":"and", "relation":"and",
"startTime":"2021-05-09 00:00:00", "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 startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000; 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']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
retaineddata(); retaineddata();

6
web/srczip/common.js
View File

@ -106,8 +106,8 @@ var X = window.X || {
(function(){ (function(){
// var ipurl = "http://10.0.0.77:7889/api/v1/"; var ipurl = "http://10.0.0.77:7889/api/v1/";
var ipurl = "http://139.159.159.3:9865/api/v1/"; // var ipurl = "http://139.159.159.3:9865/api/v1/";
//设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失 //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
X.loginCache = function(data){ X.loginCache = function(data){
@ -364,7 +364,7 @@ var X = window.X || {
ranges: { ranges: {
'今日': [moment(), moment()], '今日': [moment(), moment()],
'昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], '昨日': [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')], '最近30日': [moment().subtract(30, 'days'), moment().subtract(1, 'days')],
'上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000], '上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000],
'本周': [moment().startOf('week')+86400000, moment()+86400000], '本周': [moment().startOf('week')+86400000, moment()+86400000],

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

@ -23,8 +23,7 @@
"timeParticleSize":"P1D", "timeParticleSize":"P1D",
"endTime":"", "endTime":"",
"graphShape":"L0", "graphShape":"L0",
"recentDay":"1-7", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"groupBy":[], "groupBy":[],
"uiCommonConfig":{ "uiCommonConfig":{
@ -60,10 +59,10 @@
var startdate = new Date(start.format('YYYY-MM-DD')); var startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000; 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']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
calculationdata(); console.log(data);
// calculationdata();
}) })
var time = $("#analtsis-condition-date").val(); var time = $("#analtsis-condition-date").val();

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

@ -7,7 +7,6 @@
"cksql":"scatter", "cksql":"scatter",
"endTime":"", "endTime":"",
"groupBy":[], "groupBy":[],
"recentDay":"1-7",
"startTime":"", "startTime":"",
"timeParticleSize":"P1D" "timeParticleSize":"P1D"
}, },

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

@ -10,8 +10,7 @@
"endTime":"", "endTime":"",
"filts":[], "filts":[],
"groupBy":[], "groupBy":[],
"recentDay":"1-30", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"relation":"and", "relation":"and",
"startTime":"", "startTime":"",

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

@ -9,8 +9,7 @@
"endTime":"2021-06-07 23:59:59", "endTime":"2021-06-07 23:59:59",
"filts":[], "filts":[],
"groupBy":[], "groupBy":[],
"recentDay":"1-7", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"relation":"and", "relation":"and",
"startTime":"2021-05-09 00:00:00", "startTime":"2021-05-09 00:00:00",
@ -42,7 +41,6 @@
var startdate = new Date(start.format('YYYY-MM-DD')); var startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000; 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']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
retaineddata(); retaineddata();

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

@ -10,8 +10,7 @@
"endTime":"2021-06-07 23:59:59", "endTime":"2021-06-07 23:59:59",
"filts":[], "filts":[],
"groupBy":[], "groupBy":[],
"recentDay":"1-7", "e_days":0,
"e_days":1,
"s_days":7, "s_days":7,
"relation":"and", "relation":"and",
"startTime":"2021-05-09 00:00:00", "startTime":"2021-05-09 00:00:00",
@ -46,7 +45,6 @@
var startdate = new Date(start.format('YYYY-MM-DD')); var startdate = new Date(start.format('YYYY-MM-DD'));
var startmonth = Date.parse(startdate)/1000; 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']['e_days'] = parseInt((sameday - endmonth)/86400);
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400); data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
retaineddata(); retaineddata();