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

修改单位筛选字段名重复问题

Browse Source
This commit is contained in:
罗松柏 2022-02-10 10:04:19 +08:00
parent 4f2ff0551c
commit 126b7fae26
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@ var X = window.X || {
{'title': "UTC±00:00",id:0} {'title': "UTC±00:00",id:0}
], ],
'analysis':{}, 'analysis':{},
'screenlist':{ 'companylist':{
'event':[ 'event':[
{'title':'按天','id':'P1D'}, {'title':'按天','id':'P1D'},
{'title':'按分钟','id':'PT1M'}, {'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); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['timeParticleSize'] = d.id; data['eventView']['timeParticleSize'] = d.id;
calculationdata(); calculationdata();
@ -6501,7 +6501,7 @@ var X = window.X || {
var name = obj.attr('data-name'); var name = obj.attr('data-name');
$("#sxjg"+id).hide(); $("#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); // console.log(d);
obj.html(d.title); obj.html(d.title);
var reportid = []; 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); console.log(d);
$(".analtsis-timeParticleSize").html(d.title); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['timeParticleSize'] = d.id; 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); // console.log(d);
$(".analtsis-timeParticleSize").html(d.title); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['unitNum'] = parseInt(d.id); data['eventView']['unitNum'] = parseInt(d.id);
@ -13963,7 +13963,7 @@ var X = window.X || {
$('#avesumdatatrue').prop('checked',true); $('#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){ X.daterender(".setupbaobiao-rli-box2",function(start, end, label){

2
web/srczip/common.js
View File

@ -92,7 +92,7 @@ var X = window.X || {
{'title': "UTC±00:00",id:0} {'title': "UTC±00:00",id:0}
], ],
'analysis':{}, 'analysis':{},
'screenlist':{ 'companylist':{
'event':[ 'event':[
{'title':'按天','id':'P1D'}, {'title':'按天','id':'P1D'},
{'title':'按分钟','id':'PT1M'}, {'title':'按分钟','id':'PT1M'},

2
web/srczip/logic/3rmodel.js
View File

@ -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); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['timeParticleSize'] = d.id; data['eventView']['timeParticleSize'] = d.id;
calculationdata(); calculationdata();

2
web/srczip/logic/dashboard.js
View File

@ -582,7 +582,7 @@
var name = obj.attr('data-name'); var name = obj.attr('data-name');
$("#sxjg"+id).hide(); $("#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); // console.log(d);
obj.html(d.title); obj.html(d.title);
var reportid = []; var reportid = [];

2
web/srczip/logic/distribution.js
View File

@ -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); console.log(d);
$(".analtsis-timeParticleSize").html(d.title); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['timeParticleSize'] = d.id; data['eventView']['timeParticleSize'] = d.id;

2
web/srczip/logic/retained.js
View File

@ -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); // console.log(d);
$(".analtsis-timeParticleSize").html(d.title); $(".analtsis-timeParticleSize").html(d.title);
data['eventView']['unitNum'] = parseInt(d.id); data['eventView']['unitNum'] = parseInt(d.id);

2
web/srczip/logic/setupbaobiao.js
View File

@ -59,7 +59,7 @@
$('#avesumdatatrue').prop('checked',true); $('#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){ X.daterender(".setupbaobiao-rli-box2",function(start, end, label){