From c302d945aa8d33c6f912d2ebf20bd9737634bce4 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Mon, 13 Jun 2022 14:34:11 +0800
Subject: [PATCH] 1

---
 web/src/x.min.js               | 9 +++++----
 web/srczip/common.js           | 2 +-
 web/srczip/logic/grouptable.js | 7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/src/x.min.js b/web/src/x.min.js
index e4ce988..5b0a1b5 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -131,7 +131,7 @@ var X = window.X || {
             {title: '-',id:'-'}, 
             {title: '*',id:'*'},
             {title: '/',id:'/'},
-        ]
+        ] 
     },
 };
   
@@ -10404,9 +10404,10 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms.extData;
-
-            data['eventView']['endTime'] = data.time+" 23:59:59";
-            data['eventView']['startTime'] = data.time+" 00:00:00";
+            if(data.eventView.timeParticleSize != "P1M" && data.eventView.timeParticleSize != "total" && data.eventView.timeParticleSize != "P1W"){
+                data['eventView']['endTime'] = data.time+" 23:59:59";
+                data['eventView']['startTime'] = data.time+" 00:00:00";
+            }
             
             X.api("ck/scatter_model_details","post",data,function(d){
                 d['tabletitle'] = $.extend(true,[],d['label']);
diff --git a/web/srczip/common.js b/web/srczip/common.js
index f4936c1..2130bb2 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -130,7 +130,7 @@ var X = window.X || {
             {title: '-',id:'-'}, 
             {title: '*',id:'*'},
             {title: '/',id:'/'},
-        ]
+        ] 
     },
 };
   
diff --git a/web/srczip/logic/grouptable.js b/web/srczip/logic/grouptable.js
index af6bddd..3759ab8 100644
--- a/web/srczip/logic/grouptable.js
+++ b/web/srczip/logic/grouptable.js
@@ -5,9 +5,10 @@
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms.extData;
-
-            data['eventView']['endTime'] = data.time+" 23:59:59";
-            data['eventView']['startTime'] = data.time+" 00:00:00";
+            if(data.eventView.timeParticleSize != "P1M" && data.eventView.timeParticleSize != "total" && data.eventView.timeParticleSize != "P1W"){
+                data['eventView']['endTime'] = data.time+" 23:59:59";
+                data['eventView']['startTime'] = data.time+" 00:00:00";
+            }
             
             X.api("ck/scatter_model_details","post",data,function(d){
                 d['tabletitle'] = $.extend(true,[],d['label']);