From 5bf5a4d1f593239bfb2c4fcaa426faed69a3bc69 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Tue, 27 Sep 2022 11:18:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E5=8D=A1?=
 =?UTF-8?q?=E9=A1=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/pages/modeltable.html      | 100 +++++----------------------------
 web/src/x.min.js               |  42 +++++++-------
 web/srczip/logic/attribute.js  |   1 +
 web/srczip/logic/modeltable.js |  17 +++---
 web/srczip/logic/savereport.js |  14 +++--
 web/static/css/style.css       |   4 ++
 6 files changed, 61 insertions(+), 117 deletions(-)

diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index af854d3..94c3b34 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -1,4 +1,3 @@
-
 <script id="kanban-model-modify-table-dot" type="text/html">
 
     {{#  if(d.modelsize === "small"){ }}
@@ -37,90 +36,11 @@
 
                 <div class="table_box_big">
                     <div class="table_box">
-                        <!-- <table>
-                            <thead>
-                                <tr class="table-fenxi-th">
-                                    {{# layui.each(d.titledata, function(indexs, items) {  }}
-                                        <th>{{items}}</th>
-                                    {{#  }); }}
-                                </tr> 
-                            </thead>
-                        </table>
+                        <div class="table_tbody_box">
+                        {{#  if(d.condata.length > 200){ }}
+                            <div class="table_tbody_box2">
+                        {{#  } }} 
 
-                        <div class="table_tbody_box">
-                            <table class="table-fenxi-box">
-                                
-                                {{#  if(d.cat === "event"){ }}
-                                    <tbody class="table-fenxi-td">
-                                    
-                                        {{# layui.each(d.condata, function(indexs, items) {  }}
-                                            <tr >
-                                                {{# layui.each(items, function(indexss, itemss) {  }}
-                                                    <td>{{itemss}}</td>
-                                                {{#  }); }}
-                                            </tr>
-                                        {{#  }); }}
-                                    </tbody>
-                                {{# } else if( d.cat == "scatter"){ }}
-                                    <tbody class="table-fenxi-td">
-                                        
-                                        {{# layui.each(d.condata, function(indexs, items) {  }}
-                                        <tr >
-                                            <td>{{items.date}}</td>
-                                            <td>{{items.d0}}</td>
-                                            {{#  layui.each(items.data, function(indexss, itemss){ }}
-                                            <td>
-                                                <p>{{itemss.n}}</p>
-                                                <p>{{itemss.p}}</p>
-                                            </td>
-                                            {{#  }); }}
-                                        </tr>
-                                        {{#  }); }}
-                                    </tbody>
-                                {{# } else if(d.cat === "retention"){ }}
-                                <tbody class="table-fenxi-td">
-                                        
-                                    {{# layui.each(d.condata, function(indexs, items) {  }}
-                                    <tr >
-                                        <td>{{items.date}}</td>
-                                        <td>{{items.d0}}</td>
-                                        {{#  layui.each(items.data, function(indexss, itemss){ }}
-                                        <td>
-                                            {{#  if(itemss.p == '-'){ }}
-                                                <p>{{itemss.p}}</p>
-                                            {{# } else { }}
-                                                <p>{{itemss.p}}%</p>
-                                            {{#  } }} 
-                                            
-                                        </td>
-                                        {{#  }); }}
-                                    </tr>
-                                    {{#  }); }}
-                                </tbody>
-            
-                                {{# } else if(d.cat === "ltv"){ }}
-                                    <tbody class="table-fenxi-td">
-                                        
-                                        {{# layui.each(d.condata, function(indexs, items) {  }}
-                                        <tr >
-                                            {{#  layui.each(items, function(indexss, itemss){ }}
-                                            <td>{{itemss}}</td>
-                                            {{#  }); }}
-                                        </tr>
-                                        {{#  }); }}
-                                    </tbody>
-                                {{# } else if(d.cat === "user_property"){ }}
-                                    {{# layui.each(d.condata, function(indexs, items) {  }}
-                                        <tr>
-                                            <td>{{indexs}}</td>
-                                            <td>{{items}}</td>
-                                        </tr>
-                                    {{#  }); }}
-                                {{#  } }} 
-                            </table>
-                        </div> -->
-                        <div class="table_tbody_box">
-                        
                         <table id="dataTableMul{{d.id}}" class="table table-bordered table-fenxi-box">
                             <thead>
                                 <tr>
@@ -217,6 +137,9 @@
                             </tbody>
 
                         </table>
+                        {{#  if(d.condata.length > 200){ }}
+                            </div>
+                        {{#  } }} 
                     </div>
                     </div>
                 </div>
@@ -233,8 +156,12 @@
 
                 <div class="table_box_big" style="height: 690px;">
                     <div class="table_box">
+                        
                         <div class="table_tbody_box big_table_tbody_box" style="height: 690px;">
-
+                            
+                            {{#  if(d.condata.length > 200){ }}
+                                <div class="table_tbody_box2">
+                            {{#  } }} 
                         <table id="dataTableMul{{d.id}}" class="table table-bordered table-fenxi-box">
                             <thead>
                                 <tr>
@@ -315,6 +242,9 @@
                             </tbody>
 
                         </table>
+                        {{#  if(d.condata.length > 200){ }}
+                            </div>
+                        {{#  } }} 
                     </div>
                     </div>
                 </div>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 03b55b9..f0c1a6e 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -197,7 +197,6 @@ var X = window.X || {
                 var url = ipurl+url+"?game="+ X.DATA.game || "";
             }
         }
-        console.log(11111,data)
         var index;
         $.ajax({
             headers: {
@@ -323,11 +322,6 @@ var X = window.X || {
         var min = date.getMinutes();
         var s = date.getSeconds();
         var time = y+'年'+(m<10?('0'+m):m)+'月'+(d<10?('0'+d):d)+'日  '+(h<10?('0'+h):h)+':'+(min<10?('0'+min):min)+':'+(s<10?('0'+s):s);//操作时间
-
-        console.log(name+'在'+time+'修改'+content);
-        // X.api(function(){
-            
-        // })
     };
 
     X.uploadfile=function(url,id,callback){
@@ -991,7 +985,7 @@ var X = window.X || {
             proid_money: data[0]['proid_money'],
             proid_name: data[0]['proid_name']
         }
-        console.log(dataArr);
+
         callback && callback(dataArr);
     };
 
@@ -1320,7 +1314,7 @@ var X = window.X || {
         var arr = {};
         var seriesData = [];
         var xAxisdata = [];
-        console.log(544565645,data)
+
         if(data.switch_test){
             if(jQuery.isEmptyObject(data.date_data)){
                 var arr = []
@@ -5799,6 +5793,7 @@ var X = window.X || {
 
             // 保存报表
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
+                console.log('保存',data)
                 if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
                     baobiaodata['saveas'] = 0;
                     X.parametersopen(baobiaodata,'savereport','auto');
@@ -12423,7 +12418,6 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
-            console.log('11',data);
             X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
 
                 
@@ -12473,13 +12467,17 @@ var X = window.X || {
                     $("#conent-box"+data.id).html(html);
                 // }
                 // console.log(data.reverseorder , data.name);
+              
+                console.log(data)
                 if(data.modeltype == "table" && data.modelsize != "small"){
-                    var tableMul;
-                    var id = 'dataTableMul'+data['id'];
-                    if(data.reverseorder){
-                        tableMul = new FixedTable(id, 2);
-                    }else {
-                        tableMul = new FixedTable(id, 0);
+                    if(data.condata.length < 200){
+                        var tableMul;
+                        var id = 'dataTableMul'+data['id'];
+                        if(data.reverseorder && data.titledata.length > 2){
+                            tableMul = new FixedTable(id, 2);
+                        }else {
+                            tableMul = new FixedTable(id, 0);
+                        }
                     }
                 }
                 
@@ -15195,11 +15193,14 @@ var X = window.X || {
                     layer.msg("请填写报表备注");
                     return false;
                 }
-                if(data.eventView){
-                    if(!data.eventView['switchTest']){
-                        data.events = data.single
+                if(data.cksql === 'funnel'){
+                    if(data.eventView){
+                        if(!data.eventView['switchTest']){
+                            data.events = data.single
+                        }
                     }
                 }
+                
 
                 if(data.saveas == 0 ){
                     data['query']['eventView']['date_type']  = tabval.date_type;
@@ -15213,8 +15214,8 @@ var X = window.X || {
                         
                         // 提交看板修改记录
                         // X.submitrecord('修改'+tabval['title']+'看板')
-                        layer.msg(d);
                         layer.closeAll();
+                        layer.msg(d);
                         
                     })
                 }else {
@@ -15226,9 +15227,10 @@ var X = window.X || {
                         project_id:X.DATA.projectid,
                         cat: data['eventView']['cksql']
                     }
+                    // console.log(arr)
                     X.api('report/create','post',arr,function(d){
-                        layer.msg(d);
                         layer.closeAll();
+                        layer.msg('保存成功');
                     })
                 }
             });
diff --git a/web/srczip/logic/attribute.js b/web/srczip/logic/attribute.js
index ad39c27..a95a563 100644
--- a/web/srczip/logic/attribute.js
+++ b/web/srczip/logic/attribute.js
@@ -497,6 +497,7 @@
 
             // 保存报表
             $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
+                console.log('保存',data)
                 if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
                     baobiaodata['saveas'] = 0;
                     X.parametersopen(baobiaodata,'savereport','auto');
diff --git a/web/srczip/logic/modeltable.js b/web/srczip/logic/modeltable.js
index 48ea509..8309d13 100644
--- a/web/srczip/logic/modeltable.js
+++ b/web/srczip/logic/modeltable.js
@@ -5,7 +5,6 @@
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
-            console.log('11',data);
             X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
 
                 
@@ -55,13 +54,17 @@
                     $("#conent-box"+data.id).html(html);
                 // }
                 // console.log(data.reverseorder , data.name);
+              
+                console.log(data)
                 if(data.modeltype == "table" && data.modelsize != "small"){
-                    var tableMul;
-                    var id = 'dataTableMul'+data['id'];
-                    if(data.reverseorder){
-                        tableMul = new FixedTable(id, 2);
-                    }else {
-                        tableMul = new FixedTable(id, 0);
+                    if(data.condata.length < 200){
+                        var tableMul;
+                        var id = 'dataTableMul'+data['id'];
+                        if(data.reverseorder && data.titledata.length > 2){
+                            tableMul = new FixedTable(id, 2);
+                        }else {
+                            tableMul = new FixedTable(id, 0);
+                        }
                     }
                 }
                 
diff --git a/web/srczip/logic/savereport.js b/web/srczip/logic/savereport.js
index 79a9344..8d4c3b1 100644
--- a/web/srczip/logic/savereport.js
+++ b/web/srczip/logic/savereport.js
@@ -24,11 +24,14 @@
                     layer.msg("请填写报表备注");
                     return false;
                 }
-                if(data.eventView){
-                    if(!data.eventView['switchTest']){
-                        data.events = data.single
+                if(data.cksql === 'funnel'){
+                    if(data.eventView){
+                        if(!data.eventView['switchTest']){
+                            data.events = data.single
+                        }
                     }
                 }
+                
 
                 if(data.saveas == 0 ){
                     data['query']['eventView']['date_type']  = tabval.date_type;
@@ -42,8 +45,8 @@
                         
                         // 提交看板修改记录
                         // X.submitrecord('修改'+tabval['title']+'看板')
-                        layer.msg(d);
                         layer.closeAll();
+                        layer.msg(d);
                         
                     })
                 }else {
@@ -55,9 +58,10 @@
                         project_id:X.DATA.projectid,
                         cat: data['eventView']['cksql']
                     }
+                    // console.log(arr)
                     X.api('report/create','post',arr,function(d){
-                        layer.msg(d);
                         layer.closeAll();
+                        layer.msg('保存成功');
                     })
                 }
             });
diff --git a/web/static/css/style.css b/web/static/css/style.css
index e21712f..67e6ec3 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -841,6 +841,10 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
     height: 300px;
     /* overflow: scroll; */
 }
+.table_tbody_box2 {
+    height: 100%;
+    overflow: scroll;
+}
 .table-fenxi-th th{
     background-color: #f0f2f5;
     min-width: 120px;