diff --git a/web/pages/datacheck.html b/web/pages/datacheck.html
index 7d97ebf..63f4db6 100644
--- a/web/pages/datacheck.html
+++ b/web/pages/datacheck.html
@@ -148,16 +148,16 @@
-
+
- 1111 |
+
- 21524 |
+
diff --git a/web/src/x.min.js b/web/src/x.min.js
index b08daf1..e29bc7a 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -187,7 +187,7 @@ var X = window.X || {
},
error:function(error){
- layer.msg('条件错误');
+ layer.msg('数据正在加载中...');
layer.close(index);
}
});
@@ -625,8 +625,8 @@ var X = window.X || {
};
// table
- X.fixedTable=function(id,type,classname,headdata){
- new FixedTable({
+ X.fixedTable=function(id,type,classname,headdata,dataarr,cat){
+ var fixedTable = new FixedTable({
wrap: document.getElementById(id),//生成的表格需要放到哪里
type: type,//表格类型,有:head-fixed、col-fixed、row-col-fixed
extraClass: classname,//需要添加到表格中的额外class
@@ -673,6 +673,42 @@ var X = window.X || {
// ],
tableDefaultContent: "我是一个默认的div
"
});
+
+ fixedTable.addRow(function (){
+ var html = '';
+ if(cat == 'event' || cat == "ltv"){
+ for(let i in dataarr){
+ html += '';
+ for(let j in dataarr[i]){
+ html += ''+ dataarr[i][j] +' | ';
+ }
+ html += '
';
+ }
+ }else if(cat == "retention" || cat == "scatter"){
+
+ for(let i in dataarr){
+ html += '';
+ html += ''+ dataarr[i]['date'] +' | ';
+ html += ''+ dataarr[i]['d0'] +' | ';
+ for(let j in dataarr[i]['data']){
+ // for(let z in dataarr[i]['data'][j]){
+ html += ''+ dataarr[i]['data'][j]['n'] +' '+ dataarr[i]['data'][j]['p'] +' | ';
+ // }
+ }
+ html += '
';
+ }
+
+ }else if(cat == "user_property"){
+ for(let i in dataarr){
+ html += '';
+ html += ''+ i +' | ';
+ html += ''+ dataarr[i] +' | ';
+ html += '
';
+ }
+ }
+
+ return html;
+ });
};
X.eventtable=function(data,callback){
@@ -5477,7 +5513,8 @@ var X = window.X || {
'is_unique':is_unique,
'props':props,
'where':where,
- 'default_field':baseeventdata
+ 'default_field':baseeventdata,
+ 'modeltitle': modeltitle
};
X.open({
type: 1,
@@ -5492,7 +5529,7 @@ var X = window.X || {
})
});
-
+ var modeltitle
$(document).off('click','.datacheck-but-ck').on('click','.datacheck-but-ck',function(){
X.parametersopen({},'datacheck_list','rt',function(d){
var data = d;
@@ -5517,13 +5554,14 @@ var X = window.X || {
conditionData.push(arr);
}
conditionarr = conditionData;
-
+ modeltitle = data.title;
layui.form.val('datacheckexample',{
// 'game':data['game'],
'db_name':data['check']['db_name'],
'eventname':data['check']['event_name'],
'only':data['check']['is_unique'],
});
+
X.laytpldata("#eventattr-box-dot",eventarr,"#datacheck-eventattr-box");
X.laytpldata("#condition-box-dot",conditionarr,"#datacheck-condition-box");
layui.form.render();
@@ -5563,8 +5601,8 @@ var X = window.X || {
$(".datacheck-result-info-tongguo").html("");
$(".datacheck-result-info-cuowu").html("");
- X.laytpldata("#datacheck-table-title-box",d.title,".table-fenxi-th");
- X.laytpldata("#datacheck-tbody-title-box",d.data,".table-fenxi-td");
+ // X.laytpldata("#datacheck-table-title-box",d.title,".table-fenxi-th");
+ // X.laytpldata("#datacheck-tbody-title-box",d.data,".table-fenxi-td");
var data=d;
var pass_list = data.pass_list;
@@ -5575,6 +5613,22 @@ var X = window.X || {
for(let i in fail_list){
$(".datacheck-result-info-cuowu").append(fail_list[i]);
}
+
+ var headdata=[];
+ for(let i in data.title){
+ var arr = {
+ width: "150px",
+ field: data.title[i],
+ fixed: false
+ };
+ if(i == 0){
+ arr['fixed'] = true;
+ }
+ headdata.push(arr);
+ }
+ X.fixedTable("datacheck-table-box",'row-col-fixed','',headdata,data.data);
+
+
})
});
@@ -5598,24 +5652,6 @@ var X = window.X || {
savelist = d;
X.laytpldata("#save-list-content-box-dot",d,".save-list-content-box");
})
- // $.ajax({
- // url: 'http://10.0.0.77:7997/v1/check/template',
- // type:'get',
- // dataType: 'json',
- // async:true,
- // contentType:'application/json',
- // beforeSend: function () {
- // // loading 显示
- // },
- // success:function(d){
- // savelist = d.data;
- // X.laytpldata("#save-list-content-box-dot",d.data,".save-list-content-box");
-
- // },
- // error:function(error){
- // layer.msg('条件错误');
- // }
- // });
};
$(document).off('click','.save-list').on('click','.save-list',function(){
@@ -5636,26 +5672,6 @@ var X = window.X || {
layer.msg('删除成功');
posttemplate();
})
- // $.ajax({
- // url: 'http://10.0.0.77:7997/v1/check/del_template',
- // type:'post',
- // dataType: 'json',
- // async:true,
- // data: JSON.stringify(data),
- // contentType:'application/json',
- // beforeSend: function () {
- // // loading 显示
- // },
- // success:function(d){
- // if(d.data){
- // layer.msg('删除成功');
- // posttemplate();
- // }
- // },
- // error:function(error){
- // layer.msg('条件错误');
- // }
- // });
});
$(document).off('click','.save-list-qx').on('click','.save-list-qx',function(){
@@ -5810,7 +5826,9 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback;
var check = parms.data;
-
+ if(check.modeltitle){
+ $('.datacheck_preser-save-title').val(check.modeltitle);
+ }
$(document).off('click','.datacheck_preser-but-qd').on('click','.datacheck_preser-but-qd',function(){
if($('.datacheck_preser-save-title').val() == ""){
layer.msg('名称不能为空');
@@ -5818,7 +5836,7 @@ var X = window.X || {
}
var data = {
check:check,
- title: $('.datacheck_preser-save-title').val()
+ title: $('.datacheck_preser-save-title').val()
}
X.api('check_data/save','post',data,function(d){
@@ -5827,27 +5845,6 @@ var X = window.X || {
layer.msg('保存成功');
}
})
-
- // $.ajax({
- // url: 'http://10.0.0.77:7997/v1/check/save?game='+check.game+'&db_name='+check.db_name,
- // type:'post',
- // data: JSON.stringify(data),
- // dataType: 'json',
- // async:true,
- // contentType:'application/json',
- // beforeSend: function () {
- // // loading 显示
- // },
- // success:function(d){
- // if(d.data == true){
- // layer.closeAll();
- // layer.msg('保存成功');
- // }
- // },
- // error:function(error){
- // layer.msg('条件错误');
- // }
- // });
});
$(document).off('click','.datacheck_preser-but-qx').on('click','.datacheck_preser-but-qx',function(){
@@ -8712,10 +8709,24 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback;
var data = parms;
- // console.log("table",data);
+ console.log("table",data);
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
-
$("#conent-box"+data.id).html(html);
+ if(data.modeltype == 'table'){
+ var headdata = [];
+ for(let i in data.titledata){
+ var arr = {
+ width: "150px",
+ field: data.titledata[i],
+ fixed: false
+ };
+ if(i == 0){
+ arr['fixed'] = true;
+ }
+ headdata.push(arr);
+ }
+ X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
+ }
})
@@ -12093,18 +12104,17 @@ var X = window.X || {
});
fixedTable.addRow(function (){
+ var dataarr = [
+ ['2016-05-03','王小虎','上海','普陀区','上海市普','200333','200333','200333','200333'],
+ ['2016-05-03','王小虎','上海','普陀区','上海市普','200333','200333','200333','200333'],
+ ['2016-05-03','王小虎','上海','普陀区','上海市普','200333','200333','200333','200333'],
+ ]
var html = '';
- for(var i = 0; i < 15; i ++){
+ for(let i in dataarr){
html += '';
- html += ' 2016-05-03 | ';
- html += ' 王小虎' + i + ' | ';
- html += ' 上海' + i + ' | ';
- html += ' 普陀区' + i + ' | ';
- html += ' 上海市普' + i + ' | ';
- html += ' 200333' + i + ' | ';
- html += ' 200333' + i + ' | ';
- html += ' 200333' + i + ' | ';
- html += ' 200333' + i + ' | ';
+ for(let j in dataarr[i]){
+ html += ' '+ dataarr[i][j] +' | ';
+ }
html += '
';
}
return html;
diff --git a/web/srczip/common.js b/web/srczip/common.js
index f886e50..ff937d9 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -186,7 +186,7 @@ var X = window.X || {
},
error:function(error){
- layer.msg('条件错误');
+ layer.msg('数据正在加载中...');
layer.close(index);
}
});
@@ -624,8 +624,8 @@ var X = window.X || {
};
// table
- X.fixedTable=function(id,type,classname,headdata){
- new FixedTable({
+ X.fixedTable=function(id,type,classname,headdata,dataarr,cat){
+ var fixedTable = new FixedTable({
wrap: document.getElementById(id),//生成的表格需要放到哪里
type: type,//表格类型,有:head-fixed、col-fixed、row-col-fixed
extraClass: classname,//需要添加到表格中的额外class
@@ -672,6 +672,42 @@ var X = window.X || {
// ],
tableDefaultContent: "我是一个默认的div
"
});
+
+ fixedTable.addRow(function (){
+ var html = '';
+ if(cat == 'event' || cat == "ltv"){
+ for(let i in dataarr){
+ html += '';
+ for(let j in dataarr[i]){
+ html += ''+ dataarr[i][j] +' | ';
+ }
+ html += '
';
+ }
+ }else if(cat == "retention" || cat == "scatter"){
+
+ for(let i in dataarr){
+ html += '';
+ html += ''+ dataarr[i]['date'] +' | ';
+ html += ''+ dataarr[i]['d0'] +' | ';
+ for(let j in dataarr[i]['data']){
+ // for(let z in dataarr[i]['data'][j]){
+ html += ''+ dataarr[i]['data'][j]['n'] +' '+ dataarr[i]['data'][j]['p'] +' | ';
+ // }
+ }
+ html += '
';
+ }
+
+ }else if(cat == "user_property"){
+ for(let i in dataarr){
+ html += '';
+ html += ''+ i +' | ';
+ html += ''+ dataarr[i] +' | ';
+ html += '
';
+ }
+ }
+
+ return html;
+ });
};
X.eventtable=function(data,callback){
diff --git a/web/srczip/logic/datacheck.js b/web/srczip/logic/datacheck.js
index 7762302..ea8d9d1 100644
--- a/web/srczip/logic/datacheck.js
+++ b/web/srczip/logic/datacheck.js
@@ -161,7 +161,8 @@
'is_unique':is_unique,
'props':props,
'where':where,
- 'default_field':baseeventdata
+ 'default_field':baseeventdata,
+ 'modeltitle': modeltitle
};
X.open({
type: 1,
@@ -176,7 +177,7 @@
})
});
-
+ var modeltitle
$(document).off('click','.datacheck-but-ck').on('click','.datacheck-but-ck',function(){
X.parametersopen({},'datacheck_list','rt',function(d){
var data = d;
@@ -201,13 +202,14 @@
conditionData.push(arr);
}
conditionarr = conditionData;
-
+ modeltitle = data.title;
layui.form.val('datacheckexample',{
// 'game':data['game'],
'db_name':data['check']['db_name'],
'eventname':data['check']['event_name'],
'only':data['check']['is_unique'],
});
+
X.laytpldata("#eventattr-box-dot",eventarr,"#datacheck-eventattr-box");
X.laytpldata("#condition-box-dot",conditionarr,"#datacheck-condition-box");
layui.form.render();
@@ -247,8 +249,8 @@
$(".datacheck-result-info-tongguo").html("");
$(".datacheck-result-info-cuowu").html("");
- X.laytpldata("#datacheck-table-title-box",d.title,".table-fenxi-th");
- X.laytpldata("#datacheck-tbody-title-box",d.data,".table-fenxi-td");
+ // X.laytpldata("#datacheck-table-title-box",d.title,".table-fenxi-th");
+ // X.laytpldata("#datacheck-tbody-title-box",d.data,".table-fenxi-td");
var data=d;
var pass_list = data.pass_list;
@@ -259,6 +261,22 @@
for(let i in fail_list){
$(".datacheck-result-info-cuowu").append(fail_list[i]);
}
+
+ var headdata=[];
+ for(let i in data.title){
+ var arr = {
+ width: "150px",
+ field: data.title[i],
+ fixed: false
+ };
+ if(i == 0){
+ arr['fixed'] = true;
+ }
+ headdata.push(arr);
+ }
+ X.fixedTable("datacheck-table-box",'row-col-fixed','',headdata,data.data);
+
+
})
});
diff --git a/web/srczip/logic/datacheck_list.js b/web/srczip/logic/datacheck_list.js
index 090fdba..6f03287 100644
--- a/web/srczip/logic/datacheck_list.js
+++ b/web/srczip/logic/datacheck_list.js
@@ -14,24 +14,6 @@
savelist = d;
X.laytpldata("#save-list-content-box-dot",d,".save-list-content-box");
})
- // $.ajax({
- // url: 'http://10.0.0.77:7997/v1/check/template',
- // type:'get',
- // dataType: 'json',
- // async:true,
- // contentType:'application/json',
- // beforeSend: function () {
- // // loading 显示
- // },
- // success:function(d){
- // savelist = d.data;
- // X.laytpldata("#save-list-content-box-dot",d.data,".save-list-content-box");
-
- // },
- // error:function(error){
- // layer.msg('条件错误');
- // }
- // });
};
$(document).off('click','.save-list').on('click','.save-list',function(){
@@ -52,26 +34,6 @@
layer.msg('删除成功');
posttemplate();
})
- // $.ajax({
- // url: 'http://10.0.0.77:7997/v1/check/del_template',
- // type:'post',
- // dataType: 'json',
- // async:true,
- // data: JSON.stringify(data),
- // contentType:'application/json',
- // beforeSend: function () {
- // // loading 显示
- // },
- // success:function(d){
- // if(d.data){
- // layer.msg('删除成功');
- // posttemplate();
- // }
- // },
- // error:function(error){
- // layer.msg('条件错误');
- // }
- // });
});
$(document).off('click','.save-list-qx').on('click','.save-list-qx',function(){
diff --git a/web/srczip/logic/datacheck_preser.js b/web/srczip/logic/datacheck_preser.js
index 4273ac6..da64b67 100644
--- a/web/srczip/logic/datacheck_preser.js
+++ b/web/srczip/logic/datacheck_preser.js
@@ -5,7 +5,9 @@
this.parms = parms;
this.callback = parms.callback;
var check = parms.data;
-
+ if(check.modeltitle){
+ $('.datacheck_preser-save-title').val(check.modeltitle);
+ }
$(document).off('click','.datacheck_preser-but-qd').on('click','.datacheck_preser-but-qd',function(){
if($('.datacheck_preser-save-title').val() == ""){
layer.msg('名称不能为空');
@@ -13,7 +15,7 @@
}
var data = {
check:check,
- title: $('.datacheck_preser-save-title').val()
+ title: $('.datacheck_preser-save-title').val()
}
X.api('check_data/save','post',data,function(d){
@@ -22,27 +24,6 @@
layer.msg('保存成功');
}
})
-
- // $.ajax({
- // url: 'http://10.0.0.77:7997/v1/check/save?game='+check.game+'&db_name='+check.db_name,
- // type:'post',
- // data: JSON.stringify(data),
- // dataType: 'json',
- // async:true,
- // contentType:'application/json',
- // beforeSend: function () {
- // // loading 显示
- // },
- // success:function(d){
- // if(d.data == true){
- // layer.closeAll();
- // layer.msg('保存成功');
- // }
- // },
- // error:function(error){
- // layer.msg('条件错误');
- // }
- // });
});
$(document).off('click','.datacheck_preser-but-qx').on('click','.datacheck_preser-but-qx',function(){
diff --git a/web/static/css/fixed-table.css b/web/static/css/fixed-table.css
index 4c86b57..d01bef2 100644
--- a/web/static/css/fixed-table.css
+++ b/web/static/css/fixed-table.css
@@ -82,13 +82,12 @@ body{
}
.fixed-table-box .table-cell{
display: block;
- /*height: 30px;
- line-height: 30px;*/
- /*word-break: break-all;
- overflow: hidden;
- text-overflow: ellipsis;*/
- white-space: nowrap;
padding: 0 10px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ word-break: break-all;
+
}
/* 表头 start */
.fixed-table-box>.fixed-table_header-wraper{
@@ -104,7 +103,11 @@ body{
background-color: #eef1f6;
}
.fixed-table-box .fixed-table_header th{
- color: #1f2d3d;
+ background-color: #f0f2f5;
+ padding: 10px 0px;
+ color: #202d3f;
+ font-size: 13px;
+ font-weight: 400;
border-top: 0;
border-left: 0;
}
@@ -114,6 +117,7 @@ body{
.fixed-table-box .fixed-table_body td{
border-top: 0;
border-left: 0;
+ height: 51px;
}
.fixed-table-box .fixed-table_body tr.rowHover{
background-color: #eef1f6;
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 86b7b0c..4492870 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -612,6 +612,7 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
.w-300{width: 300px;}
.w-100{width: 100px;}
.ws-100 { width: 100px; }
+.ws-150 { width: 150px; }
.btns{text-align: center;}
.btns button{padding: 10px 20px;}