From 28b0e677b82f5c04c0e67114a82b3a2e11f85a92 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Wed, 8 Sep 2021 17:04:56 +0800
Subject: [PATCH] 111

---
 web/pages/analysis.html            |   6 +
 web/pages/attribute.html           |   4 +
 web/pages/dashboard.html           | 120 +++++++++++++--
 web/pages/distribution.html        |   4 +
 web/pages/funnelanalysis.html      |   4 +
 web/pages/ltvmodel.html            |   6 +
 web/pages/modeltable.html          |   6 +
 web/pages/modeltype.html           | 168 ++++++---------------
 web/pages/routeanalysis.html       |   4 +
 web/src/x.min.js                   | 235 ++++++++++++++++++-----------
 web/srczip/common.js               |  12 +-
 web/srczip/logic/analysis.js       |  14 +-
 web/srczip/logic/attribute.js      |   6 +
 web/srczip/logic/dashboard.js      |  26 +++-
 web/srczip/logic/distribution.js   |  67 ++++----
 web/srczip/logic/funnelanalysis.js |  78 +++++-----
 web/srczip/logic/ltvmodel.js       |  14 +-
 web/srczip/logic/modeltype.js      |   4 +-
 web/srczip/logic/retained.js       |   8 +-
 web/srczip/logic/routeanalysis.js  |   6 +
 20 files changed, 489 insertions(+), 303 deletions(-)

diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index e226336..e6e7079 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -30,6 +30,12 @@
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
                 <img src="./static/img/baobiao2.png">
             </div>
+
+            <div class="analysis-navigation-bar-right-img analysis-fanhui" title="返回">
+                <img src="./static/img/fanhui.png">
+                <span>返回</span>
+            </div>
+            
         </div>
     </div>
 
diff --git a/web/pages/attribute.html b/web/pages/attribute.html
index dcd31a8..7a9c799 100644
--- a/web/pages/attribute.html
+++ b/web/pages/attribute.html
@@ -18,6 +18,10 @@
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
                 <img src="./static/img/baobiao2.png">
             </div>
+            <div class="analysis-navigation-bar-right-img analysis-fanhui" title="返回">
+                <img src="./static/img/fanhui.png">
+                <span>返回</span>
+            </div>
         </div>
     </div>
 
diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index f92dc5b..4cc1ab5 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -128,7 +128,7 @@
               
               </dl>
             </li>
-            <li class="layui-nav-item modify-layui-nav-item">
+            <li class="layui-nav-item modify-layui-nav-item layui-nav-itemed">
               <a href="javascript:;" class="fontcolor">项目空间</a>
               <dl class="layui-nav-child modeify-layui-nav-" id="kongjian">
                
@@ -560,17 +560,26 @@
 
 <!-- 空间 -->
 <script id="kongjian-dot" type="text/html">
-
+    
     {{# layui.each(d, function(index, item) {  }}
         {{#  if(item.name != undefined ){ }}
-        <li class="layui-nav-item">
+        <li class="layui-nav-item layui-nav-itemed">
             <a href="javascript:;" class="fontcolor mykanban category xiangmukongjian" data-id="{{item._id}}"> 
                 <i class="layui-icon layui-icon-template-1"></i> {{item.name}} 
                 <img src="./static/img/renyuan.png" class="nav-space-bar" data-id="{{item._id}}"/></a>
-            <dl class="layui-nav-child modeify-layui-nav-child sidebar-box">
+            <dl class="layui-nav-child modeify-layui-nav-child" id="sidebar-box">
 
                 {{#  layui.each(item.children, function(indexs, items){ }}
-                    {{#  if(items.isFolder === true){ }}
+                    <!-- {{#  if(indexs == 0){ }}
+                        <dd class="layui-left-dd layui-this"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
+                            <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
+                        </dd>
+                    {{#  } else { }} -->
+                        <dd class="layui-left-dd"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
+                            <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
+                        </dd>
+                    <!-- {{#  } }} -->
+                    <!-- {{#  if(items.isFolder === true){ }}
                     <li class="layui-nav-item">
                         <a href="javascript:;" class="fontcolor mykanban second category xiangmukongjian" data-id="{{items._id}}"> <i class="layui-icon layui-icon-file-b"></i> {{items.name}}
                         <img src="./static/img/gengduo.png" class="nav-file-bar" data-id="{{items._id}}"/></a>
@@ -580,14 +589,20 @@
                                 <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{datas._id}}"></a></dd>
                             </dl>
                         {{#  }); }}
-                    </li>
-                    {{#  } else { }}
-                    <dd class="layui-left-dd" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
-                        <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
-                    </dd>
-                    {{#  } }} 
+                    </li> -->
+                    <!-- {{#  } else { }} -->
+                        <!-- {{#  if(indexs == 0){ }}
+                        <dd class="layui-left-dd layui-this" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
+                            <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
+                        </dd>
+                        {{#  } else { }} -->
+                            <!-- <dd class="layui-left-dd"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
+                                <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
+                            </dd> -->
+                        <!-- {{#  } }}  -->
+                    <!-- {{#  } }}  -->
                 {{#  }); }}
-
+               
             </dl>
         </li>
         {{#  } }} 
@@ -819,6 +834,32 @@
     {{#  if(d.graph_size === "small"){ }}
 
         <div class="layui-col-md3 layui-col" id="model{{d.report_id}}">
+
+            <div class="layui-card modify-layui-card-small">
+                <div class="row-top controlhover">
+                    <div class="row-tit">
+                        <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
+                    </div>
+                    <div class="control">
+                        <div class="action-box" >
+                            <div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新">
+                                <img src="./static/img/gengxin.png" />
+                            </div>
+                            <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}" >
+                                <img src="./static/img/fuzhi2.png" />
+                            </div>
+                            <div class="tishi model-gengduo" title="更多">
+                                <img src="./static/img/gengduo.png" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                <div id="model-two-{{d.report_id}}">
+
+                </div>
+
+            </div>
             
         </div>
 
@@ -831,7 +872,32 @@
         {{# } else { }}
             <div class="layui-col-md6 layui-col" id="model{{d.report_id}}">
         {{#  } }} 
-       
+
+                <div class="layui-card modify-layui-card">
+                    <div class="row-top controlhover">
+                        <div class="row-tit">
+                            <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
+                        </div>
+                        <div class="control">
+                            <div class="action-box" >
+                                <div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新">
+                                    <img src="./static/img/gengxin.png" />
+                                </div>
+                                <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
+                                    <img src="./static/img/fuzhi2.png" />
+                                </div>
+                                <div class="tishi model-gengduo" title="更多">
+                                    <img src="./static/img/gengduo.png" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="model-two-{{d.report_id}}">
+
+                    </div>
+
+                </div>
+                
             </div>
         
     {{#  } else { }}
@@ -840,7 +906,33 @@
         {{# } else { }}
             <div class="layui-col-md6 layui-col" id="model{{d.report_id}}">
         {{#  } }} 
-            
+
+                <div class="layui-card modify-layui-card">
+                    <div class="row-top controlhover">
+                        <div class="row-tit">
+                            <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.report_id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
+                        </div>
+                        <div class="control">
+                            <div class="action-box" >
+                                <div class="tishi model-gengx" data-id="{{d.report_id}}" title="更新">
+                                    <img src="./static/img/gengxin.png" />
+                                </div>
+                                <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
+                                    <img src="./static/img/fuzhi2.png" />
+                                </div>
+                                <div class="tishi model-gengduo" title="更多">
+                                    <img src="./static/img/gengduo.png" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div id="model-two-{{d.report_id}}">
+
+                    </div>
+
+                </div>
+
         </div>
 
 
diff --git a/web/pages/distribution.html b/web/pages/distribution.html
index 7210837..8fc8e25 100644
--- a/web/pages/distribution.html
+++ b/web/pages/distribution.html
@@ -24,6 +24,10 @@
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
                 <img src="./static/img/baobiao2.png">
             </div>
+            <div class="analysis-navigation-bar-right-img analysis-fanhui" title="返回">
+                <img src="./static/img/fanhui.png">
+                <span>返回</span>
+            </div>
         </div>
     </div>
 
diff --git a/web/pages/funnelanalysis.html b/web/pages/funnelanalysis.html
index fe2584d..ce51dc4 100644
--- a/web/pages/funnelanalysis.html
+++ b/web/pages/funnelanalysis.html
@@ -24,6 +24,10 @@
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
                 <img src="./static/img/baobiao2.png">
             </div>
+            <div class="analysis-navigation-bar-right-img analysis-fanhui" title="返回">
+                <img src="./static/img/fanhui.png">
+                <span>返回</span>
+            </div>
         </div>
     </div>
 
diff --git a/web/pages/ltvmodel.html b/web/pages/ltvmodel.html
index 995c994..0468353 100644
--- a/web/pages/ltvmodel.html
+++ b/web/pages/ltvmodel.html
@@ -24,6 +24,12 @@
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
                 <img src="./static/img/baobiao2.png">
             </div>
+
+            <div class="analysis-navigation-bar-right-img analysis-fanhui" title="返回">
+                <img src="./static/img/fanhui.png">
+                <span>返回</span>
+            </div>
+            
         </div>
     </div>
 
diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index b34d843..f100dbd 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -102,6 +102,9 @@
 
         
     {{#  } else { }}
+    
+    {{#  if(d.cat != "user_property"){ }}
+
         <div class="data-box">
             <div style="display: flex; align-items: center;">
                 <div class="data-num">{{d.sameday}}<span></span></div>
@@ -135,6 +138,9 @@
             </div>
         </div>
 
+        {{#  } }} 
+        
+
         <div class="echarts-box">
             <div id="{{d.id}}" class="echarts"></div>
         </div>
diff --git a/web/pages/modeltype.html b/web/pages/modeltype.html
index eee84cc..eac315f 100644
--- a/web/pages/modeltype.html
+++ b/web/pages/modeltype.html
@@ -2,141 +2,67 @@
 <script id="kanban-model-modify-type-dot" type="text/html">
 
     {{#  if(d.modelsize === "small"){ }}
-            <div class="layui-card modify-layui-card-small">
-                <div class="row-top controlhover">
-                    <div class="row-tit">
-                        <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
-                    </div>
-                    <div class="control">
-                        <div class="action-box" >
-                            <div class="tishi model-gengx" data-id="{{d.id}}" title="更新">
-                                <img src="./static/img/gengxin.png" />
-                            </div>
-                            <div class="tishi model-fuzhi" title="复制" data-id="{{d.id}}" >
-                                <img src="./static/img/fuzhi2.png" />
-                            </div>
-                            <div class="tishi model-gengduo" title="更多">
-                                <img src="./static/img/gengduo.png" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="conent-box" id="conent-box{{d.id}}">
-
-                </div>
-              
-
-
-            </div>
-
+        <div class="conent-box" id="conent-box{{d.id}}">
 
+        </div>
     {{# } else { }}
 
     {{#  if(d.modeltype === "table"){ }}
-    
-        <!-- <div class="layui-col-md6" style="float: none;"> -->
-            <div class="layui-card modify-layui-card">
-                <div class="row-top controlhover">
-                    <div class="row-tit">
-                        <p><a href="javascript:;" class="gobaobiaoinfo" data-id="{{d.id}}" data-cat="{{d.cat}}">{{d.name}}</a></p>
-                    </div>
-                    <div class="control">
-                        <div class="action-box" >
-                            <div class="tishi model-gengx" data-id="{{d.id}}" title="更新">
-                                <img src="./static/img/gengxin.png" />
-                            </div>
-                            <div class="tishi model-fuzhi" title="复制" data-id="{{d.id}}">
-                                <img src="./static/img/fuzhi2.png" />
-                            </div>
-                            <div class="tishi model-gengduo" title="更多">
-                                <img src="./static/img/gengduo.png" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 
-                <div class="condition-box controlhover">
-                    <div class="time-cond">
-                        {{#  if(d.cat != "user_property"){ }}
-                            {{#  if(d.date != ""){ }}
-                                <span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}">{{d.date}}</span>
-                            {{#  } }} 
-                            <div class="xian"></div>
-                            <span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.timeParticleSize}}</span>
-                            {{#  if(d.cat === "retention"){ }}
-                                <div class="xian"></div>
-                                {{#  if(d.retentiontype === 0){ }}
-                                    <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span>
-                                {{#  } else { }}
-                                    <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span>
-                                {{#  } }} 
-                            {{#  } }} 
+        <div class="condition-box controlhover">
+            <div class="time-cond">
+                {{#  if(d.cat != "user_property"){ }}
+                    {{#  if(d.date != ""){ }}
+                        <span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}">{{d.date}}</span>
+                    {{#  } }} 
+                    <div class="xian"></div>
+                    <span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.timeParticleSize}}</span>
+                    {{#  if(d.cat === "retention"){ }}
+                        <div class="xian"></div>
+                        {{#  if(d.retentiontype === 0){ }}
+                            <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span>
+                        {{#  } else { }}
+                            <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span>
                         {{#  } }} 
-                    </div>
-                    <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
-                        <img src="./static/img/qvshitu.png" /> <span>报表</span>
-                    </div>
-                </div>
-                <div class="conent-box" id="conent-box{{d.id}}">
-
-                </div>
-                
-
+                    {{#  } }} 
+                {{#  } }} 
             </div>
+            <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
+                <img src="./static/img/qvshitu.png" /> <span>报表</span>
+            </div>
+        </div>
+        <div class="conent-box" id="conent-box{{d.id}}">
+
+        </div>
         
     {{#  } else { }}
-            <div class="layui-card modify-layui-card">
-                <div class="row-top controlhover">
-                    <div class="row-tit">
-                        <p><a href="javascript:;" class="gobaobiaoinfo" data-cat="{{d.cat}}" data-id="{{d.id}}">{{d.name}}</a></p>
-                        <!-- <div class="tishi" title="活跃用户可以通过“登录.触发用户数”来进行计算，即有登录行为的用户的去重数.">
-                            <img src="./static/img/tishi.png" />
-                        </div> -->
-                    </div>
-                    <div class="control">
-                        <div class="action-box" >
-                            <div class="tishi model-gengx" data-id="{{d.id}}" title="更新">
-                                <img src="./static/img/gengxin.png" />
-                            </div>
-                            <div class="tishi model-fuzhi" title="复制" data-id="{{d.id}}">
-                                <img src="./static/img/fuzhi2.png" />
-                            </div>
-                            <div class="tishi model-gengduo" title="更多">
-                                <img src="./static/img/gengduo.png" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
                 
-                <div class="condition-box controlhover">
-                    <div class="time-cond">
-                        {{#  if(d.cat != "user_property"){ }}
-                            <span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" >{{d.date}}</span>
-                            <div class="xian"></div>
-                            {{#  if(d.date != ""){ }}
-                                <span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}" >{{d.timeParticleSize}}</span>
-                            {{#  } }} 
-                            {{#  if(d.cat === "retention"){ }}
-                                <div class="xian"></div>
-                                {{#  if(d.retentiontype === 0){ }}
-                                    <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span>
-                                {{#  } else { }}
-                                    <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span>
-                                {{#  } }} 
-                            {{#  } }} 
+        <div class="condition-box controlhover">
+            <div class="time-cond">
+                {{#  if(d.cat != "user_property"){ }}
+                    <span class="model-times" id="times{{d.id}}" data-id="{{d.id}}" data-cat="{{d.cat}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" >{{d.date}}</span>
+                    <div class="xian"></div>
+                    {{#  if(d.date != ""){ }}
+                        <span class="model-screenlist" id="screenlist{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}" data-id="{{d.id}}" >{{d.timeParticleSize}}</span>
+                    {{#  } }} 
+                    {{#  if(d.cat === "retention"){ }}
+                        <div class="xian"></div>
+                        {{#  if(d.retentiontype === 0){ }}
+                            <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">留存</span>
+                        {{#  } else { }}
+                            <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype="{{d.modeltype}}" data-name="{{d.name}}" data-cat="{{d.cat}}">流失</span>
                         {{#  } }} 
-
-                    </div>
-                    <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
-                        <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
-                    </div>
-                </div>
-                <div class="conent-box" id="conent-box{{d.id}}">
-
-                </div>
+                    {{#  } }} 
+                {{#  } }} 
 
             </div>
+            <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
+                <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
+            </div>
+        </div>
+        <div class="conent-box" id="conent-box{{d.id}}">
 
+        </div>
 
     {{#  } }} 
 
diff --git a/web/pages/routeanalysis.html b/web/pages/routeanalysis.html
index 132ffb6..e756b7a 100644
--- a/web/pages/routeanalysis.html
+++ b/web/pages/routeanalysis.html
@@ -18,6 +18,10 @@
             <div class="analysis-navigation-bar-right-img analysis-navigation-bar-right-img-baobiao" title="报表">
                 <img src="./static/img/baobiao2.png">
             </div>
+            <div class="analysis-navigation-bar-right-img analysis-fanhui" title="返回">
+                <img src="./static/img/fanhui.png">
+                <span>返回</span>
+            </div>
         </div>
     </div>
 
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 311ec1b..35d5666 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -171,12 +171,17 @@ var X = window.X || {
             },
             success:function(d){
                 // console.log(d);
+                layer.close(index);
                 if(d.code == 0){
-                    callback && callback(d.data);
+                    if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
+                        callback && callback(d.data);
+                    }else {
+                        layer.msg('查无数据');
+                    }
                 }else {
                     layer.msg(d.msg);
                 }
-                layer.close(index);
+                
             },
             error:function(error){
                layer.msg('条件错误');
@@ -644,8 +649,7 @@ var X = window.X || {
             }
         }
         date = data[0]['start_date'] + " - " + data[0]['end_date'];
-        console.log(titledata);
-        console.log(condata);
+
         var dataArr = {
             titledata:titledata,
             condata:condata,
@@ -2086,9 +2090,13 @@ var X = window.X || {
 
             // 反向填充数据
             function backfilldata(d){
+
                 data = d.query;
                 // filtersymbols = data.cachedata.filtersymbols;
-
+                var time = $("#analtsis-condition-date").val();
+                var timearr = time.split(" ");
+                data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
+                data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
                 baobiaodata = d;
                
                 if(d.query.eventView.filts.length > 0){
@@ -3016,10 +3024,16 @@ var X = window.X || {
 
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
-                console.log(11111);
+                // console.log(11111);
                 X.download('ck/event_model_export',data,'事件分析');
             });
 
+              // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
         },
 
         // 保存报表
@@ -3592,6 +3606,12 @@ var X = window.X || {
                 calculationdata();
             }
 
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
         }
     };
 })();
@@ -3889,6 +3909,7 @@ var X = window.X || {
                 var id = $(this).attr("data-id");
                 var game = $(this).attr("data-game");
                 $(".projecttit").html($(this).html());
+                X.DATA['dashboard_id'] = "";
                 X.DATA['projectid'] = id;
                 X.DATA["game"] = game;
                 //侧边栏数据渲染
@@ -4349,7 +4370,22 @@ var X = window.X || {
                 X.DATA['ProjectData'] = d.spaces;
                 X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
                 X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
-                
+            
+                // if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
+                //     $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
+                //     X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
+                // }else {
+                //     for(let i in d.spaces){
+                //         for(let j in d.spaces[i]['children']){
+                //             if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
+                //                 $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
+                //             }
+                //         }
+                //     }
+                // }
+                // $("#model-box").html("");
+                // // 获取报表数据
+                // X.pageLogic['dashboard'].gettabledata();
                 
                 // var updateOutput = function(e){
 
@@ -4370,8 +4406,8 @@ var X = window.X || {
             
                 // };
             
-                // $('#kongjian').nestable({group: 1}).on('change', updateOutput);
-                // updateOutput($('#kongjian').data('output', $('#nestable-output')));
+                // $('#sidebar-box').nestable({group: 1}).on('change', updateOutput);
+                // updateOutput($('#sidebar-box').data('output', $('#nestable-output')));
             });
         },
 
@@ -4385,7 +4421,7 @@ var X = window.X || {
                     for(var z in eventdata){
                         if(id){
                             //当有id时更新对应id看板内的内容
-                            X.template("modeltype",id,eventdata[z],function(){ 
+                            X.template("modeltype","model-two-"+id,eventdata[z],function(){ 
                                 // X.pageLogic['dashboard'].morefeatures(eventdata[z]);
                                 X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){ 
                                     X.pageLogic['dashboard'].morefeatures(eventdata[z]);
@@ -4393,7 +4429,7 @@ var X = window.X || {
                             });
                         }else {
                             //渲染模板和数据
-                            X.template("modeltype",'model'+eventdata[z]['id'],eventdata[z],function(){
+                            X.template("modeltype",'model-two-'+eventdata[z]['id'],eventdata[z],function(){
                                 //X.pageLogic['dashboard'].morefeatures(eventdata[z]);
                                 X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){
                                     X.pageLogic['dashboard'].morefeatures(eventdata[z]);
@@ -4938,7 +4974,7 @@ var X = window.X || {
                     filtersymbols:[],//筛选符号
                     screentypearr:[], //筛选项数据
                 }
-            }
+            };
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
@@ -4947,7 +4983,7 @@ var X = window.X || {
                 X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                     
                 })
-            })
+            });
 
             // 日期渲染
             X.daterender("#retained-condition-date",function(start, end, label){
@@ -4956,7 +4992,7 @@ var X = window.X || {
                 data['eventView']['startTime'] = startTime;
                 data['eventView']['endTime'] = endTime;
                 distributiondata();
-            })
+            });
 
             var time = $("#retained-condition-date").val();
             var timearr = time.split(" ");
@@ -4980,7 +5016,7 @@ var X = window.X || {
                     }
 
                 })
-            })
+            });
 
             X.template("grouped","shushi");
             
@@ -5021,7 +5057,7 @@ var X = window.X || {
                 X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
                     groupitemeventsdata[0] = val;
                 })
-            })
+            });
 
 
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
@@ -5039,7 +5075,7 @@ var X = window.X || {
                     })
 
                 })
-            })
+            });
 
             //设置一级事件中第二个参数
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
@@ -5067,7 +5103,7 @@ var X = window.X || {
                         }
                     })
                 }
-            })
+            });
 
             //设置一级事件中第三个参数
             $(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
@@ -5083,7 +5119,7 @@ var X = window.X || {
                         })
                     }
                 }
-            })
+            });
 
             $(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
                 var sectionid = data['events'][0];
@@ -5093,14 +5129,14 @@ var X = window.X || {
                         data['events'][0]['quotaIntervalArr'] = val.quotaIntervalArr;
                     }
                 })
-            })
+            });
 
             //重命名指标
             $(document).off('click','.analysis-chongmingming').on('click','.analysis-chongmingming',function() {
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").show();
                 $(this).hide();
                 $(".analysis-chongmingming-del").show();
-            })
+            });
 
             //删除重命名
             $(document).off('click','.analysis-chongmingming-del').on('click','.analysis-chongmingming-del',function() {
@@ -5108,19 +5144,19 @@ var X = window.X || {
                 $(".analysis-con-left-screen-list-left-zhibiaoname-txt").val('');
                 $(this).hide();
                 $(".analysis-chongmingming ").show();
-            })
+            });
 
             $(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-shaix').on('click','.analysis-shaix',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 添加筛选项
             function addscreen(index){
@@ -5140,7 +5176,7 @@ var X = window.X || {
                     screentypearr[index] = d;
                     filtersymbols.push(d[0]['category'][0]["category"]);
                 })
-            }
+            };
 
             $(document).off("click",".ta-property-select").on('click','.ta-property-select',function(){
                 var obj = $(this);
@@ -5157,7 +5193,7 @@ var X = window.X || {
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
                     data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
                 })
-            })
+            });
 
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
@@ -5172,7 +5208,7 @@ var X = window.X || {
                         X.template("userpar","userpar-event",data['events']); 
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-list-right-screen-qh-tit').on('click','.analysis-con-left-screen-list-right-screen-qh-tit',function(){
                 var tit = $(this).html();
@@ -5183,7 +5219,7 @@ var X = window.X || {
                     $(this).html('且');
                     data['events'][0]['relation'] = 'and';
                 }
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr("data-index");
@@ -5192,15 +5228,14 @@ var X = window.X || {
                 var valarr = val.split(",");
                 data['events'][index]['filts'][indexs]['ftv']=valarr;
                 data['events'][index]['filts'][indexs]['strftv']=val;
-            })
-
+            });
 
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
                 data.eventView.groupBy.splice(index,1);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
-            })  
+            });
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
@@ -5214,7 +5249,7 @@ var X = window.X || {
                 };
                 data['eventView']['groupBy'].push(arr);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
-            })
+            });
 
             $(document).off('click','.analysis-ant-dropdown-trigger').on('click','.analysis-ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -5228,7 +5263,7 @@ var X = window.X || {
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
                 });
-            })
+            });
 
             // 时间粒度
             X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['distribution'],function(d){
@@ -5236,14 +5271,14 @@ var X = window.X || {
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['timeParticleSize'] = d.id;
                 // retaineddata();
-            })
+            });
 
             // 计算
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
 
               distributiondata()
               
-            })
+            });
 
             var querydata;
             function distributiondata(){
@@ -5262,14 +5297,14 @@ var X = window.X || {
                     d['tabletitle'].unshift('事件发生时间','总人数');
                     updata(d)
                 })
-            }
+            };
 
             function updata(d){
                 var title = $(".select-chart").attr("title");
                 if(title == '数据表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)}
                 else if(title == '数值分布'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retainednRetained(d) }
                 else if(title == '百分比分布'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retaineddayRetained(d) }
-            }
+            };
             
             $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
                 if(querydata){
@@ -5281,7 +5316,7 @@ var X = window.X || {
                 }else{
                     layer.msg('请先计算数据,在切换图表');
                 }
-            })
+            });
 
             function retainedtable(d){
                 var tabledata = [];
@@ -5305,7 +5340,7 @@ var X = window.X || {
                 // console.log(tabledata);
                 X.laytpldata("#table-fenxi-th-dot",d.tabletitle,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
-            }
+            };
 
             function retainednRetained(d){
                 var legendData = d.label;
@@ -5389,7 +5424,7 @@ var X = window.X || {
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
             
             function retaineddayRetained(d){
                 var legendData = d.label;
@@ -5476,11 +5511,17 @@ var X = window.X || {
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 X.parametersopen(data,'savereport','auto')  
-            })
+            });
+
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
 
         }
     };
@@ -5801,14 +5842,14 @@ var X = window.X || {
                     
                     
                 })
-            })
+            });
             
             //开启重命名
             $(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-del-initial-event').on('click','.analysis-chongmingming-del-initial-event',function(){
@@ -5816,7 +5857,7 @@ var X = window.X || {
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event input").val('');
                 $(this).hide();
                 $(".analysis-chongmingming-initial-event").show();
-            })
+            });
 
             // 添加指标
             function addindex(){
@@ -5838,22 +5879,22 @@ var X = window.X || {
                     }
                 });
                 
-            }
+            };
 
             //添加按钮
             $(document).off('click','.analysis-jia1').on('click','.analysis-jia1',function(){
                 addindex();
-            })
+            });
             $(document).off('click','.funnel-updataevent').on('click','.funnel-updataevent',function(){
                 addindex();
-            })
+            });
             
             // 添加筛选项
             $(document).off('click','.analysis-shaix').on('click','.analysis-shaix',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 添加筛选项
             function addscreen(index){
@@ -5869,20 +5910,20 @@ var X = window.X || {
                 }
                 data['events'][index]['filts'].push(arr);
                 X.template("funnel","funnel-event",data['events']);
-            }
+            };
 
             $(document).off('click','.analysis-zhibiao-updata').on('click','.analysis-zhibiao-updata',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 删除指定初始事件筛选
             $(document).off('click','.analysis-del').on('click','.analysis-del',function(){
                 var index = $(this).attr("data-index");
                 data['events'].splice(index,1);
                 X.template("funnel","funnel-event",data['events']);
-            })
+            });
             
             //删除指定筛选
             $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
@@ -5890,12 +5931,12 @@ var X = window.X || {
                 var indexs = $(this).attr("data-twonum");
                 data['events'][index]['filts'].splice(indexs,1);
                 X.template("funnel","funnel-event",data['events']);
-            })
+            });
 
             $(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','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -5915,7 +5956,7 @@ var X = window.X || {
                     // console.log(data['events']);
 
                 })
-            })
+            });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
                 var obj = $(this);
@@ -5930,7 +5971,7 @@ var X = window.X || {
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
                     data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
                 })
-            })
+            });
 
             // 过滤数据
             // function filteringdata(){
@@ -5966,7 +6007,7 @@ var X = window.X || {
                         data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
@@ -5975,7 +6016,7 @@ var X = window.X || {
                 var txtarr = txt.split(",");
                 data['events'][index]['filts'][indexs]['strftv'] = txt;
                 data['events'][index]['filts'][indexs]['ftv'] = txtarr;
-            })
+            });
 
             //全局筛选
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
@@ -5997,7 +6038,7 @@ var X = window.X || {
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
-            })
+            });
 
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
@@ -6009,7 +6050,7 @@ var X = window.X || {
                     $(".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);
@@ -6025,7 +6066,7 @@ var X = window.X || {
                     data['eventView']['filts'][index]['comparator_id'] = '==';
                     data['eventView']['filts'][index]['table_type'] = val.table_type;
                 })
-            })
+            });
 
             //循环给条件框渲染下拉框
             // function analysisdown(){
@@ -6059,7 +6100,7 @@ var X = window.X || {
                     }
                     X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
                 })
-            })
+            });
 
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
@@ -6067,7 +6108,7 @@ var X = window.X || {
                 data.eventView.groupBy.splice(index,1);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
                 $(".group-updata").show();
-            })  
+            });
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 var arr = {
@@ -6081,7 +6122,7 @@ var X = window.X || {
                 data['eventView']['groupBy'].push(arr);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
                 $(this).hide();
-            })
+            });
 
             $(document).off('click','.analysis-ant-dropdown-trigger').on('click','.analysis-ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -6096,7 +6137,7 @@ var X = window.X || {
                     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(){
@@ -6105,7 +6146,7 @@ var X = window.X || {
                     X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                         
                     })
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
@@ -6113,19 +6154,19 @@ var X = window.X || {
                 {'title':'7日','id':'7'},
                 {'title':'14日','id':'14'},
                 {'title':'30日','id':'30'},
-            ]
+            ];
             X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['windows_gap'] = parseInt(d.id);
                 retaineddata();
-            })
+            });
 
             // 计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
                 console.log(data);
 
                 retaineddata()
-            })
+            });
             var querydata;
             function retaineddata(){
                 var dataArr = {
@@ -6140,13 +6181,13 @@ var X = window.X || {
                     querydata = d;
                     updata(d)
                 })
-            }
+            };
 
             function updata(d){
                 var title = $(".select-chart").attr("title");
                 if(title == '转化图'){ retainedtable(d); retaineddayRetained(d);}
                 else if(title == '趋势图'){ retainednRetained(d);retainednRetainedtable(d); }
-            }
+            };
 
             function retainedtable(d){
                 var tabledata=[];
@@ -6169,7 +6210,7 @@ var X = window.X || {
     
                 X.laytpldata("#table-fenxi-th-dot",d.etitle,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
-            }
+            };
 
             //转化图
             function retaineddayRetained(d){
@@ -6219,7 +6260,7 @@ var X = window.X || {
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
             // 趋势图
             function retainednRetained(d){
                var arr = {};
@@ -6320,7 +6361,7 @@ var X = window.X || {
                 };
                 myChart.setOption(option,true);
 
-            }
+            };
             //趋势图表格
             function retainednRetainedtable(d){
                 var arr = {};
@@ -6388,7 +6429,7 @@ var X = window.X || {
                 console.log(tabdata);
                 X.laytpldata("#table-fenxi-th-dot",xAxisdata,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabdata,".table-fenxi-td");
-            }
+            };
 
             $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
                 if(querydata){
@@ -6402,11 +6443,11 @@ var X = window.X || {
                 }else{
                     layer.msg('请先计算数据,在切换图表');
                 }
-            })
+            });
 
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 X.parametersopen(data,'savereport','auto')  
-            })
+            });
 
             $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
                 X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
@@ -6422,7 +6463,13 @@ var X = window.X || {
                     }
 
                 })
-            })
+            });
+
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
 
         }
     };
@@ -7490,7 +7537,11 @@ var X = window.X || {
             function backfilldata(d){
                 data = d.query;
                 groupitemeventsdata = data.cachedata.groupitemeventsdata;
-                baobiaodata = d
+                baobiaodata = d;
+                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.template("globalfilter","xinwei-whole",data['eventView']['filts']);
       
@@ -7505,9 +7556,15 @@ var X = window.X || {
                 }
             });
 
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
-                console.log(11111);
+                // console.log(11111);
                 X.download('ck/ltv_model_export',data,'事件分析');
             });
 
@@ -7540,9 +7597,9 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
-            // console.log("type",data);
             X.laytpldata("#kanban-model-modify-type-dot",data,"model"+data.id,function(html){
-                $("#model"+data.id).html(html);
+                // console.log(html);
+                $("#model-two-"+data.id).html(html);
             })
 
             // for(var i in data){
@@ -8748,6 +8805,10 @@ var X = window.X || {
             function backfilldata(d){
                 data = d.query;
                 baobiaodata = d;
+                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.template("event","initial-event",data['events'][0]);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
@@ -9143,8 +9204,8 @@ var X = window.X || {
             
             // 返回
             $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
-                // X.gourl("dashboard");
-                return;
+                X.gourl("dashboard");
+                // return;
             });
 
             // 下载
@@ -9698,6 +9759,12 @@ var X = window.X || {
                 });
             };
 
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
         }
     };
 })();
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 8385f03..410879c 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -170,12 +170,17 @@ var X = window.X || {
             },
             success:function(d){
                 // console.log(d);
+                layer.close(index);
                 if(d.code == 0){
-                    callback && callback(d.data);
+                    if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
+                        callback && callback(d.data);
+                    }else {
+                        layer.msg('查无数据');
+                    }
                 }else {
                     layer.msg(d.msg);
                 }
-                layer.close(index);
+                
             },
             error:function(error){
                layer.msg('条件错误');
@@ -643,8 +648,7 @@ var X = window.X || {
             }
         }
         date = data[0]['start_date'] + " - " + data[0]['end_date'];
-        console.log(titledata);
-        console.log(condata);
+
         var dataArr = {
             titledata:titledata,
             condata:condata,
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index d27c2de..c9fd411 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -156,9 +156,13 @@
 
             // 反向填充数据
             function backfilldata(d){
+
                 data = d.query;
                 // filtersymbols = data.cachedata.filtersymbols;
-
+                var time = $("#analtsis-condition-date").val();
+                var timearr = time.split(" ");
+                data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
+                data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
                 baobiaodata = d;
                
                 if(d.query.eventView.filts.length > 0){
@@ -1086,10 +1090,16 @@
 
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
-                console.log(11111);
+                // console.log(11111);
                 X.download('ck/event_model_export',data,'事件分析');
             });
 
+              // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
         },
 
         // 保存报表
diff --git a/web/srczip/logic/attribute.js b/web/srczip/logic/attribute.js
index fecb59a..278af4a 100644
--- a/web/srczip/logic/attribute.js
+++ b/web/srczip/logic/attribute.js
@@ -456,6 +456,12 @@
                 calculationdata();
             }
 
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
         }
     };
 })();
\ No newline at end of file
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 7c16c12..f0b146b 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -40,6 +40,7 @@
                 var id = $(this).attr("data-id");
                 var game = $(this).attr("data-game");
                 $(".projecttit").html($(this).html());
+                X.DATA['dashboard_id'] = "";
                 X.DATA['projectid'] = id;
                 X.DATA["game"] = game;
                 //侧边栏数据渲染
@@ -500,7 +501,22 @@
                 X.DATA['ProjectData'] = d.spaces;
                 X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
                 X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
-                
+            
+                // if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
+                //     $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
+                //     X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
+                // }else {
+                //     for(let i in d.spaces){
+                //         for(let j in d.spaces[i]['children']){
+                //             if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
+                //                 $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
+                //             }
+                //         }
+                //     }
+                // }
+                // $("#model-box").html("");
+                // // 获取报表数据
+                // X.pageLogic['dashboard'].gettabledata();
                 
                 // var updateOutput = function(e){
 
@@ -521,8 +537,8 @@
             
                 // };
             
-                // $('#kongjian').nestable({group: 1}).on('change', updateOutput);
-                // updateOutput($('#kongjian').data('output', $('#nestable-output')));
+                // $('#sidebar-box').nestable({group: 1}).on('change', updateOutput);
+                // updateOutput($('#sidebar-box').data('output', $('#nestable-output')));
             });
         },
 
@@ -536,7 +552,7 @@
                     for(var z in eventdata){
                         if(id){
                             //当有id时更新对应id看板内的内容
-                            X.template("modeltype",id,eventdata[z],function(){ 
+                            X.template("modeltype","model-two-"+id,eventdata[z],function(){ 
                                 // X.pageLogic['dashboard'].morefeatures(eventdata[z]);
                                 X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){ 
                                     X.pageLogic['dashboard'].morefeatures(eventdata[z]);
@@ -544,7 +560,7 @@
                             });
                         }else {
                             //渲染模板和数据
-                            X.template("modeltype",'model'+eventdata[z]['id'],eventdata[z],function(){
+                            X.template("modeltype",'model-two-'+eventdata[z]['id'],eventdata[z],function(){
                                 //X.pageLogic['dashboard'].morefeatures(eventdata[z]);
                                 X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){
                                     X.pageLogic['dashboard'].morefeatures(eventdata[z]);
diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js
index 2e0d066..2dee4b9 100644
--- a/web/srczip/logic/distribution.js
+++ b/web/srczip/logic/distribution.js
@@ -21,7 +21,7 @@
                     filtersymbols:[],//筛选符号
                     screentypearr:[], //筛选项数据
                 }
-            }
+            };
 
             // sql语句显示
             $(document).off('click','.sqlquery').on('click','.sqlquery',function(){
@@ -30,7 +30,7 @@
                 X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                     
                 })
-            })
+            });
 
             // 日期渲染
             X.daterender("#retained-condition-date",function(start, end, label){
@@ -39,7 +39,7 @@
                 data['eventView']['startTime'] = startTime;
                 data['eventView']['endTime'] = endTime;
                 distributiondata();
-            })
+            });
 
             var time = $("#retained-condition-date").val();
             var timearr = time.split(" ");
@@ -63,7 +63,7 @@
                     }
 
                 })
-            })
+            });
 
             X.template("grouped","shushi");
             
@@ -104,7 +104,7 @@
                 X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
                     groupitemeventsdata[0] = val;
                 })
-            })
+            });
 
 
             $(document).off('click','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
@@ -122,7 +122,7 @@
                     })
 
                 })
-            })
+            });
 
             //设置一级事件中第二个参数
             $(document).off('click','.analysis-zhibiao-list-type2').on('click','.analysis-zhibiao-list-type2',function(){
@@ -150,7 +150,7 @@
                         }
                     })
                 }
-            })
+            });
 
             //设置一级事件中第三个参数
             $(document).off('click','.analysis-zhibiao-condition').on('click','.analysis-zhibiao-condition',function(){
@@ -166,7 +166,7 @@
                         })
                     }
                 }
-            })
+            });
 
             $(document).off('click','.userevent-granularity').on('click','.userevent-granularity',function(){
                 var sectionid = data['events'][0];
@@ -176,14 +176,14 @@
                         data['events'][0]['quotaIntervalArr'] = val.quotaIntervalArr;
                     }
                 })
-            })
+            });
 
             //重命名指标
             $(document).off('click','.analysis-chongmingming').on('click','.analysis-chongmingming',function() {
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event").show();
                 $(this).hide();
                 $(".analysis-chongmingming-del").show();
-            })
+            });
 
             //删除重命名
             $(document).off('click','.analysis-chongmingming-del').on('click','.analysis-chongmingming-del',function() {
@@ -191,19 +191,19 @@
                 $(".analysis-con-left-screen-list-left-zhibiaoname-txt").val('');
                 $(this).hide();
                 $(".analysis-chongmingming ").show();
-            })
+            });
 
             $(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-shaix').on('click','.analysis-shaix',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 添加筛选项
             function addscreen(index){
@@ -223,7 +223,7 @@
                     screentypearr[index] = d;
                     filtersymbols.push(d[0]['category'][0]["category"]);
                 })
-            }
+            };
 
             $(document).off("click",".ta-property-select").on('click','.ta-property-select',function(){
                 var obj = $(this);
@@ -240,7 +240,7 @@
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
                     data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
                 })
-            })
+            });
 
             $(document).off('click','.analysis-choicetypename').on('click','.analysis-choicetypename',function(){
                 var obj = $(this);
@@ -255,7 +255,7 @@
                         X.template("userpar","userpar-event",data['events']); 
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-con-left-screen-list-right-screen-qh-tit').on('click','.analysis-con-left-screen-list-right-screen-qh-tit',function(){
                 var tit = $(this).html();
@@ -266,7 +266,7 @@
                     $(this).html('且');
                     data['events'][0]['relation'] = 'and';
                 }
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr("data-index");
@@ -275,15 +275,14 @@
                 var valarr = val.split(",");
                 data['events'][index]['filts'][indexs]['ftv']=valarr;
                 data['events'][index]['filts'][indexs]['strftv']=val;
-            })
-
+            });
 
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
                 data.eventView.groupBy.splice(index,1);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
-            })  
+            });
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 
@@ -297,7 +296,7 @@
                 };
                 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);
@@ -311,7 +310,7 @@
                     data.eventView.groupBy[index]['data_type'] = val.type;
                     data.eventView.groupBy[index]['table_type'] = val.table_type;
                 });
-            })
+            });
 
             // 时间粒度
             X.laydropdown('.analtsis-timeParticleSize',X['DATA']['screenlist']['distribution'],function(d){
@@ -319,14 +318,14 @@
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['timeParticleSize'] = d.id;
                 // retaineddata();
-            })
+            });
 
             // 计算
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
 
               distributiondata()
               
-            })
+            });
 
             var querydata;
             function distributiondata(){
@@ -345,14 +344,14 @@
                     d['tabletitle'].unshift('事件发生时间','总人数');
                     updata(d)
                 })
-            }
+            };
 
             function updata(d){
                 var title = $(".select-chart").attr("title");
                 if(title == '数据表'){ $(".table-div-box").show(); $(".analysis-echarts").hide(); retainedtable(d)}
                 else if(title == '数值分布'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retainednRetained(d) }
                 else if(title == '百分比分布'){ $(".table-div-box").hide(); $(".analysis-echarts").show(); retaineddayRetained(d) }
-            }
+            };
             
             $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
                 if(querydata){
@@ -364,7 +363,7 @@
                 }else{
                     layer.msg('请先计算数据,在切换图表');
                 }
-            })
+            });
 
             function retainedtable(d){
                 var tabledata = [];
@@ -388,7 +387,7 @@
                 // console.log(tabledata);
                 X.laytpldata("#table-fenxi-th-dot",d.tabletitle,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
-            }
+            };
 
             function retainednRetained(d){
                 var legendData = d.label;
@@ -472,7 +471,7 @@
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
             
             function retaineddayRetained(d){
                 var legendData = d.label;
@@ -559,11 +558,17 @@
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
 
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 X.parametersopen(data,'savereport','auto')  
-            })
+            });
+
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
 
         }
     };
diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js
index d8a8658..f26e92c 100644
--- a/web/srczip/logic/funnelanalysis.js
+++ b/web/srczip/logic/funnelanalysis.js
@@ -90,14 +90,14 @@
                     
                     
                 })
-            })
+            });
             
             //开启重命名
             $(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-del-initial-event').on('click','.analysis-chongmingming-del-initial-event',function(){
@@ -105,7 +105,7 @@
                 $("#analysis-con-left-screen-list-left-zhibiaoname-initial-event input").val('');
                 $(this).hide();
                 $(".analysis-chongmingming-initial-event").show();
-            })
+            });
 
             // 添加指标
             function addindex(){
@@ -127,22 +127,22 @@
                     }
                 });
                 
-            }
+            };
 
             //添加按钮
             $(document).off('click','.analysis-jia1').on('click','.analysis-jia1',function(){
                 addindex();
-            })
+            });
             $(document).off('click','.funnel-updataevent').on('click','.funnel-updataevent',function(){
                 addindex();
-            })
+            });
             
             // 添加筛选项
             $(document).off('click','.analysis-shaix').on('click','.analysis-shaix',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 添加筛选项
             function addscreen(index){
@@ -158,20 +158,20 @@
                 }
                 data['events'][index]['filts'].push(arr);
                 X.template("funnel","funnel-event",data['events']);
-            }
+            };
 
             $(document).off('click','.analysis-zhibiao-updata').on('click','.analysis-zhibiao-updata',function(){
                 var obj = $(this);
                 var index = obj.attr("data-index");
                 addscreen(index);
-            })
+            });
 
             // 删除指定初始事件筛选
             $(document).off('click','.analysis-del').on('click','.analysis-del',function(){
                 var index = $(this).attr("data-index");
                 data['events'].splice(index,1);
                 X.template("funnel","funnel-event",data['events']);
-            })
+            });
             
             //删除指定筛选
             $(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
@@ -179,12 +179,12 @@
                 var indexs = $(this).attr("data-twonum");
                 data['events'][index]['filts'].splice(indexs,1);
                 X.template("funnel","funnel-event",data['events']);
-            })
+            });
 
             $(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','.ant-dropdown-trigger').on('click','.ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -204,7 +204,7 @@
                     // console.log(data['events']);
 
                 })
-            })
+            });
 
             $(document).off('click','.ta-property-select').on('click','.ta-property-select',function(){
                 var obj = $(this);
@@ -219,7 +219,7 @@
                     data['events'][index]['filts'][indexs]['data_type'] = val.type;
                     data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
                 })
-            })
+            });
 
             // 过滤数据
             // function filteringdata(){
@@ -255,7 +255,7 @@
                         data['events'][index]['filts'][indexs]['comparator'] = val.id;
                     }
                 })
-            })
+            });
 
             $(document).off('click','.analysis-zhibiao-list-type4 input').on('blur','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
@@ -264,7 +264,7 @@
                 var txtarr = txt.split(",");
                 data['events'][index]['filts'][indexs]['strftv'] = txt;
                 data['events'][index]['filts'][indexs]['ftv'] = txtarr;
-            })
+            });
 
             //全局筛选
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
@@ -286,7 +286,7 @@
                     $(".analysis-overall-situation-left-guanxi").hide();
                 }
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
-            })
+            });
 
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
@@ -298,7 +298,7 @@
                     $(".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);
@@ -314,7 +314,7 @@
                     data['eventView']['filts'][index]['comparator_id'] = '==';
                     data['eventView']['filts'][index]['table_type'] = val.table_type;
                 })
-            })
+            });
 
             //循环给条件框渲染下拉框
             // function analysisdown(){
@@ -348,7 +348,7 @@
                     }
                     X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
                 })
-            })
+            });
 
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
@@ -356,7 +356,7 @@
                 data.eventView.groupBy.splice(index,1);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
                 $(".group-updata").show();
-            })  
+            });
 
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function() {
                 var arr = {
@@ -370,7 +370,7 @@
                 data['eventView']['groupBy'].push(arr);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
                 $(this).hide();
-            })
+            });
 
             $(document).off('click','.analysis-ant-dropdown-trigger').on('click','.analysis-ant-dropdown-trigger',function(){
                 var obj = $(this);
@@ -385,7 +385,7 @@
                     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(){
@@ -394,7 +394,7 @@
                     X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
                         
                     })
-            })
+            });
 
             // 时间粒度
             var timeParticleSizearr = [
@@ -402,19 +402,19 @@
                 {'title':'7日','id':'7'},
                 {'title':'14日','id':'14'},
                 {'title':'30日','id':'30'},
-            ]
+            ];
             X.laydropdown('.analtsis-timeParticleSize',timeParticleSizearr,function(d){
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['windows_gap'] = parseInt(d.id);
                 retaineddata();
-            })
+            });
 
             // 计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
                 console.log(data);
 
                 retaineddata()
-            })
+            });
             var querydata;
             function retaineddata(){
                 var dataArr = {
@@ -429,13 +429,13 @@
                     querydata = d;
                     updata(d)
                 })
-            }
+            };
 
             function updata(d){
                 var title = $(".select-chart").attr("title");
                 if(title == '转化图'){ retainedtable(d); retaineddayRetained(d);}
                 else if(title == '趋势图'){ retainednRetained(d);retainednRetainedtable(d); }
-            }
+            };
 
             function retainedtable(d){
                 var tabledata=[];
@@ -458,7 +458,7 @@
     
                 X.laytpldata("#table-fenxi-th-dot",d.etitle,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
-            }
+            };
 
             //转化图
             function retaineddayRetained(d){
@@ -508,7 +508,7 @@
                     series: seriesData
                 };
                 myChart.setOption(option,true);
-            }
+            };
             // 趋势图
             function retainednRetained(d){
                var arr = {};
@@ -609,7 +609,7 @@
                 };
                 myChart.setOption(option,true);
 
-            }
+            };
             //趋势图表格
             function retainednRetainedtable(d){
                 var arr = {};
@@ -677,7 +677,7 @@
                 console.log(tabdata);
                 X.laytpldata("#table-fenxi-th-dot",xAxisdata,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabdata,".table-fenxi-td");
-            }
+            };
 
             $(document).off('click','.analtsis-chart-switch').on('click','.analtsis-chart-switch',function(){
                 if(querydata){
@@ -691,11 +691,11 @@
                 }else{
                     layer.msg('请先计算数据,在切换图表');
                 }
-            })
+            });
 
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
                 X.parametersopen(data,'savereport','auto')  
-            })
+            });
 
             $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
                 X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
@@ -711,7 +711,13 @@
                     }
 
                 })
-            })
+            });
+
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
 
         }
     };
diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js
index 58246c2..1ae5d2f 100644
--- a/web/srczip/logic/ltvmodel.js
+++ b/web/srczip/logic/ltvmodel.js
@@ -242,7 +242,11 @@
             function backfilldata(d){
                 data = d.query;
                 groupitemeventsdata = data.cachedata.groupitemeventsdata;
-                baobiaodata = d
+                baobiaodata = d;
+                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.template("globalfilter","xinwei-whole",data['eventView']['filts']);
       
@@ -257,9 +261,15 @@
                 }
             });
 
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
-                console.log(11111);
+                // console.log(11111);
                 X.download('ck/ltv_model_export',data,'事件分析');
             });
 
diff --git a/web/srczip/logic/modeltype.js b/web/srczip/logic/modeltype.js
index 5dbae2d..22fcfec 100644
--- a/web/srczip/logic/modeltype.js
+++ b/web/srczip/logic/modeltype.js
@@ -5,9 +5,9 @@
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
-            // console.log("type",data);
             X.laytpldata("#kanban-model-modify-type-dot",data,"model"+data.id,function(html){
-                $("#model"+data.id).html(html);
+                // console.log(html);
+                $("#model-two-"+data.id).html(html);
             })
 
             // for(var i in data){
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 84ad5ec..d8aba74 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -483,6 +483,10 @@
             function backfilldata(d){
                 data = d.query;
                 baobiaodata = d;
+                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.template("event","initial-event",data['events'][0]);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);
@@ -878,8 +882,8 @@
             
             // 返回
             $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
-                // X.gourl("dashboard");
-                return;
+                X.gourl("dashboard");
+                // return;
             });
 
             // 下载
diff --git a/web/srczip/logic/routeanalysis.js b/web/srczip/logic/routeanalysis.js
index ebb8f1b..3f3da56 100644
--- a/web/srczip/logic/routeanalysis.js
+++ b/web/srczip/logic/routeanalysis.js
@@ -473,6 +473,12 @@
                 });
             };
 
+            // 返回
+            $(document).off('click','.analysis-fanhui').on('click','.analysis-fanhui',function(){
+                X.gourl("dashboard");
+                // return;
+            });
+
         }
     };
 })();
\ No newline at end of file