筛选删除添加
This commit is contained in:
parent
ca9a901b5c
commit
bacea4ba99
@ -230,7 +230,7 @@
|
||||
<div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.column_name}}</div>
|
||||
<div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}">{{items.comparator_name}}</div>
|
||||
<div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}"> <input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
|
||||
<div class="analysis-zhibiao-list-del" data-twonum="{{indexs}}"></div>
|
||||
<div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
|
||||
</div>
|
||||
{{# }); }}
|
||||
</div>
|
||||
|
||||
24
web/src/x.min.js
vendored
24
web/src/x.min.js
vendored
@ -1196,6 +1196,7 @@ var X = window.X || {
|
||||
var drr = [];
|
||||
screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
|
||||
var filtersymbols=[];//筛选符号
|
||||
filtersymbols.push(drr);
|
||||
var data = {
|
||||
"events":[],
|
||||
"eventView":{
|
||||
@ -1430,7 +1431,7 @@ var X = window.X || {
|
||||
}
|
||||
})
|
||||
//设置一级事件中第三个参数
|
||||
$(document).on('click','.analysis-zhibiao-condition',function(){
|
||||
$(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var index = obj.attr("data-index");
|
||||
@ -1446,7 +1447,7 @@ var X = window.X || {
|
||||
}
|
||||
})
|
||||
|
||||
$(document).on('click','.ta-property-select',function(){
|
||||
$(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var index = obj.attr("data-index");
|
||||
@ -1462,7 +1463,7 @@ var X = window.X || {
|
||||
|
||||
})
|
||||
|
||||
$(document).on('click','.analysis-choicetypename',function(){
|
||||
$(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var index = $(this).attr("data-index");
|
||||
@ -1493,8 +1494,9 @@ var X = window.X || {
|
||||
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
|
||||
var drr=[];
|
||||
filtersymbols.push(drr);
|
||||
console.log(filtersymbols)
|
||||
screentypearr[index] = dataArr[0]['category'][0]["event_filter"];
|
||||
filtersymbols[index][filtersymbols[index].length] = dataArr[0]['category'][0]["event_filter"][0]["category"][0]["category"];
|
||||
filtersymbols[index][filtersymbols[index].length ] = dataArr[0]['category'][0]["event_filter"][0]["category"][0]["category"];
|
||||
|
||||
})
|
||||
|
||||
@ -1535,8 +1537,13 @@ var X = window.X || {
|
||||
|
||||
// 删除二级筛选项
|
||||
$(document).on('click','.analysis-zhibiao-list-del',function(){
|
||||
var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
|
||||
$("#"+id).remove();
|
||||
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
|
||||
// $("#"+id).remove();
|
||||
var index = $(this).attr("data-index");
|
||||
var indexs = $(this).attr("data-indexs");
|
||||
filtersymbols[index].splice(indexs,1);
|
||||
data.events[index]['filters'].splice(indexs,1);
|
||||
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
|
||||
})
|
||||
|
||||
// 添加指标
|
||||
@ -1598,7 +1605,7 @@ var X = window.X || {
|
||||
|
||||
})
|
||||
|
||||
$(document).on('click','.analysis-custom-event-box .analysis-custom-event-txt',function(){
|
||||
$(document).off('click','.analysis-custom-event-box .analysis-custom-event-txt').on('click','.analysis-custom-event-box .analysis-custom-event-txt',function(){
|
||||
$(this).css("border-bottom","1px solid #3d90ff");
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
@ -1640,7 +1647,7 @@ var X = window.X || {
|
||||
})
|
||||
})
|
||||
|
||||
$(document).on("click",".analysis-granularity",function(){
|
||||
$(document).off('click','.analysis-granularity').on("click",".analysis-granularity",function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var type = obj.attr("data_type");
|
||||
@ -2035,6 +2042,7 @@ var X = window.X || {
|
||||
$(document).on("click",".zhuang_conetnt .ta-pso-line",function(){
|
||||
var index = $(this).attr("data-index");
|
||||
var indexs = $(this).attr("data-indexs");
|
||||
console.log(data[index]['category'])
|
||||
var valdata = {
|
||||
'title':$(this).attr('data-title'),
|
||||
'id':$(this).attr('data-id'),
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
var drr = [];
|
||||
screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
|
||||
var filtersymbols=[];//筛选符号
|
||||
filtersymbols.push(drr);
|
||||
var data = {
|
||||
"events":[],
|
||||
"eventView":{
|
||||
@ -246,7 +247,7 @@
|
||||
}
|
||||
})
|
||||
//设置一级事件中第三个参数
|
||||
$(document).on('click','.analysis-zhibiao-condition',function(){
|
||||
$(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var index = obj.attr("data-index");
|
||||
@ -262,7 +263,7 @@
|
||||
}
|
||||
})
|
||||
|
||||
$(document).on('click','.ta-property-select',function(){
|
||||
$(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var index = obj.attr("data-index");
|
||||
@ -278,7 +279,7 @@
|
||||
|
||||
})
|
||||
|
||||
$(document).on('click','.analysis-choicetypename',function(){
|
||||
$(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var index = $(this).attr("data-index");
|
||||
@ -309,8 +310,9 @@
|
||||
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
|
||||
var drr=[];
|
||||
filtersymbols.push(drr);
|
||||
console.log(filtersymbols)
|
||||
screentypearr[index] = dataArr[0]['category'][0]["event_filter"];
|
||||
filtersymbols[index][filtersymbols[index].length] = dataArr[0]['category'][0]["event_filter"][0]["category"][0]["category"];
|
||||
filtersymbols[index][filtersymbols[index].length ] = dataArr[0]['category'][0]["event_filter"][0]["category"][0]["category"];
|
||||
|
||||
})
|
||||
|
||||
@ -351,8 +353,13 @@
|
||||
|
||||
// 删除二级筛选项
|
||||
$(document).on('click','.analysis-zhibiao-list-del',function(){
|
||||
var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
|
||||
$("#"+id).remove();
|
||||
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
|
||||
// $("#"+id).remove();
|
||||
var index = $(this).attr("data-index");
|
||||
var indexs = $(this).attr("data-indexs");
|
||||
filtersymbols[index].splice(indexs,1);
|
||||
data.events[index]['filters'].splice(indexs,1);
|
||||
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
|
||||
})
|
||||
|
||||
// 添加指标
|
||||
@ -414,7 +421,7 @@
|
||||
|
||||
})
|
||||
|
||||
$(document).on('click','.analysis-custom-event-box .analysis-custom-event-txt',function(){
|
||||
$(document).off('click','.analysis-custom-event-box .analysis-custom-event-txt').on('click','.analysis-custom-event-box .analysis-custom-event-txt',function(){
|
||||
$(this).css("border-bottom","1px solid #3d90ff");
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
@ -456,7 +463,7 @@
|
||||
})
|
||||
})
|
||||
|
||||
$(document).on("click",".analysis-granularity",function(){
|
||||
$(document).off('click','.analysis-granularity').on("click",".analysis-granularity",function(){
|
||||
var obj = $(this);
|
||||
var offset = obj.offset();
|
||||
var type = obj.attr("data_type");
|
||||
|
||||
@ -66,6 +66,7 @@
|
||||
$(document).on("click",".zhuang_conetnt .ta-pso-line",function(){
|
||||
var index = $(this).attr("data-index");
|
||||
var indexs = $(this).attr("data-indexs");
|
||||
console.log(data[index]['category'])
|
||||
var valdata = {
|
||||
'title':$(this).attr('data-title'),
|
||||
'id':$(this).attr('data-id'),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user