From 1f87f4ec17f76c68ed98ae216cadc5cf47edd00e Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 29 Jul 2021 22:31:44 +0800
Subject: [PATCH] 111

---
 web/pages/analysis.html              |   2 +-
 web/pages/dashboard.html             |  58 +-
 web/pages/event.html                 |   2 +
 web/pages/kanbanadmin.html           |   2 +-
 web/pages/modeltable.html            |  84 ++-
 web/pages/retained.html              |   2 +-
 web/pages/returnvisitevent.html      |   2 +
 web/src/x.min.js                     | 850 ++++++++++++++++-----------
 web/srczip/base/ajaxpage.js          |  26 +-
 web/srczip/common.js                 |   1 -
 web/srczip/logic/analysis.js         | 193 +++---
 web/srczip/logic/dashboard.js        | 428 +++++++++-----
 web/srczip/logic/funnelanalysis.js   |   6 +-
 web/srczip/logic/kanbanadmin.js      |   3 +-
 web/srczip/logic/modeltable.js       |  19 +-
 web/srczip/logic/retained.js         | 172 +++---
 web/srczip/logic/returnvisitevent.js |   2 +-
 web/static/css/style.css             |   5 +-
 18 files changed, 1097 insertions(+), 760 deletions(-)

diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index 6dcb331..2166933 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -230,7 +230,7 @@
             <div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box-{{index}}">
         {{#  } }} 
             
-            {{#  if(item.eventNameDisplay != " " && item.eventNameDisplay != undefined){ }}
+            {{#  if(item.eventNameDisplay != "" && item.eventNameDisplay != undefined){ }}
             <div class="analysis-con-left-screen-list-left-zhibiaoname" id="analysis-con-left-screen-list-left-zhibiaoname-{{index}}" style="display: block;">
                 <input type="text" placeholder="请输入指标名" value="{{item.eventNameDisplay}}" class="analysis-con-left-screen-list-left-zhibiaoname-txt" data-index="{{index}}"/>
             </div>
diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 154a8a5..ea9a86f 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -315,7 +315,7 @@
     <div class="Screen"></div>
 
     <!-- 导航操作弹窗 -->
-    <div class="TabOperation_box" id="TabOperation_box">
+    <!-- <div class="TabOperation_box" id="TabOperation_box">
         <ul id="TabOperation">
             <li>
                 <img src="./static/img/xiugai.png"/>
@@ -334,10 +334,10 @@
                 <span>删除看板</span>
             </li>
         </ul>
-    </div>
+    </div> -->
 
     <!-- 修改看板名称 -->
-    <div class="modifyname-bg">
+    <!-- <div class="modifyname-bg">
         <div class="modifyname-box">
             <div class="modifyname-top">
                 <p>看板名称</p>
@@ -352,9 +352,9 @@
                 <div class="modifyname-qd" id="modifyname-qd">确定</div>
             </div>
         </div>
-    </div>
+    </div> -->
     <!-- 移动看板 -->
-    <div class="yidong-bg">
+    <!-- <div class="yidong-bg">
         <div class="yidong-box">
             <div class="yidong-top">
                 <p>移动至</p>
@@ -376,10 +376,10 @@
                 <div class="yidong-qd" id="yidong-qd">确定</div>
             </div>
         </div>
-    </div>
+    </div> -->
 
     <!-- 复制看板 -->
-    <div class="copy-bg">
+    <!-- <div class="copy-bg">
         <div class="copy-box">
             <div class="copy-top">
                 <p>复制看板</p>
@@ -407,10 +407,10 @@
                 <div class="copy-qd" id="copy-qd">确定</div>
             </div>
         </div>
-    </div>
+    </div> -->
 
     <!-- 删除 -->
-    <div class="del-bg">
+    <!-- <div class="del-bg">
         <div class="del-box">
             <div class="del-xinxi">
                 <div class="del-tit"><img src="./static/img/redtishi.png">操作提示</div>
@@ -422,15 +422,11 @@
                 <div class="del-qd" id="del-qd">删除</div>
             </div>
         </div>
-    </div>
+    </div> -->
 
     <!-- 控件设置 -->
-    <div class="kongjian-bg">
+    <!-- <div class="kongjian-bg">
         <div class="kongjian-box">
-            <!-- <div class="kongjian-top">
-                <p>控件设置</p>
-                <img src="./static/img/cha.png" id="copy-cha"/>
-            </div> -->
             <div class="chuangjiankongjian-box">
                 <p class="chuangjiankongjian-tit">创建空间</p>
                 <p class="chuangjiankongjian-tit2">选择成员创建共享空间，添加看板至空间实现统一共享</p>
@@ -462,7 +458,7 @@
                 </div>
             </div>
         </div>
-    </div>
+    </div> -->
 
     <!-- 新建看板 -->
     <!-- <div class="new-bg">
@@ -601,15 +597,15 @@
 
     {{#  if(d.modelsize === "small"){ }}
 
-        <div class="layui-col-md3">
+        <div class="layui-col-md3" id="model{{d.id}}">
             <div class="layui-card">
                 <div class="row-top">
                     <div class="row-tit">
-                        <p><a href="#">{{d.name}}</a></p>
+                        <p><a href="javascript:;" class="gobaobiaoinfo" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.name}}</a></p>
                     </div>
                     <div class="control">
                         <div class="action-box" >
-                            <div class="tishi" title="更新">
+                            <div class="tishi model-gengx" data-id="{{d.id}}" title="更新">
                                 <img src="./static/img/gengxin.png" />
                             </div>
                             <div class="tishi" title="探索">
@@ -650,20 +646,21 @@
     {{# } else { }}
 
     {{#  if(d.modeltype === "table"){ }}
+    
         {{#  if(d.modelsize === "large"){ }}
-            <div class="layui-col-md12">
+            <div class="layui-col-md12" id="model{{d.id}}">
         {{# } else { }}
-            <div class="layui-col-md6">
+            <div class="layui-col-md6" id="model{{d.id}}">
         {{#  } }} 
         <!-- <div class="layui-col-md6" style="float: none;"> -->
             <div class="layui-card">
                 <div class="row-top">
                     <div class="row-tit">
-                        <p><a href="#">{{d.name}}</a></p>
+                        <p><a href="javascript:;" class="gobaobiaoinfo" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.name}}</a></p>
                     </div>
                     <div class="control">
                         <div class="action-box" >
-                            <div class="tishi" title="更新">
+                            <div class="tishi model-gengx"  data-id="{{d.id}}" title="更新">
                                 <img src="./static/img/gengxin.png" />
                             </div>
                             <div class="tishi" title="探索">
@@ -684,8 +681,8 @@
                         <div class="xian"></div>
                         <span>按天</span>
                     </div>
-                    <div class="chart control">
-                        <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
+                    <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
+                        <img src="./static/img/qvshitu.png" /> <span>报表</span>
                     </div>
                 </div>
                 
@@ -744,21 +741,21 @@
         
     {{#  } else { }}
         {{#  if(d.modelsize === "large"){ }}
-            <div class="layui-col-md12">
+            <div class="layui-col-md12" id="model{{d.id}}">
         {{# } else { }}
-            <div class="layui-col-md6">
+            <div class="layui-col-md6" id="model{{d.id}}">
         {{#  } }} 
             <div class="layui-card">
                 <div class="row-top">
                 <div class="row-tit">
-                    <p><a href="#">{{d.name}}</a></p>
+                    <p><a href="javascript:;" class="gobaobiaoinfo" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.name}}</a></p>
                     <div class="tishi" title="活跃用户可以通过“登录.触发用户数”来进行计算，即有登录行为的用户的去重数.">
                         <img src="./static/img/tishi.png" />
                     </div>
                 </div>
                 <div class="control">
                     <div class="action-box" >
-                        <div class="tishi" title="更新">
+                        <div class="tishi model-gengx"  data-id="{{d.id}}" title="更新">
                             <img src="./static/img/gengxin.png" />
                         </div>
                         <div class="tishi" title="探索">
@@ -777,7 +774,7 @@
                     <div class="xian"></div>
                     <span>按天</span>
                 </div>
-                <div class="chart control">
+                <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
                     <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
                 </div>
                 </div>
@@ -811,5 +808,4 @@
 
 
 {{#  } }} 
-    
 </script>
diff --git a/web/pages/event.html b/web/pages/event.html
index f3e345b..37ee923 100644
--- a/web/pages/event.html
+++ b/web/pages/event.html
@@ -10,6 +10,8 @@
             <div class="analysis-con-left-screen-list-left" style="margin-left: 24px;">
                 <div class="analysis-zhibiao-list">
                     <div class="ant-dropdown-trigger ant-dropdown-trigger0 analysis-zhibiao-list-type1 analysis-background" data-index="0"> {{d.eventDesc}}</div>
+                    <span style="margin-left: 6px;">的</span>
+                    <div id="analysis-zhibiao-list-type2-0" class="analysis-zhibiao-list-type2 analysis-background" data-index="0">{{d.event_attr}}</div>
                 </div>
             </div>
             {{#  if(d.filts.length > 0){ }}
diff --git a/web/pages/kanbanadmin.html b/web/pages/kanbanadmin.html
index 6285c72..374a536 100644
--- a/web/pages/kanbanadmin.html
+++ b/web/pages/kanbanadmin.html
@@ -1,4 +1,4 @@
-<!-- 看板管理 -->
+<!-- 看板设置 -->
 <div class="kanbanadmin-box">
     <div class="kanbanadmin-top">
         <div>看板设置</div>
diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index 25972c1..859a274 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -1,19 +1,17 @@
-<div class="layui-row layui-col-space15" id="model-box" style="width: 100%; height: 780px;">
 
-</div>
-<script id="kanban-model-table-dot" type="text/html">
+<script id="kanban-model-modify-table-dot" type="text/html">
 
     {{#  if(d.modelsize === "small"){ }}
 
-        <div class="layui-col-md3">
+        <div class="layui-col-md3" id="model{{d.id}}">
             <div class="layui-card">
                 <div class="row-top">
                     <div class="row-tit">
-                        <p><a href="#">{{d.name}}</a></p>
+                        <p><a href="javascript:;" class="gobaobiaoinfo">{{d.name}}</a></p>
                     </div>
                     <div class="control">
                         <div class="action-box" >
-                            <div class="tishi" title="更新">
+                            <div class="tishi model-gengx" data-id="{{d.id}}" title="更新">
                                 <img src="./static/img/gengxin.png" />
                             </div>
                             <div class="tishi" title="探索">
@@ -54,20 +52,16 @@
     {{# } else { }}
 
     {{#  if(d.modeltype === "table"){ }}
-        {{#  if(d.modelsize === "large"){ }}
-            <div class="layui-col-md12">
-        {{# } else { }}
-            <div class="layui-col-md6">
-        {{#  } }} 
+    
         <!-- <div class="layui-col-md6" style="float: none;"> -->
             <div class="layui-card">
                 <div class="row-top">
                     <div class="row-tit">
-                        <p><a href="#">{{d.name}}</a></p>
+                        <p><a href="javascript:;" class="gobaobiaoinfo">{{d.name}}</a></p>
                     </div>
                     <div class="control">
                         <div class="action-box" >
-                            <div class="tishi" title="更新">
+                            <div class="tishi model-gengx" data-id="{{d.id}}" title="更新">
                                 <img src="./static/img/gengxin.png" />
                             </div>
                             <div class="tishi" title="探索">
@@ -82,12 +76,14 @@
                 
                 <div class="condition-box">
                     <div class="time-cond">
-                        <span>过去7天</span>
+                        <span>
+                            过去7天
+                        </span>
                         <div class="xian"></div>
                         <span>按天</span>
                     </div>
-                    <div class="chart control">
-                        <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
+                    <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
+                        <img src="./static/img/qvshitu.png" /> <span>报表</span>
                     </div>
                 </div>
                 
@@ -111,7 +107,7 @@
                                     </tr>
                                 {{#  }); }}
                             </tbody>
-                        {{# } else { }}
+                        {{# } else if(d.cat === "retention"){ }}
                             <tbody class="table-fenxi-td">
                                 {{# layui.each(d.condata, function(indexs, items) {  }}
                                 <tr >
@@ -126,42 +122,45 @@
                                 </tr>
                                 {{#  }); }}
                             </tbody>
+                        {{# } else if(d.cat === "ltv"){ }}
+                            <tbody class="table-fenxi-td">
+                                {{# layui.each(d.condata, function(indexs, items) {  }}
+                                <tr >
+                                    {{#  layui.each(items, function(indexss, itemss){ }}
+                                    <td>{{indexss}}</td>
+                                    {{#  }); }}
+                                </tr>
+                                {{#  }); }}
+                            </tbody>
                         {{#  } }} 
 
-                        
                     </table>
                 </div>
 
             </div>
-        </div>
         
     {{#  } else { }}
-        {{#  if(d.modelsize === "large"){ }}
-            <div class="layui-col-md12">
-        {{# } else { }}
-            <div class="layui-col-md6">
-        {{#  } }} 
             <div class="layui-card">
                 <div class="row-top">
-                <div class="row-tit">
-                    <p><a href="#">{{d.name}}</a></p>
-                    <div class="tishi" title="活跃用户可以通过“登录.触发用户数”来进行计算，即有登录行为的用户的去重数.">
-                        <img src="./static/img/tishi.png" />
-                    </div>
-                </div>
-                <div class="control">
-                    <div class="action-box" >
-                        <div class="tishi" title="更新">
-                            <img src="./static/img/gengxin.png" />
-                        </div>
-                        <div class="tishi" title="探索">
-                            <img src="./static/img/fangda.png" />
-                        </div>
-                        <div class="tishi" title="更多">
-                            <img src="./static/img/gengduo.png" />
+                    <div class="row-tit">
+                        <p><a href="javascript:;" class="gobaobiaoinfo">{{d.name}}</a></p>
+                        <div class="tishi" title="活跃用户可以通过“登录.触发用户数”来进行计算，即有登录行为的用户的去重数.">
+                            <img src="./static/img/tishi.png" />
+                        </div>
+                    </div>
+                    <div class="control">
+                        <div class="action-box" >
+                            <div class="tishi model-gengx" title="更新">
+                                <img src="./static/img/gengxin.png" />
+                            </div>
+                            <div class="tishi" title="探索">
+                                <img src="./static/img/fangda.png" />
+                            </div>
+                            <div class="tishi" title="更多">
+                                <img src="./static/img/gengduo.png" />
+                            </div>
                         </div>
                     </div>
-                </div>
                 </div>
                 
                 <div class="condition-box">
@@ -170,7 +169,7 @@
                     <div class="xian"></div>
                     <span>按天</span>
                 </div>
-                <div class="chart control">
+                <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
                     <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
                 </div>
                 </div>
@@ -197,7 +196,6 @@
                 </div>
 
             </div>
-        </div>
 
 
     {{#  } }} 
diff --git a/web/pages/retained.html b/web/pages/retained.html
index 3c2a9f9..c37a460 100644
--- a/web/pages/retained.html
+++ b/web/pages/retained.html
@@ -120,7 +120,7 @@
                             <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>
-                                <div class="analtsis-chart-switch" title="每日留存"> <i class="iconfont" style="font-size: 18px; ">&#xe601;</i> </div>
+                                <!-- <div class="analtsis-chart-switch" title="每日留存"> <i class="iconfont" style="font-size: 18px; ">&#xe601;</i> </div> -->
                             </div>
                         </div>
 
diff --git a/web/pages/returnvisitevent.html b/web/pages/returnvisitevent.html
index 657ee1f..2694386 100644
--- a/web/pages/returnvisitevent.html
+++ b/web/pages/returnvisitevent.html
@@ -8,6 +8,8 @@
             <div class="analysis-con-left-screen-list-left" style="margin-left: 24px;">
                 <div class="analysis-zhibiao-list">
                     <div class="ant-dropdown-trigger analysis-zhibiao-list-type1 analysis-background" data-index="1"> {{d.eventDesc}}</div>
+                    <!-- <span style="margin-left: 6px;">的</span> -->
+                    <!-- <div id="analysis-zhibiao-list-type2-1" class="analysis-zhibiao-list-type2 analysis-background" data-index="1">{{d.event_attr}}</div> -->
                 </div>
             </div>
             {{#  if(d.filts.length > 0){ }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 11b518a..53e8da5 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -266,7 +266,6 @@ var X = window.X || {
             type: 1,
             title: false,
             closeBtn: 0,
-            shade:[0.1, '#000'],
             shadeClose: true,
             offset: [deviationtop,deviationleft],
             url: url,
@@ -769,6 +768,7 @@ var X = window.X || {
             setHashParms('page',url);
 		    setContentByUrl(url,id);
         }
+        X.DATA['eventid'] = "";
     };
 
 	
@@ -783,15 +783,24 @@ var X = window.X || {
 		//设置主页，如果hash里有值的话，设置为hash的值，方便复制url传播
 		var hash = getHashParms();
 		setContentByUrl(hash.page || 'login');
-	});	
 
-    $(document).keydown(function (event) {
-        if (event.keyCode == 116) {
-            event.preventDefault(); //阻止默认刷新
-            console.log('刷新');
-            return false;                    
-        }
-    });
+        $(document).keydown(function (event) {
+            if (event.keyCode == 116) {
+                event.preventDefault(); //阻止默认刷新
+                console.log('刷新');
+                var query = window.location.href;
+                var querys = query.split("=");
+                if(querys[1]){
+                    $("#conetnt").html("");
+                    var gourl = querys[1];
+                    X.gourl(gourl,'conetnt');
+                }
+                return false;
+            }
+        });
+
+
+	});	
 
 })();
 // srczip/base/visibleChange.js
@@ -1518,7 +1527,7 @@ var X = window.X || {
         init : function(){
             var me = this;
             // 渲染form样式
-            layui.form.render(); 
+            layui.form.render();
 
             var dataArr; //分析指标
             var groupeddata;//分组项
@@ -1573,8 +1582,6 @@ var X = window.X || {
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                // console.log(parseInt((sameday - startmonth )/86400));
-                // console.log(parseInt((sameday - endmonth)/86400));
                 data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
                 calculationdata();
             })
@@ -1611,6 +1618,16 @@ var X = window.X || {
                     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]);
+                            })
+                        }
+
                     })
                 })
                 // groupeddata = d.group_by;
@@ -1649,40 +1666,43 @@ var X = window.X || {
             var baobiaodata;
             $(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;
-                        type2data = data.cachedata.type2data;
-                        type3data = data.cachedata.type3data;
-                        screentypearr = data.cachedata.screentypearr;
-                        filtersymbols = data.cachedata.filtersymbols;
-
-                        baobiaodata = d;
-                       
-                        if(d.query.eventView.filts.length > 0){
-                            $(".analysis-overall").show();
-                        }else {
-                            $(".analysis-overall").hide();
-                        }
-    
-                        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();
-                        calculationdata();
-
+                        backfilldata(d)
                     }
                 })
-            })
+            });
+
+            // 反向填充数据
+            function backfilldata(d){
+                data = d.query;
+                type2data = data.cachedata.type2data;
+                type3data = data.cachedata.type3data;
+                screentypearr = data.cachedata.screentypearr;
+                filtersymbols = data.cachedata.filtersymbols;
+
+                baobiaodata = d;
+               
+                if(d.query.eventView.filts.length > 0){
+                    $(".analysis-overall").show();
+                }else {
+                    $(".analysis-overall").hide();
+                }
+
+                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();
+                calculationdata();
+            }
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
-                    var obj = $(this);
-                    var offset = obj.offset();
-                    X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
-                        
-                    })
-            })
+                var obj = $(this);
+                var offset = obj.offset();
+                X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
+                    
+                })
+            });
 
             // 切换为指标公式
             $(document).on('click','.analysis-gongshi',function(){
@@ -1692,7 +1712,7 @@ var X = window.X || {
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-zhibiao").show();
 
-            })
+            });
             
             // 切换为指标选择
             $(document).on('click','.analysis-zhibiao',function(){
@@ -1701,7 +1721,7 @@ var X = window.X || {
                 $("#analysis-custom-box-"+index).hide();
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-gongshi").show();
-            })
+            });
 
             //复制指标
             $(document).on('click','.analysis-fuzhi',function(){
@@ -1714,11 +1734,7 @@ var X = window.X || {
                 type3data[num] = type3data[index];
                 screentypearr[num] = screentypearr[index];
                 filtersymbols[num] = filtersymbols[index];
-            })
-
-            // $('.analysis-con-left-screen-list-left-zhibiaoname-txt').bind('input propertychange', function() {
-                
-            // })
+            });
 
             //重命名指标
             $(document).off('click','.analysis-chongmingming').on('click','.analysis-chongmingming',function() {
@@ -1726,7 +1742,7 @@ var X = window.X || {
                 $("#analysis-con-left-screen-list-left-zhibiaoname-"+index).show();
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-chongmingming-del").show();
-            })
+            });
 
             //删除重命名
             $(document).off('click','.analysis-chongmingming-del').on('click','.analysis-chongmingming-del',function() {
@@ -1735,7 +1751,7 @@ var X = window.X || {
                 $("#analysis-con-left-screen-list-left-zhibiaoname-"+index+" "+"input").val('');
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-chongmingming").show();
-            })
+            });
             
             // 设置一级事件
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function() {
@@ -1755,12 +1771,11 @@ var X = window.X || {
 
                     X.api("data_auth/load_filter_props","post",{event_name:val.name},function(d){
                         groupitemeventsdata[index] = d;
-                        console.log(groupitemeventsdata);
                     })
 
                     
                 })
-            })
+            });
             //设置一级事件中第二个参数
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
                 var obj = $(this);
@@ -1787,7 +1802,7 @@ var X = window.X || {
                         }
                     })
                 }
-            })
+            });
             //设置一级事件中第三个参数
             $(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
                 var obj = $(this);
@@ -1803,7 +1818,7 @@ var X = window.X || {
                         })
                     }
                 }
-            })
+            });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
                 var obj = $(this);
@@ -1811,7 +1826,6 @@ var X = window.X || {
                 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){
-                    console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     filtersymbols[index][indexs] = val.category;
@@ -1821,7 +1835,7 @@ var X = window.X || {
                     data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
                 })
 
-            })
+            });
 
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
@@ -1835,19 +1849,19 @@ var X = window.X || {
                         data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
-            })
+            });
 
             // 添加筛选项
             $(document).off('click','.analysis-shaix').on('click','.analysis-shaix',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 添加筛选项
             function addscreen(index){
                 X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["event_name"]},function(d){
-                    console.log(d);
+
                     var arr = {
                         "columnDesc":d[0]['category'][0]['title'],//事件中文显示
                         "columnName":d[0]['category'][0]['id'],//事件id
@@ -1865,14 +1879,14 @@ var X = window.X || {
                     screentypearr[index] = d;
                     filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
                 })
-            }
+            };
 
             //监听重命名指标
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname input',function(){
                 var index = $(this).attr("data-index");
                 var txt = $(this).val();
                 data['events'][index]['eventNameDisplay'] = txt;
-            })
+            });
 
             // 监听文本框
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
@@ -1882,7 +1896,7 @@ var X = window.X || {
                 var valarr = val.split(",");
                 data['events'][index]['filts'][indexs]['ftv']=valarr;
                 data['events'][index]['filts'][indexs]['strftv']=val;
-            })
+            });
 
             // 且和或切换
             $(document).on("click",".analysis-con-left-screen-list-right-screen-qh-tit",function(){
@@ -1895,12 +1909,12 @@ var X = window.X || {
                     $(this).html('且');
                     data['events'][index]['condrelation'] = 'and'
                 }
-            })
+            });
 
             // 添加条件按钮
             $(document).on('click',".analysis-zhibiao-updata",function(){
                 // addindex();
-            })
+            });
 
             // 删除二级筛选项
             $(document).on('click','.analysis-zhibiao-list-del',function(){
@@ -1911,7 +1925,7 @@ var X = window.X || {
                 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");
-            })
+            });
 
             // 添加指标
             function addindex(){
@@ -1930,7 +1944,6 @@ var X = window.X || {
                 data['events'].push(defaultindicator);
 
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
-                console.log(data.events);
                 var index = data.events.length - 1;
                 type2data[index]= retdata;
                 type3data[index]= [];
@@ -1944,20 +1957,20 @@ var X = window.X || {
                 }
                 screentypearr[index]=props;
                 groupitemeventsdata.push(defaultgroupdata);
-            }
+            };
 
             //添加按钮
             $(document).on('click','.analysis-jia1',function(){
 
                 addindex();
 
-            })
+            });
             //添加指标按钮
             $(document).on('click','.analysis-bottom-jia1',function(){
 
                 addindex();
 
-            })
+            });
 
             //删除指标
             $(document).on('click',".analysis-del",function(){
@@ -1970,13 +1983,13 @@ var X = window.X || {
                     }
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                 }
-            })
+            });
             
 
             $(".analysis-custom-event-box .analysis-custom-event-txt").blur(function(){
                 $(this).css("border-bottom","0px");
             
-            })
+            });
 
             $(document).off('click','.analysis-custom-event-box .analysis-custom-event-txt').on('blur','.analysis-custom-event-box .analysis-custom-event-txt',function(){
                 // $(this).css("border-bottom","1px solid #3d90ff");
@@ -1984,21 +1997,18 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 data['events'][index]['customEvent'] = $(this).val();
-                // console.log(data);
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname2 input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname2 input',function(){
                 var index = $(this).attr('data-index');
                 data['events'][index]['eventNameDisplay'] = $(this).val();
-                // console.log(data);
-            })
+            });
 
             //分组项
             var cat = "event";
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
                 var index = data['eventView']['groupBy'].length;
                 var screentypedata = filteringdata();
-                console.log(screentypedata);
                 var drr = {
                     "columnDesc":screentypedata[0]['category'][index]['title'],//事件中文显示
                     "columnName":screentypedata[0]['category'][index]['id'],//事件id
@@ -2010,7 +2020,7 @@ var X = window.X || {
                 data.eventView.groupBy.push(drr);
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
 
-            })
+            });
 
             $(document).off('click','.analysis-ant-dropdown-trigger').on('click','.analysis-ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -2025,7 +2035,7 @@ var X = window.X || {
                     data.eventView.groupBy[index]['tableType'] = val.table_type;
                     X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
                 })
-            })
+            });
 
             $(document).off('click','.analysis-granularity').on("click",".analysis-granularity",function(){
                 var obj = $(this);
@@ -2059,7 +2069,7 @@ var X = window.X || {
                 X.querycriteriapop(arr,'groupitem',offset.left,offset.top+obj.height(),function(val){
                     data.eventView.groupBy[index]['ftv'] = val.id;
                 })
-            })
+            });
 
             $(document).on("click",".analysis-section",function(){
                 var obj = $(this);
@@ -2079,17 +2089,17 @@ var X = window.X || {
                     }
                   })
 
-            })
+            });
 
             $(document).on('click','.analysis-action-right',function(){
                 var index = $(this).attr('data-index');
                 data.eventView.groupBy.splice(index,1);
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
-            })
+            });
 
             $(document).on('click','.analysis-event-splitting',function(){
 
-            })
+            });
 
             // 过滤数据
             function filteringdata(){
@@ -2110,7 +2120,7 @@ var X = window.X || {
                     screentypedata = groupitemeventsdata[0];
                 }
                 return screentypedata;
-            }
+            };
 
             // 全局筛选
             var filtsftvdata=[];
@@ -2128,7 +2138,6 @@ var X = window.X || {
                     "section":[-1,1],//区间
                     "tableType":screentypedata[0]['id']
                 };
-                // console.log(drr);
                 data['eventView']['filts'].push(drr);//上传全局数据
                 filtsftvdata.push(screentypedata[0]['category'][0]['category'])
 
@@ -2141,7 +2150,7 @@ var X = window.X || {
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
-            })
+            });
 
             //循环给条件框渲染下拉框
             function analysisdown(){
@@ -2157,7 +2166,7 @@ var X = window.X || {
                         analysisdown();
                     })
                 }
-            }
+            };
 
             $(document).on('click',".analysis-overall-situation-del",function(){
                 var index = $(this).attr("data-index");
@@ -2171,7 +2180,7 @@ var X = window.X || {
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
-            })
+            });
 
             // 全局属性选择
             $(document).off('click','.analysis-overall-situation-attr').on('click',".analysis-overall-situation-attr",function(){
@@ -2190,7 +2199,7 @@ var X = window.X || {
                     X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                     analysisdown();
                 })
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr("data-index");
@@ -2198,7 +2207,7 @@ var X = window.X || {
                 var valarr = val.split(",");
                 data['eventView']['filts'][index]['ftv']=valarr;
                 data['eventView']['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');
@@ -2212,7 +2221,7 @@ var X = window.X || {
                     data['eventView']['filts'][index]['ftv'][1] = val;
                     data['eventView']['filts'][index]['section'][1] = val;
                 }
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
@@ -2225,26 +2234,24 @@ var X = window.X || {
                 {'title':'按周','id':'P1W'},
                 {'title':'按月','id':'P1M'},
                 // {'title':'合计','id':'total'},
-            ]
+            ];
 
             X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
                 $(this).html(d.title);
                 data['eventView']['timeParticleSize'] = d.id;
                 calculationdata();
-            })
+            });
 
             X.layuidate('#analysis-overall-situation-time1');
            
             // 计算
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
-                console.log(data);
                 calculationdata();
                 
-            })
+            });
 
             var querydata;//查询数据
             $(document).on('click','.analtsis-chart-switch-box .analtsis-chart-switch',function(){
-                console.log(querydata)
                 if(querydata){
                     $('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
                     $(this).addClass('select-chart');
@@ -2257,7 +2264,7 @@ var X = window.X || {
                     // layer.msg('请先计算数据,在切换图表');
                 }
 
-            })
+            });
 
             //堆积图
             function stackingdiagram(d){
@@ -2331,7 +2338,7 @@ var X = window.X || {
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             //趋势图
             function trendchart(d){
@@ -2358,8 +2365,6 @@ var X = window.X || {
                         seriesData[i]['name'] = xAxisData[i];
                     }
                 }
-                console.log(d);
-                console.log(seriesData);
                 var myChart = echarts.init(document.getElementById('analysis-echarts'));
                 var option = {
                     title: {
@@ -2406,7 +2411,7 @@ var X = window.X || {
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             //分布图
             function distributionmap(d){
@@ -2468,8 +2473,6 @@ var X = window.X || {
 
                         }
                     }
-                    console.log(seriesData);
-                    console.log(xAxisData)
                 }
                 // for(let i in d){
                 //     for(let z in d[i]['groups']){
@@ -2528,11 +2531,10 @@ var X = window.X || {
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             //表格
             function tabledata(d){
-                console.log(d);
                 var titledata,condata = [];
                 for(let i in d){
                     if(d[i]['groups']['length'] == 0){
@@ -2540,17 +2542,14 @@ var X = window.X || {
                         titledata.unshift('指标','阶段总和');
                         condata.push(d[i].values[0]);
                         condata[i].unshift(d[i]['event_name'],d[i]['sum']);
-                        // console.log(condata);
                     }else {
 
                     }
                 }
-                console.log(titledata);
-                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;
@@ -2575,7 +2574,7 @@ var X = window.X || {
                         layer.msg("无数据");
                     }
                 })
-            }
+            };
 
             function updata(){
                var tit = $(".select-chart").attr("title");
@@ -2584,17 +2583,16 @@ var X = window.X || {
                 else if(tit == '累计图'){}
                 else if(tit == '分布图'){distributionmap(querydata)}
                 else if(tit == '饼状分布'){}
-            }
+            };
 
             // 保存报表
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
-                    console.log(baobiaodata);
                     X.parametersopen(baobiaodata,'savereport','auto');
                 }else{
                     X.parametersopen(data,'savereport','auto');          
                 }
-            })
+            });
 
         },
 
@@ -3460,6 +3458,78 @@ var X = window.X || {
                     me.gettabledata();
                 })
             });
+
+            //更新报表
+            $(document).off('click','.model-gengx').on('click','.model-gengx',function(){
+                var id = $(this).attr('data-id');
+
+                X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
+
+                    X.pageLogic['dashboard'].fillmodeldata(d[id]);
+    
+                })
+
+            });
+
+            //报表跳转到详情s
+            $(document).off('click','.gobaobiaoinfo').on('click','.gobaobiaoinfo',function(){
+                var cat = $(this).attr('data-cat');
+                var id = $(this).attr('data-id');
+                var gourl='';
+
+                // <dd><a class="ajax-content" href="analysis" data-id="conetnt">事件分析</a></dd>
+                // <dd><a class="ajax-content" href="retained" data-id="conetnt">留存分析</a></dd>
+                // <dd><a class="ajax-content" href="ltvmodel" data-id="conetnt">LTV模型</a></dd>
+                // <dd><a class="ajax-content" href="funnelanalysis" data-id="conetnt">漏斗分析</a></dd>
+                // <dd><a class="ajax-content" href="distribution" data-id="conetnt">分布分析</a></dd>
+                // <dd><a class="ajax-content" href="routeanalysis" data-id="conetnt">路径分析</a></dd>
+                // <dd><a class="ajax-content" href="sqlquery" data-id="conetnt">SQL查询</a></dd>
+
+                if(cat == 'event'){
+                    gourl = 'analysis';
+                }else if(cat == 'retention'){
+                    gourl = 'retained';
+                    layer.msg('暂未处理当前逻辑');
+                    return;
+                }else if(cat == 'ltv'){
+                    gourl = 'ltvmodel';
+                    layer.msg('暂未处理当前逻辑');
+                    return;
+                }
+                X.gourl(gourl,'conetnt');//跳到对应的分析页面
+                X.DATA[cat+'id'] = id;
+            });
+
+            //切换模板
+            // $(document).off('click','.chart').on('click','.chart',function(){
+            //     var id = $(this).attr('data-id');
+            //     var modelid = 'model'+id;
+            //     var modelsize = $(this).attr('data-modelsize');
+            //     var modeltype = $(this).attr('data-modeltype');
+            //     var cat = $(this).attr('data-cat');
+            //     var name = $(this).attr('data-name');
+
+            //     var configdata = {
+            //         graph_size:modelsize,
+            //         graph_type:modeltype,
+            //         model:cat,
+            //         name:name,
+            //         report_id:id
+            //     }
+
+            //     var obj = $(this);
+            //     var offset = obj.offset();
+            //     var dropdownlist = [
+            //         {title:'表格',id:'table'},
+            //         {title:'图形',id:'echarts'}
+            //     ]
+            //     X.querycriteriapop(dropdownlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+            //         console.log(val);
+            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
+            //             me.fillmodeldata(d[0],modelid);  
+            //         })
+            //     })
+            // });
     
             //侧边栏更多控制按钮
             // taboperation = function(e,type,id,name){
@@ -3467,13 +3537,13 @@ var X = window.X || {
             //     X.laydropdown('.kanbanwenjianimg',X.DATA.taboperationdata[type]);
             // }
 
+            // 渲染下拉框
+
+
             $(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
                 e.stopPropagation();
-                // console.log(111);
-            })
-
-         
-
+                console.log('更多操作按钮');
+            });
             
         },
 
@@ -3488,157 +3558,217 @@ var X = window.X || {
             });
         },
 
+        //填充看板数据
+        fillmodeldata:function(d,id){
+            // console.log(d);
+            X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
+                var eventdata=[];
+                if(d['model'] == "event"){
+                    // 事件分析
+                    if(d['graph_size'] == 'small'){
+                        X.eventsmall(val,function(data){//表格数据处理
+                            data['name'] = d['name'];
+                            data['modeltype'] = d['graph_type'];
+                            data['id'] = d['report_id'];
+                            data['modelsize'] = d['graph_size'];
+                            data['cat'] = d['model'];
+                            eventdata.push(data);
+                        })
+                    }else {
+                        if(d['graph_type'] == 'table'){
+                            //表格样式
+                            X.eventtable(val,function(data){//表格数据处理
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+                        }else if(d['graph_type'] == 'echarts'){
+                            //图形
+                            X.eventchart(val,function(data){
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+                        }
+                    }
+
+                } else if(d['model'] == "retention"){
+                    //留存分析
+                    if(d['graph_size'] == 'small'){
+
+                    }else {
+                        if(d['graph_type'] == 'table'){
+                            X.retentiontable(val,function(data){
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+
+                        }else {
+                            X.retentionchart(val,function(data){
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+                        }
+                    }
+                }else if(d['model'] == 'ltv'){
+                    //ltv模型
+                    if(d['graph_type'] == 'table'){
+                        X.ltvtable(val,function(data){
+                            data['name'] = d['name'];
+                            data['modeltype'] = d['graph_type'];
+                            data['id'] = d['report_id'];
+                            data['modelsize'] = d['graph_size'];
+                            data['cat'] = d['model'];
+                            eventdata.push(data);
+                        })
+                    }else {
+                        X.ltvchart(val,function(data){
+                            data['name'] = d['name'];
+                            data['modeltype'] = d['graph_type'];
+                            data['id'] = d['report_id'];
+                            data['modelsize'] = d['graph_size'];
+                            data['cat'] = d['model'];
+                            eventdata.push(data);
+                        })
+                    }
+                }
+                
+                if(eventdata.length > 0){
+                    for(var z in eventdata){
+                        if(id){
+                            X.template("modeltable",id,eventdata[z],function(){
+                                X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                            });
+                        }else {
+                            X.laytpldata("#kanban-model-table-dot",eventdata[z],null,function(html){
+                                $('#model-box').append(html);
+                                X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                            });
+                        }
+                        
+
+                        
+                    }
+                }
+            })
+        },
+
+        //画统计图和添加移入移出事件
+        morefeatures:function(eventdata){
+
+            $(".layui-card").mouseenter(function () {
+                var classname = $(this).attr('class');
+                if(classname.indexOf("tool-show") == -1){
+                    $(this).addClass('tool-show');
+                }
+            });
+            $(".layui-card").mouseleave(function () {
+                var classname = $(this).attr('class');
+                if(classname.indexOf("tool-show") != -1){
+                    $(this).removeClass('tool-show');
+                }
+            });
+            var dropdownlist = [
+                {title:'表格',id:'table'},
+                {title:'图形',id:'echarts'}
+            ];
+            X.laydropdown("#chart"+eventdata.id,dropdownlist,function(d){
+                var id = $("#chart"+eventdata.id).attr('data-id');
+                var modelid = 'model'+id;
+                var modelsize = $("#chart"+eventdata.id).attr('data-modelsize');
+                var modeltype = $("#chart"+eventdata.id).attr('data-modeltype');
+                var cat = $("#chart"+eventdata.id).attr('data-cat');
+                var name = $("#chart"+eventdata.id).attr('data-name');
+                var data = {
+                    report_id:id,
+                    graph_size:modelsize,
+                    graph_type:d.id,
+                    model:cat,
+                    name:name
+                }
+                X.api('dashboard/edit_show_report','post',{dashboard_id:X.DATA.dashboard_id,config:data},function(d){
+                    // console.log(d);
+                    X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
+                        for(let i in val){
+                            if(val[i]['report_id'] == id){
+                                X.pageLogic['dashboard'].fillmodeldata(val[i],modelid);
+                            }
+                        }
+                    })
+                })
+                
+            });
+
+            if(eventdata['modeltype'] == 'echarts' && eventdata['modelsize'] != 'small' ){
+                var myChart = echarts.init(document.getElementById(eventdata['id']));
+                var option = {
+                    title: {
+                        text: ''
+                    },
+                    color: X.DATA.echartscolor,
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross',
+                            label: {
+                                backgroundColor: '#6a7985'
+                            }
+                        }
+                    },
+                    legend: {
+                        type:'scroll',
+                        data: eventdata['legenddata']
+                    },
+                    grid: {
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        top: '10%',
+                        containLabel: true
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            boundaryGap: false,
+                            data: eventdata['xAxisData']
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: eventdata['seriesData']
+                };
+                myChart.setOption(option,true);
+            }
+        },
+
          // 获取表格数据
         gettabledata:function(){
 
             $("#model-box").html("");//清空表格数据
             
             X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
-                console.log(d);
-                var index = d.length;
-                for(let z in d){
 
-                    (function (i, model) {   // 注意这里是形参
-                        setTimeout(function () {
-                            console.log(d[i]['report_id']);
-                            X.api("ck/"+model+"_model","post",{report_id:d[i]['report_id']},function(val){
-                                var eventdata=[];
-                                if(model == "event"){
-                                    // 事件分析
-                                    if(d[i]['graph_size'] == 'small'){
-                                        X.eventsmall(val,function(data){//表格数据处理
-                                            data['name'] = d[i]['name'];
-                                            data['modeltype'] = d[i]['graph_type'];
-                                            data['id'] = d[i]['report_id'];
-                                            data['modelsize'] = d[i]['graph_size'];
-                                            eventdata.push(data);
-                                        })
-                                    }else {
-                                        if(d[i]['graph_type'] == 'table'){
-                                            //表格样式
-                                            X.eventtable(val,function(data){//表格数据处理
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                data['cat'] = model;
-                                                eventdata.push(data);
-                                            })
-                                        }else if(d[i]['graph_type'] == 'echarts'){
-                                            //图形
-                                            X.eventchart(val,function(data){
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                eventdata.push(data);
-                                            })
-                                        }
-                                    }
-        
-                                } else if(model == "retention"){
-                                    if(d[i]['graph_size'] == 'small'){
-
-                                    }else {
-                                        if(d[i]['graph_type'] == 'table'){
-                                            X.retentiontable(val,function(data){
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                data['cat'] = model;
-                                                eventdata.push(data);
-                                            })
-
-                                        }else {
-                                            X.retentionchart(val,function(data){
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                eventdata.push(data);
-                                            })
-                                        }
-                                    }
-                                }else if(model == 'ltv'){
-                                    if(d[i]['graph_type'] == 'table'){
-                                        X.ltvtable(val,function(data){
-                                            data['name'] = d[i]['name'];
-                                            data['modeltype'] = d[i]['graph_type'];
-                                            data['id'] = d[i]['report_id'];
-                                            data['modelsize'] = d[i]['graph_size'];
-                                            data['cat'] = model;
-                                            eventdata.push(data);
-                                        })
-                                    }else {
-                                        X.ltvchart(val,function(data){
-                                            data['name'] = d[i]['name'];
-                                            data['modeltype'] = d[i]['graph_type'];
-                                            data['id'] = d[i]['report_id'];
-                                            data['modelsize'] = d[i]['graph_size'];
-                                            eventdata.push(data);
-                                        })
-                                    }
-                                }
-                                index --;
-                                if(eventdata.length > 0){
-                                    console.log(eventdata);
-                                    for(var z in eventdata){
-
-                                        X.laytpldata("#kanban-model-table-dot",eventdata[z],null,function(html){
-                                            $('#model-box').append(html);
-                                        });
-
-                                        if(eventdata[z]['modeltype'] == 'echarts' && eventdata[z]['modelsize'] != 'small' ){
-                                            var myChart = echarts.init(document.getElementById(eventdata[z]['id']));
-                                            var option = {
-                                                title: {
-                                                    text: ''
-                                                },
-                                                color: X.DATA.echartscolor,
-                                                tooltip: {
-                                                    trigger: 'axis',
-                                                    axisPointer: {
-                                                        type: 'cross',
-                                                        label: {
-                                                            backgroundColor: '#6a7985'
-                                                        }
-                                                    }
-                                                },
-                                                legend: {
-                                                    type:'scroll',
-                                                    data: eventdata[z]['legenddata']
-                                                },
-                                                grid: {
-                                                    left: '2%',
-                                                    right: '2%',
-                                                    bottom: '2%',
-                                                    top: '10%',
-                                                    containLabel: true
-                                                },
-                                                xAxis: [
-                                                    {
-                                                        type: 'category',
-                                                        boundaryGap: false,
-                                                        data: eventdata[z]['xAxisData']
-                                                    }
-                                                ],
-                                                yAxis: [
-                                                    {
-                                                        type: 'value'
-                                                    }
-                                                ],
-                                                series: eventdata[z]['seriesData']
-                                            };
-                                            myChart.setOption(option,true);
-                                        }
-                                    }
-                                }
-                            })
-                
-                        }, 0 * i);	// 还是每秒执行一次，不是累加的
-                    })(z, d[z]['model'])   // 注意这里是实参，这里把要用的参数传进去
+                for(let z in d){      
 
+                    X.pageLogic['dashboard'].fillmodeldata(d[z]);
+                    
                 }
                
 
@@ -4651,11 +4781,11 @@ var X = window.X || {
                     
                     groupitemeventsdata[0] = val;
                     groupitemeventsdata[1] = val;
+                    //初始事件
+                    X.template("funnel","funnel-event",data['events']);
                 })
             })
-
-            //初始事件
-            X.template("funnel","funnel-event",data['events']);
+            
             //开启重命名
             $(document).off('click','.analysis-chongmingming-initial-event').on('click','.analysis-chongmingming-initial-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").show();
@@ -5655,6 +5785,7 @@ var X = window.X || {
                         configdata = submitdata[i];
                     }
                 }
+                console.log(configdata);
                 X.parametersopen(configdata,'kanbantypeset','auto',function(d){
                     var graph_size = d['graph_size'];
                     var graph_type = d['graph_type'];
@@ -5667,7 +5798,7 @@ var X = window.X || {
                 })
             })
             
-            //渲染已添加报表下拉框
+            //渲染已添加报表
             function toadddataprocessing(){ 
                 toadddata = [];
                 for(let i in reportlistdata){
@@ -6265,13 +6396,18 @@ var X = window.X || {
             this.callback = parms.callback;
             var data = parms;
 
-            for(var i in data){
-                X.laytpldata("#kanban-model-table-dot",data[i],null,function(html){
-                    // console.log($("#model-box").html());
-                    console.log(html);
-                    $('#model-box').append(html);
-                });
-            }
+            X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
+
+                $("#model"+data.id).html(html);
+            })
+
+            // for(var i in data){
+            //     X.laytpldata("#kanban-model-table-dot",data[i],null,function(html){
+            //         // console.log($("#model-box").html());
+            //         console.log(html);
+            //         $('#model-box').append(html);
+            //     });
+            // }
            
 
         }
@@ -6908,6 +7044,7 @@ var X = window.X || {
                     returnevent:[],
                     filtersymbols:[],
                     groupitemeventsdata:[],
+                    type2data:[]
                 }
             };
 
@@ -6918,7 +7055,7 @@ var X = window.X || {
                 data['eventView']['startTime'] = startTime;
                 data['eventView']['endTime'] = endTime;
                 retaineddata();
-            })
+            });
 
             var time = $("#retained-condition-date").val();
             var timearr = time.split(" ");
@@ -6928,49 +7065,75 @@ var X = window.X || {
             var eventdata;
             var filtersymbols = [[],[]];//默认两个事件
             var groupitemeventsdata=[[],[]]//分组项里的事件
+            var type2data = [[],[]];
 
             X.api("data_auth/my_event","get",{},function(d){
                 eventdata = d;
-                var arr = [{
-                    "eventDesc":eventdata[0]['category'][0]['event_desc'],
-                    "eventName":eventdata[0]['category'][0]['event_name'],
-                    "filts":[],
-                    "relation":"and",
-                    "relationUser":"and",
-                    "renameindicator":""
-                },{
-                    "eventDesc":eventdata[0]['category'][0]['event_desc'],
-                    "eventName":eventdata[0]['category'][0]['event_name'],
-                    "filts":[],
-                    "relation":"and",
-                    "relationUser":"and",
-                    "renameindicator":""
-                }
-                ]
-                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;
-                     //初始事件
-                    console.log(data['events'][0]);
-                    X.template("event","initial-event",data['events'][0]);
-                    X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-                })
-            })
 
+                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;
+
+                    var arr = [{
+                        "eventDesc":eventdata[0]['category'][0]['event_desc'],
+                        "eventName":eventdata[0]['category'][0]['event_name'],
+                        "filts":[],
+                        "relation":"and",
+                        "relationUser":"and",
+                        "renameindicator":"",
+                        "event_attr": type2data[0][0]['title'],
+                        "event_attr_id": type2data[0][0]['id'],
+                    },{
+                        "eventDesc":eventdata[0]['category'][0]['event_desc'],
+                        "eventName":eventdata[0]['category'][0]['event_name'],
+                        "filts":[],
+                        "relation":"and",
+                        "relationUser":"and",
+                        "renameindicator":"",
+                    }]
+                    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;
+                        //初始事件
+                        console.log(data['events'][0]);
+                        X.template("event","initial-event",data['events'][0]);
+                        X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+                    })
+
+                })
+                
+            });
+
+            $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
+                var obj = $(this);
+                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){
+                        // if(val != undefined){
+                            console.log(val);
+                            $("#analysis-zhibiao-list-type2-"+index).html(val.title);
+                            data['events'][index]['event_attr'] = val.title;
+                            data['events'][index]['event_attr_id'] = val.id;
+                        // }
+                    })
+                }
+            });
            
             //开启重命名
             $(document).off('click','.analysis-chongmingming-initial-event').on('click','.analysis-chongmingming-initial-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").show();
                 $(this).hide();
                 $(".analysis-chongmingming-del-initial-event").show();
-            })
+            });
 
             $(document).off('click','.analysis-chongmingming-return-event').on('click','.analysis-chongmingming-return-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-return-event").show();
                 $(this).hide();
                 $(".analysis-chongmingming-del-return-event").show();
-            })
+            });
 
             //取消重命名
             $(document).off('click','.analysis-chongmingming-del-initial-event').on('click','.analysis-chongmingming-del-initial-event',function(){
@@ -6978,14 +7141,14 @@ var X = window.X || {
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event input").val('');
                 $(this).hide();
                 $(".analysis-chongmingming-initial-event").show();
-            })
+            });
 
             $(document).off('click','.analysis-chongmingming-del-return-event').on('click','.analysis-chongmingming-del-return-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-return-event").hide();
                 $("#analysis-con-left-screen-list-left-zhibiaoname-return-event input").val('');
                 $(this).hide();
                 $(".analysis-chongmingming-return-event").show();
-            })
+            });
 
             // 添加初始事件筛选
             // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-initial-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
@@ -7038,8 +7201,8 @@ var X = window.X || {
                 filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
 
                 X.template("event","initial-event",data['events'][0]);
-            })
-            var returnevent = []
+            });
+            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'],
@@ -7056,7 +7219,7 @@ var X = window.X || {
                 data['events'][1]['filts'] = returnevent;
                 filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-            })
+            });
 
             // 删除指定初始事件筛选
             $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
@@ -7064,24 +7227,24 @@ var X = window.X || {
                 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]);
-            })
+            });
             
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname-initial-event input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname-initial-event input',function(){
                 var txt = $(this).val();
                 data['events'][0]['renameindicator'] = txt;
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname-return-event input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname-return-event input',function(){
                 var txt = $(this).val();
                 data['events'][1]['renameindicator'] = txt;
-            })
+            });
 
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -7095,20 +7258,24 @@ var X = window.X || {
                     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']);
 
                 })
-            })
+            });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
@@ -7118,11 +7285,12 @@ var X = window.X || {
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
                     data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
                 })
-            })
+            });
 
             // 过滤数据
             function filteringdata(){
                 var screentypedata;
+                console.log(groupitemeventsdata);
                 if(groupitemeventsdata.length>1){
                     for(var i =0; i < groupitemeventsdata.length - 1; i++){
                         if(i == 0){
@@ -7139,7 +7307,7 @@ var X = window.X || {
                     screentypedata = groupitemeventsdata[0];
                 }
                 return screentypedata;
-            }
+            };
             
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
@@ -7153,7 +7321,7 @@ var X = window.X || {
                         data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
@@ -7162,12 +7330,12 @@ var X = window.X || {
                 var txtarr = txt.split(",");
                 data['events'][index]['filts'][indexs]['strftv'] = txt;
                 data['events'][index]['filts'][indexs]['ftv'] = txtarr;
-            })
+            });
 
             //全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = filteringdata();
+                var screentypedata = groupitemeventsdata[0];
                 var drr={
                     "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
                     "column_id":screentypedata[0]['category'][0]['id'],//事件id
@@ -7189,7 +7357,7 @@ var X = window.X || {
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
                     analysisdown();
                 });
-            })
+            });
 
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
@@ -7204,13 +7372,13 @@ var X = window.X || {
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
                     analysisdown();
                 });
-            })
+            });
 
             $(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[0],'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
                     data['eventView']['filts'][index]['columnName'] = val.title;
@@ -7222,7 +7390,7 @@ var X = window.X || {
                     filtsftvdata[index]=val.category;
                     analysisdown();//渲染下拉框
                 })
-            })
+            });
 
             //循环给条件框渲染下拉框
             function analysisdown(){
@@ -7239,14 +7407,14 @@ var X = window.X || {
                         });
                     })
                 }
-            }
+            };
 
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
                 data.eventView.groupBy.splice(index,1);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
-            })  
+            });
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
@@ -7261,13 +7429,13 @@ var X = window.X || {
                 data['eventView']['groupBy'].push(arr);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
 
-            })
+            });
 
             $(document).off('click','.analysis-ant-dropdown-trigger').on('click','.analysis-ant-dropdown-trigger',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[0],'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
@@ -7275,11 +7443,8 @@ var X = window.X || {
                     data.eventView.groupBy[index]['column_id'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
-                    
-
                 })
-
-            })
+            });
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
@@ -7288,7 +7453,7 @@ var X = window.X || {
                     X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                         
                     })
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
@@ -7297,18 +7462,19 @@ var X = window.X || {
                 {'title':'7日','id':'7'},
                 {'title':'14日','id':'14'},
                 {'title':'30日','id':'30'},
-            ]
+            ];
             X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
                 console.log(d);
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['unitNum'] = parseInt(d.id);
                 retaineddata();
-            })
+            });
 
             // 计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
+                // console.log(data);
                 retaineddata()
-            })
+            });
 
             function retaineddata(){
                 data['cachedata']['eventdata'] = eventdata;
@@ -7321,15 +7487,15 @@ var X = window.X || {
                     events: data.events
                 }
                 X.api("ck/retention_model","post",dataArr,function(d){
-                    console.log(data);
+                    // console.log(data);
                     querydata = d;
                     updata(d)
                 })
-            }
+            };
 
             $(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){
@@ -7353,14 +7519,14 @@ var X = window.X || {
                     }
 
                 })
-            })
+            });
 
             function updata(d){
                 var title = $(".select-chart").attr("title");
                 if(title == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)}
                 else if(title == '第N日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retainednRetained(d) }
                 else if(title == '每日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retaineddayRetained(d) }
-            }
+            };
 
             function retainedtable(d){
                 var tabledata=[];
@@ -7391,7 +7557,7 @@ var X = window.X || {
                 X.laytpldata("#table-fenxi-th-dot",titdata,".table-fenxi-th");
     
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
-            }
+            };
 
             // 每日留存
             function retaineddayRetained(d){
@@ -7495,7 +7661,7 @@ var X = window.X || {
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             function retainednRetained(d){
                var arr = {};
@@ -7552,6 +7718,8 @@ var X = window.X || {
 
                }
 
+               console.log(seriesData);
+
                 var myChart = echarts.init(document.getElementById('analysis-echarts'));
                 var option = {
                     title: {
@@ -7594,7 +7762,7 @@ var X = window.X || {
                 };
                 myChart.setOption(option,true);
 
-            }
+            };
 
             var querydata;
             $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
@@ -7607,7 +7775,7 @@ var X = window.X || {
                 }else{
                     layer.msg('请先计算数据,在切换图表');
                 }
-            })
+            });
 
         }
     };
@@ -7623,7 +7791,7 @@ var X = window.X || {
             }else {
                 var data = []
             }
-            console.log(data);
+            // console.log(data);
             X.laytpldata("#analysis-overall-situation-list-box-return-dot",data,"#returnvisit-event");
             
         }
diff --git a/web/srczip/base/ajaxpage.js b/web/srczip/base/ajaxpage.js
index f86c93f..47fafc3 100644
--- a/web/srczip/base/ajaxpage.js
+++ b/web/srczip/base/ajaxpage.js
@@ -44,6 +44,7 @@
             setHashParms('page',url);
 		    setContentByUrl(url,id);
         }
+        X.DATA['eventid'] = "";
     };
 
 	
@@ -58,14 +59,23 @@
 		//设置主页，如果hash里有值的话，设置为hash的值，方便复制url传播
 		var hash = getHashParms();
 		setContentByUrl(hash.page || 'login');
+
+        $(document).keydown(function (event) {
+            if (event.keyCode == 116) {
+                event.preventDefault(); //阻止默认刷新
+                console.log('刷新');
+                var query = window.location.href;
+                var querys = query.split("=");
+                if(querys[1]){
+                    $("#conetnt").html("");
+                    var gourl = querys[1];
+                    X.gourl(gourl,'conetnt');
+                }
+                return false;
+            }
+        });
+
+
 	});	
 
-    $(document).keydown(function (event) {
-        if (event.keyCode == 116) {
-            event.preventDefault(); //阻止默认刷新
-            console.log('刷新');
-            return false;                    
-        }
-    });
-
 })();
\ No newline at end of file
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 0f7b310..acb040a 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -265,7 +265,6 @@ var X = window.X || {
             type: 1,
             title: false,
             closeBtn: 0,
-            shade:[0.1, '#000'],
             shadeClose: true,
             offset: [deviationtop,deviationleft],
             url: url,
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index fe2b2f5..df6f9c9 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -3,7 +3,7 @@
         init : function(){
             var me = this;
             // 渲染form样式
-            layui.form.render(); 
+            layui.form.render();
 
             var dataArr; //分析指标
             var groupeddata;//分组项
@@ -58,8 +58,6 @@
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                // console.log(parseInt((sameday - startmonth )/86400));
-                // console.log(parseInt((sameday - endmonth)/86400));
                 data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
                 calculationdata();
             })
@@ -96,6 +94,16 @@
                     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]);
+                            })
+                        }
+
                     })
                 })
                 // groupeddata = d.group_by;
@@ -134,40 +142,43 @@
             var baobiaodata;
             $(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;
-                        type2data = data.cachedata.type2data;
-                        type3data = data.cachedata.type3data;
-                        screentypearr = data.cachedata.screentypearr;
-                        filtersymbols = data.cachedata.filtersymbols;
-
-                        baobiaodata = d;
-                       
-                        if(d.query.eventView.filts.length > 0){
-                            $(".analysis-overall").show();
-                        }else {
-                            $(".analysis-overall").hide();
-                        }
-    
-                        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();
-                        calculationdata();
-
+                        backfilldata(d)
                     }
                 })
-            })
+            });
+
+            // 反向填充数据
+            function backfilldata(d){
+                data = d.query;
+                type2data = data.cachedata.type2data;
+                type3data = data.cachedata.type3data;
+                screentypearr = data.cachedata.screentypearr;
+                filtersymbols = data.cachedata.filtersymbols;
+
+                baobiaodata = d;
+               
+                if(d.query.eventView.filts.length > 0){
+                    $(".analysis-overall").show();
+                }else {
+                    $(".analysis-overall").hide();
+                }
+
+                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();
+                calculationdata();
+            }
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
-                    var obj = $(this);
-                    var offset = obj.offset();
-                    X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
-                        
-                    })
-            })
+                var obj = $(this);
+                var offset = obj.offset();
+                X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
+                    
+                })
+            });
 
             // 切换为指标公式
             $(document).on('click','.analysis-gongshi',function(){
@@ -177,7 +188,7 @@
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-zhibiao").show();
 
-            })
+            });
             
             // 切换为指标选择
             $(document).on('click','.analysis-zhibiao',function(){
@@ -186,7 +197,7 @@
                 $("#analysis-custom-box-"+index).hide();
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-gongshi").show();
-            })
+            });
 
             //复制指标
             $(document).on('click','.analysis-fuzhi',function(){
@@ -199,11 +210,7 @@
                 type3data[num] = type3data[index];
                 screentypearr[num] = screentypearr[index];
                 filtersymbols[num] = filtersymbols[index];
-            })
-
-            // $('.analysis-con-left-screen-list-left-zhibiaoname-txt').bind('input propertychange', function() {
-                
-            // })
+            });
 
             //重命名指标
             $(document).off('click','.analysis-chongmingming').on('click','.analysis-chongmingming',function() {
@@ -211,7 +218,7 @@
                 $("#analysis-con-left-screen-list-left-zhibiaoname-"+index).show();
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-chongmingming-del").show();
-            })
+            });
 
             //删除重命名
             $(document).off('click','.analysis-chongmingming-del').on('click','.analysis-chongmingming-del',function() {
@@ -220,7 +227,7 @@
                 $("#analysis-con-left-screen-list-left-zhibiaoname-"+index+" "+"input").val('');
                 $(this).hide();
                 $("#analysis-con-left-screen-list-right-"+index+" "+".analysis-chongmingming").show();
-            })
+            });
             
             // 设置一级事件
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function() {
@@ -240,12 +247,11 @@
 
                     X.api("data_auth/load_filter_props","post",{event_name:val.name},function(d){
                         groupitemeventsdata[index] = d;
-                        console.log(groupitemeventsdata);
                     })
 
                     
                 })
-            })
+            });
             //设置一级事件中第二个参数
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
                 var obj = $(this);
@@ -272,7 +278,7 @@
                         }
                     })
                 }
-            })
+            });
             //设置一级事件中第三个参数
             $(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
                 var obj = $(this);
@@ -288,7 +294,7 @@
                         })
                     }
                 }
-            })
+            });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
                 var obj = $(this);
@@ -296,7 +302,6 @@
                 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){
-                    console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     filtersymbols[index][indexs] = val.category;
@@ -306,7 +311,7 @@
                     data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
                 })
 
-            })
+            });
 
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
@@ -320,19 +325,19 @@
                         data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
-            })
+            });
 
             // 添加筛选项
             $(document).off('click','.analysis-shaix').on('click','.analysis-shaix',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 添加筛选项
             function addscreen(index){
                 X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["event_name"]},function(d){
-                    console.log(d);
+
                     var arr = {
                         "columnDesc":d[0]['category'][0]['title'],//事件中文显示
                         "columnName":d[0]['category'][0]['id'],//事件id
@@ -350,14 +355,14 @@
                     screentypearr[index] = d;
                     filtersymbols[index][filtersymbols[index].length ] = d[0]['category'][0]["category"];
                 })
-            }
+            };
 
             //监听重命名指标
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname input',function(){
                 var index = $(this).attr("data-index");
                 var txt = $(this).val();
                 data['events'][index]['eventNameDisplay'] = txt;
-            })
+            });
 
             // 监听文本框
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
@@ -367,7 +372,7 @@
                 var valarr = val.split(",");
                 data['events'][index]['filts'][indexs]['ftv']=valarr;
                 data['events'][index]['filts'][indexs]['strftv']=val;
-            })
+            });
 
             // 且和或切换
             $(document).on("click",".analysis-con-left-screen-list-right-screen-qh-tit",function(){
@@ -380,12 +385,12 @@
                     $(this).html('且');
                     data['events'][index]['condrelation'] = 'and'
                 }
-            })
+            });
 
             // 添加条件按钮
             $(document).on('click',".analysis-zhibiao-updata",function(){
                 // addindex();
-            })
+            });
 
             // 删除二级筛选项
             $(document).on('click','.analysis-zhibiao-list-del',function(){
@@ -396,7 +401,7 @@
                 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");
-            })
+            });
 
             // 添加指标
             function addindex(){
@@ -415,7 +420,6 @@
                 data['events'].push(defaultindicator);
 
                 X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
-                console.log(data.events);
                 var index = data.events.length - 1;
                 type2data[index]= retdata;
                 type3data[index]= [];
@@ -429,20 +433,20 @@
                 }
                 screentypearr[index]=props;
                 groupitemeventsdata.push(defaultgroupdata);
-            }
+            };
 
             //添加按钮
             $(document).on('click','.analysis-jia1',function(){
 
                 addindex();
 
-            })
+            });
             //添加指标按钮
             $(document).on('click','.analysis-bottom-jia1',function(){
 
                 addindex();
 
-            })
+            });
 
             //删除指标
             $(document).on('click',".analysis-del",function(){
@@ -455,13 +459,13 @@
                     }
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                 }
-            })
+            });
             
 
             $(".analysis-custom-event-box .analysis-custom-event-txt").blur(function(){
                 $(this).css("border-bottom","0px");
             
-            })
+            });
 
             $(document).off('click','.analysis-custom-event-box .analysis-custom-event-txt').on('blur','.analysis-custom-event-box .analysis-custom-event-txt',function(){
                 // $(this).css("border-bottom","1px solid #3d90ff");
@@ -469,21 +473,18 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 data['events'][index]['customEvent'] = $(this).val();
-                // console.log(data);
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname2 input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname2 input',function(){
                 var index = $(this).attr('data-index');
                 data['events'][index]['eventNameDisplay'] = $(this).val();
-                // console.log(data);
-            })
+            });
 
             //分组项
             var cat = "event";
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
                 var index = data['eventView']['groupBy'].length;
                 var screentypedata = filteringdata();
-                console.log(screentypedata);
                 var drr = {
                     "columnDesc":screentypedata[0]['category'][index]['title'],//事件中文显示
                     "columnName":screentypedata[0]['category'][index]['id'],//事件id
@@ -495,7 +496,7 @@
                 data.eventView.groupBy.push(drr);
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
 
-            })
+            });
 
             $(document).off('click','.analysis-ant-dropdown-trigger').on('click','.analysis-ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -510,7 +511,7 @@
                     data.eventView.groupBy[index]['tableType'] = val.table_type;
                     X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
                 })
-            })
+            });
 
             $(document).off('click','.analysis-granularity').on("click",".analysis-granularity",function(){
                 var obj = $(this);
@@ -544,7 +545,7 @@
                 X.querycriteriapop(arr,'groupitem',offset.left,offset.top+obj.height(),function(val){
                     data.eventView.groupBy[index]['ftv'] = val.id;
                 })
-            })
+            });
 
             $(document).on("click",".analysis-section",function(){
                 var obj = $(this);
@@ -564,17 +565,17 @@
                     }
                   })
 
-            })
+            });
 
             $(document).on('click','.analysis-action-right',function(){
                 var index = $(this).attr('data-index');
                 data.eventView.groupBy.splice(index,1);
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
-            })
+            });
 
             $(document).on('click','.analysis-event-splitting',function(){
 
-            })
+            });
 
             // 过滤数据
             function filteringdata(){
@@ -595,7 +596,7 @@
                     screentypedata = groupitemeventsdata[0];
                 }
                 return screentypedata;
-            }
+            };
 
             // 全局筛选
             var filtsftvdata=[];
@@ -613,7 +614,6 @@
                     "section":[-1,1],//区间
                     "tableType":screentypedata[0]['id']
                 };
-                // console.log(drr);
                 data['eventView']['filts'].push(drr);//上传全局数据
                 filtsftvdata.push(screentypedata[0]['category'][0]['category'])
 
@@ -626,7 +626,7 @@
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
-            })
+            });
 
             //循环给条件框渲染下拉框
             function analysisdown(){
@@ -642,7 +642,7 @@
                         analysisdown();
                     })
                 }
-            }
+            };
 
             $(document).on('click',".analysis-overall-situation-del",function(){
                 var index = $(this).attr("data-index");
@@ -656,7 +656,7 @@
                 }
                 X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
-            })
+            });
 
             // 全局属性选择
             $(document).off('click','.analysis-overall-situation-attr').on('click',".analysis-overall-situation-attr",function(){
@@ -675,7 +675,7 @@
                     X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                     analysisdown();
                 })
-            })
+            });
 
             $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr("data-index");
@@ -683,7 +683,7 @@
                 var valarr = val.split(",");
                 data['eventView']['filts'][index]['ftv']=valarr;
                 data['eventView']['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');
@@ -697,7 +697,7 @@
                     data['eventView']['filts'][index]['ftv'][1] = val;
                     data['eventView']['filts'][index]['section'][1] = val;
                 }
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
@@ -710,26 +710,24 @@
                 {'title':'按周','id':'P1W'},
                 {'title':'按月','id':'P1M'},
                 // {'title':'合计','id':'total'},
-            ]
+            ];
 
             X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
                 $(this).html(d.title);
                 data['eventView']['timeParticleSize'] = d.id;
                 calculationdata();
-            })
+            });
 
             X.layuidate('#analysis-overall-situation-time1');
            
             // 计算
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
-                console.log(data);
                 calculationdata();
                 
-            })
+            });
 
             var querydata;//查询数据
             $(document).on('click','.analtsis-chart-switch-box .analtsis-chart-switch',function(){
-                console.log(querydata)
                 if(querydata){
                     $('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
                     $(this).addClass('select-chart');
@@ -742,7 +740,7 @@
                     // layer.msg('请先计算数据,在切换图表');
                 }
 
-            })
+            });
 
             //堆积图
             function stackingdiagram(d){
@@ -816,7 +814,7 @@
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             //趋势图
             function trendchart(d){
@@ -843,8 +841,6 @@
                         seriesData[i]['name'] = xAxisData[i];
                     }
                 }
-                console.log(d);
-                console.log(seriesData);
                 var myChart = echarts.init(document.getElementById('analysis-echarts'));
                 var option = {
                     title: {
@@ -891,7 +887,7 @@
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             //分布图
             function distributionmap(d){
@@ -953,8 +949,6 @@
 
                         }
                     }
-                    console.log(seriesData);
-                    console.log(xAxisData)
                 }
                 // for(let i in d){
                 //     for(let z in d[i]['groups']){
@@ -1013,11 +1007,10 @@
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             //表格
             function tabledata(d){
-                console.log(d);
                 var titledata,condata = [];
                 for(let i in d){
                     if(d[i]['groups']['length'] == 0){
@@ -1025,17 +1018,14 @@
                         titledata.unshift('指标','阶段总和');
                         condata.push(d[i].values[0]);
                         condata[i].unshift(d[i]['event_name'],d[i]['sum']);
-                        // console.log(condata);
                     }else {
 
                     }
                 }
-                console.log(titledata);
-                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;
@@ -1060,7 +1050,7 @@
                         layer.msg("无数据");
                     }
                 })
-            }
+            };
 
             function updata(){
                var tit = $(".select-chart").attr("title");
@@ -1069,17 +1059,16 @@
                 else if(tit == '累计图'){}
                 else if(tit == '分布图'){distributionmap(querydata)}
                 else if(tit == '饼状分布'){}
-            }
+            };
 
             // 保存报表
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
-                    console.log(baobiaodata);
                     X.parametersopen(baobiaodata,'savereport','auto');
                 }else{
                     X.parametersopen(data,'savereport','auto');          
                 }
-            })
+            });
 
         },
 
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 7fd746c..b4963ad 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -224,6 +224,78 @@
                     me.gettabledata();
                 })
             });
+
+            //更新报表
+            $(document).off('click','.model-gengx').on('click','.model-gengx',function(){
+                var id = $(this).attr('data-id');
+
+                X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
+
+                    X.pageLogic['dashboard'].fillmodeldata(d[id]);
+    
+                })
+
+            });
+
+            //报表跳转到详情s
+            $(document).off('click','.gobaobiaoinfo').on('click','.gobaobiaoinfo',function(){
+                var cat = $(this).attr('data-cat');
+                var id = $(this).attr('data-id');
+                var gourl='';
+
+                // <dd><a class="ajax-content" href="analysis" data-id="conetnt">事件分析</a></dd>
+                // <dd><a class="ajax-content" href="retained" data-id="conetnt">留存分析</a></dd>
+                // <dd><a class="ajax-content" href="ltvmodel" data-id="conetnt">LTV模型</a></dd>
+                // <dd><a class="ajax-content" href="funnelanalysis" data-id="conetnt">漏斗分析</a></dd>
+                // <dd><a class="ajax-content" href="distribution" data-id="conetnt">分布分析</a></dd>
+                // <dd><a class="ajax-content" href="routeanalysis" data-id="conetnt">路径分析</a></dd>
+                // <dd><a class="ajax-content" href="sqlquery" data-id="conetnt">SQL查询</a></dd>
+
+                if(cat == 'event'){
+                    gourl = 'analysis';
+                }else if(cat == 'retention'){
+                    gourl = 'retained';
+                    layer.msg('暂未处理当前逻辑');
+                    return;
+                }else if(cat == 'ltv'){
+                    gourl = 'ltvmodel';
+                    layer.msg('暂未处理当前逻辑');
+                    return;
+                }
+                X.gourl(gourl,'conetnt');//跳到对应的分析页面
+                X.DATA[cat+'id'] = id;
+            });
+
+            //切换模板
+            // $(document).off('click','.chart').on('click','.chart',function(){
+            //     var id = $(this).attr('data-id');
+            //     var modelid = 'model'+id;
+            //     var modelsize = $(this).attr('data-modelsize');
+            //     var modeltype = $(this).attr('data-modeltype');
+            //     var cat = $(this).attr('data-cat');
+            //     var name = $(this).attr('data-name');
+
+            //     var configdata = {
+            //         graph_size:modelsize,
+            //         graph_type:modeltype,
+            //         model:cat,
+            //         name:name,
+            //         report_id:id
+            //     }
+
+            //     var obj = $(this);
+            //     var offset = obj.offset();
+            //     var dropdownlist = [
+            //         {title:'表格',id:'table'},
+            //         {title:'图形',id:'echarts'}
+            //     ]
+            //     X.querycriteriapop(dropdownlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+            //         console.log(val);
+            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
+            //             me.fillmodeldata(d[0],modelid);  
+            //         })
+            //     })
+            // });
     
             //侧边栏更多控制按钮
             // taboperation = function(e,type,id,name){
@@ -231,13 +303,13 @@
             //     X.laydropdown('.kanbanwenjianimg',X.DATA.taboperationdata[type]);
             // }
 
+            // 渲染下拉框
+
+
             $(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
                 e.stopPropagation();
-                // console.log(111);
-            })
-
-         
-
+                console.log('更多操作按钮');
+            });
             
         },
 
@@ -252,157 +324,217 @@
             });
         },
 
+        //填充看板数据
+        fillmodeldata:function(d,id){
+            // console.log(d);
+            X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
+                var eventdata=[];
+                if(d['model'] == "event"){
+                    // 事件分析
+                    if(d['graph_size'] == 'small'){
+                        X.eventsmall(val,function(data){//表格数据处理
+                            data['name'] = d['name'];
+                            data['modeltype'] = d['graph_type'];
+                            data['id'] = d['report_id'];
+                            data['modelsize'] = d['graph_size'];
+                            data['cat'] = d['model'];
+                            eventdata.push(data);
+                        })
+                    }else {
+                        if(d['graph_type'] == 'table'){
+                            //表格样式
+                            X.eventtable(val,function(data){//表格数据处理
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+                        }else if(d['graph_type'] == 'echarts'){
+                            //图形
+                            X.eventchart(val,function(data){
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+                        }
+                    }
+
+                } else if(d['model'] == "retention"){
+                    //留存分析
+                    if(d['graph_size'] == 'small'){
+
+                    }else {
+                        if(d['graph_type'] == 'table'){
+                            X.retentiontable(val,function(data){
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+
+                        }else {
+                            X.retentionchart(val,function(data){
+                                data['name'] = d['name'];
+                                data['modeltype'] = d['graph_type'];
+                                data['id'] = d['report_id'];
+                                data['modelsize'] = d['graph_size'];
+                                data['cat'] = d['model'];
+                                eventdata.push(data);
+                            })
+                        }
+                    }
+                }else if(d['model'] == 'ltv'){
+                    //ltv模型
+                    if(d['graph_type'] == 'table'){
+                        X.ltvtable(val,function(data){
+                            data['name'] = d['name'];
+                            data['modeltype'] = d['graph_type'];
+                            data['id'] = d['report_id'];
+                            data['modelsize'] = d['graph_size'];
+                            data['cat'] = d['model'];
+                            eventdata.push(data);
+                        })
+                    }else {
+                        X.ltvchart(val,function(data){
+                            data['name'] = d['name'];
+                            data['modeltype'] = d['graph_type'];
+                            data['id'] = d['report_id'];
+                            data['modelsize'] = d['graph_size'];
+                            data['cat'] = d['model'];
+                            eventdata.push(data);
+                        })
+                    }
+                }
+                
+                if(eventdata.length > 0){
+                    for(var z in eventdata){
+                        if(id){
+                            X.template("modeltable",id,eventdata[z],function(){
+                                X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                            });
+                        }else {
+                            X.laytpldata("#kanban-model-table-dot",eventdata[z],null,function(html){
+                                $('#model-box').append(html);
+                                X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                            });
+                        }
+                        
+
+                        
+                    }
+                }
+            })
+        },
+
+        //画统计图和添加移入移出事件
+        morefeatures:function(eventdata){
+
+            $(".layui-card").mouseenter(function () {
+                var classname = $(this).attr('class');
+                if(classname.indexOf("tool-show") == -1){
+                    $(this).addClass('tool-show');
+                }
+            });
+            $(".layui-card").mouseleave(function () {
+                var classname = $(this).attr('class');
+                if(classname.indexOf("tool-show") != -1){
+                    $(this).removeClass('tool-show');
+                }
+            });
+            var dropdownlist = [
+                {title:'表格',id:'table'},
+                {title:'图形',id:'echarts'}
+            ];
+            X.laydropdown("#chart"+eventdata.id,dropdownlist,function(d){
+                var id = $("#chart"+eventdata.id).attr('data-id');
+                var modelid = 'model'+id;
+                var modelsize = $("#chart"+eventdata.id).attr('data-modelsize');
+                var modeltype = $("#chart"+eventdata.id).attr('data-modeltype');
+                var cat = $("#chart"+eventdata.id).attr('data-cat');
+                var name = $("#chart"+eventdata.id).attr('data-name');
+                var data = {
+                    report_id:id,
+                    graph_size:modelsize,
+                    graph_type:d.id,
+                    model:cat,
+                    name:name
+                }
+                X.api('dashboard/edit_show_report','post',{dashboard_id:X.DATA.dashboard_id,config:data},function(d){
+                    // console.log(d);
+                    X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
+                        for(let i in val){
+                            if(val[i]['report_id'] == id){
+                                X.pageLogic['dashboard'].fillmodeldata(val[i],modelid);
+                            }
+                        }
+                    })
+                })
+                
+            });
+
+            if(eventdata['modeltype'] == 'echarts' && eventdata['modelsize'] != 'small' ){
+                var myChart = echarts.init(document.getElementById(eventdata['id']));
+                var option = {
+                    title: {
+                        text: ''
+                    },
+                    color: X.DATA.echartscolor,
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross',
+                            label: {
+                                backgroundColor: '#6a7985'
+                            }
+                        }
+                    },
+                    legend: {
+                        type:'scroll',
+                        data: eventdata['legenddata']
+                    },
+                    grid: {
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        top: '10%',
+                        containLabel: true
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            boundaryGap: false,
+                            data: eventdata['xAxisData']
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: eventdata['seriesData']
+                };
+                myChart.setOption(option,true);
+            }
+        },
+
          // 获取表格数据
         gettabledata:function(){
 
             $("#model-box").html("");//清空表格数据
             
             X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
-                console.log(d);
-                var index = d.length;
-                for(let z in d){
 
-                    (function (i, model) {   // 注意这里是形参
-                        setTimeout(function () {
-                            console.log(d[i]['report_id']);
-                            X.api("ck/"+model+"_model","post",{report_id:d[i]['report_id']},function(val){
-                                var eventdata=[];
-                                if(model == "event"){
-                                    // 事件分析
-                                    if(d[i]['graph_size'] == 'small'){
-                                        X.eventsmall(val,function(data){//表格数据处理
-                                            data['name'] = d[i]['name'];
-                                            data['modeltype'] = d[i]['graph_type'];
-                                            data['id'] = d[i]['report_id'];
-                                            data['modelsize'] = d[i]['graph_size'];
-                                            eventdata.push(data);
-                                        })
-                                    }else {
-                                        if(d[i]['graph_type'] == 'table'){
-                                            //表格样式
-                                            X.eventtable(val,function(data){//表格数据处理
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                data['cat'] = model;
-                                                eventdata.push(data);
-                                            })
-                                        }else if(d[i]['graph_type'] == 'echarts'){
-                                            //图形
-                                            X.eventchart(val,function(data){
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                eventdata.push(data);
-                                            })
-                                        }
-                                    }
-        
-                                } else if(model == "retention"){
-                                    if(d[i]['graph_size'] == 'small'){
-
-                                    }else {
-                                        if(d[i]['graph_type'] == 'table'){
-                                            X.retentiontable(val,function(data){
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                data['cat'] = model;
-                                                eventdata.push(data);
-                                            })
-
-                                        }else {
-                                            X.retentionchart(val,function(data){
-                                                data['name'] = d[i]['name'];
-                                                data['modeltype'] = d[i]['graph_type'];
-                                                data['id'] = d[i]['report_id'];
-                                                data['modelsize'] = d[i]['graph_size'];
-                                                eventdata.push(data);
-                                            })
-                                        }
-                                    }
-                                }else if(model == 'ltv'){
-                                    if(d[i]['graph_type'] == 'table'){
-                                        X.ltvtable(val,function(data){
-                                            data['name'] = d[i]['name'];
-                                            data['modeltype'] = d[i]['graph_type'];
-                                            data['id'] = d[i]['report_id'];
-                                            data['modelsize'] = d[i]['graph_size'];
-                                            data['cat'] = model;
-                                            eventdata.push(data);
-                                        })
-                                    }else {
-                                        X.ltvchart(val,function(data){
-                                            data['name'] = d[i]['name'];
-                                            data['modeltype'] = d[i]['graph_type'];
-                                            data['id'] = d[i]['report_id'];
-                                            data['modelsize'] = d[i]['graph_size'];
-                                            eventdata.push(data);
-                                        })
-                                    }
-                                }
-                                index --;
-                                if(eventdata.length > 0){
-                                    console.log(eventdata);
-                                    for(var z in eventdata){
-
-                                        X.laytpldata("#kanban-model-table-dot",eventdata[z],null,function(html){
-                                            $('#model-box').append(html);
-                                        });
-
-                                        if(eventdata[z]['modeltype'] == 'echarts' && eventdata[z]['modelsize'] != 'small' ){
-                                            var myChart = echarts.init(document.getElementById(eventdata[z]['id']));
-                                            var option = {
-                                                title: {
-                                                    text: ''
-                                                },
-                                                color: X.DATA.echartscolor,
-                                                tooltip: {
-                                                    trigger: 'axis',
-                                                    axisPointer: {
-                                                        type: 'cross',
-                                                        label: {
-                                                            backgroundColor: '#6a7985'
-                                                        }
-                                                    }
-                                                },
-                                                legend: {
-                                                    type:'scroll',
-                                                    data: eventdata[z]['legenddata']
-                                                },
-                                                grid: {
-                                                    left: '2%',
-                                                    right: '2%',
-                                                    bottom: '2%',
-                                                    top: '10%',
-                                                    containLabel: true
-                                                },
-                                                xAxis: [
-                                                    {
-                                                        type: 'category',
-                                                        boundaryGap: false,
-                                                        data: eventdata[z]['xAxisData']
-                                                    }
-                                                ],
-                                                yAxis: [
-                                                    {
-                                                        type: 'value'
-                                                    }
-                                                ],
-                                                series: eventdata[z]['seriesData']
-                                            };
-                                            myChart.setOption(option,true);
-                                        }
-                                    }
-                                }
-                            })
-                
-                        }, 0 * i);	// 还是每秒执行一次，不是累加的
-                    })(z, d[z]['model'])   // 注意这里是实参，这里把要用的参数传进去
+                for(let z in d){      
 
+                    X.pageLogic['dashboard'].fillmodeldata(d[z]);
+                    
                 }
                
 
diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js
index 4702315..06a7d0c 100644
--- a/web/srczip/logic/funnelanalysis.js
+++ b/web/srczip/logic/funnelanalysis.js
@@ -70,11 +70,11 @@
                     
                     groupitemeventsdata[0] = val;
                     groupitemeventsdata[1] = val;
+                    //初始事件
+                    X.template("funnel","funnel-event",data['events']);
                 })
             })
-
-            //初始事件
-            X.template("funnel","funnel-event",data['events']);
+            
             //开启重命名
             $(document).off('click','.analysis-chongmingming-initial-event').on('click','.analysis-chongmingming-initial-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").show();
diff --git a/web/srczip/logic/kanbanadmin.js b/web/srczip/logic/kanbanadmin.js
index 335e12a..f6f3c35 100644
--- a/web/srczip/logic/kanbanadmin.js
+++ b/web/srczip/logic/kanbanadmin.js
@@ -112,6 +112,7 @@
                         configdata = submitdata[i];
                     }
                 }
+                console.log(configdata);
                 X.parametersopen(configdata,'kanbantypeset','auto',function(d){
                     var graph_size = d['graph_size'];
                     var graph_type = d['graph_type'];
@@ -124,7 +125,7 @@
                 })
             })
             
-            //渲染已添加报表下拉框
+            //渲染已添加报表
             function toadddataprocessing(){ 
                 toadddata = [];
                 for(let i in reportlistdata){
diff --git a/web/srczip/logic/modeltable.js b/web/srczip/logic/modeltable.js
index 9f5c6df..9029863 100644
--- a/web/srczip/logic/modeltable.js
+++ b/web/srczip/logic/modeltable.js
@@ -6,13 +6,18 @@
             this.callback = parms.callback;
             var data = parms;
 
-            for(var i in data){
-                X.laytpldata("#kanban-model-table-dot",data[i],null,function(html){
-                    // console.log($("#model-box").html());
-                    console.log(html);
-                    $('#model-box').append(html);
-                });
-            }
+            X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
+
+                $("#model"+data.id).html(html);
+            })
+
+            // for(var i in data){
+            //     X.laytpldata("#kanban-model-table-dot",data[i],null,function(html){
+            //         // console.log($("#model-box").html());
+            //         console.log(html);
+            //         $('#model-box').append(html);
+            //     });
+            // }
            
 
         }
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 2dbf85d..c26a017 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -26,6 +26,7 @@
                     returnevent:[],
                     filtersymbols:[],
                     groupitemeventsdata:[],
+                    type2data:[]
                 }
             };
 
@@ -36,7 +37,7 @@
                 data['eventView']['startTime'] = startTime;
                 data['eventView']['endTime'] = endTime;
                 retaineddata();
-            })
+            });
 
             var time = $("#retained-condition-date").val();
             var timearr = time.split(" ");
@@ -46,49 +47,75 @@
             var eventdata;
             var filtersymbols = [[],[]];//默认两个事件
             var groupitemeventsdata=[[],[]]//分组项里的事件
+            var type2data = [[],[]];
 
             X.api("data_auth/my_event","get",{},function(d){
                 eventdata = d;
-                var arr = [{
-                    "eventDesc":eventdata[0]['category'][0]['event_desc'],
-                    "eventName":eventdata[0]['category'][0]['event_name'],
-                    "filts":[],
-                    "relation":"and",
-                    "relationUser":"and",
-                    "renameindicator":""
-                },{
-                    "eventDesc":eventdata[0]['category'][0]['event_desc'],
-                    "eventName":eventdata[0]['category'][0]['event_name'],
-                    "filts":[],
-                    "relation":"and",
-                    "relationUser":"and",
-                    "renameindicator":""
-                }
-                ]
-                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;
-                     //初始事件
-                    console.log(data['events'][0]);
-                    X.template("event","initial-event",data['events'][0]);
-                    X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-                })
-            })
 
+                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;
+
+                    var arr = [{
+                        "eventDesc":eventdata[0]['category'][0]['event_desc'],
+                        "eventName":eventdata[0]['category'][0]['event_name'],
+                        "filts":[],
+                        "relation":"and",
+                        "relationUser":"and",
+                        "renameindicator":"",
+                        "event_attr": type2data[0][0]['title'],
+                        "event_attr_id": type2data[0][0]['id'],
+                    },{
+                        "eventDesc":eventdata[0]['category'][0]['event_desc'],
+                        "eventName":eventdata[0]['category'][0]['event_name'],
+                        "filts":[],
+                        "relation":"and",
+                        "relationUser":"and",
+                        "renameindicator":"",
+                    }]
+                    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;
+                        //初始事件
+                        console.log(data['events'][0]);
+                        X.template("event","initial-event",data['events'][0]);
+                        X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+                    })
+
+                })
+                
+            });
+
+            $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
+                var obj = $(this);
+                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){
+                        // if(val != undefined){
+                            console.log(val);
+                            $("#analysis-zhibiao-list-type2-"+index).html(val.title);
+                            data['events'][index]['event_attr'] = val.title;
+                            data['events'][index]['event_attr_id'] = val.id;
+                        // }
+                    })
+                }
+            });
            
             //开启重命名
             $(document).off('click','.analysis-chongmingming-initial-event').on('click','.analysis-chongmingming-initial-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").show();
                 $(this).hide();
                 $(".analysis-chongmingming-del-initial-event").show();
-            })
+            });
 
             $(document).off('click','.analysis-chongmingming-return-event').on('click','.analysis-chongmingming-return-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-return-event").show();
                 $(this).hide();
                 $(".analysis-chongmingming-del-return-event").show();
-            })
+            });
 
             //取消重命名
             $(document).off('click','.analysis-chongmingming-del-initial-event').on('click','.analysis-chongmingming-del-initial-event',function(){
@@ -96,14 +123,14 @@
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event input").val('');
                 $(this).hide();
                 $(".analysis-chongmingming-initial-event").show();
-            })
+            });
 
             $(document).off('click','.analysis-chongmingming-del-return-event').on('click','.analysis-chongmingming-del-return-event',function(){
                 $("#analysis-con-left-screen-list-left-zhibiaoname-return-event").hide();
                 $("#analysis-con-left-screen-list-left-zhibiaoname-return-event input").val('');
                 $(this).hide();
                 $(".analysis-chongmingming-return-event").show();
-            })
+            });
 
             // 添加初始事件筛选
             // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-initial-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
@@ -156,8 +183,8 @@
                 filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
 
                 X.template("event","initial-event",data['events'][0]);
-            })
-            var returnevent = []
+            });
+            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'],
@@ -174,7 +201,7 @@
                 data['events'][1]['filts'] = returnevent;
                 filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
-            })
+            });
 
             // 删除指定初始事件筛选
             $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
@@ -182,24 +209,24 @@
                 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]);
-            })
+            });
             
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname-initial-event input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname-initial-event input',function(){
                 var txt = $(this).val();
                 data['events'][0]['renameindicator'] = txt;
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-list-left-zhibiaoname-return-event input').on('blur','.analysis-con-left-screen-list-left-zhibiaoname-return-event input',function(){
                 var txt = $(this).val();
                 data['events'][1]['renameindicator'] = txt;
-            })
+            });
 
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -213,20 +240,24 @@
                     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']);
 
                 })
-            })
+            });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
                 var obj = $(this);
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var indexs = obj.attr("data-indexs");
-                X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
+                X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
@@ -236,11 +267,12 @@
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
                     data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
                 })
-            })
+            });
 
             // 过滤数据
             function filteringdata(){
                 var screentypedata;
+                console.log(groupitemeventsdata);
                 if(groupitemeventsdata.length>1){
                     for(var i =0; i < groupitemeventsdata.length - 1; i++){
                         if(i == 0){
@@ -257,7 +289,7 @@
                     screentypedata = groupitemeventsdata[0];
                 }
                 return screentypedata;
-            }
+            };
             
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
@@ -271,7 +303,7 @@
                         data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
@@ -280,12 +312,12 @@
                 var txtarr = txt.split(",");
                 data['events'][index]['filts'][indexs]['strftv'] = txt;
                 data['events'][index]['filts'][indexs]['ftv'] = txtarr;
-            })
+            });
 
             //全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
-                var screentypedata = filteringdata();
+                var screentypedata = groupitemeventsdata[0];
                 var drr={
                     "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
                     "column_id":screentypedata[0]['category'][0]['id'],//事件id
@@ -307,7 +339,7 @@
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
                     analysisdown();
                 });
-            })
+            });
 
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
@@ -322,13 +354,13 @@
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
                     analysisdown();
                 });
-            })
+            });
 
             $(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[0],'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     obj.html(val.title);
                     data['eventView']['filts'][index]['columnName'] = val.title;
@@ -340,7 +372,7 @@
                     filtsftvdata[index]=val.category;
                     analysisdown();//渲染下拉框
                 })
-            })
+            });
 
             //循环给条件框渲染下拉框
             function analysisdown(){
@@ -357,14 +389,14 @@
                         });
                     })
                 }
-            }
+            };
 
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
                 data.eventView.groupBy.splice(index,1);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
-            })  
+            });
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
@@ -379,13 +411,13 @@
                 data['eventView']['groupBy'].push(arr);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
 
-            })
+            });
 
             $(document).off('click','.analysis-ant-dropdown-trigger').on('click','.analysis-ant-dropdown-trigger',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[0],'category',offset.left,offset.top+obj.height(),function(val){
                     console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
@@ -393,11 +425,8 @@
                     data.eventView.groupBy[index]['column_id'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
-                    
-
                 })
-
-            })
+            });
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
@@ -406,7 +435,7 @@
                     X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                         
                     })
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
@@ -415,18 +444,19 @@
                 {'title':'7日','id':'7'},
                 {'title':'14日','id':'14'},
                 {'title':'30日','id':'30'},
-            ]
+            ];
             X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
                 console.log(d);
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['unitNum'] = parseInt(d.id);
                 retaineddata();
-            })
+            });
 
             // 计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
+                // console.log(data);
                 retaineddata()
-            })
+            });
 
             function retaineddata(){
                 data['cachedata']['eventdata'] = eventdata;
@@ -439,15 +469,15 @@
                     events: data.events
                 }
                 X.api("ck/retention_model","post",dataArr,function(d){
-                    console.log(data);
+                    // console.log(data);
                     querydata = d;
                     updata(d)
                 })
-            }
+            };
 
             $(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){
@@ -471,14 +501,14 @@
                     }
 
                 })
-            })
+            });
 
             function updata(d){
                 var title = $(".select-chart").attr("title");
                 if(title == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)}
                 else if(title == '第N日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retainednRetained(d) }
                 else if(title == '每日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retaineddayRetained(d) }
-            }
+            };
 
             function retainedtable(d){
                 var tabledata=[];
@@ -509,7 +539,7 @@
                 X.laytpldata("#table-fenxi-th-dot",titdata,".table-fenxi-th");
     
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
-            }
+            };
 
             // 每日留存
             function retaineddayRetained(d){
@@ -613,7 +643,7 @@
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             function retainednRetained(d){
                var arr = {};
@@ -670,6 +700,8 @@
 
                }
 
+               console.log(seriesData);
+
                 var myChart = echarts.init(document.getElementById('analysis-echarts'));
                 var option = {
                     title: {
@@ -712,7 +744,7 @@
                 };
                 myChart.setOption(option,true);
 
-            }
+            };
 
             var querydata;
             $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
@@ -725,7 +757,7 @@
                 }else{
                     layer.msg('请先计算数据,在切换图表');
                 }
-            })
+            });
 
         }
     };
diff --git a/web/srczip/logic/returnvisitevent.js b/web/srczip/logic/returnvisitevent.js
index f1b38fa..c3d8aad 100644
--- a/web/srczip/logic/returnvisitevent.js
+++ b/web/srczip/logic/returnvisitevent.js
@@ -8,7 +8,7 @@
             }else {
                 var data = []
             }
-            console.log(data);
+            // console.log(data);
             X.laytpldata("#analysis-overall-situation-list-box-return-dot",data,"#returnvisit-event");
             
         }
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 40bd040..c982b18 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -66,8 +66,9 @@
 .time-cond { display: flex; align-items: center; font-size: 12px; line-height: 24px; color: #67729d;}
 .time-cond span { min-width: 20px; height: 24px; line-height: 24px; margin-right: 8px; cursor: pointer }
 .time-cond div { width: 1px; height: 8px; background-color: #f0f0f0; margin-right: 8px; }
-.chart { cursor: pointer; }
+.chart { cursor: pointer; padding: 3px 5px;}
 .chart span { font-size: 12px; color: #67729d; margin-left: 4px; }
+.chart:hover { background-color: #f0f2f5; }
 .dqtime { padding: 0 24px; color: #67729d; font-size: 12px; margin-top: 12px; }
 .sanjiao { width: 0; height: 0; border-left: 4px solid transparent; border-right: 4px solid transparent;  border-bottom: 3px solid #00bf74; margin: 0 8px; }
 .proportion-data { display: flex; align-items: center; font-size: 12px; color: #42546d; }
@@ -83,6 +84,8 @@
 .layui-card:last-child { padding-bottom: 12px; }
 .echarts { width: 100%; height: 204px; }
 .control { display: none; }
+.tool-show .control { display: block; }
+
 .table-box { margin: 10px 24px 0 24px; height: 283px; overflow-x: auto; }
 
 .layui-table-body { height: 242px; overflow: auto; }