diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index f9a0c66..4720eef 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -78,13 +78,13 @@
                     <div class="time-cond">
                         <span class="model-times" id="times{{d.id}}">{{d.date}}</span>
                         <div class="xian"></div>
-                        <span class="model-screenlist">按天</span>
+                        <span class="model-screenlist" data-cat="{{d.cat}}" data-id="{{d.id}}"  >按天</span>
                         {{#  if(d.cat === "retention"){ }}
                             <div class="xian"></div>
                             {{#  if(d.retentiontype === 0){ }}
-                                <span class="kanben-retained-type" id="retention{{d.id}}">留存</span>
+                                <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}">留存</span>
                             {{#  } else { }}
-                                <span class="kanben-retained-type" id="retention{{d.id}}">流失</span>
+                                <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}">流失</span>
                             {{#  } }} 
                         {{#  } }} 
                     </div>
@@ -212,9 +212,9 @@
                         {{#  if(d.cat === "retention"){ }}
                             <div class="xian"></div>
                             {{#  if(d.retentiontype === 0){ }}
-                                <span class="kanben-retained-type" id="retention{{d.id}}">留存</span>
+                                <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}">留存</span>
                             {{#  } else { }}
-                                <span class="kanben-retained-type" id="retention{{d.id}}">流失</span>
+                                <span class="kanben-retained-type" data-id="{{d.id}}" id="retention{{d.id}}">流失</span>
                             {{#  } }} 
                         {{#  } }} 
                     </div>
@@ -229,15 +229,19 @@
                     <div class="proportion">
                         <!-- <div class="proportion-data">较环比 <div class="sanjiao"></div><span>5.4%</span></div>
                         <div class="proportion-data">较同比 <div class="sanjiao"></div><span>5.4%</span></div> -->
-                        {{#  if(d.wowtyle == '-'){ }}
-                            <div class="proportion-data">较环比 <div class="sanjiao"></div><span>{{d.wow}}%</span></div>
-                        {{# } else { }}
-                            <div class="proportion-data">较环比 <div class="sanjiao fu"></div><span class="funum">{{d.wow}}%</span></div>
+                        {{#  if(d.wow != undefined){ }}
+                            {{#  if(d.wowtyle == '-'){ }}
+                                <div class="proportion-data">较环比 <div class="sanjiao"></div><span>{{d.wow}}%</span></div>
+                            {{# } else { }}
+                                <div class="proportion-data">较环比 <div class="sanjiao fu"></div><span class="funum">{{d.wow}}%</span></div>
+                            {{#  } }} 
                         {{#  } }} 
-                        {{#  if(d.chain_ratiotype == "+"){ }}
-                            <div class="proportion-data">较同比 <div class="sanjiao"></div><span>{{d.chain_ratio}}%</span></div>
-                        {{# } else { }}
-                            <div class="proportion-data">较同比 <div class="sanjiao fu"></div><span class="funum">{{d.chain_ratio}}%</span></div>
+                        {{#  if(d.chain_ratio != undefined){ }}
+                            {{#  if(d.chain_ratiotype == "+"){ }}
+                                <div class="proportion-data">较同比 <div class="sanjiao"></div><span>{{d.chain_ratio}}%</span></div>
+                            {{# } else { }}
+                                <div class="proportion-data">较同比 <div class="sanjiao fu"></div><span class="funum">{{d.chain_ratio}}%</span></div>
+                            {{#  } }} 
                         {{#  } }} 
                     </div>
                 </div>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index c4290c5..d6c901d 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -116,8 +116,8 @@ var X = window.X || {
 
 (function(){
 
-    var ipurl = "http://10.0.0.77:7889/api/v1/";
-    // var ipurl = "http://139.159.159.3:9865/api/v1/";
+    // var ipurl = "http://10.0.0.77:7889/api/v1/";
+    var ipurl = "http://139.159.159.3:9865/api/v1/";
 
     //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
     X.loginCache = function(data){
@@ -447,9 +447,9 @@ var X = window.X || {
     };
 
     //多选下拉框
-    X.select = function(){
+    // X.select = function(){
         
-    };
+    // };
 
     //多选标签-基本配置
     X.selectM = function(id,data,width,callback){
@@ -4034,22 +4034,62 @@ var X = window.X || {
                 });
             });
 
-            // $(document).off('click',".kanben-retained-type").on('click',".kanben-retained-type",function(d){
-            //     var obj = $(this);
-            //     var offset = obj.offset();
+            //留存分析模板特定留存流失按钮
+            $(document).off('click',".kanben-retained-type").on('click',".kanben-retained-type",function(d){
+                var obj = $(this);
+                var offset = obj.offset();
+                var id = obj.attr('data-id');
+                X.parametersopen(X['DATA']['retentionlist'],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
+                    var retentiontype = d.id;
+                    var modelid = "retention"+id;
+                    console.log(d);
+                    console.log(modelid);
+                    X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
+                        for(let i in val){
+                            if(val[i]['report_id'] == id){
+                                X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
+                            }
+                        }
+                    })
+                })
+            });
 
-            //     X.parametersopen(X['DATA']['retentionlist'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
-            //         var retentiontype = d.id;
-            //         var modelid = "retention"+eventdata.id;
-            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
-            //             for(let i in val){
-            //                 if(val[i]['report_id'] == eventdata.id){
-            //                     X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
-            //                 }
-            //             }
-            //         })
-            //     })
-            // })
+            $(document).off('click','.model-screenlist').on('click','.model-screenlist',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+
+                // var id = obj.attr('data-id');
+                // X.parametersopen(X['DATA']['screenlist'][eventdata.cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
+
+                //     var modelid = eventdata['cat']+eventdata.id;
+                //     var reportid = [];
+                //     reportid.push(eventdata.id);
+                //     X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
+                //         var query = {
+                //             eventView:val[0]['query']['eventView'],
+                //             events:val[0]['query']['events'],
+                //         };
+                //         query['eventView']['timeParticleSize'] = d.id;
+                //         X.api("ck/"+ eventdata.cat +"_model","post",query,function(val){
+                //             var bbsetdata = {
+                //                 graph_size:eventdata['modelsize'],
+                //                 graph_type:eventdata['modeltype'],
+                //                 model:eventdata['cat'],
+                //                 name:eventdata['name'],
+                //                 report_id:eventdata['id'],
+                //             }
+
+                //             var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val);
+                //             // console.log(modeldata);
+                //             //渲染模板和数据
+                //             X.template("modeltable",'model'+modeldata[0]['id'],modeldata[0],function(){
+                //                 X.pageLogic['dashboard'].morefeatures(modeldata);
+                //             });
+                //         })
+                //     })
+
+                // })
+            });
             
         },
 
@@ -4092,6 +4132,11 @@ var X = window.X || {
         modeldata:function(d,val,type){
             console.log('aaa',val);
             var eventdata = [];
+            var startTime =  d['query']['eventView']['startTime'];
+            var endTime =  d['query']['eventView']['endTime'];
+            var startTimearr = startTime.split(" ");
+            var endTimearr = endTime.split(" ");
+
             if(d['model'] == "event"){
                 // 事件分析
                 if(d['graph_size'] == 'small'){
@@ -4114,6 +4159,7 @@ var X = window.X || {
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
                     }else if(d['graph_type'] == 'echarts'){
@@ -4124,6 +4170,7 @@ var X = window.X || {
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
                     }
@@ -4146,6 +4193,7 @@ var X = window.X || {
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
 
@@ -4156,6 +4204,7 @@ var X = window.X || {
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
                     }
@@ -4169,6 +4218,7 @@ var X = window.X || {
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }else {
@@ -4178,6 +4228,7 @@ var X = window.X || {
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }
@@ -4190,6 +4241,7 @@ var X = window.X || {
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }else {
@@ -4199,6 +4251,7 @@ var X = window.X || {
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }
@@ -4239,26 +4292,26 @@ var X = window.X || {
                 
             });
             
-            // 留存分析模板特定留存流失按钮
-            var retentionlist = [
-                {'title':'留存','id':0},
-                {'title':'流失','id':1},
-            ]
-            if(eventdata.cat == 'retention'){
-                X.laydropdown("#retention"+eventdata.id,retentionlist,function(d){
+            //已废弃  留存分析模板特定留存流失按钮 
+            // var retentionlist = [
+            //     {'title':'留存','id':0},
+            //     {'title':'流失','id':1},
+            // ]
+            // if(eventdata.cat == 'retention'){
+            //     X.laydropdown("#retention"+eventdata.id,retentionlist,function(d){
 
-                    var retentiontype = d.id;
-                    var modelid = "retention"+eventdata.id;
-                    X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
-                        for(let i in val){
-                            if(val[i]['report_id'] == eventdata.id){
-                                X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
-                            }
-                        }
-                    })
+            //         var retentiontype = d.id;
+            //         var modelid = "retention"+eventdata.id;
+            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
+            //             for(let i in val){
+            //                 if(val[i]['report_id'] == eventdata.id){
+            //                     X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
+            //                 }
+            //             }
+            //         })
                     
-                })
-            };
+            //     })
+            // };
 
             //更多按钮配置下拉框
             X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 951d9b6..776edac 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -446,9 +446,9 @@ var X = window.X || {
     };
 
     //多选下拉框
-    X.select = function(){
+    // X.select = function(){
         
-    };
+    // };
 
     //多选标签-基本配置
     X.selectM = function(id,data,width,callback){
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 33512a7..d75b51c 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -326,22 +326,62 @@
                 });
             });
 
-            // $(document).off('click',".kanben-retained-type").on('click',".kanben-retained-type",function(d){
-            //     var obj = $(this);
-            //     var offset = obj.offset();
+            //留存分析模板特定留存流失按钮
+            $(document).off('click',".kanben-retained-type").on('click',".kanben-retained-type",function(d){
+                var obj = $(this);
+                var offset = obj.offset();
+                var id = obj.attr('data-id');
+                X.parametersopen(X['DATA']['retentionlist'],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
+                    var retentiontype = d.id;
+                    var modelid = "retention"+id;
+                    console.log(d);
+                    console.log(modelid);
+                    X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
+                        for(let i in val){
+                            if(val[i]['report_id'] == id){
+                                X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
+                            }
+                        }
+                    })
+                })
+            });
 
-            //     X.parametersopen(X['DATA']['retentionlist'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
-            //         var retentiontype = d.id;
-            //         var modelid = "retention"+eventdata.id;
-            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
-            //             for(let i in val){
-            //                 if(val[i]['report_id'] == eventdata.id){
-            //                     X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
-            //                 }
-            //             }
-            //         })
-            //     })
-            // })
+            $(document).off('click','.model-screenlist').on('click','.model-screenlist',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+
+                // var id = obj.attr('data-id');
+                // X.parametersopen(X['DATA']['screenlist'][eventdata.cat],'dropdownlist',[offset.top+obj.height(),offset.left],function(d){
+
+                //     var modelid = eventdata['cat']+eventdata.id;
+                //     var reportid = [];
+                //     reportid.push(eventdata.id);
+                //     X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:reportid},function(val){
+                //         var query = {
+                //             eventView:val[0]['query']['eventView'],
+                //             events:val[0]['query']['events'],
+                //         };
+                //         query['eventView']['timeParticleSize'] = d.id;
+                //         X.api("ck/"+ eventdata.cat +"_model","post",query,function(val){
+                //             var bbsetdata = {
+                //                 graph_size:eventdata['modelsize'],
+                //                 graph_type:eventdata['modeltype'],
+                //                 model:eventdata['cat'],
+                //                 name:eventdata['name'],
+                //                 report_id:eventdata['id'],
+                //             }
+
+                //             var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,val);
+                //             // console.log(modeldata);
+                //             //渲染模板和数据
+                //             X.template("modeltable",'model'+modeldata[0]['id'],modeldata[0],function(){
+                //                 X.pageLogic['dashboard'].morefeatures(modeldata);
+                //             });
+                //         })
+                //     })
+
+                // })
+            });
             
         },
 
@@ -384,6 +424,11 @@
         modeldata:function(d,val,type){
             console.log('aaa',val);
             var eventdata = [];
+            var startTime =  d['query']['eventView']['startTime'];
+            var endTime =  d['query']['eventView']['endTime'];
+            var startTimearr = startTime.split(" ");
+            var endTimearr = endTime.split(" ");
+
             if(d['model'] == "event"){
                 // 事件分析
                 if(d['graph_size'] == 'small'){
@@ -406,6 +451,7 @@
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
                     }else if(d['graph_type'] == 'echarts'){
@@ -416,6 +462,7 @@
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
                     }
@@ -438,6 +485,7 @@
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
 
@@ -448,6 +496,7 @@
                             data['id'] = d['report_id'];
                             data['modelsize'] = d['graph_size'];
                             data['cat'] = d['model'];
+                            data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                             eventdata.push(data);
                         })
                     }
@@ -461,6 +510,7 @@
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }else {
@@ -470,6 +520,7 @@
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }
@@ -482,6 +533,7 @@
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }else {
@@ -491,6 +543,7 @@
                         data['id'] = d['report_id'];
                         data['modelsize'] = d['graph_size'];
                         data['cat'] = d['model'];
+                        data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
                         eventdata.push(data);
                     })
                 }
@@ -531,26 +584,26 @@
                 
             });
             
-            // 留存分析模板特定留存流失按钮
-            var retentionlist = [
-                {'title':'留存','id':0},
-                {'title':'流失','id':1},
-            ]
-            if(eventdata.cat == 'retention'){
-                X.laydropdown("#retention"+eventdata.id,retentionlist,function(d){
+            //已废弃  留存分析模板特定留存流失按钮 
+            // var retentionlist = [
+            //     {'title':'留存','id':0},
+            //     {'title':'流失','id':1},
+            // ]
+            // if(eventdata.cat == 'retention'){
+            //     X.laydropdown("#retention"+eventdata.id,retentionlist,function(d){
 
-                    var retentiontype = d.id;
-                    var modelid = "retention"+eventdata.id;
-                    X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
-                        for(let i in val){
-                            if(val[i]['report_id'] == eventdata.id){
-                                X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
-                            }
-                        }
-                    })
+            //         var retentiontype = d.id;
+            //         var modelid = "retention"+eventdata.id;
+            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(val){
+            //             for(let i in val){
+            //                 if(val[i]['report_id'] == eventdata.id){
+            //                     X.pageLogic['dashboard'].fillmodeldata(val[i],modelid,retentiontype);
+            //                 }
+            //             }
+            //         })
                     
-                })
-            };
+            //     })
+            // };
 
             //更多按钮配置下拉框
             X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){