diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html index 6884082..31c2c3b 100644 --- a/web/pages/modeltable.html +++ b/web/pages/modeltable.html @@ -35,83 +35,101 @@
- - - - {{# layui.each(d.titledata, function(indexs, items) { }} - - {{# }); }} - - - - {{# if(d.cat === "event"){ }} - - - {{# layui.each(d.condata, function(indexs, items) { }} - - {{# layui.each(items, function(indexss, itemss) { }} - +
+
+
{{items}}
{{itemss}}
+ + + {{# layui.each(d.titledata, function(indexs, items) { }} + {{# }); }} - - {{# }); }} - - {{# } else if( d.cat == "scatter"){ }} - - - {{# layui.each(d.condata, function(indexs, items) { }} - - - - {{# layui.each(items.data, function(indexss, itemss){ }} - - {{# }); }} - - {{# }); }} - - {{# } else if(d.cat === "retention"){ }} - - - {{# layui.each(d.condata, function(indexs, items) { }} - - - - {{# layui.each(items.data, function(indexss, itemss){ }} - - {{# }); }} - - {{# }); }} - + + +
{{items}}
{{items.date}}{{items.d0}} -

{{itemss.n}}

-

{{itemss.p}}%

-
{{items.date}}{{items.d0}} - {{# if(itemss.p == '-'){ }} -

{{itemss.p}}

- {{# } else { }} -

{{itemss.p}}%

- {{# } }} - -
- {{# } else if(d.cat === "ltv"){ }} - - - {{# layui.each(d.condata, function(indexs, items) { }} - - {{# layui.each(items, function(indexss, itemss){ }} - {{itemss}} - {{# }); }} - - {{# }); }} - - {{# } else if(d.cat === "user_property"){ }} - {{# layui.each(d.condata, function(indexs, items) { }} - - {{indexs}} - {{items}} - - {{# }); }} - {{# } }} - +
+ + + + {{# if(d.cat === "event"){ }} + + + {{# layui.each(d.condata, function(indexs, items) { }} + + {{# layui.each(items, function(indexss, itemss) { }} + + {{# }); }} + + {{# }); }} + + {{# } else if( d.cat == "scatter"){ }} + + + {{# layui.each(d.condata, function(indexs, items) { }} + + + + {{# layui.each(items.data, function(indexss, itemss){ }} + + {{# }); }} + + {{# }); }} + + {{# } else if(d.cat === "retention"){ }} + + + {{# layui.each(d.condata, function(indexs, items) { }} + + + + {{# layui.each(items.data, function(indexss, itemss){ }} + + {{# }); }} + + {{# }); }} + + + {{# } else if(d.cat === "ltv"){ }} + + + {{# layui.each(d.condata, function(indexs, items) { }} + + {{# layui.each(items, function(indexss, itemss){ }} + + {{# }); }} + + {{# }); }} + + {{# } else if(d.cat === "user_property"){ }} + {{# layui.each(d.condata, function(indexs, items) { }} + + + + + {{# }); }} + {{# } }} +
{{itemss}}
{{items.date}}{{items.d0}} +

{{itemss.n}}

+

{{itemss.p}}%

+
{{items.date}}{{items.d0}} + {{# if(itemss.p == '-'){ }} +

{{itemss.p}}

+ {{# } else { }} +

{{itemss.p}}%

+ {{# } }} + +
{{itemss}}
{{indexs}}{{items}}
+
+ +
+
+ diff --git a/web/src/x.min.js b/web/src/x.min.js index 5d62312..c685aad 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -5938,7 +5938,7 @@ var X = window.X || { var offset = obj.offset(); var offsets = [ offset.top + 10,offset.left]; var id = $(this).attr('data-id'); - X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist",offsets,function(d){ + X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist2",offsets,function(d){ var arr = []; arr.push(id); if(d.click != 'del'){ diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index bf1726a..8f70390 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -380,7 +380,7 @@ var offset = obj.offset(); var offsets = [ offset.top + 10,offset.left]; var id = $(this).attr('data-id'); - X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist",offsets,function(d){ + X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist2",offsets,function(d){ var arr = []; arr.push(id); if(d.click != 'del'){ diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css index bf20c0f..09b847f 100644 --- a/web/static/css/analysis.css +++ b/web/static/css/analysis.css @@ -286,7 +286,7 @@ .table-fenxi-box { width: 100%; } .table-fenxi-box th { background-color: #f0f2f5; min-width: 100px; max-width: 200px; padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #f0f2f5; } .table-fenxi-box tr { text-align: center; border-left: 1px solid #e6e6e6; } -.table-fenxi-box tr td{ padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border: 1px solid #e6e6e6; } +.table-fenxi-box tr td{ min-width: 100px; max-height: 200px; padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border: 1px solid #e6e6e6; } .participate-box { color: #67729d; margin-left: 16px; padding: 0 6px; display: inline-block; min-width: 40px; height: 28px; font-size: 13px; line-height: 29px; border-radius: 2px; cursor: pointer; background-color: #fff; border: 1px solid #f0f2f5; } diff --git a/web/static/css/style.css b/web/static/css/style.css index e28120f..827cd8b 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -171,8 +171,12 @@ .control { height: 21px; display: block; } .tool-show .control { display: block; } -.table-box { margin: 10px 24px 0 24px; height: 300px; overflow-x: auto; overflow-y: hidden; } -.table-tbody-box { height: 300px; overflow-x: auto; overflow-y: auto; } +.table-box { margin: 10px 24px 0 24px; height: 300px; + /* overflow-x: auto; overflow-y: hidden; */ +} +.table-tbody-box { height: 300px; + /* overflow-x: auto; overflow-y: auto; */ +} .table-thead { } .layui-table-body { height: 242px; overflow: auto; } @@ -806,5 +810,28 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; } .customname-val-right div { width: 50%; padding: 24px 0; text-indent: 20px; border-right: 1px solid #f0f2f5;} .customname-content-box { position: relative; top: 66px; } - - +.table_box_big { + overflow-x: scroll; + overflow-y: hidden; + position: relative; + height: 300px; +} +.table_box { + overflow: hidden; + position: absolute; +} +.table_tbody_box { + height: 250px; + overflow: scroll; +} +.table-fenxi-th th{ + background-color: #f0f2f5; + min-width: 100px; + max-width: 200px; + padding: 10px 16px; + color: #202d3f; + font-size: 13px; + font-weight: 400; + border-right: 1px solid #e6e6e6; + border-bottom: 1px solid #f0f2f5; +}