diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index 746fb05..749bd27 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -224,12 +224,12 @@
         <!-- 指标选择 -->
         <div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box-{{index}}">
             <div class="analysis-con-left-screen-list-left-zhibiaoname" id="analysis-con-left-screen-list-left-zhibiaoname-{{index}}">
-                <input type="text" placeholder="请出入指标名" class="analysis-con-left-screen-list-left-zhibiaoname-txt" data-index="{{index}}"/>
+                <input type="text" placeholder="请输入指标名" class="analysis-con-left-screen-list-left-zhibiaoname-txt" data-index="{{index}}"/>
             </div>
             <div class="analysis-con-left-screen-list-left">
                 <div class="analysis-num">{{index}}</div>
                 <div class="analysis-zhibiao-list">
-                    <div class="ant-dropdown-trigger analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}"> {{item.event_name}}</div>
+                    <div class="ant-dropdown-trigger analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}"> {{item.event_desc}}</div>
                     <span style="margin-left: 6px;">的</span>
                     <div id="analysis-zhibiao-list-type2-{{index}}" class="analysis-zhibiao-list-type2 analysis-background" data-index="{{index}}">{{item.event_attr}}</div>
                     {{#  if(item.event_attr_id != "*"){ }}
@@ -238,13 +238,13 @@
                     <!-- <div id="analysis-zhibiao-list-type3-{{index}}" class="analysis-zhibiao-list-type3 analysis-background analysis-zhibiao-condition" data-index="{{index}}"></div> -->
                     {{#  } }} 
                 </div>
-            </div>
-            {{#  if(item.filters.length > 0){ }}
+            </div>      
+            {{#  if(item.filts.length > 0){ }}
             <div class="analysis-con-left-screen-list-right-screen-bg" id="analysis-con-left-screen-list-right-screen-bg-{{index}}">
                 <div class="analysis-con-left-screen-list-right-screen-box">
                     <div class="analysis-con-left-screen-list-right-screen-qh">
                         <div class="analysis-con-left-screen-list-right-screen-qh-xian"></div>
-                        {{#  if(item.filters.length > 1){ }}
+                        {{#  if(item.filts.length > 1){ }}
                             {{#  if(item.condrelation === "and"){ }}
                                 <div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">且</div>
                             {{#  } else { }}
@@ -253,11 +253,13 @@
                         {{#  } }} 
                     </div>
                     <div style="padding-bottom: 10px;" class="analysis-zhibiao-list2-box">
-                        {{#  layui.each(item.filters, function(indexs, items){ }}
+                        {{#  layui.each(item.filts, function(indexs, items){ }}
                             <div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{index}}-{{indexs}}">
-                                <div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.column_name}}</div>
+                                <div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
                                 <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}">{{items.comparator_name}}</div>
+                                <!-- {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
                                 <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}"> <input type="text"  data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <!-- {{#  } }}  -->
                                 <div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
                             </div>
                         {{#  }); }}
@@ -315,7 +317,7 @@
                 <div class="analysis-num bgcolor">{{index}}</div>
                 <div class="analysis-ant-dropdown-trigger" data-index="{{index}}">
                     <!-- <img src="./static/img/shaix2.png"/> -->
-                    <span>{{item.column_name}}</span>
+                    <span>{{item.columnDesc}}</span>
                 </div>
             </div>
             <!-- <div class="analysis-ta-property-range analysis-granularity" data-index="{{index}}" data-type="{{item.data_type}}"> <img src="./static/img/shezhi2.png"> </div> -->
@@ -338,7 +340,7 @@
 <script id="analysis-overall-situation-list-box-dot" type="text/html">
     {{#  layui.each(d, function(index, item){ }}
         <div class="analysis-overall-situation-list">
-            <div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.column_name}}</div>
+            <div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.columnDesc}}</div>
             <div class="analysis-overall-situation-fuhao" id="analysis-overall-situation-fuhao-{{index}}" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
             {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }}
                 <div class="analysis-overall-situation-input" > <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" /> </div>
diff --git a/web/pages/event.html b/web/pages/event.html
new file mode 100644
index 0000000..fc24db3
--- /dev/null
+++ b/web/pages/event.html
@@ -0,0 +1,56 @@
+
+
+<script id="analysis-overall-situation-list-box-dot" type="text/html">
+    <div class="analysis-con-left-screen-list">
+        <!-- 指标选择 -->
+        <div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box">
+            <div class="analysis-con-left-screen-list-left-zhibiaoname analysis-con-left-screen-list-left-zhibiaoname-initial-event" id="analysis-con-left-screen-list-left-zhibiaoname-initial-event">
+                <input type="text" placeholder="请输入指标名" class="analysis-con-left-screen-list-left-zhibiaoname-txt"/>
+            </div>
+            <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="0"> {{d.eventDesc}}</div>
+                </div>
+            </div>
+            {{#  if(d.filts.length > 0){ }}
+            <div class="analysis-con-left-screen-list-right-screen-bg" id="analysis-con-left-screen-list-right-screen-bg">
+                <div class="analysis-con-left-screen-list-right-screen-box">
+                    <div class="analysis-con-left-screen-list-right-screen-qh">
+                        <div class="analysis-con-left-screen-list-right-screen-qh-xian"></div>
+                        {{#  if(d.filts.length > 1){ }}
+                            {{#  if(d.relation === "and"){ }}
+                                <div class="analysis-con-left-screen-list-right-screen-qh-tit">且</div>
+                            {{#  } else { }}
+                                <div class="analysis-con-left-screen-list-right-screen-qh-tit">或</div>
+                            {{#  } }} 
+                        {{#  } }} 
+                    </div>
+                    <div style="padding-bottom: 10px;" class="analysis-zhibiao-list2-box">
+                        {{#  layui.each(d.filts, function(indexs, items){ }}
+                            <div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{indexs}}">
+                                <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
+                                <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}">{{items.comparatorName}}</div>
+                                {{#  if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range"){ }}
+                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                {{#  } }} 
+                                <div class="analysis-zhibiao-list-del analysis-zhibiao-list-del-initial-event" data-twonum="{{indexs}}"></div>
+                            </div>
+                        {{#  }); }}
+                    </div>
+                </div>
+                <div class="analysis-zhibiao-updata-list-box">
+                    <span class="analysis-zhibiao-updata analysis-zhibiao-updata-initial-event"> <img src="./static/img/shaix.png" /> 添加条件 </span>
+                </div>
+            </div>
+            {{#  } }} 
+        </div>
+        <!-- 操作按钮 -->
+        <div class="analysis-con-left-screen-list-right-box">
+            <div class="analysis-con-left-screen-list-right" >
+                <div class="analysis-chongmingming analysis-chongmingming-initial-event" title="重命名指标"></div>
+                <div class="analysis-chongmingming-del analysis-chongmingming-del-initial-event" title="取消重命名"></div>
+                <div class="analysis-shaix analysis-shaix-initial-event" title="指标筛选"></div>
+            </div>
+        </div>
+    </div>
+</script>
diff --git a/web/pages/globalfilter.html b/web/pages/globalfilter.html
new file mode 100644
index 0000000..38c2ddf
--- /dev/null
+++ b/web/pages/globalfilter.html
@@ -0,0 +1,17 @@
+<!-- 全局筛选 -->
+<script id="analysis-overall-situation-list-box-dot" type="text/html">
+    {{#  layui.each(d, function(index, item){ }}
+        <div class="analysis-overall-situation-list">
+            <div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.column_name}}</div>
+            <div class="analysis-overall-situation-fuhao" id="analysis-overall-situation-fuhao-{{index}}" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
+            {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }}
+                <div class="analysis-overall-situation-input" > <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" /> </div>
+            {{#  } }} 
+
+            {{#  if(item.comparator_id === "range"){ }}
+                <div class="analysis-overall-situation-input2" > <input data-index="{{index}}" type="text" value="{{item.section[0]}}" name="start"/> <span>与</span> <input data-index="{{index}}" name="end" type="text" value="{{item.section[1]}}"/> <span>之间</span> </div>
+            {{#  } }} 
+            <p class="analysis-overall-situation-del" data-index="{{index}}"> <img src="./static/img/cha1.png"> </p>
+        </div>
+    {{#  }); }}
+</script>
\ No newline at end of file
diff --git a/web/pages/grouped.html b/web/pages/grouped.html
index dfaf090..997617c 100644
--- a/web/pages/grouped.html
+++ b/web/pages/grouped.html
@@ -1,19 +1,26 @@
 <script id="analysis-con-left-screen-box-dot" type="text/html">
     {{#  layui.each(d, function(index, item){ }}
-    <div class="analysis-action-row">
-        <div class="analysis-action-left">
-            <div class="analysis-num bgcolor">{{index}}</div>
-            <div class="analysis-ant-dropdown-trigger">
-                <img src="./static/img/shaix2.png"/>
-                <span>SDK类型</span>
+        <div class="analysis-action-row">
+            <div class="analysis-action-left">
+                <div class="analysis-num bgcolor">{{index}}</div>
+                <div class="analysis-ant-dropdown-trigger" data-index="{{index}}">
+                    <!-- <img src="./static/img/shaix2.png"/> -->
+                    <span>{{item.columnName}}</span>
+                </div>
             </div>
+            <!-- <div class="analysis-ta-property-range analysis-granularity" data-index="{{index}}" data-type="{{item.data_type}}"> <img src="./static/img/shezhi2.png"> </div> -->
+            <!-- {{#  if(item.data_type === "int"){ }}
+                <div class="analysis-ta-property-range analysis-section"> <img src="./static/img/shezhi2.png"> </div>
+            {{#  } }}  -->
+
+            {{#  if(item.data_type === "datetime"){ }}
+                <div class="analysis-ta-property-range analysis-granularity" data-index="{{index}}"  data-type="{{item.data_type}}"> <img src="./static/img/shezhi2.png"> </div>
+            {{#  } }} 
+            {{#  if(item.data_type === "array"){ }}
+                <div class="analysis-ta-property-range analysis-granularity"  data-index="{{index}}" data-type="{{item.data_type}}"> <img src="./static/img/shezhi2.png"> </div>
+            {{#  } }} 
+            <div class="analysis-action-right" data-index="{{index}}"> <img src="./static/img/cha1.png"/> </div>
         </div>
-    
-        <div class="analysis-ta-property-range analysis-granularity"> <img src="./static/img/shezhi2.png"> </div> 
-    
-        <div class="analysis-ta-property-range analysis-section"> <img src="./static/img/shezhi2.png"> </div>
-        <div class="analysis-action-right"> <img src="./static/img/cha1.png"/> </div>
-    </div>
     {{#  }); }}
 </script>
 
diff --git a/web/pages/retained.html b/web/pages/retained.html
index 1dfd12f..3c2a9f9 100644
--- a/web/pages/retained.html
+++ b/web/pages/retained.html
@@ -34,8 +34,53 @@
             <div class="analysis-con-left-shrink"></div>
 
             <div class="root___2a4tb">
+
                 <div class="block___2n0We">
                     <div class="analysis-con-left-title">初始事件</div>
+                    <div class="analysis-con-left-screen-list-box" id="initial-event">
+                        
+                    </div>
+                </div>
+
+                <div class="block___2n0We">
+                    <div class="analysis-con-left-title">回访事件</div>
+                    <div class="analysis-con-left-screen-list-box" id="returnvisit-event">
+                        
+                    </div>
+                </div>
+
+                <div class="block___2n0We analysis-overall" style="display: block;">
+                    <div class="analysis-con-left-title">全局筛选</div>
+
+                    <div class="analysis-con-left-screen-box">
+                        
+                        <div class="analysis-overall-situation-box">
+
+                            <div class="analysis-overall-situation-left-box">
+                                <div class="analysis-overall-situation-left-xian"></div>
+                                <div class="analysis-overall-situation-left-guanxi">且</div>
+                            </div>
+
+                            <div class="analysis-overall-situation-list-box" id="xinwei-whole">
+
+
+                            </div>
+
+                        </div>
+
+                        <div class="analysis-foot___P797w">
+                            <span class="analysis-overall-situation-add">
+                                <img src="./static/img/fenzu.png">
+                                添加条件
+                            </span>
+                        </div>
+                    </div>
+
+                </div>
+
+
+                <div class="block___2n0We">
+                    <div class="analysis-con-left-title">分组项</div>
                     <div class="analysis-con-left-screen-box" id="shushi">
                         
                     </div>
@@ -65,25 +110,23 @@
                     </div>
                     <div class="analtsis-condition-box">
                         <div class="analtsis-time-box">
-                            <div class="analtsis-condition" > <input id="analtsis-condition-date" readonly="readonly"></input> </div>
-                            <div class="analtsis-condition analtsis-timeParticleSize">按天</div>
+                            <div class="analtsis-condition" > <input id="retained-condition-date" readonly="readonly"></input> </div>
+                            <div class="analtsis-condition analtsis-timeParticleSize">7天</div>
                         </div>
 
                         <div class="analtsis-condition-right-box">
-                            <div class="analtsis-condition">指标</div>
-                            <div class="analtsis-condition">分组</div>
+                            <!-- <div class="analtsis-condition">指标</div>
+                            <div class="analtsis-condition">分组</div> -->
                             <div class="analtsis-chart-switch-box">
-                                <div class="analtsis-chart-switch" title="趋势图"> <i class="iconfont" style="font-size: 18px; ">&#xe600;</i> </div>
-                                <div class="analtsis-chart-switch  select-chart" title="堆积图"> <i class="iconfont" style="font-size: 18px; ">&#xe61f;</i> </div>
-                                <!-- <div class="analtsis-chart-switch" title="累计图"> <i class="iconfont" style="font-size: 18px; ">&#xe711;</i> </div> -->
-                                <div class="analtsis-chart-switch" title="分布图"> <i class="iconfont" style="font-size: 18px; ">&#xe60b;</i> </div>
-                                <!-- <div class="analtsis-chart-switch" title="饼状分布"> <i class="iconfont" style="font-size: 18px;">&#xe684;</i> </div> -->
+                                <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>
                         </div>
 
                     </div>
                     <!-- 统计图 -->
-                    <div class="analysis-echarts" id="analysis-echarts"></div>
+                    <div class="analysis-echarts" id="analysis-echarts" style="display: none;"></div>
 
                     <div class="table-div-box">
                         <table class="table-fenxi-box">
@@ -92,10 +135,9 @@
                                 
                             </tr> 
                             </thead>
-                            <tbody>
-                            <tr class="table-fenxi-td">
-                                
-                            </tr>
+                            <tbody class="table-fenxi-td">
+                            
+                               
                             </tbody>
                         </table>
                     </div>
@@ -107,4 +149,29 @@
         </div>
     </div>
 
-</div>
\ No newline at end of file
+</div>
+
+<script id="table-fenxi-th-dot" type="text/html">
+    {{#  layui.each(d, function(index, item){ }}
+        {{#  if(item == "第0日"){ }}
+            <th>当日</th>
+        {{#  } else { }}
+            <th>{{item}}</th>
+        {{#  } }} 
+    {{#  }); }}
+</script>
+
+<script id="table-fenxi-td-dot" type="text/html">
+    {{#  layui.each(d, function(index, item){ }}
+    <tr >
+        <td>{{item.date}}</td>
+        <td>{{item.d0}}</td>
+        {{#  layui.each(item.data, function(indexs, items){ }}
+        <td>
+            <p>{{items.n}}</p>
+            <p>{{items.p}}%</p>
+        </td>
+        {{#  }); }}
+    </tr>
+    {{#  }); }}
+</script>
\ No newline at end of file
diff --git a/web/pages/returnvisitevent.html b/web/pages/returnvisitevent.html
new file mode 100644
index 0000000..657ee1f
--- /dev/null
+++ b/web/pages/returnvisitevent.html
@@ -0,0 +1,52 @@
+<script id="analysis-overall-situation-list-box-return-dot" type="text/html">
+    <div class="analysis-con-left-screen-list">
+        <!-- 指标选择 -->
+        <div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box">
+            <div class="analysis-con-left-screen-list-left-zhibiaoname analysis-con-left-screen-list-left-zhibiaoname-return-event" id="analysis-con-left-screen-list-left-zhibiaoname-return-event">
+                <input type="text" placeholder="请输入指标名" class="analysis-con-left-screen-list-left-zhibiaoname-txt"/>
+            </div>
+            <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>
+                </div>
+            </div>
+            {{#  if(d.filts.length > 0){ }}
+            <div class="analysis-con-left-screen-list-right-screen-bg" id="analysis-con-left-screen-list-right-screen-bg">
+                <div class="analysis-con-left-screen-list-right-screen-box">
+                    <div class="analysis-con-left-screen-list-right-screen-qh">
+                        <div class="analysis-con-left-screen-list-right-screen-qh-xian"></div>
+                        {{#  if(d.filts.length > 1){ }}
+                            {{#  if(d.relation === "and"){ }}
+                                <div class="analysis-con-left-screen-list-right-screen-qh-tit">且</div>
+                            {{#  } else { }}
+                                <div class="analysis-con-left-screen-list-right-screen-qh-tit">或</div>
+                            {{#  } }} 
+                        {{#  } }} 
+                    </div>
+                    <div style="padding-bottom: 10px;" class="analysis-zhibiao-list2-box">
+                        {{#  layui.each(d.filts, function(indexs, items){ }}
+                            <div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{indexs}}">
+                                <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
+                                <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}">{{items.comparatorName}}</div>
+                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <div class="analysis-zhibiao-list-del analysis-zhibiao-list-del-return-event" data-twonum="{{indexs}}"></div>
+                            </div>
+                        {{#  }); }}
+                    </div>
+                </div>
+                <div class="analysis-zhibiao-updata-list-box">
+                    <span class="analysis-zhibiao-updata analysis-zhibiao-updata-return-event"> <img src="./static/img/shaix.png" /> 添加条件 </span>
+                </div>
+            </div>
+            {{#  } }} 
+        </div>
+        <!-- 操作按钮 -->
+        <div class="analysis-con-left-screen-list-right-box">
+            <div class="analysis-con-left-screen-list-right" >
+                <div class="analysis-chongmingming analysis-chongmingming-return-event" title="重命名指标"></div>
+                <div class="analysis-chongmingming-del analysis-chongmingming-del-return-event" title="取消重命名"></div>
+                <div class="analysis-shaix analysis-shaix-return-event" title="指标筛选"></div>
+            </div>
+        </div>
+    </div>
+</script>
diff --git a/web/pages/setgrouping.html b/web/pages/setgrouping.html
index 0e98a6e..53c3b0c 100644
--- a/web/pages/setgrouping.html
+++ b/web/pages/setgrouping.html
@@ -24,8 +24,8 @@
             <div class="setgrouping-content-title">{{item.title}}</div>
             <div class="setgrouping-content-list-box">
                 {{#  layui.each(item.category, function(indexs, items){ }}
-                <div class="setgrouping-content-list" data-index="{{index}}" data-indexs="{{indexs}}" data-id="{{items.event_name}}" data-name="{{items.event_name}}">
-                    <div>{{items.event_name}}</div>
+                <div class="setgrouping-content-list" data-index="{{index}}" data-indexs="{{indexs}}" data-id="{{items.event_desc}}" data-name="{{items.event_name}}">
+                    <div>{{items.event_desc}}</div>
                     <!-- {{#  if(items.isshoucang != 1){ }} -->
                     <img src="./static/img/xing1.png" class="setgrouping-content-list-img">
                     <!-- {{#  } else { }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index f89e969..93c2627 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -123,8 +123,8 @@ var X = window.X || {
 };
 
 (function(){
-    // var ipurl = "http://10.0.0.77:7889/api/v1/"
-    var ipurl = "http://119.29.176.224:7889/api/v1/"
+    // var ipurl = "http://10.0.0.77:7889/api/v1/";
+    var ipurl = "http://119.29.176.224:7889/api/v1/";
 
     //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
     X.loginCache = function(data){
@@ -190,10 +190,12 @@ var X = window.X || {
         });
     }
 
-    X.template = function(url,id){
+    X.template = function(url,id,data,callback){
 		$.get('pages/'+ url + '.html',function(content){
 			$('#'+id).html(content);
-            X.pageLogic[url] && X.pageLogic[url].init && X.pageLogic[url].init();
+            X.pageLogic[url] && X.pageLogic[url].init && X.pageLogic[url].init(data);
+            callback && callback();
+            // X.pageLogic[parms.url] && X.pageLogic[parms.url].init && X.pageLogic[parms.url].init( parms );
 		});
     };
 
@@ -388,9 +390,9 @@ var X = window.X || {
             "startDate": moment().subtract(29, 'days'),
             "endDate": new Date(),
             "opens": "right",
-            callback:callback
-        }, function (start, end, label) {
            
+        }, function (start, end, label) {
+            callback && callback(start,end,label);
             // console.log(start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
         });
     }
@@ -1283,6 +1285,7 @@ var X = window.X || {
             var data = {
                 "events":[],
                 "eventView":{
+                    "cksql":"event",
                     "startTime":"",
                     "timeParticleSize":"P1D",
                     "endTime":"",
@@ -1293,7 +1296,7 @@ var X = window.X || {
                         "tableSorts":[],
                         "chartSort":"num-desc"
                     },
-                    "filters":[],//全局筛选
+                    "filts":[],//全局筛选
                     "relation":1,
                     "zone_time":'8'//时区
                 },
@@ -1349,8 +1352,6 @@ var X = window.X || {
 
             var time = $("#analtsis-condition-date").val();
             var timearr = time.split(" ");
-            console.log(time);
-            console.log(timearr);
             data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
@@ -1361,13 +1362,14 @@ var X = window.X || {
                     retdata = d.staid_quots.concat(d.props);
                     props = d.props;
                     var defaultindicator = {
+                        "event_desc":dataArr[0]['category'][0]['event_desc'],
                         "event_name":dataArr[0]['category'][0]['event_name'],
                         "event_attr":"总次数",
                         "event_attr_id":"*",
                         "analysisname":'',
                         "analysis":'total_count',
                         "renameindicator":"", //重命名指标
-                        "filters":[],//过滤项
+                        "filts":[],//过滤项
                         "condrelation":'and',
                     }
                     data.events.push(defaultindicator);
@@ -1423,7 +1425,7 @@ var X = window.X || {
                         screentypearr = data.cachedata.screentypearr;
                         filtersymbols = data.cachedata.filtersymbols;
                        
-                        if(d.query.eventView.filters.length > 0){
+                        if(d.query.eventView.filts.length > 0){
                             $(".analysis-overall").show();
                         }else {
                             $(".analysis-overall").hide();
@@ -1431,7 +1433,7 @@ var X = window.X || {
     
                         X.laytpldata("#analysis-con-left-screen-list-dot",d.query.events,".analysis-con-left-screen-list-box");
                         X.laytpldata("#analysis-gpmain___3YGfw-dot",d.query.eventView.groupBy,".analysis-gpmain___3YGfw");
-                        X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filters'],".analysis-overall-situation-list-box");
+                        X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filts'],".analysis-overall-situation-list-box");
                         analysisdown();
                         calculationdata();
 
@@ -1508,17 +1510,19 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr('data-index');
                 X.querycriteriapop(dataArr,'setgrouping',offset.left,offset.top+obj.height(),function(val){
-                    var htmlstring = val.name;
+                    var htmlstring = val.id;
                     obj.html(htmlstring);
+                    data['events'][index]['event_desc'] = val.id;
                     data['events'][index]['event_name'] = val.name;
-                    X.api("data_auth/load_prop_quotas","post",{event_name:val.id},function(d){
+                    X.api("data_auth/load_prop_quotas","post",{event_name:val.name},function(d){
                         var retdata = d.staid_quots.concat(d.props);
                         type2data[index]=retdata;
                         screentypearr[index] = d.props;
                     })
 
-                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(d){
+                    X.api("data_auth/load_filter_props","post",{event_name:val.name},function(d){
                         groupitemeventsdata[index] = d;
+                        console.log(groupitemeventsdata);
                     })
 
                     
@@ -1578,10 +1582,10 @@ var X = window.X || {
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     filtersymbols[index][indexs] = val.category;
-                    data['events'][index]['filters'][indexs]['column_name'] = htmlstring;
-                    data['events'][index]['filters'][indexs]['column_id'] = val.id;
-                    data['events'][index]['filters'][indexs]['data_type'] = val.type;
-                    data['events'][index]['filters'][indexs]['table_type'] = val.table_type;
+                    data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
+                    data['events'][index]['filts'][indexs]['columnName'] = val.id;
+                    data['events'][index]['filts'][indexs]['data_type'] = val.type;
+                    data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
                 })
 
             })
@@ -1594,8 +1598,8 @@ var X = window.X || {
                 X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
-                        data['events'][index]['filters'][indexs]['comparator_name'] = val.title;
-                        data['events'][index]['filters'][indexs]['comparator_id'] = val.id;
+                        data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
+                        data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
             })
@@ -1612,16 +1616,16 @@ var X = window.X || {
                 X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["event_name"]},function(d){
                     console.log(d);
                     var arr = {
-                        "column_name":d[0]['category'][0]['title'],//事件中文显示
-                        "column_id":d[0]['category'][0]['id'],//事件id
+                        "columnDesc":d[0]['category'][0]['title'],//事件中文显示
+                        "columnName":d[0]['category'][0]['id'],//事件id
                         "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
-                        "comparator_id":d[0]['category'][0]['category'][0]['id'],//符号id
+                        "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
                         "data_type":d[0]['category'][0]['data_type'],
                         "ftv":'',//条件
                         "strftv":'',//字符串显示条件
-                        "table_type": d[0]['id']
+                        "tableType": d[0]['id']
                     } //筛选数据
-                    data['events'][index]['filters'].push(arr);
+                    data['events'][index]['filts'].push(arr);
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                     var drr=[];
                     filtersymbols.push(drr);
@@ -1643,8 +1647,8 @@ var X = window.X || {
                 var indexs = $(this).attr("data-indexs");
                 var val = $(this).val();
                 var valarr = val.split(",");
-                data['events'][index]['filters'][indexs]['ftv']=valarr;
-                data['events'][index]['filters'][indexs]['strftv']=val;
+                data['events'][index]['filts'][indexs]['ftv']=valarr;
+                data['events'][index]['filts'][indexs]['strftv']=val;
             })
 
             // 且和或切换
@@ -1672,20 +1676,21 @@ var X = window.X || {
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
                 filtersymbols[index].splice(indexs,1);
-                data.events[index]['filters'].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(){
                 var defaultindicator = {
+                    "event_desc":dataArr[0]['category'][0]['event_desc'],
                     "event_name":dataArr[0]['category'][0]['event_name'],
                     "event_attr":"总次数",
                     "event_attr_id":"*",
                     "analysisname":'',
                     "analysis":'total_count',
                     "renameindicator":"", //重命名指标
-                    "filters":[],//过滤项
+                    "filts":[],//过滤项
                     "condrelation":'and',
                 }
                 data['events'].push(defaultindicator);
@@ -1758,10 +1763,10 @@ var X = window.X || {
                 var screentypedata = filteringdata();
                 console.log(screentypedata);
                 var drr = {
-                    "column_name":screentypedata[0]['category'][index]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][index]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][index]['title'],//事件中文显示
+                    "columnName":screentypedata[0]['category'][index]['id'],//事件id
                     'data_type':screentypedata[0]['category'][index]['data_type'],//类型
-                    'table_type': screentypedata[0]['id'],
+                    'tableType': screentypedata[0]['id'],
                     "ftv":'',//条件
                     "section":''//区间
                 }
@@ -1777,10 +1782,10 @@ var X = window.X || {
                 X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['column_name'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
-                    data.eventView.groupBy[index]['table_type'] = val.table_type;
+                    data.eventView.groupBy[index]['tableType'] = val.table_type;
                     X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
                 })
             })
@@ -1876,42 +1881,42 @@ var X = window.X || {
 
                 var screentypedata = filteringdata();
                 var drr={
-                    "column_name":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":screentypedata[0]['id']
+                    "tableType":screentypedata[0]['id']
                 };
-
-                data['eventView']['filters'].push(drr);//上传全局数据
+                console.log(drr);
+                data['eventView']['filts'].push(drr);//上传全局数据
                 filtsftvdata.push(screentypedata[0]['category'][0]['category'])
 
                 $(".analysis-overall-situation-left-box").show();
 
-                if(data['eventView']['filters'].length > 1){
+                if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
             })
 
             //循环给条件框渲染下拉框
             function analysisdown(){
-                for(let i in data['eventView']['filters']){
+                for(let i in data['eventView']['filts']){
                     X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
                         $(this).html(val.title);
-                        data['eventView']['filters'][i]['comparator_name'] = val.title;
-                        data['eventView']['filters'][i]['comparator_id'] = val.id;
+                        data['eventView']['filts'][i]['comparator_name'] = val.title;
+                        data['eventView']['filts'][i]['comparator'] = val.id;
                         if(val.id == "range"){
-                            data['eventView']['filters'][i]['ftv'] = [-1,1];
+                            data['eventView']['filts'][i]['ftv'] = [-1,1];
                         }
-                        X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                        X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                         analysisdown();
                     })
                 }
@@ -1919,15 +1924,15 @@ var X = window.X || {
 
             $(document).on('click',".analysis-overall-situation-del",function(){
                 var index = $(this).attr("data-index");
-                data['eventView']['filters'].splice(index,1);
+                data['eventView']['filts'].splice(index,1);
                 filtsftvdata.splice(index,1);
-                if(data['eventView']['filters'].length > 1){
+                if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                     // $(".analysis-overall-situation-left-box").hide();
                 }
-                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
             })
 
@@ -1938,14 +1943,14 @@ var X = window.X || {
                 var index = obj.attr("data-index");
                 X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    data['eventView']['filters'][index]['column_name'] = val.title;
-                    data['eventView']['filters'][index]['column_id'] = val.id;
-                    data['eventView']['filters'][index]['data_type'] = val.type;
-                    data['eventView']['filters'][index]['comparator_name'] = '等于';
-                    data['eventView']['filters'][index]['comparator_id'] = '==';
-                    data['eventView']['filters'][index]['table_type'] = val.table_type;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
+                    data['eventView']['filts'][index]['data_type'] = val.type;
+                    data['eventView']['filts'][index]['comparator_name'] = '等于';
+                    data['eventView']['filts'][index]['comparator'] = '==';
+                    data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
-                    X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                    X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                     analysisdown();
                 })
             })
@@ -1954,8 +1959,8 @@ var X = window.X || {
                 var index = $(this).attr("data-index");
                 var val = $(this).val();
                 var valarr = val.split(",");
-                data['eventView']['filters'][index]['ftv']=valarr;
-                data['eventView']['filters'][index]['strftv']=val;
+                data['eventView']['filts'][index]['ftv']=valarr;
+                data['eventView']['filts'][index]['strftv']=val;
             })
 
             $(document).on('blur','.analysis-overall-situation-input2 input',function(){
@@ -1964,11 +1969,11 @@ var X = window.X || {
                 var index = $(this).attr("data-index");
                 
                 if(name == 'start'){
-                    data['eventView']['filters'][index]['ftv'][0] = val;
-                    data['eventView']['filters'][index]['section'][0] = val;
+                    data['eventView']['filts'][index]['ftv'][0] = val;
+                    data['eventView']['filts'][index]['section'][0] = val;
                 }else {
-                    data['eventView']['filters'][index]['ftv'][1] = val;
-                    data['eventView']['filters'][index]['section'][1] = val;
+                    data['eventView']['filts'][index]['ftv'][1] = val;
+                    data['eventView']['filts'][index]['section'][1] = val;
                 }
             })
 
@@ -2344,7 +2349,7 @@ var X = window.X || {
             })
 
             //单击属性
-            $(document).on("click",".zhuang_conetnt .ta-pso-line",function(){
+            $(document).off('click','.zhuang_conetnt .ta-pso-line').on('click','.zhuang_conetnt .ta-pso-line',function(){
                 // var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
                 var valdata = {
@@ -2375,7 +2380,7 @@ var X = window.X || {
                 eventView:data.eventView,
                 events:data.events
             }
-            X.api('ck/event_model_sql','post',data,function(d){
+            X.api('ck/'+ dataArr['eventView']['cksql'] +'_model_sql','post',dataArr,function(d){
                 console.log(d);
                 $(".conditionquery-sqldata").html(d[0]['sql']);
                 $(".conditionquery-apidata").html(JSON.stringify(data));
@@ -2801,6 +2806,22 @@ var X = window.X || {
     };
 })();
 
+// srczip/logic/event.js
+(function(){
+    X.pageLogic['event'] = {
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+            X.laytpldata("#analysis-overall-situation-list-box-dot",data,"#initial-event");
+            
+        }
+    };
+})();
 // srczip/logic/eventattradmin.js
 (function(){
     X.pageLogic['eventattradmin'] = {
@@ -2945,13 +2966,38 @@ var X = window.X || {
     };
 })();
 
+// srczip/logic/globalfilter.js
+(function(){
+    X.pageLogic['globalfilter'] = {
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+
+            console.log(111,data);
+            X.laytpldata("#analysis-overall-situation-list-box-dot",data,"#xinwei-whole");
+            
+            
+        }
+    };
+})();
 // srczip/logic/grouped.js
 (function(){
     X.pageLogic['grouped'] = {
-        init : function(){
-            var data = [
-                {}
-            ]
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+
+            console.log(111,data);
             X.laytpldata("#analysis-con-left-screen-box-dot",data,"#shushi");
             
             
@@ -3848,75 +3894,588 @@ var X = window.X || {
 // srczip/logic/retained.js
 (function(){
     X.pageLogic['retained'] = {
-        init : function(){
+        init : function(parms){
+
             // X.gourl("grouped","shushi");
             X.template("grouped","shushi");
 
             var data ={
-                "events": [
-                    {
-                        "event_name": "create_role",
-                        "event_attr": "总次数",
-                        "event_attr_id": "*",
-                        "analysisname": "",
-                        "analysis": "total_count",
-                        "renameindicator": "",
-                        "filters": [],
-                        "condrelation": "and"
-                    }
-                ],
-                "eventView": {
-                    "startTime": "2021-05-01 00:00:00",
-                    "timeParticleSize": "P1D",
-                    "endTime": "2021-05-19 23:59:59",
-                    "graphShape": "L0",
-                    "recentDay": "1-30",
-                    "groupBy": [
-                        {
-                            "column_name": "#account_id",
-                            "column_id": "#account_id",
-                            "data_type": "string",
-                            "table_type": "event",
-                            "ftv": "",
-                            "section": ""
+                        "eventView":{
+                            "cksql":"retention",
+                            "endTime":"2021-06-07 23:59:59",
+                            "filts":[],
+                            "groupBy":[],
+                            "recentDay":"1-30",
+                            "relation":"and",
+                            "startTime":"2021-05-09 00:00:00",
+                            "statType":"retention",
+                            "timeParticleSize":"P1D",
+                            "unitNum":7
                         },
-                        {
-                            "column_name": "#app_id",
-                            "column_id": "#app_id",
-                            "data_type": "string",
-                            "table_type": "event",
-                            "ftv": "",
-                            "section": ""
-                        }
-                    ],
-                    "uiCommonConfig": {
-                        "tableSorts": [],
-                        "chartSort": "num-desc"
-                    },
-                    "filters": [],
-                    "relation": 1,
-                    "zone_time": "8"
-                },
-            }
-            X.grouped(data['eventView']['groupBy'],"#shushi")
+                        "events":[
+                            
+                        ],
+                        "projectId":1
+            };
 
-            $(document).off('click','.analysis-calculation').on("click",'.analysis-calculation',function(){
-                console.log(211);
+            // 日期渲染
+            X.daterender("#retained-condition-date",function(start, end, label){
+                var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
+                var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
+                data['eventView']['startTime'] = startTime;
+                data['eventView']['endTime'] = endTime;
+                retaineddata();
             })
 
+            var time = $("#retained-condition-date").val();
+            var timearr = time.split(" ");
+            data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
+            data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
+
+            X.grouped(data['eventView']['groupBy'],"#shushi");
+
+            // $(document).off('click','.analysis-calculation').on("click",'.analysis-calculation',function(){
+            //     console.log(211);
+            // })
+
+            var eventdata;
+            var filtersymbols = [[],[]];//默认两个事件
+            var groupitemeventsdata=[[],[]]//分组项里的事件
+
+            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":""
+                }
+                data['events'].push(arr);
+                data['events'].push(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;
+                })
+            })
+
+            //初始事件
+            X.template("event","initial-event",data['events'][0]);
+            X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+            //开启重命名
+            $(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(){
+                $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").hide();
+                $("#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(){
+            //     var arr = {
+            //         "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
+            //         "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
+            //         "comparator":"==",
+            //         "comparatorName":"等于",
+            //         "ftv":[],
+            //         "strftv":"",
+            //         "table_type":groupitemeventsdata[0][0]['category'][0]['data_type'],
+            //         "timeUnit":""
+            //     }
+            //     data['events'][0]['filts'].push(arr);
+            //     filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
+            //     X.template("event","initial-event",data['events'][0]);
+            // })
+
+            // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-return-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
+            //     var arr = {
+            //         "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
+            //         "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
+            //         "comparator":"==",
+            //         "comparatorName":"等于",
+            //         "ftv":[],
+            //         "strftv":"",
+            //         "table_type":groupitemeventsdata[1][0]['category'][0]['data_type'],
+            //         "timeUnit":""
+            //     }
+            //     data['events'][1]['filts'].push(arr);
+            //     filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
+            //     X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+            // })
+
+            // 添加初始事件筛选
+            var initialevent = []
+            $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){
+                var arr = {
+                    "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
+                    "comparator":"==",
+                    "comparatorName":"等于",
+                    "ftv":[],
+                    "strftv":"",
+                    "table_type":groupitemeventsdata[0][0]['category'][0]['data_type'],
+                    "timeUnit":""
+                }
+                initialevent.push(arr);
+                data['events'][1]['filts'] = initialevent;
+                filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
+                X.template("event","initial-event",data['events'][0]);
+            })
+            var returnevent = []
+            $(document).off('click','.analysis-shaix-return-event').on('click','.analysis-shaix-return-event',function(){
+                var arr = {
+                    "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
+                    "comparator":"==",
+                    "comparatorName":"等于",
+                    "ftv":[],
+                    "strftv":"",
+                    "table_type":groupitemeventsdata[1][0]['category'][0]['data_type'],
+                    "timeUnit":""
+                }
+                // data['events'][1]['filts'].push(arr);
+                returnevent.push(arr);
+                data['events'][1]['filts'] = returnevent;
+                filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
+                X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+            })
+
+            // 删除指定初始事件筛选
+            $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
+                var index = $(this).attr("data-twonum");
+                data['events'][0]['filts'].splice(index,1);
+                filtersymbols[0].splice(index,1);
+                X.template("event","initial-event",data['events'][0]);
+            })
+
+            $(document).off('click','.analysis-zhibiao-list-del-return-event').on('click','.analysis-zhibiao-list-del-return-event',function(){
+                var index = $(this).attr("data-twonum");
+                data['events'][0]['filts'].splice(index,1);
+                filtersymbols[1].splice(index,1);
+                X.template("returnvisitevent","return-event",data['events'][0]);
+            })
+            
+            $(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);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
+                    console.log(val);
+                    obj.html(val.id);
+                    data['events'][index]['eventName'] = val.name;
+                    data['events'][index]['eventDesc'] = val.id;
+                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
+                        console.log(val);
+                        groupitemeventsdata[index] = val;
+                    })
+                    console.log(groupitemeventsdata)
+
+                })
+            })
+
+            $(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){
+                    console.log(val);
+                    var htmlstring = val.title;
+                    obj.html(htmlstring);
+                    filtersymbols[index][indexs] = val.category;
+                    data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
+                    data['events'][index]['filts'][indexs]['columnName'] = val.id;
+                    data['events'][index]['filts'][indexs]['data_type'] = val.type;
+                    data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
+                })
+            })
+
+            // 过滤数据
+            function filteringdata(){
+                var screentypedata;
+                if(groupitemeventsdata.length>1){
+                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
+                        if(i == 0){
+                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
+                                screentypedata = d;
+                            });
+                        }else {
+                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
+                                screentypedata = d;
+                            })
+                        }
+                    }
+                }else { 
+                    screentypedata = groupitemeventsdata[0];
+                }
+                return screentypedata;
+            }
+            
+            $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                    if(val != undefined){
+                        obj.html(val.title);
+                        data['events'][index]['filts'][indexs]['comparatorName'] = val.title;
+                        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');
+                var indexs = $(this).attr('data-indexs');
+                var txt = $(this).val();
+                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 drr={
+                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
+                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    'data_type':screentypedata[0]['category'][0]['data_type'],//类型
+                    'comparator_name':'等于',//默认等于
+                    "comparator_id":'==',//符号id
+                    "ftv":[],//条件
+                    "strftv":'',//显示条件
+                    "section":[-1,1],//区间
+                    "table_type":screentypedata[0]['id']
+                };
+                data['eventView']['filts'].push(drr);
+                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
+                if(data['eventView']['filts'].length > 1){
+                    $(".analysis-overall-situation-left-guanxi").show();
+                }else{
+                    $(".analysis-overall-situation-left-guanxi").hide();
+                }
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                    analysisdown();
+                });
+            })
+
+            //删除指定全局数据
+            $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
+                var index = $(this).attr('data-index');
+                data['eventView']['filts'].splice(index,1);
+                filtsftvdata.splice(index,1);
+                if(data['eventView']['filts'].length > 1){
+                    $(".analysis-overall-situation-left-guanxi").show();
+                }else{
+                    $(".analysis-overall-situation-left-guanxi").hide();
+                }
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+            })
+
+            $(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){
+                    obj.html(val.title);
+                    data['eventView']['filts'][index]['columnName'] = val.title;
+                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['data_type'] = val.type;
+                    data['eventView']['filts'][index]['comparator_name'] = '等于';
+                    data['eventView']['filts'][index]['comparator_id'] = '==';
+                    data['eventView']['filts'][index]['table_type'] = val.table_type;
+                    filtsftvdata[index]=val.category;
+                    analysisdown();//渲染下拉框
+                })
+            })
+
+            //循环给条件框渲染下拉框
+            function analysisdown(){
+                console.log(data['eventView']['filts']);
+                console.log(filtsftvdata);
+                for(let i in data['eventView']['filts']){
+                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+                        $(this).html(val.title);
+                        data['eventView']['filts'][i]['comparator_name'] = val.title;
+                        data['eventView']['filts'][i]['comparator_id'] = val.id;
+                        if(val.id == "range"){
+                            data['eventView']['filts'][i]['ftv'] = [-1,1];
+                        }
+                        X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+                        analysisdown();
+                    })
+                }
+            }
+
+            // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
-                console.log(111);
+                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() {
-                var data= [
-                    {},{}
-                ]
-                X.laytpldata("#analysis-con-left-screen-box-dot",data,"#shushi");
-            }) 
+                
+                var arr = {
+                    "columnName": "#account_id",//事件中文显示
+                    "column_id": "#account_id",//事件id
+                    'data_type': "string",//类型
+                    'table_type': "event",
+                    "ftv":'',//条件
+                    "section":''//区间
+                };
+                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){
+                    console.log(val);
+                    var htmlstring = val.title;
+                    obj.html(htmlstring);
+                    data.eventView.groupBy[index]['columnName'] = val.title;
+                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['data_type'] = val.type;
+                    data.eventView.groupBy[index]['table_type'] = val.table_type;
+                    
+
+                })
+
+            })
+
+            // 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 timeParticleSizearr = [
+                {'title':'当日','id':'1'},
+                {'title':'次日','id':'2'},
+                {'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'] = d.id;
+                retaineddata();
+            })
+
+            // 计算按钮
+            $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
+                retaineddata()
+            })
+
+            function retaineddata(){
+                X.api("ck/retention_model","post",data,function(d){
+                    console.log(data);
+                    querydata = d;
+                    retainedtable(d)
+                })
+            }
+
+            function retainedtable(d){
+                var tabledata=[];
+                for(let i in d['summary_values']){
+                    var arr = {
+                        date: i,
+                        d0:d['summary_values'][i]['d0'],
+                        data:[]
+                    }
+                    for(let j in d['summary_values'][i]["n"]){
+                        var nrr = {
+                            n:0,
+                            p:0
+                        }
+                        nrr["n"] = d['summary_values'][i]["n"][j];
+                        nrr["p"] = d['summary_values'][i]["p"][j]
+                        arr['data'].push(nrr);
+                    }
+                    tabledata.push(arr)
+                }
+    
+                var titdata = [];
+                for(let i in d['days']){
+                    var tit = "第" + i + "日";
+                    titdata.push(tit);
+                }
+                titdata.unshift("日期",d.title);
+                X.laytpldata("#table-fenxi-th-dot",titdata,".table-fenxi-th");
+    
+                X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
+            }
+
+            // 每日留存
+            function retaineddayRetained(d){
+                var xAxisData=[];
+                for(let i in d['days']){
+                    var tit = "第" + i + "日";
+                    xAxisData.push(tit);
+                }
+                var seriesData=[];
+                for(let i in d['summary_values']){
+                    var arr = {
+                        name: i,
+                        type: 'line',
+                        stack: '',
+                        data: d['summary_values'][i]['p']
+                    }
+                    seriesData.push(arr);
+                }
+                var myChart = echarts.init(document.getElementById('analysis-echarts'));
+                var option = {
+                    title: {
+                        text: ''
+                    },
+                    color: [ '#3ea7fd', '#cdddfd', '#5ad8a6', '#cdf3e4', '#5d7092', '#ced4de', '#f6bd16','#fcebb9','#e86452','#f8d0cb','#6dc8ec', '#d3eef9', '#9270ca', '#d3c6ea', '#ff9d4d', '#ffd8b8', '#269a99','#aad8d8','#ff99c3','#ffd6e7' ],
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross',
+                            label: {
+                                backgroundColor: '#6a7985'
+                            }
+                        }
+                    },
+                    legend: {
+                        type:'scroll',
+                        data: d.date_range
+                    },
+                    toolbox: {
+                        feature: {
+                            saveAsImage: {}
+                        }
+                    },
+                    grid: {
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        top: '10%',
+                        containLabel: true
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            boundaryGap: false,
+                            data: xAxisData
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: seriesData
+                };
+                myChart.setOption(option,true);
+            }
+
+            function retainednRetained(d){
+                var data = [];
+                for(let i in d['summary_values']){
+                    var index = d['summary_values'][i]['p'].length - 1;
+                    data.push(d['summary_values'][i]['p'][index]);
+                }
+                console.log(data);
+                var myChart = echarts.init(document.getElementById('analysis-echarts'));
+                var option = {
+                    xAxis: {
+                        type: 'category',
+                        data: d['date_range']
+                    },
+                    color: [ '#3ea7fd'],
+                    grid: {
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        top: '10%',
+                        containLabel: true
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [{
+                        data: data,
+                        type: 'line'
+                    }]
+                }
+                myChart.setOption(option,true);
+
+            }
+
+            var querydata;
+            $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
+                if(querydata){
+                    $('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
+                    $(this).addClass('select-chart');
+                    if($(this).attr('title') == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(querydata)}
+                    else if($(this).attr('title') == '第N日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retainednRetained(querydata) }
+                    else if($(this).attr('title') == '每日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retaineddayRetained(querydata) }
+                }else{
+                    layer.msg('请先计算数据,在切换图表');
+                }
+            })
+
+        }
+    };
+})();
+// srczip/logic/returnvisitevent.js
+(function(){
+    X.pageLogic['returnvisitevent'] = {
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+            console.log(data);
+            X.laytpldata("#analysis-overall-situation-list-box-return-dot",data,"#returnvisit-event");
             
-
         }
     };
 })();
@@ -4391,7 +4950,7 @@ var X = window.X || {
                 X.laytpldata("#judge-box-dot",data,".setgrouping-box .setgrouping-content-box");
             })
             
-            $(document).on("click",".setgrouping-content-list",function(){
+            $(document).off('click','.setgrouping-content-list').on('click','.setgrouping-content-list',function(){
                 var index = $(this).attr('data-index');
                 var indexs = $(this).attr('data-indexs');
                 var valdata = {
diff --git a/web/srczip/common.js b/web/srczip/common.js
index f64619c..50bee3a 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -122,8 +122,8 @@ var X = window.X || {
 };
 
 (function(){
-    // var ipurl = "http://10.0.0.77:7889/api/v1/"
-    var ipurl = "http://119.29.176.224:7889/api/v1/"
+    // var ipurl = "http://10.0.0.77:7889/api/v1/";
+    var ipurl = "http://119.29.176.224:7889/api/v1/";
 
     //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
     X.loginCache = function(data){
@@ -189,10 +189,12 @@ var X = window.X || {
         });
     }
 
-    X.template = function(url,id){
+    X.template = function(url,id,data,callback){
 		$.get('pages/'+ url + '.html',function(content){
 			$('#'+id).html(content);
-            X.pageLogic[url] && X.pageLogic[url].init && X.pageLogic[url].init();
+            X.pageLogic[url] && X.pageLogic[url].init && X.pageLogic[url].init(data);
+            callback && callback();
+            // X.pageLogic[parms.url] && X.pageLogic[parms.url].init && X.pageLogic[parms.url].init( parms );
 		});
     };
 
@@ -387,9 +389,9 @@ var X = window.X || {
             "startDate": moment().subtract(29, 'days'),
             "endDate": new Date(),
             "opens": "right",
-            callback:callback
-        }, function (start, end, label) {
            
+        }, function (start, end, label) {
+            callback && callback(start,end,label);
             // console.log(start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
         });
     }
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index d2f62f6..0b9f091 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -18,6 +18,7 @@
             var data = {
                 "events":[],
                 "eventView":{
+                    "cksql":"event",
                     "startTime":"",
                     "timeParticleSize":"P1D",
                     "endTime":"",
@@ -28,7 +29,7 @@
                         "tableSorts":[],
                         "chartSort":"num-desc"
                     },
-                    "filters":[],//全局筛选
+                    "filts":[],//全局筛选
                     "relation":1,
                     "zone_time":'8'//时区
                 },
@@ -84,8 +85,6 @@
 
             var time = $("#analtsis-condition-date").val();
             var timearr = time.split(" ");
-            console.log(time);
-            console.log(timearr);
             data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
             data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
 
@@ -96,13 +95,14 @@
                     retdata = d.staid_quots.concat(d.props);
                     props = d.props;
                     var defaultindicator = {
+                        "event_desc":dataArr[0]['category'][0]['event_desc'],
                         "event_name":dataArr[0]['category'][0]['event_name'],
                         "event_attr":"总次数",
                         "event_attr_id":"*",
                         "analysisname":'',
                         "analysis":'total_count',
                         "renameindicator":"", //重命名指标
-                        "filters":[],//过滤项
+                        "filts":[],//过滤项
                         "condrelation":'and',
                     }
                     data.events.push(defaultindicator);
@@ -158,7 +158,7 @@
                         screentypearr = data.cachedata.screentypearr;
                         filtersymbols = data.cachedata.filtersymbols;
                        
-                        if(d.query.eventView.filters.length > 0){
+                        if(d.query.eventView.filts.length > 0){
                             $(".analysis-overall").show();
                         }else {
                             $(".analysis-overall").hide();
@@ -166,7 +166,7 @@
     
                         X.laytpldata("#analysis-con-left-screen-list-dot",d.query.events,".analysis-con-left-screen-list-box");
                         X.laytpldata("#analysis-gpmain___3YGfw-dot",d.query.eventView.groupBy,".analysis-gpmain___3YGfw");
-                        X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filters'],".analysis-overall-situation-list-box");
+                        X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filts'],".analysis-overall-situation-list-box");
                         analysisdown();
                         calculationdata();
 
@@ -243,17 +243,19 @@
                 var offset = obj.offset();
                 var index = obj.attr('data-index');
                 X.querycriteriapop(dataArr,'setgrouping',offset.left,offset.top+obj.height(),function(val){
-                    var htmlstring = val.name;
+                    var htmlstring = val.id;
                     obj.html(htmlstring);
+                    data['events'][index]['event_desc'] = val.id;
                     data['events'][index]['event_name'] = val.name;
-                    X.api("data_auth/load_prop_quotas","post",{event_name:val.id},function(d){
+                    X.api("data_auth/load_prop_quotas","post",{event_name:val.name},function(d){
                         var retdata = d.staid_quots.concat(d.props);
                         type2data[index]=retdata;
                         screentypearr[index] = d.props;
                     })
 
-                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(d){
+                    X.api("data_auth/load_filter_props","post",{event_name:val.name},function(d){
                         groupitemeventsdata[index] = d;
+                        console.log(groupitemeventsdata);
                     })
 
                     
@@ -313,10 +315,10 @@
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     filtersymbols[index][indexs] = val.category;
-                    data['events'][index]['filters'][indexs]['column_name'] = htmlstring;
-                    data['events'][index]['filters'][indexs]['column_id'] = val.id;
-                    data['events'][index]['filters'][indexs]['data_type'] = val.type;
-                    data['events'][index]['filters'][indexs]['table_type'] = val.table_type;
+                    data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
+                    data['events'][index]['filts'][indexs]['columnName'] = val.id;
+                    data['events'][index]['filts'][indexs]['data_type'] = val.type;
+                    data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
                 })
 
             })
@@ -329,8 +331,8 @@
                 X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
                     if(val != undefined){
                         obj.html(val.title);
-                        data['events'][index]['filters'][indexs]['comparator_name'] = val.title;
-                        data['events'][index]['filters'][indexs]['comparator_id'] = val.id;
+                        data['events'][index]['filts'][indexs]['comparator_name'] = val.title;
+                        data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
             })
@@ -347,16 +349,16 @@
                 X.api('data_auth/load_filter_props',"post",{event_name:data['events'][index]["event_name"]},function(d){
                     console.log(d);
                     var arr = {
-                        "column_name":d[0]['category'][0]['title'],//事件中文显示
-                        "column_id":d[0]['category'][0]['id'],//事件id
+                        "columnDesc":d[0]['category'][0]['title'],//事件中文显示
+                        "columnName":d[0]['category'][0]['id'],//事件id
                         "comparator_name":d[0]['category'][0]['category'][0]['title'],//选择符号中文显示
-                        "comparator_id":d[0]['category'][0]['category'][0]['id'],//符号id
+                        "comparator":d[0]['category'][0]['category'][0]['id'],//符号id
                         "data_type":d[0]['category'][0]['data_type'],
                         "ftv":'',//条件
                         "strftv":'',//字符串显示条件
-                        "table_type": d[0]['id']
+                        "tableType": d[0]['id']
                     } //筛选数据
-                    data['events'][index]['filters'].push(arr);
+                    data['events'][index]['filts'].push(arr);
                     X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
                     var drr=[];
                     filtersymbols.push(drr);
@@ -378,8 +380,8 @@
                 var indexs = $(this).attr("data-indexs");
                 var val = $(this).val();
                 var valarr = val.split(",");
-                data['events'][index]['filters'][indexs]['ftv']=valarr;
-                data['events'][index]['filters'][indexs]['strftv']=val;
+                data['events'][index]['filts'][indexs]['ftv']=valarr;
+                data['events'][index]['filts'][indexs]['strftv']=val;
             })
 
             // 且和或切换
@@ -407,20 +409,21 @@
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
                 filtersymbols[index].splice(indexs,1);
-                data.events[index]['filters'].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(){
                 var defaultindicator = {
+                    "event_desc":dataArr[0]['category'][0]['event_desc'],
                     "event_name":dataArr[0]['category'][0]['event_name'],
                     "event_attr":"总次数",
                     "event_attr_id":"*",
                     "analysisname":'',
                     "analysis":'total_count',
                     "renameindicator":"", //重命名指标
-                    "filters":[],//过滤项
+                    "filts":[],//过滤项
                     "condrelation":'and',
                 }
                 data['events'].push(defaultindicator);
@@ -493,10 +496,10 @@
                 var screentypedata = filteringdata();
                 console.log(screentypedata);
                 var drr = {
-                    "column_name":screentypedata[0]['category'][index]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][index]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][index]['title'],//事件中文显示
+                    "columnName":screentypedata[0]['category'][index]['id'],//事件id
                     'data_type':screentypedata[0]['category'][index]['data_type'],//类型
-                    'table_type': screentypedata[0]['id'],
+                    'tableType': screentypedata[0]['id'],
                     "ftv":'',//条件
                     "section":''//区间
                 }
@@ -512,10 +515,10 @@
                 X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
                     var htmlstring = val.title;
                     obj.html(htmlstring);
-                    data.eventView.groupBy[index]['column_name'] = val.title;
-                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['columnDesc'] = val.title;
+                    data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
-                    data.eventView.groupBy[index]['table_type'] = val.table_type;
+                    data.eventView.groupBy[index]['tableType'] = val.table_type;
                     X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
                 })
             })
@@ -611,42 +614,42 @@
 
                 var screentypedata = filteringdata();
                 var drr={
-                    "column_name":screentypedata[0]['category'][0]['title'],//事件中文显示
-                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    "columnDesc":screentypedata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                    "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":screentypedata[0]['id']
+                    "tableType":screentypedata[0]['id']
                 };
-
-                data['eventView']['filters'].push(drr);//上传全局数据
+                console.log(drr);
+                data['eventView']['filts'].push(drr);//上传全局数据
                 filtsftvdata.push(screentypedata[0]['category'][0]['category'])
 
                 $(".analysis-overall-situation-left-box").show();
 
-                if(data['eventView']['filters'].length > 1){
+                if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
-                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
             })
 
             //循环给条件框渲染下拉框
             function analysisdown(){
-                for(let i in data['eventView']['filters']){
+                for(let i in data['eventView']['filts']){
                     X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
                         $(this).html(val.title);
-                        data['eventView']['filters'][i]['comparator_name'] = val.title;
-                        data['eventView']['filters'][i]['comparator_id'] = val.id;
+                        data['eventView']['filts'][i]['comparator_name'] = val.title;
+                        data['eventView']['filts'][i]['comparator'] = val.id;
                         if(val.id == "range"){
-                            data['eventView']['filters'][i]['ftv'] = [-1,1];
+                            data['eventView']['filts'][i]['ftv'] = [-1,1];
                         }
-                        X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                        X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                         analysisdown();
                     })
                 }
@@ -654,15 +657,15 @@
 
             $(document).on('click',".analysis-overall-situation-del",function(){
                 var index = $(this).attr("data-index");
-                data['eventView']['filters'].splice(index,1);
+                data['eventView']['filts'].splice(index,1);
                 filtsftvdata.splice(index,1);
-                if(data['eventView']['filters'].length > 1){
+                if(data['eventView']['filts'].length > 1){
                     $(".analysis-overall-situation-left-guanxi").show();
                 }else{
                     $(".analysis-overall-situation-left-guanxi").hide();
                     // $(".analysis-overall-situation-left-box").hide();
                 }
-                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                 analysisdown();
             })
 
@@ -673,14 +676,14 @@
                 var index = obj.attr("data-index");
                 X.querycriteriapop(filteringdata(),'category',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.title);
-                    data['eventView']['filters'][index]['column_name'] = val.title;
-                    data['eventView']['filters'][index]['column_id'] = val.id;
-                    data['eventView']['filters'][index]['data_type'] = val.type;
-                    data['eventView']['filters'][index]['comparator_name'] = '等于';
-                    data['eventView']['filters'][index]['comparator_id'] = '==';
-                    data['eventView']['filters'][index]['table_type'] = val.table_type;
+                    data['eventView']['filts'][index]['columnDesc'] = val.title;
+                    data['eventView']['filts'][index]['columnName'] = val.id;
+                    data['eventView']['filts'][index]['data_type'] = val.type;
+                    data['eventView']['filts'][index]['comparator_name'] = '等于';
+                    data['eventView']['filts'][index]['comparator'] = '==';
+                    data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
-                    X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filters'],".analysis-overall-situation-list-box");
+                    X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box");
                     analysisdown();
                 })
             })
@@ -689,8 +692,8 @@
                 var index = $(this).attr("data-index");
                 var val = $(this).val();
                 var valarr = val.split(",");
-                data['eventView']['filters'][index]['ftv']=valarr;
-                data['eventView']['filters'][index]['strftv']=val;
+                data['eventView']['filts'][index]['ftv']=valarr;
+                data['eventView']['filts'][index]['strftv']=val;
             })
 
             $(document).on('blur','.analysis-overall-situation-input2 input',function(){
@@ -699,11 +702,11 @@
                 var index = $(this).attr("data-index");
                 
                 if(name == 'start'){
-                    data['eventView']['filters'][index]['ftv'][0] = val;
-                    data['eventView']['filters'][index]['section'][0] = val;
+                    data['eventView']['filts'][index]['ftv'][0] = val;
+                    data['eventView']['filts'][index]['section'][0] = val;
                 }else {
-                    data['eventView']['filters'][index]['ftv'][1] = val;
-                    data['eventView']['filters'][index]['section'][1] = val;
+                    data['eventView']['filts'][index]['ftv'][1] = val;
+                    data['eventView']['filts'][index]['section'][1] = val;
                 }
             })
 
diff --git a/web/srczip/logic/category.js b/web/srczip/logic/category.js
index c3b0cfc..dfff83e 100644
--- a/web/srczip/logic/category.js
+++ b/web/srczip/logic/category.js
@@ -63,7 +63,7 @@
             })
 
             //单击属性
-            $(document).on("click",".zhuang_conetnt .ta-pso-line",function(){
+            $(document).off('click','.zhuang_conetnt .ta-pso-line').on('click','.zhuang_conetnt .ta-pso-line',function(){
                 // var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
                 var valdata = {
diff --git a/web/srczip/logic/conditionquery.js b/web/srczip/logic/conditionquery.js
index 20567ba..be50d9a 100644
--- a/web/srczip/logic/conditionquery.js
+++ b/web/srczip/logic/conditionquery.js
@@ -9,7 +9,7 @@
                 eventView:data.eventView,
                 events:data.events
             }
-            X.api('ck/event_model_sql','post',data,function(d){
+            X.api('ck/'+ dataArr['eventView']['cksql'] +'_model_sql','post',dataArr,function(d){
                 console.log(d);
                 $(".conditionquery-sqldata").html(d[0]['sql']);
                 $(".conditionquery-apidata").html(JSON.stringify(data));
diff --git a/web/srczip/logic/event.js b/web/srczip/logic/event.js
new file mode 100644
index 0000000..1932759
--- /dev/null
+++ b/web/srczip/logic/event.js
@@ -0,0 +1,15 @@
+(function(){
+    X.pageLogic['event'] = {
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+            X.laytpldata("#analysis-overall-situation-list-box-dot",data,"#initial-event");
+            
+        }
+    };
+})();
\ No newline at end of file
diff --git a/web/srczip/logic/globalfilter.js b/web/srczip/logic/globalfilter.js
new file mode 100644
index 0000000..51674fd
--- /dev/null
+++ b/web/srczip/logic/globalfilter.js
@@ -0,0 +1,18 @@
+(function(){
+    X.pageLogic['globalfilter'] = {
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+
+            console.log(111,data);
+            X.laytpldata("#analysis-overall-situation-list-box-dot",data,"#xinwei-whole");
+            
+            
+        }
+    };
+})();
\ No newline at end of file
diff --git a/web/srczip/logic/grouped.js b/web/srczip/logic/grouped.js
index 9b29e8f..18d0954 100644
--- a/web/srczip/logic/grouped.js
+++ b/web/srczip/logic/grouped.js
@@ -1,9 +1,15 @@
 (function(){
     X.pageLogic['grouped'] = {
-        init : function(){
-            var data = [
-                {}
-            ]
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+
+            console.log(111,data);
             X.laytpldata("#analysis-con-left-screen-box-dot",data,"#shushi");
             
             
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index d1d960c..23d0405 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -1,73 +1,569 @@
 (function(){
     X.pageLogic['retained'] = {
-        init : function(){
+        init : function(parms){
+
             // X.gourl("grouped","shushi");
             X.template("grouped","shushi");
 
             var data ={
-                "events": [
-                    {
-                        "event_name": "create_role",
-                        "event_attr": "总次数",
-                        "event_attr_id": "*",
-                        "analysisname": "",
-                        "analysis": "total_count",
-                        "renameindicator": "",
-                        "filters": [],
-                        "condrelation": "and"
-                    }
-                ],
-                "eventView": {
-                    "startTime": "2021-05-01 00:00:00",
-                    "timeParticleSize": "P1D",
-                    "endTime": "2021-05-19 23:59:59",
-                    "graphShape": "L0",
-                    "recentDay": "1-30",
-                    "groupBy": [
-                        {
-                            "column_name": "#account_id",
-                            "column_id": "#account_id",
-                            "data_type": "string",
-                            "table_type": "event",
-                            "ftv": "",
-                            "section": ""
+                        "eventView":{
+                            "cksql":"retention",
+                            "endTime":"2021-06-07 23:59:59",
+                            "filts":[],
+                            "groupBy":[],
+                            "recentDay":"1-30",
+                            "relation":"and",
+                            "startTime":"2021-05-09 00:00:00",
+                            "statType":"retention",
+                            "timeParticleSize":"P1D",
+                            "unitNum":7
                         },
-                        {
-                            "column_name": "#app_id",
-                            "column_id": "#app_id",
-                            "data_type": "string",
-                            "table_type": "event",
-                            "ftv": "",
-                            "section": ""
-                        }
-                    ],
-                    "uiCommonConfig": {
-                        "tableSorts": [],
-                        "chartSort": "num-desc"
-                    },
-                    "filters": [],
-                    "relation": 1,
-                    "zone_time": "8"
-                },
-            }
-            X.grouped(data['eventView']['groupBy'],"#shushi")
+                        "events":[
+                            
+                        ],
+                        "projectId":1
+            };
 
-            $(document).off('click','.analysis-calculation').on("click",'.analysis-calculation',function(){
-                console.log(211);
+            // 日期渲染
+            X.daterender("#retained-condition-date",function(start, end, label){
+                var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
+                var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
+                data['eventView']['startTime'] = startTime;
+                data['eventView']['endTime'] = endTime;
+                retaineddata();
             })
 
+            var time = $("#retained-condition-date").val();
+            var timearr = time.split(" ");
+            data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
+            data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
+
+            X.grouped(data['eventView']['groupBy'],"#shushi");
+
+            // $(document).off('click','.analysis-calculation').on("click",'.analysis-calculation',function(){
+            //     console.log(211);
+            // })
+
+            var eventdata;
+            var filtersymbols = [[],[]];//默认两个事件
+            var groupitemeventsdata=[[],[]]//分组项里的事件
+
+            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":""
+                }
+                data['events'].push(arr);
+                data['events'].push(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;
+                })
+            })
+
+            //初始事件
+            X.template("event","initial-event",data['events'][0]);
+            X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+            //开启重命名
+            $(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(){
+                $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").hide();
+                $("#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(){
+            //     var arr = {
+            //         "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
+            //         "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
+            //         "comparator":"==",
+            //         "comparatorName":"等于",
+            //         "ftv":[],
+            //         "strftv":"",
+            //         "table_type":groupitemeventsdata[0][0]['category'][0]['data_type'],
+            //         "timeUnit":""
+            //     }
+            //     data['events'][0]['filts'].push(arr);
+            //     filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
+            //     X.template("event","initial-event",data['events'][0]);
+            // })
+
+            // $(document).off('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata-return-event').on('click','.analysis-zhibiao-updata-list-box .analysis-zhibiao-updata',function(){
+            //     var arr = {
+            //         "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
+            //         "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
+            //         "comparator":"==",
+            //         "comparatorName":"等于",
+            //         "ftv":[],
+            //         "strftv":"",
+            //         "table_type":groupitemeventsdata[1][0]['category'][0]['data_type'],
+            //         "timeUnit":""
+            //     }
+            //     data['events'][1]['filts'].push(arr);
+            //     filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
+            //     X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+            // })
+
+            // 添加初始事件筛选
+            var initialevent = []
+            $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){
+                var arr = {
+                    "columnDesc":groupitemeventsdata[0][0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[0][0]['category'][0]['id'],
+                    "comparator":"==",
+                    "comparatorName":"等于",
+                    "ftv":[],
+                    "strftv":"",
+                    "table_type":groupitemeventsdata[0][0]['category'][0]['data_type'],
+                    "timeUnit":""
+                }
+                initialevent.push(arr);
+                data['events'][1]['filts'] = initialevent;
+                filtersymbols[0].push(groupitemeventsdata[0][0]['category'][0]['category']);
+                X.template("event","initial-event",data['events'][0]);
+            })
+            var returnevent = []
+            $(document).off('click','.analysis-shaix-return-event').on('click','.analysis-shaix-return-event',function(){
+                var arr = {
+                    "columnDesc":groupitemeventsdata[1][0]['category'][0]['title'],
+                    "columnName":groupitemeventsdata[1][0]['category'][0]['id'],
+                    "comparator":"==",
+                    "comparatorName":"等于",
+                    "ftv":[],
+                    "strftv":"",
+                    "table_type":groupitemeventsdata[1][0]['category'][0]['data_type'],
+                    "timeUnit":""
+                }
+                // data['events'][1]['filts'].push(arr);
+                returnevent.push(arr);
+                data['events'][1]['filts'] = returnevent;
+                filtersymbols[1].push(groupitemeventsdata[1][0]['category'][0]['category']);
+                X.template("returnvisitevent","returnvisit-event",data['events'][1]);
+            })
+
+            // 删除指定初始事件筛选
+            $(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
+                var index = $(this).attr("data-twonum");
+                data['events'][0]['filts'].splice(index,1);
+                filtersymbols[0].splice(index,1);
+                X.template("event","initial-event",data['events'][0]);
+            })
+
+            $(document).off('click','.analysis-zhibiao-list-del-return-event').on('click','.analysis-zhibiao-list-del-return-event',function(){
+                var index = $(this).attr("data-twonum");
+                data['events'][0]['filts'].splice(index,1);
+                filtersymbols[1].splice(index,1);
+                X.template("returnvisitevent","return-event",data['events'][0]);
+            })
+            
+            $(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);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
+                    console.log(val);
+                    obj.html(val.id);
+                    data['events'][index]['eventName'] = val.name;
+                    data['events'][index]['eventDesc'] = val.id;
+                    X.api("data_auth/load_filter_props","post",{event_name:val.id},function(val){
+                        console.log(val);
+                        groupitemeventsdata[index] = val;
+                    })
+                    console.log(groupitemeventsdata)
+
+                })
+            })
+
+            $(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){
+                    console.log(val);
+                    var htmlstring = val.title;
+                    obj.html(htmlstring);
+                    filtersymbols[index][indexs] = val.category;
+                    data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
+                    data['events'][index]['filts'][indexs]['columnName'] = val.id;
+                    data['events'][index]['filts'][indexs]['data_type'] = val.type;
+                    data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
+                })
+            })
+
+            // 过滤数据
+            function filteringdata(){
+                var screentypedata;
+                if(groupitemeventsdata.length>1){
+                    for(var i =0; i < groupitemeventsdata.length - 1; i++){
+                        if(i == 0){
+                            X.groupintersection(groupitemeventsdata[i] , groupitemeventsdata[Number(i) + Number(1)],function(d){
+                                screentypedata = d;
+                            });
+                        }else {
+                            X.groupintersection(screentypedata , groupitemeventsdata[Number(i) + Number(1)],function(d){
+                                screentypedata = d;
+                            })
+                        }
+                    }
+                }else { 
+                    screentypedata = groupitemeventsdata[0];
+                }
+                return screentypedata;
+            }
+            
+            $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var indexs = $(this).attr("data-indexs");
+                X.querycriteriapop(filtersymbols[index][indexs],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                    if(val != undefined){
+                        obj.html(val.title);
+                        data['events'][index]['filts'][indexs]['comparatorName'] = val.title;
+                        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');
+                var indexs = $(this).attr('data-indexs');
+                var txt = $(this).val();
+                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 drr={
+                    "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
+                    "column_id":screentypedata[0]['category'][0]['id'],//事件id
+                    'data_type':screentypedata[0]['category'][0]['data_type'],//类型
+                    'comparator_name':'等于',//默认等于
+                    "comparator_id":'==',//符号id
+                    "ftv":[],//条件
+                    "strftv":'',//显示条件
+                    "section":[-1,1],//区间
+                    "table_type":screentypedata[0]['id']
+                };
+                data['eventView']['filts'].push(drr);
+                filtsftvdata.push(screentypedata[0]['category'][0]['category']);
+                if(data['eventView']['filts'].length > 1){
+                    $(".analysis-overall-situation-left-guanxi").show();
+                }else{
+                    $(".analysis-overall-situation-left-guanxi").hide();
+                }
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                    analysisdown();
+                });
+            })
+
+            //删除指定全局数据
+            $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
+                var index = $(this).attr('data-index');
+                data['eventView']['filts'].splice(index,1);
+                filtsftvdata.splice(index,1);
+                if(data['eventView']['filts'].length > 1){
+                    $(".analysis-overall-situation-left-guanxi").show();
+                }else{
+                    $(".analysis-overall-situation-left-guanxi").hide();
+                }
+                X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+            })
+
+            $(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){
+                    obj.html(val.title);
+                    data['eventView']['filts'][index]['columnName'] = val.title;
+                    data['eventView']['filts'][index]['column_id'] = val.id;
+                    data['eventView']['filts'][index]['data_type'] = val.type;
+                    data['eventView']['filts'][index]['comparator_name'] = '等于';
+                    data['eventView']['filts'][index]['comparator_id'] = '==';
+                    data['eventView']['filts'][index]['table_type'] = val.table_type;
+                    filtsftvdata[index]=val.category;
+                    analysisdown();//渲染下拉框
+                })
+            })
+
+            //循环给条件框渲染下拉框
+            function analysisdown(){
+                console.log(data['eventView']['filts']);
+                console.log(filtsftvdata);
+                for(let i in data['eventView']['filts']){
+                    X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
+                        $(this).html(val.title);
+                        data['eventView']['filts'][i]['comparator_name'] = val.title;
+                        data['eventView']['filts'][i]['comparator_id'] = val.id;
+                        if(val.id == "range"){
+                            data['eventView']['filts'][i]['ftv'] = [-1,1];
+                        }
+                        X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
+                        analysisdown();
+                    })
+                }
+            }
+
+            // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
-                console.log(111);
+                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() {
-                var data= [
-                    {},{}
-                ]
-                X.laytpldata("#analysis-con-left-screen-box-dot",data,"#shushi");
-            }) 
+                
+                var arr = {
+                    "columnName": "#account_id",//事件中文显示
+                    "column_id": "#account_id",//事件id
+                    'data_type': "string",//类型
+                    'table_type': "event",
+                    "ftv":'',//条件
+                    "section":''//区间
+                };
+                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){
+                    console.log(val);
+                    var htmlstring = val.title;
+                    obj.html(htmlstring);
+                    data.eventView.groupBy[index]['columnName'] = val.title;
+                    data.eventView.groupBy[index]['column_id'] = val.id;
+                    data.eventView.groupBy[index]['data_type'] = val.type;
+                    data.eventView.groupBy[index]['table_type'] = val.table_type;
+                    
+
+                })
+
+            })
+
+            // 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 timeParticleSizearr = [
+                {'title':'当日','id':'1'},
+                {'title':'次日','id':'2'},
+                {'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'] = d.id;
+                retaineddata();
+            })
+
+            // 计算按钮
+            $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
+                retaineddata()
+            })
+
+            function retaineddata(){
+                X.api("ck/retention_model","post",data,function(d){
+                    console.log(data);
+                    querydata = d;
+                    retainedtable(d)
+                })
+            }
+
+            function retainedtable(d){
+                var tabledata=[];
+                for(let i in d['summary_values']){
+                    var arr = {
+                        date: i,
+                        d0:d['summary_values'][i]['d0'],
+                        data:[]
+                    }
+                    for(let j in d['summary_values'][i]["n"]){
+                        var nrr = {
+                            n:0,
+                            p:0
+                        }
+                        nrr["n"] = d['summary_values'][i]["n"][j];
+                        nrr["p"] = d['summary_values'][i]["p"][j]
+                        arr['data'].push(nrr);
+                    }
+                    tabledata.push(arr)
+                }
+    
+                var titdata = [];
+                for(let i in d['days']){
+                    var tit = "第" + i + "日";
+                    titdata.push(tit);
+                }
+                titdata.unshift("日期",d.title);
+                X.laytpldata("#table-fenxi-th-dot",titdata,".table-fenxi-th");
+    
+                X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
+            }
+
+            // 每日留存
+            function retaineddayRetained(d){
+                var xAxisData=[];
+                for(let i in d['days']){
+                    var tit = "第" + i + "日";
+                    xAxisData.push(tit);
+                }
+                var seriesData=[];
+                for(let i in d['summary_values']){
+                    var arr = {
+                        name: i,
+                        type: 'line',
+                        stack: '',
+                        data: d['summary_values'][i]['p']
+                    }
+                    seriesData.push(arr);
+                }
+                var myChart = echarts.init(document.getElementById('analysis-echarts'));
+                var option = {
+                    title: {
+                        text: ''
+                    },
+                    color: [ '#3ea7fd', '#cdddfd', '#5ad8a6', '#cdf3e4', '#5d7092', '#ced4de', '#f6bd16','#fcebb9','#e86452','#f8d0cb','#6dc8ec', '#d3eef9', '#9270ca', '#d3c6ea', '#ff9d4d', '#ffd8b8', '#269a99','#aad8d8','#ff99c3','#ffd6e7' ],
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross',
+                            label: {
+                                backgroundColor: '#6a7985'
+                            }
+                        }
+                    },
+                    legend: {
+                        type:'scroll',
+                        data: d.date_range
+                    },
+                    toolbox: {
+                        feature: {
+                            saveAsImage: {}
+                        }
+                    },
+                    grid: {
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        top: '10%',
+                        containLabel: true
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            boundaryGap: false,
+                            data: xAxisData
+                        }
+                    ],
+                    yAxis: [
+                        {
+                            type: 'value'
+                        }
+                    ],
+                    series: seriesData
+                };
+                myChart.setOption(option,true);
+            }
+
+            function retainednRetained(d){
+                var data = [];
+                for(let i in d['summary_values']){
+                    var index = d['summary_values'][i]['p'].length - 1;
+                    data.push(d['summary_values'][i]['p'][index]);
+                }
+                console.log(data);
+                var myChart = echarts.init(document.getElementById('analysis-echarts'));
+                var option = {
+                    xAxis: {
+                        type: 'category',
+                        data: d['date_range']
+                    },
+                    color: [ '#3ea7fd'],
+                    grid: {
+                        left: '2%',
+                        right: '2%',
+                        bottom: '2%',
+                        top: '10%',
+                        containLabel: true
+                    },
+                    yAxis: {
+                        type: 'value'
+                    },
+                    series: [{
+                        data: data,
+                        type: 'line'
+                    }]
+                }
+                myChart.setOption(option,true);
+
+            }
+
+            var querydata;
+            $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
+                if(querydata){
+                    $('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
+                    $(this).addClass('select-chart');
+                    if($(this).attr('title') == '数据报表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(querydata)}
+                    else if($(this).attr('title') == '第N日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retainednRetained(querydata) }
+                    else if($(this).attr('title') == '每日留存'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retaineddayRetained(querydata) }
+                }else{
+                    layer.msg('请先计算数据,在切换图表');
+                }
+            })
 
         }
     };
diff --git a/web/srczip/logic/returnvisitevent.js b/web/srczip/logic/returnvisitevent.js
new file mode 100644
index 0000000..f1b38fa
--- /dev/null
+++ b/web/srczip/logic/returnvisitevent.js
@@ -0,0 +1,16 @@
+(function(){
+    X.pageLogic['returnvisitevent'] = {
+        init : function(parms){
+            var me = this;
+            if(parms){
+                this.parms = parms;
+                var data = parms;
+            }else {
+                var data = []
+            }
+            console.log(data);
+            X.laytpldata("#analysis-overall-situation-list-box-return-dot",data,"#returnvisit-event");
+            
+        }
+    };
+})();
\ No newline at end of file
diff --git a/web/srczip/logic/setgrouping.js b/web/srczip/logic/setgrouping.js
index 9ec43ee..470133d 100644
--- a/web/srczip/logic/setgrouping.js
+++ b/web/srczip/logic/setgrouping.js
@@ -46,7 +46,7 @@
                 X.laytpldata("#judge-box-dot",data,".setgrouping-box .setgrouping-content-box");
             })
             
-            $(document).on("click",".setgrouping-content-list",function(){
+            $(document).off('click','.setgrouping-content-list').on('click','.setgrouping-content-list',function(){
                 var index = $(this).attr('data-index');
                 var indexs = $(this).attr('data-indexs');
                 var valdata = {
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index 3a5094d..50183f5 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -88,7 +88,7 @@
 /* .analysis-con-left-screen-list-right-screen-qh-xian { width: 1px; min-height: 38px; position: absolute; left: 45px; background-color: #d9dfe6;} */
 .analysis-con-left-screen-list-right-screen-qh-tit { border-radius: 24px; width: 24px; height: 24px; line-height: 24px; text-align: center; font-size: 12px; color: #3d90ff; background-color: #ffffff; border: 1px solid #d9dfe6; }
 .analysis-zhibiao-list-mar { margin-top: 10px; }
-.analysis-zhibiao-updata-list-box { display: none; margin-top: 6px; width: 100%; padding-left: 32px }
+.analysis-zhibiao-updata-list-box { display: block; margin-top: 6px; width: 100%; padding-left: 32px }
 
 .analysis-zhibiao-updata { padding: 4px; cursor: pointer; border-radius: 2px; font-size: 13px; color: #3d90ff; }
 .analysis-zhibiao-updata:hover { background-color: #e4f2ff; }
@@ -242,11 +242,11 @@
 .conditionquery-copy { cursor: pointer; color: #fff; background-color: #3d90ff; border-radius: 2px; padding: 0 16px; font-weight: 400; font-size: 14px; height: 32px; line-height: 32px; }
 .conditionquery-but-box span{ background-color: #eaecf8; color: #3d90ff; padding: 0 8px; cursor: pointer; display: inline-block; }
 
-.table-div-box { width: 100%; overflow: auto; }
+.table-div-box { width: 100%; height: 670px; overflow: auto; }
 .table-fenxi-box { width: 100%; }
-.table-fenxi-box th { min-width: 100px; max-width: 200px; padding: 16px; }
+.table-fenxi-box th { background-color: #f0f2f5; min-width: 100px; max-width: 200px; padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #f0f2f5; }
 .table-fenxi-box tr { text-align: center; }
-.table-fenxi-box tr td{ padding: 16px; }
+.table-fenxi-box tr td{ padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #f0f2f5;  }
 
 
 
diff --git a/web/static/img/iconfont/demo_index.html b/web/static/img/iconfont/demo_index.html
index d8a4914..bb9f811 100644
--- a/web/static/img/iconfont/demo_index.html
+++ b/web/static/img/iconfont/demo_index.html
@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe601;</span>
+                <div class="name">流失</div>
+                <div class="code-name">&amp;#xe601;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe670;</span>
+                <div class="name">数据表</div>
+                <div class="code-name">&amp;#xe670;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe727;</span>
                 <div class="name">sql</div>
@@ -108,9 +120,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1622169041664') format('woff2'),
-       url('iconfont.woff?t=1622169041664') format('woff'),
-       url('iconfont.ttf?t=1622169041664') format('truetype');
+  src: url('iconfont.woff2?t=1623376633178') format('woff2'),
+       url('iconfont.woff?t=1623376633178') format('woff'),
+       url('iconfont.ttf?t=1623376633178') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -136,6 +148,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-liushi"></span>
+            <div class="name">
+              流失
+            </div>
+            <div class="code-name">.icon-liushi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shujubiao"></span>
+            <div class="name">
+              数据表
+            </div>
+            <div class="code-name">.icon-shujubiao
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-sql"></span>
             <div class="name">
@@ -217,6 +247,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-liushi"></use>
+                </svg>
+                <div class="name">流失</div>
+                <div class="code-name">#icon-liushi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shujubiao"></use>
+                </svg>
+                <div class="name">数据表</div>
+                <div class="code-name">#icon-shujubiao</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-sql"></use>
diff --git a/web/static/img/iconfont/iconfont.css b/web/static/img/iconfont/iconfont.css
index 3747d9e..5e2ff87 100644
--- a/web/static/img/iconfont/iconfont.css
+++ b/web/static/img/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2570810 */
-  src: url('iconfont.woff2?t=1622169041664') format('woff2'),
-       url('iconfont.woff?t=1622169041664') format('woff'),
-       url('iconfont.ttf?t=1622169041664') format('truetype');
+  src: url('iconfont.woff2?t=1623376633178') format('woff2'),
+       url('iconfont.woff?t=1623376633178') format('woff'),
+       url('iconfont.ttf?t=1623376633178') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-liushi:before {
+  content: "\e601";
+}
+
+.icon-shujubiao:before {
+  content: "\e670";
+}
+
 .icon-sql:before {
   content: "\e727";
 }
diff --git a/web/static/img/iconfont/iconfont.js b/web/static/img/iconfont/iconfont.js
index 8a3f48c..b74013f 100644
--- a/web/static/img/iconfont/iconfont.js
+++ b/web/static/img/iconfont/iconfont.js
@@ -1 +1 @@
-!function(t){var e,c,n,o,i,l,a='<svg><symbol id="icon-sql" viewBox="0 0 1024 1024"><path d="M170.666667 0h682.666666a170.666667 170.666667 0 0 1 170.666667 170.666667v682.666666a170.666667 170.666667 0 0 1-170.666667 170.666667H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666667V170.666667a170.666667 170.666667 0 0 1 170.666667-170.666667z m0 56.888889a113.777778 113.777778 0 0 0-113.777778 113.777778v682.666666a113.777778 113.777778 0 0 0 113.777778 113.777778h682.666666a113.777778 113.777778 0 0 0 113.777778-113.777778V170.666667a113.777778 113.777778 0 0 0-113.777778-113.777778H170.666667z m-63.772445 561.095111c10.524444 9.216 24.576 16.782222 42.211556 22.698667 17.635556 5.916444 34.360889 8.874667 50.232889 8.874666 48.298667 0 72.419556-17.180444 72.419555-51.541333a45.511111 45.511111 0 0 0-7.736889-25.998222 74.353778 74.353778 0 0 0-21.333333-20.48 560.64 560.64 0 0 0-50.915556-27.306667c-34.531556-17.180444-57.230222-33.166222-68.266666-47.900444a82.488889 82.488889 0 0 1-16.384-50.574223c0-28.558222 11.491556-51.2 34.417778-67.982222 22.983111-16.725333 51.939556-25.088 86.926222-25.088 34.190222 0 59.335111 4.152889 75.320889 12.401778v48.469333c-20.764444-14.392889-46.990222-21.560889-78.677334-21.560889-21.048889 0-38.172444 4.437333-51.427555 13.198223a41.813333 41.813333 0 0 0-19.911111 36.807111c0 13.937778 4.551111 25.258667 13.767111 34.019555 9.216 8.704 29.127111 20.650667 59.790222 35.783111 33.792 16.099556 57.457778 32.256 70.883556 48.412445 13.482667 16.156444 20.252444 34.304 20.252444 54.442667 0 30.208-10.979556 53.418667-32.881778 69.575111-21.959111 16.156444-52.394667 24.234667-91.363555 24.234666-13.653333 0-29.525333-1.934222-47.672889-5.688889-18.147556-3.754667-31.345778-8.533333-39.651556-14.108444v-50.631111z m593.123556 153.998222c-10.808889 3.413333-23.779556 5.12-38.912 5.12-21.333333 0-41.528889-5.176889-60.529778-15.530666-19.057778-10.410667-45.397333-34.759111-79.018667-73.102223-46.08 0.284444-83.968-16.099556-113.664-49.152-29.696-32.995556-44.544-74.524444-44.544-124.643555 0-55.864889 15.018667-100.124444 45.112889-132.892445 30.037333-32.768 71.168-49.095111 123.335111-49.095111 46.933333 0 85.048889 16.042667 114.346667 48.184889 29.240889 32.142222 43.804444 74.012444 43.804444 125.553778 0 45.795556-10.24 84.195556-30.833777 115.370667-20.593778 31.118222-49.834667 51.2-87.779556 60.188444 19.114667 20.764444 35.384889 34.929778 48.924445 42.552889 13.425778 7.623111 28.444444 11.434667 45.056 11.434667 13.653333 0 25.201778-1.991111 34.702222-5.973334v41.984zM409.998222 511.089778c0 41.642667 10.638222 75.036444 31.857778 100.124444 21.276444 25.144889 49.038222 37.660444 83.228444 37.660445 36.750222 0 65.592889-12.003556 86.584889-36.124445 20.935111-24.064 31.459556-57.685333 31.459556-100.977778 0-44.430222-10.24-78.734222-30.776889-102.912-20.536889-24.120889-48.64-36.181333-84.366222-36.181333-35.100444 0-63.544889 12.743111-85.333334 38.229333-21.788444 25.486222-32.654222 58.88-32.654222 100.181334zM937.984 682.666667h-181.532444V338.488889h44.430222v304.867555h137.102222V682.666667z"  ></path></symbol><symbol id="icon-duijixiantu" viewBox="0 0 1024 1024"><path d="M197.973333 826.026667h669.013334c6.826667 0 10.24 3.413333 10.24 10.24v30.72c0 6.826667-3.413333 10.24-10.24 10.24H157.013333c-6.826667 0-10.24-3.413333-10.24-10.24V157.013333c0-6.826667 3.413333-10.24 10.24-10.24h30.72c6.826667 0 10.24 3.413333 10.24 10.24v669.013334z"  ></path><path d="M607.573333 570.026667l-105.813333 75.093333c-3.413333 3.413333-6.826667 3.413333-10.24 0l-133.12-78.506667c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 672.426667c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826666v81.92c0 3.413333 3.413333 10.24 10.24 10.24h576.853333c3.413333 0 10.24-3.413333 10.24-10.24v-235.52c0-6.826667-6.826667-10.24-10.24-10.24l-215.04 54.613334c3.413333 0 3.413333 0 0 0m-17.066666-187.733334l-105.813334 92.16c-3.413333 3.413333-6.826667 3.413333-10.24 0l-116.053333-68.266666c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 512c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826667v102.4c0 6.826667 10.24 13.653333 13.653333 6.826666l95.573334-92.16c3.413333-3.413333 6.826667-3.413333 10.24 0l133.12 78.506667c3.413333 3.413333 6.826667 0 10.24 0l109.226666-75.093333h3.413334l211.626666-54.613334c3.413333 0 6.826667-3.413333 6.826667-10.24V327.68c0-6.826667-6.826667-10.24-10.24-10.24l-225.28 61.44c0 3.413333-3.413333 3.413333-3.413333 3.413333"  ></path></symbol><symbol id="icon-leiji" viewBox="0 0 1024 1024"><path d="M75.09333333 930.48604445h146.80064v-403.11921778H75.09333333v403.11921778z m366.41905778 0h146.80064v-879.63875556H441.51239111v879.63875556z m366.41905778-623.32017778v623.32017778H954.73208889v-623.32017778h-146.80064z"  ></path></symbol><symbol id="icon-zhexian" viewBox="0 0 1024 1024"><path d="M612.393 653.575L386.757 427.94l35.355-35.355L647.748 618.22z"  ></path><path d="M576.84 617.98l332.902-332.904 35.355 35.355-332.903 332.903zM62.698 752.029l338.984-338.984 35.355 35.355L98.053 787.384z"  ></path></symbol><symbol id="icon-fenbutu" viewBox="0 0 1024 1024"><path d="M0 1024v-93.090909h1024v93.090909H0z m837.818182-837.818182h186.181818v651.636364H837.818182V186.181818zM558.545455 465.454545h186.181818v372.363637H558.545455V465.454545zM279.272727 0h186.181818v837.818182H279.272727V0zM0 279.272727h186.181818v558.545455H0V279.272727z"  ></path></symbol><symbol id="icon-tongjitu" viewBox="0 0 1024 1024"><path d="M850.832544 671.454642L529.987165 491.420289V132.101667c0-20.174482-16.427134-35.81981-36.47575-35.81981-118.232798 0-225.035266 45.938262-302.638715 121.16764l-0.499373 0.531096-0.280386 0.218988C112.739179 293.210995 64.303027 397.234163 64.303027 511.875157c0 114.610294 48.436152 218.163765 125.789914 293.613154l0.280386 0.249687c77.603449 75.262124 184.906314 121.980145 303.138088 121.980145 75.574233 0 148.399865-19.423375 211.980949-54.525847l1.873674-1.249457c63.768349-35.599799 118.170376-87.940888 156.518776-151.271262l0.499374-0.74906c10.431583-17.426905 4.123924-38.84982-13.551644-48.467875zM670.892335 810.29785l-1.873674 1.311879c-52.089355 28.980032-113.048729 44.906769-175.506222 44.906769-98.464569 0-187.529047-38.660508-251.579829-100.744495-64.331167-62.582337-103.929024-148.773372-103.929024-243.896846 0-94.935186 39.597857-180.783413 103.930047-243.64716 56.242955-54.525847 131.255393-90.906429 214.604706-98.995665v342.642825c0 14.614859 8.838296 27.012214 21.360494 32.7898l303.16981 169.697937c-29.481452 39.159882-67.205635 72.200392-110.176308 95.934956z m180.752714-605.464695c-62.33265-60.58382-146.651035-99.744725-239.900836-105.022938V445.701015L920.597467 618.677625c10.992355-21.98471 20.360723-44.156686 26.606984-67.673286 8.306176-30.29191 12.491499-61.364603 12.491499-93.186356 0-98.714256-41.159422-188.840926-108.050901-252.984828z" fill="#7E7E7E" ></path></symbol></svg>',d=(d=document.getElementsByTagName("script"))[d.length-1].getAttribute("data-injectcss");if(d&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}function h(){i||(i=!0,n())}e=function(){var t,e,c;(c=document.createElement("div")).innerHTML=a,a=null,(e=c.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",t=e,(c=document.body).firstChild?(e=c.firstChild).parentNode.insertBefore(t,e):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),e()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(n=e,o=t.document,i=!1,(l=function(){try{o.documentElement.doScroll("left")}catch(t){return void setTimeout(l,50)}h()})(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,h())})}(window);
\ No newline at end of file
+!function(t){var e,c,o,i,n,h,l='<svg><symbol id="icon-liushi" viewBox="0 0 1024 1024"><path d="M389.9 361.148h57.712V737H389.9V361.148z m173.138 0h57.713V737h-57.713V361.148z m144.282 0h57.712v205.269H707.32V361.148z m-461.703 0h57.713v205.269h-57.713V361.148zM182 274.641V217h664v57.641H182z"  ></path></symbol><symbol id="icon-shujubiao" viewBox="0 0 1024 1024"><path d="M896 864H128c-51.2 0-96-44.8-96-96V192c0-51.2 44.8-96 96-96h768c51.2 0 96 44.8 96 96v576c0 51.2-44.8 96-96 96zM128 160c-19.2 0-32 12.8-32 32v576c0 19.2 12.8 32 32 32h768c19.2 0 32-12.8 32-32V192c0-19.2-12.8-32-32-32H128z"  ></path><path d="M64 320h896v64H64zM64 544h896v64H64z"  ></path><path d="M256 320h64v480H256zM480 352h64V832h-64zM704 320h64v480h-64z"  ></path></symbol><symbol id="icon-sql" viewBox="0 0 1024 1024"><path d="M170.666667 0h682.666666a170.666667 170.666667 0 0 1 170.666667 170.666667v682.666666a170.666667 170.666667 0 0 1-170.666667 170.666667H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666667V170.666667a170.666667 170.666667 0 0 1 170.666667-170.666667z m0 56.888889a113.777778 113.777778 0 0 0-113.777778 113.777778v682.666666a113.777778 113.777778 0 0 0 113.777778 113.777778h682.666666a113.777778 113.777778 0 0 0 113.777778-113.777778V170.666667a113.777778 113.777778 0 0 0-113.777778-113.777778H170.666667z m-63.772445 561.095111c10.524444 9.216 24.576 16.782222 42.211556 22.698667 17.635556 5.916444 34.360889 8.874667 50.232889 8.874666 48.298667 0 72.419556-17.180444 72.419555-51.541333a45.511111 45.511111 0 0 0-7.736889-25.998222 74.353778 74.353778 0 0 0-21.333333-20.48 560.64 560.64 0 0 0-50.915556-27.306667c-34.531556-17.180444-57.230222-33.166222-68.266666-47.900444a82.488889 82.488889 0 0 1-16.384-50.574223c0-28.558222 11.491556-51.2 34.417778-67.982222 22.983111-16.725333 51.939556-25.088 86.926222-25.088 34.190222 0 59.335111 4.152889 75.320889 12.401778v48.469333c-20.764444-14.392889-46.990222-21.560889-78.677334-21.560889-21.048889 0-38.172444 4.437333-51.427555 13.198223a41.813333 41.813333 0 0 0-19.911111 36.807111c0 13.937778 4.551111 25.258667 13.767111 34.019555 9.216 8.704 29.127111 20.650667 59.790222 35.783111 33.792 16.099556 57.457778 32.256 70.883556 48.412445 13.482667 16.156444 20.252444 34.304 20.252444 54.442667 0 30.208-10.979556 53.418667-32.881778 69.575111-21.959111 16.156444-52.394667 24.234667-91.363555 24.234666-13.653333 0-29.525333-1.934222-47.672889-5.688889-18.147556-3.754667-31.345778-8.533333-39.651556-14.108444v-50.631111z m593.123556 153.998222c-10.808889 3.413333-23.779556 5.12-38.912 5.12-21.333333 0-41.528889-5.176889-60.529778-15.530666-19.057778-10.410667-45.397333-34.759111-79.018667-73.102223-46.08 0.284444-83.968-16.099556-113.664-49.152-29.696-32.995556-44.544-74.524444-44.544-124.643555 0-55.864889 15.018667-100.124444 45.112889-132.892445 30.037333-32.768 71.168-49.095111 123.335111-49.095111 46.933333 0 85.048889 16.042667 114.346667 48.184889 29.240889 32.142222 43.804444 74.012444 43.804444 125.553778 0 45.795556-10.24 84.195556-30.833777 115.370667-20.593778 31.118222-49.834667 51.2-87.779556 60.188444 19.114667 20.764444 35.384889 34.929778 48.924445 42.552889 13.425778 7.623111 28.444444 11.434667 45.056 11.434667 13.653333 0 25.201778-1.991111 34.702222-5.973334v41.984zM409.998222 511.089778c0 41.642667 10.638222 75.036444 31.857778 100.124444 21.276444 25.144889 49.038222 37.660444 83.228444 37.660445 36.750222 0 65.592889-12.003556 86.584889-36.124445 20.935111-24.064 31.459556-57.685333 31.459556-100.977778 0-44.430222-10.24-78.734222-30.776889-102.912-20.536889-24.120889-48.64-36.181333-84.366222-36.181333-35.100444 0-63.544889 12.743111-85.333334 38.229333-21.788444 25.486222-32.654222 58.88-32.654222 100.181334zM937.984 682.666667h-181.532444V338.488889h44.430222v304.867555h137.102222V682.666667z"  ></path></symbol><symbol id="icon-duijixiantu" viewBox="0 0 1024 1024"><path d="M197.973333 826.026667h669.013334c6.826667 0 10.24 3.413333 10.24 10.24v30.72c0 6.826667-3.413333 10.24-10.24 10.24H157.013333c-6.826667 0-10.24-3.413333-10.24-10.24V157.013333c0-6.826667 3.413333-10.24 10.24-10.24h30.72c6.826667 0 10.24 3.413333 10.24 10.24v669.013334z"  ></path><path d="M607.573333 570.026667l-105.813333 75.093333c-3.413333 3.413333-6.826667 3.413333-10.24 0l-133.12-78.506667c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 672.426667c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826666v81.92c0 3.413333 3.413333 10.24 10.24 10.24h576.853333c3.413333 0 10.24-3.413333 10.24-10.24v-235.52c0-6.826667-6.826667-10.24-10.24-10.24l-215.04 54.613334c3.413333 0 3.413333 0 0 0m-17.066666-187.733334l-105.813334 92.16c-3.413333 3.413333-6.826667 3.413333-10.24 0l-116.053333-68.266666c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 512c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826667v102.4c0 6.826667 10.24 13.653333 13.653333 6.826666l95.573334-92.16c3.413333-3.413333 6.826667-3.413333 10.24 0l133.12 78.506667c3.413333 3.413333 6.826667 0 10.24 0l109.226666-75.093333h3.413334l211.626666-54.613334c3.413333 0 6.826667-3.413333 6.826667-10.24V327.68c0-6.826667-6.826667-10.24-10.24-10.24l-225.28 61.44c0 3.413333-3.413333 3.413333-3.413333 3.413333"  ></path></symbol><symbol id="icon-leiji" viewBox="0 0 1024 1024"><path d="M75.09333333 930.48604445h146.80064v-403.11921778H75.09333333v403.11921778z m366.41905778 0h146.80064v-879.63875556H441.51239111v879.63875556z m366.41905778-623.32017778v623.32017778H954.73208889v-623.32017778h-146.80064z"  ></path></symbol><symbol id="icon-zhexian" viewBox="0 0 1024 1024"><path d="M612.393 653.575L386.757 427.94l35.355-35.355L647.748 618.22z"  ></path><path d="M576.84 617.98l332.902-332.904 35.355 35.355-332.903 332.903zM62.698 752.029l338.984-338.984 35.355 35.355L98.053 787.384z"  ></path></symbol><symbol id="icon-fenbutu" viewBox="0 0 1024 1024"><path d="M0 1024v-93.090909h1024v93.090909H0z m837.818182-837.818182h186.181818v651.636364H837.818182V186.181818zM558.545455 465.454545h186.181818v372.363637H558.545455V465.454545zM279.272727 0h186.181818v837.818182H279.272727V0zM0 279.272727h186.181818v558.545455H0V279.272727z"  ></path></symbol><symbol id="icon-tongjitu" viewBox="0 0 1024 1024"><path d="M850.832544 671.454642L529.987165 491.420289V132.101667c0-20.174482-16.427134-35.81981-36.47575-35.81981-118.232798 0-225.035266 45.938262-302.638715 121.16764l-0.499373 0.531096-0.280386 0.218988C112.739179 293.210995 64.303027 397.234163 64.303027 511.875157c0 114.610294 48.436152 218.163765 125.789914 293.613154l0.280386 0.249687c77.603449 75.262124 184.906314 121.980145 303.138088 121.980145 75.574233 0 148.399865-19.423375 211.980949-54.525847l1.873674-1.249457c63.768349-35.599799 118.170376-87.940888 156.518776-151.271262l0.499374-0.74906c10.431583-17.426905 4.123924-38.84982-13.551644-48.467875zM670.892335 810.29785l-1.873674 1.311879c-52.089355 28.980032-113.048729 44.906769-175.506222 44.906769-98.464569 0-187.529047-38.660508-251.579829-100.744495-64.331167-62.582337-103.929024-148.773372-103.929024-243.896846 0-94.935186 39.597857-180.783413 103.930047-243.64716 56.242955-54.525847 131.255393-90.906429 214.604706-98.995665v342.642825c0 14.614859 8.838296 27.012214 21.360494 32.7898l303.16981 169.697937c-29.481452 39.159882-67.205635 72.200392-110.176308 95.934956z m180.752714-605.464695c-62.33265-60.58382-146.651035-99.744725-239.900836-105.022938V445.701015L920.597467 618.677625c10.992355-21.98471 20.360723-44.156686 26.606984-67.673286 8.306176-30.29191 12.491499-61.364603 12.491499-93.186356 0-98.714256-41.159422-188.840926-108.050901-252.984828z" fill="#7E7E7E" ></path></symbol></svg>',a=(a=document.getElementsByTagName("script"))[a.length-1].getAttribute("data-injectcss");if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}function d(){n||(n=!0,o())}e=function(){var t,e,c;(c=document.createElement("div")).innerHTML=l,l=null,(e=c.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",t=e,(c=document.body).firstChild?(e=c.firstChild).parentNode.insertBefore(t,e):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),e()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(o=e,i=t.document,n=!1,(h=function(){try{i.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}d()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,d())})}(window);
\ No newline at end of file
diff --git a/web/static/img/iconfont/iconfont.json b/web/static/img/iconfont/iconfont.json
index c6308c4..a117163 100644
--- a/web/static/img/iconfont/iconfont.json
+++ b/web/static/img/iconfont/iconfont.json
@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "2332742",
+      "name": "流失",
+      "font_class": "liushi",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "20666187",
+      "name": "数据表",
+      "font_class": "shujubiao",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
     {
       "icon_id": "3031210",
       "name": "sql",
diff --git a/web/static/img/iconfont/iconfont.ttf b/web/static/img/iconfont/iconfont.ttf
index c25234c..85b019b 100644
Binary files a/web/static/img/iconfont/iconfont.ttf and b/web/static/img/iconfont/iconfont.ttf differ
diff --git a/web/static/img/iconfont/iconfont.woff b/web/static/img/iconfont/iconfont.woff
index 77b5335..b0a729f 100644
Binary files a/web/static/img/iconfont/iconfont.woff and b/web/static/img/iconfont/iconfont.woff differ
diff --git a/web/static/img/iconfont/iconfont.woff2 b/web/static/img/iconfont/iconfont.woff2
index 92ad44a..fef0de3 100644
Binary files a/web/static/img/iconfont/iconfont.woff2 and b/web/static/img/iconfont/iconfont.woff2 differ