From 7b6478c46643ce6be32e68d5081e3350b9886604 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Mon, 6 Sep 2021 18:24:56 +0800
Subject: [PATCH] 11

---
 web/pages/analysis.html             |    6 +-
 web/pages/globalfilter.html         |    2 +-
 web/pages/grouped.html              |    2 +-
 web/pages/ltvmodel.html             |    2 +-
 web/pages/retained.html             |    9 +-
 web/src/x.min.js                    | 1062 ++++++++++++---------------
 web/srczip/common.js                |   13 +-
 web/srczip/logic/analysis.js        |  251 +++----
 web/srczip/logic/attribute.js       |   36 +-
 web/srczip/logic/dashboard.js       |    6 +-
 web/srczip/logic/distribution.js    |   28 +-
 web/srczip/logic/funnelanalysis.js  |  223 +++---
 web/srczip/logic/groupeditemspop.js |   10 +-
 web/srczip/logic/ltvmodel.js        |   44 +-
 web/srczip/logic/retained.js        |  266 +++----
 web/srczip/logic/routeanalysis.js   |  185 ++---
 web/static/css/analysis.css         |    5 +-
 web/static/img/fanhui.png           |  Bin 0 -> 344 bytes
 18 files changed, 946 insertions(+), 1204 deletions(-)
 create mode 100644 web/static/img/fanhui.png

diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index 41cd533..e226336 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -24,7 +24,7 @@
             <div class="analysis-navigation-bar-right-img sqlquery" title="查看条件代码">
                 <i class="iconfont" style="font-size: 18px; color: #67729d;">&#xe727;</i>
             </div>
-            <div class="analysis-navigation-bar-right-img" title="以页面格式下载全量数据">
+            <div class="analysis-navigation-bar-right-img download-table" title="以页面格式下载全量数据">
                 <img src="./static/img/xiazai.png">
             </div>
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
@@ -246,7 +246,7 @@
                     <span style="margin-left: 6px;">的</span>
                     <div id="analysis-zhibiao-list-type2-{{index}}" class="analysis-zhibiao-list-type2 analysis-background" data-index="{{index}}">{{item.event_attr}}</div>
                     {{#  if(item.event_attr_id != "*"){ }}
-                    <div id="analysis-zhibiao-list-type3-{{index}}" class="analysis-zhibiao-list-type3 analysis-background analysis-zhibiao-condition" data-index="{{index}}">{{item.analysisname}}</div>
+                    <div id="analysis-zhibiao-list-type3-{{index}}" class="analysis-zhibiao-list-type3 analysis-background analysis-zhibiao-condition" data-index="{{index}}" data-type="{{item.event_attr_type}}">{{item.analysisname}}</div>
                     {{#  } else { }}
                     <!-- <div id="analysis-zhibiao-list-type3-{{index}}" class="analysis-zhibiao-list-type3 analysis-background analysis-zhibiao-condition" data-index="{{index}}"></div> -->
                     {{#  } }} 
@@ -269,7 +269,7 @@
                         {{#  layui.each(item.filts, function(indexs, items){ }}
                             <div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{index}}-{{indexs}}">
                                 <div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.columnDesc}}</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-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}" data-type="{{items.data_type}}">{{items.comparator_name}}</div>
                                 <!-- {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
                                 <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>
                                 <!-- {{#  } }}  -->
diff --git a/web/pages/globalfilter.html b/web/pages/globalfilter.html
index 1c99cff..f2da9ea 100644
--- a/web/pages/globalfilter.html
+++ b/web/pages/globalfilter.html
@@ -2,7 +2,7 @@
 <script id="analysis-overall-situation-list-box-dot" type="text/html">
     {{#  layui.each(d, function(index, item){ }}
         <div class="analysis-overall-situation-list">
-            <div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.columnName}}</div>
+            <div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.columnDesc}}</div>
             <div class="analysis-overall-situation-fuhao" id="analysis-overall-situation-fuhao-{{index}}" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
             {{#  if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
                 <div class="analysis-overall-situation-input" > 
diff --git a/web/pages/grouped.html b/web/pages/grouped.html
index e2a284c..ec4eaa6 100644
--- a/web/pages/grouped.html
+++ b/web/pages/grouped.html
@@ -5,7 +5,7 @@
                 <div class="analysis-num bgcolor">{{index}}</div>
                 <div class="analysis-ant-dropdown-trigger" data-index="{{index}}">
                     <!-- <img src="./static/img/shaix2.png"/> -->
-                    <span>{{item.columnName}}</span>
+                    <span>{{item.columnDesc}}</span>
                 </div>
             </div>
             <!-- <div class="analysis-ta-property-range analysis-granularity" data-index="{{index}}" data-type="{{item.data_type}}"> <img src="./static/img/shezhi2.png"> </div> -->
diff --git a/web/pages/ltvmodel.html b/web/pages/ltvmodel.html
index f3bf2d8..995c994 100644
--- a/web/pages/ltvmodel.html
+++ b/web/pages/ltvmodel.html
@@ -18,7 +18,7 @@
             <div class="analysis-navigation-bar-right-img sqlquery" title="查看条件代码">
                 <i class="iconfont" style="font-size: 18px; color: #67729d;">&#xe727;</i>
             </div>
-            <div class="analysis-navigation-bar-right-img" title="以页面格式下载全量数据">
+            <div class="analysis-navigation-bar-right-img download-table" title="以页面格式下载全量数据">
                 <img src="./static/img/xiazai.png">
             </div>
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
diff --git a/web/pages/retained.html b/web/pages/retained.html
index 31f0cae..45e03ec 100644
--- a/web/pages/retained.html
+++ b/web/pages/retained.html
@@ -18,15 +18,16 @@
             <div class="analysis-navigation-bar-right-img sqlquery" title="查看条件代码">
                 <i class="iconfont" style="font-size: 18px; color: #67729d;">&#xe727;</i>
             </div>
-            <div class="analysis-navigation-bar-right-img" title="以页面格式下载全量数据">
+            <div class="analysis-navigation-bar-right-img download-table" title="以页面格式下载全量数据">
                 <img src="./static/img/xiazai.png">
             </div>
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
                 <img src="./static/img/baobiao2.png">
             </div>
 
-            <div class="analysis-navigation-bar-right-img" title="返回">
-                <img src="./static/img/baobiao2.png">
+            <div class="analysis-navigation-bar-right-img analysis-fanhui" title="返回">
+                <img src="./static/img/fanhui.png">
+                <span>返回</span>
             </div>
 
         </div>
@@ -122,7 +123,7 @@
 
                         <div class="analtsis-condition-right-box">
                             <!-- <div class="analtsis-condition">指标</div> -->
-                            <div class="analtsis-condition" >显示设置</div>
+                            <div class="analtsis-condition analtsis-condition-xssz" >显示设置</div>
                             <div class="analtsis-chart-switch-box">
                                 <div class="analtsis-chart-switch select-chart" title="数据报表"> <i class="iconfont" style="font-size: 18px; ">&#xe670;</i> </div>
                                 <div class="analtsis-chart-switch  " title="第N日留存"> <i class="iconfont" style="font-size: 18px; ">&#xe601;</i> </div>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 4bc2adc..5bc7f55 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -116,9 +116,9 @@ var X = window.X || {
 
 (function(){
     //本地
-    // var ipurl = "http://10.0.0.77:7889/api/v1/";
+    var ipurl = "http://10.0.0.77:7889/api/v1/";
     //线上
-    var ipurl = "http://139.159.159.3:9865/api/v1/";
+    // var ipurl = "http://139.159.159.3:9865/api/v1/";
 
     //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
     X.loginCache = function(data){
@@ -330,6 +330,11 @@ var X = window.X || {
     };
 
     X.parametersopen = function(data,url,offset,callback){
+        // var innerHeight = window.innerHeight;
+        // if( innerHeight - offset[0] < height){
+        //     offset[0] = offset[0] - (height + 30);
+        // }
+        // console.log(offset);
         X.open({
             type: 1,
             title: false,
@@ -745,7 +750,7 @@ var X = window.X || {
             nname = 'n_outflow';
             pname = 'p_outflow';
         }
-        console.log()
+
         if(data['filter_item_type'] != "all"  && data['filter_item_type'] != "" && data['filter_item_type']){
             var filteritem = data['filter_item'];
             if(data['days'].length >= 7){
@@ -816,7 +821,7 @@ var X = window.X || {
         }
         titdata.unshift("日期",data.title);
         console.log(titdata);
-        console.log(tabledata);
+        console.log(tabledata)
         var dataArr = {
             titledata:titdata,
             condata:tabledata,
@@ -1893,14 +1898,11 @@ var X = window.X || {
 
             var dataArr; //分析指标
             var groupeddata;//分组项
-            var type2data =[],type3data = [];
-            var screentypearr=[]; //筛选项数据
-            var drr = [];
-            screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
-            var filtersymbols=[];//筛选符号
-            filtersymbols.push(drr);
-            var groupitemeventsdata=[]//分组项里的事件
-            var defaultgroupdata //默认添加分组项里的事件
+            var type2data;
+            //var filtersymbols=[];//筛选符号
+            // filtersymbols.push(drr);
+            var defaultgroupdata; //默认添加分组项里的事件
+            var filter_map,quotas_map;
             var data = {
                 "events":[],
                 "eventView":{
@@ -1921,10 +1923,7 @@ var X = window.X || {
                     "zone_time":'8'//时区
                 },
                 "cachedata":{
-                    type2data:[],
-                    type3data:[],
-                    screentypearr:[],
-                    filtersymbols:[],
+                    // filtersymbols:[],
                     groupitemeventsdata:[],
                     defaultgroupdata:[],
                 }
@@ -1969,6 +1968,7 @@ var X = window.X || {
                         "event_name":dataArr[0]['category'][0]['event_name'],
                         "event_attr":"总次数",
                         "event_attr_id":"*",
+                        "event_attr_type":"",
                         "analysisname":'',
                         "analysis":'total_count',
                         "filts":[],//过滤项
@@ -1980,21 +1980,26 @@ var X = window.X || {
                     }
                     data.events.push(defaultindicator);
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
-                    type2data[0]= retdata;
-                    type3data[0]= [];
-                    screentypearr[0]=d.props;
+                    type2data= retdata
                     X.api("data_auth/load_filter_props","post",{event_name:dataArr[0]['category'][0]['event_name']},function(val){
                         defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
 
-                        //从数据看板点击进来触发事件
-                        if(X.DATA.eventid && X.DATA.eventid != ''){
-                            var report_idarr = [];
-                            report_idarr.push(X.DATA.eventid);
-                            X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
-                                backfilldata(d[0]);
+                        X.api("data_auth/filter_map","get",{},function(d){
+                            filter_map = d;
+
+                            X.api('data_auth/quotas_map',"get",{},function(d){
+                                quotas_map = d;
+                                //从数据看板点击进来触发事件
+                                if(X.DATA.eventid && X.DATA.eventid != ''){
+                                    var report_idarr = [];
+                                    report_idarr.push(X.DATA.eventid);
+                                    X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
+                                        backfilldata(d[0]);
+                                    })
+                                }
                             })
-                        }
+
+                        })
 
                     })
                 })
@@ -2043,10 +2048,7 @@ var X = window.X || {
             // 反向填充数据
             function backfilldata(d){
                 data = d.query;
-                type2data = data.cachedata.type2data;
-                type3data = data.cachedata.type3data;
-                screentypearr = data.cachedata.screentypearr;
-                filtersymbols = data.cachedata.filtersymbols;
+                // filtersymbols = data.cachedata.filtersymbols;
 
                 baobiaodata = d;
                
@@ -2059,7 +2061,7 @@ var X = window.X || {
                 X.laytpldata("#analysis-con-left-screen-list-dot",d.query.events,".analysis-con-left-screen-list-box");
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",d.query.eventView.groupBy,".analysis-gpmain___3YGfw");
                 X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filts'],".analysis-overall-situation-list-box");
-                analysisdown();
+                // analysisdown();
                 calculationdata();
             }
 
@@ -2098,10 +2100,8 @@ var X = window.X || {
                 data.events.push(arr);
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                 var num = data.events.length;
-                type2data[num] = type2data[index];
-                type3data[num] = type3data[index];
-                screentypearr[num] = screentypearr[index];
-                filtersymbols[num] = filtersymbols[index];
+                
+                // filtersymbols[num] = filtersymbols[index];
             });
 
             //重命名指标
@@ -2131,15 +2131,7 @@ var X = window.X || {
                     obj.html(htmlstring);
                     data['events'][index]['event_desc'] = val.id;
                     data['events'][index]['event_name'] = val.name;
-                    X.api("data_auth/load_prop_quotas","post",{event_name:val.name},function(d){
-                        var retdata = d.staid_quots.concat(d.props);
-                        type2data[index]=retdata;
-                        screentypearr[index] = d.props;
-                    })
-
-                    X.api("data_auth/load_filter_props","post",{event_name:val.name},function(d){
-                        groupitemeventsdata[index] = d;
-                    })
+                   
 
                     
                 })
@@ -2150,18 +2142,19 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 if(type2data.length >0){
-                    X.querycriteriapop(type2data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                    X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                         if(val != undefined){
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
                             
-                            type3data[index]=val.category;
                             data['events'][index]['event_attr'] = val.title;
                             data['events'][index]['event_attr_id'] = val.id;
-                            if(val.category &&  val.category.length > 0){
+                            data['events'][index]['event_attr_type'] = val.data_type;
+
+                            if(val.data_type && val.data_type != null){
                                 $("#analysis-zhibiao-list-type3-"+index).show();
-                                $("#analysis-zhibiao-list-type3-"+index).html(val.category[0].title);
-                                data['events'][index]['analysisname'] = val.category[0].title;
-                                data['events'][index]['analysis'] = val.category[0].id;
+                                $("#analysis-zhibiao-list-type3-"+index).html(quotas_map[val.data_type][0]['title']);
+                                data['events'][index]['analysisname'] = quotas_map[val.data_type][0]['title'];
+                                data['events'][index]['analysis'] = quotas_map[val.data_type][0]['id'];
                             }else {
                                 $("#analysis-zhibiao-list-type3-"+index).hide();
                                 data['events'][index]['analysis'] = val.analysis;
@@ -2176,16 +2169,13 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                var indexs = obj.attr("data-indexs");
-                if(type3data.length>0){
-                    if(type3data[index].length > 0){
-                        X.querycriteriapop(type3data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
-                            $("#analysis-zhibiao-list-type3-"+index).html(val.title);
-                            data['events'][index]['analysisname'] = val.title;
-                            data['events'][index]['analysis'] = val.id;
-                        })
-                    }
-                }
+                var type = data['events'][index]['event_attr_type'];
+
+                X.parametersopen(quotas_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $("#analysis-zhibiao-list-type3-"+index).html(val.title);
+                    data['events'][index]['analysisname'] = val.title;
+                    data['events'][index]['analysis'] = val.id;
+                })
             });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
@@ -2193,10 +2183,10 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(screentypearr[index],'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    filtersymbols[index][indexs] = val.category;
+                    // filtersymbols[index][indexs] = val.category;
                     data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
                     data['events'][index]['filts'][indexs]['columnName'] = val.id;
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
@@ -2210,7 +2200,8 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events'][index]['filts'][indexs]['data_type'];
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
@@ -2233,8 +2224,8 @@ var X = window.X || {
                     var arr = {
                         "columnDesc":d[0]['category'][0]['title'],//事件中文显示    
                         "columnName":d[0]['category'][0]['id'],//事件id
-                        "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
-                        "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
+                        "comparator_name":filter_map[d[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
+                        "comparator":filter_map[d[0]['category'][0]['data_type']][0]['id'],//符号id
                         "data_type":d[0]['category'][0]['data_type'],
                         "ftv":[],//条件
                         "strftv":'',//字符串显示条件
@@ -2243,9 +2234,8 @@ var X = window.X || {
                     data['events'][index]['filts'].push(arr);
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                     var drr=[];
-                    filtersymbols.push(drr);
-                    screentypearr[index] = d;
-                    filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
+                    // filtersymbols.push(drr);
+                    // filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
                 })
             };
 
@@ -2283,6 +2273,9 @@ var X = window.X || {
             // 添加条件按钮
             $(document).on('click',".analysis-zhibiao-updata",function(){
                 // addindex();
+                var obj = $(this);
+                var index = obj.attr("data-index");
+                addscreen(index);
             });
 
             // 删除二级筛选项
@@ -2291,7 +2284,7 @@ var X = window.X || {
                 // $("#"+id).remove();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                filtersymbols[index].splice(indexs,1);
+                // filtersymbols[index].splice(indexs,1);
                 data.events[index]['filts'].splice(indexs,1);
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
             });
@@ -2303,6 +2296,7 @@ var X = window.X || {
                     "event_name":dataArr[0]['category'][0]['event_name'],
                     "event_attr":"总次数",
                     "event_attr_id":"*",
+                    "event_attr_type":"",
                     "analysisname":'',
                     "analysis":'total_count',
                     "filts":[],//过滤项
@@ -2316,18 +2310,14 @@ var X = window.X || {
 
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                 var index = data.events.length - 1;
-                type2data[index]= retdata;
-                type3data[index]= [];
+               
                 $(".analysis-del").show() //显示删除按钮
                 var drr = [];
-                screentypearr.push(drr);
                 if(data.events.length > 1){
                     $(".analysis-overall").show();
                 }else {
                     $(".analysis-overall").hide();
                 }
-                screentypearr[index]=props;
-                groupitemeventsdata.push(defaultgroupdata);
             };
 
             //添加按钮
@@ -2384,7 +2374,7 @@ var X = window.X || {
                     {title:'百分比',id:'percent'},
                     {title:'取整',id:'integer'},
                 ];
-                X.querycriteriapop(downlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen(downlist,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['format'] = val.id;
@@ -2398,14 +2388,13 @@ var X = window.X || {
             var cat = "event";
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
                 var index = data['eventView']['groupBy'].length;
-                var screentypedata = filteringdata();
-                for(let i in screentypedata){
-                    if(screentypedata[i]['category'].length > 0){
+                for(let i in defaultgroupdata){
+                    if(defaultgroupdata[i]['category'].length > 0){
                         var drr = {
-                            "columnDesc":screentypedata[i]['category'][index]['title'],//事件中文显示
-                            "columnName":screentypedata[i]['category'][index]['id'],//事件id
-                            'data_type':screentypedata[i]['category'][index]['data_type'],//类型
-                            'tableType': screentypedata[i]['id'],
+                            "columnDesc":defaultgroupdata[i]['category'][index]['title'],//事件中文显示
+                            "columnName":defaultgroupdata[i]['category'][index]['id'],//事件id
+                            'data_type':defaultgroupdata[i]['category'][index]['data_type'],//类型
+                            'tableType': defaultgroupdata[i]['id'],
                             "ftv":[],//条件
                             "section":''//区间
                         }
@@ -2422,7 +2411,7 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     data.eventView.groupBy[index]['columnDesc'] = val.title;
@@ -2497,45 +2486,22 @@ var X = window.X || {
 
             });
 
-            // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            };
-
             // 全局筛选
             var filtsftvdata=[];
             $(document).on('click','.analysis-overall-situation-add',function(){
-
-                var screentypedata = filteringdata();
                 var drr={
-                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示 columnDesc
-                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
-                    'data_type':screentypedata[0]['category'][0]['data_type'],//类型
+                    "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                    "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
+                    'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "tableType":screentypedata[0]['id']
+                    "tableType":defaultgroupdata[0]['id']
                 };
                 data['eventView']['filts'].push(drr);//上传全局数据
-                filtsftvdata.push(screentypedata[0]['category'][0]['category'])
+                filtsftvdata.push(defaultgroupdata[0]['category'][0]['category'])
 
                 $(".analysis-overall-situation-left-box").show();
 
@@ -2545,24 +2511,40 @@ var X = window.X || {
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                analysisdown();
+                // analysisdown();
             });
 
             //循环给条件框渲染下拉框
-            function analysisdown(){
-                for(let i in data['eventView']['filts']){
-                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
-                        $(this).html(val.title);
-                        data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator'] = val.id;
-                        if(val.id == "range"){
-                            data['eventView']['filts'][i]['ftv'] = [-1,1];
-                        }
-                        X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                        analysisdown();
-                    })
-                }
-            };
+            // function analysisdown(){
+            //     for(let i in data['eventView']['filts']){
+            //         X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+            //             $(this).html(val.title);
+            //             data['eventView']['filts'][i]['comparator_name'] = val.title;
+            //             data['eventView']['filts'][i]['comparator'] = val.id;
+            //             if(val.id == "range"){
+            //                 data['eventView']['filts'][i]['ftv'] = [-1,1];
+            //             }
+            //             X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
+            //             analysisdown();
+            //         })
+            //     }
+            // };
+
+            $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['eventView']['filts'][index]['data_type'];
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['eventView']['filts'][index]['comparator_name'] = val.title;
+                    data['eventView']['filts'][index]['comparator'] = val.id;
+                    if(val.id == "range"){
+                        data['eventView']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
+                })
+            }); 
 
             $(document).on('click',".analysis-overall-situation-del",function(){
                 var index = $(this).attr("data-index");
@@ -2575,7 +2557,7 @@ var X = window.X || {
                     // $(".analysis-overall-situation-left-box").hide();
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                analysisdown();
+                // analysisdown();
             });
 
             // 全局属性选择
@@ -2583,7 +2565,7 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
                     data['eventView']['filts'][index]['columnDesc'] = val.title;
                     data['eventView']['filts'][index]['columnName'] = val.id;
@@ -2593,7 +2575,7 @@ var X = window.X || {
                     data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
                     X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                    analysisdown();
+                    // analysisdown();
                 })
             });
 
@@ -2926,16 +2908,20 @@ var X = window.X || {
                 var titledata,condata=[];
                 for(let i in d){
                     titledata= $.extend(true,[],d[0]['date_range']) ;
-                    titledata.unshift('指标','阶段总和');
                     if(d[i]['groups']['length'] != 0){
+                        titledata.unshift('指标','分组','阶段总和');
                         for(let j in d[i]['values']){
                             var arr;
-                            arr = $.extend(true,[],d[i].values[j])
+                            arr = $.extend(true,[],d[i].values[j]);
                             arr.unshift(d[i]['event_name'],d[i]['sum'][j]);
                             condata.push(arr);
                         }
+                        for(let j in condata){
+                            condata[j].splice(1,0,d[i]['groups'][j]);
+                        }
                         
                     }else {
+                        titledata.unshift('指标','阶段总和');
                         var arr;
                         arr = $.extend(true,[],d[i].values[0])
                         arr.unshift(d[i]['event_name'],d[i]['sum'][0]);
@@ -2943,18 +2929,12 @@ var X = window.X || {
                     }
                 }
                 // console.log(titledata);
-                console.log(condata);
+                // console.log(condata);
                 X.laytpldata("#table-fenxi-th-dot",titledata,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",condata ,".table-fenxi-td");
             };
 
             function calculationdata(){
-                data['cachedata']['type2data'] = type2data;
-                data['cachedata']['type3data'] = type3data;
-                data['cachedata']['screentypearr'] = screentypearr;
-                data['cachedata']['filtersymbols'] = filtersymbols;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['defaultgroupdata'] = defaultgroupdata;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -2995,6 +2975,12 @@ var X = window.X || {
                 }
             });
 
+            // 下载
+            $(document).off('click','.download-table').on('click','.download-table',function(){
+                console.log(11111);
+                X.download('ck/event_model_export',data,'事件分析');
+            });
+
         },
 
         // 保存报表
@@ -3178,7 +3164,6 @@ var X = window.X || {
                     title:'用户属性'
                 }
                 user_data.push(arr);
-                // console.log(user_data);
 
                 X.api("data_auth/quotas_map","get",{},function(val){
                     quotas_map = val;
@@ -3219,7 +3204,7 @@ var X = window.X || {
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
                 var offset = obj.offset();
-                X.querycriteriapop(user_attr,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen(user_attr,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     obj.html(val.title);
                     data['events']['quota']  = val.id;
                     data['events']['quotaDesc']  = val.title;
@@ -3238,7 +3223,7 @@ var X = window.X || {
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
-                X.querycriteriapop(quotas_map[data['events']['quotatype']],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen(quotas_map[data['events']['quotatype']],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     obj.html(val.title);
                     data['events']['analysis']  = val.id;
                     data['events']['analysisDesc']  = val.title;
@@ -3247,16 +3232,16 @@ var X = window.X || {
             });
 
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname input',function(){
-                // console.log($(this).val());
                 data['events']['eventNameDisplay'] = $(this).val();
             });
 
             // 分组项
             X.template("grouped","shushi",data['eventView']['groupBy']);
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
+                console.log(user_data);
                 var arr = {
-                    "columnName": user_data[0]['category'][0]['title'],//事件中文显示
-                    "column_id": user_data[0]['category'][0]['id'],//事件id
+                    "columnDesc": user_data[0]['category'][0]['title'],//事件中文显示
+                    "columnName": user_data[0]['category'][0]['id'],//事件id
                     'data_type': user_data[0]['category'][0]['data_type'],//类型
                     'table_type': "",
                     "ftv":'',//条件
@@ -3286,8 +3271,8 @@ var X = window.X || {
                 X.querycriteriapop(user_data,'category',offset.left,offset.top+obj.height(),function(val){
                     // console.log(val);
                     obj.html(val.title);
-                    data['eventView']['groupBy'][index]['column_id']  = val.id;
-                    data['eventView']['groupBy'][index]['columnName']  = val.title;
+                    data['eventView']['groupBy'][index]['columnName']  = val.id;
+                    data['eventView']['groupBy'][index]['columnDesc']  = val.title;
                     data['eventView']['groupBy'][index]['data_type']  = val.type;
                     X.template("grouped","shushi",data['eventView']['groupBy']);
                 })
@@ -3307,8 +3292,8 @@ var X = window.X || {
             //且用户符合
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var drr={
-                    "columnName":user_data[0]['category'][0]['title'],//事件中文显示
-                    "column_id":user_data[0]['category'][0]['id'],//事件id
+                    "columnDesc":user_data[0]['category'][0]['title'],//事件中文显示
+                    "columnName":user_data[0]['category'][0]['id'],//事件id
                     'data_type':user_data[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
@@ -3346,8 +3331,8 @@ var X = window.X || {
 
                 X.querycriteriapop(user_data,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    data['events']['filts'][index]['column_id']  = val.id;
-                    data['events']['filts'][index]['columnName']  = val.title;
+                    data['events']['filts'][index]['columnName']  = val.id;
+                    data['events']['filts'][index]['columnDesc']  = val.title;
                     data['events']['filts'][index]['data_type']  = val.type;
                     X.template("globalfilter","xinwei-whole",data['events']['filts']);
                 })
@@ -3359,7 +3344,7 @@ var X = window.X || {
                 var offset = obj.offset();
                 // console.log(filter_map);
                 var filter_type = data['events']['filts'][index]['data_type'];
-                X.querycriteriapop( filter_map[filter_type] ,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen( filter_map[filter_type] ,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     obj.html(val.title);
                     data['events']['filts'][index]['comparator']  = val.id;
                     data['events']['filts'][index]['comparator_name']  = val.title;
@@ -3407,10 +3392,7 @@ var X = window.X || {
             });
 
             function calculationdata(){
-                data['cachedata']['user_attr'] = user_attr;
-                data['cachedata']['quotas_map'] = quotas_map;
-                data['cachedata']['filter_map'] = filter_map;
-                data['cachedata']['user_data'] = user_data;
+
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -3558,12 +3540,6 @@ var X = window.X || {
             // 反向填充数据
             function backfilldata(d){
                 data = d.query;
-                console.log(d);
-
-                user_attr = data.cachedata.user_attr;
-                quotas_map = data.cachedata.quotas_map;
-                filter_map = data.cachedata.filter_map;
-                user_data = data.cachedata.user_data;
 
                 baobiaodata = d;
                
@@ -3867,8 +3843,6 @@ var X = window.X || {
                 // X.template("toptab","analysis-zhanwei",d);
             });
 
-            
-
             // $(".username").html(X.DATA.userinfo.name);
 
             // 选择项目
@@ -4190,7 +4164,7 @@ var X = window.X || {
                 var name = obj.attr('data-name');
 
                 X.parametersopen(X['DATA']['screenlist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
-
+                    console.log(d);
                     var reportid = [];
                     reportid.push(id);
                     X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
@@ -4541,7 +4515,7 @@ var X = window.X || {
                         X.pageLogic['dashboard'].gettabledata();
                     })
                 }else if(d.id == 'export'){
-                    X.download('ck/event_model_export',{report_id:eventdata.id},eventdata.name);
+                    X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
                 }else {
 
                     layer.confirm('确认移除['+ eventdata.name + ']', {
@@ -4907,10 +4881,10 @@ var X = window.X || {
                     // console.log(d);
                     if(d){
                         data = d.query;
-                        type2data = data.cachedata.type2data;
-                        type3data = data.cachedata.type3data;
-                        screentypearr = data.cachedata.screentypearr;
-                        filtersymbols = data.cachedata.filtersymbols;
+                        // type2data = data.cachedata.type2data;
+                        // type3data = data.cachedata.type3data;
+                        // screentypearr = data.cachedata.screentypearr;
+                        // filtersymbols = data.cachedata.filtersymbols;
     
                         X.template("userpar","userpar-event",data['events']); 
                         X.template("grouped","shushi",data['eventView']['groupBy']);
@@ -4986,7 +4960,6 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 if(type2data.length >0){
-                    // console.log(type2data);
                     X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                         if(val != undefined){
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
@@ -5145,8 +5118,8 @@ var X = window.X || {
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
                 var arr = {
-                    "columnName": "#account_id",//事件中文显示
-                    "column_id": "#account_id",//事件id
+                    "columnDesc": "#account_id",//事件中文显示
+                    "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
                     'table_type': "event",
                     "ftv":"",//条件
@@ -5163,8 +5136,8 @@ var X = window.X || {
                 X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['columnName'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
                 });
@@ -5187,12 +5160,11 @@ var X = window.X || {
 
             var querydata;
             function distributiondata(){
-                data['cachedata']['eventdata'] = eventdata;
-                data['cachedata']['type2data'] = type2data;
-                data['cachedata']['type3data'] = type3data;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtersymbols'] = filtersymbols;
-                data['cachedata']['screentypearr'] = screentypearr;
+                // data['cachedata']['type2data'] = type2data;
+                // data['cachedata']['type3data'] = type3data;
+                // data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
+                // data['cachedata']['filtersymbols'] = filtersymbols;
+                // data['cachedata']['screentypearr'] = screentypearr;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -5672,13 +5644,7 @@ var X = window.X || {
                         },
                         "events":[
                             
-                        ],
-                        "cachedata":{
-                            eventdata : [],
-                            groupitemeventsdata: [],
-                            filtsftvdata:[],
-                            filtersymbols:[],//筛选符号
-                        }
+                        ]
             };
 
             // 日期渲染
@@ -5698,8 +5664,8 @@ var X = window.X || {
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
             var eventdata;
-            var filtersymbols = [[],[]];//默认两个事件
-            var groupitemeventsdata=[[],[]]//分组项里的事件
+            var groupitemeventsdata//分组项里的事件
+            var filter_map,quotas_map;
             // var screentypearr = [];
 
             X.api("data_auth/my_event","get",{},function(d){
@@ -5722,11 +5688,31 @@ var X = window.X || {
                 ]
                 data['events'] = arr;
                 X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
+
+                    groupitemeventsdata= val;
+
+                    X.api("data_auth/filter_map","get",{},function(d){
+                        filter_map = d;
+
+                        X.api('data_auth/quotas_map',"get",{},function(d){
+                            quotas_map = d;
+                            //从数据看板点击进来触发事件
+                            // if(X.DATA.retentionid && X.DATA.retentionid != ''){
+                            //     var report_idarr = [];
+                            //     report_idarr.push(X.DATA.retentionid);
+                            //     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
+                            //         backfilldata(d[0]);
+                            //     })
+                            // }
+
+                            //初始事件
+                            X.template("funnel","funnel-event",data['events']);
+                        })
+
+                    })
+                    
+                    
                     
-                    groupitemeventsdata[0] = val;
-                    groupitemeventsdata[1] = val;
-                    //初始事件
-                    X.template("funnel","funnel-event",data['events']);
                 })
             })
             
@@ -5758,7 +5744,6 @@ var X = window.X || {
                 data['events'].push(defaultindicator);
                 X.template("funnel","funnel-event",data['events'],function(){
                     var drr = [];
-                    filtersymbols.push(drr);
                     if(data['events'].length > 2){
                         $(".analysis-del").show();
                     }else {
@@ -5785,27 +5770,18 @@ var X = window.X || {
 
             // 添加筛选项
             function addscreen(index){
-                console.log(data);
-                X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["eventName"]},function(d){
-                    console.log(d);
-                    var arr = {
-                        "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
-                        "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
-                        "comparator":"==",
-                        "comparatorName":"等于",
-                        "ftv":[],
-                        "strftv":"",
-                        "table_type":groupitemeventsdata[0][0]['category'][0]['data_type'],
-                        "timeUnit":""
-                    }
-                    data['events'][index]['filts'].push(arr);
-                    var drr=[];
-                    filtersymbols.push(drr);
-                    groupitemeventsdata[index] = d;
-                    filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
-
-                    X.template("funnel","funnel-event",data['events']);
-                })
+                var arr = {
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],
+                    "comparator":"==",
+                    "comparatorName":"等于",
+                    "ftv":[],
+                    "strftv":"",
+                    "table_type":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "timeUnit":""
+                }
+                data['events'][index]['filts'].push(arr);
+                X.template("funnel","funnel-event",data['events']);
             }
 
             $(document).off('click','.analysis-zhibiao-updata').on('click','.analysis-zhibiao-updata',function(){
@@ -5818,8 +5794,6 @@ var X = window.X || {
             $(document).off('click','.analysis-del').on('click','.analysis-del',function(){
                 var index = $(this).attr("data-index");
                 data['events'].splice(index,1);
-                filtersymbols[index].splice(index,1);
-                // groupitemeventsdata[index].splice(index,1);
                 X.template("funnel","funnel-event",data['events']);
             })
             
@@ -5828,7 +5802,6 @@ var X = window.X || {
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-twonum");
                 data['events'][index]['filts'].splice(indexs,1);
-                filtersymbols[index].splice(indexs,1);
                 X.template("funnel","funnel-event",data['events']);
             })
 
@@ -5850,7 +5823,7 @@ var X = window.X || {
                     dataevent['eventDesc'] = val.id;
 
                     X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
-                        groupitemeventsdata[index] = val;
+                        groupitemeventsdata = val;
                     })
                     // console.log(data['events']);
 
@@ -5862,12 +5835,9 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                console.log(groupitemeventsdata);
-                X.querycriteriapop(groupitemeventsdata[index],'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    filtersymbols[index][indexs] = val.category;
                     data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
                     data['events'][index]['filts'][indexs]['columnName'] = val.id;
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
@@ -5876,33 +5846,33 @@ var X = window.X || {
             })
 
             // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            }
+            // function filteringdata(){
+            //     var screentypedata;
+            //     if(groupitemeventsdata.length>1){
+            //         for(var i =0; i < groupitemeventsdata.length - 1; i++){
+            //             if(i == 0){
+            //                 X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
+            //                     screentypedata = d;
+            //                 });
+            //             }else {
+            //                 X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
+            //                     screentypedata = d;
+            //                 })
+            //             }
+            //         }
+            //     }else { 
+            //         screentypedata = groupitemeventsdata[0];
+            //     }
+            //     return screentypedata;
+            // }
             
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                console.log(filtersymbols);
-                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events'][index]['filts'][indexs]['data_type'];
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['filts'][indexs]['comparatorName'] = val.title;
@@ -5921,81 +5891,89 @@ var X = window.X || {
             })
 
             //全局筛选
-            var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = filteringdata();
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
-                    'data_type':screentypedata[0]['category'][0]['data_type'],//类型
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
+                    'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator_id":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":screentypedata[0]['id']
+                    "table_type":groupitemeventsdata[0]['id']
                 };
                 data['eventView']['filts'].push(drr);
-                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             })
 
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
                 data['eventView']['filts'].splice(index,1);
-                filtsftvdata.splice(index,1);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             })
 
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
-                    data['eventView']['filts'][index]['columnName'] = val.title;
-                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
                     data['eventView']['filts'][index]['comparator_id'] = '==';
                     data['eventView']['filts'][index]['table_type'] = val.table_type;
-                    filtsftvdata[index]=val.category;
-                    analysisdown();//渲染下拉框
                 })
             })
 
             //循环给条件框渲染下拉框
-            function analysisdown(){
-                for(let i in data['eventView']['filts']){
-                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
-                        $(this).html(val.title);
-                        data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator_id'] = val.id;
-                        if(val.id == "range"){
-                            data['eventView']['filts'][i]['ftv'] = [-1,1];
-                        }
-                        X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                            analysisdown();
-                        });
-                    })
-                }
-            }
+            // function analysisdown(){
+            //     for(let i in data['eventView']['filts']){
+            //         X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+            //             $(this).html(val.title);
+            //             data['eventView']['filts'][i]['comparator_name'] = val.title;
+            //             data['eventView']['filts'][i]['comparator_id'] = val.id;
+            //             if(val.id == "range"){
+            //                 data['eventView']['filts'][i]['ftv'] = [-1,1];
+            //             }
+            //             X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+            //                 analysisdown();
+            //             });
+            //         })
+            //     }
+            // }
+
+            $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['eventView']['filts'][index]['data_type'];
+
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['eventView']['filts'][index]['comparator_name'] = val.title;
+                    data['eventView']['filts'][index]['comparator_id'] = val.id;
+                    if(val.id == "range"){
+                        data['eventView']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+                })
+            })
+
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
@@ -6006,8 +5984,8 @@ var X = window.X || {
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 var arr = {
-                    "columnName": "#account_id",//事件中文显示
-                    "column_id": "#account_id",//事件id
+                    "columnDesc": "#account_id",//事件中文显示
+                    "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
                     'table_type': "event",
                     "ftv":"",//条件
@@ -6022,12 +6000,12 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['columnName'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
                 })
@@ -6063,10 +6041,6 @@ var X = window.X || {
             })
             var querydata;
             function retaineddata(){
-                data['cachedata']['eventdata'] = eventdata;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtersymbols'] = filtersymbols;
-                data['cachedata']['filtsftvdata'] = filtsftvdata;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -6352,15 +6326,10 @@ var X = window.X || {
                     console.log(d);
                     if(d){
                         data = d.query;
-                        screentypearr = data.cachedata.screentypearr;
-                        filtersymbols = data.cachedata.filtersymbols;
-                        filtsftvdata = data.cachedata.filtsftvdata;
     
                         X.template("funnel","funnel-event",data['events']);
                         X.template("grouped","shushi",data['eventView']['groupBy']);
-                        X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                            analysisdown();
-                        });
+                        X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
               
                         retaineddata();
                     }
@@ -6424,10 +6393,12 @@ var X = window.X || {
             console.log(data);
             if(data!= ''){
                 for(let i in arr){
-                    if(arr[i]['id'] == data['intervalType']){
-                        arr[i]['checked'] = true
-                    }else {
-                        arr[i]['checked'] = false
+                    if(data['intervalType'] != ""){
+                        if(arr[i]['id'] == data['intervalType']){
+                            arr[i]['checked'] = true
+                        }else {
+                            arr[i]['checked'] = false
+                        }
                     }
                 }
                 // 添加
@@ -7212,7 +7183,6 @@ var X = window.X || {
                     
                 ],
                 "cachedata":{
-                    eventdata:[],
                     groupitemeventsdata:[],
                 }
             };
@@ -7241,13 +7211,14 @@ var X = window.X || {
             data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
-            var eventdata;
-            var groupitemeventsdata=[[],[]];//分组项里的事件
+            var groupitemeventsdata,filter_map;//分组项里的事件
 
-            X.api("data_auth/my_event","get",{},function(d){
-                eventdata = d;
-                X.api("data_auth/load_filter_props","post",{event_name:'pay'},function(val){
-                    groupitemeventsdata = val;
+            X.api("data_auth/load_filter_props","post",{event_name:'pay'},function(val){
+                groupitemeventsdata = val;
+
+                
+                X.api("data_auth/filter_map","get",{},function(d){
+                    filter_map = d;
 
                     //从数据看板点击进来触发事件
                     if(X.DATA.ltvid && X.DATA.ltvid != ''){
@@ -7257,17 +7228,16 @@ var X = window.X || {
                             backfilldata(d[0]);
                         })
                     }
-     
                 })
             });
 
             //全局筛选
-            var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var screentypedata = groupitemeventsdata;
+
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
@@ -7281,13 +7251,11 @@ var X = window.X || {
                     return;
                 }
                 data['eventView']['filts'].push(drr);
-                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                console.log(data);
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
@@ -7306,7 +7274,6 @@ var X = window.X || {
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
                 data['eventView']['filts'].splice(index,1);
-                filtsftvdata.splice(index,1);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
@@ -7322,13 +7289,12 @@ var X = window.X || {
                 X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
-                    data['eventView']['filts'][index]['columnName'] = val.title;
-                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
                     data['eventView']['filts'][index]['comparator'] = '==';
                     data['eventView']['filts'][index]['table_type'] = val.table_type;
-                    filtsftvdata[index]=val.category;
                     X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
                 })
             });
@@ -7337,7 +7303,9 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
-                X.querycriteriapop(filtsftvdata[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['eventView']['filts'][index]['data_type'];
+                console.log(type)
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['eventView']['filts'][index]['comparator_name'] = val.title;
@@ -7352,9 +7320,9 @@ var X = window.X || {
             $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");
-                data['eventView']['filts'][index]['ftv'] = [];
+                var valarr = val.split(",");
                 data['eventView']['filts'][index]['strftv'] = val;
-                data['eventView']['filts'][index]['ftv'].push(val);
+                data['eventView']['filts'][index]['ftv']= valarr;
             });
 
             $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){
@@ -7405,7 +7373,6 @@ var X = window.X || {
             });
 
             function retaineddata(){
-                data['cachedata']['eventdata'] = eventdata;
                 data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
                 var dataArr = {
                     eventView: data.eventView,
@@ -7435,7 +7402,6 @@ var X = window.X || {
 
             function backfilldata(d){
                 data = d.query;
-                eventdata = data.cachedata.eventdata;
                 groupitemeventsdata = data.cachedata.groupitemeventsdata;
                 baobiaodata = d
 
@@ -7452,6 +7418,11 @@ var X = window.X || {
                 }
             });
 
+            // 下载
+            $(document).off('click','.download-table').on('click','.download-table',function(){
+                console.log(11111);
+                X.download('ck/ltv_model_export',data,'事件分析');
+            });
 
         }
     };
@@ -8213,15 +8184,7 @@ var X = window.X || {
                 },
                 "events":[
                     
-                ],
-                "cachedata":{
-                    eventdata:[],
-                    initialevent:[],
-                    returnevent:[],
-                    filtersymbols:[],
-                    groupitemeventsdata:[],
-                    type2data:[]
-                }
+                ]
             };
 
             // 重新渲染控件
@@ -8252,18 +8215,16 @@ var X = window.X || {
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
             var eventdata;
-            var filtersymbols = [[],[]];//默认两个事件
-            var groupitemeventsdata=[[],[]]//分组项里的事件
-            var type2data = [[],[]];
+            var groupitemeventsdata;//分组项里的事件
             var querydata; //计算后返回的数据
+            var filter_map,quotas_map;
 
             X.api("data_auth/my_event","get",{},function(d){
                 eventdata = d;
 
                 X.api("data_auth/load_prop_quotas","post",{event_name:eventdata[0]['category'][0]['event_name']},function(val){
                     
-                    type2data[0] = val.props;
-                    type2data[1] = val.props;
+                    type2data = val.props;
 
                     var arr = [{
                         "eventDesc":eventdata[0]['category'][0]['event_desc'],
@@ -8272,8 +8233,8 @@ var X = window.X || {
                         "relation":"and",
                         "relationUser":"and",
                         "renameindicator":"",
-                        "event_attr": type2data[0][0]['title'],
-                        "event_attr_id": type2data[0][0]['id'],
+                        "event_attr": type2data[0]['title'],
+                        "event_attr_id": type2data[0]['id'],
                     },{
                         "eventDesc":eventdata[0]['category'][0]['event_desc'],
                         "eventName":eventdata[0]['category'][0]['event_name'],
@@ -8284,27 +8245,32 @@ var X = window.X || {
                     }]
                     data['events'] = arr;
                     X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
-                        groupitemeventsdata[0] = val;
-                        groupitemeventsdata[1] = val;
+                        groupitemeventsdata = val;
                         //初始事件
                         // console.log(data['events'][0]);
                         X.template("event","initial-event",data['events'][0]);
                         X.template("returnvisitevent","returnvisit-event",data['events'][1]);
 
-                        //从数据看板点击进来触发事件
-                        if(X.DATA.retentionid && X.DATA.retentionid != ''){
-                            var report_idarr = [];
-                            report_idarr.push(X.DATA.retentionid);
-                            X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
-                                backfilldata(d[0]);
+                        X.api("data_auth/filter_map","get",{},function(d){
+                            filter_map = d;
+
+                            X.api('data_auth/quotas_map',"get",{},function(d){
+                                quotas_map = d;
+                                //从数据看板点击进来触发事件
+                                if(X.DATA.retentionid && X.DATA.retentionid != ''){
+                                    var report_idarr = [];
+                                    report_idarr.push(X.DATA.retentionid);
+                                    X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
+                                        backfilldata(d[0]);
+                                    })
+                                }
                             })
-                        }
 
+                        })
 
+                        
                     })
-
                 })
-                
             });
 
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
@@ -8312,7 +8278,7 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 if(type2data.length >0){
-                    X.querycriteriapop(type2data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                    X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                         // if(val != undefined){
                             console.log(val);
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
@@ -8352,73 +8318,40 @@ var X = window.X || {
             });
 
             // 添加初始事件筛选
-            // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-initial-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
-            //     var arr = {
-            //         "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
-            //         "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
-            //         "comparator":"==",
-            //         "comparatorName":"等于",
-            //         "ftv":[],
-            //         "strftv":"",
-            //         "tableType":groupitemeventsdata[0][0]['category'][0]['data_type'],
-            //         "timeUnit":""
-            //     }
-            //     data['events'][0]['filts'].push(arr);
-            //     filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
-            //     X.template("event","initial-event",data['events'][0]);
-            // })
-
-            // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-return-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
-            //     var arr = {
-            //         "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
-            //         "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
-            //         "comparator":"==",
-            //         "comparatorName":"等于",
-            //         "ftv":[],
-            //         "strftv":"",
-            //         "tableType":groupitemeventsdata[1][0]['category'][0]['data_type'],
-            //         "timeUnit":""
-            //     }
-            //     data['events'][1]['filts'].push(arr);
-            //     filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
-            //     X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-            // })
-
-            // 添加初始事件筛选
-            var initialevent = []
+            // var initialevent = []
             $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){
                 var arr = {
-                    "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
-                    "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],
                     "comparator":"==",
                     "comparatorName":"等于",
                     "ftv":[],
                     "strftv":"",
-                    "tableType":groupitemeventsdata[0][0]['category'][0]['data_type'],
+                    "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
-                initialevent.push(arr);
-                data['events'][0]['filts'] = initialevent;
-                filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
+                // initialevent.push(arr);
+                data['events'][0]['filts'].push(arr);
 
                 X.template("event","initial-event",data['events'][0]);
             });
             var returnevent = [];
             $(document).off('click','.analysis-shaix-return-event').on('click','.analysis-shaix-return-event',function(){
                 var arr = {
-                    "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
-                    "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],
                     "comparator":"==",
                     "comparatorName":"等于",
                     "ftv":[],
                     "strftv":"",
-                    "tableType":groupitemeventsdata[1][0]['category'][0]['data_type'],
+                    "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
                 // data['events'][1]['filts'].push(arr);
                 returnevent.push(arr);
                 data['events'][1]['filts'] = returnevent;
-                filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
             });
 
@@ -8426,14 +8359,12 @@ 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'][0]['filts'].splice(index,1);
-                filtersymbols[0].splice(index,1);
                 X.template("event","initial-event",data['events'][0]);
             });
 
             $(document).off('click','.analysis-zhibiao-list-del-return-event').on('click','.analysis-zhibiao-list-del-return-event',function(){
                 var index = $(this).attr("data-twonum");
                 data['events'][1]['filts'].splice(index,1);
-                filtersymbols[1].splice(index,1);
                 X.template("returnvisitevent","return-event",data['events'][1]);
             });
             
@@ -8454,18 +8385,9 @@ var X = window.X || {
                 var dataevent= data['events'][index];
                 // console.log(dataevent);
                 X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
                     obj.html(val.id);
                     dataevent['eventName'] = val.name;
                     dataevent['eventDesc'] = val.id;
-
-                    X.api("data_auth/load_prop_quotas","post",{event_name:val.name},function(val){
-                        type2data[index] = val.props;
-                    })
-
-                    X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
-                        groupitemeventsdata[index] = val;
-                    })
                     // console.log(data['events']);
 
                 })
@@ -8476,11 +8398,9 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    filtersymbols[index][indexs] = val.category;
                     data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
                     data['events'][index]['filts'][indexs]['columnName'] = val.id;
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
@@ -8488,35 +8408,15 @@ var X = window.X || {
                     
                 })
             });
-
-            // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                console.log(groupitemeventsdata);
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            };
             
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events'][index]['filts'][indexs]['data_type'];
+                console.log(type);
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['filts'][indexs]['comparatorName'] = val.title;
@@ -8537,11 +8437,12 @@ var X = window.X || {
             //全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = groupitemeventsdata[0];
+                var screentypedata = groupitemeventsdata;
                 console.log(screentypedata);
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
+                    //"column_id":screentypedata[0]['category'][0]['id'],
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
@@ -8557,9 +8458,7 @@ var X = window.X || {
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
             //删除指定全局数据
@@ -8572,45 +8471,59 @@ var X = window.X || {
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
-                    data['eventView']['filts'][index]['columnName'] = val.title;
-                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
                     data['eventView']['filts'][index]['comparator'] = '==';
                     data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
-                    analysisdown();//渲染下拉框
                 })
             });
 
             //循环给条件框渲染下拉框
-            function analysisdown(){
-                for(let i in data['eventView']['filts']){
-                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
-                        $(this).html(val.title);
-                        data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator'] = val.id;
-                        if(val.id == "range"){
-                            data['eventView']['filts'][i]['ftv'] = [-1,1];
-                        }
-                        X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                            analysisdown();
-                        });
-                    })
-                }
-            };
+            // function analysisdown(){
+            //     for(let i in data['eventView']['filts']){
+            //         X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+            //             $(this).html(val.title);
+            //             data['eventView']['filts'][i]['comparator_name'] = val.title;
+            //             data['eventView']['filts'][i]['comparator'] = val.id;
+            //             if(val.id == "range"){
+            //                 data['eventView']['filts'][i]['ftv'] = [-1,1];
+            //             }
+            //             X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+            //                 analysisdown();
+            //             });
+            //         })
+            //     }
+            // };
+
+            $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['eventView']['filts'][index]['data_type'];
+                console.log(type);
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['eventView']['filts'][index]['comparator_name'] = val.title;
+                    data['eventView']['filts'][index]['comparator'] = val.id;
+                    if(val.id == "range"){
+                        data['eventView']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+                })
+            }); 
 
             $(document).off('click','.analysis-overall-situation-input input').on('change','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr('data-index');
@@ -8630,8 +8543,8 @@ var X = window.X || {
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
                 var arr = {
-                    "columnName": "#account_id",//事件中文显示
-                    "column_id": "#account_id",//事件id
+                    "columnDesc": "#account_id",//事件中文显示
+                    "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
                     'tableType': "event",
                     "ftv":"",//条件
@@ -8646,11 +8559,11 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['columnName'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['tableType'] = val.tableType;
                 })
@@ -8699,11 +8612,6 @@ var X = window.X || {
             });
 
             function retaineddata(){
-                data['cachedata']['eventdata'] = eventdata;
-                data['cachedata']['initialevent'] = initialevent;
-                data['cachedata']['returnevent'] = returnevent;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtersymbols'] = filtersymbols;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -8735,18 +8643,11 @@ var X = window.X || {
             var baobiaodata;//以存报表数据
             function backfilldata(d){
                 data = d.query;
-                eventdata = data.cachedata.eventdata;
-                initialevent = data.cachedata.initialevent;
-                returnevent = data.cachedata.returnevent;
-                filtersymbols = data.cachedata.filtersymbols;
-                groupitemeventsdata = data.cachedata.groupitemeventsdata;
                 baobiaodata = d;
 
                 X.template("event","initial-event",data['events'][0]);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
       
                 retaineddata();
@@ -8763,7 +8664,7 @@ var X = window.X || {
             function retainedtable(d){
                 var nname,pname
 
-                if(data['eventView']['filter_item_type'] != "all"){
+                if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
                     var filteritem = data['eventView']['filter_item'];
                     if(d['days'].length >= 7){
                         var filterarr = [];
@@ -8804,7 +8705,7 @@ var X = window.X || {
                             n:0,
                             p:0
                         }
-                        if(data['eventView']['filter_item_type'] != "all"){
+                        if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
                             for(let a in filterarr){
                                 var index = Number(filterarr[a]);
                                 if(j == index){
@@ -8823,7 +8724,7 @@ var X = window.X || {
                 }
     
                 var titdata = [];
-                if(data['eventView']['filter_item_type'] != "all"){
+                if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
                     var titarr = [];
                     for(let j in filterarr){
                         var index = Number(filterarr[j]);
@@ -8841,7 +8742,7 @@ var X = window.X || {
                 }
                 titdata.unshift("日期",d.title);
                 console.log(titdata);
-             
+                console.log(tabledata);
 
                 // X.fixedTable('table-div-box','row-col-fixed','',headdata);
 
@@ -9074,7 +8975,7 @@ var X = window.X || {
             });
 
             //显示设置
-            $(document).off('click','.analtsis-condition').on('click','.analtsis-condition',function(){
+            $(document).off('click','.analtsis-condition-xssz').on('click','.analtsis-condition-xssz',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 // offset.left,offset.top+obj.height()
@@ -9102,7 +9003,6 @@ var X = window.X || {
                     $(".showsetup-wancheng").hide();
                     $(".showsetup-bianji-show-box-type").hide();
                     $(".showsetup-bianji-input-box-type").hide();
-                   
                 }
                 data['eventView']['filter_item_type'] = val.value;
                 if(querydata){
@@ -9135,7 +9035,20 @@ var X = window.X || {
 
             function unique (arr) {
                 return Array.from(new Set(arr))
-              }
+            };
+            
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                // X.gourl("dashboard");
+                return;
+            });
+
+            // 下载
+            $(document).off('click','.download-table').on('click','.download-table',function(){
+                console.log(11111);
+                X.download('ck/retention_model_export',data,'事件分析');
+            });
+
 
         }
     };
@@ -9209,12 +9122,7 @@ var X = window.X || {
 (function(){
     X.pageLogic['routeanalysis'] = {
         init : function(){
-            var eventdata = {};
-            var filtsftvdata =[];
-            X.api("data_auth/my_event","get",{},function(d){
-                eventdata['list'] = d;
-            })
-
+            
             var data = {
                 "eventView":{
                     "cksql":'trace',
@@ -9244,8 +9152,6 @@ var X = window.X || {
                 },
                 "cachedata":{
                     "event_names":[],
-                    "groupitemeventsdata":[],
-                    "filtsftvdata":[]
                 }
             }
 
@@ -9268,9 +9174,23 @@ var X = window.X || {
             data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
+            var filter_map;
+            var eventdata = {};
+            var filtsftvdata =[];
+            var groupitemeventsdata = [];
+            X.api("data_auth/my_event","get",{},function(d){
+                eventdata['list'] = d;
+                X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
+                    groupitemeventsdata= val;
+                })
+            });
+            X.api("data_auth/filter_map","get",{},function(d){
+                filter_map = d;
+            });
+            
+
             $(document).off('click','.eventsplit').on('click','.eventsplit',function(){
                 var routeevent = X['DATA']['routeevent'];
-                console.log(routeevent);
                 if( routeevent && routeevent.length > data['events']['by_fields'].length){
                     var arr = {
                         "eventName": routeevent[data['events']['by_fields'].length]['id'],
@@ -9285,21 +9205,14 @@ var X = window.X || {
                     };
                     data['events']['by_fields'].push(arr);
                     X.laytpldata("#eventsplit-box-dot",data['events']['by_fields'],".eventsplit-box");
-
-                    X.api("data_auth/load_filter_props","post",{event_name:routeevent[data['events']['by_fields'].length]['id']},function(val){
-                        console.log(val);
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
-                
                 }
-            })
+            });
 
             $(document).off('click','.route-action-right').on('click','.route-action-right',function(){
                 var index = $(this).attr('data-index');
                 data['events']['by_fields'].splice(index,1);
                 X.laytpldata("#eventsplit-box-dot",data['events']['by_fields'],".eventsplit-box");
-            })
+            });
             
             $(document).off('click','.participate-box').on('click','.participate-box',function(){
                 var obj = $(this);
@@ -9332,14 +9245,9 @@ var X = window.X || {
                     data['events']['source_event']['eventDesc'] = X.DATA['routeevent'][0]['title'];
                     X.template("route","event-roue-event",data['events']['source_event']);
 
-                    X.api("data_auth/load_filter_props","post",{event_name:val[0]['event_name']},function(val){
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
                 })
-            })
+            });
 
-            var groupitemeventsdata = [];
             $(document).off('click','.route-ant-select-selector1').on('click','.route-ant-select-selector1',function(){
                 var obj = $(this);
                 var offset = obj.offset();
@@ -9348,46 +9256,21 @@ var X = window.X || {
                     obj.html(val.title);
                     data['events']['by_fields'][index]['eventDesc'] = val.title;
                     data['events']['by_fields'][index]['eventName'] = val.id;
-                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
-                        console.log(val);
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
+                  
                 })
-            })
-
-            // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            }
+            });
 
             $(document).off('click','.route-ant-select-selector2').on('click','.route-ant-select-selector2',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr('data-index');
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
                     data['events']['by_fields'][index]['eventDesc'] = val.title;
                     data['events']['by_fields'][index]['eventName'] = val.id;
                 })
-            })
+            });
 
             $(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
                 var index = $(this).attr('data-index');
@@ -9399,47 +9282,42 @@ var X = window.X || {
                         data['events']['by_fields'][index]['quotaIntervalArr'] = val.quotaIntervalArr;
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
                 data['events']['user_filter']['filts'].splice(index,1);
-                filtsftvdata.splice(index,1);
                 if(data['events']['user_filter']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-            })
+            });
 
            $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){
                 addscreen(0)
-           })
+           });
 
            $(document).off('click','.analysis-zhibiao-updata-initial-event').on('click','.analysis-zhibiao-updata-initial-event',function(){
                 addscreen(0)
-            })
+            });
 
            // 添加筛选项
-           var filtersymbols = [];
            function addscreen(index){
-                X.api('data_auth/load_filter_props',"post",{event_name:data['events']['source_event']["eventName"]},function(d){
-                    var arr = {
-                        "columnDesc":d[0]['category'][0]['title'],//事件中文显示
-                        "columnName":d[0]['category'][0]['id'],//事件id
-                        "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
-                        "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
-                        "data_type":d[0]['category'][0]['data_type'],
-                        "ftv":[],//条件
-                        "strftv":'',//字符串显示条件
-                        "tableType": d[0]['id']
-                    } //筛选数据
-                    data['events']['source_event']['filts'].push(arr);
-                    X.template("route","event-roue-event",data['events']['source_event']);  //更新事件
-                    // screentypearr[index] = d;
-                    filtersymbols.push(d[0]['category'][0]["category"]);
-                })
-            }
+               console.log(groupitemeventsdata);
+                var arr = {
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
+                    "comparator_name": filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
+                    "comparator":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
+                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "ftv":[],//条件
+                    "strftv":'',//字符串显示条件
+                    "tableType": groupitemeventsdata[0]['id']
+                } //筛选数据
+                data['events']['source_event']['filts'].push(arr);
+                X.template("route","event-roue-event",data['events']['source_event']);  //更新事件
+            };
 
             $(document).off('click','.analysis-con-left-screen-list-right-screen-qh-tit').on('click','.analysis-con-left-screen-list-right-screen-qh-tit',function(){
                 if($(this).html() == '或'){
@@ -9449,7 +9327,7 @@ var X = window.X || {
                     $(this).html('或');
                     data['events']["source_event"]['relation'] = 'and';
                 }
-            })
+            });
 
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -9458,13 +9336,8 @@ var X = window.X || {
                     obj.html(val.title);
                     data['events']['source_event']['eventDesc']= val.title;
                     data['events']['source_event']['eventName'] = val.id;
-                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
-                        console.log(val);
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
                 var eventdata = [
@@ -9479,27 +9352,27 @@ var X = window.X || {
                     data['events']['source_event']['source_type'] = val.id;
                     
                 })
-            })
+            });
 
             $(document).off("click",".ta-property-select").on('click','.ta-property-select',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    filtersymbols[indexs] = val.category;
                     data['events']['source_event']['filts'][indexs]['columnDesc'] = val.title;
                     data['events']['source_event']['filts'][indexs]['columnName'] = val.id;
                     data['events']['source_event']['filts'][indexs]['data_type'] = val.type;
                     data['events']['source_event']['filts'][indexs]['tableType'] = val.table_type;
                 })
-            })
+            });
 
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var indexs = $(this).attr("data-indexs");
-                X.querycriteriapop(filtersymbols[indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events']['source_event']['filts'][indexs]['data_type'];
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events']['source_event']['filts'][indexs]['comparator_name'] = val.title;
@@ -9507,7 +9380,7 @@ var X = window.X || {
                         X.template("userpar","userpar-event",data['events']); 
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var indexs = $(this).attr("data-indexs");
@@ -9515,14 +9388,14 @@ var X = window.X || {
                 var valarr = val.split(",");
                 data['events']['source_event']['filts'][indexs]['ftv']=valarr;
                 data['events']['source_event']['filts'][indexs]['strftv']=val;
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = filteringdata();
+                var screentypedata = groupitemeventsdata;
                 if(!screentypedata) {alert('请先选择参与分析事件'); return;}
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator_id":'==',//符号id
@@ -9532,7 +9405,6 @@ var X = window.X || {
                     "table_type":screentypedata[0]['id']
                 };
                 data['events']['user_filter']['filts'].push(drr);
-                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['events']['user_filter']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
@@ -9540,27 +9412,27 @@ var X = window.X || {
                 }
                 X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']);
 
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    data['events']['user_filter']['filts'][index]['columnName'] = val.title;
-                    data['events']['user_filter']['filts'][index]['column_id'] = val.id;
+                    data['events']['user_filter']['filts'][index]['columnDesc'] = val.title;
+                    data['events']['user_filter']['filts'][index]['columnName'] = val.id;
                     data['events']['user_filter']['filts'][index]['data_type'] = val.type;
                     data['events']['user_filter']['filts'][index]['tableType'] = val.table_type;
-                    filtsftvdata[index] = val.category;
                 })
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
-                X.querycriteriapop(filtsftvdata[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events']['user_filter']['filts'][index]['data_type'];
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
@@ -9571,12 +9443,12 @@ var X = window.X || {
                         X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']);
                     }
                 })
-            })
+            });
             $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");
                 data['events']['user_filter']['filts'][index]['strftv'] = val;
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){
                 var name = $(this).attr('name');
@@ -9590,23 +9462,23 @@ var X = window.X || {
                     data['events']['user_filter']['filts'][index]['ftv'][1] = val;
                     data['events']['user_filter']['filts'][index]['section'][1] = val;
                 }
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
                 {'title':'秒','id':'second'},
                 {'title':'分钟','id':'minute'},
                 {'title':'小时','id':'hour'},
-            ]
+            ];
             X.laydropdown('.route-condition',timeParticleSizearr,function(d){
                 console.log(d);
                 $(".route-condition").html(d.title);
                 data['eventView']['session_type'] = parseInt(d.id);
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-box2 input').on('blur','.analysis-con-left-screen-box2',function(){
                 data['eventView']['session_interval'] =parseInt($('.analysis-con-left-screen-box2 input').val());
-            })
+            });
 
             //计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
@@ -9617,7 +9489,6 @@ var X = window.X || {
             function calculationdata(){
                 data['cachedata']['event_names'] = X['DATA']['routeevent'];
                 data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtsftvdata'] = filtsftvdata;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -9625,7 +9496,7 @@ var X = window.X || {
                 X.api("ck/trace_model","post",dataArr,function(d){
                     routeanalysisdata(d);
                 })
-            }
+            };
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
@@ -9634,18 +9505,17 @@ var X = window.X || {
                 X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                     
                 })
-            })
+            });
 
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 X.parametersopen(data,'savereport','auto')  
-            })
+            });
 
             $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
                 X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
                     console.log(d);
                     if(d){
                         data = d.query;
-                        filtsftvdata = data.cachedata.filtsftvdata;
                         groupitemeventsdata = data.cachedata.groupitemeventsdata;
                         $('.route-time-input').val(data['eventView']['session_interval']);
                         if(data['eventView']['session_type'] == "second"){
@@ -9667,7 +9537,7 @@ var X = window.X || {
                     }
 
                 })
-            })
+            });
 
             function routeanalysisdata(d){
                 var myChart = echarts.init(document.getElementById('routeanalysis-echarts'));
@@ -9722,7 +9592,7 @@ var X = window.X || {
                         }
                     ]
                 });
-            }
+            };
 
         }
     };
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 3a23eaa..ab86fe0 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -115,9 +115,9 @@ var X = window.X || {
 
 (function(){
     //本地
-    // var ipurl = "http://10.0.0.77:7889/api/v1/";
+    var ipurl = "http://10.0.0.77:7889/api/v1/";
     //线上
-    var ipurl = "http://139.159.159.3:9865/api/v1/";
+    // var ipurl = "http://139.159.159.3:9865/api/v1/";
 
     //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
     X.loginCache = function(data){
@@ -329,6 +329,11 @@ var X = window.X || {
     };
 
     X.parametersopen = function(data,url,offset,callback){
+        // var innerHeight = window.innerHeight;
+        // if( innerHeight - offset[0] < height){
+        //     offset[0] = offset[0] - (height + 30);
+        // }
+        // console.log(offset);
         X.open({
             type: 1,
             title: false,
@@ -744,7 +749,7 @@ var X = window.X || {
             nname = 'n_outflow';
             pname = 'p_outflow';
         }
-        console.log()
+
         if(data['filter_item_type'] != "all"  && data['filter_item_type'] != "" && data['filter_item_type']){
             var filteritem = data['filter_item'];
             if(data['days'].length >= 7){
@@ -815,7 +820,7 @@ var X = window.X || {
         }
         titdata.unshift("日期",data.title);
         console.log(titdata);
-        console.log(tabledata);
+        console.log(tabledata)
         var dataArr = {
             titledata:titdata,
             condata:tabledata,
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 035296f..d27c2de 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -7,14 +7,11 @@
 
             var dataArr; //分析指标
             var groupeddata;//分组项
-            var type2data =[],type3data = [];
-            var screentypearr=[]; //筛选项数据
-            var drr = [];
-            screentypearr.push(drr); //每一个筛选事件按添加次数依次写入
-            var filtersymbols=[];//筛选符号
-            filtersymbols.push(drr);
-            var groupitemeventsdata=[]//分组项里的事件
-            var defaultgroupdata //默认添加分组项里的事件
+            var type2data;
+            //var filtersymbols=[];//筛选符号
+            // filtersymbols.push(drr);
+            var defaultgroupdata; //默认添加分组项里的事件
+            var filter_map,quotas_map;
             var data = {
                 "events":[],
                 "eventView":{
@@ -35,10 +32,7 @@
                     "zone_time":'8'//时区
                 },
                 "cachedata":{
-                    type2data:[],
-                    type3data:[],
-                    screentypearr:[],
-                    filtersymbols:[],
+                    // filtersymbols:[],
                     groupitemeventsdata:[],
                     defaultgroupdata:[],
                 }
@@ -83,6 +77,7 @@
                         "event_name":dataArr[0]['category'][0]['event_name'],
                         "event_attr":"总次数",
                         "event_attr_id":"*",
+                        "event_attr_type":"",
                         "analysisname":'',
                         "analysis":'total_count',
                         "filts":[],//过滤项
@@ -94,21 +89,26 @@
                     }
                     data.events.push(defaultindicator);
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
-                    type2data[0]= retdata;
-                    type3data[0]= [];
-                    screentypearr[0]=d.props;
+                    type2data= retdata
                     X.api("data_auth/load_filter_props","post",{event_name:dataArr[0]['category'][0]['event_name']},function(val){
                         defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
 
-                        //从数据看板点击进来触发事件
-                        if(X.DATA.eventid && X.DATA.eventid != ''){
-                            var report_idarr = [];
-                            report_idarr.push(X.DATA.eventid);
-                            X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
-                                backfilldata(d[0]);
+                        X.api("data_auth/filter_map","get",{},function(d){
+                            filter_map = d;
+
+                            X.api('data_auth/quotas_map',"get",{},function(d){
+                                quotas_map = d;
+                                //从数据看板点击进来触发事件
+                                if(X.DATA.eventid && X.DATA.eventid != ''){
+                                    var report_idarr = [];
+                                    report_idarr.push(X.DATA.eventid);
+                                    X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
+                                        backfilldata(d[0]);
+                                    })
+                                }
                             })
-                        }
+
+                        })
 
                     })
                 })
@@ -157,10 +157,7 @@
             // 反向填充数据
             function backfilldata(d){
                 data = d.query;
-                type2data = data.cachedata.type2data;
-                type3data = data.cachedata.type3data;
-                screentypearr = data.cachedata.screentypearr;
-                filtersymbols = data.cachedata.filtersymbols;
+                // filtersymbols = data.cachedata.filtersymbols;
 
                 baobiaodata = d;
                
@@ -173,7 +170,7 @@
                 X.laytpldata("#analysis-con-left-screen-list-dot",d.query.events,".analysis-con-left-screen-list-box");
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",d.query.eventView.groupBy,".analysis-gpmain___3YGfw");
                 X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filts'],".analysis-overall-situation-list-box");
-                analysisdown();
+                // analysisdown();
                 calculationdata();
             }
 
@@ -212,10 +209,8 @@
                 data.events.push(arr);
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                 var num = data.events.length;
-                type2data[num] = type2data[index];
-                type3data[num] = type3data[index];
-                screentypearr[num] = screentypearr[index];
-                filtersymbols[num] = filtersymbols[index];
+                
+                // filtersymbols[num] = filtersymbols[index];
             });
 
             //重命名指标
@@ -245,15 +240,7 @@
                     obj.html(htmlstring);
                     data['events'][index]['event_desc'] = val.id;
                     data['events'][index]['event_name'] = val.name;
-                    X.api("data_auth/load_prop_quotas","post",{event_name:val.name},function(d){
-                        var retdata = d.staid_quots.concat(d.props);
-                        type2data[index]=retdata;
-                        screentypearr[index] = d.props;
-                    })
-
-                    X.api("data_auth/load_filter_props","post",{event_name:val.name},function(d){
-                        groupitemeventsdata[index] = d;
-                    })
+                   
 
                     
                 })
@@ -264,18 +251,19 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 if(type2data.length >0){
-                    X.querycriteriapop(type2data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                    X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                         if(val != undefined){
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
                             
-                            type3data[index]=val.category;
                             data['events'][index]['event_attr'] = val.title;
                             data['events'][index]['event_attr_id'] = val.id;
-                            if(val.category &&  val.category.length > 0){
+                            data['events'][index]['event_attr_type'] = val.data_type;
+
+                            if(val.data_type && val.data_type != null){
                                 $("#analysis-zhibiao-list-type3-"+index).show();
-                                $("#analysis-zhibiao-list-type3-"+index).html(val.category[0].title);
-                                data['events'][index]['analysisname'] = val.category[0].title;
-                                data['events'][index]['analysis'] = val.category[0].id;
+                                $("#analysis-zhibiao-list-type3-"+index).html(quotas_map[val.data_type][0]['title']);
+                                data['events'][index]['analysisname'] = quotas_map[val.data_type][0]['title'];
+                                data['events'][index]['analysis'] = quotas_map[val.data_type][0]['id'];
                             }else {
                                 $("#analysis-zhibiao-list-type3-"+index).hide();
                                 data['events'][index]['analysis'] = val.analysis;
@@ -290,16 +278,13 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                var indexs = obj.attr("data-indexs");
-                if(type3data.length>0){
-                    if(type3data[index].length > 0){
-                        X.querycriteriapop(type3data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
-                            $("#analysis-zhibiao-list-type3-"+index).html(val.title);
-                            data['events'][index]['analysisname'] = val.title;
-                            data['events'][index]['analysis'] = val.id;
-                        })
-                    }
-                }
+                var type = data['events'][index]['event_attr_type'];
+
+                X.parametersopen(quotas_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $("#analysis-zhibiao-list-type3-"+index).html(val.title);
+                    data['events'][index]['analysisname'] = val.title;
+                    data['events'][index]['analysis'] = val.id;
+                })
             });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
@@ -307,10 +292,10 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(screentypearr[index],'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    filtersymbols[index][indexs] = val.category;
+                    // filtersymbols[index][indexs] = val.category;
                     data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
                     data['events'][index]['filts'][indexs]['columnName'] = val.id;
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
@@ -324,7 +309,8 @@
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events'][index]['filts'][indexs]['data_type'];
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
@@ -347,8 +333,8 @@
                     var arr = {
                         "columnDesc":d[0]['category'][0]['title'],//事件中文显示    
                         "columnName":d[0]['category'][0]['id'],//事件id
-                        "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
-                        "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
+                        "comparator_name":filter_map[d[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
+                        "comparator":filter_map[d[0]['category'][0]['data_type']][0]['id'],//符号id
                         "data_type":d[0]['category'][0]['data_type'],
                         "ftv":[],//条件
                         "strftv":'',//字符串显示条件
@@ -357,9 +343,8 @@
                     data['events'][index]['filts'].push(arr);
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                     var drr=[];
-                    filtersymbols.push(drr);
-                    screentypearr[index] = d;
-                    filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
+                    // filtersymbols.push(drr);
+                    // filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
                 })
             };
 
@@ -397,6 +382,9 @@
             // 添加条件按钮
             $(document).on('click',".analysis-zhibiao-updata",function(){
                 // addindex();
+                var obj = $(this);
+                var index = obj.attr("data-index");
+                addscreen(index);
             });
 
             // 删除二级筛选项
@@ -405,7 +393,7 @@
                 // $("#"+id).remove();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                filtersymbols[index].splice(indexs,1);
+                // filtersymbols[index].splice(indexs,1);
                 data.events[index]['filts'].splice(indexs,1);
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
             });
@@ -417,6 +405,7 @@
                     "event_name":dataArr[0]['category'][0]['event_name'],
                     "event_attr":"总次数",
                     "event_attr_id":"*",
+                    "event_attr_type":"",
                     "analysisname":'',
                     "analysis":'total_count',
                     "filts":[],//过滤项
@@ -430,18 +419,14 @@
 
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                 var index = data.events.length - 1;
-                type2data[index]= retdata;
-                type3data[index]= [];
+               
                 $(".analysis-del").show() //显示删除按钮
                 var drr = [];
-                screentypearr.push(drr);
                 if(data.events.length > 1){
                     $(".analysis-overall").show();
                 }else {
                     $(".analysis-overall").hide();
                 }
-                screentypearr[index]=props;
-                groupitemeventsdata.push(defaultgroupdata);
             };
 
             //添加按钮
@@ -498,7 +483,7 @@
                     {title:'百分比',id:'percent'},
                     {title:'取整',id:'integer'},
                 ];
-                X.querycriteriapop(downlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen(downlist,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['format'] = val.id;
@@ -512,14 +497,13 @@
             var cat = "event";
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
                 var index = data['eventView']['groupBy'].length;
-                var screentypedata = filteringdata();
-                for(let i in screentypedata){
-                    if(screentypedata[i]['category'].length > 0){
+                for(let i in defaultgroupdata){
+                    if(defaultgroupdata[i]['category'].length > 0){
                         var drr = {
-                            "columnDesc":screentypedata[i]['category'][index]['title'],//事件中文显示
-                            "columnName":screentypedata[i]['category'][index]['id'],//事件id
-                            'data_type':screentypedata[i]['category'][index]['data_type'],//类型
-                            'tableType': screentypedata[i]['id'],
+                            "columnDesc":defaultgroupdata[i]['category'][index]['title'],//事件中文显示
+                            "columnName":defaultgroupdata[i]['category'][index]['id'],//事件id
+                            'data_type':defaultgroupdata[i]['category'][index]['data_type'],//类型
+                            'tableType': defaultgroupdata[i]['id'],
                             "ftv":[],//条件
                             "section":''//区间
                         }
@@ -536,7 +520,7 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     data.eventView.groupBy[index]['columnDesc'] = val.title;
@@ -611,45 +595,22 @@
 
             });
 
-            // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            };
-
             // 全局筛选
             var filtsftvdata=[];
             $(document).on('click','.analysis-overall-situation-add',function(){
-
-                var screentypedata = filteringdata();
                 var drr={
-                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示 columnDesc
-                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
-                    'data_type':screentypedata[0]['category'][0]['data_type'],//类型
+                    "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                    "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
+                    'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "tableType":screentypedata[0]['id']
+                    "tableType":defaultgroupdata[0]['id']
                 };
                 data['eventView']['filts'].push(drr);//上传全局数据
-                filtsftvdata.push(screentypedata[0]['category'][0]['category'])
+                filtsftvdata.push(defaultgroupdata[0]['category'][0]['category'])
 
                 $(".analysis-overall-situation-left-box").show();
 
@@ -659,24 +620,40 @@
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                analysisdown();
+                // analysisdown();
             });
 
             //循环给条件框渲染下拉框
-            function analysisdown(){
-                for(let i in data['eventView']['filts']){
-                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
-                        $(this).html(val.title);
-                        data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator'] = val.id;
-                        if(val.id == "range"){
-                            data['eventView']['filts'][i]['ftv'] = [-1,1];
-                        }
-                        X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                        analysisdown();
-                    })
-                }
-            };
+            // function analysisdown(){
+            //     for(let i in data['eventView']['filts']){
+            //         X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+            //             $(this).html(val.title);
+            //             data['eventView']['filts'][i]['comparator_name'] = val.title;
+            //             data['eventView']['filts'][i]['comparator'] = val.id;
+            //             if(val.id == "range"){
+            //                 data['eventView']['filts'][i]['ftv'] = [-1,1];
+            //             }
+            //             X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
+            //             analysisdown();
+            //         })
+            //     }
+            // };
+
+            $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['eventView']['filts'][index]['data_type'];
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['eventView']['filts'][index]['comparator_name'] = val.title;
+                    data['eventView']['filts'][index]['comparator'] = val.id;
+                    if(val.id == "range"){
+                        data['eventView']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
+                })
+            }); 
 
             $(document).on('click',".analysis-overall-situation-del",function(){
                 var index = $(this).attr("data-index");
@@ -689,7 +666,7 @@
                     // $(".analysis-overall-situation-left-box").hide();
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                analysisdown();
+                // analysisdown();
             });
 
             // 全局属性选择
@@ -697,7 +674,7 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
                     data['eventView']['filts'][index]['columnDesc'] = val.title;
                     data['eventView']['filts'][index]['columnName'] = val.id;
@@ -707,7 +684,7 @@
                     data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
                     X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
-                    analysisdown();
+                    // analysisdown();
                 })
             });
 
@@ -1040,16 +1017,20 @@
                 var titledata,condata=[];
                 for(let i in d){
                     titledata= $.extend(true,[],d[0]['date_range']) ;
-                    titledata.unshift('指标','阶段总和');
                     if(d[i]['groups']['length'] != 0){
+                        titledata.unshift('指标','分组','阶段总和');
                         for(let j in d[i]['values']){
                             var arr;
-                            arr = $.extend(true,[],d[i].values[j])
+                            arr = $.extend(true,[],d[i].values[j]);
                             arr.unshift(d[i]['event_name'],d[i]['sum'][j]);
                             condata.push(arr);
                         }
+                        for(let j in condata){
+                            condata[j].splice(1,0,d[i]['groups'][j]);
+                        }
                         
                     }else {
+                        titledata.unshift('指标','阶段总和');
                         var arr;
                         arr = $.extend(true,[],d[i].values[0])
                         arr.unshift(d[i]['event_name'],d[i]['sum'][0]);
@@ -1057,18 +1038,12 @@
                     }
                 }
                 // console.log(titledata);
-                console.log(condata);
+                // console.log(condata);
                 X.laytpldata("#table-fenxi-th-dot",titledata,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",condata ,".table-fenxi-td");
             };
 
             function calculationdata(){
-                data['cachedata']['type2data'] = type2data;
-                data['cachedata']['type3data'] = type3data;
-                data['cachedata']['screentypearr'] = screentypearr;
-                data['cachedata']['filtersymbols'] = filtersymbols;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['defaultgroupdata'] = defaultgroupdata;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -1109,6 +1084,12 @@
                 }
             });
 
+            // 下载
+            $(document).off('click','.download-table').on('click','.download-table',function(){
+                console.log(11111);
+                X.download('ck/event_model_export',data,'事件分析');
+            });
+
         },
 
         // 保存报表
diff --git a/web/srczip/logic/attribute.js b/web/srczip/logic/attribute.js
index 4314360..fecb59a 100644
--- a/web/srczip/logic/attribute.js
+++ b/web/srczip/logic/attribute.js
@@ -67,7 +67,6 @@
                     title:'用户属性'
                 }
                 user_data.push(arr);
-                // console.log(user_data);
 
                 X.api("data_auth/quotas_map","get",{},function(val){
                     quotas_map = val;
@@ -108,7 +107,7 @@
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
                 var offset = obj.offset();
-                X.querycriteriapop(user_attr,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen(user_attr,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     obj.html(val.title);
                     data['events']['quota']  = val.id;
                     data['events']['quotaDesc']  = val.title;
@@ -127,7 +126,7 @@
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
-                X.querycriteriapop(quotas_map[data['events']['quotatype']],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen(quotas_map[data['events']['quotatype']],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     obj.html(val.title);
                     data['events']['analysis']  = val.id;
                     data['events']['analysisDesc']  = val.title;
@@ -136,16 +135,16 @@
             });
 
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname input',function(){
-                // console.log($(this).val());
                 data['events']['eventNameDisplay'] = $(this).val();
             });
 
             // 分组项
             X.template("grouped","shushi",data['eventView']['groupBy']);
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
+                console.log(user_data);
                 var arr = {
-                    "columnName": user_data[0]['category'][0]['title'],//事件中文显示
-                    "column_id": user_data[0]['category'][0]['id'],//事件id
+                    "columnDesc": user_data[0]['category'][0]['title'],//事件中文显示
+                    "columnName": user_data[0]['category'][0]['id'],//事件id
                     'data_type': user_data[0]['category'][0]['data_type'],//类型
                     'table_type': "",
                     "ftv":'',//条件
@@ -175,8 +174,8 @@
                 X.querycriteriapop(user_data,'category',offset.left,offset.top+obj.height(),function(val){
                     // console.log(val);
                     obj.html(val.title);
-                    data['eventView']['groupBy'][index]['column_id']  = val.id;
-                    data['eventView']['groupBy'][index]['columnName']  = val.title;
+                    data['eventView']['groupBy'][index]['columnName']  = val.id;
+                    data['eventView']['groupBy'][index]['columnDesc']  = val.title;
                     data['eventView']['groupBy'][index]['data_type']  = val.type;
                     X.template("grouped","shushi",data['eventView']['groupBy']);
                 })
@@ -196,8 +195,8 @@
             //且用户符合
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var drr={
-                    "columnName":user_data[0]['category'][0]['title'],//事件中文显示
-                    "column_id":user_data[0]['category'][0]['id'],//事件id
+                    "columnDesc":user_data[0]['category'][0]['title'],//事件中文显示
+                    "columnName":user_data[0]['category'][0]['id'],//事件id
                     'data_type':user_data[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
@@ -235,8 +234,8 @@
 
                 X.querycriteriapop(user_data,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    data['events']['filts'][index]['column_id']  = val.id;
-                    data['events']['filts'][index]['columnName']  = val.title;
+                    data['events']['filts'][index]['columnName']  = val.id;
+                    data['events']['filts'][index]['columnDesc']  = val.title;
                     data['events']['filts'][index]['data_type']  = val.type;
                     X.template("globalfilter","xinwei-whole",data['events']['filts']);
                 })
@@ -248,7 +247,7 @@
                 var offset = obj.offset();
                 // console.log(filter_map);
                 var filter_type = data['events']['filts'][index]['data_type'];
-                X.querycriteriapop( filter_map[filter_type] ,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                X.parametersopen( filter_map[filter_type] ,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     obj.html(val.title);
                     data['events']['filts'][index]['comparator']  = val.id;
                     data['events']['filts'][index]['comparator_name']  = val.title;
@@ -296,10 +295,7 @@
             });
 
             function calculationdata(){
-                data['cachedata']['user_attr'] = user_attr;
-                data['cachedata']['quotas_map'] = quotas_map;
-                data['cachedata']['filter_map'] = filter_map;
-                data['cachedata']['user_data'] = user_data;
+
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -447,12 +443,6 @@
             // 反向填充数据
             function backfilldata(d){
                 data = d.query;
-                console.log(d);
-
-                user_attr = data.cachedata.user_attr;
-                quotas_map = data.cachedata.quotas_map;
-                filter_map = data.cachedata.filter_map;
-                user_data = data.cachedata.user_data;
 
                 baobiaodata = d;
                
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 58ea8e0..4834281 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -33,8 +33,6 @@
                 // X.template("toptab","analysis-zhanwei",d);
             });
 
-            
-
             // $(".username").html(X.DATA.userinfo.name);
 
             // 选择项目
@@ -356,7 +354,7 @@
                 var name = obj.attr('data-name');
 
                 X.parametersopen(X['DATA']['screenlist'][cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
-
+                    console.log(d);
                     var reportid = [];
                     reportid.push(id);
                     X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
@@ -707,7 +705,7 @@
                         X.pageLogic['dashboard'].gettabledata();
                     })
                 }else if(d.id == 'export'){
-                    X.download('ck/event_model_export',{report_id:eventdata.id},eventdata.name);
+                    X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
                 }else {
 
                     layer.confirm('确认移除['+ eventdata.name + ']', {
diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js
index 5770268..2e0d066 100644
--- a/web/srczip/logic/distribution.js
+++ b/web/srczip/logic/distribution.js
@@ -51,10 +51,10 @@
                     // console.log(d);
                     if(d){
                         data = d.query;
-                        type2data = data.cachedata.type2data;
-                        type3data = data.cachedata.type3data;
-                        screentypearr = data.cachedata.screentypearr;
-                        filtersymbols = data.cachedata.filtersymbols;
+                        // type2data = data.cachedata.type2data;
+                        // type3data = data.cachedata.type3data;
+                        // screentypearr = data.cachedata.screentypearr;
+                        // filtersymbols = data.cachedata.filtersymbols;
     
                         X.template("userpar","userpar-event",data['events']); 
                         X.template("grouped","shushi",data['eventView']['groupBy']);
@@ -130,7 +130,6 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 if(type2data.length >0){
-                    // console.log(type2data);
                     X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                         if(val != undefined){
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
@@ -289,8 +288,8 @@
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
                 var arr = {
-                    "columnName": "#account_id",//事件中文显示
-                    "column_id": "#account_id",//事件id
+                    "columnDesc": "#account_id",//事件中文显示
+                    "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
                     'table_type': "event",
                     "ftv":"",//条件
@@ -307,8 +306,8 @@
                 X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['columnName'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
                 });
@@ -331,12 +330,11 @@
 
             var querydata;
             function distributiondata(){
-                data['cachedata']['eventdata'] = eventdata;
-                data['cachedata']['type2data'] = type2data;
-                data['cachedata']['type3data'] = type3data;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtersymbols'] = filtersymbols;
-                data['cachedata']['screentypearr'] = screentypearr;
+                // data['cachedata']['type2data'] = type2data;
+                // data['cachedata']['type3data'] = type3data;
+                // data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
+                // data['cachedata']['filtersymbols'] = filtersymbols;
+                // data['cachedata']['screentypearr'] = screentypearr;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js
index 0de5354..d8a8658 100644
--- a/web/srczip/logic/funnelanalysis.js
+++ b/web/srczip/logic/funnelanalysis.js
@@ -20,13 +20,7 @@
                         },
                         "events":[
                             
-                        ],
-                        "cachedata":{
-                            eventdata : [],
-                            groupitemeventsdata: [],
-                            filtsftvdata:[],
-                            filtersymbols:[],//筛选符号
-                        }
+                        ]
             };
 
             // 日期渲染
@@ -46,8 +40,8 @@
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
             var eventdata;
-            var filtersymbols = [[],[]];//默认两个事件
-            var groupitemeventsdata=[[],[]]//分组项里的事件
+            var groupitemeventsdata//分组项里的事件
+            var filter_map,quotas_map;
             // var screentypearr = [];
 
             X.api("data_auth/my_event","get",{},function(d){
@@ -70,11 +64,31 @@
                 ]
                 data['events'] = arr;
                 X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
+
+                    groupitemeventsdata= val;
+
+                    X.api("data_auth/filter_map","get",{},function(d){
+                        filter_map = d;
+
+                        X.api('data_auth/quotas_map',"get",{},function(d){
+                            quotas_map = d;
+                            //从数据看板点击进来触发事件
+                            // if(X.DATA.retentionid && X.DATA.retentionid != ''){
+                            //     var report_idarr = [];
+                            //     report_idarr.push(X.DATA.retentionid);
+                            //     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
+                            //         backfilldata(d[0]);
+                            //     })
+                            // }
+
+                            //初始事件
+                            X.template("funnel","funnel-event",data['events']);
+                        })
+
+                    })
+                    
+                    
                     
-                    groupitemeventsdata[0] = val;
-                    groupitemeventsdata[1] = val;
-                    //初始事件
-                    X.template("funnel","funnel-event",data['events']);
                 })
             })
             
@@ -106,7 +120,6 @@
                 data['events'].push(defaultindicator);
                 X.template("funnel","funnel-event",data['events'],function(){
                     var drr = [];
-                    filtersymbols.push(drr);
                     if(data['events'].length > 2){
                         $(".analysis-del").show();
                     }else {
@@ -133,27 +146,18 @@
 
             // 添加筛选项
             function addscreen(index){
-                console.log(data);
-                X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["eventName"]},function(d){
-                    console.log(d);
-                    var arr = {
-                        "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
-                        "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
-                        "comparator":"==",
-                        "comparatorName":"等于",
-                        "ftv":[],
-                        "strftv":"",
-                        "table_type":groupitemeventsdata[0][0]['category'][0]['data_type'],
-                        "timeUnit":""
-                    }
-                    data['events'][index]['filts'].push(arr);
-                    var drr=[];
-                    filtersymbols.push(drr);
-                    groupitemeventsdata[index] = d;
-                    filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
-
-                    X.template("funnel","funnel-event",data['events']);
-                })
+                var arr = {
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],
+                    "comparator":"==",
+                    "comparatorName":"等于",
+                    "ftv":[],
+                    "strftv":"",
+                    "table_type":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "timeUnit":""
+                }
+                data['events'][index]['filts'].push(arr);
+                X.template("funnel","funnel-event",data['events']);
             }
 
             $(document).off('click','.analysis-zhibiao-updata').on('click','.analysis-zhibiao-updata',function(){
@@ -166,8 +170,6 @@
             $(document).off('click','.analysis-del').on('click','.analysis-del',function(){
                 var index = $(this).attr("data-index");
                 data['events'].splice(index,1);
-                filtersymbols[index].splice(index,1);
-                // groupitemeventsdata[index].splice(index,1);
                 X.template("funnel","funnel-event",data['events']);
             })
             
@@ -176,7 +178,6 @@
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-twonum");
                 data['events'][index]['filts'].splice(indexs,1);
-                filtersymbols[index].splice(indexs,1);
                 X.template("funnel","funnel-event",data['events']);
             })
 
@@ -198,7 +199,7 @@
                     dataevent['eventDesc'] = val.id;
 
                     X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
-                        groupitemeventsdata[index] = val;
+                        groupitemeventsdata = val;
                     })
                     // console.log(data['events']);
 
@@ -210,12 +211,9 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                console.log(groupitemeventsdata);
-                X.querycriteriapop(groupitemeventsdata[index],'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    filtersymbols[index][indexs] = val.category;
                     data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
                     data['events'][index]['filts'][indexs]['columnName'] = val.id;
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
@@ -224,33 +222,33 @@
             })
 
             // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            }
+            // function filteringdata(){
+            //     var screentypedata;
+            //     if(groupitemeventsdata.length>1){
+            //         for(var i =0; i < groupitemeventsdata.length - 1; i++){
+            //             if(i == 0){
+            //                 X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
+            //                     screentypedata = d;
+            //                 });
+            //             }else {
+            //                 X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
+            //                     screentypedata = d;
+            //                 })
+            //             }
+            //         }
+            //     }else { 
+            //         screentypedata = groupitemeventsdata[0];
+            //     }
+            //     return screentypedata;
+            // }
             
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                console.log(filtersymbols);
-                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events'][index]['filts'][indexs]['data_type'];
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['filts'][indexs]['comparatorName'] = val.title;
@@ -269,81 +267,89 @@
             })
 
             //全局筛选
-            var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = filteringdata();
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
-                    'data_type':screentypedata[0]['category'][0]['data_type'],//类型
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
+                    'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator_id":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":screentypedata[0]['id']
+                    "table_type":groupitemeventsdata[0]['id']
                 };
                 data['eventView']['filts'].push(drr);
-                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             })
 
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
                 data['eventView']['filts'].splice(index,1);
-                filtsftvdata.splice(index,1);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             })
 
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
-                    data['eventView']['filts'][index]['columnName'] = val.title;
-                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
                     data['eventView']['filts'][index]['comparator_id'] = '==';
                     data['eventView']['filts'][index]['table_type'] = val.table_type;
-                    filtsftvdata[index]=val.category;
-                    analysisdown();//渲染下拉框
                 })
             })
 
             //循环给条件框渲染下拉框
-            function analysisdown(){
-                for(let i in data['eventView']['filts']){
-                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
-                        $(this).html(val.title);
-                        data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator_id'] = val.id;
-                        if(val.id == "range"){
-                            data['eventView']['filts'][i]['ftv'] = [-1,1];
-                        }
-                        X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                            analysisdown();
-                        });
-                    })
-                }
-            }
+            // function analysisdown(){
+            //     for(let i in data['eventView']['filts']){
+            //         X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+            //             $(this).html(val.title);
+            //             data['eventView']['filts'][i]['comparator_name'] = val.title;
+            //             data['eventView']['filts'][i]['comparator_id'] = val.id;
+            //             if(val.id == "range"){
+            //                 data['eventView']['filts'][i]['ftv'] = [-1,1];
+            //             }
+            //             X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+            //                 analysisdown();
+            //             });
+            //         })
+            //     }
+            // }
+
+            $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['eventView']['filts'][index]['data_type'];
+
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['eventView']['filts'][index]['comparator_name'] = val.title;
+                    data['eventView']['filts'][index]['comparator_id'] = val.id;
+                    if(val.id == "range"){
+                        data['eventView']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+                })
+            })
+
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
@@ -354,8 +360,8 @@
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 var arr = {
-                    "columnName": "#account_id",//事件中文显示
-                    "column_id": "#account_id",//事件id
+                    "columnDesc": "#account_id",//事件中文显示
+                    "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
                     'table_type': "event",
                     "ftv":"",//条件
@@ -370,12 +376,12 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['columnName'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
                 })
@@ -411,10 +417,6 @@
             })
             var querydata;
             function retaineddata(){
-                data['cachedata']['eventdata'] = eventdata;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtersymbols'] = filtersymbols;
-                data['cachedata']['filtsftvdata'] = filtsftvdata;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -700,15 +702,10 @@
                     console.log(d);
                     if(d){
                         data = d.query;
-                        screentypearr = data.cachedata.screentypearr;
-                        filtersymbols = data.cachedata.filtersymbols;
-                        filtsftvdata = data.cachedata.filtsftvdata;
     
                         X.template("funnel","funnel-event",data['events']);
                         X.template("grouped","shushi",data['eventView']['groupBy']);
-                        X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                            analysisdown();
-                        });
+                        X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
               
                         retaineddata();
                     }
diff --git a/web/srczip/logic/groupeditemspop.js b/web/srczip/logic/groupeditemspop.js
index c4a9c4e..26bb96b 100644
--- a/web/srczip/logic/groupeditemspop.js
+++ b/web/srczip/logic/groupeditemspop.js
@@ -14,10 +14,12 @@
             console.log(data);
             if(data!= ''){
                 for(let i in arr){
-                    if(arr[i]['id'] == data['intervalType']){
-                        arr[i]['checked'] = true
-                    }else {
-                        arr[i]['checked'] = false
+                    if(data['intervalType'] != ""){
+                        if(arr[i]['id'] == data['intervalType']){
+                            arr[i]['checked'] = true
+                        }else {
+                            arr[i]['checked'] = false
+                        }
                     }
                 }
                 // 添加
diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js
index 9b904b5..58246c2 100644
--- a/web/srczip/logic/ltvmodel.js
+++ b/web/srczip/logic/ltvmodel.js
@@ -22,7 +22,6 @@
                     
                 ],
                 "cachedata":{
-                    eventdata:[],
                     groupitemeventsdata:[],
                 }
             };
@@ -51,13 +50,14 @@
             data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
-            var eventdata;
-            var groupitemeventsdata=[[],[]];//分组项里的事件
+            var groupitemeventsdata,filter_map;//分组项里的事件
 
-            X.api("data_auth/my_event","get",{},function(d){
-                eventdata = d;
-                X.api("data_auth/load_filter_props","post",{event_name:'pay'},function(val){
-                    groupitemeventsdata = val;
+            X.api("data_auth/load_filter_props","post",{event_name:'pay'},function(val){
+                groupitemeventsdata = val;
+
+                
+                X.api("data_auth/filter_map","get",{},function(d){
+                    filter_map = d;
 
                     //从数据看板点击进来触发事件
                     if(X.DATA.ltvid && X.DATA.ltvid != ''){
@@ -67,17 +67,16 @@
                             backfilldata(d[0]);
                         })
                     }
-     
                 })
             });
 
             //全局筛选
-            var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var screentypedata = groupitemeventsdata;
+
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
@@ -91,13 +90,11 @@
                     return;
                 }
                 data['eventView']['filts'].push(drr);
-                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                console.log(data);
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
@@ -116,7 +113,6 @@
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
                 data['eventView']['filts'].splice(index,1);
-                filtsftvdata.splice(index,1);
                 if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
@@ -132,13 +128,12 @@
                 X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
-                    data['eventView']['filts'][index]['columnName'] = val.title;
-                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
                     data['eventView']['filts'][index]['comparator'] = '==';
                     data['eventView']['filts'][index]['table_type'] = val.table_type;
-                    filtsftvdata[index]=val.category;
                     X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
                 })
             });
@@ -147,7 +142,9 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
-                X.querycriteriapop(filtsftvdata[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['eventView']['filts'][index]['data_type'];
+                console.log(type)
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['eventView']['filts'][index]['comparator_name'] = val.title;
@@ -162,9 +159,9 @@
             $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");
-                data['eventView']['filts'][index]['ftv'] = [];
+                var valarr = val.split(",");
                 data['eventView']['filts'][index]['strftv'] = val;
-                data['eventView']['filts'][index]['ftv'].push(val);
+                data['eventView']['filts'][index]['ftv']= valarr;
             });
 
             $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){
@@ -215,7 +212,6 @@
             });
 
             function retaineddata(){
-                data['cachedata']['eventdata'] = eventdata;
                 data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
                 var dataArr = {
                     eventView: data.eventView,
@@ -245,7 +241,6 @@
 
             function backfilldata(d){
                 data = d.query;
-                eventdata = data.cachedata.eventdata;
                 groupitemeventsdata = data.cachedata.groupitemeventsdata;
                 baobiaodata = d
 
@@ -262,6 +257,11 @@
                 }
             });
 
+            // 下载
+            $(document).off('click','.download-table').on('click','.download-table',function(){
+                console.log(11111);
+                X.download('ck/ltv_model_export',data,'事件分析');
+            });
 
         }
     };
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index c477137..84ad5ec 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -23,15 +23,7 @@
                 },
                 "events":[
                     
-                ],
-                "cachedata":{
-                    eventdata:[],
-                    initialevent:[],
-                    returnevent:[],
-                    filtersymbols:[],
-                    groupitemeventsdata:[],
-                    type2data:[]
-                }
+                ]
             };
 
             // 重新渲染控件
@@ -62,18 +54,16 @@
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
             var eventdata;
-            var filtersymbols = [[],[]];//默认两个事件
-            var groupitemeventsdata=[[],[]]//分组项里的事件
-            var type2data = [[],[]];
+            var groupitemeventsdata;//分组项里的事件
             var querydata; //计算后返回的数据
+            var filter_map,quotas_map;
 
             X.api("data_auth/my_event","get",{},function(d){
                 eventdata = d;
 
                 X.api("data_auth/load_prop_quotas","post",{event_name:eventdata[0]['category'][0]['event_name']},function(val){
                     
-                    type2data[0] = val.props;
-                    type2data[1] = val.props;
+                    type2data = val.props;
 
                     var arr = [{
                         "eventDesc":eventdata[0]['category'][0]['event_desc'],
@@ -82,8 +72,8 @@
                         "relation":"and",
                         "relationUser":"and",
                         "renameindicator":"",
-                        "event_attr": type2data[0][0]['title'],
-                        "event_attr_id": type2data[0][0]['id'],
+                        "event_attr": type2data[0]['title'],
+                        "event_attr_id": type2data[0]['id'],
                     },{
                         "eventDesc":eventdata[0]['category'][0]['event_desc'],
                         "eventName":eventdata[0]['category'][0]['event_name'],
@@ -94,27 +84,32 @@
                     }]
                     data['events'] = arr;
                     X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
-                        groupitemeventsdata[0] = val;
-                        groupitemeventsdata[1] = val;
+                        groupitemeventsdata = val;
                         //初始事件
                         // console.log(data['events'][0]);
                         X.template("event","initial-event",data['events'][0]);
                         X.template("returnvisitevent","returnvisit-event",data['events'][1]);
 
-                        //从数据看板点击进来触发事件
-                        if(X.DATA.retentionid && X.DATA.retentionid != ''){
-                            var report_idarr = [];
-                            report_idarr.push(X.DATA.retentionid);
-                            X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
-                                backfilldata(d[0]);
+                        X.api("data_auth/filter_map","get",{},function(d){
+                            filter_map = d;
+
+                            X.api('data_auth/quotas_map',"get",{},function(d){
+                                quotas_map = d;
+                                //从数据看板点击进来触发事件
+                                if(X.DATA.retentionid && X.DATA.retentionid != ''){
+                                    var report_idarr = [];
+                                    report_idarr.push(X.DATA.retentionid);
+                                    X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
+                                        backfilldata(d[0]);
+                                    })
+                                }
                             })
-                        }
 
+                        })
 
+                        
                     })
-
                 })
-                
             });
 
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
@@ -122,7 +117,7 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 if(type2data.length >0){
-                    X.querycriteriapop(type2data[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                    X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                         // if(val != undefined){
                             console.log(val);
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
@@ -162,73 +157,40 @@
             });
 
             // 添加初始事件筛选
-            // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-initial-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
-            //     var arr = {
-            //         "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
-            //         "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
-            //         "comparator":"==",
-            //         "comparatorName":"等于",
-            //         "ftv":[],
-            //         "strftv":"",
-            //         "tableType":groupitemeventsdata[0][0]['category'][0]['data_type'],
-            //         "timeUnit":""
-            //     }
-            //     data['events'][0]['filts'].push(arr);
-            //     filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
-            //     X.template("event","initial-event",data['events'][0]);
-            // })
-
-            // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-return-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
-            //     var arr = {
-            //         "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
-            //         "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
-            //         "comparator":"==",
-            //         "comparatorName":"等于",
-            //         "ftv":[],
-            //         "strftv":"",
-            //         "tableType":groupitemeventsdata[1][0]['category'][0]['data_type'],
-            //         "timeUnit":""
-            //     }
-            //     data['events'][1]['filts'].push(arr);
-            //     filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
-            //     X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-            // })
-
-            // 添加初始事件筛选
-            var initialevent = []
+            // var initialevent = []
             $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){
                 var arr = {
-                    "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
-                    "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],
                     "comparator":"==",
                     "comparatorName":"等于",
                     "ftv":[],
                     "strftv":"",
-                    "tableType":groupitemeventsdata[0][0]['category'][0]['data_type'],
+                    "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
-                initialevent.push(arr);
-                data['events'][0]['filts'] = initialevent;
-                filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
+                // initialevent.push(arr);
+                data['events'][0]['filts'].push(arr);
 
                 X.template("event","initial-event",data['events'][0]);
             });
             var returnevent = [];
             $(document).off('click','.analysis-shaix-return-event').on('click','.analysis-shaix-return-event',function(){
                 var arr = {
-                    "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
-                    "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],
                     "comparator":"==",
                     "comparatorName":"等于",
                     "ftv":[],
                     "strftv":"",
-                    "tableType":groupitemeventsdata[1][0]['category'][0]['data_type'],
+                    "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
                 // data['events'][1]['filts'].push(arr);
                 returnevent.push(arr);
                 data['events'][1]['filts'] = returnevent;
-                filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
             });
 
@@ -236,14 +198,12 @@
             $(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'][0]['filts'].splice(index,1);
-                filtersymbols[0].splice(index,1);
                 X.template("event","initial-event",data['events'][0]);
             });
 
             $(document).off('click','.analysis-zhibiao-list-del-return-event').on('click','.analysis-zhibiao-list-del-return-event',function(){
                 var index = $(this).attr("data-twonum");
                 data['events'][1]['filts'].splice(index,1);
-                filtersymbols[1].splice(index,1);
                 X.template("returnvisitevent","return-event",data['events'][1]);
             });
             
@@ -264,18 +224,9 @@
                 var dataevent= data['events'][index];
                 // console.log(dataevent);
                 X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
                     obj.html(val.id);
                     dataevent['eventName'] = val.name;
                     dataevent['eventDesc'] = val.id;
-
-                    X.api("data_auth/load_prop_quotas","post",{event_name:val.name},function(val){
-                        type2data[index] = val.props;
-                    })
-
-                    X.api("data_auth/load_filter_props","post",{event_name:val.name},function(val){
-                        groupitemeventsdata[index] = val;
-                    })
                     // console.log(data['events']);
 
                 })
@@ -286,11 +237,9 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    filtersymbols[index][indexs] = val.category;
                     data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
                     data['events'][index]['filts'][indexs]['columnName'] = val.id;
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
@@ -298,35 +247,15 @@
                     
                 })
             });
-
-            // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                console.log(groupitemeventsdata);
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            };
             
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
-                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events'][index]['filts'][indexs]['data_type'];
+                console.log(type);
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events'][index]['filts'][indexs]['comparatorName'] = val.title;
@@ -347,11 +276,12 @@
             //全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = groupitemeventsdata[0];
+                var screentypedata = groupitemeventsdata;
                 console.log(screentypedata);
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
+                    //"column_id":screentypedata[0]['category'][0]['id'],
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator":'==',//符号id
@@ -367,9 +297,7 @@
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
             //删除指定全局数据
@@ -382,45 +310,59 @@
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
-                    data['eventView']['filts'][index]['columnName'] = val.title;
-                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
                     data['eventView']['filts'][index]['comparator'] = '==';
                     data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
-                    analysisdown();//渲染下拉框
                 })
             });
 
             //循环给条件框渲染下拉框
-            function analysisdown(){
-                for(let i in data['eventView']['filts']){
-                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
-                        $(this).html(val.title);
-                        data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator'] = val.id;
-                        if(val.id == "range"){
-                            data['eventView']['filts'][i]['ftv'] = [-1,1];
-                        }
-                        X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                            analysisdown();
-                        });
-                    })
-                }
-            };
+            // function analysisdown(){
+            //     for(let i in data['eventView']['filts']){
+            //         X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+            //             $(this).html(val.title);
+            //             data['eventView']['filts'][i]['comparator_name'] = val.title;
+            //             data['eventView']['filts'][i]['comparator'] = val.id;
+            //             if(val.id == "range"){
+            //                 data['eventView']['filts'][i]['ftv'] = [-1,1];
+            //             }
+            //             X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+            //                 analysisdown();
+            //             });
+            //         })
+            //     }
+            // };
+
+            $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['eventView']['filts'][index]['data_type'];
+                console.log(type);
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['eventView']['filts'][index]['comparator_name'] = val.title;
+                    data['eventView']['filts'][index]['comparator'] = val.id;
+                    if(val.id == "range"){
+                        data['eventView']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+                })
+            }); 
 
             $(document).off('click','.analysis-overall-situation-input input').on('change','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr('data-index');
@@ -440,8 +382,8 @@
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
                 var arr = {
-                    "columnName": "#account_id",//事件中文显示
-                    "column_id": "#account_id",//事件id
+                    "columnDesc": "#account_id",//事件中文显示
+                    "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
                     'tableType': "event",
                     "ftv":"",//条件
@@ -456,11 +398,11 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
-                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['columnName'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['tableType'] = val.tableType;
                 })
@@ -509,11 +451,6 @@
             });
 
             function retaineddata(){
-                data['cachedata']['eventdata'] = eventdata;
-                data['cachedata']['initialevent'] = initialevent;
-                data['cachedata']['returnevent'] = returnevent;
-                data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtersymbols'] = filtersymbols;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -545,18 +482,11 @@
             var baobiaodata;//以存报表数据
             function backfilldata(d){
                 data = d.query;
-                eventdata = data.cachedata.eventdata;
-                initialevent = data.cachedata.initialevent;
-                returnevent = data.cachedata.returnevent;
-                filtersymbols = data.cachedata.filtersymbols;
-                groupitemeventsdata = data.cachedata.groupitemeventsdata;
                 baobiaodata = d;
 
                 X.template("event","initial-event",data['events'][0]);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
-                    analysisdown();
-                });
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
       
                 retaineddata();
@@ -573,7 +503,7 @@
             function retainedtable(d){
                 var nname,pname
 
-                if(data['eventView']['filter_item_type'] != "all"){
+                if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
                     var filteritem = data['eventView']['filter_item'];
                     if(d['days'].length >= 7){
                         var filterarr = [];
@@ -614,7 +544,7 @@
                             n:0,
                             p:0
                         }
-                        if(data['eventView']['filter_item_type'] != "all"){
+                        if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
                             for(let a in filterarr){
                                 var index = Number(filterarr[a]);
                                 if(j == index){
@@ -633,7 +563,7 @@
                 }
     
                 var titdata = [];
-                if(data['eventView']['filter_item_type'] != "all"){
+                if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
                     var titarr = [];
                     for(let j in filterarr){
                         var index = Number(filterarr[j]);
@@ -651,7 +581,7 @@
                 }
                 titdata.unshift("日期",d.title);
                 console.log(titdata);
-             
+                console.log(tabledata);
 
                 // X.fixedTable('table-div-box','row-col-fixed','',headdata);
 
@@ -884,7 +814,7 @@
             });
 
             //显示设置
-            $(document).off('click','.analtsis-condition').on('click','.analtsis-condition',function(){
+            $(document).off('click','.analtsis-condition-xssz').on('click','.analtsis-condition-xssz',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 // offset.left,offset.top+obj.height()
@@ -912,7 +842,6 @@
                     $(".showsetup-wancheng").hide();
                     $(".showsetup-bianji-show-box-type").hide();
                     $(".showsetup-bianji-input-box-type").hide();
-                   
                 }
                 data['eventView']['filter_item_type'] = val.value;
                 if(querydata){
@@ -945,7 +874,20 @@
 
             function unique (arr) {
                 return Array.from(new Set(arr))
-              }
+            };
+            
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                // X.gourl("dashboard");
+                return;
+            });
+
+            // 下载
+            $(document).off('click','.download-table').on('click','.download-table',function(){
+                console.log(11111);
+                X.download('ck/retention_model_export',data,'事件分析');
+            });
+
 
         }
     };
diff --git a/web/srczip/logic/routeanalysis.js b/web/srczip/logic/routeanalysis.js
index a6bf81a..ebb8f1b 100644
--- a/web/srczip/logic/routeanalysis.js
+++ b/web/srczip/logic/routeanalysis.js
@@ -1,12 +1,7 @@
 (function(){
     X.pageLogic['routeanalysis'] = {
         init : function(){
-            var eventdata = {};
-            var filtsftvdata =[];
-            X.api("data_auth/my_event","get",{},function(d){
-                eventdata['list'] = d;
-            })
-
+            
             var data = {
                 "eventView":{
                     "cksql":'trace',
@@ -36,8 +31,6 @@
                 },
                 "cachedata":{
                     "event_names":[],
-                    "groupitemeventsdata":[],
-                    "filtsftvdata":[]
                 }
             }
 
@@ -60,9 +53,23 @@
             data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
+            var filter_map;
+            var eventdata = {};
+            var filtsftvdata =[];
+            var groupitemeventsdata = [];
+            X.api("data_auth/my_event","get",{},function(d){
+                eventdata['list'] = d;
+                X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
+                    groupitemeventsdata= val;
+                })
+            });
+            X.api("data_auth/filter_map","get",{},function(d){
+                filter_map = d;
+            });
+            
+
             $(document).off('click','.eventsplit').on('click','.eventsplit',function(){
                 var routeevent = X['DATA']['routeevent'];
-                console.log(routeevent);
                 if( routeevent && routeevent.length > data['events']['by_fields'].length){
                     var arr = {
                         "eventName": routeevent[data['events']['by_fields'].length]['id'],
@@ -77,21 +84,14 @@
                     };
                     data['events']['by_fields'].push(arr);
                     X.laytpldata("#eventsplit-box-dot",data['events']['by_fields'],".eventsplit-box");
-
-                    X.api("data_auth/load_filter_props","post",{event_name:routeevent[data['events']['by_fields'].length]['id']},function(val){
-                        console.log(val);
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
-                
                 }
-            })
+            });
 
             $(document).off('click','.route-action-right').on('click','.route-action-right',function(){
                 var index = $(this).attr('data-index');
                 data['events']['by_fields'].splice(index,1);
                 X.laytpldata("#eventsplit-box-dot",data['events']['by_fields'],".eventsplit-box");
-            })
+            });
             
             $(document).off('click','.participate-box').on('click','.participate-box',function(){
                 var obj = $(this);
@@ -124,14 +124,9 @@
                     data['events']['source_event']['eventDesc'] = X.DATA['routeevent'][0]['title'];
                     X.template("route","event-roue-event",data['events']['source_event']);
 
-                    X.api("data_auth/load_filter_props","post",{event_name:val[0]['event_name']},function(val){
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
                 })
-            })
+            });
 
-            var groupitemeventsdata = [];
             $(document).off('click','.route-ant-select-selector1').on('click','.route-ant-select-selector1',function(){
                 var obj = $(this);
                 var offset = obj.offset();
@@ -140,46 +135,21 @@
                     obj.html(val.title);
                     data['events']['by_fields'][index]['eventDesc'] = val.title;
                     data['events']['by_fields'][index]['eventName'] = val.id;
-                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
-                        console.log(val);
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
+                  
                 })
-            })
-
-            // 过滤数据
-            function filteringdata(){
-                var screentypedata;
-                if(groupitemeventsdata.length>1){
-                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
-                        if(i == 0){
-                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            });
-                        }else {
-                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
-                                screentypedata = d;
-                            })
-                        }
-                    }
-                }else { 
-                    screentypedata = groupitemeventsdata[0];
-                }
-                return screentypedata;
-            }
+            });
 
             $(document).off('click','.route-ant-select-selector2').on('click','.route-ant-select-selector2',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr('data-index');
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
                     data['events']['by_fields'][index]['eventDesc'] = val.title;
                     data['events']['by_fields'][index]['eventName'] = val.id;
                 })
-            })
+            });
 
             $(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
                 var index = $(this).attr('data-index');
@@ -191,47 +161,42 @@
                         data['events']['by_fields'][index]['quotaIntervalArr'] = val.quotaIntervalArr;
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
                 data['events']['user_filter']['filts'].splice(index,1);
-                filtsftvdata.splice(index,1);
                 if(data['events']['user_filter']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-            })
+            });
 
            $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){
                 addscreen(0)
-           })
+           });
 
            $(document).off('click','.analysis-zhibiao-updata-initial-event').on('click','.analysis-zhibiao-updata-initial-event',function(){
                 addscreen(0)
-            })
+            });
 
            // 添加筛选项
-           var filtersymbols = [];
            function addscreen(index){
-                X.api('data_auth/load_filter_props',"post",{event_name:data['events']['source_event']["eventName"]},function(d){
-                    var arr = {
-                        "columnDesc":d[0]['category'][0]['title'],//事件中文显示
-                        "columnName":d[0]['category'][0]['id'],//事件id
-                        "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
-                        "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
-                        "data_type":d[0]['category'][0]['data_type'],
-                        "ftv":[],//条件
-                        "strftv":'',//字符串显示条件
-                        "tableType": d[0]['id']
-                    } //筛选数据
-                    data['events']['source_event']['filts'].push(arr);
-                    X.template("route","event-roue-event",data['events']['source_event']);  //更新事件
-                    // screentypearr[index] = d;
-                    filtersymbols.push(d[0]['category'][0]["category"]);
-                })
-            }
+               console.log(groupitemeventsdata);
+                var arr = {
+                    "columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
+                    "comparator_name": filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['title'],//选择符号中文显示
+                    "comparator":filter_map[groupitemeventsdata[0]['category'][0]['data_type']][0]['id'],//符号id
+                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
+                    "ftv":[],//条件
+                    "strftv":'',//字符串显示条件
+                    "tableType": groupitemeventsdata[0]['id']
+                } //筛选数据
+                data['events']['source_event']['filts'].push(arr);
+                X.template("route","event-roue-event",data['events']['source_event']);  //更新事件
+            };
 
             $(document).off('click','.analysis-con-left-screen-list-right-screen-qh-tit').on('click','.analysis-con-left-screen-list-right-screen-qh-tit',function(){
                 if($(this).html() == '或'){
@@ -241,7 +206,7 @@
                     $(this).html('或');
                     data['events']["source_event"]['relation'] = 'and';
                 }
-            })
+            });
 
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -250,13 +215,8 @@
                     obj.html(val.title);
                     data['events']['source_event']['eventDesc']= val.title;
                     data['events']['source_event']['eventName'] = val.id;
-                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
-                        console.log(val);
-                        // defaultgroupdata = val;
-                        groupitemeventsdata.push(val);
-                    })
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
                 var eventdata = [
@@ -271,27 +231,27 @@
                     data['events']['source_event']['source_type'] = val.id;
                     
                 })
-            })
+            });
 
             $(document).off("click",".ta-property-select").on('click','.ta-property-select',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    filtersymbols[indexs] = val.category;
                     data['events']['source_event']['filts'][indexs]['columnDesc'] = val.title;
                     data['events']['source_event']['filts'][indexs]['columnName'] = val.id;
                     data['events']['source_event']['filts'][indexs]['data_type'] = val.type;
                     data['events']['source_event']['filts'][indexs]['tableType'] = val.table_type;
                 })
-            })
+            });
 
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var indexs = $(this).attr("data-indexs");
-                X.querycriteriapop(filtersymbols[indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events']['source_event']['filts'][indexs]['data_type'];
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events']['source_event']['filts'][indexs]['comparator_name'] = val.title;
@@ -299,7 +259,7 @@
                         X.template("userpar","userpar-event",data['events']); 
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var indexs = $(this).attr("data-indexs");
@@ -307,14 +267,14 @@
                 var valarr = val.split(",");
                 data['events']['source_event']['filts'][indexs]['ftv']=valarr;
                 data['events']['source_event']['filts'][indexs]['strftv']=val;
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = filteringdata();
+                var screentypedata = groupitemeventsdata;
                 if(!screentypedata) {alert('请先选择参与分析事件'); return;}
                 var drr={
-                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
                     "comparator_id":'==',//符号id
@@ -324,7 +284,6 @@
                     "table_type":screentypedata[0]['id']
                 };
                 data['events']['user_filter']['filts'].push(drr);
-                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['events']['user_filter']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
@@ -332,27 +291,27 @@
                 }
                 X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']);
 
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    data['events']['user_filter']['filts'][index]['columnName'] = val.title;
-                    data['events']['user_filter']['filts'][index]['column_id'] = val.id;
+                    data['events']['user_filter']['filts'][index]['columnDesc'] = val.title;
+                    data['events']['user_filter']['filts'][index]['columnName'] = val.id;
                     data['events']['user_filter']['filts'][index]['data_type'] = val.type;
                     data['events']['user_filter']['filts'][index]['tableType'] = val.table_type;
-                    filtsftvdata[index] = val.category;
                 })
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = $(this).attr("data-index");
-                X.querycriteriapop(filtsftvdata[index],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                var type = data['events']['user_filter']['filts'][index]['data_type'];
+                X.querycriteriapop(filter_map[type],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
                         data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
@@ -363,12 +322,12 @@
                         X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']);
                     }
                 })
-            })
+            });
             $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");
                 data['events']['user_filter']['filts'][index]['strftv'] = val;
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){
                 var name = $(this).attr('name');
@@ -382,23 +341,23 @@
                     data['events']['user_filter']['filts'][index]['ftv'][1] = val;
                     data['events']['user_filter']['filts'][index]['section'][1] = val;
                 }
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
                 {'title':'秒','id':'second'},
                 {'title':'分钟','id':'minute'},
                 {'title':'小时','id':'hour'},
-            ]
+            ];
             X.laydropdown('.route-condition',timeParticleSizearr,function(d){
                 console.log(d);
                 $(".route-condition").html(d.title);
                 data['eventView']['session_type'] = parseInt(d.id);
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-box2 input').on('blur','.analysis-con-left-screen-box2',function(){
                 data['eventView']['session_interval'] =parseInt($('.analysis-con-left-screen-box2 input').val());
-            })
+            });
 
             //计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
@@ -409,7 +368,6 @@
             function calculationdata(){
                 data['cachedata']['event_names'] = X['DATA']['routeevent'];
                 data['cachedata']['groupitemeventsdata'] = groupitemeventsdata;
-                data['cachedata']['filtsftvdata'] = filtsftvdata;
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -417,7 +375,7 @@
                 X.api("ck/trace_model","post",dataArr,function(d){
                     routeanalysisdata(d);
                 })
-            }
+            };
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
@@ -426,18 +384,17 @@
                 X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                     
                 })
-            })
+            });
 
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 X.parametersopen(data,'savereport','auto')  
-            })
+            });
 
             $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
                 X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
                     console.log(d);
                     if(d){
                         data = d.query;
-                        filtsftvdata = data.cachedata.filtsftvdata;
                         groupitemeventsdata = data.cachedata.groupitemeventsdata;
                         $('.route-time-input').val(data['eventView']['session_interval']);
                         if(data['eventView']['session_type'] == "second"){
@@ -459,7 +416,7 @@
                     }
 
                 })
-            })
+            });
 
             function routeanalysisdata(d){
                 var myChart = echarts.init(document.getElementById('routeanalysis-echarts'));
@@ -514,7 +471,7 @@
                         }
                     ]
                 });
-            }
+            };
 
         }
     };
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index 2ace947..02bc111 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -8,7 +8,8 @@
 .analysis-navigation-bar-right { display: flex; justify-content: space-between; align-items: center; }
 .analysis-navigation-bar-right-jisuan { display: flex; align-items: center; } 
 .modify-layui-form-item { margin-bottom: 7px !important; margin-left: 8px; }
-.analysis-navigation-bar-right-img { border-radius: 2px; padding: 4px; margin-left: 24px; cursor: pointer; }
+.analysis-navigation-bar-right-img { display: flex; align-items: center; border-radius: 2px; padding: 4px; margin-left: 24px; cursor: pointer; }
+.analysis-navigation-bar-right-img span { margin-left: 5px; color: #67729d; }
 .analysis-navigation-bar-right-img:hover { background-color: #f0f2f5; }
 /* .analysis-navigation-bar-right img { } */
 
@@ -30,7 +31,7 @@
 .saved-sousuo-box input:hover { border: 1px solid #3d90ff; }
 .saved-select-type{ width: 100%; color: #42546d; height: 38px; border: 1px solid #eee; }
 
-.saved-list-box{ padding: 0px 16px 8px 16px; }
+.saved-list-box{ padding: 0px 16px 8px 16px; height: calc(100% - 230px); overflow: scroll; }
 .saved-list { margin-top: 8px; display: flex; justify-content: space-between; align-items: center; cursor: pointer; background-color: #ffffff;  padding: 8px 0; font-size: 12px; color: #42546d;}
 .saved-list img { margin-left: 6px; margin-right: 6px; }
 .saved-list-del {display: none; width: 14px; height: 14px; margin-right: 6px; cursor: pointer; background: url("../img/cha1.png") no-repeat 100%; background-position: center; }
diff --git a/web/static/img/fanhui.png b/web/static/img/fanhui.png
new file mode 100644
index 0000000000000000000000000000000000000000..374a548e992ff43916ab5aacf00e8f925025d596
GIT binary patch
literal 344
zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$5=lfsR5(wil08lWQ51#G8ECLHA?gC?>`dH(g*By#nE}QS2>})$E`V2%kjxu0
zQ?dvsZ0&4Z0Tfbdt8uP*#Slj3C%~(2-o59$zr>M`N9vIYX!WN<Up0qC33dQRNLWus
zsFhP#;U-{P7-tnk&#_Ih)&M``_vg(YyUWeLG1A02rGF7J^Hig4ViG0(2W_{|=uXc{
zrScUJ)dAcK@aQXNlG<Yo%9?>Y2wn+V-pIZ#98y{<t$r8~a;uedeh|Rz1)AiYr|gr1
z01ty;A;Jr-?906XolaQ&E=P5c6SHD-XbFJZ3tzI<M@vpcPy<i_FxSet*;!*A0F+Mv
qE0FJcWc!IjD!TVP|6Vgl1N{LG-&he?l^eYP0000<MNUMnLSTZWK#FMq

literal 0
HcmV?d00001