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

1

Browse Source
This commit is contained in:
罗松柏 2022-03-09 15:09:41 +08:00
parent 10cbf46bc2
commit 86e79d287a
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2986,12 +2986,10 @@ var X = window.X || {
$(document).off('click','.newwenjian-qx').on('click','.newwenjian-qx',function(){ $(document).off('click','.newwenjian-qx').on('click','.newwenjian-qx',function(){
layer.closeAll(); layer.closeAll();
}); });
$(document).off('click','.newwenjian-cha').on('click','.newwenjian-cha',function(){ $(document).off('click','.newwenjian-cha').on('click','.newwenjian-cha',function(){
layer.closeAll(); layer.closeAll();
}); });
@ -9048,6 +9046,13 @@ var X = window.X || {
X.daterender("#retained-condition-date",function(start, end, label){ X.daterender("#retained-condition-date",function(start, end, label){
var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00"; var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59"; var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
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;
data['eventView']['startTime'] = startTime; data['eventView']['startTime'] = startTime;
data['eventView']['endTime'] = endTime; data['eventView']['endTime'] = endTime;
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
@ -9478,12 +9483,16 @@ var X = window.X || {
events: data.events events: data.events
} }
X.api("ck/funnel_model","post",dataArr,function(d){ X.api("ck/funnel_model","post",dataArr,function(d){
d['etitle'] = $.extend(true,[],d['title']); if(d != "查无数据"){
if(d['title'].length == 2){ d['etitle'] = $.extend(true,[],d['title']);
d['etitle'].unshift('总体'); if(d['title'].length == 2){
d['etitle'].unshift('总体');
}
querydata = d;
updata(d)
}else {
layer.msg('查无数据');
} }
querydata = d;
updata(d)
}) })
}; };
@ -13578,6 +13587,9 @@ var X = window.X || {
report_id:data['_id'] report_id:data['_id']
} }
X.api('report/edit','post',arr,function(d){ X.api('report/edit','post',arr,function(d){
// 提交看板修改记录
// X.submitrecord('修改'+tabval['title']+'看板')
layer.msg(d); layer.msg(d);
layer.closeAll(); layer.closeAll();

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

@ -27,6 +27,13 @@
X.daterender("#retained-condition-date",function(start, end, label){ X.daterender("#retained-condition-date",function(start, end, label){
var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00"; var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59"; var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
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;
data['eventView']['startTime'] = startTime; data['eventView']['startTime'] = startTime;
data['eventView']['endTime'] = endTime; data['eventView']['endTime'] = endTime;
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400); data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
@ -457,12 +464,16 @@
events: data.events events: data.events
} }
X.api("ck/funnel_model","post",dataArr,function(d){ X.api("ck/funnel_model","post",dataArr,function(d){
d['etitle'] = $.extend(true,[],d['title']); if(d != "查无数据"){
if(d['title'].length == 2){ d['etitle'] = $.extend(true,[],d['title']);
d['etitle'].unshift('总体'); if(d['title'].length == 2){
d['etitle'].unshift('总体');
}
querydata = d;
updata(d)
}else {
layer.msg('查无数据');
} }
querydata = d;
updata(d)
}) })
}; };