From 1b130b2dfa8762e09d07e8d9ce446d9fc09809a2 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Mon, 23 May 2022 15:08:36 +0800 Subject: [PATCH] 1 --- web/src/x.min.js | 14 +++++++++----- web/srczip/common.js | 6 +++--- web/srczip/logic/distribution.js | 8 ++++++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/web/src/x.min.js b/web/src/x.min.js index c894c91..a927ace 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -139,12 +139,12 @@ var X = window.X || { (function(){ //本地李伟 // var ipurl = "http://10.0.0.240:7899/api/v1/"; - //本地李宗政 + //本地李宗振 // var ipurl = "http://10.0.0.94:7899/api/v1/"; // 线上 var ipurl = "http://139.159.159.3:9865/api/v1/"; - //线上测试 - // var ipurl = "http://139.159.159.3:7889/api/v1/"; + //线上测试 + // var ipurl = "http://139.159.159.3:7889/api/v1/"; //设置或读取登录缓存,需要保存到localStorage,防止刷新时候登录数据丢失 X.loginCache = function(data){ @@ -8381,7 +8381,7 @@ var X = window.X || { X.pageLogic['distribution'] = { init : function(){ - const data ={ + var data ={ "eventView":{ "cksql":"scatter", "endTime":"", @@ -8452,8 +8452,12 @@ var X = window.X || { var baobiaodata; function backfilldata(d){ if(d){ - baobiaodata = d; data = d.query; + var time = $("#retained-condition-date").val(); + var timearr = time.split(" "); + data['eventView']['startTime'] = timearr[0] + " "+"00:00:00"; + data['eventView']['endTime'] = timearr[2]+" "+"23:59:59"; + baobiaodata = d; // 数据看板点进来时吧保存的时间初始化为当前时间 var time = $("#retained-condition-date").val(); var timearr = time.split(" "); diff --git a/web/srczip/common.js b/web/srczip/common.js index a6d2a9b..8fe0da3 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -138,12 +138,12 @@ var X = window.X || { (function(){ //本地李伟 // var ipurl = "http://10.0.0.240:7899/api/v1/"; - //本地李宗政 + //本地李宗振 // var ipurl = "http://10.0.0.94:7899/api/v1/"; // 线上 var ipurl = "http://139.159.159.3:9865/api/v1/"; - //线上测试 - // var ipurl = "http://139.159.159.3:7889/api/v1/"; + //线上测试 + // var ipurl = "http://139.159.159.3:7889/api/v1/"; //设置或读取登录缓存,需要保存到localStorage,防止刷新时候登录数据丢失 X.loginCache = function(data){ diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js index 68ea086..649c4c3 100644 --- a/web/srczip/logic/distribution.js +++ b/web/srczip/logic/distribution.js @@ -2,7 +2,7 @@ X.pageLogic['distribution'] = { init : function(){ - const data ={ + var data ={ "eventView":{ "cksql":"scatter", "endTime":"", @@ -73,8 +73,12 @@ var baobiaodata; function backfilldata(d){ if(d){ - baobiaodata = d; data = d.query; + var time = $("#retained-condition-date").val(); + var timearr = time.split(" "); + data['eventView']['startTime'] = timearr[0] + " "+"00:00:00"; + data['eventView']['endTime'] = timearr[2]+" "+"23:59:59"; + baobiaodata = d; // 数据看板点进来时吧保存的时间初始化为当前时间 var time = $("#retained-condition-date").val(); var timearr = time.split(" ");