From 126b7fae26c596778b39448749e1a8f57ee670be Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Thu, 10 Feb 2022 10:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E4=BD=8D=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=AD=97=E6=AE=B5=E5=90=8D=E9=87=8D=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/x.min.js | 12 ++++++------ web/srczip/common.js | 2 +- web/srczip/logic/3rmodel.js | 2 +- web/srczip/logic/dashboard.js | 2 +- web/srczip/logic/distribution.js | 2 +- web/srczip/logic/retained.js | 2 +- web/srczip/logic/setupbaobiao.js | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/src/x.min.js b/web/src/x.min.js index 72054c2..1770d62 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -93,7 +93,7 @@ var X = window.X || { {'title': "UTC±00:00",id:0} ], 'analysis':{}, - 'screenlist':{ + 'companylist':{ 'event':[ {'title':'按天','id':'P1D'}, {'title':'按分钟','id':'PT1M'}, @@ -2323,7 +2323,7 @@ var X = window.X || { }); // 时间粒度 - X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['event'],function(d){ + X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['event'],function(d){ $(".analtsis-timeParticleSize").html(d.title); data['eventView']['timeParticleSize'] = d.id; calculationdata(); @@ -6501,7 +6501,7 @@ var X = window.X || { var name = obj.attr('data-name'); $("#sxjg"+id).hide(); - X.parametersopen(X['DATA']['screenlist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){ + X.parametersopen(X['DATA']['companylist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){ // console.log(d); obj.html(d.title); var reportid = []; @@ -8327,7 +8327,7 @@ var X = window.X || { }); // 时间粒度 - X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['distribution'],function(d){ + X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['distribution'],function(d){ console.log(d); $(".analtsis-timeParticleSize").html(d.title); data['eventView']['timeParticleSize'] = d.id; @@ -12236,7 +12236,7 @@ var X = window.X || { }); // 时间粒度 - X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['retention'],function(d){ + X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){ // console.log(d); $(".analtsis-timeParticleSize").html(d.title); data['eventView']['unitNum'] = parseInt(d.id); @@ -13963,7 +13963,7 @@ var X = window.X || { $('#avesumdatatrue').prop('checked',true); } - X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select"); + X.laytpldata("#setupbaobiao-select-dot",X['DATA']['companylist'][d[0]['cat']],".setupbaobiao-select"); }); X.daterender(".setupbaobiao-rli-box2",function(start, end, label){ diff --git a/web/srczip/common.js b/web/srczip/common.js index fd1c912..1bad679 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -92,7 +92,7 @@ var X = window.X || { {'title': "UTC±00:00",id:0} ], 'analysis':{}, - 'screenlist':{ + 'companylist':{ 'event':[ {'title':'按天','id':'P1D'}, {'title':'按分钟','id':'PT1M'}, diff --git a/web/srczip/logic/3rmodel.js b/web/srczip/logic/3rmodel.js index bef04ae..9b01be5 100644 --- a/web/srczip/logic/3rmodel.js +++ b/web/srczip/logic/3rmodel.js @@ -757,7 +757,7 @@ }); // 时间粒度 - X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['event'],function(d){ + X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['event'],function(d){ $(".analtsis-timeParticleSize").html(d.title); data['eventView']['timeParticleSize'] = d.id; calculationdata(); diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 1f99557..182ca5c 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -582,7 +582,7 @@ var name = obj.attr('data-name'); $("#sxjg"+id).hide(); - X.parametersopen(X['DATA']['screenlist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){ + X.parametersopen(X['DATA']['companylist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){ // console.log(d); obj.html(d.title); var reportid = []; diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js index 6ae4c62..ff46651 100644 --- a/web/srczip/logic/distribution.js +++ b/web/srczip/logic/distribution.js @@ -374,7 +374,7 @@ }); // 时间粒度 - X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['distribution'],function(d){ + X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['distribution'],function(d){ console.log(d); $(".analtsis-timeParticleSize").html(d.title); data['eventView']['timeParticleSize'] = d.id; diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js index f7dca18..5ce8b00 100644 --- a/web/srczip/logic/retained.js +++ b/web/srczip/logic/retained.js @@ -516,7 +516,7 @@ }); // 时间粒度 - X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['retention'],function(d){ + X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){ // console.log(d); $(".analtsis-timeParticleSize").html(d.title); data['eventView']['unitNum'] = parseInt(d.id); diff --git a/web/srczip/logic/setupbaobiao.js b/web/srczip/logic/setupbaobiao.js index c40197b..ea2375f 100644 --- a/web/srczip/logic/setupbaobiao.js +++ b/web/srczip/logic/setupbaobiao.js @@ -59,7 +59,7 @@ $('#avesumdatatrue').prop('checked',true); } - X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select"); + X.laytpldata("#setupbaobiao-select-dot",X['DATA']['companylist'][d[0]['cat']],".setupbaobiao-select"); }); X.daterender(".setupbaobiao-rli-box2",function(start, end, label){