From ff0022162792538505d8411a12db4590d8ac5071 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Wed, 27 Oct 2021 13:43:28 +0800 Subject: [PATCH] 1 --- web/pages/retained.html | 4 +- web/src/x.min.js | 172 +++++++++++++++++------------------ web/srczip/base/ajaxpage.js | 4 +- web/srczip/common.js | 97 +++++++++++--------- web/srczip/logic/analysis.js | 42 ++++++--- web/srczip/logic/retained.js | 86 +++++++++--------- web/static/css/style.css | 7 ++ 7 files changed, 222 insertions(+), 190 deletions(-) diff --git a/web/pages/retained.html b/web/pages/retained.html index e2938d2..a976de8 100644 --- a/web/pages/retained.html +++ b/web/pages/retained.html @@ -117,13 +117,13 @@
-
7天
+
留存
-
显示设置
+
diff --git a/web/src/x.min.js b/web/src/x.min.js index 558e4bc..1ed0329 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -919,19 +919,19 @@ var X = window.X || { pname = 'p_outflow'; } - if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - var filteritem = data['filter_item']; - if(data['days'].length >= 0){ - var filterarr = []; - for(let i in data['days']){ - for(let j in filteritem){ - if(data['days'][i] == filteritem[j]){ - filterarr.push(i); - } - } - } - } - } + // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ + // var filteritem = data['filter_item']; + // if(data['days'].length >= 0){ + // var filterarr = []; + // for(let i in data['days']){ + // for(let j in filteritem){ + // if(data['days'][i] == filteritem[j]){ + // filterarr.push(i); + // } + // } + // } + // } + // } var tabledata=[]; for(let i in data['summary_values']){ @@ -945,20 +945,20 @@ var X = window.X || { n:0, p:0 } - if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - for(let a in filterarr){ - var index = Number(filterarr[a]); - if(j == index){ - nrr["n"] = data['summary_values'][i][nname][j]; - nrr["p"] = data['summary_values'][i][pname][j] - arr['data'].push(nrr); - } - } - }else { + // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ + // for(let a in filterarr){ + // var index = Number(filterarr[a]); + // if(j == index){ + // nrr["n"] = data['summary_values'][i][nname][j]; + // nrr["p"] = data['summary_values'][i][pname][j] + // arr['data'].push(nrr); + // } + // } + // }else { nrr["n"] = data['summary_values'][i][nname][j]; nrr["p"] = data['summary_values'][i][pname][j] arr['data'].push(nrr); - } + // } // nrr["n"] = data['summary_values'][i][nname][j]; // nrr["p"] = data['summary_values'][i][pname][j] // arr['data'].push(nrr); @@ -966,31 +966,31 @@ var X = window.X || { tabledata.push(arr); } - var titdata = []; + // var titdata = []; // for(let i in data['days']){ // var tit = "第" + i + "日"; // titdata.push(tit); // } - if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - var titarr = []; - for(let j in filterarr){ - var index = Number(filterarr[j]); - titarr.push(data['days'][index]); - } - for(let i in titarr){ - var tit = "第" + titarr[i] + "日"; - titdata.push(tit); - } - }else { - for(let i in data['days']){ - var tit = "第" + data['days'][i] + "日"; - titdata.push(tit); - } - } - titdata.unshift("日期",data.title); + // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ + // var titarr = []; + // for(let j in filterarr){ + // var index = Number(filterarr[j]); + // titarr.push(data['days'][index]); + // } + // for(let i in titarr){ + // var tit = "第" + titarr[i] + "日"; + // titdata.push(tit); + // } + // }else { + // for(let i in data['days']){ + // var tit = "第" + data['days'][i] + "日"; + // titdata.push(tit); + // } + // } + // titdata.unshift("日期",data.title); var date = data['start_date'] + " - " + data['end_date']; var dataArr = { - titledata:titdata, + titledata: data.title, condata:tabledata, retentiontype:data.retentiontype, date:date @@ -11368,17 +11368,17 @@ var X = window.X || { var nname,pname if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ - var filteritem = data['eventView']['filter_item']; - if(d['days'].length >= 0){ - var filterarr = []; - for(let i in d['days']){ - for(let j in filteritem){ - if(d['days'][i] == filteritem[j]){ - filterarr.push(i); - } - } - } - } + // var filteritem = data['eventView']['filter_item']; + // if(d['days'].length >= 0){ + // var filterarr = []; + // for(let i in d['days']){ + // for(let j in filteritem){ + // if(d['days'][i] == filteritem[j]){ + // filterarr.push(i); + // } + // } + // } + // } // var titarr = []; // var tablearr = []; // for(let i in filterarr){ @@ -11408,49 +11408,49 @@ var X = window.X || { n:0, p:0 } - if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ - for(let a in filterarr){ - var index = Number(filterarr[a]); - if(j == index){ - nrr["n"] = d['summary_values'][i][nname][j]; - nrr["p"] = d['summary_values'][i][pname][j] - arr['data'].push(nrr); - } - } - }else { + // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ + // for(let a in filterarr){ + // var index = Number(filterarr[a]); + // if(j == index){ + // nrr["n"] = d['summary_values'][i][nname][j]; + // nrr["p"] = d['summary_values'][i][pname][j] + // arr['data'].push(nrr); + // } + // } + // }else { nrr["n"] = d['summary_values'][i][nname][j]; nrr["p"] = d['summary_values'][i][pname][j] arr['data'].push(nrr); - } + // } } tabledata.push(arr) } - var titdata = []; - if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ - var titarr = []; - for(let j in filterarr){ - var index = Number(filterarr[j]); - titarr.push(d['days'][index]); - } - for(let i in titarr){ - var tit = "第" + titarr[i] + "日"; - titdata.push(tit); - } - }else { - for(let i in d['days']){ - var tit = "第" + d['days'][i] + "日"; - titdata.push(tit); - } - } - titdata.unshift("日期",d.title); - console.log(titdata); - console.log(tabledata); + // var titdata = []; + // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ + // var titarr = []; + // for(let j in filterarr){ + // var index = Number(filterarr[j]); + // titarr.push(d['days'][index]); + // } + // for(let i in titarr){ + // var tit = "第" + titarr[i] + "日"; + // titdata.push(tit); + // } + // }else { + // for(let i in d['days']){ + // var tit = "第" + d['days'][i] + "日"; + // titdata.push(tit); + // } + // } + // titdata.unshift("日期",d.title); + // console.log(titdata); + console.log(tabledata); // X.fixedTable('table-div-box','row-col-fixed','',headdata); - X.laytpldata("#table-fenxi-th-dot",titdata,".table-fenxi-th"); + X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td"); }; diff --git a/web/srczip/base/ajaxpage.js b/web/srczip/base/ajaxpage.js index 99e75b4..fb1de5b 100644 --- a/web/srczip/base/ajaxpage.js +++ b/web/srczip/base/ajaxpage.js @@ -116,8 +116,8 @@ X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian'); X.DATA['page'] = urlinfo.page; - console.log(urlinfo.page); - console.log(urlinfo.menu); + // console.log(urlinfo.page); + // console.log(urlinfo.menu); if(page != urlinfo.page){ X.gourl(urlinfo.page,'conetnt'); } diff --git a/web/srczip/common.js b/web/srczip/common.js index 069eb26..a805615 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -347,7 +347,7 @@ var X = window.X || { }; //渲染表格有分页有操作 - X.laytabledata = function(id,url,data,arr,height,callback){ + X.laytabledata = function(id,url,data,arr,height,callback,method){ var loginCache = X.loginCache(); var token = (loginCache? loginCache.token:""); token = "Bearer "+token; @@ -360,7 +360,14 @@ var X = window.X || { if(!height){ var height = 'full-20' } + method = method ? method : "get"; + // if(method){ + // method = method; + // }else{ + // method = 'get'; + // } layui.table.render({ + method: method, headers: { Authorization: token } @@ -570,7 +577,7 @@ var X = window.X || { 'locale': X.DATA.locale, ranges: { '今日': [moment(), moment()], - '昨日': [moment, moment().subtract(1, 'days')], + '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], '最近7日': [moment().subtract(7, 'days'), moment().subtract(0, 'days')], '最近30日': [moment().subtract(30, 'days'), moment().subtract(0, 'days')], '上周': [moment().subtract(1, 'week').startOf('week')+86400000, moment().subtract(1, 'week').endOf('week')+86400000], @@ -911,19 +918,19 @@ var X = window.X || { pname = 'p_outflow'; } - if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - var filteritem = data['filter_item']; - if(data['days'].length >= 0){ - var filterarr = []; - for(let i in data['days']){ - for(let j in filteritem){ - if(data['days'][i] == filteritem[j]){ - filterarr.push(i); - } - } - } - } - } + // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ + // var filteritem = data['filter_item']; + // if(data['days'].length >= 0){ + // var filterarr = []; + // for(let i in data['days']){ + // for(let j in filteritem){ + // if(data['days'][i] == filteritem[j]){ + // filterarr.push(i); + // } + // } + // } + // } + // } var tabledata=[]; for(let i in data['summary_values']){ @@ -937,20 +944,20 @@ var X = window.X || { n:0, p:0 } - if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - for(let a in filterarr){ - var index = Number(filterarr[a]); - if(j == index){ - nrr["n"] = data['summary_values'][i][nname][j]; - nrr["p"] = data['summary_values'][i][pname][j] - arr['data'].push(nrr); - } - } - }else { + // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ + // for(let a in filterarr){ + // var index = Number(filterarr[a]); + // if(j == index){ + // nrr["n"] = data['summary_values'][i][nname][j]; + // nrr["p"] = data['summary_values'][i][pname][j] + // arr['data'].push(nrr); + // } + // } + // }else { nrr["n"] = data['summary_values'][i][nname][j]; nrr["p"] = data['summary_values'][i][pname][j] arr['data'].push(nrr); - } + // } // nrr["n"] = data['summary_values'][i][nname][j]; // nrr["p"] = data['summary_values'][i][pname][j] // arr['data'].push(nrr); @@ -958,31 +965,31 @@ var X = window.X || { tabledata.push(arr); } - var titdata = []; + // var titdata = []; // for(let i in data['days']){ // var tit = "第" + i + "日"; // titdata.push(tit); // } - if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ - var titarr = []; - for(let j in filterarr){ - var index = Number(filterarr[j]); - titarr.push(data['days'][index]); - } - for(let i in titarr){ - var tit = "第" + titarr[i] + "日"; - titdata.push(tit); - } - }else { - for(let i in data['days']){ - var tit = "第" + data['days'][i] + "日"; - titdata.push(tit); - } - } - titdata.unshift("日期",data.title); + // if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ + // var titarr = []; + // for(let j in filterarr){ + // var index = Number(filterarr[j]); + // titarr.push(data['days'][index]); + // } + // for(let i in titarr){ + // var tit = "第" + titarr[i] + "日"; + // titdata.push(tit); + // } + // }else { + // for(let i in data['days']){ + // var tit = "第" + data['days'][i] + "日"; + // titdata.push(tit); + // } + // } + // titdata.unshift("日期",data.title); var date = data['start_date'] + " - " + data['end_date']; var dataArr = { - titledata:titdata, + titledata: data.title, condata:tabledata, retentiontype:data.retentiontype, date:date diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index 6900faf..ec6fbfc 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -83,7 +83,7 @@ "formatname":'两位小数' } data.events.push(defaultindicator); - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); type2data= retdata X.api("data_auth/load_filter_props","post",{event_name:dataArr[0]['category'][0]['event_name']},function(val){ defaultgroupdata = val; @@ -165,15 +165,33 @@ }else { $(".analysis-overall").hide(); } - - X.laytpldata("#analysis-con-left-screen-list-dot",d.query.events,".analysis-con-left-screen-list-box"); + updataindex(d.query.events); X.laytpldata("#analysis-gpmain___3YGfw-dot",d.query.eventView.groupBy,".analysis-gpmain___3YGfw"); X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filts'],".analysis-overall-situation-list-box",function(){ renderdate(); }); // analysisdown(); calculationdata(); - } + }; + + // 更新指标 + function updataindex(indexdata){ + X.laytpldata("#analysis-con-left-screen-list-dot",indexdata,".analysis-con-left-screen-list-box",function(){ + var sidebar = document.getElementById('analysis-con-left-screen-list-box'); + new Sortable(sidebar, { + handle: '.analysis-num', // handle class + animation: 150, + onUpdate:function(evt){ + var newIndex = evt.newIndex; + var oldIndex = evt.oldIndex; + let item = data.events.splice(oldIndex, 1); // arr删除2，把2给item + data.events.splice(newIndex, 0, item[0]); + console.log(data); + updataindex(data.events); + } + }); + }); + }; // sql语句显示 $(document).off('click','.sqlquery').on('click','.sqlquery',function(){ @@ -209,7 +227,7 @@ var index = $(this).attr("data-index"); var arr = data.events[index]; data.events.push(arr); - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); var num = data.events.length; // filtersymbols[num] = filtersymbols[index]; @@ -242,7 +260,7 @@ obj.html(htmlstring); data['events'][index]['event_desc'] = val.id; data['events'][index]['event_name'] = val.name; - + }) @@ -270,7 +288,7 @@ $("#analysis-zhibiao-list-type3-"+index).hide(); data['events'][index]['analysis'] = val.analysis; } - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); } }) } @@ -307,7 +325,7 @@ data['events'][index]['filts'][indexs]['comparator_name'] = "是"; data['events'][index]['filts'][indexs]['comparator'] = 'in'; } - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); }) }); @@ -349,7 +367,7 @@ "tableType": d[0]['id'] } //筛选数据 data['events'][index]['filts'].push(arr); - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); }) }; @@ -406,7 +424,7 @@ var indexs = $(this).attr("data-indexs"); // filtersymbols[index].splice(indexs,1); data.events[index]['filts'].splice(indexs,1); - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); }); // 添加指标 @@ -428,7 +446,7 @@ } data['events'].push(defaultindicator); - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); var index = data.events.length - 1; $(".analysis-del").show() //显示删除按钮 @@ -462,7 +480,7 @@ $(".analysis-del").hide(); //隐藏删除按钮 $(".analysis-overall").hide(); } - X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box"); + updataindex(data.events); } }); diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js index 3abdd3e..55a79cf 100644 --- a/web/srczip/logic/retained.js +++ b/web/srczip/logic/retained.js @@ -557,17 +557,17 @@ var nname,pname if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ - var filteritem = data['eventView']['filter_item']; - if(d['days'].length >= 0){ - var filterarr = []; - for(let i in d['days']){ - for(let j in filteritem){ - if(d['days'][i] == filteritem[j]){ - filterarr.push(i); - } - } - } - } + // var filteritem = data['eventView']['filter_item']; + // if(d['days'].length >= 0){ + // var filterarr = []; + // for(let i in d['days']){ + // for(let j in filteritem){ + // if(d['days'][i] == filteritem[j]){ + // filterarr.push(i); + // } + // } + // } + // } // var titarr = []; // var tablearr = []; // for(let i in filterarr){ @@ -597,49 +597,49 @@ n:0, p:0 } - if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ - for(let a in filterarr){ - var index = Number(filterarr[a]); - if(j == index){ - nrr["n"] = d['summary_values'][i][nname][j]; - nrr["p"] = d['summary_values'][i][pname][j] - arr['data'].push(nrr); - } - } - }else { + // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ + // for(let a in filterarr){ + // var index = Number(filterarr[a]); + // if(j == index){ + // nrr["n"] = d['summary_values'][i][nname][j]; + // nrr["p"] = d['summary_values'][i][pname][j] + // arr['data'].push(nrr); + // } + // } + // }else { nrr["n"] = d['summary_values'][i][nname][j]; nrr["p"] = d['summary_values'][i][pname][j] arr['data'].push(nrr); - } + // } } tabledata.push(arr) } - var titdata = []; - if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ - var titarr = []; - for(let j in filterarr){ - var index = Number(filterarr[j]); - titarr.push(d['days'][index]); - } - for(let i in titarr){ - var tit = "第" + titarr[i] + "日"; - titdata.push(tit); - } - }else { - for(let i in d['days']){ - var tit = "第" + d['days'][i] + "日"; - titdata.push(tit); - } - } - titdata.unshift("日期",d.title); - console.log(titdata); - console.log(tabledata); + // var titdata = []; + // if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ + // var titarr = []; + // for(let j in filterarr){ + // var index = Number(filterarr[j]); + // titarr.push(d['days'][index]); + // } + // for(let i in titarr){ + // var tit = "第" + titarr[i] + "日"; + // titdata.push(tit); + // } + // }else { + // for(let i in d['days']){ + // var tit = "第" + d['days'][i] + "日"; + // titdata.push(tit); + // } + // } + // titdata.unshift("日期",d.title); + // console.log(titdata); + console.log(tabledata); // X.fixedTable('table-div-box','row-col-fixed','',headdata); - X.laytpldata("#table-fenxi-th-dot",titdata,".table-fenxi-th"); + X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th"); X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td"); }; diff --git a/web/static/css/style.css b/web/static/css/style.css index 0c60d33..9b14880 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -26,6 +26,7 @@ .modify-layui-card-small { height: 186px; } .modify-layui-card { height: 388px; } .layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; } +.layui-laypage-em { background-color: #3d90ff !important; } ::-webkit-scrollbar { width:5px; @@ -788,4 +789,10 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; } .ant-input-number input{ height: 28px; margin-left: 4px; padding: 0 8px; border: 1px solid #f0f2f5; width: 44px; color: #42546d; border-radius: 2px; } .userlabel-dy-head-userlabel { color: #42546d !important; cursor: pointer; } +.userlabelinfo-box { width: 100%; height: 100%; background-color: #f0f2f5; position: fixed; } +.userlabel-right-fanhui { padding: 0px 24px 10px 24px; cursor: pointer; color: #607595; font-size: 14px; font-weight: 500; } +.analysis-num {cursor: pointer;} + + +