From cedd21f88fc71ce11c7747b6728f49aaeb384b5a Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Mon, 1 Aug 2022 11:48:41 +0800
Subject: [PATCH] 1

---
 web/pages/globalfilter.html             |   2 +-
 web/pages/grouptable.html               |  20 ++
 web/pages/retained.html                 |   7 +-
 web/pages/userlabel_dy.html             | 129 +++++--
 web/src/x.min.js                        | 447 ++++++++++++++++--------
 web/srczip/common.js                    |   5 +-
 web/srczip/logic/distribution.js        |   4 +-
 web/srczip/logic/funnelanalysis.js      |  48 ++-
 web/srczip/logic/grouptable.js          | 108 ++++--
 web/srczip/logic/retained.js            | 129 +++----
 web/srczip/logic/routeanalysis.js       |  40 ++-
 web/srczip/logic/userlabel_dy.js        | 113 +++++-
 web/static/css/analysis.css             |   2 +-
 web/static/css/style.css                |   3 +-
 web/static/img/iconfont/demo_index.html |  29 +-
 web/static/img/iconfont/iconfont.css    |  10 +-
 web/static/img/iconfont/iconfont.js     |   2 +-
 web/static/img/iconfont/iconfont.json   |   7 +
 web/static/img/iconfont/iconfont.ttf    | Bin 4704 -> 4944 bytes
 web/static/img/iconfont/iconfont.woff   | Bin 3136 -> 3288 bytes
 web/static/img/iconfont/iconfont.woff2  | Bin 2544 -> 2652 bytes
 21 files changed, 774 insertions(+), 331 deletions(-)

diff --git a/web/pages/globalfilter.html b/web/pages/globalfilter.html
index 1194284..eba5590 100644
--- a/web/pages/globalfilter.html
+++ b/web/pages/globalfilter.html
@@ -6,7 +6,7 @@
             <div class="analysis-overall-situation-fuhao" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
             {{#  if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
                 {{#  if(item.data_type != "datetime" && item.data_type != "user_label"){ }}
-                    <div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}"> 
+                    <div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}" data-comparator="{{item.comparator}}"> 
                         <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}"/> 
                     </div>
                 {{# } else if(item.data_type == "user_label"){ }}
diff --git a/web/pages/grouptable.html b/web/pages/grouptable.html
index 93df18e..1655342 100644
--- a/web/pages/grouptable.html
+++ b/web/pages/grouptable.html
@@ -45,4 +45,24 @@
         {{#  }); }}
     </tr>
     {{#  }); }}
+</script>
+
+<script id="table-fenxi-retained-td-group-dot" type="text/html">
+    {{#  layui.each(d, function(index, item){ }}
+
+    <tr >
+        <td>{{item.date}}</td>
+        <td>{{item.d0}}</td>
+        {{#  layui.each(item.data, function(indexs, items){ }}
+        <td>
+            <!-- <p>{{items.n}}</p> -->
+            {{#  if(items.p == '-'){ }}
+                <p>{{items.p}}</p>
+            {{# } else { }}
+                <p>{{items.p}}%</p>
+            {{#  } }} 
+        </td>
+        {{#  }); }}
+    </tr>
+    {{#  }); }}
 </script>
\ No newline at end of file
diff --git a/web/pages/retained.html b/web/pages/retained.html
index cbbfcd4..c5bccef 100644
--- a/web/pages/retained.html
+++ b/web/pages/retained.html
@@ -205,7 +205,12 @@
 <script id="table-fenxi-td-dot" type="text/html">
     {{#  layui.each(d, function(index, item){ }}
     <tr >
-        <td>{{item.date}}</td>
+        {{#  if(item.date == "均值"){ }}
+            <td>{{item.date}}</td>
+        {{#  } else { }}
+            <td>{{item.date}} <img src="./static/img/jia1.png" class="table-info-list-box" data-time="{{item.date}}"> </td>
+        {{#  } }} 
+        
         <td>{{item.d0}}</td>
         {{#  layui.each(item.data, function(indexs, items){ }}
         <td>
diff --git a/web/pages/userlabel_dy.html b/web/pages/userlabel_dy.html
index 9fd1358..0bc8d59 100644
--- a/web/pages/userlabel_dy.html
+++ b/web/pages/userlabel_dy.html
@@ -92,7 +92,7 @@
                     {{#  if(d.events.length > 1){ }}
                     <div class="userlabel-json-relation-relation">
                         <em class="userlabel-json-relation-relation-line"></em>
-                        <div class="userlabel-json-relation-relation-value">且</div>
+                        <div class="userlabel-json-relation-relation-value" data-type="event">且</div>
                     </div>
                     {{#  } }}
                     <div class="userlabel-json-relation-main">
@@ -106,20 +106,27 @@
                                             <div class="ant-dropdown-trigger2 ta-event-select my-event-data" data-index="{{index}}">
                                                 <span class="ta-event-select-label">{{item.eventDesc}}</span>
                                             </div>
-                                            <span class="ta-bold">，在</span>
-                                            {{#  if(item.e_days == 0){ }}
-                                                <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
-                                                    过去{{item.s_days}}天
-                                                </span>
-                                            {{#  } else { }}
-                                                <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
-                                                    过去{{item.s_days}}天-过去{{item.e_days}}天
-                                                </span>
+
+                                            {{#  if(item.is_time){ }}
+                                                <span class="ta-bold">，在</span>
+                                                {{#  if(item.e_days == 0){ }}
+                                                    <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
+                                                        过去{{item.s_days}}天
+                                                    </span>
+                                                {{#  } else { }}
+                                                    <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
+                                                        过去{{item.s_days}}天-过去{{item.e_days}}天
+                                                    </span>
+                                                {{#  } }}
                                             {{#  } }}
+                                            
 
                                         </div>
                                     </div>
                                     <div class="userlabel-json-action-right">
+                                        <div class="action-icon action-normal action-md action-action action-icon-time" data-index="{{index}}">
+                                            <i class="iconfont" style="font-size: 22px; margin-right: 4px;">&#xe8b8;</i>
+                                        </div>
                                         <div class="action-icon action-normal action-md action-action action-icon-shax">
                                             <i class="iconfont" style="font-size: 22px; margin-right: 4px;">&#xe683;</i>
                                         </div>
@@ -151,21 +158,26 @@
                                                 <span class="ta-event-select-label">{{item.uce_calcu_symbolDesc}}</span>
                                             </div>
                                             <div class="ant-input-number tant-input-number lable-input-box">
-                                                <input  style="width: 160px;" type="text" placeholder="多个用英文逗号隔开" data-index="{{index}}" value="{{item.num}}"/>
+                                                <input  style="width: 160px;" type="text" placeholder="区间多个用英文逗号隔开" data-index="{{index}}" value="{{item.num}}"/>
                                             </div>
-                                            <span class="ta-bold">，在</span>
-                                            {{#  if(item.e_days == 0){ }}
-                                                <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
-                                                    过去{{item.s_days}}天
-                                                </span>
-                                            {{#  } else { }}
-                                                <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
-                                                    过去{{item.s_days}}天-过去{{item.e_days}}天
-                                                </span>
+                                            {{#  if(item.is_time){ }}
+                                                <span class="ta-bold">，在</span>
+                                                {{#  if(item.e_days == 0){ }}
+                                                    <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
+                                                        过去{{item.s_days}}天
+                                                    </span>
+                                                {{#  } else { }}
+                                                    <span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
+                                                        过去{{item.s_days}}天-过去{{item.e_days}}天
+                                                    </span>
+                                                {{#  } }}
                                             {{#  } }}
                                         </div>
                                     </div>
                                     <div class="userlabel-json-action-right">
+                                        <div class="action-icon action-normal action-md action-action action-icon-time" data-index="{{index}}">
+                                            <i class="iconfont" style="font-size: 22px; margin-right: 4px;">&#xe8b8;</i>
+                                        </div>
                                         <div class="action-icon action-normal action-md action-action action-icon-shax action-icon-events-shax" data-index="{{index}}">
                                             <i class="iconfont" style="font-size: 22px; margin-right: 4px;">&#xe683;</i>
                                         </div>
@@ -188,37 +200,78 @@
                     {{#  if(d.filts.length > 1){ }}
                     <div class="userlabel-json-relation-relation">
                         <em class="userlabel-json-relation-relation-line"></em>
-                        <div class="userlabel-json-relation-relation-value">且</div>
+                        <div class="userlabel-json-relation-relation-value" data-type="userattr">且</div>
                     </div>
                     {{#  } }}
                     <div class="userlabel-json-relation-main">
                         <div class="userlabel-json-relation-row">
                             <div class="ta-multa-filter-condition">
                                 {{# layui.each(d.filts, function(index, item) {  }}
-                                <div class="userlabel-json-action-row">
-                                    <div class="userlabel-json-action-left">
-                                        <div class="ta-filter-condition">
-                                            <span class="ta-property">用户属性</span>
-                                            <div class="ant-dropdown-trigger2 ta-property-select">
-                                                <span class="ta-property-select-label">账户ID</span>
+                                    <div class="userlabel-json-action-row">
+                                        <div class="userlabel-json-action-left">
+                                            <div class="ta-filter-condition">
+                                                <span class="ta-property">用户属性</span>
+                                                <div class="ant-dropdown-trigger2 ta-property-select user-attribute" data-index="{{index}}">
+                                                    <span class="ta-property-select-label">{{item.columnDesc}}</span>
+                                                </div>
+                                                <div class="ant-dropdown-trigger2 ta-property-select user-attribute-filter" data-index="{{index}}">
+                                                    <span class="ta-property-select-label">{{item.comparator_name}}</span>
+                                                </div>
+                                                <div class="ta-equal-search taDragDisable" data-index="{{index}}">
+                                                    <input type="text" value="{{item.strftv}}"/>
+                                                </div>
                                             </div>
-                                            <div class="ant-dropdown-trigger2 ta-property-select">
-                                                <span class="ta-property-select-label">等于</span>
+                                        </div>
+                                        <div class="userlabel-json-action-right">
+                                            <div class="action-icon action-normal action-md action-action action-icon-shax userattrfilts" data-type="userattr" data-index="{{index}}">
+                                                <i class="iconfont" style="font-size: 22px; margin-right: 4px;">&#xe683;</i>
                                             </div>
-                                            <div class="ta-equal-search taDragDisable">
-                                                <input type="text"/>
+                                            <div class="action-icon action-normal action-md action-action action-icon-del">
+                                                <i class="iconfont" style="font-size: 18px; margin-right: 4px;">&#xe611;</i>
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="userlabel-json-action-right">
-                                        <div class="action-icon action-normal action-md action-action action-icon-shax">
-                                            <i class="iconfont" style="font-size: 22px; margin-right: 4px;">&#xe683;</i>
-                                        </div>
-                                        <div class="action-icon action-normal action-md action-action action-icon-del">
-                                            <i class="iconfont" style="font-size: 18px; margin-right: 4px;">&#xe611;</i>
+
+                                    <div class="userlabel-json-relation-row" style="margin-top: 8px;">
+                                        <div class="userlabel-json-relation-editor">
+                                            {{#  if(item.filts.length > 1){ }}
+                                            <div class="userlabel-json-relation-relation">
+                                                <em class="userlabel-json-relation-relation-line"></em>
+                                                <div class="userlabel-json-relation-relation-value" data-type="userattr" data-index="{{index}}" data-indexs="{{indexs}}">且</div>
+                                            </div>
+                                            {{#  } }}
+                                            <div class="userlabel-json-relation-main">
+                                                <div class="userlabel-json-relation-row">
+                                                    <div class="ta-multa-filter-condition">
+                                                        {{# layui.each(item.filts, function(indexs, items) {  }}
+                                                        <div class="userlabel-json-action-row">
+                                                            <div class="userlabel-json-action-left">
+                                                                <div class="ta-filter-condition">
+                                                                    <span class="ta-property">用户属性</span>
+                                                                    <div class="ant-dropdown-trigger2 ta-property-select user-attribute" data-index="{{index}}" data-indexs="{{indexs}}">
+                                                                        <span class="ta-property-select-label">{{items.columnDesc}}</span>
+                                                                    </div>
+                                                                    <div class="ant-dropdown-trigger2 ta-property-select user-attribute-filter" data-index="{{index}}" data-indexs="{{indexs}}">
+                                                                        <span class="ta-property-select-label">{{items.comparator_name}}</span>
+                                                                    </div>
+                                                                    <div class="ta-equal-search taDragDisable" data-index="{{index}}" data-indexs="{{indexs}}">
+                                                                        <input type="text" value="{{items.strftv}}"/>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                            <div class="userlabel-json-action-right">
+                                                                <div class="action-icon action-normal action-md action-action action-icon-del" data-index="{{index}}" data-indexs="{{indexs}}">
+                                                                    <i class="iconfont" style="font-size: 18px; margin-right: 4px;">&#xe611;</i>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                        {{#  }); }}
+                                                    </div>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
+
                                 {{#  }); }}
                             </div>
                         </div>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 5b0a1b5..e27e0dd 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -138,11 +138,11 @@ var X = window.X || {
 
 (function(){
     //本地李伟
-    //  var ipurl = "http://10.0.0.240:7899/api/v1/";
+     var ipurl = "http://10.0.0.240:7899/api/v1/";
      //本地李宗振
     //  var ipurl = "http://10.0.0.94:7899/api/v1/";
     // 线上  
-    var ipurl = "http://139.159.159.3:9865/api/v1/";
+    // var ipurl = "http://139.159.159.3:9865/api/v1/";
     //线上测试
     // var ipurl = "http://139.159.159.3:7889/api/v1/";
 
@@ -211,6 +211,7 @@ var X = window.X || {
                         X.gourl("login");
                         location.reload();
                     }else if(d.code == -9){
+                        //无数据时
                         layer.msg(d.msg);
                     }else {
                         layer.msg(d.msg);
@@ -9061,9 +9062,7 @@ var X = window.X || {
                     time:time
                 }
 
-                X.parametersopen(dataArr,'grouptable','auto',function(){
-
-                })
+                X.parametersopen(dataArr,'grouptable','auto')
             
             });
 
@@ -9725,11 +9724,11 @@ var X = window.X || {
                     "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
                     'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":groupitemeventsdata[0]['id']
+                    "tableType":groupitemeventsdata[0]['id']
                 };
                 data['eventView']['filts'].push(drr);
                 if(data['eventView']['filts'].length > 1){
@@ -9766,8 +9765,8 @@ var X = window.X || {
                     data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
-                    data['eventView']['filts'][index]['comparator_id'] = '==';
-                    data['eventView']['filts'][index]['table_type'] = val.table_type;
+                    data['eventView']['filts'][index]['comparator'] = '==';
+                    data['eventView']['filts'][index]['tableType'] = val.table_type;
                     X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
                         renderdate();
                     });
@@ -9783,7 +9782,7 @@ var X = window.X || {
                 X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     $(this).html(val.title);
                     data['eventView']['filts'][index]['comparator_name'] = val.title;
-                    data['eventView']['filts'][index]['comparator_id'] = val.id;
+                    data['eventView']['filts'][index]['comparator'] = val.id;
                     if(val.id == "range"){
                         data['eventView']['filts'][index]['ftv'] = [-1,1];
                     }
@@ -9817,6 +9816,40 @@ var X = window.X || {
                 });
             };
 
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var comparator = obj.attr("data-comparator");
+                var columnName = data['eventView']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            if(comparator == "in"){
+                                if(data['eventView']['filts'][index]['strftv'] == "" ){
+                                    var strftv = val.title;
+                                    data['eventView']['filts'][index]['ftv'].push(val.id);
+                                }else {
+                                    var strftv = data['eventView']['filts'][index]['strftv'] + "," + val.title;
+                                    data['eventView']['filts'][index]['ftv'].push(val.id);
+                                }
+                                data['eventView']['filts'][index]['strftv'] = strftv;
+                            }else {
+                                data['eventView']['filts'][index]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['eventView']['filts'][index]['ftv'] = arr; 
+                            }
+                            
+                            X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");
@@ -9854,7 +9887,7 @@ var X = window.X || {
                     "columnDesc": "#account_id",//事件中文显示
                     "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
-                    'table_type': "event",
+                    'tableType': "event",
                     "ftv":"",//条件
                     "section":''//区间
                 };
@@ -9873,7 +9906,7 @@ var X = window.X || {
                     data.eventView.groupBy[index]['columnDesc'] = val.title;
                     data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
-                    data.eventView.groupBy[index]['table_type'] = val.table_type;
+                    data.eventView.groupBy[index]['tableType'] = val.table_type;
                 })
             });
 
@@ -10403,45 +10436,85 @@ var X = window.X || {
             var me = this;
             this.parms = parms;
             this.callback = parms.callback;
-            var data = parms.extData;
-            if(data.eventView.timeParticleSize != "P1M" && data.eventView.timeParticleSize != "total" && data.eventView.timeParticleSize != "P1W"){
-                data['eventView']['endTime'] = data.time+" 23:59:59";
-                data['eventView']['startTime'] = data.time+" 00:00:00";
+            var dataArr = parms.extData;
+            
+            if(dataArr.eventView.timeParticleSize != "P1M" && dataArr.eventView.timeParticleSize != "total" && dataArr.eventView.timeParticleSize != "P1W"){
+                dataArr['eventView']['endTime'] = dataArr.time+" 23:59:59";
+                dataArr['eventView']['startTime'] = dataArr.time+" 00:00:00";
             }
             
-            X.api("ck/scatter_model_details","post",data,function(d){
-                d['tabletitle'] = $.extend(true,[],d['label']);
-                d['tabletitle'].unshift(d.biaotou,'全部用户');
-                var contnetdata =[];
-                for(let i in d.list){
-                    var arrdata= [];
-                    for(let j in d.list[i]['n']){
-                        var n = d.list[i]['n'][j];
-                        var p = d.list[i]['p'][j];
-                        var arr = {
-                            n: n,
-                            p: p
-                        }
-                        arrdata.push(arr);
-                    }
-                    var drr = {
-                        total : d.list[i]['total'],
-                        first: i,
-                        data: arrdata
-                    }
-                    contnetdata.push(drr);
+            if(dataArr.type == "retained"){
+                var nname,pname
+                if(dataArr.retentiontype == 0) {
+                    nname = 'n';
+                    pname = 'p';
+                }else {
+                    nname = 'n_outflow';
+                    pname = 'p_outflow';
                 }
-                // console.log(contnetdata);
-                $('.grouptable-title-box span').html(d.start_date);
-                X.laytpldata("#table-fenxi-th-group-dot",d.tabletitle,".table-fenxi-group-th");
-                X.laytpldata("#table-fenxi-td-group-dot",contnetdata,".table-fenxi-group-td");
 
-            });
+                X.api("ck/retention_model_details","post",dataArr,function(d){
+                    var tabledata=[];
+                    for(let i in d['summary_values']){
+                        var arr = {
+                            date: i,
+                            d0:d['summary_values'][i]['d0'],
+                            data:[]
+                        }
+                        for(let j in d['summary_values'][i]["n"]){
+                            var nrr = {
+                                n:0,
+                                p:0
+                            }
+                            nrr["n"] = d['summary_values'][i][nname][j];
+                            nrr["p"] = d['summary_values'][i][pname][j]
+                            arr['data'].push(nrr);
+                        }
+                        tabledata.push(arr)
+                    }
+                    $('.grouptable-title-box span').html(d.start_date);
+                    X.laytpldata("#table-fenxi-th-group-dot",d.title,".table-fenxi-group-th");
+                    X.laytpldata("#table-fenxi-retained-td-group-dot",tabledata,".table-fenxi-group-td");
+    
+                });
+            }else {
+                
+                X.api("ck/scatter_model_details","post",dataArr,function(d){
+                    d['tabletitle'] = $.extend(true,[],d['label']);
+                    d['tabletitle'].unshift(d.biaotou,'全部用户');
+                    var contnetdata =[];
+                    for(let i in d.list){
+                        var arrdata= [];
+                        for(let j in d.list[i]['n']){
+                            var n = d.list[i]['n'][j];
+                            var p = d.list[i]['p'][j];
+                            var arr = {
+                                n: n,
+                                p: p
+                            }
+                            arrdata.push(arr);
+                        }
+                        var drr = {
+                            total : d.list[i]['total'],
+                            first: i,
+                            data: arrdata
+                        }
+                        contnetdata.push(drr);
+                    }
+                    // console.log(contnetdata);
+                    $('.grouptable-title-box span').html(d.start_date);
+                    X.laytpldata("#table-fenxi-th-group-dot",d.tabletitle,".table-fenxi-group-th");
+                    X.laytpldata("#table-fenxi-td-group-dot",contnetdata,".table-fenxi-group-td");
+    
+                });
+    
+                $(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
+                    dataArr.eventView['download'] = 1;
+                    X.download("ck/scatter_model_details",dataArr,'分布分析')
+                })
+            }
 
-            $(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
-                data.eventView['download'] = 1;
-                X.download("ck/scatter_model_details",data,'分布分析')
-            })
+            
            
 
         }
@@ -12412,14 +12485,9 @@ var X = window.X || {
                 var startmonth = Date.parse(startdate)/1000;
                 data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
                 data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
-                retaineddata();
+                // retaineddata();
             });
 
-            var time = $("#retained-condition-date").val();
-            var timearr = time.split(" ");
-            data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
-            data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
-
             var eventdata;
             var groupitemeventsdata;//分组项里的事件
             var querydata; //计算后返回的数据
@@ -12453,7 +12521,6 @@ var X = window.X || {
                     X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
                         groupitemeventsdata = val;
                         //初始事件
-                        // console.log(data['events'][0]);
                         X.template("event","initial-event",data['events'][0]);
                         X.template("returnvisitevent","returnvisit-event",data['events'][1]);
 
@@ -12491,7 +12558,6 @@ var X = window.X || {
                 if(type2data.length >0){
                     X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                         // if(val != undefined){
-                            console.log(val);
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
                             data['events'][index]['event_attr'] = val.title;
                             data['events'][index]['event_attr_id'] = val.id;
@@ -12539,7 +12605,6 @@ var X = window.X || {
                     "ftv":[],
                     "strftv":"",
                     "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
-                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
                 // initialevent.push(arr);
@@ -12557,7 +12622,6 @@ var X = window.X || {
                     "ftv":[],
                     "strftv":"",
                     "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
-                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
                 // data['events'][1]['filts'].push(arr);
@@ -12594,12 +12658,10 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var dataevent= data['events'][index];
-                // console.log(dataevent);
                 X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.id);
                     dataevent['eventName'] = val.name;
                     dataevent['eventDesc'] = val.id;
-                    // console.log(data['events']);
 
                 })
             });
@@ -12634,7 +12696,6 @@ var X = window.X || {
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
                 var type = data['events'][index]['filts'][indexs]['data_type'];
-                console.log(type);
                 X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
@@ -12700,7 +12761,6 @@ var X = window.X || {
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var screentypedata = groupitemeventsdata;
-                console.log(screentypedata);
                 var drr={
                     "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     //"column_id":screentypedata[0]['category'][0]['id'],
@@ -12745,7 +12805,6 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
                     obj.html(val.title);
                     data['eventView']['filts'][index]['columnDesc'] = val.title;
                     data['eventView']['filts'][index]['columnName'] = val.id;
@@ -12787,7 +12846,6 @@ var X = window.X || {
             $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
                 var index = $(this).attr('data-index');
                 render_date_index = index;
-                // console.log(index);
             });
 
             // 渲染过滤项时间框
@@ -12812,7 +12870,6 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var type = data['eventView']['filts'][index]['data_type'];
-                console.log(type);
                 X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     $(this).html(val.title);
                     data['eventView']['filts'][index]['comparator_name'] = val.title;
@@ -12849,7 +12906,9 @@ var X = window.X || {
                     'data_type': "string",//类型
                     'tableType': "event",
                     "ftv":"",//条件
-                    "section":''//区间
+                    "section":'',//区间
+                    "intervalType":"def",
+                    "quotaIntervalArr":[]
                 };
                 data['eventView']['groupBy'].push(arr);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
@@ -12866,7 +12925,21 @@ var X = window.X || {
                     data.eventView.groupBy[index]['columnDesc'] = val.title;
                     data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
-                    data.eventView.groupBy[index]['tableType'] = val.tableType;
+                    data.eventView.groupBy[index]['tableType'] = val.table_type;
+                    X.template("grouped","shushi",data['eventView']['groupBy']);
+
+                })
+            });
+
+
+            $(document).off('click','.analysis-granularity').on('click','.analysis-granularity',function(){
+                var index = $(this).attr("data-index");
+                var sectionid = data['eventView']['groupBy'][index];
+                X.parametersopen(sectionid,'groupeditemspop',"auto",function(val){
+                    data['eventView']['groupBy'][index]['intervalType'] = val.type;
+                    if(val.type == "user_defined"){
+                        data['eventView']['groupBy'][index]['quotaIntervalArr'] = val.quotaIntervalArr;
+                    }
                 })
             });
 
@@ -12886,7 +12959,6 @@ var X = window.X || {
 
             // 时间粒度
             X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){
-                // console.log(d);
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['unitNum'] = parseInt(d.id);
                 retaineddata();
@@ -12913,6 +12985,10 @@ var X = window.X || {
             });
 
             function retaineddata(){
+                var time = $("#retained-condition-date").val();
+                var timearr = time.split(" ");
+                data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
+                data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -12922,6 +12998,11 @@ var X = window.X || {
                         querydata = d;
                         updata(d);
                         $(".chawushuj").hide();
+                        if(data.eventView.groupBy.length > 0){
+                            $(".table-info-list-box").show();
+                        }else {
+                            $(".table-info-list-box").hide();
+                        }
                     }else {
                         $("#analysis-echarts").empty();
                         $(".table-fenxi-th").html("");
@@ -12949,7 +13030,6 @@ var X = window.X || {
 
             $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
                 X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
-                    console.log(d);
                     if(d){
                         backfilldata(d);
                     }
@@ -12987,28 +13067,6 @@ var X = window.X || {
             function retainedtable(d){
                 var nname,pname
 
-                if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
-                    // var filteritem = data['eventView']['filter_item'];
-                    // if(d['days'].length >= 0){
-                        // var filterarr = [];
-                        // for(let i in d['days']){
-                        //     for(let j in filteritem){
-                        //         if(d['days'][i] == filteritem[j]){
-                        //             filterarr.push(i);
-                        //         }
-                        //     }
-                        // }
-                    // }
-                    // var titarr = [];
-                    // var tablearr = [];
-                    // for(let i in filterarr){
-                    //     var index = Number(filterarr[i])  + 2;
-                    //     titarr.push(titdata[index]);
-                    // }
-                    // titarr.unshift(titdata[0],titdata[1]);
-                    // console.log(titarr);
-                }
-
                 if(retentiontype == 0) {
                     nname = 'n';
                     pname = 'p';
@@ -13028,47 +13086,12 @@ var X = window.X || {
                             n:0,
                             p:0
                         }
-                        // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
-                        //     for(let a in filterarr){
-                        //         var index = Number(filterarr[a]);
-                        //         if(j == index){
-                        //             nrr["n"] = d['summary_values'][i][nname][j];
-                        //             nrr["p"] = d['summary_values'][i][pname][j]
-                        //             arr['data'].push(nrr);
-                        //         }
-                        //     }
-                        // }else {
-                            nrr["n"] = d['summary_values'][i][nname][j];
-                            nrr["p"] = d['summary_values'][i][pname][j]
-                            arr['data'].push(nrr);
-                        // }
+                        nrr["n"] = d['summary_values'][i][nname][j];
+                        nrr["p"] = d['summary_values'][i][pname][j]
+                        arr['data'].push(nrr);
                     }
                     tabledata.push(arr)
                 }
-    
-                // var titdata = [];
-                // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
-                //     var titarr = [];
-                //     for(let j in filterarr){
-                //         var index = Number(filterarr[j]);
-                //         titarr.push(d['days'][index]);
-                //     }
-                //     for(let i in titarr){
-                //         var tit = "第" + titarr[i] + "日";
-                //         titdata.push(tit);
-                //     }
-                // }else {
-                //     for(let i in d['days']){
-                //         var tit = "第" + d['days'][i] + "日";
-                //         titdata.push(tit);
-                //     }
-                // }
-                // titdata.unshift("日期",d.title);
-                // console.log(titdata);
-                 console.log(tabledata);
-
-                // X.fixedTable('table-div-box','row-col-fixed','',headdata);
-
 
                 X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
@@ -13123,7 +13146,6 @@ var X = window.X || {
                             }
                         }
                     }
-                    console.log(ydata);
                     // for(let i in ydata){    
                     //     legenddata.push(i);
                     //     var arr = {
@@ -13390,10 +13412,24 @@ var X = window.X || {
 
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
-                console.log(11111);
                 X.download('ck/retention_model_export',data,'事件分析');
             });
 
+            $(document).off("click",'.table-info-list-box').on('click','.table-info-list-box',function(){
+
+                var time = $(this).attr("data-time");
+                const dataArr = {
+                    eventView: data.eventView,
+                    events: data.events,
+                    time:time,
+                    type: 'retained',
+                    retentiontype: retentiontype
+                }
+                X.parametersopen(dataArr,'grouptable','auto')
+                
+
+            });
+
 
         }
     };
@@ -13835,7 +13871,7 @@ var X = window.X || {
                     "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
@@ -13878,7 +13914,7 @@ var X = window.X || {
                     if(val != undefined){
                         obj.html(val.title);
                         data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
-                        data['events']['user_filter']['filts'][index]['comparator_id'] = val.id;
+                        data['events']['user_filter']['filts'][index]['comparator'] = val.id;
                         if(val.id == "range"){
                             data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
                         }
@@ -13913,6 +13949,42 @@ var X = window.X || {
                 });
             };
 
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(event){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var comparator = obj.attr("data-comparator");
+                var columnName = data['events']['user_filter']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            
+                            if(comparator == "in"){
+                                if(data['events']['user_filter']['filts'][index]['strftv'] == "" ){
+                                    var strftv = val.title;
+                                    data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
+                                }else {
+                                    var strftv = data['events']['user_filter']['filts'][index]['strftv'] + "," + val.title;
+                                    data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
+                                }
+                                data['events']['user_filter']['filts'][index]['strftv'] = strftv;
+                            }else {
+                                data['events']['user_filter']['filts'][index]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['events']['user_filter']['filts'][index]['ftv'] = arr; 
+                            }
+
+                            X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){
+                                renderdate()
+                            });
+                            
+                        })
+                    }
+                })
+            });
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr('data-index');
                 var val = $(this).val();
@@ -15931,20 +16003,21 @@ var X = window.X || {
                         uce_calcu_symbolDesc: "等于",
                         prop_quota: {analysis: '', analysisDesc: '', quota: retdata[0]['id'], quotaDesc: retdata[0]["title"],quota_type: null},
                         is_touch: true,
+                        is_time: false
                     }
                     data['qp']['user_cluster_def']['events'].push(arr);
                 }else {
                     arr = {
-                        calcuSymbol: "C01",
-                        columnDesc: "",
-                        columnName: "lv",
-                        columnType: "double",
-                        filterType: "SIMPLE",
-                        ftv: ["10"],
-                        selectType: "number",
-                        tableType: "1",
-                        timeRelative: "",
-                        timeUnit: ""
+                        "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                        "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
+                        'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
+                        'comparator_name':'等于',//默认等于
+                        "comparator":'==',//符号id
+                        "ftv":[],//条件
+                        "strftv":'',//显示条件
+                        "section":[-1,1],//区间
+                        "tableType":defaultgroupdata[0]['id'],
+                        "filts": []
                     }
                     data['qp']['user_cluster_def']['filts'].push(arr);
                 }
@@ -16083,6 +16156,97 @@ var X = window.X || {
                 updatalable();
             });
 
+            $(document).off("click",".action-icon-time").on('click','.action-icon-time',function(){
+                var index = $(this).attr("data-index");
+                data['qp']['user_cluster_def']['events'][index]['is_time'] = !data['qp']['user_cluster_def']['events'][index]['is_time'];
+                updatalable();
+            });
+
+            $(document).off("click",".ta-property-select").on("click",".ta-property-select",function(){
+                var obj = $(this);
+                
+
+
+            });
+
+            $(document).off("click",".user-attribute").on("click",".user-attribute",function(){
+                var obj =$(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
+                    console.log(val);
+                    $(this).html(val.title);
+                    data['qp']['user_cluster_def']['filts'][index]['columnName'] = val.id;
+                    data['qp']['user_cluster_def']['filts'][index]['columnDesc'] = val.title;
+                    data['qp']['user_cluster_def']['filts'][index]['data_type'] = val.type;
+                    data['qp']['user_cluster_def']['filts'][index]['tableType'] = val.table_type;
+                    updatalable();
+                })
+            });
+
+            $(document).off("click",".user-attribute-filter").on("click",".user-attribute-filter",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['qp']['user_cluster_def']['filts'][index]['data_type'];
+                console.log()
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['qp']['user_cluster_def']['filts'][index]['comparator_name'] = val.title;
+                    data['qp']['user_cluster_def']['filts'][index]['comparator'] = val.id;
+                    if(val.id == "range"){
+                        data['qp']['user_cluster_def']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    updatalable();
+                })
+            });
+
+            $(document).off('click','.userattrfilts').on('click','.userattrfilts',function(){
+                var obj = $(this);
+                var index = obj.attr("data-index");
+                var type = obj.attr("data-type");
+                var arr = {
+                    "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                    "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
+                    'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
+                    'comparator_name':'等于',//默认等于
+                    "comparator":'==',//符号id
+                    "ftv":[],//条件
+                    "strftv":'',//显示条件
+                    "section":[-1,1],//区间
+                    "tableType":defaultgroupdata[0]['id']
+                }
+                if(type == 'userattr'){
+                    data['qp']['user_cluster_def']['filts'][index]['filts'].push(arr);
+                }else {
+                    data['qp']['user_cluster_def']['events'][index]['filts'].push(arr);
+                }
+                console.log(data);
+                X.laytpldata('#userlabel-json-box-dot',data['qp']['user_cluster_def'],'.userlabel-json-box');
+            });
+
+            $(document).off("click",".taDragDisable").on("click",".taDragDisable",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var columnName = data['qp']['user_cluster_def']['filts'][index]['columnName']
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                        
+                            data['qp']['user_cluster_def']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['qp']['user_cluster_def']['filts'][index]['ftv'] = arr; 
+                            updatalable();
+                            
+                        })
+                    }
+                })
+            });
+
             $(document).off("click",'.userlabel-dy-baocun').on("click",".userlabel-dy-baocun",function(){
                 var lablename = $(".lablename").val();
                 var labledesc = $(".labledesc").val();
@@ -16098,6 +16262,7 @@ var X = window.X || {
                 data['cluster_name'] = lablename;
                 data['display_name'] = labledesc;
                 data['remarks'] = labeldes;
+
                 X.api('user_label/save','post',data,function(d){
                     layer.msg("添加成功");
                 })
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 2130bb2..013f39f 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -137,11 +137,11 @@ var X = window.X || {
 
 (function(){
     //本地李伟
-    //  var ipurl = "http://10.0.0.240:7899/api/v1/";
+     var ipurl = "http://10.0.0.240:7899/api/v1/";
      //本地李宗振
     //  var ipurl = "http://10.0.0.94:7899/api/v1/";
     // 线上  
-    var ipurl = "http://139.159.159.3:9865/api/v1/";
+    // var ipurl = "http://139.159.159.3:9865/api/v1/";
     //线上测试
     // var ipurl = "http://139.159.159.3:7889/api/v1/";
 
@@ -210,6 +210,7 @@ var X = window.X || {
                         X.gourl("login");
                         location.reload();
                     }else if(d.code == -9){
+                        //无数据时
                         layer.msg(d.msg);
                     }else {
                         layer.msg(d.msg);
diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js
index 649c4c3..eb82a82 100644
--- a/web/srczip/logic/distribution.js
+++ b/web/srczip/logic/distribution.js
@@ -682,9 +682,7 @@
                     time:time
                 }
 
-                X.parametersopen(dataArr,'grouptable','auto',function(){
-
-                })
+                X.parametersopen(dataArr,'grouptable','auto')
             
             });
 
diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js
index f12716e..970a881 100644
--- a/web/srczip/logic/funnelanalysis.js
+++ b/web/srczip/logic/funnelanalysis.js
@@ -279,11 +279,11 @@
                     "columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
                     'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":groupitemeventsdata[0]['id']
+                    "tableType":groupitemeventsdata[0]['id']
                 };
                 data['eventView']['filts'].push(drr);
                 if(data['eventView']['filts'].length > 1){
@@ -320,8 +320,8 @@
                     data['eventView']['filts'][index]['columnName'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
-                    data['eventView']['filts'][index]['comparator_id'] = '==';
-                    data['eventView']['filts'][index]['table_type'] = val.table_type;
+                    data['eventView']['filts'][index]['comparator'] = '==';
+                    data['eventView']['filts'][index]['tableType'] = val.table_type;
                     X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
                         renderdate();
                     });
@@ -337,7 +337,7 @@
                 X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     $(this).html(val.title);
                     data['eventView']['filts'][index]['comparator_name'] = val.title;
-                    data['eventView']['filts'][index]['comparator_id'] = val.id;
+                    data['eventView']['filts'][index]['comparator'] = val.id;
                     if(val.id == "range"){
                         data['eventView']['filts'][index]['ftv'] = [-1,1];
                     }
@@ -371,6 +371,40 @@
                 });
             };
 
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var comparator = obj.attr("data-comparator");
+                var columnName = data['eventView']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            if(comparator == "in"){
+                                if(data['eventView']['filts'][index]['strftv'] == "" ){
+                                    var strftv = val.title;
+                                    data['eventView']['filts'][index]['ftv'].push(val.id);
+                                }else {
+                                    var strftv = data['eventView']['filts'][index]['strftv'] + "," + val.title;
+                                    data['eventView']['filts'][index]['ftv'].push(val.id);
+                                }
+                                data['eventView']['filts'][index]['strftv'] = strftv;
+                            }else {
+                                data['eventView']['filts'][index]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['eventView']['filts'][index]['ftv'] = arr; 
+                            }
+                            
+                            X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
+                                renderdate();
+                            });
+                        })
+                    }
+                })
+            });
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var val = $(this).val();
                 var index = $(this).attr("data-index");
@@ -408,7 +442,7 @@
                     "columnDesc": "#account_id",//事件中文显示
                     "columnName": "#account_id",//事件id
                     'data_type': "string",//类型
-                    'table_type': "event",
+                    'tableType': "event",
                     "ftv":"",//条件
                     "section":''//区间
                 };
@@ -427,7 +461,7 @@
                     data.eventView.groupBy[index]['columnDesc'] = val.title;
                     data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
-                    data.eventView.groupBy[index]['table_type'] = val.table_type;
+                    data.eventView.groupBy[index]['tableType'] = val.table_type;
                 })
             });
 
diff --git a/web/srczip/logic/grouptable.js b/web/srczip/logic/grouptable.js
index 3759ab8..f31c7f6 100644
--- a/web/srczip/logic/grouptable.js
+++ b/web/srczip/logic/grouptable.js
@@ -4,45 +4,85 @@
             var me = this;
             this.parms = parms;
             this.callback = parms.callback;
-            var data = parms.extData;
-            if(data.eventView.timeParticleSize != "P1M" && data.eventView.timeParticleSize != "total" && data.eventView.timeParticleSize != "P1W"){
-                data['eventView']['endTime'] = data.time+" 23:59:59";
-                data['eventView']['startTime'] = data.time+" 00:00:00";
+            var dataArr = parms.extData;
+            
+            if(dataArr.eventView.timeParticleSize != "P1M" && dataArr.eventView.timeParticleSize != "total" && dataArr.eventView.timeParticleSize != "P1W"){
+                dataArr['eventView']['endTime'] = dataArr.time+" 23:59:59";
+                dataArr['eventView']['startTime'] = dataArr.time+" 00:00:00";
             }
             
-            X.api("ck/scatter_model_details","post",data,function(d){
-                d['tabletitle'] = $.extend(true,[],d['label']);
-                d['tabletitle'].unshift(d.biaotou,'全部用户');
-                var contnetdata =[];
-                for(let i in d.list){
-                    var arrdata= [];
-                    for(let j in d.list[i]['n']){
-                        var n = d.list[i]['n'][j];
-                        var p = d.list[i]['p'][j];
-                        var arr = {
-                            n: n,
-                            p: p
-                        }
-                        arrdata.push(arr);
-                    }
-                    var drr = {
-                        total : d.list[i]['total'],
-                        first: i,
-                        data: arrdata
-                    }
-                    contnetdata.push(drr);
+            if(dataArr.type == "retained"){
+                var nname,pname
+                if(dataArr.retentiontype == 0) {
+                    nname = 'n';
+                    pname = 'p';
+                }else {
+                    nname = 'n_outflow';
+                    pname = 'p_outflow';
                 }
-                // console.log(contnetdata);
-                $('.grouptable-title-box span').html(d.start_date);
-                X.laytpldata("#table-fenxi-th-group-dot",d.tabletitle,".table-fenxi-group-th");
-                X.laytpldata("#table-fenxi-td-group-dot",contnetdata,".table-fenxi-group-td");
 
-            });
+                X.api("ck/retention_model_details","post",dataArr,function(d){
+                    var tabledata=[];
+                    for(let i in d['summary_values']){
+                        var arr = {
+                            date: i,
+                            d0:d['summary_values'][i]['d0'],
+                            data:[]
+                        }
+                        for(let j in d['summary_values'][i]["n"]){
+                            var nrr = {
+                                n:0,
+                                p:0
+                            }
+                            nrr["n"] = d['summary_values'][i][nname][j];
+                            nrr["p"] = d['summary_values'][i][pname][j]
+                            arr['data'].push(nrr);
+                        }
+                        tabledata.push(arr)
+                    }
+                    $('.grouptable-title-box span').html(d.start_date);
+                    X.laytpldata("#table-fenxi-th-group-dot",d.title,".table-fenxi-group-th");
+                    X.laytpldata("#table-fenxi-retained-td-group-dot",tabledata,".table-fenxi-group-td");
+    
+                });
+            }else {
+                
+                X.api("ck/scatter_model_details","post",dataArr,function(d){
+                    d['tabletitle'] = $.extend(true,[],d['label']);
+                    d['tabletitle'].unshift(d.biaotou,'全部用户');
+                    var contnetdata =[];
+                    for(let i in d.list){
+                        var arrdata= [];
+                        for(let j in d.list[i]['n']){
+                            var n = d.list[i]['n'][j];
+                            var p = d.list[i]['p'][j];
+                            var arr = {
+                                n: n,
+                                p: p
+                            }
+                            arrdata.push(arr);
+                        }
+                        var drr = {
+                            total : d.list[i]['total'],
+                            first: i,
+                            data: arrdata
+                        }
+                        contnetdata.push(drr);
+                    }
+                    // console.log(contnetdata);
+                    $('.grouptable-title-box span').html(d.start_date);
+                    X.laytpldata("#table-fenxi-th-group-dot",d.tabletitle,".table-fenxi-group-th");
+                    X.laytpldata("#table-fenxi-td-group-dot",contnetdata,".table-fenxi-group-td");
+    
+                });
+    
+                $(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
+                    dataArr.eventView['download'] = 1;
+                    X.download("ck/scatter_model_details",dataArr,'分布分析')
+                })
+            }
 
-            $(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
-                data.eventView['download'] = 1;
-                X.download("ck/scatter_model_details",data,'分布分析')
-            })
+            
            
 
         }
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 442bd64..e6cfc1f 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -45,14 +45,9 @@
                 var startmonth = Date.parse(startdate)/1000;
                 data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
                 data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
-                retaineddata();
+                // retaineddata();
             });
 
-            var time = $("#retained-condition-date").val();
-            var timearr = time.split(" ");
-            data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
-            data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
-
             var eventdata;
             var groupitemeventsdata;//分组项里的事件
             var querydata; //计算后返回的数据
@@ -86,7 +81,6 @@
                     X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
                         groupitemeventsdata = val;
                         //初始事件
-                        // console.log(data['events'][0]);
                         X.template("event","initial-event",data['events'][0]);
                         X.template("returnvisitevent","returnvisit-event",data['events'][1]);
 
@@ -124,7 +118,6 @@
                 if(type2data.length >0){
                     X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                         // if(val != undefined){
-                            console.log(val);
                             $("#analysis-zhibiao-list-type2-"+index).html(val.title);
                             data['events'][index]['event_attr'] = val.title;
                             data['events'][index]['event_attr_id'] = val.id;
@@ -172,7 +165,6 @@
                     "ftv":[],
                     "strftv":"",
                     "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
-                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
                 // initialevent.push(arr);
@@ -190,7 +182,6 @@
                     "ftv":[],
                     "strftv":"",
                     "tableType":groupitemeventsdata[0]['category'][0]['data_type'],
-                    "data_type":groupitemeventsdata[0]['category'][0]['data_type'],
                     "timeUnit":""
                 }
                 // data['events'][1]['filts'].push(arr);
@@ -227,12 +218,10 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var dataevent= data['events'][index];
-                // console.log(dataevent);
                 X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
                     obj.html(val.id);
                     dataevent['eventName'] = val.name;
                     dataevent['eventDesc'] = val.id;
-                    // console.log(data['events']);
 
                 })
             });
@@ -267,7 +256,6 @@
                 var index = $(this).attr("data-index");
                 var indexs = $(this).attr("data-indexs");
                 var type = data['events'][index]['filts'][indexs]['data_type'];
-                console.log(type);
                 X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     if(val != undefined){
                         obj.html(val.title);
@@ -333,7 +321,6 @@
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var screentypedata = groupitemeventsdata;
-                console.log(screentypedata);
                 var drr={
                     "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     //"column_id":screentypedata[0]['category'][0]['id'],
@@ -378,7 +365,6 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
                     obj.html(val.title);
                     data['eventView']['filts'][index]['columnDesc'] = val.title;
                     data['eventView']['filts'][index]['columnName'] = val.id;
@@ -420,7 +406,6 @@
             $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
                 var index = $(this).attr('data-index');
                 render_date_index = index;
-                // console.log(index);
             });
 
             // 渲染过滤项时间框
@@ -445,7 +430,6 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 var type = data['eventView']['filts'][index]['data_type'];
-                console.log(type);
                 X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
                     $(this).html(val.title);
                     data['eventView']['filts'][index]['comparator_name'] = val.title;
@@ -482,7 +466,9 @@
                     'data_type': "string",//类型
                     'tableType': "event",
                     "ftv":"",//条件
-                    "section":''//区间
+                    "section":'',//区间
+                    "intervalType":"def",
+                    "quotaIntervalArr":[]
                 };
                 data['eventView']['groupBy'].push(arr);
                 X.template("grouped","shushi",data['eventView']['groupBy']);
@@ -499,7 +485,21 @@
                     data.eventView.groupBy[index]['columnDesc'] = val.title;
                     data.eventView.groupBy[index]['columnName'] = val.id;
                     data.eventView.groupBy[index]['data_type'] = val.type;
-                    data.eventView.groupBy[index]['tableType'] = val.tableType;
+                    data.eventView.groupBy[index]['tableType'] = val.table_type;
+                    X.template("grouped","shushi",data['eventView']['groupBy']);
+
+                })
+            });
+
+
+            $(document).off('click','.analysis-granularity').on('click','.analysis-granularity',function(){
+                var index = $(this).attr("data-index");
+                var sectionid = data['eventView']['groupBy'][index];
+                X.parametersopen(sectionid,'groupeditemspop',"auto",function(val){
+                    data['eventView']['groupBy'][index]['intervalType'] = val.type;
+                    if(val.type == "user_defined"){
+                        data['eventView']['groupBy'][index]['quotaIntervalArr'] = val.quotaIntervalArr;
+                    }
                 })
             });
 
@@ -519,7 +519,6 @@
 
             // 时间粒度
             X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){
-                // console.log(d);
                 $(".analtsis-timeParticleSize").html(d.title);
                 data['eventView']['unitNum'] = parseInt(d.id);
                 retaineddata();
@@ -546,6 +545,10 @@
             });
 
             function retaineddata(){
+                var time = $("#retained-condition-date").val();
+                var timearr = time.split(" ");
+                data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
+                data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
                 var dataArr = {
                     eventView: data.eventView,
                     events: data.events
@@ -555,6 +558,11 @@
                         querydata = d;
                         updata(d);
                         $(".chawushuj").hide();
+                        if(data.eventView.groupBy.length > 0){
+                            $(".table-info-list-box").show();
+                        }else {
+                            $(".table-info-list-box").hide();
+                        }
                     }else {
                         $("#analysis-echarts").empty();
                         $(".table-fenxi-th").html("");
@@ -582,7 +590,6 @@
 
             $(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
                 X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
-                    console.log(d);
                     if(d){
                         backfilldata(d);
                     }
@@ -620,28 +627,6 @@
             function retainedtable(d){
                 var nname,pname
 
-                if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
-                    // var filteritem = data['eventView']['filter_item'];
-                    // if(d['days'].length >= 0){
-                        // var filterarr = [];
-                        // for(let i in d['days']){
-                        //     for(let j in filteritem){
-                        //         if(d['days'][i] == filteritem[j]){
-                        //             filterarr.push(i);
-                        //         }
-                        //     }
-                        // }
-                    // }
-                    // var titarr = [];
-                    // var tablearr = [];
-                    // for(let i in filterarr){
-                    //     var index = Number(filterarr[i])  + 2;
-                    //     titarr.push(titdata[index]);
-                    // }
-                    // titarr.unshift(titdata[0],titdata[1]);
-                    // console.log(titarr);
-                }
-
                 if(retentiontype == 0) {
                     nname = 'n';
                     pname = 'p';
@@ -661,47 +646,12 @@
                             n:0,
                             p:0
                         }
-                        // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
-                        //     for(let a in filterarr){
-                        //         var index = Number(filterarr[a]);
-                        //         if(j == index){
-                        //             nrr["n"] = d['summary_values'][i][nname][j];
-                        //             nrr["p"] = d['summary_values'][i][pname][j]
-                        //             arr['data'].push(nrr);
-                        //         }
-                        //     }
-                        // }else {
-                            nrr["n"] = d['summary_values'][i][nname][j];
-                            nrr["p"] = d['summary_values'][i][pname][j]
-                            arr['data'].push(nrr);
-                        // }
+                        nrr["n"] = d['summary_values'][i][nname][j];
+                        nrr["p"] = d['summary_values'][i][pname][j]
+                        arr['data'].push(nrr);
                     }
                     tabledata.push(arr)
                 }
-    
-                // var titdata = [];
-                // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){
-                //     var titarr = [];
-                //     for(let j in filterarr){
-                //         var index = Number(filterarr[j]);
-                //         titarr.push(d['days'][index]);
-                //     }
-                //     for(let i in titarr){
-                //         var tit = "第" + titarr[i] + "日";
-                //         titdata.push(tit);
-                //     }
-                // }else {
-                //     for(let i in d['days']){
-                //         var tit = "第" + d['days'][i] + "日";
-                //         titdata.push(tit);
-                //     }
-                // }
-                // titdata.unshift("日期",d.title);
-                // console.log(titdata);
-                 console.log(tabledata);
-
-                // X.fixedTable('table-div-box','row-col-fixed','',headdata);
-
 
                 X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
                 X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
@@ -756,7 +706,6 @@
                             }
                         }
                     }
-                    console.log(ydata);
                     // for(let i in ydata){    
                     //     legenddata.push(i);
                     //     var arr = {
@@ -1023,10 +972,24 @@
 
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
-                console.log(11111);
                 X.download('ck/retention_model_export',data,'事件分析');
             });
 
+            $(document).off("click",'.table-info-list-box').on('click','.table-info-list-box',function(){
+
+                var time = $(this).attr("data-time");
+                const dataArr = {
+                    eventView: data.eventView,
+                    events: data.events,
+                    time:time,
+                    type: 'retained',
+                    retentiontype: retentiontype
+                }
+                X.parametersopen(dataArr,'grouptable','auto')
+                
+
+            });
+
 
         }
     };
diff --git a/web/srczip/logic/routeanalysis.js b/web/srczip/logic/routeanalysis.js
index b2e7e24..f93b746 100644
--- a/web/srczip/logic/routeanalysis.js
+++ b/web/srczip/logic/routeanalysis.js
@@ -343,7 +343,7 @@
                     "columnName":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
@@ -386,7 +386,7 @@
                     if(val != undefined){
                         obj.html(val.title);
                         data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
-                        data['events']['user_filter']['filts'][index]['comparator_id'] = val.id;
+                        data['events']['user_filter']['filts'][index]['comparator'] = val.id;
                         if(val.id == "range"){
                             data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
                         }
@@ -421,6 +421,42 @@
                 });
             };
 
+            $(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(event){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = $(this).attr("data-index");
+                var comparator = obj.attr("data-comparator");
+                var columnName = data['events']['user_filter']['filts'][index]['columnName'];
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                            
+                            if(comparator == "in"){
+                                if(data['events']['user_filter']['filts'][index]['strftv'] == "" ){
+                                    var strftv = val.title;
+                                    data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
+                                }else {
+                                    var strftv = data['events']['user_filter']['filts'][index]['strftv'] + "," + val.title;
+                                    data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
+                                }
+                                data['events']['user_filter']['filts'][index]['strftv'] = strftv;
+                            }else {
+                                data['events']['user_filter']['filts'][index]['strftv'] = val.title;
+                                var arr = [];
+                                arr.push(val.id);
+                                data['events']['user_filter']['filts'][index]['ftv'] = arr; 
+                            }
+
+                            X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){
+                                renderdate()
+                            });
+                            
+                        })
+                    }
+                })
+            });
+
             $(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
                 var index = $(this).attr('data-index');
                 var val = $(this).val();
diff --git a/web/srczip/logic/userlabel_dy.js b/web/srczip/logic/userlabel_dy.js
index 1fc8f73..e209702 100644
--- a/web/srczip/logic/userlabel_dy.js
+++ b/web/srczip/logic/userlabel_dy.js
@@ -61,20 +61,21 @@
                         uce_calcu_symbolDesc: "等于",
                         prop_quota: {analysis: '', analysisDesc: '', quota: retdata[0]['id'], quotaDesc: retdata[0]["title"],quota_type: null},
                         is_touch: true,
+                        is_time: false
                     }
                     data['qp']['user_cluster_def']['events'].push(arr);
                 }else {
                     arr = {
-                        calcuSymbol: "C01",
-                        columnDesc: "",
-                        columnName: "lv",
-                        columnType: "double",
-                        filterType: "SIMPLE",
-                        ftv: ["10"],
-                        selectType: "number",
-                        tableType: "1",
-                        timeRelative: "",
-                        timeUnit: ""
+                        "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                        "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
+                        'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
+                        'comparator_name':'等于',//默认等于
+                        "comparator":'==',//符号id
+                        "ftv":[],//条件
+                        "strftv":'',//显示条件
+                        "section":[-1,1],//区间
+                        "tableType":defaultgroupdata[0]['id'],
+                        "filts": []
                     }
                     data['qp']['user_cluster_def']['filts'].push(arr);
                 }
@@ -213,6 +214,97 @@
                 updatalable();
             });
 
+            $(document).off("click",".action-icon-time").on('click','.action-icon-time',function(){
+                var index = $(this).attr("data-index");
+                data['qp']['user_cluster_def']['events'][index]['is_time'] = !data['qp']['user_cluster_def']['events'][index]['is_time'];
+                updatalable();
+            });
+
+            $(document).off("click",".ta-property-select").on("click",".ta-property-select",function(){
+                var obj = $(this);
+                
+
+
+            });
+
+            $(document).off("click",".user-attribute").on("click",".user-attribute",function(){
+                var obj =$(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
+                    console.log(val);
+                    $(this).html(val.title);
+                    data['qp']['user_cluster_def']['filts'][index]['columnName'] = val.id;
+                    data['qp']['user_cluster_def']['filts'][index]['columnDesc'] = val.title;
+                    data['qp']['user_cluster_def']['filts'][index]['data_type'] = val.type;
+                    data['qp']['user_cluster_def']['filts'][index]['tableType'] = val.table_type;
+                    updatalable();
+                })
+            });
+
+            $(document).off("click",".user-attribute-filter").on("click",".user-attribute-filter",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var type = data['qp']['user_cluster_def']['filts'][index]['data_type'];
+                console.log()
+                X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                    $(this).html(val.title);
+                    data['qp']['user_cluster_def']['filts'][index]['comparator_name'] = val.title;
+                    data['qp']['user_cluster_def']['filts'][index]['comparator'] = val.id;
+                    if(val.id == "range"){
+                        data['qp']['user_cluster_def']['filts'][index]['ftv'] = [-1,1];
+                    }
+                    updatalable();
+                })
+            });
+
+            $(document).off('click','.userattrfilts').on('click','.userattrfilts',function(){
+                var obj = $(this);
+                var index = obj.attr("data-index");
+                var type = obj.attr("data-type");
+                var arr = {
+                    "columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
+                    "columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
+                    'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
+                    'comparator_name':'等于',//默认等于
+                    "comparator":'==',//符号id
+                    "ftv":[],//条件
+                    "strftv":'',//显示条件
+                    "section":[-1,1],//区间
+                    "tableType":defaultgroupdata[0]['id']
+                }
+                if(type == 'userattr'){
+                    data['qp']['user_cluster_def']['filts'][index]['filts'].push(arr);
+                }else {
+                    data['qp']['user_cluster_def']['events'][index]['filts'].push(arr);
+                }
+                console.log(data);
+                X.laytpldata('#userlabel-json-box-dot',data['qp']['user_cluster_def'],'.userlabel-json-box');
+            });
+
+            $(document).off("click",".taDragDisable").on("click",".taDragDisable",function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var index = obj.attr("data-index");
+                var columnName = data['qp']['user_cluster_def']['filts'][index]['columnName']
+
+                X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
+                    if(val != "查无数据"){
+                        
+                        X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
+                        
+                            data['qp']['user_cluster_def']['filts'][index]['strftv'] = val.title;
+                            var arr = [];
+                            arr.push(val.id);
+                            data['qp']['user_cluster_def']['filts'][index]['ftv'] = arr; 
+                            updatalable();
+                            
+                        })
+                    }
+                })
+            });
+
             $(document).off("click",'.userlabel-dy-baocun').on("click",".userlabel-dy-baocun",function(){
                 var lablename = $(".lablename").val();
                 var labledesc = $(".labledesc").val();
@@ -228,6 +320,7 @@
                 data['cluster_name'] = lablename;
                 data['display_name'] = labledesc;
                 data['remarks'] = labeldes;
+
                 X.api('user_label/save','post',data,function(d){
                     layer.msg("添加成功");
                 })
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index eb88a3e..2ea76b5 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -305,7 +305,7 @@
 .table-fenxi-box { width: 100%; }
 .table-fenxi-box th { background-color: #f0f2f5; min-width: 100px; max-width: 200px; padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #f0f2f5; }
 .table-fenxi-box tr { text-align: center; border-left: 1px solid #e6e6e6; }
-.table-fenxi-box tr td{ min-width: 120px; max-height: 200px; width: 150px; max-width: 120px; padding: 7px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border: 1px solid #e6e6e6; word-wrap:break-word;
+.table-fenxi-box tr td{ min-width: 120px; max-height: 200px; height: 35px; width: 150px; max-width: 120px; padding: 7px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border: 1px solid #e6e6e6; word-wrap:break-word;
      /* white-space:pre-wrap;  */
 }
 
diff --git a/web/static/css/style.css b/web/static/css/style.css
index fed34c5..e21712f 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -28,9 +28,10 @@
 .layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; }
 .layui-laypage-em { background-color: #3d90ff !important; }
 .layui-table-cell { height: auto; }
-.nav-list-box { overflow-y: auto; height: 100%; }
+.nav-list-box { overflow-y: auto; height: calc(100% - 60px ); }
 .importuser-con-box .layui-select-title { width: auto; }
 .importuser-con-box .layui-form-selected dl { max-height: 160px; } 
+.layui-col-md6 {height: 409px;}
 
 ::-webkit-scrollbar { 
     width:0px; 
diff --git a/web/static/img/iconfont/demo_index.html b/web/static/img/iconfont/demo_index.html
index a8e08dc..8ccf31c 100644
--- a/web/static/img/iconfont/demo_index.html
+++ b/web/static/img/iconfont/demo_index.html
@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b8;</span>
+                <div class="name">时间</div>
+                <div class="code-name">&amp;#xe8b8;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe683;</span>
                 <div class="name">过滤</div>
@@ -168,9 +174,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1634286267600') format('woff2'),
-       url('iconfont.woff?t=1634286267600') format('woff'),
-       url('iconfont.ttf?t=1634286267600') format('truetype');
+  src: url('iconfont.woff2?t=1655362654795') format('woff2'),
+       url('iconfont.woff?t=1655362654795') format('woff'),
+       url('iconfont.ttf?t=1655362654795') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -196,6 +202,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-shijian"></span>
+            <div class="name">
+              时间
+            </div>
+            <div class="code-name">.icon-shijian
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-guolv"></span>
             <div class="name">
@@ -367,6 +382,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shijian"></use>
+                </svg>
+                <div class="name">时间</div>
+                <div class="code-name">#icon-shijian</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guolv"></use>
diff --git a/web/static/img/iconfont/iconfont.css b/web/static/img/iconfont/iconfont.css
index 3e78d8b..367bf87 100644
--- a/web/static/img/iconfont/iconfont.css
+++ b/web/static/img/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2570810 */
-  src: url('iconfont.woff2?t=1634286267600') format('woff2'),
-       url('iconfont.woff?t=1634286267600') format('woff'),
-       url('iconfont.ttf?t=1634286267600') format('truetype');
+  src: url('iconfont.woff2?t=1655362654795') format('woff2'),
+       url('iconfont.woff?t=1655362654795') format('woff'),
+       url('iconfont.ttf?t=1655362654795') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shijian:before {
+  content: "\e8b8";
+}
+
 .icon-guolv:before {
   content: "\e683";
 }
diff --git a/web/static/img/iconfont/iconfont.js b/web/static/img/iconfont/iconfont.js
index 40bcbb7..9884c51 100644
--- a/web/static/img/iconfont/iconfont.js
+++ b/web/static/img/iconfont/iconfont.js
@@ -1 +1 @@
-!function(t){var c,a,e,o,i,l='<svg><symbol id="icon-guolv" viewBox="0 0 1024 1024"><path d="M283.884308 295.384615h456.231384l-169.865846 169.747693a19.692308 19.692308 0 0 0-5.750154 13.942154v300.347076l-42.653538-42.614153a19.692308 19.692308 0 1 0-27.844923 27.844923l76.248615 76.20923a19.692308 19.692308 0 0 0 33.634462-13.942153v-339.692308l197.710769-197.592615A19.692308 19.692308 0 0 0 787.692308 256H236.307692a19.692308 19.692308 0 0 0-13.902769 33.634462l212.795077 212.637538v199.601231a19.692308 19.692308 0 1 0 39.384615 0v-207.753846a19.692308 19.692308 0 0 0-5.789538-13.942154L283.884308 295.384615z"  ></path></symbol><symbol id="icon-shanchu1" viewBox="0 0 1024 1024"><path d="M256 256v608a32 32 0 0 0 32 32h448a32 32 0 0 0 32-32V256z m480 704H288a96 96 0 0 1-96-96V224a32 32 0 0 1 32-32h576a32 32 0 0 1 32 32v640a96 96 0 0 1-96 96z"  ></path><path d="M160 256a32 32 0 0 1 0-64h704a32 32 0 0 1 0 64z m192 192a32 32 0 0 1 64 0v256a32 32 0 0 1-64 0z m128 0a32 32 0 0 1 64 0v256a32 32 0 0 1-64 0z m128 0a32 32 0 0 1 64 0v256a32 32 0 0 1-64 0z"  ></path><path d="M647.04 128H376.96l-16 64h302.08zM704 256H320a32 32 0 0 1-32-39.68l32-128A32 32 0 0 1 352 64h320a32 32 0 0 1 32 24.32l32 128A32 32 0 0 1 704 256z"  ></path></symbol><symbol id="icon-jianchagengxin" viewBox="0 0 1024 1024"><path d="M511.3 808.6c-118.2 0-224.2-72-270.5-177.2h93.3c16.9 0 19.7-11.5 19.7-28.4s-2.8-30.6-19.7-30.6H167.8c-16.9 0-30.6 13.7-30.6 30.6v166.3c0 16.9 13.7 19.7 30.6 19.7 16.9 0 28.4-2.8 28.4-19.7v-93.6c58.9 114 177.9 192 315.1 192 195.8 0 354.4-158.7 354.4-354.4h-59.1c0.1 162.8-132.4 295.3-295.3 295.3zM854.9 237.6c-17 0-28.5 2.8-28.5 19.7v93.5c-58.9-114-177.9-192-315.1-192-195.7 0-354.4 158.7-354.4 354.5H216c0-162.9 132.5-295.4 295.4-295.4 118.2 0 224.2 71.9 270.6 177.2h-93.3c-16.9 0-19.7 11.5-19.7 28.4s2.8 30.6 19.7 30.6H855c16.9 0 30.6-13.7 30.6-30.6l0.1-166.3c-0.2-16.9-13.9-19.6-30.8-19.6z" fill="#666666" ></path></symbol><symbol id="icon-peizhiguanli1" viewBox="0 0 1024 1024"><path d="M164.3651123 282.19348144h0.49438478c0.57678223 0 54.79431153-0.82397461 134.88464354-0.98876952 12.35961914 43.75305176 52.65197754 75.88806153 100.36010743 75.88806152 57.51342773 0 104.23278809-46.80175781 104.23278809-104.23278808S457.53527832 148.62719727 400.02185058 148.62719727c-47.29614258 0-87.34130859 31.640625-100.03051757 74.89929199-80.74951172 0.16479492-135.46142578 0.98876953-136.12060548 0.98876952-15.90270997 0.24719239-28.59191895 13.34838867-28.34472655 29.3334961 0.24719239 15.73791504 13.10119629 28.34472656 28.83911133 28.34472656z m235.65673829-75.88806152c25.70800781 0 46.55456543 20.92895508 46.55456543 46.55456544S425.72985839 299.41455078 400.02185058 299.41455078s-46.55456543-20.92895508-46.55456542-46.55456543 20.84655762-46.55456543 46.55456543-46.55456543z m173.28186035 75.39367676h286.33117676c15.90270997 0 28.83911133-12.93640137 28.83911132-28.83911133s-12.93640137-28.83911133-28.83911133-28.83911133H573.30371094c-15.90270997 0-28.83911133 12.93640137-28.83911133 28.83911133s12.93640137 28.83911133 28.83911133 28.83911132z m287.56713867 193.55163574c-0.90637207 0-21.42333984-0.90637207-95.66345215-1.071167-12.68920898-43.258667-52.734375-74.899292-100.03051757-74.89929198-57.51342773 0-104.23278809 46.80175781-104.23278809 104.23278809 0 57.51342773 46.80175781 104.23278809 104.23278809 104.23278808 47.62573242 0 88.00048828-32.13500977 100.36010742-75.88806153 71.76818848 0.16479492 92.44995117 0.98876953 92.94433594 0.98876954h1.23596191c15.32592773 0 28.09753418-12.11242676 28.75671387-27.60314942 0.65917969-15.8203125-11.618042-29.33349609-27.60314942-29.99267578z m-195.69396973 74.899292c-25.70800781 0-46.55456543-20.92895508-46.55456543-46.55456544s20.92895508-46.55456543 46.55456544-46.55456543 46.55456543 20.92895508 46.55456542 46.55456543-20.84655762 46.55456543-46.55456542 46.55456543z m-171.55151366-75.47607423H164.3651123c-15.90270997 0-28.83911133 12.93640137-28.83911132 28.83911133s12.93640137 28.83911133 28.83911133 28.83911133h329.2602539c15.90270997 0 28.83911133-12.93640137 28.83911133-28.83911133s-12.93640137-28.83911133-28.83911132-28.83911133zM400.02185058 666.90722656c-47.29614258 0-87.34130859 31.640625-100.03051757 74.899292-80.74951172 0.16479492-135.46142578 0.98876953-136.12060548 0.98876952-15.90270997 0.24719239-28.59191895 13.34838867-28.34472655 29.3334961 0.24719239 15.73791504 13.10119629 28.34472656 28.83911133 28.34472656h0.49438476c0.57678223 0 54.79431153-0.82397461 134.88464355-0.98876953 12.35961914 43.75305176 52.65197754 75.88806153 100.36010743 75.88806152 57.51342773 0 104.23278809-46.80175781 104.23278809-104.23278809-0.08239747-57.43103028-46.80175781-104.23278809-104.31518556-104.23278808z m1e-8 150.78735352c-25.70800781 0-46.55456543-20.92895508-46.55456543-46.55456544S374.39624023 724.58544922 400.02185058 724.58544922s46.55456543 20.92895508 46.55456544 46.55456543-20.84655762 46.55456543-46.55456543 46.55456543z m459.6130371-75.39367676H573.30371094c-15.90270997 0-28.83911133 12.93640137-28.83911133 28.83911133s12.93640137 28.83911133 28.83911133 28.83911133h286.33117676c15.90270997 0 28.83911133-12.93640137 28.83911132-28.83911133s-12.85400391-28.83911133-28.83911133-28.83911133z" fill="#768696" ></path></symbol><symbol id="icon-biaoqianxiangqing" viewBox="0 0 1024 1024"><path d="M460.8 64L960 563.2 563.2 960 64 460.8l6.4-390.4L460.8 64z m-32 76.8l-281.6 6.4-6.4 281.6 422.4 422.4 288-288-422.4-422.4zM339.2 339.2c32-32 76.8-32 108.8 0S480 422.4 448 448c-25.6 32-76.8 32-108.8 0-25.6-25.6-25.6-76.8 0-108.8z"  ></path></symbol><symbol id="icon-back" viewBox="0 0 1024 1024"><path d="M593.109333 178.261333a42.666667 42.666667 0 0 1 61.994667 58.453334l-3.712 3.84-290.773333 271.914666 291.285333 281.173334a42.666667 42.666667 0 0 1-55.168 64.853333l-4.096-3.456-294.357333-284.288a85.333333 85.333333 0 0 1-1.109334-115.328l5.12-5.248 290.816-271.914667z"  ></path></symbol><symbol id="icon-backbeifen" viewBox="0 0 1024 1024"><path d="M347.093333 178.261333a42.666667 42.666667 0 0 0-61.952 58.453334l3.669334 3.84 290.773333 271.914666-291.285333 281.173334a42.666667 42.666667 0 0 0 55.210666 64.853333l4.053334-3.456 294.4-284.288a85.333333 85.333333 0 0 0 1.066666-115.328l-5.12-5.248-290.816-271.914667z"  ></path></symbol><symbol id="icon-ic_normal_dot" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z"  ></path></symbol><symbol id="icon-liushi" viewBox="0 0 1024 1024"><path d="M389.9 361.148h57.712V737H389.9V361.148z m173.138 0h57.713V737h-57.713V361.148z m144.282 0h57.712v205.269H707.32V361.148z m-461.703 0h57.713v205.269h-57.713V361.148zM182 274.641V217h664v57.641H182z"  ></path></symbol><symbol id="icon-shujubiao" viewBox="0 0 1024 1024"><path d="M896 864H128c-51.2 0-96-44.8-96-96V192c0-51.2 44.8-96 96-96h768c51.2 0 96 44.8 96 96v576c0 51.2-44.8 96-96 96zM128 160c-19.2 0-32 12.8-32 32v576c0 19.2 12.8 32 32 32h768c19.2 0 32-12.8 32-32V192c0-19.2-12.8-32-32-32H128z"  ></path><path d="M64 320h896v64H64zM64 544h896v64H64z"  ></path><path d="M256 320h64v480H256zM480 352h64V832h-64zM704 320h64v480h-64z"  ></path></symbol><symbol id="icon-sql" viewBox="0 0 1024 1024"><path d="M170.666667 0h682.666666a170.666667 170.666667 0 0 1 170.666667 170.666667v682.666666a170.666667 170.666667 0 0 1-170.666667 170.666667H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666667V170.666667a170.666667 170.666667 0 0 1 170.666667-170.666667z m0 56.888889a113.777778 113.777778 0 0 0-113.777778 113.777778v682.666666a113.777778 113.777778 0 0 0 113.777778 113.777778h682.666666a113.777778 113.777778 0 0 0 113.777778-113.777778V170.666667a113.777778 113.777778 0 0 0-113.777778-113.777778H170.666667z m-63.772445 561.095111c10.524444 9.216 24.576 16.782222 42.211556 22.698667 17.635556 5.916444 34.360889 8.874667 50.232889 8.874666 48.298667 0 72.419556-17.180444 72.419555-51.541333a45.511111 45.511111 0 0 0-7.736889-25.998222 74.353778 74.353778 0 0 0-21.333333-20.48 560.64 560.64 0 0 0-50.915556-27.306667c-34.531556-17.180444-57.230222-33.166222-68.266666-47.900444a82.488889 82.488889 0 0 1-16.384-50.574223c0-28.558222 11.491556-51.2 34.417778-67.982222 22.983111-16.725333 51.939556-25.088 86.926222-25.088 34.190222 0 59.335111 4.152889 75.320889 12.401778v48.469333c-20.764444-14.392889-46.990222-21.560889-78.677334-21.560889-21.048889 0-38.172444 4.437333-51.427555 13.198223a41.813333 41.813333 0 0 0-19.911111 36.807111c0 13.937778 4.551111 25.258667 13.767111 34.019555 9.216 8.704 29.127111 20.650667 59.790222 35.783111 33.792 16.099556 57.457778 32.256 70.883556 48.412445 13.482667 16.156444 20.252444 34.304 20.252444 54.442667 0 30.208-10.979556 53.418667-32.881778 69.575111-21.959111 16.156444-52.394667 24.234667-91.363555 24.234666-13.653333 0-29.525333-1.934222-47.672889-5.688889-18.147556-3.754667-31.345778-8.533333-39.651556-14.108444v-50.631111z m593.123556 153.998222c-10.808889 3.413333-23.779556 5.12-38.912 5.12-21.333333 0-41.528889-5.176889-60.529778-15.530666-19.057778-10.410667-45.397333-34.759111-79.018667-73.102223-46.08 0.284444-83.968-16.099556-113.664-49.152-29.696-32.995556-44.544-74.524444-44.544-124.643555 0-55.864889 15.018667-100.124444 45.112889-132.892445 30.037333-32.768 71.168-49.095111 123.335111-49.095111 46.933333 0 85.048889 16.042667 114.346667 48.184889 29.240889 32.142222 43.804444 74.012444 43.804444 125.553778 0 45.795556-10.24 84.195556-30.833777 115.370667-20.593778 31.118222-49.834667 51.2-87.779556 60.188444 19.114667 20.764444 35.384889 34.929778 48.924445 42.552889 13.425778 7.623111 28.444444 11.434667 45.056 11.434667 13.653333 0 25.201778-1.991111 34.702222-5.973334v41.984zM409.998222 511.089778c0 41.642667 10.638222 75.036444 31.857778 100.124444 21.276444 25.144889 49.038222 37.660444 83.228444 37.660445 36.750222 0 65.592889-12.003556 86.584889-36.124445 20.935111-24.064 31.459556-57.685333 31.459556-100.977778 0-44.430222-10.24-78.734222-30.776889-102.912-20.536889-24.120889-48.64-36.181333-84.366222-36.181333-35.100444 0-63.544889 12.743111-85.333334 38.229333-21.788444 25.486222-32.654222 58.88-32.654222 100.181334zM937.984 682.666667h-181.532444V338.488889h44.430222v304.867555h137.102222V682.666667z"  ></path></symbol><symbol id="icon-duijixiantu" viewBox="0 0 1024 1024"><path d="M197.973333 826.026667h669.013334c6.826667 0 10.24 3.413333 10.24 10.24v30.72c0 6.826667-3.413333 10.24-10.24 10.24H157.013333c-6.826667 0-10.24-3.413333-10.24-10.24V157.013333c0-6.826667 3.413333-10.24 10.24-10.24h30.72c6.826667 0 10.24 3.413333 10.24 10.24v669.013334z"  ></path><path d="M607.573333 570.026667l-105.813333 75.093333c-3.413333 3.413333-6.826667 3.413333-10.24 0l-133.12-78.506667c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 672.426667c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826666v81.92c0 3.413333 3.413333 10.24 10.24 10.24h576.853333c3.413333 0 10.24-3.413333 10.24-10.24v-235.52c0-6.826667-6.826667-10.24-10.24-10.24l-215.04 54.613334c3.413333 0 3.413333 0 0 0m-17.066666-187.733334l-105.813334 92.16c-3.413333 3.413333-6.826667 3.413333-10.24 0l-116.053333-68.266666c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 512c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826667v102.4c0 6.826667 10.24 13.653333 13.653333 6.826666l95.573334-92.16c3.413333-3.413333 6.826667-3.413333 10.24 0l133.12 78.506667c3.413333 3.413333 6.826667 0 10.24 0l109.226666-75.093333h3.413334l211.626666-54.613334c3.413333 0 6.826667-3.413333 6.826667-10.24V327.68c0-6.826667-6.826667-10.24-10.24-10.24l-225.28 61.44c0 3.413333-3.413333 3.413333-3.413333 3.413333"  ></path></symbol><symbol id="icon-leiji" viewBox="0 0 1024 1024"><path d="M75.09333333 930.48604445h146.80064v-403.11921778H75.09333333v403.11921778z m366.41905778 0h146.80064v-879.63875556H441.51239111v879.63875556z m366.41905778-623.32017778v623.32017778H954.73208889v-623.32017778h-146.80064z"  ></path></symbol><symbol id="icon-zhexian" viewBox="0 0 1024 1024"><path d="M612.393 653.575L386.757 427.94l35.355-35.355L647.748 618.22z"  ></path><path d="M576.84 617.98l332.902-332.904 35.355 35.355-332.903 332.903zM62.698 752.029l338.984-338.984 35.355 35.355L98.053 787.384z"  ></path></symbol><symbol id="icon-fenbutu" viewBox="0 0 1024 1024"><path d="M0 1024v-93.090909h1024v93.090909H0z m837.818182-837.818182h186.181818v651.636364H837.818182V186.181818zM558.545455 465.454545h186.181818v372.363637H558.545455V465.454545zM279.272727 0h186.181818v837.818182H279.272727V0zM0 279.272727h186.181818v558.545455H0V279.272727z"  ></path></symbol><symbol id="icon-tongjitu" viewBox="0 0 1024 1024"><path d="M850.832544 671.454642L529.987165 491.420289V132.101667c0-20.174482-16.427134-35.81981-36.47575-35.81981-118.232798 0-225.035266 45.938262-302.638715 121.16764l-0.499373 0.531096-0.280386 0.218988C112.739179 293.210995 64.303027 397.234163 64.303027 511.875157c0 114.610294 48.436152 218.163765 125.789914 293.613154l0.280386 0.249687c77.603449 75.262124 184.906314 121.980145 303.138088 121.980145 75.574233 0 148.399865-19.423375 211.980949-54.525847l1.873674-1.249457c63.768349-35.599799 118.170376-87.940888 156.518776-151.271262l0.499374-0.74906c10.431583-17.426905 4.123924-38.84982-13.551644-48.467875zM670.892335 810.29785l-1.873674 1.311879c-52.089355 28.980032-113.048729 44.906769-175.506222 44.906769-98.464569 0-187.529047-38.660508-251.579829-100.744495-64.331167-62.582337-103.929024-148.773372-103.929024-243.896846 0-94.935186 39.597857-180.783413 103.930047-243.64716 56.242955-54.525847 131.255393-90.906429 214.604706-98.995665v342.642825c0 14.614859 8.838296 27.012214 21.360494 32.7898l303.16981 169.697937c-29.481452 39.159882-67.205635 72.200392-110.176308 95.934956z m180.752714-605.464695c-62.33265-60.58382-146.651035-99.744725-239.900836-105.022938V445.701015L920.597467 618.677625c10.992355-21.98471 20.360723-44.156686 26.606984-67.673286 8.306176-30.29191 12.491499-61.364603 12.491499-93.186356 0-98.714256-41.159422-188.840926-108.050901-252.984828z" fill="#7E7E7E" ></path></symbol></svg>',h=(h=document.getElementsByTagName("script"))[h.length-1].getAttribute("data-injectcss"),n=function(t,c){c.parentNode.insertBefore(t,c)};if(h&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}function s(){i||(i=!0,e())}function d(){try{o.documentElement.doScroll("left")}catch(t){return void setTimeout(d,50)}s()}c=function(){var t,c;(c=document.createElement("div")).innerHTML=l,l=null,(t=c.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",c=t,(t=document.body).firstChild?n(c,t.firstChild):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),c()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(e=c,o=t.document,i=!1,d(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,s())})}(window);
\ No newline at end of file
+!function(t){var c,a,o,e,i,l='<svg><symbol id="icon-shijian" viewBox="0 0 1024 1024"><path d="M878.08 731.274667a32 32 0 0 1-54.88-32.938667A360.789333 360.789333 0 0 0 874.666667 512c0-200.298667-162.368-362.666667-362.666667-362.666667S149.333333 311.701333 149.333333 512s162.368 362.666667 362.666667 362.666667a360.789333 360.789333 0 0 0 186.314667-51.445334 32 32 0 0 1 32.928 54.88A424.778667 424.778667 0 0 1 512 938.666667C276.362667 938.666667 85.333333 747.637333 85.333333 512S276.362667 85.333333 512 85.333333s426.666667 191.029333 426.666667 426.666667c0 78.293333-21.152 153.568-60.586667 219.274667z m-548.704-81.898667L480 498.741333V320a32 32 0 0 1 64 0v192a32 32 0 0 1-9.376 22.624l-160 160a32 32 0 1 1-45.248-45.248z"  ></path></symbol><symbol id="icon-guolv" viewBox="0 0 1024 1024"><path d="M283.884308 295.384615h456.231384l-169.865846 169.747693a19.692308 19.692308 0 0 0-5.750154 13.942154v300.347076l-42.653538-42.614153a19.692308 19.692308 0 1 0-27.844923 27.844923l76.248615 76.20923a19.692308 19.692308 0 0 0 33.634462-13.942153v-339.692308l197.710769-197.592615A19.692308 19.692308 0 0 0 787.692308 256H236.307692a19.692308 19.692308 0 0 0-13.902769 33.634462l212.795077 212.637538v199.601231a19.692308 19.692308 0 1 0 39.384615 0v-207.753846a19.692308 19.692308 0 0 0-5.789538-13.942154L283.884308 295.384615z"  ></path></symbol><symbol id="icon-shanchu1" viewBox="0 0 1024 1024"><path d="M256 256v608a32 32 0 0 0 32 32h448a32 32 0 0 0 32-32V256z m480 704H288a96 96 0 0 1-96-96V224a32 32 0 0 1 32-32h576a32 32 0 0 1 32 32v640a96 96 0 0 1-96 96z"  ></path><path d="M160 256a32 32 0 0 1 0-64h704a32 32 0 0 1 0 64z m192 192a32 32 0 0 1 64 0v256a32 32 0 0 1-64 0z m128 0a32 32 0 0 1 64 0v256a32 32 0 0 1-64 0z m128 0a32 32 0 0 1 64 0v256a32 32 0 0 1-64 0z"  ></path><path d="M647.04 128H376.96l-16 64h302.08zM704 256H320a32 32 0 0 1-32-39.68l32-128A32 32 0 0 1 352 64h320a32 32 0 0 1 32 24.32l32 128A32 32 0 0 1 704 256z"  ></path></symbol><symbol id="icon-jianchagengxin" viewBox="0 0 1024 1024"><path d="M511.3 808.6c-118.2 0-224.2-72-270.5-177.2h93.3c16.9 0 19.7-11.5 19.7-28.4s-2.8-30.6-19.7-30.6H167.8c-16.9 0-30.6 13.7-30.6 30.6v166.3c0 16.9 13.7 19.7 30.6 19.7 16.9 0 28.4-2.8 28.4-19.7v-93.6c58.9 114 177.9 192 315.1 192 195.8 0 354.4-158.7 354.4-354.4h-59.1c0.1 162.8-132.4 295.3-295.3 295.3zM854.9 237.6c-17 0-28.5 2.8-28.5 19.7v93.5c-58.9-114-177.9-192-315.1-192-195.7 0-354.4 158.7-354.4 354.5H216c0-162.9 132.5-295.4 295.4-295.4 118.2 0 224.2 71.9 270.6 177.2h-93.3c-16.9 0-19.7 11.5-19.7 28.4s2.8 30.6 19.7 30.6H855c16.9 0 30.6-13.7 30.6-30.6l0.1-166.3c-0.2-16.9-13.9-19.6-30.8-19.6z" fill="#666666" ></path></symbol><symbol id="icon-peizhiguanli1" viewBox="0 0 1024 1024"><path d="M164.3651123 282.19348144h0.49438478c0.57678223 0 54.79431153-0.82397461 134.88464354-0.98876952 12.35961914 43.75305176 52.65197754 75.88806153 100.36010743 75.88806152 57.51342773 0 104.23278809-46.80175781 104.23278809-104.23278808S457.53527832 148.62719727 400.02185058 148.62719727c-47.29614258 0-87.34130859 31.640625-100.03051757 74.89929199-80.74951172 0.16479492-135.46142578 0.98876953-136.12060548 0.98876952-15.90270997 0.24719239-28.59191895 13.34838867-28.34472655 29.3334961 0.24719239 15.73791504 13.10119629 28.34472656 28.83911133 28.34472656z m235.65673829-75.88806152c25.70800781 0 46.55456543 20.92895508 46.55456543 46.55456544S425.72985839 299.41455078 400.02185058 299.41455078s-46.55456543-20.92895508-46.55456542-46.55456543 20.84655762-46.55456543 46.55456543-46.55456543z m173.28186035 75.39367676h286.33117676c15.90270997 0 28.83911133-12.93640137 28.83911132-28.83911133s-12.93640137-28.83911133-28.83911133-28.83911133H573.30371094c-15.90270997 0-28.83911133 12.93640137-28.83911133 28.83911133s12.93640137 28.83911133 28.83911133 28.83911132z m287.56713867 193.55163574c-0.90637207 0-21.42333984-0.90637207-95.66345215-1.071167-12.68920898-43.258667-52.734375-74.899292-100.03051757-74.89929198-57.51342773 0-104.23278809 46.80175781-104.23278809 104.23278809 0 57.51342773 46.80175781 104.23278809 104.23278809 104.23278808 47.62573242 0 88.00048828-32.13500977 100.36010742-75.88806153 71.76818848 0.16479492 92.44995117 0.98876953 92.94433594 0.98876954h1.23596191c15.32592773 0 28.09753418-12.11242676 28.75671387-27.60314942 0.65917969-15.8203125-11.618042-29.33349609-27.60314942-29.99267578z m-195.69396973 74.899292c-25.70800781 0-46.55456543-20.92895508-46.55456543-46.55456544s20.92895508-46.55456543 46.55456544-46.55456543 46.55456543 20.92895508 46.55456542 46.55456543-20.84655762 46.55456543-46.55456542 46.55456543z m-171.55151366-75.47607423H164.3651123c-15.90270997 0-28.83911133 12.93640137-28.83911132 28.83911133s12.93640137 28.83911133 28.83911133 28.83911133h329.2602539c15.90270997 0 28.83911133-12.93640137 28.83911133-28.83911133s-12.93640137-28.83911133-28.83911132-28.83911133zM400.02185058 666.90722656c-47.29614258 0-87.34130859 31.640625-100.03051757 74.899292-80.74951172 0.16479492-135.46142578 0.98876953-136.12060548 0.98876952-15.90270997 0.24719239-28.59191895 13.34838867-28.34472655 29.3334961 0.24719239 15.73791504 13.10119629 28.34472656 28.83911133 28.34472656h0.49438476c0.57678223 0 54.79431153-0.82397461 134.88464355-0.98876953 12.35961914 43.75305176 52.65197754 75.88806153 100.36010743 75.88806152 57.51342773 0 104.23278809-46.80175781 104.23278809-104.23278809-0.08239747-57.43103028-46.80175781-104.23278809-104.31518556-104.23278808z m1e-8 150.78735352c-25.70800781 0-46.55456543-20.92895508-46.55456543-46.55456544S374.39624023 724.58544922 400.02185058 724.58544922s46.55456543 20.92895508 46.55456544 46.55456543-20.84655762 46.55456543-46.55456543 46.55456543z m459.6130371-75.39367676H573.30371094c-15.90270997 0-28.83911133 12.93640137-28.83911133 28.83911133s12.93640137 28.83911133 28.83911133 28.83911133h286.33117676c15.90270997 0 28.83911133-12.93640137 28.83911132-28.83911133s-12.85400391-28.83911133-28.83911133-28.83911133z" fill="#768696" ></path></symbol><symbol id="icon-biaoqianxiangqing" viewBox="0 0 1024 1024"><path d="M460.8 64L960 563.2 563.2 960 64 460.8l6.4-390.4L460.8 64z m-32 76.8l-281.6 6.4-6.4 281.6 422.4 422.4 288-288-422.4-422.4zM339.2 339.2c32-32 76.8-32 108.8 0S480 422.4 448 448c-25.6 32-76.8 32-108.8 0-25.6-25.6-25.6-76.8 0-108.8z"  ></path></symbol><symbol id="icon-back" viewBox="0 0 1024 1024"><path d="M593.109333 178.261333a42.666667 42.666667 0 0 1 61.994667 58.453334l-3.712 3.84-290.773333 271.914666 291.285333 281.173334a42.666667 42.666667 0 0 1-55.168 64.853333l-4.096-3.456-294.357333-284.288a85.333333 85.333333 0 0 1-1.109334-115.328l5.12-5.248 290.816-271.914667z"  ></path></symbol><symbol id="icon-backbeifen" viewBox="0 0 1024 1024"><path d="M347.093333 178.261333a42.666667 42.666667 0 0 0-61.952 58.453334l3.669334 3.84 290.773333 271.914666-291.285333 281.173334a42.666667 42.666667 0 0 0 55.210666 64.853333l4.053334-3.456 294.4-284.288a85.333333 85.333333 0 0 0 1.066666-115.328l-5.12-5.248-290.816-271.914667z"  ></path></symbol><symbol id="icon-ic_normal_dot" viewBox="0 0 1024 1024"><path d="M512 512m-512 0a512 512 0 1 0 1024 0 512 512 0 1 0-1024 0Z"  ></path></symbol><symbol id="icon-liushi" viewBox="0 0 1024 1024"><path d="M389.9 361.148h57.712V737H389.9V361.148z m173.138 0h57.713V737h-57.713V361.148z m144.282 0h57.712v205.269H707.32V361.148z m-461.703 0h57.713v205.269h-57.713V361.148zM182 274.641V217h664v57.641H182z"  ></path></symbol><symbol id="icon-shujubiao" viewBox="0 0 1024 1024"><path d="M896 864H128c-51.2 0-96-44.8-96-96V192c0-51.2 44.8-96 96-96h768c51.2 0 96 44.8 96 96v576c0 51.2-44.8 96-96 96zM128 160c-19.2 0-32 12.8-32 32v576c0 19.2 12.8 32 32 32h768c19.2 0 32-12.8 32-32V192c0-19.2-12.8-32-32-32H128z"  ></path><path d="M64 320h896v64H64zM64 544h896v64H64z"  ></path><path d="M256 320h64v480H256zM480 352h64V832h-64zM704 320h64v480h-64z"  ></path></symbol><symbol id="icon-sql" viewBox="0 0 1024 1024"><path d="M170.666667 0h682.666666a170.666667 170.666667 0 0 1 170.666667 170.666667v682.666666a170.666667 170.666667 0 0 1-170.666667 170.666667H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666667V170.666667a170.666667 170.666667 0 0 1 170.666667-170.666667z m0 56.888889a113.777778 113.777778 0 0 0-113.777778 113.777778v682.666666a113.777778 113.777778 0 0 0 113.777778 113.777778h682.666666a113.777778 113.777778 0 0 0 113.777778-113.777778V170.666667a113.777778 113.777778 0 0 0-113.777778-113.777778H170.666667z m-63.772445 561.095111c10.524444 9.216 24.576 16.782222 42.211556 22.698667 17.635556 5.916444 34.360889 8.874667 50.232889 8.874666 48.298667 0 72.419556-17.180444 72.419555-51.541333a45.511111 45.511111 0 0 0-7.736889-25.998222 74.353778 74.353778 0 0 0-21.333333-20.48 560.64 560.64 0 0 0-50.915556-27.306667c-34.531556-17.180444-57.230222-33.166222-68.266666-47.900444a82.488889 82.488889 0 0 1-16.384-50.574223c0-28.558222 11.491556-51.2 34.417778-67.982222 22.983111-16.725333 51.939556-25.088 86.926222-25.088 34.190222 0 59.335111 4.152889 75.320889 12.401778v48.469333c-20.764444-14.392889-46.990222-21.560889-78.677334-21.560889-21.048889 0-38.172444 4.437333-51.427555 13.198223a41.813333 41.813333 0 0 0-19.911111 36.807111c0 13.937778 4.551111 25.258667 13.767111 34.019555 9.216 8.704 29.127111 20.650667 59.790222 35.783111 33.792 16.099556 57.457778 32.256 70.883556 48.412445 13.482667 16.156444 20.252444 34.304 20.252444 54.442667 0 30.208-10.979556 53.418667-32.881778 69.575111-21.959111 16.156444-52.394667 24.234667-91.363555 24.234666-13.653333 0-29.525333-1.934222-47.672889-5.688889-18.147556-3.754667-31.345778-8.533333-39.651556-14.108444v-50.631111z m593.123556 153.998222c-10.808889 3.413333-23.779556 5.12-38.912 5.12-21.333333 0-41.528889-5.176889-60.529778-15.530666-19.057778-10.410667-45.397333-34.759111-79.018667-73.102223-46.08 0.284444-83.968-16.099556-113.664-49.152-29.696-32.995556-44.544-74.524444-44.544-124.643555 0-55.864889 15.018667-100.124444 45.112889-132.892445 30.037333-32.768 71.168-49.095111 123.335111-49.095111 46.933333 0 85.048889 16.042667 114.346667 48.184889 29.240889 32.142222 43.804444 74.012444 43.804444 125.553778 0 45.795556-10.24 84.195556-30.833777 115.370667-20.593778 31.118222-49.834667 51.2-87.779556 60.188444 19.114667 20.764444 35.384889 34.929778 48.924445 42.552889 13.425778 7.623111 28.444444 11.434667 45.056 11.434667 13.653333 0 25.201778-1.991111 34.702222-5.973334v41.984zM409.998222 511.089778c0 41.642667 10.638222 75.036444 31.857778 100.124444 21.276444 25.144889 49.038222 37.660444 83.228444 37.660445 36.750222 0 65.592889-12.003556 86.584889-36.124445 20.935111-24.064 31.459556-57.685333 31.459556-100.977778 0-44.430222-10.24-78.734222-30.776889-102.912-20.536889-24.120889-48.64-36.181333-84.366222-36.181333-35.100444 0-63.544889 12.743111-85.333334 38.229333-21.788444 25.486222-32.654222 58.88-32.654222 100.181334zM937.984 682.666667h-181.532444V338.488889h44.430222v304.867555h137.102222V682.666667z"  ></path></symbol><symbol id="icon-duijixiantu" viewBox="0 0 1024 1024"><path d="M197.973333 826.026667h669.013334c6.826667 0 10.24 3.413333 10.24 10.24v30.72c0 6.826667-3.413333 10.24-10.24 10.24H157.013333c-6.826667 0-10.24-3.413333-10.24-10.24V157.013333c0-6.826667 3.413333-10.24 10.24-10.24h30.72c6.826667 0 10.24 3.413333 10.24 10.24v669.013334z"  ></path><path d="M607.573333 570.026667l-105.813333 75.093333c-3.413333 3.413333-6.826667 3.413333-10.24 0l-133.12-78.506667c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 672.426667c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826666v81.92c0 3.413333 3.413333 10.24 10.24 10.24h576.853333c3.413333 0 10.24-3.413333 10.24-10.24v-235.52c0-6.826667-6.826667-10.24-10.24-10.24l-215.04 54.613334c3.413333 0 3.413333 0 0 0m-17.066666-187.733334l-105.813334 92.16c-3.413333 3.413333-6.826667 3.413333-10.24 0l-116.053333-68.266666c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 512c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826667v102.4c0 6.826667 10.24 13.653333 13.653333 6.826666l95.573334-92.16c3.413333-3.413333 6.826667-3.413333 10.24 0l133.12 78.506667c3.413333 3.413333 6.826667 0 10.24 0l109.226666-75.093333h3.413334l211.626666-54.613334c3.413333 0 6.826667-3.413333 6.826667-10.24V327.68c0-6.826667-6.826667-10.24-10.24-10.24l-225.28 61.44c0 3.413333-3.413333 3.413333-3.413333 3.413333"  ></path></symbol><symbol id="icon-leiji" viewBox="0 0 1024 1024"><path d="M75.09333333 930.48604445h146.80064v-403.11921778H75.09333333v403.11921778z m366.41905778 0h146.80064v-879.63875556H441.51239111v879.63875556z m366.41905778-623.32017778v623.32017778H954.73208889v-623.32017778h-146.80064z"  ></path></symbol><symbol id="icon-zhexian" viewBox="0 0 1024 1024"><path d="M612.393 653.575L386.757 427.94l35.355-35.355L647.748 618.22z"  ></path><path d="M576.84 617.98l332.902-332.904 35.355 35.355-332.903 332.903zM62.698 752.029l338.984-338.984 35.355 35.355L98.053 787.384z"  ></path></symbol><symbol id="icon-fenbutu" viewBox="0 0 1024 1024"><path d="M0 1024v-93.090909h1024v93.090909H0z m837.818182-837.818182h186.181818v651.636364H837.818182V186.181818zM558.545455 465.454545h186.181818v372.363637H558.545455V465.454545zM279.272727 0h186.181818v837.818182H279.272727V0zM0 279.272727h186.181818v558.545455H0V279.272727z"  ></path></symbol><symbol id="icon-tongjitu" viewBox="0 0 1024 1024"><path d="M850.832544 671.454642L529.987165 491.420289V132.101667c0-20.174482-16.427134-35.81981-36.47575-35.81981-118.232798 0-225.035266 45.938262-302.638715 121.16764l-0.499373 0.531096-0.280386 0.218988C112.739179 293.210995 64.303027 397.234163 64.303027 511.875157c0 114.610294 48.436152 218.163765 125.789914 293.613154l0.280386 0.249687c77.603449 75.262124 184.906314 121.980145 303.138088 121.980145 75.574233 0 148.399865-19.423375 211.980949-54.525847l1.873674-1.249457c63.768349-35.599799 118.170376-87.940888 156.518776-151.271262l0.499374-0.74906c10.431583-17.426905 4.123924-38.84982-13.551644-48.467875zM670.892335 810.29785l-1.873674 1.311879c-52.089355 28.980032-113.048729 44.906769-175.506222 44.906769-98.464569 0-187.529047-38.660508-251.579829-100.744495-64.331167-62.582337-103.929024-148.773372-103.929024-243.896846 0-94.935186 39.597857-180.783413 103.930047-243.64716 56.242955-54.525847 131.255393-90.906429 214.604706-98.995665v342.642825c0 14.614859 8.838296 27.012214 21.360494 32.7898l303.16981 169.697937c-29.481452 39.159882-67.205635 72.200392-110.176308 95.934956z m180.752714-605.464695c-62.33265-60.58382-146.651035-99.744725-239.900836-105.022938V445.701015L920.597467 618.677625c10.992355-21.98471 20.360723-44.156686 26.606984-67.673286 8.306176-30.29191 12.491499-61.364603 12.491499-93.186356 0-98.714256-41.159422-188.840926-108.050901-252.984828z" fill="#7E7E7E" ></path></symbol></svg>',h=(h=document.getElementsByTagName("script"))[h.length-1].getAttribute("data-injectcss"),n=function(t,c){c.parentNode.insertBefore(t,c)};if(h&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}function s(){i||(i=!0,o())}function d(){try{e.documentElement.doScroll("left")}catch(t){return void setTimeout(d,50)}s()}c=function(){var t,c=document.createElement("div");c.innerHTML=l,l=null,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(t=document.body).firstChild?n(c,t.firstChild):t.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),c()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(o=c,e=t.document,i=!1,d(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,s())})}(window);
\ No newline at end of file
diff --git a/web/static/img/iconfont/iconfont.json b/web/static/img/iconfont/iconfont.json
index 3232510..aff3088 100644
--- a/web/static/img/iconfont/iconfont.json
+++ b/web/static/img/iconfont/iconfont.json
@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "11372699",
+      "name": "时间",
+      "font_class": "shijian",
+      "unicode": "e8b8",
+      "unicode_decimal": 59576
+    },
     {
       "icon_id": "3369493",
       "name": "过滤",
diff --git a/web/static/img/iconfont/iconfont.ttf b/web/static/img/iconfont/iconfont.ttf
index fd71df8691ad71fef4193a3d89a9d5a8e9a22c40..740be0edd0799f4c750791dd2075bc93af99107b 100644
GIT binary patch
delta 898
zcmX|-Ur19?9LIm>{yVwdP4Bjxv-yWLH=z(2^Ul(;mqLgLL<C>T%Un)zbEJelt<a!{
z9?VPmW>VNgy$HSx@xgk~*S*w}m`I$BC<-F*C2qg7qn*R&p7Z<N-=FXA97fBrrAYDS
zQvmV|0LIcetFRUscmg0Lk<!HU!+R^4o)mx@0C0WHW~}k{om*QNdx)4>bkHyIGTyh5
zXf`)DKM0P4^}eG$I6afL!Z(_J0Vv##<*fMv>3|pbzX|R3yp_u|oO{#10Z@O84JQgS
zvvXx<_cwrV3<G{V-#$O!1A<p%WToTh-TMAN;8xH9a8O=6I6WQ5d882eG1_N9;$B=l
z&u6!i4XIkP%jBx<k}k#fYi@wgAlGge@pNJAJ}B@G6I!7GJzjfCYK~S*d=>_bGB@)u
zgN0ce>tqGCP%$d;$|(PD6S?I&!L;`OI|5=yL2R53TWDBV#nKcNda#)rbsFFW9qPCc
zqHPjcB1N?M+OK^9Be1^!s{q4D4wuZR04oD?3$O<;j{v&?<M{~o1r`>d0$?oy)B>zc
zfU1BMJMn{{Kwt#{N(Htc;E&4|1zcR^1RMk^aRDEpGAh8~pjr}~y!<%4Cf#IJx+5)1
zThfu-Ae-`%a#?w+d{mB#s!P3(?XivXNq#S1fG)TO(BUOrBxNS!v3M*(HL3-Ijlsr5
z%4{WQM7TSdGE-)PyUzyHR8P`OG`5gHJ;6-Ll=Czcq%@i69va>q9_mi;%if3{@@jhK
zTiWXF>+7}B)wFfHx9{)jioe-kx273}uBz+0<_+m1d#6dY>?EbZ5WRAeBa-JH_+M^%
q{C>}l$F-)Zs&4Ri-#k{<b>g#Ejfk80fzD<przWku{lR#JBmM)2g~S#B

delta 642
zcmX|-KS*0a9LK+R@5NLTjW1OYjj6;?6{K`&ht@w>oLssIF4c!sQ%E#m1_d$Nb`mL-
zM<)lxfRmuutw;x#E+Qd_n^Y7oL&d3u;`037JK8%wclZ0<@4mm^@5+xa)1Ontksd&-
z1DKf1x%t)C-@XI#DcPCHE>0gtPTv9cU!X3LnR4GI`&$c)y(G^wbcBCe8$2J8bS76=
z7>4gt?}qkpc5c#bF1H->{h7YcxeIxb#uwhV(C(OZb5o6NrM?3o*2IJ}`MLSRZRxiF
zoFxWaZya?FI-sfP-+cIEJl6LI5t|O+;?u8}|90Q^S8QRe(tZG`y&U?T<0Zv`td4nQ
zG2q4Jv#v_u22NlFr(W)LjIF@NHXkI=NKe$8m95^IOiJJP9II_e@FMwtcEHRO^aL7E
zix6Uzkf=cz(LhvCsvZ$m1W{9REKy`=lmO*m1p}aX)KCP9C2J@L6*f>9Dq>&?sComF
zK{*E9vPu|O093nyr9eG0Fmn;An+9QhP<exHUwts>FHs*2y0|J6XxIm;T?Tf9>X<?I
y7K{O$h!^5cK9QqxS?<Y-)oY#Guk1JWvb`H>2)-I$uR>c<;dt-kDFJUkzI6|X(tO|m

diff --git a/web/static/img/iconfont/iconfont.woff b/web/static/img/iconfont/iconfont.woff
index c08646be790ca76176392f56eafe5d02b54e95a1..5de67b08cf2da6f91f6dae339f61ceda2764f163 100644
GIT binary patch
delta 2802
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
E0G4hd;Q#;t

delta 2654
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
M@dep+J6iw%029H|R{#J2

diff --git a/web/static/img/iconfont/iconfont.woff2 b/web/static/img/iconfont/iconfont.woff2
index 5b744385e9328800acf664f08959350321f29226..f16644c92e60b0d1f98b77e3150451600f7e988a 100644
GIT binary patch
delta 2651
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
JdBy+$003RA{6zo&

delta 2542
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
E00?Q(jsO4v