From bacea4ba99c41741ade28f80f4c98ca7876dd938 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 27 May 2021 20:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=88=A0=E9=99=A4=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/pages/analysis.html | 2 +-
web/src/x.min.js | 24 ++++++++++++++++--------
web/srczip/logic/analysis.js | 23 +++++++++++++++--------
web/srczip/logic/category.js | 1 +
4 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index 720dabb..126f8d3 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -230,7 +230,7 @@
{{items.column_name}}
{{items.comparator_name}}
-
+
{{# }); }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 7659ab2..e35c1f3 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -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'),
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 6bc0339..5723db7 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -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");
diff --git a/web/srczip/logic/category.js b/web/srczip/logic/category.js
index d143a5e..fb6b8dd 100644
--- a/web/srczip/logic/category.js
+++ b/web/srczip/logic/category.js
@@ -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'),