From 5c5ae25924cfa938b0e8f2c99b4d8161a5f1ec12 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Fri, 29 Oct 2021 16:02:53 +0800
Subject: [PATCH] 1

---
 web/pages/analysis.html           |   4 ++
 web/pages/attribute.html          |   4 ++
 web/pages/dashboard.html          |   2 +-
 web/pages/distribution.html       |   3 +
 web/pages/dropdownlist.html       |   5 +-
 web/pages/ltvmodel.html           |   5 ++
 web/pages/retained.html           |   4 ++
 web/pages/userlabel.html          |  31 +--------
 web/pages/userlabel_dy.html       |  39 +++++++----
 web/pages/userlabelinfo.html      | 106 ++++++++++++++++++++++++++++
 web/src/x.min.js                  | 110 +++++++++++++++++++++++++-----
 web/srczip/common.js              |  17 ++++-
 web/srczip/logic/analysis.js      |   9 ++-
 web/srczip/logic/attribute.js     |  14 +++-
 web/srczip/logic/dashboard.js     |  10 +--
 web/srczip/logic/distribution.js  |  17 +++--
 web/srczip/logic/dropdownlist.js  |  29 +++++++-
 web/srczip/logic/ltvmodel.js      |   8 ++-
 web/srczip/logic/retained.js      |  12 +++-
 web/srczip/logic/userlabel.js     |  24 +++++--
 web/srczip/logic/userlabelinfo.js |  52 ++++++++++++++
 web/static/css/analysis.css       |   1 +
 web/static/css/style.css          |   6 +-
 web/static/img/wushujv3.png       | Bin 0 -> 8802 bytes
 24 files changed, 420 insertions(+), 92 deletions(-)
 create mode 100644 web/pages/userlabelinfo.html
 create mode 100644 web/srczip/logic/userlabelinfo.js
 create mode 100644 web/static/img/wushujv3.png

diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index a3699c7..21a88a7 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -183,6 +183,9 @@
                         </div>
 
                     </div>
+                    <div class="chawushuj" style="display: none;">
+                        <img src="./static/img/wushujv3.png">
+                    </div>
                     <!-- 统计图 -->
                     <div class="analysis-echarts" id="analysis-echarts"></div>
 
@@ -198,6 +201,7 @@
                             </tbody>
                         </table>
                     </div>
+                    
                 </div>
 
 
diff --git a/web/pages/attribute.html b/web/pages/attribute.html
index 7a9c799..b7e9dad 100644
--- a/web/pages/attribute.html
+++ b/web/pages/attribute.html
@@ -144,6 +144,10 @@
                         </div>
 
                     </div>
+
+                    <div class="chawushuj" style="display: none;">
+                        <img src="./static/img/wushujv3.png">
+                    </div>
                     <!-- 统计图 -->
                     <div class="analysis-echarts" id="attribute-echarts" style="height: 400px;"></div>
 
diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 7cc3843..650ca8b 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -363,7 +363,7 @@
                 <i class="layui-icon layui-icon-template-1"></i> {{item.name}} 
                 <img src="./static/img/renyuan.png" class="nav-space-bar" data-id="{{item._id}}"/>
             </a>
-            <dl class="layui-nav-child modeify-layui-nav-child" id="sidebar-box">
+            <dl class="layui-nav-child modeify-layui-nav-child" id="sidebar-box{{item._id}}">
                 {{#  layui.each(item.children, function(indexs, items){ }}
                     {{#  if(items.onclick == 1){ }}
                         <dd class="layui-left-dd layui-this"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span class="tuodong">{{items.name}}</span>
diff --git a/web/pages/distribution.html b/web/pages/distribution.html
index 8fc8e25..f300379 100644
--- a/web/pages/distribution.html
+++ b/web/pages/distribution.html
@@ -92,6 +92,9 @@
                         </div>
 
                     </div>
+                    <div class="chawushuj" style="display: none;">
+                        <img src="./static/img/wushujv3.png">
+                    </div>
                     <!-- 统计图 -->
                     <div class="analysis-echarts" id="distribution-echarts" style="display: none;"></div>
 
diff --git a/web/pages/dropdownlist.html b/web/pages/dropdownlist.html
index 25dccbd..435ece8 100644
--- a/web/pages/dropdownlist.html
+++ b/web/pages/dropdownlist.html
@@ -1,6 +1,6 @@
 <!-- 下拉列表 -->
 <div class="dropdownlist-box">
-
+    <input type="text" class="dropdownlist-input" placeholder="请输入搜索条件">
     <div class="dropdownlist-con-box">
         
     </div>
@@ -8,7 +8,8 @@
 </div>
 
 <script id="dropdownlist-con-box-dot" type="text/html">
+    
     {{#  layui.each(d, function(index, item){ }}
-        <div class="dropdownlist-list" data-index="{{index}}" data-id="{{item.id}}" > {{item.title}}</div>
+        <div class="dropdownlist-list" data-index="{{index}}" data-id="{{item.id}}" data-title="{{item.title}}"> {{item.title}}</div>
     {{#  }); }}
 </script>
diff --git a/web/pages/ltvmodel.html b/web/pages/ltvmodel.html
index 0468353..3fa1d44 100644
--- a/web/pages/ltvmodel.html
+++ b/web/pages/ltvmodel.html
@@ -121,6 +121,11 @@
                             </tbody>
                         </table>
                     </div>
+
+                    <div class="chawushuj" style="display: none;">
+                        <img src="./static/img/wushujv3.png">
+                    </div>
+
                 </div>
 
 
diff --git a/web/pages/retained.html b/web/pages/retained.html
index a976de8..c0e5cc8 100644
--- a/web/pages/retained.html
+++ b/web/pages/retained.html
@@ -132,6 +132,10 @@
                         </div>
 
                     </div>
+
+                    <div class="chawushuj" style="display: none;">
+                        <img src="./static/img/wushujv3.png">
+                    </div>
                     <!-- 统计图 -->
                     <div class="analysis-echarts" id="analysis-echarts" style="display: none;"></div>
 
diff --git a/web/pages/userlabel.html b/web/pages/userlabel.html
index 4fa97b8..4efc21b 100644
--- a/web/pages/userlabel.html
+++ b/web/pages/userlabel.html
@@ -40,10 +40,6 @@
 
             <span><i class="iconfont" style="font-size: 14px; ">&#xe61d;</i></span>
         </div>
-        <!-- <div class="label-info-box" style="border-bottom: 1px solid #e6e6e6;">
-            <span> <i class="iconfont" style="font-size: 18px; ">;</i> 历史版本</span>
-            <span><i class="iconfont" style="font-size: 18px; ">&#xe61d;</i></span>
-        </div> -->
         <div class="label-info-box-ov">
             <div class="label-info-box-ov-title">自定义条件 <i class="layui-icon" title="筛选特定行为条件或用户属性的用户，并赋予标签值">&#xe60b;</i></div>
             <div class="label-info-box-ov-del">
@@ -58,33 +54,12 @@
                     <span>创建人</span>
                     <span class="label-info-box-con-right">{{d.act_name}}</span>
                 </div>
-                <!-- <div class="label-info-box-con">
+                <div class="label-info-box-con">
                     <span>用户数</span>
-                    <span class="label-info-box-con-right">1526</span>
-                </div> -->
-                <!-- <div class="label-info-box-con" style="padding-bottom: 8px;">
-                    <span>数据更新时间</span>
-                    <span class="label-info-box-con-right">shafsdf</span>
-                </div> -->
+                    <span class="label-info-box-con-right">{{d.num}}</span>
+                </div>
             </div>
 
-            <!-- <div class="labelval-box">
-                <div class="labelval-title-box">标签值</div>
-                <div class="labelval-list-box">
-
-                    <div class="labelval-list">
-                        <div class="labelval-list-top">
-                            <span>小R</span>
-                            <span>1537</span>
-                        </div>
-                        <div class="labelval-list-slide-box">
-                            <div class="labelval-list-slide"></div>
-                        </div>
-                    </div>
-                    
-
-                </div>
-            </div> -->
 
         </div>
         <div class="label-but-box">
diff --git a/web/pages/userlabel_dy.html b/web/pages/userlabel_dy.html
index 641e753..4208a6a 100644
--- a/web/pages/userlabel_dy.html
+++ b/web/pages/userlabel_dy.html
@@ -103,13 +103,20 @@
                                     <div class="userlabel-json-action-left">
                                         <div class="ta-editor-done-condition">
                                             <span class="ta-isDone" data-index="{{index}}">没做过</span>
-                                            <div class="ant-dropdown-trigger ta-event-select my-event-data" data-index="{{index}}">
+                                            <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>
-                                            <span class="ant-dropdown-trigger ta-range-picker-label time-days-box" data-index="{{index}}">
-                                                过去{{item.s_days}}天
-                                            </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">
@@ -128,28 +135,34 @@
                                     <div class="userlabel-json-action-left">
                                         <div class="ta-editor-done-condition">
                                             <span class="ta-isDone" data-index="{{index}}">做过</span>
-                                            <div class="ant-dropdown-trigger ta-event-select my-event-data" data-index="{{index}}">
+                                            <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>
-                                            <div class="ant-dropdown-trigger ta-event-select load_prop_quotas_data" data-index="{{index}}">
+                                            <div class="ant-dropdown-trigger2 ta-event-select load_prop_quotas_data" data-index="{{index}}">
                                                 <span class="ta-event-select-label">{{item.prop_quota.quotaDesc}}</span>
                                             </div>
                                             {{#  if(item.prop_quota.quota_type != null){ }}
-                                            <div class="ant-dropdown-trigger ta-event-select analysis-data-box" data-index="{{index}}" data-type="{{item.prop_quota.quota_type}}">
+                                            <div class="ant-dropdown-trigger2 ta-event-select analysis-data-box" data-index="{{index}}" data-type="{{item.prop_quota.quota_type}}">
                                                 <span class="ta-event-select-label">{{item.prop_quota.analysisDesc}}</span>
                                             </div>
                                             {{#  } }}
-                                            <div class="ant-dropdown-trigger ta-event-select uce_calcu_symbol_box" data-index="{{index}}">
+                                            <div class="ant-dropdown-trigger2 ta-event-select uce_calcu_symbol_box" data-index="{{index}}">
                                                 <span class="ta-event-select-label">{{item.uce_calcu_symbolDesc}}</span>
                                             </div>
                                             <div class="ant-input-number tant-input-number lable-input-box">
                                                 <input type="text" placeholder="多个用,隔开" data-index="{{index}}" value="{{item.num}}"/>
                                             </div>
                                             <span class="ta-bold">，在</span>
-                                            <span class="ant-dropdown-trigger ta-range-picker-label time-days-box" data-index="{{index}}">
-                                                过去{{item.s_days}}天
-                                            </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">
@@ -186,10 +199,10 @@
                                     <div class="userlabel-json-action-left">
                                         <div class="ta-filter-condition">
                                             <span class="ta-property">用户属性</span>
-                                            <div class="ant-dropdown-trigger ta-property-select">
+                                            <div class="ant-dropdown-trigger2 ta-property-select">
                                                 <span class="ta-property-select-label">账户ID</span>
                                             </div>
-                                            <div class="ant-dropdown-trigger ta-property-select">
+                                            <div class="ant-dropdown-trigger2 ta-property-select">
                                                 <span class="ta-property-select-label">等于</span>
                                             </div>
                                             <div class="ta-equal-search taDragDisable">
diff --git a/web/pages/userlabelinfo.html b/web/pages/userlabelinfo.html
new file mode 100644
index 0000000..53a2e5e
--- /dev/null
+++ b/web/pages/userlabelinfo.html
@@ -0,0 +1,106 @@
+<div class="userlabel-box">
+    <div class="userlabel-right-box">
+       
+    </div>
+    <div class="userlabel-left-box">
+        <div class="eventattradmin-top-box">
+            <div class="eventattradmin-left___y490Q">用户信息</div>
+
+            <div class="eventattradmin-right___1TIt8">
+                <!-- <div class="eventattradmin-search___23TMG">
+                    <i class="layui-icon">&#xe615;</i>
+                    <input type="text" placeholder="请输入搜索" />
+                    <img src="./static/img/cha1.png">
+                </div> -->
+
+                <div class="eventattradmin-actions___141YT addlabeldata">
+                    <i class="layui-icon">&#xe624;</i>
+                    <span>数据下载</span>
+                </div>
+
+            </div>
+
+        </div>
+
+        <div class="eventattradmin-table-box">
+            <table class="layui-hide" id="userlabelinfo-table" lay-filter="userlabelinfotest" ></table>
+
+            <div class="table-div-box">
+                <table class="table-fenxi-box">
+                    <thead>
+                    <tr class="table-fenxi-th">
+                        
+                    </tr> 
+                    </thead>
+                    <tbody class="table-fenxi-td">
+                   
+                    </tbody>
+                </table>
+            </div>
+            <div id="laypage" style="float: right;"></div>
+
+        </div>
+
+    </div>
+
+</div>
+
+<script id="table-fenxi-th-dot" type="text/html">
+    {{#  layui.each(d, function(index, item){ }}
+        <th>{{item}}</th>
+    {{#  }); }}
+</script>
+
+<script id="table-fenxi-td-dot" type="text/html">
+    {{#  layui.each(d, function(index, item){ }}
+    <tr>
+        {{#  layui.each(d[index], function(indexs, items){ }}
+        <td>{{items}}</td>
+        {{#  }); }}                    
+    </tr>
+    {{#  }); }}
+</script>
+
+
+<script id="userlabelinfo-right-box-dot" type="text/html">
+    <div class="userlabel-right">
+        <div class="userlabel-right-fanhui"> <i class="iconfont" style="font-size: 14px;">&#xe61c;</i> 返回列表</div>
+        <div class="label-title-box">
+            <div class="label-box-title">用户标签</div>
+            <div class="lable-title-name">{{d.display_name}}</div>
+        </div>
+        <div class="label-info-box" style="border-bottom: 1px solid #e6e6e6;">
+            <span> <i class="iconfont" style="font-size: 14px; position: relative; top: 2px;">&#xe607;</i> 标签详情</span>
+
+            <span><i class="iconfont" style="font-size: 14px; ">&#xe61d;</i></span>
+        </div>
+        <div class="label-info-box-ov">
+            <div class="label-info-box-ov-title">自定义条件 <i class="layui-icon" title="筛选特定行为条件或用户属性的用户，并赋予标签值">&#xe60b;</i></div>
+            <div class="label-info-box-ov-del">
+                {{d.remarks}}
+            </div>
+            <div class="label-info-box-con" style="padding-top: 8px;">
+                <span>标签名</span>
+                <span class="label-info-box-con-right">{{d.cluster_name}}</span>
+            </div>
+            <div style="border-bottom: 1px solid #e6e6e6;">
+                <div class="label-info-box-con">
+                    <span>创建人</span>
+                    <span class="label-info-box-con-right">{{d.act_name}}</span>
+                </div>
+                <div class="label-info-box-con">
+                    <span>用户数</span>
+                    <span class="label-info-box-con-right">{{d.num}}</span>
+                </div>
+            </div>
+
+
+        </div>
+        <!-- <div class="label-but-box">
+            <div class="lable-dingyi" style="border-right: 1px solid #e6e6e6;"> <i class="iconfont" style="font-size: 14px; margin-right: 4px;">&#xe60d;</i> 定义</div>
+            <div class="lable-gengxin" style="border-right: 1px solid #e6e6e6;"> <i class="iconfont" style="font-size: 14px; margin-right: 4px;">&#xe628;</i> 更新</div>
+            <div class="lable-del"> <i class="iconfont" style="font-size: 14px; margin-right: 4px;">&#xe611;</i> 删除</div>
+        </div> -->
+        
+    </div>
+</script>
\ No newline at end of file
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 1ed0329..82940de 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -193,7 +193,7 @@ var X = window.X || {
                         callback && callback(d.data);
                     }else {
                         layer.msg('查无数据');
-                        // callback && callback(d);
+                        callback && callback(d);
                     }
                 }else {
                     if(d.code == -5){
@@ -201,6 +201,9 @@ var X = window.X || {
                         window.localStorage.removeItem('loginData');
                         X.gourl("login");
                         location.reload();
+                    }else if(d.code == -9){
+                        
+                        callback && callback("查无数据");
                     }else {
                         layer.msg(d.msg);
                     }
@@ -255,7 +258,17 @@ var X = window.X || {
                         callback && callback(d.data);
                     }
                 }else {
-                    layer.msg(d.msg);
+                    if(d.code == -5){
+                        layer.msg("登录过期请重新登录!!!");
+                        window.localStorage.removeItem('loginData');
+                        X.gourl("login");
+                        location.reload();
+                    }else if(d.code == -9){
+                        
+                        callback && callback("查无数据");
+                    }else {
+                        layer.msg(d.msg);
+                    }
                 }
                 
             },
@@ -4456,17 +4469,22 @@ var X = window.X || {
                 }
                 X.api("ck/event_model","post",dataArr,function(d){
                     querydata = d;
-                    if(d.length > 0){
+                    if(d != "查无数据"){
                         if(d[0].values.length > 0 ){
                             updata();
                             tabledata(d);
+                            $(".chawushuj").hide();
                         }else {
                             $("#analysis-echarts").empty();
                             layer.msg("无数据");
                         }
                     }else {
                         $("#analysis-echarts").empty();
-                        layer.msg("无数据");
+
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                        // layer.msg("无数据");
+
                     }
                     
                 })
@@ -4949,9 +4967,17 @@ var X = window.X || {
                     events: data.events
                 }
                 X.api("ck/user_property_model","post",dataArr,function(val){
-                    attributetable(val);
-                    querydata = val;
-                    updata(val)
+                    if(val != "查无数据"){
+                        attributetable(val);
+                        querydata = val;
+                        updata(val);
+                        $(".chawushuj").hide();
+                    }else {
+                        $("#attribute-echarts").empty();
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                    }
                 })
             };
 
@@ -6099,7 +6125,7 @@ var X = window.X || {
         //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
         fillmodeldata:function(d,id,type){
             X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
-                if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){
+                if(val == '查无数据'){
                     $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
                 }else {
                     var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
@@ -6489,7 +6515,7 @@ var X = window.X || {
                             })
                         });
                     }else {
-                        layer.msg('无数据!!!');
+                        layer.msg('无数据qqq');
                     }
                 })
             });
@@ -7625,10 +7651,19 @@ var X = window.X || {
                     events: data.events
                 }
                 X.api("ck/scatter_model","post",dataArr,function(d){
-                    querydata = d;
-                    d['tabletitle'] = $.extend(true,[],d['label']);
-                    d['tabletitle'].unshift('事件发生时间','总人数');
-                    updata(d)
+                    if(d != "查无数据"){
+                        querydata = d;
+                        d['tabletitle'] = $.extend(true,[],d['label']);
+                        d['tabletitle'].unshift('事件发生时间','总人数');
+                        updata(d);
+                        $(".chawushuj").hide();
+                    }else{
+                        $("#distribution-echarts").empty();
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                    }
+                    
                 })
             };
 
@@ -7875,9 +7910,36 @@ var X = window.X || {
 
             X.laytpldata("#dropdownlist-con-box-dot",listdata,".dropdownlist-con-box");
 
+            // $(document).off("bind",'.dropdownlist-input').on("bind",".dropdownlist-input",function(){
+            //     var title = $(this).val();
+            //     console.log(title);
+            // });
+
+            $('.dropdownlist-input').bind('input propertychange', function() {
+                var title = $(this).val();
+                if(title != ""){
+                    var filteringdata = [];
+                    for(let i in listdata){
+                        if(listdata[i]['title'].indexOf(title) != -1 || listdata[i]['id'].indexOf(title) != -1){
+                            filteringdata.push(listdata[i]);
+                        }
+                    }
+                    // console.log(filteringdata);
+                    X.laytpldata("#dropdownlist-con-box-dot",filteringdata,".dropdownlist-con-box");
+                }else{
+                    X.laytpldata("#dropdownlist-con-box-dot",listdata,".dropdownlist-con-box");
+                }
+            })
+
             $(document).off('click','.dropdownlist-list').on('click','.dropdownlist-list',function(){
                 var index = $(this).attr("data-index");
-                var dataArr = listdata[index];
+                var id = $(this).attr("data-id");
+                var title = $(this).attr("data-title");
+                for(let i in listdata){
+                    if(listdata[i]['id'] == id && title == listdata[i]['title']){
+                        var dataArr = listdata[i];
+                    }
+                }
                 me.callback && me.callback(dataArr);
                 layer.close( me.parms.layIndex );
             })
@@ -9963,10 +10025,14 @@ var X = window.X || {
                     events: data.events
                 }
                 X.api("ck/ltv_model","post",dataArr,function(d){
-                    if(d.title.length == 0){
-                        layer.msg('无数据');
+                    if(d == "查无数据"){
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+
                         return;
                     }else{
+                        $(".chawushuj").hide();
                         X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
                         X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td");
                     }
@@ -11314,8 +11380,16 @@ var X = window.X || {
                     events: data.events
                 }
                 X.api("ck/retention_model","post",dataArr,function(d){
-                    querydata = d;
-                    updata(d)
+                    if(d != "查无数据"){
+                        querydata = d;
+                        updata(d);
+                        $(".chawushuj").hide();
+                    }else {
+                        $("#analysis-echarts").empty();
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                    }
                 })
             };
 
diff --git a/web/srczip/common.js b/web/srczip/common.js
index a805615..3622272 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -192,7 +192,7 @@ var X = window.X || {
                         callback && callback(d.data);
                     }else {
                         layer.msg('查无数据');
-                        // callback && callback(d);
+                        callback && callback(d);
                     }
                 }else {
                     if(d.code == -5){
@@ -200,6 +200,9 @@ var X = window.X || {
                         window.localStorage.removeItem('loginData');
                         X.gourl("login");
                         location.reload();
+                    }else if(d.code == -9){
+                        
+                        callback && callback("查无数据");
                     }else {
                         layer.msg(d.msg);
                     }
@@ -254,7 +257,17 @@ var X = window.X || {
                         callback && callback(d.data);
                     }
                 }else {
-                    layer.msg(d.msg);
+                    if(d.code == -5){
+                        layer.msg("登录过期请重新登录!!!");
+                        window.localStorage.removeItem('loginData');
+                        X.gourl("login");
+                        location.reload();
+                    }else if(d.code == -9){
+                        
+                        callback && callback("查无数据");
+                    }else {
+                        layer.msg(d.msg);
+                    }
                 }
                 
             },
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index ec6fbfc..e4d6427 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -1112,17 +1112,22 @@
                 }
                 X.api("ck/event_model","post",dataArr,function(d){
                     querydata = d;
-                    if(d.length > 0){
+                    if(d != "查无数据"){
                         if(d[0].values.length > 0 ){
                             updata();
                             tabledata(d);
+                            $(".chawushuj").hide();
                         }else {
                             $("#analysis-echarts").empty();
                             layer.msg("无数据");
                         }
                     }else {
                         $("#analysis-echarts").empty();
-                        layer.msg("无数据");
+
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                        // layer.msg("无数据");
+
                     }
                     
                 })
diff --git a/web/srczip/logic/attribute.js b/web/srczip/logic/attribute.js
index e62c043..ac68757 100644
--- a/web/srczip/logic/attribute.js
+++ b/web/srczip/logic/attribute.js
@@ -331,9 +331,17 @@
                     events: data.events
                 }
                 X.api("ck/user_property_model","post",dataArr,function(val){
-                    attributetable(val);
-                    querydata = val;
-                    updata(val)
+                    if(val != "查无数据"){
+                        attributetable(val);
+                        querydata = val;
+                        updata(val);
+                        $(".chawushuj").hide();
+                    }else {
+                        $("#attribute-echarts").empty();
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                    }
                 })
             };
 
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index e20c379..ac39e85 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -642,7 +642,7 @@
                         });
                     }
                 })
-            })
+            });
             
         },
 
@@ -691,7 +691,8 @@
                         $("#model-box").html("");
                         // 获取报表数据
                         X.pageLogic['dashboard'].gettabledata();
-                        var sidebar = document.getElementById('sidebar-box');
+
+                        var sidebar = document.getElementById('sidebar-box'+d.spaces[0]['_id']);
                         new Sortable(sidebar, {
                             handle: '.tuodong', // handle class
                             animation: 150,
@@ -720,6 +721,7 @@
                                 })
                             }
                         });
+
                         break;//终止循环
                         
                     }
@@ -732,7 +734,7 @@
         //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
         fillmodeldata:function(d,id,type){
             X.modelapi("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
-                if(val == null || JSON.stringify(val) == "{}" || JSON.stringify(val) == "[]"){
+                if(val == '查无数据'){
                     $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
                 }else {
                     var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
@@ -1122,7 +1124,7 @@
                             })
                         });
                     }else {
-                        layer.msg('无数据!!!');
+                        layer.msg('无数据qqq');
                     }
                 })
             });
diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js
index d061c06..d58099b 100644
--- a/web/srczip/logic/distribution.js
+++ b/web/srczip/logic/distribution.js
@@ -366,10 +366,19 @@
                     events: data.events
                 }
                 X.api("ck/scatter_model","post",dataArr,function(d){
-                    querydata = d;
-                    d['tabletitle'] = $.extend(true,[],d['label']);
-                    d['tabletitle'].unshift('事件发生时间','总人数');
-                    updata(d)
+                    if(d != "查无数据"){
+                        querydata = d;
+                        d['tabletitle'] = $.extend(true,[],d['label']);
+                        d['tabletitle'].unshift('事件发生时间','总人数');
+                        updata(d);
+                        $(".chawushuj").hide();
+                    }else{
+                        $("#distribution-echarts").empty();
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                    }
+                    
                 })
             };
 
diff --git a/web/srczip/logic/dropdownlist.js b/web/srczip/logic/dropdownlist.js
index 1a53cc7..787257a 100644
--- a/web/srczip/logic/dropdownlist.js
+++ b/web/srczip/logic/dropdownlist.js
@@ -9,9 +9,36 @@
 
             X.laytpldata("#dropdownlist-con-box-dot",listdata,".dropdownlist-con-box");
 
+            // $(document).off("bind",'.dropdownlist-input').on("bind",".dropdownlist-input",function(){
+            //     var title = $(this).val();
+            //     console.log(title);
+            // });
+
+            $('.dropdownlist-input').bind('input propertychange', function() {
+                var title = $(this).val();
+                if(title != ""){
+                    var filteringdata = [];
+                    for(let i in listdata){
+                        if(listdata[i]['title'].indexOf(title) != -1 || listdata[i]['id'].indexOf(title) != -1){
+                            filteringdata.push(listdata[i]);
+                        }
+                    }
+                    // console.log(filteringdata);
+                    X.laytpldata("#dropdownlist-con-box-dot",filteringdata,".dropdownlist-con-box");
+                }else{
+                    X.laytpldata("#dropdownlist-con-box-dot",listdata,".dropdownlist-con-box");
+                }
+            })
+
             $(document).off('click','.dropdownlist-list').on('click','.dropdownlist-list',function(){
                 var index = $(this).attr("data-index");
-                var dataArr = listdata[index];
+                var id = $(this).attr("data-id");
+                var title = $(this).attr("data-title");
+                for(let i in listdata){
+                    if(listdata[i]['id'] == id && title == listdata[i]['title']){
+                        var dataArr = listdata[i];
+                    }
+                }
                 me.callback && me.callback(dataArr);
                 layer.close( me.parms.layIndex );
             })
diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js
index c8ae9c4..756324a 100644
--- a/web/srczip/logic/ltvmodel.js
+++ b/web/srczip/logic/ltvmodel.js
@@ -251,10 +251,14 @@
                     events: data.events
                 }
                 X.api("ck/ltv_model","post",dataArr,function(d){
-                    if(d.title.length == 0){
-                        layer.msg('无数据');
+                    if(d == "查无数据"){
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+
                         return;
                     }else{
+                        $(".chawushuj").hide();
                         X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
                         X.laytpldata("#table-fenxi-td-dot",d.rows,".table-fenxi-td");
                     }
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 55a79cf..b9191e5 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -503,8 +503,16 @@
                     events: data.events
                 }
                 X.api("ck/retention_model","post",dataArr,function(d){
-                    querydata = d;
-                    updata(d)
+                    if(d != "查无数据"){
+                        querydata = d;
+                        updata(d);
+                        $(".chawushuj").hide();
+                    }else {
+                        $("#analysis-echarts").empty();
+                        $(".table-fenxi-th").html("");
+                        $(".table-fenxi-td").html("");
+                        $(".chawushuj").show();
+                    }
                 })
             };
 
diff --git a/web/srczip/logic/userlabel.js b/web/srczip/logic/userlabel.js
index fc78777..063f416 100644
--- a/web/srczip/logic/userlabel.js
+++ b/web/srczip/logic/userlabel.js
@@ -29,16 +29,23 @@
                 });
             });
 
-            // X.api('user_label/read','post',{project_id: X.DATA.projectid},function(d){
-            //     console.log(d);
-            // })
+            // 标签详情
+            $(document).off('click','.label-info-box').on('click','.label-info-box',function(){
+                X.gourl('userlabelinfo','conetnt');
+            });
 
             // 监听单行事件
             layui.table.on('row(userlabeltest)',function(obj){
                 var data = obj.data
-                console.log(data);
+                // console.log(data);
                 X.DATA.userlabelid = data._id;
-                X.laytpldata('#userlabel-right-box-dot',data,'.userlabel-right-box');
+
+                X.api("user_label/cluster_user_count","post",{cluster_name:data.cluster_name},function(d){
+                    data['num'] = d.num;
+                    // console.log(d);
+                    X.laytpldata('#userlabel-right-box-dot',data,'.userlabel-right-box');
+                })
+
             });
 
 
@@ -56,11 +63,14 @@
                     }
                 }}
                 // ,{fixed: 'right', title:'操作', toolbar: '#eventattradminbarDemo', width:80}
-            ]],"&project_id="+X.DATA.projectid,'auto',function(res, curr, count){
+            ]],"",'auto',function(res, curr, count){
                 // console.log(res);
                 if(res.data.length > 0){
                     X.DATA.userlabelid = res.data[0]._id;
-                    X.laytpldata('#userlabel-right-box-dot',res.data[0],'.userlabel-right-box');
+                    X.api("user_label/cluster_user_count","post",{cluster_name:res.data[0].cluster_name},function(d){
+                        res.data[0]['num'] = d.num;
+                        X.laytpldata('#userlabel-right-box-dot',res.data[0],'.userlabel-right-box');
+                    })
                 }
             });
         } 
diff --git a/web/srczip/logic/userlabelinfo.js b/web/srczip/logic/userlabelinfo.js
new file mode 100644
index 0000000..c47bf9b
--- /dev/null
+++ b/web/srczip/logic/userlabelinfo.js
@@ -0,0 +1,52 @@
+(function(){
+    X.pageLogic['userlabelinfo'] = {
+        init : function(parms){
+            var me = this;
+            var userlabelid = X.DATA.userlabelid;
+
+            var page = 1;  //设置首页页码
+            var limit = 10;  //设置每页显示条数
+            var total; //总条数
+
+            X.api("user_label/detail","post",{label_id: userlabelid},function(val){
+                X.api("user_label/cluster_user_count","post",{cluster_name:val.cluster_name},function(d){
+                    val['num'] = d.num;
+                    total = d.num;
+                    X.laytpldata('#userlabelinfo-right-box-dot',val,'.userlabel-right-box');
+                    cluster_user_list_data(val);
+
+                    layui.laypage.render({
+                        elem: 'laypage' //注意，这里的 test1 是 ID，不用加 # 号
+                        ,count: total, //数据总数，从服务端得到
+                        limit:limit,   //每页条数设置
+                        jump: function(obj, first){
+                            //obj包含了当前分页的所有参数，比如：
+                            // console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
+                            // console.log(obj.limit); //得到每页显示的条数
+                            page=obj.curr;  //改变当前页码
+                            limit=obj.limit;
+                            //首次不执行
+                            if(!first){
+                                cluster_user_list_data(val);  //加载数据
+                            }
+                        }
+                    });
+                })
+            });
+
+            function cluster_user_list_data(val){
+                X.api('user_label/cluster_user_list',"post",{cluster_name: val.cluster_name,page: page,limit: limit},function(d){
+                    X.laytpldata("#table-fenxi-th-dot",d.columns,".table-fenxi-th");
+                    X.laytpldata("#table-fenxi-td-dot",d.values ,".table-fenxi-td");
+                });
+            };
+
+            // 返回上一页
+            $(document).off("click",".userlabel-right-fanhui").on("click",".userlabel-right-fanhui",function(){
+                X.gourl('userlabel','conetnt');
+            });
+            
+
+        }
+    };
+})();
\ No newline at end of file
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index 4a3b1af..61e64a2 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -199,6 +199,7 @@
 .dropdownlist-box { width: 200px; max-height: 350px; background-color: #fff; }
 .dropdownlist-list { cursor: pointer; margin: 1px 0; padding: 8px 15px; font-size: 14px; color: rgba(0, 0, 0, 0.8); }
 .dropdownlist-list:hover { background-color: #f6f8fa; }
+.dropdownlist-input { width: 170px; padding: 15px; border: 0; }
 
 /* 分组项弹窗 */
 .groupeditemspop-box { width: 364px; height: 270px; background-color: #fff; }
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 9b14880..1419fc3 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -29,8 +29,8 @@
 .layui-laypage-em { background-color: #3d90ff !important; }
 
 ::-webkit-scrollbar { 
-    width:5px; 
-    height:5px; 
+    width:8px; 
+    height:8px; 
     background-color:#F5F5F5; 
 }
 /* 滚动条上的按钮 (上下箭头). */
@@ -793,6 +793,6 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
 .userlabel-right-fanhui { padding: 0px 24px 10px 24px; cursor: pointer; color: #607595; font-size: 14px; font-weight: 500; }
 .analysis-num {cursor: pointer;}
 
-
+.chawushuj { width: 100%; text-align: center;  }
 
 
diff --git a/web/static/img/wushujv3.png b/web/static/img/wushujv3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca98c1197fe2a9fff052f3c5b17099c65d356207
GIT binary patch
literal 8802
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
SM_-cCe`Eg_Wk7bP?>_+Y2M=)o

literal 0
HcmV?d00001