leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改看板卡顿问题

Browse Source
This commit is contained in:
罗松柏 2022-09-27 11:18:52 +08:00
parent e9121c25d7
commit 5bf5a4d1f5
6 changed files with 61 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
web/pages/modeltable.html
View File

@ -1,4 +1,3 @@
<script id="kanban-model-modify-table-dot" type="text/html"> <script id="kanban-model-modify-table-dot" type="text/html">
{{# if(d.modelsize === "small"){ }} {{# if(d.modelsize === "small"){ }}
@ -37,89 +36,10 @@
<div class="table_box_big"> <div class="table_box_big">
<div class="table_box"> <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">
<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"> <div class="table_tbody_box">
{{# if(d.condata.length > 200){ }}
<div class="table_tbody_box2">
{{# } }}
<table id="dataTableMul{{d.id}}" class="table table-bordered table-fenxi-box"> <table id="dataTableMul{{d.id}}" class="table table-bordered table-fenxi-box">
<thead> <thead>
@ -217,6 +137,9 @@
</tbody> </tbody>
</table> </table>
{{# if(d.condata.length > 200){ }}
</div>
{{# } }}
</div> </div>
</div> </div>
</div> </div>
@ -233,8 +156,12 @@
<div class="table_box_big" style="height: 690px;"> <div class="table_box_big" style="height: 690px;">
<div class="table_box"> <div class="table_box">
<div class="table_tbody_box big_table_tbody_box" style="height: 690px;"> <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"> <table id="dataTableMul{{d.id}}" class="table table-bordered table-fenxi-box">
<thead> <thead>
<tr> <tr>
@ -315,6 +242,9 @@
</tbody> </tbody>
</table> </table>
{{# if(d.condata.length > 200){ }}
</div>
{{# } }}
</div> </div>
</div> </div>
</div> </div>

42
web/src/x.min.js vendored
View File

@ -197,7 +197,6 @@ var X = window.X || {
var url = ipurl+url+"?game="+ X.DATA.game || ""; var url = ipurl+url+"?game="+ X.DATA.game || "";
} }
} }
console.log(11111,data)
var index; var index;
$.ajax({ $.ajax({
headers: { headers: {
@ -323,11 +322,6 @@ var X = window.X || {
var min = date.getMinutes(); var min = date.getMinutes();
var s = date.getSeconds(); 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);//操作时间 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){ X.uploadfile=function(url,id,callback){
@ -991,7 +985,7 @@ var X = window.X || {
proid_money: data[0]['proid_money'], proid_money: data[0]['proid_money'],
proid_name: data[0]['proid_name'] proid_name: data[0]['proid_name']
} }
console.log(dataArr);
callback && callback(dataArr); callback && callback(dataArr);
}; };
@ -1320,7 +1314,7 @@ var X = window.X || {
var arr = {}; var arr = {};
var seriesData = []; var seriesData = [];
var xAxisdata = []; var xAxisdata = [];
console.log(544565645,data)
if(data.switch_test){ if(data.switch_test){
if(jQuery.isEmptyObject(data.date_data)){ if(jQuery.isEmptyObject(data.date_data)){
var arr = [] var arr = []
@ -5799,6 +5793,7 @@ var X = window.X || {
// 保存报表 // 保存报表
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
console.log('保存',data)
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){ if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
baobiaodata['saveas'] = 0; baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto'); X.parametersopen(baobiaodata,'savereport','auto');
@ -12423,7 +12418,6 @@ var X = window.X || {
this.parms = parms; this.parms = parms;
this.callback = parms.callback; this.callback = parms.callback;
var data = parms; var data = parms;
console.log('11',data);
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){ 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); $("#conent-box"+data.id).html(html);
// } // }
// console.log(data.reverseorder , data.name); // console.log(data.reverseorder , data.name);
console.log(data)
if(data.modeltype == "table" && data.modelsize != "small"){ if(data.modeltype == "table" && data.modelsize != "small"){
var tableMul; if(data.condata.length < 200){
var id = 'dataTableMul'+data['id']; var tableMul;
if(data.reverseorder){ var id = 'dataTableMul'+data['id'];
tableMul = new FixedTable(id, 2); if(data.reverseorder && data.titledata.length > 2){
}else { tableMul = new FixedTable(id, 2);
tableMul = new FixedTable(id, 0); }else {
tableMul = new FixedTable(id, 0);
}
} }
} }
@ -15195,12 +15193,15 @@ var X = window.X || {
layer.msg("请填写报表备注"); layer.msg("请填写报表备注");
return false; return false;
} }
if(data.eventView){ if(data.cksql === 'funnel'){
if(!data.eventView['switchTest']){ if(data.eventView){
data.events = data.single if(!data.eventView['switchTest']){
data.events = data.single
}
} }
} }
if(data.saveas == 0 ){ if(data.saveas == 0 ){
data['query']['eventView']['date_type'] = tabval.date_type; data['query']['eventView']['date_type'] = tabval.date_type;
var arr = { var arr = {
@ -15213,8 +15214,8 @@ var X = window.X || {
// 提交看板修改记录 // 提交看板修改记录
// X.submitrecord('修改'+tabval['title']+'看板') // X.submitrecord('修改'+tabval['title']+'看板')
layer.msg(d);
layer.closeAll(); layer.closeAll();
layer.msg(d);
}) })
}else { }else {
@ -15226,9 +15227,10 @@ var X = window.X || {
project_id:X.DATA.projectid, project_id:X.DATA.projectid,
cat: data['eventView']['cksql'] cat: data['eventView']['cksql']
} }
// console.log(arr)
X.api('report/create','post',arr,function(d){ X.api('report/create','post',arr,function(d){
layer.msg(d);
layer.closeAll(); layer.closeAll();
layer.msg('保存成功');
}) })
} }
}); });

1
web/srczip/logic/attribute.js
View File

@ -497,6 +497,7 @@
// 保存报表 // 保存报表
$(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){ $(document).off('click','.analysis-savereport').on('click','.analysis-savereport',function(){
console.log('保存',data)
if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){ if(baobiaodata != '' && baobiaodata != undefined && baobiaodata != null){
baobiaodata['saveas'] = 0; baobiaodata['saveas'] = 0;
X.parametersopen(baobiaodata,'savereport','auto'); X.parametersopen(baobiaodata,'savereport','auto');

17
web/srczip/logic/modeltable.js
View File

@ -5,7 +5,6 @@
this.parms = parms; this.parms = parms;
this.callback = parms.callback; this.callback = parms.callback;
var data = parms; var data = parms;
console.log('11',data);
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){ X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
@ -55,13 +54,17 @@
$("#conent-box"+data.id).html(html); $("#conent-box"+data.id).html(html);
// } // }
// console.log(data.reverseorder , data.name); // console.log(data.reverseorder , data.name);
console.log(data)
if(data.modeltype == "table" && data.modelsize != "small"){ if(data.modeltype == "table" && data.modelsize != "small"){
var tableMul; if(data.condata.length < 200){
var id = 'dataTableMul'+data['id']; var tableMul;
if(data.reverseorder){ var id = 'dataTableMul'+data['id'];
tableMul = new FixedTable(id, 2); if(data.reverseorder && data.titledata.length > 2){
}else { tableMul = new FixedTable(id, 2);
tableMul = new FixedTable(id, 0); }else {
tableMul = new FixedTable(id, 0);
}
} }
} }

14
web/srczip/logic/savereport.js
View File

@ -24,12 +24,15 @@
layer.msg("请填写报表备注"); layer.msg("请填写报表备注");
return false; return false;
} }
if(data.eventView){ if(data.cksql === 'funnel'){
if(!data.eventView['switchTest']){ if(data.eventView){
data.events = data.single if(!data.eventView['switchTest']){
data.events = data.single
}
} }
} }
if(data.saveas == 0 ){ if(data.saveas == 0 ){
data['query']['eventView']['date_type'] = tabval.date_type; data['query']['eventView']['date_type'] = tabval.date_type;
var arr = { var arr = {
@ -42,8 +45,8 @@
// 提交看板修改记录 // 提交看板修改记录
// X.submitrecord('修改'+tabval['title']+'看板') // X.submitrecord('修改'+tabval['title']+'看板')
layer.msg(d);
layer.closeAll(); layer.closeAll();
layer.msg(d);
}) })
}else { }else {
@ -55,9 +58,10 @@
project_id:X.DATA.projectid, project_id:X.DATA.projectid,
cat: data['eventView']['cksql'] cat: data['eventView']['cksql']
} }
// console.log(arr)
X.api('report/create','post',arr,function(d){ X.api('report/create','post',arr,function(d){
layer.msg(d);
layer.closeAll(); layer.closeAll();
layer.msg('保存成功');
}) })
} }
}); });

4
web/static/css/style.css
View File

@ -841,6 +841,10 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
height: 300px; height: 300px;
/* overflow: scroll; */ /* overflow: scroll; */
} }
.table_tbody_box2 {
height: 100%;
overflow: scroll;
}
.table-fenxi-th th{ .table-fenxi-th th{
background-color: #f0f2f5; background-color: #f0f2f5;
min-width: 120px; min-width: 120px;