From 121c04bcaddda9fcb6b553d9ca6bd45ec8d7a869 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Fri, 30 Jul 2021 16:18:17 +0800
Subject: [PATCH] 111

---
 web/pages/ltvmodel.html      |  4 +++-
 web/src/x.min.js             | 22 ++++++++++++++++++----
 web/srczip/logic/ltvmodel.js | 22 ++++++++++++++++++----
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/web/pages/ltvmodel.html b/web/pages/ltvmodel.html
index 86f2538..2ce1601 100644
--- a/web/pages/ltvmodel.html
+++ b/web/pages/ltvmodel.html
@@ -36,7 +36,9 @@
             <div class="root___2a4tb">
 
                 <div class="block___2n0We analysis-overall" style="display: block;">
-                    <div class="analysis-con-left-title">全局筛选</div>
+                    <div class="analysis-con-left-title">
+                        <span>全局筛选</span> <span class="eventsplit" style="padding: 3px 5px; background-color: #f0f2f5; color: #67729d;">角色</span>
+                    </div>
 
                     <div class="analysis-con-left-screen-box">
                         
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 1100d00..6f3561e 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -6173,7 +6173,8 @@ var X = window.X || {
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
                     "timeParticleSize":"P1D",
-                    "unitNum":7
+                    "unitNum":7,
+                    "quota":'#account_id'
                 },
                 "events":[
                     
@@ -6218,7 +6219,6 @@ var X = window.X || {
                 })
             });
 
-
             //全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
@@ -6232,8 +6232,12 @@ var X = window.X || {
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":screentypedata[0]['id']
+                    "table_type":screentypedata[0]['id'],
                 };
+                if(data['eventView']['filts'].length == 1){
+                    layer.msg('此项只能添加一个');
+                    return;
+                }
                 data['eventView']['filts'].push(drr);
                 filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['eventView']['filts'].length > 1){
@@ -6245,6 +6249,17 @@ var X = window.X || {
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
+            var listarr =[
+                {title:'角色',id:'#account_id'},
+                {title:'设备',id:'#distinct_id'},
+                // {title:'账号',id:'binduid'},
+            ]
+            X.laydropdown('.eventsplit',listarr,function(d){
+                $('.eventsplit').html(d.title);
+                data['eventView']['quota'] = d.id;
+                console.log(d);
+            });
+
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
@@ -6276,7 +6291,6 @@ var X = window.X || {
                 })
             });
 
-
             $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
                 var obj = $(this);
                 var offset = obj.offset();
diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js
index 3c8a7fe..c4d71d8 100644
--- a/web/srczip/logic/ltvmodel.js
+++ b/web/srczip/logic/ltvmodel.js
@@ -14,7 +14,8 @@
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
                     "timeParticleSize":"P1D",
-                    "unitNum":7
+                    "unitNum":7,
+                    "quota":'#account_id'
                 },
                 "events":[
                     
@@ -59,7 +60,6 @@
                 })
             });
 
-
             //全局筛选
             var filtsftvdata=[];
             $(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
@@ -73,8 +73,12 @@
                     "ftv":[],//条件
                     "strftv":'',//显示条件
                     "section":[-1,1],//区间
-                    "table_type":screentypedata[0]['id']
+                    "table_type":screentypedata[0]['id'],
                 };
+                if(data['eventView']['filts'].length == 1){
+                    layer.msg('此项只能添加一个');
+                    return;
+                }
                 data['eventView']['filts'].push(drr);
                 filtsftvdata.push(screentypedata[0]['category'][0]['category']);
                 if(data['eventView']['filts'].length > 1){
@@ -86,6 +90,17 @@
                 X.template("globalfilter","xinwei-whole",data['eventView']['filts']);
             });
 
+            var listarr =[
+                {title:'角色',id:'#account_id'},
+                {title:'设备',id:'#distinct_id'},
+                // {title:'账号',id:'binduid'},
+            ]
+            X.laydropdown('.eventsplit',listarr,function(d){
+                $('.eventsplit').html(d.title);
+                data['eventView']['quota'] = d.id;
+                console.log(d);
+            });
+
             //删除指定全局数据
             $(document).off('click','.analysis-overall-situation-del').on('click','.analysis-overall-situation-del',function(){
                 var index = $(this).attr('data-index');
@@ -117,7 +132,6 @@
                 })
             });
 
-
             $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){
                 var obj = $(this);
                 var offset = obj.offset();