111
This commit is contained in:
parent
da40ebbe48
commit
121c04bcad
@ -36,7 +36,9 @@
|
|||||||
<div class="root___2a4tb">
|
<div class="root___2a4tb">
|
||||||
|
|
||||||
<div class="block___2n0We analysis-overall" style="display: block;">
|
<div class="block___2n0We analysis-overall" style="display: block;">
|
||||||
<div class="analysis-con-left-title">全局筛选</div>
|
<div class="analysis-con-left-title">
|
||||||
|
<span>全局筛选</span> <span class="eventsplit" style="padding: 3px 5px; background-color: #f0f2f5; color: #67729d;">角色</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="analysis-con-left-screen-box">
|
<div class="analysis-con-left-screen-box">
|
||||||
|
|
||||||
|
22
web/src/x.min.js
vendored
22
web/src/x.min.js
vendored
@ -6173,7 +6173,8 @@ var X = window.X || {
|
|||||||
"startTime":"2021-05-09 00:00:00",
|
"startTime":"2021-05-09 00:00:00",
|
||||||
"statType":"retention",
|
"statType":"retention",
|
||||||
"timeParticleSize":"P1D",
|
"timeParticleSize":"P1D",
|
||||||
"unitNum":7
|
"unitNum":7,
|
||||||
|
"quota":'#account_id'
|
||||||
},
|
},
|
||||||
"events":[
|
"events":[
|
||||||
|
|
||||||
@ -6218,7 +6219,6 @@ var X = window.X || {
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
//全局筛选
|
//全局筛选
|
||||||
var filtsftvdata=[];
|
var filtsftvdata=[];
|
||||||
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
||||||
@ -6232,8 +6232,12 @@ var X = window.X || {
|
|||||||
"ftv":[],//条件
|
"ftv":[],//条件
|
||||||
"strftv":'',//显示条件
|
"strftv":'',//显示条件
|
||||||
"section":[-1,1],//区间
|
"section":[-1,1],//区间
|
||||||
"table_type":screentypedata[0]['id']
|
"table_type":screentypedata[0]['id'],
|
||||||
};
|
};
|
||||||
|
if(data['eventView']['filts'].length == 1){
|
||||||
|
layer.msg('此项只能添加一个');
|
||||||
|
return;
|
||||||
|
}
|
||||||
data['eventView']['filts'].push(drr);
|
data['eventView']['filts'].push(drr);
|
||||||
filtsftvdata.push(screentypedata[0]['category'][0]['category']);
|
filtsftvdata.push(screentypedata[0]['category'][0]['category']);
|
||||||
if(data['eventView']['filts'].length > 1){
|
if(data['eventView']['filts'].length > 1){
|
||||||
@ -6245,6 +6249,17 @@ var X = window.X || {
|
|||||||
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
|
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var listarr =[
|
||||||
|
{title:'角色',id:'#account_id'},
|
||||||
|
{title:'设备',id:'#distinct_id'},
|
||||||
|
// {title:'账号',id:'binduid'},
|
||||||
|
]
|
||||||
|
X.laydropdown('.eventsplit',listarr,function(d){
|
||||||
|
$('.eventsplit').html(d.title);
|
||||||
|
data['eventView']['quota'] = d.id;
|
||||||
|
console.log(d);
|
||||||
|
});
|
||||||
|
|
||||||
//删除指定全局数据
|
//删除指定全局数据
|
||||||
$(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
|
$(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
|
||||||
var index = $(this).attr('data-index');
|
var index = $(this).attr('data-index');
|
||||||
@ -6276,7 +6291,6 @@ var X = window.X || {
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
|
$(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
|
||||||
var obj = $(this);
|
var obj = $(this);
|
||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
|
@ -14,7 +14,8 @@
|
|||||||
"startTime":"2021-05-09 00:00:00",
|
"startTime":"2021-05-09 00:00:00",
|
||||||
"statType":"retention",
|
"statType":"retention",
|
||||||
"timeParticleSize":"P1D",
|
"timeParticleSize":"P1D",
|
||||||
"unitNum":7
|
"unitNum":7,
|
||||||
|
"quota":'#account_id'
|
||||||
},
|
},
|
||||||
"events":[
|
"events":[
|
||||||
|
|
||||||
@ -59,7 +60,6 @@
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
//全局筛选
|
//全局筛选
|
||||||
var filtsftvdata=[];
|
var filtsftvdata=[];
|
||||||
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
||||||
@ -73,8 +73,12 @@
|
|||||||
"ftv":[],//条件
|
"ftv":[],//条件
|
||||||
"strftv":'',//显示条件
|
"strftv":'',//显示条件
|
||||||
"section":[-1,1],//区间
|
"section":[-1,1],//区间
|
||||||
"table_type":screentypedata[0]['id']
|
"table_type":screentypedata[0]['id'],
|
||||||
};
|
};
|
||||||
|
if(data['eventView']['filts'].length == 1){
|
||||||
|
layer.msg('此项只能添加一个');
|
||||||
|
return;
|
||||||
|
}
|
||||||
data['eventView']['filts'].push(drr);
|
data['eventView']['filts'].push(drr);
|
||||||
filtsftvdata.push(screentypedata[0]['category'][0]['category']);
|
filtsftvdata.push(screentypedata[0]['category'][0]['category']);
|
||||||
if(data['eventView']['filts'].length > 1){
|
if(data['eventView']['filts'].length > 1){
|
||||||
@ -86,6 +90,17 @@
|
|||||||
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
|
X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var listarr =[
|
||||||
|
{title:'角色',id:'#account_id'},
|
||||||
|
{title:'设备',id:'#distinct_id'},
|
||||||
|
// {title:'账号',id:'binduid'},
|
||||||
|
]
|
||||||
|
X.laydropdown('.eventsplit',listarr,function(d){
|
||||||
|
$('.eventsplit').html(d.title);
|
||||||
|
data['eventView']['quota'] = d.id;
|
||||||
|
console.log(d);
|
||||||
|
});
|
||||||
|
|
||||||
//删除指定全局数据
|
//删除指定全局数据
|
||||||
$(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
|
$(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
|
||||||
var index = $(this).attr('data-index');
|
var index = $(this).attr('data-index');
|
||||||
@ -117,7 +132,6 @@
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
$(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
|
$(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
|
||||||
var obj = $(this);
|
var obj = $(this);
|
||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
|
Loading…
Reference in New Issue
Block a user