From dcdb26e433c40333e8115bd279a8444a019af5f6 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 19 Aug 2021 16:54:03 +0800
Subject: [PATCH] 111

---
 web/pages/analysis.html            | 34 ++++++++++++++++++++++-
 web/src/x.min.js                   | 43 +++++++++++++++++++++++-------
 web/srczip/common.js               |  1 +
 web/srczip/logic/analysis.js       | 26 ++++++++++++------
 web/srczip/logic/funnelanalysis.js |  4 +++
 web/srczip/logic/ltvmodel.js       |  6 ++++-
 web/srczip/logic/retained.js       |  6 ++++-
 7 files changed, 99 insertions(+), 21 deletions(-)

diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index f8e57d4..3028813 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -156,7 +156,7 @@
             <div class="analtsis-con-box">
                 <div class="analtsis-con-right-box">
                     <div class="analtsis-con-right-top-title">
-                        玩法参与情况
+                        <!-- 玩法参与情况 -->
                     </div>
                     <div class="analtsis-condition-box">
                         <div class="analtsis-time-box">
@@ -306,6 +306,38 @@
                     <div class="analysis-custom-event-type">触发用户数</div>
                 </div>
             </div>
+            {{#  if(item.filts.length > 0){ }}
+            <div class="analysis-con-left-screen-list-right-screen-bg">
+                <div class="analysis-con-left-screen-list-right-screen-box">
+                    <div class="analysis-con-left-screen-list-right-screen-qh">
+                        <div class="analysis-con-left-screen-list-right-screen-qh-xian"></div>
+                        {{#  if(item.filts.length > 1){ }}
+                            {{#  if(item.condrelation === "and"){ }}
+                                <div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">且</div>
+                            {{#  } else { }}
+                                <div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">或</div>
+                            {{#  } }} 
+                        {{#  } }} 
+                    </div>
+                    <div style="padding-bottom: 10px;" class="analysis-zhibiao-list2-box">
+                        {{#  layui.each(item.filts, function(indexs, items){ }}
+                            <div class="analysis-zhibiao-list analysis-zhibiao-list-mar" id="analysis-zhibiao-list-mar-{{index}}-{{indexs}}">
+                                <div id="ta-property-select-{{index}}-{{indexs}}" class="ta-property-select analysis-zhibiao-list-type1 analysis-background" data-index="{{index}}" data-indexs="{{indexs}}"> {{items.columnDesc}}</div>
+                                <div class="analysis-zhibiao-list-type3 analysis-background analysis-choicetypename" data-index="{{index}}" data-indexs="{{indexs}}">{{items.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-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}"> <input type="text"  data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
+                                <!-- {{#  } }}  -->
+                                <div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
+                            </div>
+                        {{#  }); }}
+                    </div>
+                </div>
+                <div class="analysis-zhibiao-updata-list-box">
+                    <span class="analysis-zhibiao-updata"> <img src="./static/img/shaix.png" /> 添加条件 </span>
+                </div>
+            </div>
+            {{#  } }} 
+
             {{#  if(item.formatname == undefined){ }}
                 <div class="ant-select-selector" data-index="{{index}}">两位小数</div>
             {{#  } else { }}
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 924c3d3..60a4921 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -463,6 +463,7 @@ var X = window.X || {
         var mean = 0;
         var sameday = 0;
         var date;
+
         var length = data[0]['date_range'].length - 1;
         date = data[0]['date_range'][length];
         for(let i in data){
@@ -1584,6 +1585,8 @@ var X = window.X || {
                     "endTime":"",
                     "graphShape":"L0",
                     "recentDay":"1-7",
+                    "e_days":1,
+                    "s_days":7,
                     "groupBy":[],
                     "uiCommonConfig":{
                         "tableSorts":[],
@@ -1618,7 +1621,9 @@ var X = window.X || {
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 calculationdata();
             })
 
@@ -2068,14 +2073,20 @@ var X = window.X || {
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
                 var index = data['eventView']['groupBy'].length;
                 var screentypedata = filteringdata();
-                var drr = {
-                    "columnDesc":screentypedata[0]['category'][index]['title'],//事件中文显示
-                    "columnName":screentypedata[0]['category'][index]['id'],//事件id
-                    'data_type':screentypedata[0]['category'][index]['data_type'],//类型
-                    'tableType': screentypedata[0]['id'],
-                    "ftv":'',//条件
-                    "section":''//区间
+                for(let i in screentypedata){
+                    if(screentypedata[i]['category'].length > 0){
+                        var drr = {
+                            "columnDesc":screentypedata[i]['category'][index]['title'],//事件中文显示
+                            "columnName":screentypedata[i]['category'][index]['id'],//事件id
+                            'data_type':screentypedata[i]['category'][index]['data_type'],//类型
+                            'tableType': screentypedata[i]['id'],
+                            "ftv":'',//条件
+                            "section":''//区间
+                        }
+                        break;
+                    }
                 }
+                
                 data.eventView.groupBy.push(drr);
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
 
@@ -4970,6 +4981,8 @@ var X = window.X || {
                             "filts":[],
                             "groupBy":[],
                             "recentDay":"1-30",
+                            "e_days":1,
+                            "s_days":7,
                             "relation":"and",
                             "startTime":"",
                             "statType":"retention",
@@ -4993,6 +5006,8 @@ var X = window.X || {
                 var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
                 data['eventView']['startTime'] = startTime;
                 data['eventView']['endTime'] = endTime;
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 retaineddata();
             })
 
@@ -6497,6 +6512,8 @@ var X = window.X || {
                     "filts":[],
                     "groupBy":[],
                     "recentDay":"1-7",
+                    "e_days":1,
+                    "s_days":7,
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -6527,7 +6544,9 @@ var X = window.X || {
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });
 
@@ -7486,6 +7505,8 @@ var X = window.X || {
                     "filts":[],
                     "groupBy":[],
                     "recentDay":"1-7",
+                    "e_days":1,
+                    "s_days":7,
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -7519,7 +7540,9 @@ var X = window.X || {
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });
 
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 3a69405..320a411 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -462,6 +462,7 @@ var X = window.X || {
         var mean = 0;
         var sameday = 0;
         var date;
+
         var length = data[0]['date_range'].length - 1;
         date = data[0]['date_range'][length];
         for(let i in data){
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 4c598d2..c82ccb0 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -24,6 +24,8 @@
                     "endTime":"",
                     "graphShape":"L0",
                     "recentDay":"1-7",
+                    "e_days":1,
+                    "s_days":7,
                     "groupBy":[],
                     "uiCommonConfig":{
                         "tableSorts":[],
@@ -58,7 +60,9 @@
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 calculationdata();
             })
 
@@ -508,14 +512,20 @@
             $(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){
                 var index = data['eventView']['groupBy'].length;
                 var screentypedata = filteringdata();
-                var drr = {
-                    "columnDesc":screentypedata[0]['category'][index]['title'],//事件中文显示
-                    "columnName":screentypedata[0]['category'][index]['id'],//事件id
-                    'data_type':screentypedata[0]['category'][index]['data_type'],//类型
-                    'tableType': screentypedata[0]['id'],
-                    "ftv":'',//条件
-                    "section":''//区间
+                for(let i in screentypedata){
+                    if(screentypedata[i]['category'].length > 0){
+                        var drr = {
+                            "columnDesc":screentypedata[i]['category'][index]['title'],//事件中文显示
+                            "columnName":screentypedata[i]['category'][index]['id'],//事件id
+                            'data_type':screentypedata[i]['category'][index]['data_type'],//类型
+                            'tableType': screentypedata[i]['id'],
+                            "ftv":'',//条件
+                            "section":''//区间
+                        }
+                        break;
+                    }
                 }
+                
                 data.eventView.groupBy.push(drr);
                 X.laytpldata("#analysis-gpmain___3YGfw-dot",data.eventView.groupBy,".analysis-gpmain___3YGfw");
 
diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js
index 06a7d0c..0be01b0 100644
--- a/web/srczip/logic/funnelanalysis.js
+++ b/web/srczip/logic/funnelanalysis.js
@@ -11,6 +11,8 @@
                             "filts":[],
                             "groupBy":[],
                             "recentDay":"1-30",
+                            "e_days":1,
+                            "s_days":7,
                             "relation":"and",
                             "startTime":"",
                             "statType":"retention",
@@ -34,6 +36,8 @@
                 var endTime = end.format('YYYY-MM-DD')+ " "+ "23:59:59";
                 data['eventView']['startTime'] = startTime;
                 data['eventView']['endTime'] = endTime;
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 retaineddata();
             })
 
diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js
index d1494c9..f56c44e 100644
--- a/web/srczip/logic/ltvmodel.js
+++ b/web/srczip/logic/ltvmodel.js
@@ -10,6 +10,8 @@
                     "filts":[],
                     "groupBy":[],
                     "recentDay":"1-7",
+                    "e_days":1,
+                    "s_days":7,
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -40,7 +42,9 @@
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });
 
diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js
index 66f0b56..838dae8 100644
--- a/web/srczip/logic/retained.js
+++ b/web/srczip/logic/retained.js
@@ -11,6 +11,8 @@
                     "filts":[],
                     "groupBy":[],
                     "recentDay":"1-7",
+                    "e_days":1,
+                    "s_days":7,
                     "relation":"and",
                     "startTime":"2021-05-09 00:00:00",
                     "statType":"retention",
@@ -44,7 +46,9 @@
 
                 var startdate = new Date(start.format('YYYY-MM-DD'));
                 var startmonth = Date.parse(startdate)/1000;
-                data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                // data['eventView']['recentDay'] = parseInt((sameday - endmonth)/86400) + "-"+ parseInt((sameday - startmonth)/86400);
+                data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
+                data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
                 retaineddata();
             });