From a6f244fee0bddf5463352ddcd4060840b794c4a8 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Wed, 25 Aug 2021 19:45:44 +0800
Subject: [PATCH] 111

---
 web/pages/dashboard.html                |   4 +-
 web/pages/event.html                    |   4 +-
 web/pages/globalfilter.html             |   8 +-
 web/pages/modeltable.html               |   6 +-
 web/pages/returnvisitevent.html         |   6 +-
 web/src/x.min.js                        | 127 +++++++++++++++++++++---
 web/srczip/common.js                    |   7 +-
 web/srczip/logic/dashboard.js           |  36 ++++++-
 web/srczip/logic/retained.js            |  21 ++--
 web/static/css/daterangepicker.css      |   2 +-
 web/static/css/style.css                |  62 +++++++++++-
 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 3032 -> 3156 bytes
 web/static/img/iconfont/iconfont.woff   | Bin 2064 -> 2156 bytes
 web/static/img/iconfont/iconfont.woff2  | Bin 1588 -> 1640 bytes
 web/static/img/rli.png                  | Bin 1974 -> 230 bytes
 19 files changed, 288 insertions(+), 43 deletions(-)

diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 2de1559..0aea20e 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -168,8 +168,8 @@
                 </div>
             </div>
         </div>
-        <div style="padding: 15px; height: calc(100% - 17px); overflow-y:auto; ">
-
+        <div style="padding: 15px 0px 15px 15px; height: calc(100% - 17px); overflow-y:auto;">
+            
             <div class="layui-row layui-col-space15" id="model-box" style="width: 100%; height: 780px;">
                 
                 <!-- <div class="layui-row layui-col-space15" id="model-box" style="width: 100%; height: 780px;">
diff --git a/web/pages/event.html b/web/pages/event.html
index 37ee923..e808f0a 100644
--- a/web/pages/event.html
+++ b/web/pages/event.html
@@ -33,7 +33,9 @@
                                 <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
                                 <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}">{{items.comparatorName}}</div>
                                 {{#  if(items.comparator != "is null" && items.comparator != "is not null" && items.comparator !="not null" && items.comparator != "range"){ }}
-                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <div class="analysis-zhibiao-list-type4" >
+                                     <input type="text" id="analysis-zhibiao-list-type4-{{indexs}}" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> 
+                                </div>
                                 {{#  } }} 
                                 <div class="analysis-zhibiao-list-del analysis-zhibiao-list-del-initial-event" data-twonum="{{indexs}}"></div>
                             </div>
diff --git a/web/pages/globalfilter.html b/web/pages/globalfilter.html
index 1cc2b70..1c99cff 100644
--- a/web/pages/globalfilter.html
+++ b/web/pages/globalfilter.html
@@ -4,11 +4,13 @@
         <div class="analysis-overall-situation-list">
             <div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.columnName}}</div>
             <div class="analysis-overall-situation-fuhao" id="analysis-overall-situation-fuhao-{{index}}" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
-            {{#  if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }}
-                <div class="analysis-overall-situation-input" > <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}"/> </div>
+            {{#  if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
+                <div class="analysis-overall-situation-input" > 
+                    <input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}"/> 
+                </div>
             {{#  } }} 
 
-            {{#  if(item.comparator_id === "range"){ }}
+            {{#  if(item.comparator === "range"){ }}
                 <div class="analysis-overall-situation-input2" > <input data-index="{{index}}" type="text" value="{{item.section[0]}}" name="start"/> <span>与</span> <input data-index="{{index}}" name="end" type="text" value="{{item.section[1]}}"/> <span>之间</span> </div>
             {{#  } }} 
             <p class="analysis-overall-situation-del" data-index="{{index}}"> <img src="./static/img/cha1.png"> </p>
diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index e3df95a..2fee341 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -17,7 +17,7 @@
                             <div class="tishi model-fuzhi" title="复制" data-id="{{d.id}}" >
                                 <img src="./static/img/fuzhi2.png" />
                             </div>
-                            <div class="tishi" title="更多">
+                            <div class="tishi model-gengduo" title="更多">
                                 <img src="./static/img/gengduo.png" />
                             </div>
                         </div>
@@ -67,7 +67,7 @@
                             <div class="tishi model-fuzhi" title="复制" data-id="{{d.id}}">
                                 <img src="./static/img/fuzhi2.png" />
                             </div>
-                            <div class="tishi" title="更多">
+                            <div class="tishi model-gengduo" title="更多">
                                 <img src="./static/img/gengduo.png" />
                             </div>
                         </div>
@@ -197,7 +197,7 @@
                             <div class="tishi model-fuzhi" title="复制" data-id="{{d.id}}">
                                 <img src="./static/img/fuzhi2.png" />
                             </div>
-                            <div class="tishi" title="更多">
+                            <div class="tishi model-gengduo" title="更多">
                                 <img src="./static/img/gengduo.png" />
                             </div>
                         </div>
diff --git a/web/pages/returnvisitevent.html b/web/pages/returnvisitevent.html
index 2694386..546298e 100644
--- a/web/pages/returnvisitevent.html
+++ b/web/pages/returnvisitevent.html
@@ -28,9 +28,9 @@
                     <div style="padding-bottom: 10px;" class="analysis-zhibiao-list2-box">
                         {{#  layui.each(d.filts, function(indexs, items){ }}
                             <div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{indexs}}">
-                                <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="0" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
-                                <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="0" data-indexs="{{indexs}}">{{items.comparatorName}}</div>
-                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="0" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <div id="ta-property-select-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="1" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
+                                <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="1" data-indexs="{{indexs}}">{{items.comparatorName}}</div>
+                                <div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{indexs}}"> <input type="text" data-index="1" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
                                 <div class="analysis-zhibiao-list-del analysis-zhibiao-list-del-return-event" data-twonum="{{indexs}}"></div>
                             </div>
                         {{#  }); }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index e6a21f6..7973429 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -25,6 +25,11 @@ var X = window.X || {
                 {'title':'复制看板','img':'fuzhi.png','click':'copy'}
             ]
         },
+        'gengduolist':[
+            {'title':'报表设置','id':'shezhi'},
+            {'title':'数据导出','id':'export'},
+            {'title':'报表移除','id':'del'},
+        ],
         //用户搜索条件
         'search':{
             category:[
@@ -342,7 +347,7 @@ var X = window.X || {
                 '今日': [moment(), moment()],
                 '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
                 '最近7日': [moment().subtract(7, 'days'), moment().subtract(0, 'days')],
-                '最近30日': [moment().subtract(30, 'days'), moment().subtract(1, 'days')],
+                '最近30日': [moment().subtract(30, 'days'), moment().subtract(0, 'days')],
                 '上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000],
                 '本周': [moment().startOf('week')+86400000, moment()+86400000],
                 '本月': [moment().startOf('month'), moment()],
@@ -4148,7 +4153,7 @@ var X = window.X || {
                 })
                 
             });
-            console.log(eventdata);
+            
             // 留存分析模板特定留存流失按钮
             var retentionlist = [
                 {'title':'留存','id':0},
@@ -4169,8 +4174,40 @@ var X = window.X || {
                     })
                     
                 })
-            }
+            };
 
+            //更多按钮配置下拉框
+            X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
+                console.log(eventdata);
+                if(d.id == 'shezhi'){
+                    var data = {
+                        id : eventdata.id,
+                        modelsize : eventdata.modelsize,
+                        modeltype : eventdata.modeltype
+                    }
+                    X.parametersopen(data,'setupbaobiao',"auto",function(d){
+
+                    })
+                }else if(d.id == 'export'){
+                    layer.msg('暂未开放功能');
+                }else {
+
+                    layer.confirm('确认移除['+ eventdata.name + ']', {
+                        btn: ['取消','删除 '] //按钮
+                      }, function(){
+                        //取消
+                        layer.close(layer.index);
+                      }, function(){
+                        //删除
+                        X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
+                            X.pageLogic['dashboard'].gettabledata();
+                        });
+                    });
+
+                    
+
+                }
+            })
 
             if(eventdata['modeltype'] == 'echarts' && eventdata['modelsize'] != 'small' ){
                 var myChart = echarts.init(document.getElementById(eventdata['id']));
@@ -8087,7 +8124,7 @@ var X = window.X || {
                 })
             });
 
-            $(document).off('click','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
+            $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
                 var indexs = $(this).attr('data-indexs');
                 var txt = $(this).val();
@@ -8100,12 +8137,13 @@ var X = window.X || {
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var screentypedata = groupitemeventsdata[0];
+                console.log(screentypedata);
                 var drr={
                     "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
                     "column_id":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
@@ -8149,8 +8187,8 @@ var X = window.X || {
                     data['eventView']['filts'][index]['column_id'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
-                    data['eventView']['filts'][index]['comparator_id'] = '==';
-                    data['eventView']['filts'][index]['tableType'] = val.tableType;
+                    data['eventView']['filts'][index]['comparator'] = '==';
+                    data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
                     analysisdown();//渲染下拉框
                 })
@@ -8162,7 +8200,7 @@ var X = window.X || {
                     X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
                         $(this).html(val.title);
                         data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator_id'] = val.id;
+                        data['eventView']['filts'][i]['comparator'] = val.id;
                         if(val.id == "range"){
                             data['eventView']['filts'][i]['ftv'] = [-1,1];
                         }
@@ -8173,6 +8211,14 @@ var X = window.X || {
                 }
             };
 
+            $(document).off('click','.analysis-overall-situation-input input').on('change','.analysis-overall-situation-input input',function(){
+                var index = $(this).attr('data-index');
+                var val = $(this).val();
+                var valarr = val.split(",");
+                data['eventView']['filts'][index]['ftv']=valarr;
+                data['eventView']['filts'][index]['strftv']=val;
+            })
+
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
@@ -8200,7 +8246,6 @@ var X = window.X || {
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     data.eventView.groupBy[index]['columnName'] = val.title;
@@ -8215,9 +8260,9 @@ var X = window.X || {
                     var obj = $(this);
                     var offset = obj.offset();
                     // if(querydata){
-                        X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
-                        
-                        })
+                    X.querycriteriapop(data,'conditionquery',offset.left - 410,offset.top+obj.height(),function(){
+                    
+                    })
                     // }else {
                     //     layer.msg('请先计算');
                     // }
@@ -8255,6 +8300,7 @@ var X = window.X || {
 
             // 计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
+                // console.log(data);
                 retaineddata()
             });
 
@@ -9698,6 +9744,63 @@ var X = window.X || {
     };
 })();
 
+// srczip/logic/setupbaobiao.js
+(function(){
+    X.pageLogic['setupbaobiao'] = {
+        init : function(parms){
+            var me = this;
+            this.parms = parms;
+            var data = parms.extData;
+            var report_id = [];
+            console.log(data);
+            report_id.push(data.id);
+            X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_id},function(d){
+                console.log(d);
+                $('.setupbaobiao-title').val(d[0]['name']);
+                $('.setupbaobiao-textarea').html(d[0]['desc']);
+                // 初始化时间
+                var endTime = d[0]['query']['eventView']['endTime'];
+                var startTime = d[0]['query']['eventView']['startTime'];
+                $(".setupbaobiao-time").html(startTime +' - '+ endTime);
+                if(data.modeltype == "table"){ //初始化图表类型
+                    $("#setupbaobiao-table").addClass("icon___XxbtJ");
+                }else {
+                    $("#setupbaobiao-echarts").addClass("icon___XxbtJ");
+                }
+                //初始化窗体大小
+                if(data.modelsize == 'in'){ //中图
+                    $("#setupbaobiao-in").prop("checked",true);
+                }else if( data.modelsize == 'small' ){//小图
+                    $("#setupbaobiao-small").prop("checked",true);
+                }else{//大图
+                    $("#setupbaobiao-large").prop("checked",true);
+                }
+            });
+
+            X.daterender(".setupbaobiao-rli-box2",function(start, end, label){
+                var startTime = start.format('YYYY-MM-DD')+ " "+ "00:00:00";
+                var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
+                console.log(startTime);
+                console.log(endTime);
+            });
+            
+
+            $(document).off('click','.shape___2nUUi').on('click','.shape___2nUUi',function(){
+                $('.shape___2nUUi').removeClass('icon___XxbtJ');
+                $(this).addClass('icon___XxbtJ');
+            });
+
+            $(document).off('click','.setupbaobiao-xq').on('click','.setupbaobiao-xq',function(){
+                layer.closeAll();
+            });
+
+            $(document).off('click','.setupbaobiao-yy').on('click','.setupbaobiao-yy',function(){
+
+            });
+
+        }
+    };
+})();
 // srczip/logic/sqlquery.js
 (function(){
     X.pageLogic['sqlquery'] = {
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 3602c13..8d258fa 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -24,6 +24,11 @@ var X = window.X || {
                 {'title':'复制看板','img':'fuzhi.png','click':'copy'}
             ]
         },
+        'gengduolist':[
+            {'title':'报表设置','id':'shezhi'},
+            {'title':'数据导出','id':'export'},
+            {'title':'报表移除','id':'del'},
+        ],
         //用户搜索条件
         'search':{
             category:[
@@ -341,7 +346,7 @@ var X = window.X || {
                 '今日': [moment(), moment()],
                 '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
                 '最近7日': [moment().subtract(7, 'days'), moment().subtract(0, 'days')],
-                '最近30日': [moment().subtract(30, 'days'), moment().subtract(1, 'days')],
+                '最近30日': [moment().subtract(30, 'days'), moment().subtract(0, 'days')],
                 '上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000],
                 '本周': [moment().startOf('week')+86400000, moment()+86400000],
                 '本月': [moment().startOf('month'), moment()],
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 60effca..b8c4ca0 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -519,7 +519,7 @@
                 })
                 
             });
-            console.log(eventdata);
+            
             // 留存分析模板特定留存流失按钮
             var retentionlist = [
                 {'title':'留存','id':0},
@@ -540,8 +540,40 @@
                     })
                     
                 })
-            }
+            };
 
+            //更多按钮配置下拉框
+            X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
+                console.log(eventdata);
+                if(d.id == 'shezhi'){
+                    var data = {
+                        id : eventdata.id,
+                        modelsize : eventdata.modelsize,
+                        modeltype : eventdata.modeltype
+                    }
+                    X.parametersopen(data,'setupbaobiao',"auto",function(d){
+
+                    })
+                }else if(d.id == 'export'){
+                    layer.msg('暂未开放功能');
+                }else {
+
+                    layer.confirm('确认移除['+ eventdata.name + ']', {
+                        btn: ['取消','删除 '] //按钮
+                      }, function(){
+                        //取消
+                        layer.close(layer.index);
+                      }, function(){
+                        //删除
+                        X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
+                            X.pageLogic['dashboard'].gettabledata();
+                        });
+                    });
+
+                    
+
+                }
+            })
 
             if(eventdata['modeltype'] == 'echarts' && eventdata['modelsize'] != 'small' ){
                 var myChart = echarts.init(document.getElementById(eventdata['id']));
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index e7b5369..350fd7b 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -329,7 +329,7 @@
                 })
             });
 
-            $(document).off('click','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
+            $(document).off('change','.analysis-zhibiao-list-type4 input').on('change','.analysis-zhibiao-list-type4 input',function(){
                 var index = $(this).attr('data-index');
                 var indexs = $(this).attr('data-indexs');
                 var txt = $(this).val();
@@ -342,12 +342,13 @@
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
                 var screentypedata = groupitemeventsdata[0];
+                console.log(screentypedata);
                 var drr={
                     "columnName":screentypedata[0]['category'][0]['title'],//事件中文显示
                     "column_id":screentypedata[0]['category'][0]['id'],//事件id
                     'data_type':screentypedata[0]['category'][0]['data_type'],//类型
                     'comparator_name':'等于',//默认等于
-                    "comparator_id":'==',//符号id
+                    "comparator":'==',//符号id
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
@@ -391,8 +392,8 @@
                     data['eventView']['filts'][index]['column_id'] = val.id;
                     data['eventView']['filts'][index]['data_type'] = val.type;
                     data['eventView']['filts'][index]['comparator_name'] = '等于';
-                    data['eventView']['filts'][index]['comparator_id'] = '==';
-                    data['eventView']['filts'][index]['tableType'] = val.tableType;
+                    data['eventView']['filts'][index]['comparator'] = '==';
+                    data['eventView']['filts'][index]['tableType'] = val.table_type;
                     filtsftvdata[index]=val.category;
                     analysisdown();//渲染下拉框
                 })
@@ -404,7 +405,7 @@
                     X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){
                         $(this).html(val.title);
                         data['eventView']['filts'][i]['comparator_name'] = val.title;
-                        data['eventView']['filts'][i]['comparator_id'] = val.id;
+                        data['eventView']['filts'][i]['comparator'] = val.id;
                         if(val.id == "range"){
                             data['eventView']['filts'][i]['ftv'] = [-1,1];
                         }
@@ -415,6 +416,14 @@
                 }
             };
 
+            $(document).off('click','.analysis-overall-situation-input input').on('change','.analysis-overall-situation-input input',function(){
+                var index = $(this).attr('data-index');
+                var val = $(this).val();
+                var valarr = val.split(",");
+                data['eventView']['filts'][index]['ftv']=valarr;
+                data['eventView']['filts'][index]['strftv']=val;
+            })
+
             // 分组项
             $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() {
                 var index = $(this).attr("data-index");
@@ -442,7 +451,6 @@
                 var offset = obj.offset();
                 var index = obj.attr("data-index");
                 X.querycriteriapop(groupitemeventsdata[0],'category',offset.left,offset.top+obj.height(),function(val){
-                    console.log(val);
                     var htmlstring = val.title;
                     obj.html(htmlstring);
                     data.eventView.groupBy[index]['columnName'] = val.title;
@@ -497,6 +505,7 @@
 
             // 计算按钮
             $(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
+                // console.log(data);
                 retaineddata()
             });
 
diff --git a/web/static/css/daterangepicker.css b/web/static/css/daterangepicker.css
index 23d30ac..21a2581 100644
--- a/web/static/css/daterangepicker.css
+++ b/web/static/css/daterangepicker.css
@@ -10,7 +10,7 @@
   margin-top: 7px;
   top: 100px;
   left: 20px;
-  z-index: 19891015;
+  z-index: 199891015;
   display: none;
   font-family: arial;
   font-size: 15px;
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 1c96846..9936ef2 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -23,6 +23,36 @@
 /* .layui-nav .layui-nav-child dd.layui-this a, .layui-nav-child dd.layui-this { background-color: #f6f8fa !important; } */
 .controlhover:hover > .control { display: block; }
 
+::-webkit-scrollbar { 
+    width:5px; 
+    height:5px; 
+    background-color:#F5F5F5; 
+}
+/* 滚动条上的按钮 (上下箭头). */
+::-webkit-scrollbar-button {
+    height: 0px;
+    width: 0px;
+}
+/* 滚动条上的滚动滑块. */
+::-webkit-scrollbar-thumb { 
+    background-color:#e6e6e6; 
+    border-radius: 50px;
+}
+/*  滚动条轨道. */
+::-webkit-scrollbar-track { 
+    -webkit-box-shadow:inset 0 0 6px rgba(0, 142, 255, 1); 
+    box-shadow:inset 0 0 6px rgba(0, 142, 255, 1, 1); 
+    background-color:#F5F5F5; 
+}
+/* 滚动条没有滑块的轨道部分 */
+::-webkit-scrollbar-track-piece {
+    background-color: #fff;
+}
+/* 当同时有垂直滚动条和水平滚动条时交汇的部分. */
+::-webkit-scrollbar-corner {
+    background:transparent;
+}
+
 .dad-noSelect,.dad-noSelect *{
     -webkit-touch-callout: none;
     -webkit-user-select: none;
@@ -533,6 +563,34 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
 .fu { transform:rotate(180deg); border-bottom: 3px solid #ff5d5d; }
 .funum { color: #ff5d5d !important; }
 
-/* 重命名 */
-
+/* 报表设置 */
+.setupbaobiao-box { width: 880px; height: 460px; }
+.setupbaobiao-top-box { padding: 0 20px;  font-size: 14px; height: 60px; display: flex; align-items: center; justify-content: space-between; background-color: #f0f2f5; }
+.setupbaobiao-but-box { display: flex; align-items: center; }
+.setupbaobiao-xq{ padding-right: 20px; cursor: pointer; color: #42546d; }
+.setupbaobiao-xq:hover { color: #4fa1ff; }
+.setupbaobiao-yy { color: #fff; line-height: 30px; background-color: #3d90ff; height: 32px; padding: 0 16px; border-radius: 2px; cursor: pointer; }
+.setupbaobiao-yy:hover { background-color: #4fa1ff; }
+.setupbaobiao-top-box p { color: #42546d; }
+.setupbaobiao-content-box { display: flex; }
+.setupbaobiao-left-box { width: 50%; min-height: 400px; padding-bottom: 0px; border-right: 1px solid #f0f0f0; }
+.setupbaobiao-right-box { width: 50%; min-height: 400px; padding-bottom: 0px; }
+.setupbaobiao-con-top-box { font-size: 12px; color: #42546d; height: 60px; padding: 0 0 0 20px; line-height: 60px; border-bottom: 1px solid #f0f0f0; }
+.setupbaobiao-left-from { padding-top: 16px;  }
+.setupbaobiao-left-from-list-box { display: flex; align-items: flex-start; width: 100%; min-height: 50px; margin-bottom: 10px; padding-left: 20px; padding-right: 10px; }
+.setupbaobiao-left-from-list-title { color: #42546d; display: flex; align-items: center; width: 120px; height: 32px; font-weight: 500; font-size: 14px; line-height: 16px; }
+.setupbaobiao-left-from-list-input { display: inline-block; width: 100%; line-height: 32px; }
+.setupbaobiao-left-from-list-input input { width: 240px; height: 32px; padding: 0 8px; color: #42546d; font-size: 14px; line-height: 30px; border: 1px solid #f0f0f0; border-radius: 2px; }
+.setupbaobiao-left-from-list-input select { appearance:none; -moz-appearance:none; -webkit-appearance:none; background: url("http://ourjs.github.io/static/2015/arrow.png") no-repeat scroll 90% center transparent; height: 32px; line-height: 30px; padding: 0 24px 0 8px; color: #42546d; font-size: 13px; border: 1px solid #f0f0f0; border-radius: 2px; }
+.setupbaobiao-left-from-list-input textarea { resize: none; width: 240px; min-height: 32px; padding: 0 8px; color: #42546d; font-size: 14px; line-height: 30px; border: 1px solid #f0f0f0; border-radius: 2px;  }
+.setupbaobiao-right-from { padding-top: 16px; overflow: hidden; }
+.setupbaobiao-rli-box { width: 100%; line-height: 32px; }
+.setupbaobiao-rli-box2 { display: inline-block; min-width: 80px; height: 28px; padding: 0 8px; font-size: 13px; line-height: 26px; border: 1px solid #f0f0f0; border-radius: 2px; cursor: pointer; color: #42546d; }
+.setupbaobiao-charttype { display: flex; align-items: center; }
+.shape___2nUUi { width: 28px; height: 28px; color: #67729d; line-height: 28px; text-align: center; border: 1px solid #f0f0f0; cursor: pointer; }
+.icon___XxbtJ { color: #fff; background: #3d90ff; }
+.setupbaobiao-left-from-list-radio { display: inline-block; width: 100%; line-height: 32px; }
+.setupbaobiao-left-from-list-radio-box { display: flex; color: #42546d; }
+.setupbaobiao-left-from-list-radio-box input { position: relative; top: 2px; margin-right: 5px; }
+.setupbaobiao-zs { color: #42546d; font-size: 12px; line-height: 20px; margin-bottom: 10px; padding: 0 10px 0 20px; }
 
diff --git a/web/static/img/iconfont/demo_index.html b/web/static/img/iconfont/demo_index.html
index bb9f811..2f05aff 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">&#xe759;</span>
+                <div class="name">点</div>
+                <div class="code-name">&amp;#xe759;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe601;</span>
                 <div class="name">流失</div>
@@ -120,9 +126,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1623376633178') format('woff2'),
-       url('iconfont.woff?t=1623376633178') format('woff'),
-       url('iconfont.ttf?t=1623376633178') format('truetype');
+  src: url('iconfont.woff2?t=1629862645788') format('woff2'),
+       url('iconfont.woff?t=1629862645788') format('woff'),
+       url('iconfont.ttf?t=1629862645788') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -148,6 +154,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-ic_normal_dot"></span>
+            <div class="name">
+              点
+            </div>
+            <div class="code-name">.icon-ic_normal_dot
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-liushi"></span>
             <div class="name">
@@ -247,6 +262,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-ic_normal_dot"></use>
+                </svg>
+                <div class="name">点</div>
+                <div class="code-name">#icon-ic_normal_dot</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-liushi"></use>
diff --git a/web/static/img/iconfont/iconfont.css b/web/static/img/iconfont/iconfont.css
index 5e2ff87..e33e11d 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=1623376633178') format('woff2'),
-       url('iconfont.woff?t=1623376633178') format('woff'),
-       url('iconfont.ttf?t=1623376633178') format('truetype');
+  src: url('iconfont.woff2?t=1629862645788') format('woff2'),
+       url('iconfont.woff?t=1629862645788') format('woff'),
+       url('iconfont.ttf?t=1629862645788') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-ic_normal_dot:before {
+  content: "\e759";
+}
+
 .icon-liushi:before {
   content: "\e601";
 }
diff --git a/web/static/img/iconfont/iconfont.js b/web/static/img/iconfont/iconfont.js
index b74013f..6c6ca76 100644
--- a/web/static/img/iconfont/iconfont.js
+++ b/web/static/img/iconfont/iconfont.js
@@ -1 +1 @@
-!function(t){var e,c,o,i,n,h,l='<svg><symbol id="icon-liushi" viewBox="0 0 1024 1024"><path d="M389.9 361.148h57.712V737H389.9V361.148z m173.138 0h57.713V737h-57.713V361.148z m144.282 0h57.712v205.269H707.32V361.148z m-461.703 0h57.713v205.269h-57.713V361.148zM182 274.641V217h664v57.641H182z"  ></path></symbol><symbol id="icon-shujubiao" viewBox="0 0 1024 1024"><path d="M896 864H128c-51.2 0-96-44.8-96-96V192c0-51.2 44.8-96 96-96h768c51.2 0 96 44.8 96 96v576c0 51.2-44.8 96-96 96zM128 160c-19.2 0-32 12.8-32 32v576c0 19.2 12.8 32 32 32h768c19.2 0 32-12.8 32-32V192c0-19.2-12.8-32-32-32H128z"  ></path><path d="M64 320h896v64H64zM64 544h896v64H64z"  ></path><path d="M256 320h64v480H256zM480 352h64V832h-64zM704 320h64v480h-64z"  ></path></symbol><symbol id="icon-sql" viewBox="0 0 1024 1024"><path d="M170.666667 0h682.666666a170.666667 170.666667 0 0 1 170.666667 170.666667v682.666666a170.666667 170.666667 0 0 1-170.666667 170.666667H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666667V170.666667a170.666667 170.666667 0 0 1 170.666667-170.666667z m0 56.888889a113.777778 113.777778 0 0 0-113.777778 113.777778v682.666666a113.777778 113.777778 0 0 0 113.777778 113.777778h682.666666a113.777778 113.777778 0 0 0 113.777778-113.777778V170.666667a113.777778 113.777778 0 0 0-113.777778-113.777778H170.666667z m-63.772445 561.095111c10.524444 9.216 24.576 16.782222 42.211556 22.698667 17.635556 5.916444 34.360889 8.874667 50.232889 8.874666 48.298667 0 72.419556-17.180444 72.419555-51.541333a45.511111 45.511111 0 0 0-7.736889-25.998222 74.353778 74.353778 0 0 0-21.333333-20.48 560.64 560.64 0 0 0-50.915556-27.306667c-34.531556-17.180444-57.230222-33.166222-68.266666-47.900444a82.488889 82.488889 0 0 1-16.384-50.574223c0-28.558222 11.491556-51.2 34.417778-67.982222 22.983111-16.725333 51.939556-25.088 86.926222-25.088 34.190222 0 59.335111 4.152889 75.320889 12.401778v48.469333c-20.764444-14.392889-46.990222-21.560889-78.677334-21.560889-21.048889 0-38.172444 4.437333-51.427555 13.198223a41.813333 41.813333 0 0 0-19.911111 36.807111c0 13.937778 4.551111 25.258667 13.767111 34.019555 9.216 8.704 29.127111 20.650667 59.790222 35.783111 33.792 16.099556 57.457778 32.256 70.883556 48.412445 13.482667 16.156444 20.252444 34.304 20.252444 54.442667 0 30.208-10.979556 53.418667-32.881778 69.575111-21.959111 16.156444-52.394667 24.234667-91.363555 24.234666-13.653333 0-29.525333-1.934222-47.672889-5.688889-18.147556-3.754667-31.345778-8.533333-39.651556-14.108444v-50.631111z m593.123556 153.998222c-10.808889 3.413333-23.779556 5.12-38.912 5.12-21.333333 0-41.528889-5.176889-60.529778-15.530666-19.057778-10.410667-45.397333-34.759111-79.018667-73.102223-46.08 0.284444-83.968-16.099556-113.664-49.152-29.696-32.995556-44.544-74.524444-44.544-124.643555 0-55.864889 15.018667-100.124444 45.112889-132.892445 30.037333-32.768 71.168-49.095111 123.335111-49.095111 46.933333 0 85.048889 16.042667 114.346667 48.184889 29.240889 32.142222 43.804444 74.012444 43.804444 125.553778 0 45.795556-10.24 84.195556-30.833777 115.370667-20.593778 31.118222-49.834667 51.2-87.779556 60.188444 19.114667 20.764444 35.384889 34.929778 48.924445 42.552889 13.425778 7.623111 28.444444 11.434667 45.056 11.434667 13.653333 0 25.201778-1.991111 34.702222-5.973334v41.984zM409.998222 511.089778c0 41.642667 10.638222 75.036444 31.857778 100.124444 21.276444 25.144889 49.038222 37.660444 83.228444 37.660445 36.750222 0 65.592889-12.003556 86.584889-36.124445 20.935111-24.064 31.459556-57.685333 31.459556-100.977778 0-44.430222-10.24-78.734222-30.776889-102.912-20.536889-24.120889-48.64-36.181333-84.366222-36.181333-35.100444 0-63.544889 12.743111-85.333334 38.229333-21.788444 25.486222-32.654222 58.88-32.654222 100.181334zM937.984 682.666667h-181.532444V338.488889h44.430222v304.867555h137.102222V682.666667z"  ></path></symbol><symbol id="icon-duijixiantu" viewBox="0 0 1024 1024"><path d="M197.973333 826.026667h669.013334c6.826667 0 10.24 3.413333 10.24 10.24v30.72c0 6.826667-3.413333 10.24-10.24 10.24H157.013333c-6.826667 0-10.24-3.413333-10.24-10.24V157.013333c0-6.826667 3.413333-10.24 10.24-10.24h30.72c6.826667 0 10.24 3.413333 10.24 10.24v669.013334z"  ></path><path d="M607.573333 570.026667l-105.813333 75.093333c-3.413333 3.413333-6.826667 3.413333-10.24 0l-133.12-78.506667c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 672.426667c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826666v81.92c0 3.413333 3.413333 10.24 10.24 10.24h576.853333c3.413333 0 10.24-3.413333 10.24-10.24v-235.52c0-6.826667-6.826667-10.24-10.24-10.24l-215.04 54.613334c3.413333 0 3.413333 0 0 0m-17.066666-187.733334l-105.813334 92.16c-3.413333 3.413333-6.826667 3.413333-10.24 0l-116.053333-68.266666c-3.413333-3.413333-6.826667 0-10.24 0L238.933333 512c-3.413333 3.413333-3.413333 3.413333-3.413333 6.826667v102.4c0 6.826667 10.24 13.653333 13.653333 6.826666l95.573334-92.16c3.413333-3.413333 6.826667-3.413333 10.24 0l133.12 78.506667c3.413333 3.413333 6.826667 0 10.24 0l109.226666-75.093333h3.413334l211.626666-54.613334c3.413333 0 6.826667-3.413333 6.826667-10.24V327.68c0-6.826667-6.826667-10.24-10.24-10.24l-225.28 61.44c0 3.413333-3.413333 3.413333-3.413333 3.413333"  ></path></symbol><symbol id="icon-leiji" viewBox="0 0 1024 1024"><path d="M75.09333333 930.48604445h146.80064v-403.11921778H75.09333333v403.11921778z m366.41905778 0h146.80064v-879.63875556H441.51239111v879.63875556z m366.41905778-623.32017778v623.32017778H954.73208889v-623.32017778h-146.80064z"  ></path></symbol><symbol id="icon-zhexian" viewBox="0 0 1024 1024"><path d="M612.393 653.575L386.757 427.94l35.355-35.355L647.748 618.22z"  ></path><path d="M576.84 617.98l332.902-332.904 35.355 35.355-332.903 332.903zM62.698 752.029l338.984-338.984 35.355 35.355L98.053 787.384z"  ></path></symbol><symbol id="icon-fenbutu" viewBox="0 0 1024 1024"><path d="M0 1024v-93.090909h1024v93.090909H0z m837.818182-837.818182h186.181818v651.636364H837.818182V186.181818zM558.545455 465.454545h186.181818v372.363637H558.545455V465.454545zM279.272727 0h186.181818v837.818182H279.272727V0zM0 279.272727h186.181818v558.545455H0V279.272727z"  ></path></symbol><symbol id="icon-tongjitu" viewBox="0 0 1024 1024"><path d="M850.832544 671.454642L529.987165 491.420289V132.101667c0-20.174482-16.427134-35.81981-36.47575-35.81981-118.232798 0-225.035266 45.938262-302.638715 121.16764l-0.499373 0.531096-0.280386 0.218988C112.739179 293.210995 64.303027 397.234163 64.303027 511.875157c0 114.610294 48.436152 218.163765 125.789914 293.613154l0.280386 0.249687c77.603449 75.262124 184.906314 121.980145 303.138088 121.980145 75.574233 0 148.399865-19.423375 211.980949-54.525847l1.873674-1.249457c63.768349-35.599799 118.170376-87.940888 156.518776-151.271262l0.499374-0.74906c10.431583-17.426905 4.123924-38.84982-13.551644-48.467875zM670.892335 810.29785l-1.873674 1.311879c-52.089355 28.980032-113.048729 44.906769-175.506222 44.906769-98.464569 0-187.529047-38.660508-251.579829-100.744495-64.331167-62.582337-103.929024-148.773372-103.929024-243.896846 0-94.935186 39.597857-180.783413 103.930047-243.64716 56.242955-54.525847 131.255393-90.906429 214.604706-98.995665v342.642825c0 14.614859 8.838296 27.012214 21.360494 32.7898l303.16981 169.697937c-29.481452 39.159882-67.205635 72.200392-110.176308 95.934956z m180.752714-605.464695c-62.33265-60.58382-146.651035-99.744725-239.900836-105.022938V445.701015L920.597467 618.677625c10.992355-21.98471 20.360723-44.156686 26.606984-67.673286 8.306176-30.29191 12.491499-61.364603 12.491499-93.186356 0-98.714256-41.159422-188.840926-108.050901-252.984828z" fill="#7E7E7E" ></path></symbol></svg>',a=(a=document.getElementsByTagName("script"))[a.length-1].getAttribute("data-injectcss");if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}function d(){n||(n=!0,o())}e=function(){var t,e,c;(c=document.createElement("div")).innerHTML=l,l=null,(e=c.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",t=e,(c=document.body).firstChild?(e=c.firstChild).parentNode.insertBefore(t,e):c.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),e()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(o=e,i=t.document,n=!1,(h=function(){try{i.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}d()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,d())})}(window);
\ No newline at end of file
+!function(t){var e,c,o,i,n,l='<svg><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>',a=(a=document.getElementsByTagName("script"))[a.length-1].getAttribute("data-injectcss"),h=function(t,e){e.parentNode.insertBefore(t,e)};if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}function d(){n||(n=!0,o())}function v(){try{i.documentElement.doScroll("left")}catch(t){return void setTimeout(v,50)}d()}e=function(){var t,e;(e=document.createElement("div")).innerHTML=l,l=null,(t=e.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",e=t,(t=document.body).firstChild?h(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),e()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(o=e,i=t.document,n=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,d())})}(window);
\ No newline at end of file
diff --git a/web/static/img/iconfont/iconfont.json b/web/static/img/iconfont/iconfont.json
index a117163..1c901c1 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": "16373588",
+      "name": "点",
+      "font_class": "ic_normal_dot",
+      "unicode": "e759",
+      "unicode_decimal": 59225
+    },
     {
       "icon_id": "2332742",
       "name": "流失",
diff --git a/web/static/img/iconfont/iconfont.ttf b/web/static/img/iconfont/iconfont.ttf
index 85b019b9aa73993f48d2facf56756fb4009cc3c5..dbb3cef6c2b7bd8778e2b964747a68fe75f1b397 100644
GIT binary patch
delta 991
zcmZWmO-K}B7=GTFZ}w*fZOuh3D_4`<twch^y=WKfP#uCONf5SacXhS>%T`hlc0(bE
z5NW8BLC~cjA~1rWTS1o&MnMq-o@RsU*ePmzznxFen&FxEd7t<1``-D~{-I;FyK?2!
zA%JcHxR}b@rNm<46`+L~9aFi5$ulPtqkuRL7?EtoPVaxd_bcaaGKR7&_?PsX%wIBk
zv-$FT9Q8W)`_6tmS4`RdqsB9??_<9$Z_k&g6U!X$U_Vl@^O;KM!SGWcnC5{~rQ+3c
z=-0hLz<SFGH$Z@1tyj4Lx2@L&NoB`lHWXGLUi<tlxoh|*EYV2#a{BU|B+_zeRgiw2
z-2k*kn9so0gwsU@LkQ5SbDKtJ+}WUghU_4mA9T<OYps<vHS{j@2J2&Ma{U^gYKAj+
zBgBg4l54qLZpmG)wbWv@ak&Q<|7&XemLaYW?|1<}A2I-gy9VJCJcicqYfV&HR7FAA
z*#qao<*P`@tGSj3u7}&@fjhx1dElOK`432Nchp)uz{fV`fd`^C?m^wXALsC7hAz-+
z+SH)MwN*K8+g|tZLb}842dKSmAaRTmLxZt?ibZ?;&E)rK_=9+CWg@weoLGs)w^6EQ
z|CJii^*-@lR9bn6yqEk2(5kq`ckWbNXT3*p!Thk|1}qFH?qhvKaT7;yLUD^bmUtf|
zcn^qTNpa%;`AG5#2Q)O}g$n2#c%!&r{!wuQZKx^kWBs?{CdQ~qaSKsOjm~E5awZ+Q
zv=Et26$_KaLV3%c%}mYZ?Aa~1VV!#LyfbD-oyTU#Sux)^wiW3$Nh6&E8RR2B1t>@+
WS!kM0B@4ybyq!y?i)H7IHToB-8oY!6

delta 868
zcmZ9J%WD%+7{$*wGkMJvZQ9fptt4t_AZ979d>~zjE>-H%PLs5$=0zH@SxBPPjTDp&
zxb{B~EN(<_qbpHF1zjkJi-{sa741T#@!ZTUKJIYt{eAD7n^zNW#&7Ovzdo@6$SQzB
zzT(#J?K*u7FcOrpP;SjzX66}S<)}xcqFb0;&#p7~J$0}|N93w`o&11GmnzNWG=cq8
zPP$ynyVkGpN!Cu#PE_3Gy6nUX<H}A|-Ab{2<jm$}Aj$%xQm-vFXYOD41UR!yxC8;r
zPQSwjGzU99|E!qGQ93{J?Z&z7hkn2ba^HSjYN^cN>~}1fS7=6IC@+_)i@{4uH59TS
z-@UFJmW=mYCI#MC+2;)#<L&Ms4OoRapd3$|wO!t5mJNpanSd|8<0t*PztW5MGW|Y1
z_}|0qKTB9Q^4AB1*+0Ur2Co=WJtYiyYsO}qRYQZyx~`9^_JLT&;epfzeJ2oG!A}NK
zkLR;iN&R}Ce}EDPp%)Ltk?3Utso{e)g^pw;c1!Nc3;Aixt=+a>TJ15$)Z3{&iZRUw
zC+^m4(x29Bk#m|uaBx6#nEs=hZS2Q!%??J<;0?rzaY7c?G^+=@qqxn0fo*uG111Ac
zHCyC&nnT!uFPg&`7E`m085z~=U`iJ4=|<6Q77MAlR%$U{tIpS|O?wMY6&Eg+-Nu&5
n)2rEM#r7WC8SbC$58e}JZz3j!m|{st!V;0F#KeXdADaFRg`AVY

diff --git a/web/static/img/iconfont/iconfont.woff b/web/static/img/iconfont/iconfont.woff
index b0a729f15327686d4e05c422e545f616d0e82c44..19a368e90331d7a068aee8d9498ce72add52242a 100644
GIT binary patch
delta 2035
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
PG*xOL{e}81;D7xGw7HsO

delta 1942
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
aC34s#O!JB1BbuJ?7}nmzDG%uh75@)TcxO%k

diff --git a/web/static/img/iconfont/iconfont.woff2 b/web/static/img/iconfont/iconfont.woff2
index fef0de3ba3319a7f6cfe43264763f26ff5f0a200..bf0c285929f7548edcb0531ea5b2fbc623fa14f5 100644
GIT binary patch
literal 1640
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

literal 1588
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

diff --git a/web/static/img/rli.png b/web/static/img/rli.png
index c6ea5edb1e7582bba63bd107eae499efd4b3dc61..a1aff19e1889fec806423f698507db4220c64439 100644
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|7I?ZihFJI~
zrz{XKSoHe5#;omK5AWa4G*(+8r{KnSxZ%s8%HNXz|K}b_V=%Maz?kW}Sz1DJ#w*WH
zXX}qK*Gv3kZRTZ|`Dgye`&%MwHCK0*GWy8gVVJSmab4oC;{^<}#V0&1kaAdKZord}
z@aMh5nzR{K$Ljyf818Xcqj=>z)4CnUpDuEI!4%=7q%Y9@yv*=Vx`t|)amZcfWA#20
dGM2C~Fh~n;)L75Ux(eu422WQ%mvv4FO#m*rScL!p

literal 1974
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST~P>fxXt##WAEJ?(N;(d7|MW?H?tT
z0zb1%4Eik4*fy=*;7Eu^#FvxY2@~#E#N1i#nz>?u&&;Oqjw#{}Op0?m=X9s&+0ER%
zcki<`o9nJ@PG9@=@AJ?1ifa;O{x~x<7IXI8P-r;tlZE5aONRtr#-<7z0fmlqhDI}{
zvI%B+VWNr-6O<gKH}^6)-r5lv+QQ)2#gco*jEN=laayP#6N{$M7Q@>d0!w;lhq?kO
zj|<0glpScI@hR)g`hrhY63eBFKm4uPv0Zr2H~u)E;%Byd)56o{S-*dN{jJM`wTI`g
zQ$A5u#j^9n<*m%woK6!;S>7o0MP&1CY<_b<uVA9!8-+3f>l0E;EQ%bC9G^HD=O>-D
zFRoz!$oEJ#1?YW&76lf|`3>a)?-lMj?rE-IpZWjR$CFe0B499`^M^?Gzp^Cujm<Y4
zA%^{lef(xB(9{mulup?v?ak@-y@#j1Z_E6%?d;tHp~m&{DKn0lH^#=st=#!}UfG7H
z#{J>T?88?-?AN~h>iT2#^4-siHLXwlJJ=n5*x=5tJuP=78}&JTE`Rv&^6_4G+nXig
zDgPfld28Tvz1r+$9LE_|gLPr%)$dedS$}?y`1<%xVobY3KGS1^JvMfCcHe!yFP3#@
z`G-F@O?t|!OrP6vm<UwVe|@|=+ui-Uy~&!tNuJ@3W<Pf>lRLYcohe@V!si*T0_Sg>
z6I3{H&NXYnJQj{ilb2P$m0@gp6SIWvm1l#3ZRW1)=LBzXI&ORVUN`sC$=ln$)Lc}z
zdfdM||C6m*Q_L4m%gyr?UMJ?A7H4fLsd-_(Q`C`TQ{RE4`|LNTt@i<i^ECklU|>5<
z@aL%ToL|pTe&myMYxewUxt3hjp7ZrfuWQS0lz~F2{cEg}EP-&XqJsb^Hl7QA07lIb
z>kdei+~Sy1S7TBB^zz}|o7c~+KCim&w8iHB%IOtBSA3is6fzfGdLhKZv5BSB^s<10
z$E+15yI2^TbR1*Pny_$8Qq$_yb8JxX4hS~}M)i_Tuf^U13MYiFTqRGdhWd$Z|JlEK
z+puK)<8Lh7W!Qev?@#G>%jR8djbgwYvM|k85|~4Tw>m}xvqtMI(^MekbA>Gzn5V?D
zu1x__MuE~>S{WRpRzwE3F*u%b$-MyAXsvi++n?)ksq<z%X`c2wQm09!KB@V(x`#o*
z(;`6yk9B)Wq<tC`4j!0#+O<Jp=ch}#28>NC%;9?Cj7?8Yd2c_+!Xd;Hvoi+hZEgL#
zY{Cko8i!cmG!`{I>2lvblcQ(#)w952;{KNxm2V0s|9`g;SR8yc@H4NvcX_YCjVTO{
zW~$GA1+j1hY2_Wx^J-9-EmT~q2~2pR+Y`-IH*9UXV_oqtN9vgMY`!N|ELK8@;^51U
z^y~f`&3>-g<^K6y<ALWa#}X?lYj%|H7N5DUX^z=eV0l|6vF!C;sS<e>GsO#^D@vob
z?^gKl@#)c31D@?>l4rJZ#7sG0!plG3?p}4t#ou#c>ouF^i2eAz!?gDE-h7#FJ*W5X
zQ!wb;&%gTR_QI&YmtOCFuGrKe)EKK!kZFBF?|>mQ6U#>)g$=;8ZzIPcaKyO5L7LIp
zL)v_G7clouT+n;dtwAC8&KfPJ1_jq9vovYOrY(h=S8*^liE!SUkqa!Wj-6el1oXK|
jM)Edbrl5hw#{CTbx%ZV16$u*y>thB_S3j3^P6<r_sc$^>