diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html index f5c1d7a..892a8b7 100644 --- a/web/pages/dashboard.html +++ b/web/pages/dashboard.html @@ -660,7 +660,7 @@ {{# if(d.graph_type === "table"){ }} - {{# if(d.graph_size === "large"){ }} + {{# if(d.graph_size === "large" || d.graph_size === "oversize"){ }}
{{# } else { }}
@@ -698,7 +698,7 @@
{{# } else { }} - {{# if(d.graph_size === "large"){ }} + {{# if(d.graph_size === "large" || d.graph_size === "oversize"){ }}
{{# } else { }}
diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html index 7c56b42..4354e57 100644 --- a/web/pages/modeltable.html +++ b/web/pages/modeltable.html @@ -30,7 +30,7 @@ {{# } else { }} - {{# if(d.modeltype === "table"){ }} + {{# if(d.modeltype === "table" && d.modelsize !== "oversize"){ }}
@@ -201,61 +201,145 @@
- {{# } else { }} - - {{# if(d.cat != "user_property" && d.cat != "scatter" && d.cat != "trace"){ }} - -
-
- {{# if(d.daydata != false ){ }} -
{{d.sameday}}
- {{# } }} -
- {{# if(d.chain_ratiotype != ''){ }} - {{# if(d.chain_ratiotype == '+'){ }} -
较环比
{{d.chain_ratio}}%
- {{# } else { }} -
较环比
{{d.chain_ratio}}%
- {{# } }} - {{# } }} - {{# if(d.wowtype != ''){ }} - {{# if(d.wowtype == "+"){ }} -
较同比
{{d.wow}}%
- {{# } else { }} -
较同比
{{d.wow}}%
- {{# } }} - {{# } }} + {{# } else if(d.modeltype === "table" && d.modelsize === "oversize") { }} + +
+
+ +
+
+
+ + + + + {{# layui.each(d.titledata, function(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) { }} + + + + + {{# }); }} + + {{# } }} + + + +
{{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}}
+
+
+
- {{# if(d.avesumdata != false ){ }} -
-
- {{# if(d.sum != -1){ }} -
总和 {{d.sum}}
+ +
+ + {{# } else { }} + {{# if(d.cat != "user_property" && d.cat != "scatter" && d.cat != "trace"){ }} + +
+
+ {{# if(d.daydata != false ){ }} +
{{d.sameday}}
+ {{# } }} +
+ {{# if(d.chain_ratiotype != ''){ }} + {{# if(d.chain_ratiotype == '+'){ }} +
较环比
{{d.chain_ratio}}%
+ {{# } else { }} +
较环比
{{d.chain_ratio}}%
+ {{# } }} {{# } }} - {{# if(d.mean != -1){ }} -
均值 {{d.mean}}
+ {{# if(d.wowtype != ''){ }} + {{# if(d.wowtype == "+"){ }} +
较同比
{{d.wow}}%
+ {{# } else { }} +
较同比
{{d.wow}}%
+ {{# } }} {{# } }}
+ {{# if(d.avesumdata != false ){ }} +
+
+ {{# if(d.sum != -1){ }} +
总和 {{d.sum}}
+ {{# } }} + {{# if(d.mean != -1){ }} +
均值 {{d.mean}}
+ {{# } }} +
+
+ {{# } }} +
+ {{# } }} -
- - {{# } }} -
- {{# if(d.daydata != false && d.avesumdata != false){ }} -
- {{# } else { }} -
- {{# } }} -
- - +
+ {{# if(d.daydata != false && d.avesumdata != false){ }} +
+ {{# } else { }} +
+ {{# } }} +
{{# } }} - {{# } }} \ No newline at end of file diff --git a/web/pages/setupbaobiao.html b/web/pages/setupbaobiao.html index a597e11..338ab3f 100644 --- a/web/pages/setupbaobiao.html +++ b/web/pages/setupbaobiao.html @@ -167,6 +167,9 @@
大图
+
+ 超大图 +
@@ -174,6 +177,7 @@

小图:只展示最核心数据,适用于定位核心数据数值

中图:根据图表类型展示,使用于快速浏览图表信息

大图:根据图表类型展示,适用于细致观察图表信息

+

超大图:根据图表类型展示,适用于细致观察图表信息

diff --git a/web/src/x.min.js b/web/src/x.min.js index 7d11b7c..357345c 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -143,8 +143,8 @@ var X = window.X || { // var ipurl = "http://10.0.0.94:7899/api/v1/"; // 线上 var ipurl = "http://139.159.159.3:9865/api/v1/"; - //线上测试 - // var ipurl = "http://139.159.159.3:7889/api/v1/"; + //线上测试 + // var ipurl = "http://139.159.159.3:7889/api/v1/"; //设置或读取登录缓存,需要保存到localStorage,防止刷新时候登录数据丢失 X.loginCache = function(data){ @@ -14796,8 +14796,10 @@ var X = window.X || { $("#setupbaobiao-in").prop("checked",true); }else if( data.modelsize == 'small' ){//小图 $("#setupbaobiao-small").prop("checked",true); - }else{//大图 + }else if( data.modelsize == 'large' ){//大图 $("#setupbaobiao-large").prop("checked",true); + }else { + $("#setupbaobiao-oversize").prop("checked",true); } //初始化xy轴切换 if(data.modelswitch && data.modelswitch != "undefined" && data.modelswitch == "true"){ diff --git a/web/srczip/logic/setupbaobiao.js b/web/srczip/logic/setupbaobiao.js index cdd7eae..cc206fa 100644 --- a/web/srczip/logic/setupbaobiao.js +++ b/web/srczip/logic/setupbaobiao.js @@ -32,8 +32,10 @@ $("#setupbaobiao-in").prop("checked",true); }else if( data.modelsize == 'small' ){//小图 $("#setupbaobiao-small").prop("checked",true); - }else{//大图 + }else if( data.modelsize == 'large' ){//大图 $("#setupbaobiao-large").prop("checked",true); + }else { + $("#setupbaobiao-oversize").prop("checked",true); } //初始化xy轴切换 if(data.modelswitch && data.modelswitch != "undefined" && data.modelswitch == "true"){ diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css index f059cb5..eb88a3e 100644 --- a/web/static/css/analysis.css +++ b/web/static/css/analysis.css @@ -305,7 +305,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{ min-width: 120px; max-height: 200px; width: 150px; max-width: 120px; padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border: 1px solid #e6e6e6; word-wrap:break-word; +.table-fenxi-box tr td{ min-width: 120px; max-height: 200px; width: 150px; max-width: 120px; padding: 7px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border: 1px solid #e6e6e6; word-wrap:break-word; /* white-space:pre-wrap; */ } diff --git a/web/static/css/style.css b/web/static/css/style.css index 75da6ad..5980690 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -24,7 +24,7 @@ .controlhover:hover > .control { display: block; } /* .layui-card { min-height: 388px; } */ .modify-layui-card-small { height: 186px; } -.modify-layui-card { height: 388px; } +.modify-layui-card { min-height: 388px; } .layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; } .layui-laypage-em { background-color: #3d90ff !important; } .layui-table-cell { height: auto; } @@ -875,6 +875,13 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; } max-height: 300px; max-width: 100%; } +.big_table_tbody_box .table-view { + position: relative; + overflow: auto; + box-shadow: 0px 1px 1px #dad8d8; + max-height: 690px; + max-width: 100%; +} .table-head-fixed { position: absolute; @@ -1080,6 +1087,7 @@ input.editable-select { } .table-view .table-striped th, .table-view .table-striped td { height: 45px !important; + max-width: 157px; } .userinfo-left-box { width: 270px;