From 3d0bf519361f5a9b25db6a7d1951b6b819fefd0f Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Fri, 6 May 2022 15:16:46 +0800 Subject: [PATCH] 1 --- web/pages/3rmodel.html | 2 +- web/pages/analysis.html | 6 +++--- web/pages/distribution.html | 2 +- web/pages/funnel.html | 2 +- web/src/x.min.js | 25 +++++++++++++++++++------ web/srczip/logic/3rmodel.js | 2 +- web/srczip/logic/analysis.js | 2 +- web/srczip/logic/funnelanalysis.js | 6 +++--- web/srczip/logic/routeanalysis.js | 15 ++++++++++++++- web/static/css/analysis.css | 5 ++++- 10 files changed, 48 insertions(+), 19 deletions(-) diff --git a/web/pages/3rmodel.html b/web/pages/3rmodel.html index 6cce211..49d4eb7 100644 --- a/web/pages/3rmodel.html +++ b/web/pages/3rmodel.html @@ -301,7 +301,7 @@
-
+
{{# }); }} diff --git a/web/pages/analysis.html b/web/pages/analysis.html index a169da7..bbbd930 100644 --- a/web/pages/analysis.html +++ b/web/pages/analysis.html @@ -307,7 +307,7 @@ {{# } }} -
+
{{# }); }} @@ -361,7 +361,7 @@
-
+
{{# }); }} @@ -380,7 +380,7 @@ -
+
diff --git a/web/pages/distribution.html b/web/pages/distribution.html index eba000e..1c234b4 100644 --- a/web/pages/distribution.html +++ b/web/pages/distribution.html @@ -113,7 +113,7 @@
- +
diff --git a/web/pages/funnel.html b/web/pages/funnel.html index 54ffd3f..d3fd9d5 100644 --- a/web/pages/funnel.html +++ b/web/pages/funnel.html @@ -35,7 +35,7 @@
-
+
{{# }); }} diff --git a/web/src/x.min.js b/web/src/x.min.js index af77974..d14894e 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -1999,7 +1999,7 @@ var X = window.X || { }); // 删除二级筛选项 - $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){ + $(document).off('click','.3rmodel-analysis-zhibiao-list-del').on('click','.3rmodel-analysis-zhibiao-list-del',function(){ // var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum"); // $("#"+id).remove(); var index = $(this).attr("data-index"); @@ -4169,7 +4169,7 @@ var X = window.X || { }); // 删除二级筛选项 - $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){ + $(document).off('click','.onclick-analysis-zhibiao-list-del').on('click','.onclick-analysis-zhibiao-list-del',function(){ // var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum"); // $("#"+id).remove(); var index = $(this).attr("data-index"); @@ -9497,7 +9497,7 @@ var X = window.X || { "comparatorName":"等于", "ftv":[], "strftv":"", - "table_type":groupitemeventsdata[0]['category'][0]['data_type'], + "tableType":groupitemeventsdata[0]['category'][0]['data_type'], "timeUnit":"" } data['events'][index]['filts'].push(arr); @@ -9518,7 +9518,7 @@ var X = window.X || { }); //删除指定筛选 - $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){ + $(document).off('click','.funnel-analysis-zhibiao-list-del').on('click','.funnel-analysis-zhibiao-list-del',function(){ var index = $(this).attr("data-index"); var indexs = $(this).attr("data-twonum"); data['events'][index]['filts'].splice(indexs,1); @@ -9560,7 +9560,7 @@ var X = window.X || { data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring; data['events'][index]['filts'][indexs]['columnName'] = val.id; data['events'][index]['filts'][indexs]['data_type'] = val.type; - data['events'][index]['filts'][indexs]['table_type'] = val.table_type; + data['events'][index]['filts'][indexs]['tableType'] = val.table_type; }) }); @@ -13494,7 +13494,7 @@ var X = window.X || { // 添加筛选项 function addscreen(index){ - console.log(groupitemeventsdata); + var arr = { "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示 "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id @@ -13688,6 +13688,13 @@ var X = window.X || { } }); + $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){ + var index = $(this).attr('data-twonum'); + data['events']['source_event']['filts'].splice(index,1); + X.template("route","event-roue-event",data['events']['source_event']); + }); + + // 时间粒度 var timeParticleSizearr = [ {'title':'秒','id':'second'}, @@ -13816,6 +13823,12 @@ var X = window.X || { } ] }); + + // 图表单击事件 + myChart.setOption(option); + myChart.on('click', function (params) { + console.log(params); + }); }; // 返回 diff --git a/web/srczip/logic/3rmodel.js b/web/srczip/logic/3rmodel.js index d0126be..d1e1064 100644 --- a/web/srczip/logic/3rmodel.js +++ b/web/srczip/logic/3rmodel.js @@ -392,7 +392,7 @@ }); // 删除二级筛选项 - $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){ + $(document).off('click','.3rmodel-analysis-zhibiao-list-del').on('click','.3rmodel-analysis-zhibiao-list-del',function(){ // var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum"); // $("#"+id).remove(); var index = $(this).attr("data-index"); diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index 17002ba..0cc8a7d 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -487,7 +487,7 @@ }); // 删除二级筛选项 - $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){ + $(document).off('click','.onclick-analysis-zhibiao-list-del').on('click','.onclick-analysis-zhibiao-list-del',function(){ // var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum"); // $("#"+id).remove(); var index = $(this).attr("data-index"); diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js index 5388012..f12716e 100644 --- a/web/srczip/logic/funnelanalysis.js +++ b/web/srczip/logic/funnelanalysis.js @@ -160,7 +160,7 @@ "comparatorName":"等于", "ftv":[], "strftv":"", - "table_type":groupitemeventsdata[0]['category'][0]['data_type'], + "tableType":groupitemeventsdata[0]['category'][0]['data_type'], "timeUnit":"" } data['events'][index]['filts'].push(arr); @@ -181,7 +181,7 @@ }); //删除指定筛选 - $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){ + $(document).off('click','.funnel-analysis-zhibiao-list-del').on('click','.funnel-analysis-zhibiao-list-del',function(){ var index = $(this).attr("data-index"); var indexs = $(this).attr("data-twonum"); data['events'][index]['filts'].splice(indexs,1); @@ -223,7 +223,7 @@ data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring; data['events'][index]['filts'][indexs]['columnName'] = val.id; data['events'][index]['filts'][indexs]['data_type'] = val.type; - data['events'][index]['filts'][indexs]['table_type'] = val.table_type; + data['events'][index]['filts'][indexs]['tableType'] = val.table_type; }) }); diff --git a/web/srczip/logic/routeanalysis.js b/web/srczip/logic/routeanalysis.js index 2d78bde..d463ec2 100644 --- a/web/srczip/logic/routeanalysis.js +++ b/web/srczip/logic/routeanalysis.js @@ -181,7 +181,7 @@ // 添加筛选项 function addscreen(index){ - console.log(groupitemeventsdata); + var arr = { "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示 "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id @@ -375,6 +375,13 @@ } }); + $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){ + var index = $(this).attr('data-twonum'); + data['events']['source_event']['filts'].splice(index,1); + X.template("route","event-roue-event",data['events']['source_event']); + }); + + // 时间粒度 var timeParticleSizearr = [ {'title':'秒','id':'second'}, @@ -503,6 +510,12 @@ } ] }); + + // 图表单击事件 + myChart.setOption(option); + myChart.on('click', function (params) { + console.log(params); + }); }; // 返回 diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css index 3842b38..32c7752 100644 --- a/web/static/css/analysis.css +++ b/web/static/css/analysis.css @@ -56,7 +56,10 @@ .analysis-background { border: 1px solid #f0f2f5; background-color: #fff !important; } /* .analysis-con-left-screen-list:hover > .analysis-zhibiao-list .analysis-zhibiao-list-type2 { background-color: #ffffff; } .analysis-con-left-screen-list:hover > .analysis-zhibiao-list .analysis-zhibiao-list-type1 { background-color: #ffffff; } */ -.analysis-con-left-screen-list:hover > .analysis-con-left-screen-list-right-box{ display: block; margin-left: 286px; margin-top: 8px; } +.analysis-con-left-screen-list:hover > .analysis-con-left-screen-list-right-box{ display: block; margin-top: 8px; } +.analysis-fenxi-left-box { margin-left: 286px; } + + .analysis-echarts { width: 100%; height: 400px; } .eventsplit:hover { color: #4fa1ff; cursor: pointer; } .eventsplit-box { padding: 0 8px; margin: 8px 8px; font-size: 13px; margin-bottom: 0; background-color: #f0f2f5; }