From 536305d1ec7142bd860a432c0d1c236729e3ed05 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Fri, 30 Jul 2021 16:46:06 +0800
Subject: [PATCH] 111

---
 web/pages/ltvmodel.html      |  2 +-
 web/src/x.min.js             | 22 ++++++++++++++++++++--
 web/srczip/logic/ltvmodel.js | 11 ++++++++++-
 web/srczip/logic/retained.js | 11 ++++++++++-
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/web/pages/ltvmodel.html b/web/pages/ltvmodel.html
index 2ce1601..3a45348 100644
--- a/web/pages/ltvmodel.html
+++ b/web/pages/ltvmodel.html
@@ -85,7 +85,7 @@
                     <div class="analtsis-condition-box">
                         <div class="analtsis-time-box">
                             <div class="analtsis-condition" > <input id="retained-condition-date" readonly="readonly"></input> </div>
-                            <div class="analtsis-condition analtsis-timeParticleSize">7天</div>
+                            <!-- <div class="analtsis-condition analtsis-timeParticleSize">7天</div> -->
                         </div>
 
                         <div class="analtsis-condition-right-box">
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 6f3561e..fdd299c 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -6168,7 +6168,7 @@ var X = window.X || {
                     "endTime":"2021-06-07 23:59:59",
                     "filts":[],
                     "groupBy":[],
-                    "recentDay":"1-30",
+                    "recentDay":"1-7",
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -6191,6 +6191,15 @@ var X = window.X || {
                 var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
                 data['eventView']['startTime'] = startTime;
                 data['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;
+                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });
 
@@ -7044,7 +7053,7 @@ var X = window.X || {
                     "endTime":"2021-06-07 23:59:59",
                     "filts":[],
                     "groupBy":[],
-                    "recentDay":"1-30",
+                    "recentDay":"1-7",
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -7070,6 +7079,15 @@ var X = window.X || {
                 var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
                 data['eventView']['startTime'] = startTime;
                 data['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;
+                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });
 
diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js
index c4d71d8..f7eae37 100644
--- a/web/srczip/logic/ltvmodel.js
+++ b/web/srczip/logic/ltvmodel.js
@@ -9,7 +9,7 @@
                     "endTime":"2021-06-07 23:59:59",
                     "filts":[],
                     "groupBy":[],
-                    "recentDay":"1-30",
+                    "recentDay":"1-7",
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -32,6 +32,15 @@
                 var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
                 data['eventView']['startTime'] = startTime;
                 data['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;
+                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });
 
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index cc308aa..66f0b56 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -10,7 +10,7 @@
                     "endTime":"2021-06-07 23:59:59",
                     "filts":[],
                     "groupBy":[],
-                    "recentDay":"1-30",
+                    "recentDay":"1-7",
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -36,6 +36,15 @@
                 var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
                 data['eventView']['startTime'] = startTime;
                 data['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;
+                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });