diff --git a/web/src/x.min.js b/web/src/x.min.js
index 46553a9..db08951 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -829,8 +829,13 @@ var X = window.X || {
         var legendnamearr = [];
         for(let i in data){
             legendnamearr.push(data[i]['event_name'])
-            for(let z in data[i]['groups']){
-                var pj =  data[i]['event_name']+data[i]['groups'][z];
+            if(data[i]['groups'].length > 0){
+                for(let z in data[i]['groups']){
+                    var pj =  data[i]['event_name']+data[i]['groups'][z];
+                    legenddata.push(pj);
+                }
+            }else {
+                var pj =  data[i]['event_name'];
                 legenddata.push(pj);
             }
         }
@@ -894,7 +899,7 @@ var X = window.X || {
                 chain_ratiotype = '-'
             }
         }
-        console.log(legendnamearr);
+        
         var dataArr = {
             xAxisData:data[0]['date_range'],
             legenddata:legenddata,
@@ -910,7 +915,7 @@ var X = window.X || {
             chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
             chain_ratiotype:chain_ratiotype
         }
-        
+        console.log(dataArr);
         callback && callback(dataArr);
     };
 
@@ -1059,19 +1064,26 @@ var X = window.X || {
             var arr = []
             for(let i in d['summary_values']){
                 var index = d['summary_values'][i][pname].length - 1;
-                arr.push(d['summary_values'][i][pname][index]);
-                xAxisData.push(i);
-            }
-
-            seriesData = {
-                type: 'line',
-                data: arr
+                legenddata.push(i);
+                arr.push(d['summary_values'][i][pname]);
             }
+            d.title.splice(0,1);
+            xAxisData = d.title;
             for(let i in arr){
-                sum = sum + arr[i];
-                sameday = arr[i];
+                var drr = {
+                    name: d.date_range[i],
+                    type: 'line',
+                    data: arr[i]
+                }
+                seriesData.push(drr);
             }
-            mean = (sum / arr.length).toFixed(2);
+            // for(let i in arr){
+            //     if(arr[i] != "-"){
+            //         sum = sum + 0;
+            //     }
+            //     sameday = arr[i];
+            // }
+            // mean = (sum / arr.length).toFixed(2);
             
         }else {
             var timearr = [];
@@ -1128,20 +1140,31 @@ var X = window.X || {
                 chain_ratiotype = '-'
             }
         }
+
+        var selected = {};//线多的话默认显示5条
+        if(legenddata.length > 5){
+            for(let i in legenddata){
+                if(i < 5){
+                    selected[legenddata[i]] = true;
+                }else {
+                    selected[legenddata[i]] = false;
+                }
+            }
+        }
         
         var dataArr = {
             xAxisData:xAxisData,
             legenddata:legenddata,
             seriesData:seriesData,
+            selected:selected,
             date:date,
             sum:sum.toFixed(2),
             mean:mean,
-            sameday: sameday,
+            sameday: 0,
             wowtype:wowtype,
             chain_ratiotype:chain_ratiotype,
             retentiontype:d.retentiontype
         }
-        // console.log(dataArr);
         callback && callback(dataArr);
     };
 
@@ -3608,7 +3631,7 @@ var X = window.X || {
                 data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
                 baobiaodata = d;
                
-                if(d.query.eventView.filts.length > 0){
+                if(d.query.events.length > 0){
                     $(".analysis-overall").show();
                 }else {
                     $(".analysis-overall").hide();
@@ -6587,7 +6610,7 @@ var X = window.X || {
                             //数据根据时间降序排列
                             if(d['ascending']){
                                 // console.log()
-                                console.log(eventdata);
+                                // console.log(eventdata);
                                 var condatalength =  eventdata[0]['condata'].length;
                                 var condataascend=[];
                                 for(var i = condatalength - 1; i >= 0; i--){
@@ -6886,6 +6909,7 @@ var X = window.X || {
                 var myChart = echarts.init(document.getElementById(eventdata['id']));
                 if(eventdata['cat'] == 'user_property'){
                     var option = {
+                        color: X.DATA.echartscolor,
                         tooltip: {
                             trigger: 'axis',
                             axisPointer: {
@@ -9894,9 +9918,9 @@ var X = window.X || {
             var userarr;
             var adduadaserarr;
 
-            var userinfo = X.DATA.userinfo;
-            $(".gly-firs").html(userinfo.name.substring(0,1));
-            $(".gly-name").html(userinfo.name);
+            // var userinfo = X.DATA.userinfo;
+            // $(".gly-firs").html(userinfo.name.substring(0,1));
+            // $(".gly-name").html(userinfo.name);
 
             if(id){
                 $(".editkongjian").show();
@@ -9913,6 +9937,10 @@ var X = window.X || {
                             d[i]["firs"] = d[i]['name'].substring(0,1);
                             d[i]["authority"] = "r";
                             d[i]['user_id'] = d[i]['_id']
+                            if(d[i].is_superuser){
+                                $(".gly-firs").html(d[i].name.substring(0,1));
+                                $(".gly-name").html(d[i].name);
+                            }
                         }
                         for(let i in adduadaserarr){
                             for(let j in d){
@@ -10554,7 +10582,7 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
-            console.log(data);
+            // console.log(data);
             X.laytpldata("#kanban-model-modify-type-dot",data,"model"+data.id,function(html){
                 // console.log(html);
                 $("#model-two-"+data.id).html(html);
@@ -12098,13 +12126,21 @@ var X = window.X || {
                 var arr = []
                 for(let i in d['summary_values']){
                     var index = d['summary_values'][i][pname].length - 1;
-                    arr.push(d['summary_values'][i][pname][index]);
+                    legenddata.push(i);
+                    arr.push(d['summary_values'][i][pname]);
+                }
+                d.title.splice(0,1);
+                xAxisData = d.title;
+                
+                for(let i in arr){
+                    var drr = {
+                        name: d.date_range[i],
+                        type: 'line',
+                        data: arr[i]
+                    }
+                    seriesData.push(drr);
                 }
 
-                seriesData = {
-                    type: 'line',
-                    data: arr
-                }
                }else {
                 var timearr = [];
                 for(let i in d.values){
@@ -12144,6 +12180,16 @@ var X = window.X || {
                 } 
 
                }
+                var selected = {};//线多的话默认显示5条
+                if(legenddata.length > 5){
+                    for(let i in legenddata){
+                        if(i < 5){
+                            selected[legenddata[i]] = true;
+                        }else {
+                            selected[legenddata[i]] = false;
+                        }
+                    }
+                }
 
                 var myChart = echarts.init(document.getElementById('analysis-echarts'));
                 var option = {
@@ -12162,7 +12208,8 @@ var X = window.X || {
                     },
                     legend: {
                         type:'scroll',
-                        data: legenddata
+                        data: legenddata,
+                        selected:selected
                     },
                     grid: {
                         left: '2%',
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 81f5ff6..05fd827 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -828,8 +828,13 @@ var X = window.X || {
         var legendnamearr = [];
         for(let i in data){
             legendnamearr.push(data[i]['event_name'])
-            for(let z in data[i]['groups']){
-                var pj =  data[i]['event_name']+data[i]['groups'][z];
+            if(data[i]['groups'].length > 0){
+                for(let z in data[i]['groups']){
+                    var pj =  data[i]['event_name']+data[i]['groups'][z];
+                    legenddata.push(pj);
+                }
+            }else {
+                var pj =  data[i]['event_name'];
                 legenddata.push(pj);
             }
         }
@@ -893,7 +898,7 @@ var X = window.X || {
                 chain_ratiotype = '-'
             }
         }
-        console.log(legendnamearr);
+        
         var dataArr = {
             xAxisData:data[0]['date_range'],
             legenddata:legenddata,
@@ -909,7 +914,7 @@ var X = window.X || {
             chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
             chain_ratiotype:chain_ratiotype
         }
-        
+        console.log(dataArr);
         callback && callback(dataArr);
     };
 
@@ -1058,19 +1063,26 @@ var X = window.X || {
             var arr = []
             for(let i in d['summary_values']){
                 var index = d['summary_values'][i][pname].length - 1;
-                arr.push(d['summary_values'][i][pname][index]);
-                xAxisData.push(i);
-            }
-
-            seriesData = {
-                type: 'line',
-                data: arr
+                legenddata.push(i);
+                arr.push(d['summary_values'][i][pname]);
             }
+            d.title.splice(0,1);
+            xAxisData = d.title;
             for(let i in arr){
-                sum = sum + arr[i];
-                sameday = arr[i];
+                var drr = {
+                    name: d.date_range[i],
+                    type: 'line',
+                    data: arr[i]
+                }
+                seriesData.push(drr);
             }
-            mean = (sum / arr.length).toFixed(2);
+            // for(let i in arr){
+            //     if(arr[i] != "-"){
+            //         sum = sum + 0;
+            //     }
+            //     sameday = arr[i];
+            // }
+            // mean = (sum / arr.length).toFixed(2);
             
         }else {
             var timearr = [];
@@ -1127,20 +1139,31 @@ var X = window.X || {
                 chain_ratiotype = '-'
             }
         }
+
+        var selected = {};//线多的话默认显示5条
+        if(legenddata.length > 5){
+            for(let i in legenddata){
+                if(i < 5){
+                    selected[legenddata[i]] = true;
+                }else {
+                    selected[legenddata[i]] = false;
+                }
+            }
+        }
         
         var dataArr = {
             xAxisData:xAxisData,
             legenddata:legenddata,
             seriesData:seriesData,
+            selected:selected,
             date:date,
             sum:sum.toFixed(2),
             mean:mean,
-            sameday: sameday,
+            sameday: 0,
             wowtype:wowtype,
             chain_ratiotype:chain_ratiotype,
             retentiontype:d.retentiontype
         }
-        // console.log(dataArr);
         callback && callback(dataArr);
     };
 
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 525c563..2d57e89 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -164,7 +164,7 @@
                 data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
                 baobiaodata = d;
                
-                if(d.query.eventView.filts.length > 0){
+                if(d.query.events.length > 0){
                     $(".analysis-overall").show();
                 }else {
                     $(".analysis-overall").hide();
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 69bab27..0500bca 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -886,7 +886,7 @@
                             //数据根据时间降序排列
                             if(d['ascending']){
                                 // console.log()
-                                console.log(eventdata);
+                                // console.log(eventdata);
                                 var condatalength =  eventdata[0]['condata'].length;
                                 var condataascend=[];
                                 for(var i = condatalength - 1; i >= 0; i--){
@@ -1185,6 +1185,7 @@
                 var myChart = echarts.init(document.getElementById(eventdata['id']));
                 if(eventdata['cat'] == 'user_property'){
                     var option = {
+                        color: X.DATA.echartscolor,
                         tooltip: {
                             trigger: 'axis',
                             axisPointer: {
diff --git a/web/srczip/logic/kongjianshezhi.js b/web/srczip/logic/kongjianshezhi.js
index 67a9ebf..95e9c6f 100644
--- a/web/srczip/logic/kongjianshezhi.js
+++ b/web/srczip/logic/kongjianshezhi.js
@@ -16,9 +16,9 @@
             var userarr;
             var adduadaserarr;
 
-            var userinfo = X.DATA.userinfo;
-            $(".gly-firs").html(userinfo.name.substring(0,1));
-            $(".gly-name").html(userinfo.name);
+            // var userinfo = X.DATA.userinfo;
+            // $(".gly-firs").html(userinfo.name.substring(0,1));
+            // $(".gly-name").html(userinfo.name);
 
             if(id){
                 $(".editkongjian").show();
@@ -35,6 +35,10 @@
                             d[i]["firs"] = d[i]['name'].substring(0,1);
                             d[i]["authority"] = "r";
                             d[i]['user_id'] = d[i]['_id']
+                            if(d[i].is_superuser){
+                                $(".gly-firs").html(d[i].name.substring(0,1));
+                                $(".gly-name").html(d[i].name);
+                            }
                         }
                         for(let i in adduadaserarr){
                             for(let j in d){
diff --git a/web/srczip/logic/modeltype.js b/web/srczip/logic/modeltype.js
index ffd3e77..9ea2a0d 100644
--- a/web/srczip/logic/modeltype.js
+++ b/web/srczip/logic/modeltype.js
@@ -5,7 +5,7 @@
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
-            console.log(data);
+            // console.log(data);
             X.laytpldata("#kanban-model-modify-type-dot",data,"model"+data.id,function(html){
                 // console.log(html);
                 $("#model-two-"+data.id).html(html);
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 682156e..f7dca18 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -817,13 +817,21 @@
                 var arr = []
                 for(let i in d['summary_values']){
                     var index = d['summary_values'][i][pname].length - 1;
-                    arr.push(d['summary_values'][i][pname][index]);
+                    legenddata.push(i);
+                    arr.push(d['summary_values'][i][pname]);
+                }
+                d.title.splice(0,1);
+                xAxisData = d.title;
+                
+                for(let i in arr){
+                    var drr = {
+                        name: d.date_range[i],
+                        type: 'line',
+                        data: arr[i]
+                    }
+                    seriesData.push(drr);
                 }
 
-                seriesData = {
-                    type: 'line',
-                    data: arr
-                }
                }else {
                 var timearr = [];
                 for(let i in d.values){
@@ -863,6 +871,16 @@
                 } 
 
                }
+                var selected = {};//线多的话默认显示5条
+                if(legenddata.length > 5){
+                    for(let i in legenddata){
+                        if(i < 5){
+                            selected[legenddata[i]] = true;
+                        }else {
+                            selected[legenddata[i]] = false;
+                        }
+                    }
+                }
 
                 var myChart = echarts.init(document.getElementById('analysis-echarts'));
                 var option = {
@@ -881,7 +899,8 @@
                     },
                     legend: {
                         type:'scroll',
-                        data: legenddata
+                        data: legenddata,
+                        selected:selected
                     },
                     grid: {
                         left: '2%',
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 30fedc5..a5ebf13 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -16,7 +16,7 @@
 .modify-layui-footer { left: 270px !important; }
 .modify-layui-header { background-color: #475285; }
 .layui-nav { background: none; }
-.layui-form-select dl { max-height: 225px !important; }
+.layui-form-select dl { max-height: 88px !important; }
 .layui-table-body { height: 660px !important; }
 .layui-form-item .layui-form-checkbox[lay-skin=primary] { text-indent: 0px !important; }
 .layui-anim-downbit { max-height: 350px; overflow-y: auto; overflow-x: hidden; }