diff --git a/web/layui/css/modules/laydate/default/laydate.css b/web/layui/css/modules/laydate/default/laydate.css index 9f3064b..8c090ea 100644 --- a/web/layui/css/modules/laydate/default/laydate.css +++ b/web/layui/css/modules/laydate/default/laydate.css @@ -1 +1 @@ -.laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.2s;animation-duration:.2s;-webkit-animation-fill-mode:both;animation-fill-mode:both;animation-name:laydate-downbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@keyframes laydate-downbit{0%{opacity:.3;transform:translate3d(0,-5px,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.laydate-set-ym span,.layui-laydate-header i{padding:0 5px;cursor:pointer}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;color:#999;font-size:18px}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px 20px}.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px}.layui-laydate-footer span:hover{color:#5FB878}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{height:26px;line-height:26px;margin:0 0 0 -1px;padding:0 10px;border:1px solid #C9C9C9;background-color:#fff;white-space:nowrap;vertical-align:top;border-radius:2px}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content,.layui-laydate-range .laydate-main-list-1 .layui-laydate-header{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#B5FFF8}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eee;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px} \ No newline at end of file +.laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.2s;animation-duration:.2s;-webkit-animation-fill-mode:both;animation-fill-mode:both;animation-name:laydate-downbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@keyframes laydate-downbit{0%{opacity:.3;transform:translate3d(0,-5px,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.laydate-set-ym span,.layui-laydate-header i{padding:0 5px;cursor:pointer}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;color:#999;font-size:18px}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px 20px}.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px}.layui-laydate-footer span:hover{color:#5FB878}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{height:26px;line-height:26px;margin:0 0 0 -1px;padding:0 10px;border:1px solid #C9C9C9;background-color:#fff;white-space:nowrap;vertical-align:top;border-radius:2px}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content,.layui-laydate-range .laydate-main-list-1 .layui-laydate-header{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#B5FFF8}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eee;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:rgba(89, 120, 249, 1)!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px} \ No newline at end of file diff --git a/web/pages/analysis.html b/web/pages/analysis.html index e4de271..0128aae 100644 --- a/web/pages/analysis.html +++ b/web/pages/analysis.html @@ -403,7 +403,16 @@
{{item.columnDesc}}
{{item.comparator_name}}
{{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -
+ + {{# if(item.data_type != "datetime"){ }} +
+ +
+ {{# } else { }} +
+ {{item.ftv}} +
+ {{# } }} {{# } }} {{# if(item.comparator_id === "range"){ }} diff --git a/web/pages/retained.html b/web/pages/retained.html index 45e03ec..e2938d2 100644 --- a/web/pages/retained.html +++ b/web/pages/retained.html @@ -161,7 +161,7 @@
-
+
diff --git a/web/src/x.min.js b/web/src/x.min.js index edd1fe8..3af0f4f 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -94,11 +94,11 @@ var X = window.X || { {'title':'合计','id':'total'}, ], 'retention':[ - {'title':'当日','id':'1'}, - {'title':'次日','id':'2'}, - {'title':'7日','id':'7'}, - {'title':'14日','id':'14'}, - {'title':'30日','id':'30'} + {'title':'当日','id':1}, + {'title':'次日','id':2}, + {'title':'7日','id':7}, + {'title':'14日','id':14}, + {'title':'30日','id':30} ], 'distribution':[ {'title':'按天','id':'P1D'}, @@ -853,7 +853,7 @@ var X = window.X || { if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ var filteritem = data['filter_item']; - if(data['days'].length >= 7){ + if(data['days'].length >= 0){ var filterarr = []; for(let i in data['days']){ for(let j in filteritem){ @@ -915,7 +915,7 @@ var X = window.X || { } }else { for(let i in data['days']){ - var tit = "第" + i + "日"; + var tit = "第" + data['days'][i] + "日"; titdata.push(tit); } } @@ -1321,9 +1321,27 @@ var X = window.X || { window.onhashchange = function(){ // console.log( getHashParms() ); + var page = X.DATA['page']; var urlinfo = getHashParms(); // if(urlinfo.page == 'dashboard'){ - // X.gourl(urlinfo.page,'conetnt'); + // for(let i in X.DATA['ProjectData']){ + // for(let j in X.DATA['ProjectData'][i]['children']){ + // if(X.DATA['ProjectData'][i]['children'][j]['_id'] == urlinfo.menu){ + // $(".tab-tit-box .tab-tit").html(X.DATA['ProjectData'][i]['children'][j]['name']); + // X.DATA['ProjectData'][i]['children'][j]['onclick'] = 1; + // }else{ + // X.DATA['ProjectData'][i]['children'][j]['onclick'] = 0; + // } + // } + // } + + // X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian'); + // X.DATA['page'] = urlinfo.page; + // console.log(urlinfo.page); + // console.log(urlinfo.menu); + // if(page != urlinfo.page){ + // X.gourl(urlinfo.page,'conetnt'); + // } // X.DATA['dashboard_id'] = urlinfo.menu; // X.pageLogic['dashboard'].gettabledata(); // } @@ -2269,7 +2287,9 @@ var X = window.X || { X.laytpldata("#analysis-con-left-screen-list-dot",d.query.events,".analysis-con-left-screen-list-box"); 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"); + X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); calculationdata(); } @@ -2722,26 +2742,12 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); }); - //循环给条件框渲染下拉框 - // function analysisdown(){ - // for(let i in data['eventView']['filts']){ - // X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){ - // $(this).html(val.title); - // data['eventView']['filts'][i]['comparator_name'] = val.title; - // data['eventView']['filts'][i]['comparator'] = val.id; - // if(val.id == "range"){ - // data['eventView']['filts'][i]['ftv'] = [-1,1]; - // } - // X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); - // analysisdown(); - // }) - // } - // }; - $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){ var obj = $(this); var offset = obj.offset(); @@ -2754,7 +2760,9 @@ var X = window.X || { if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); }) }); @@ -2768,10 +2776,36 @@ var X = window.X || { $(".analysis-overall-situation-left-guanxi").hide(); // $(".analysis-overall-situation-left-box").hide(); } - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); }); + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){ var html = $(this).html(); //condrelation筛选条件的关系 @@ -2798,7 +2832,9 @@ var X = window.X || { data['eventView']['filts'][index]['comparator'] = '=='; data['eventView']['filts'][index]['tableType'] = val.table_type; filtsftvdata[index]=val.category; - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); }) }); @@ -4091,6 +4127,7 @@ var X = window.X || { // 退出登录 $(document).off('click','.sifnoutlogin').on('click','.sifnoutlogin',function(){ + window.localStorage.removeItem('loginData'); X.gourl("login"); }); @@ -4108,6 +4145,7 @@ var X = window.X || { } $("#model-box").html(""); me.freshMenu(X.DATA['projectid']); + // X.template("toptab","analysis-zhanwei",d); }); @@ -4136,8 +4174,8 @@ var X = window.X || { $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){ $(".tab-tit-box .tab-tit").html($(this).find("span").html()); // setHashParms("menu",$(this).attr('data-id')); - X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id $("#model-box").html(""); + X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id // 获取报表数据 me.gettabledata(); }); @@ -4492,7 +4530,11 @@ var X = window.X || { var timeParticleSize; X.granularityid(timeParticleSizename,function(d){ timeParticleSize = d; - query['eventView']['timeParticleSize'] = timeParticleSize; + if(cat == "retention"){ + query['eventView']['unitNum'] = parseInt(timeParticleSize); + }else { + query['eventView']['timeParticleSize'] = timeParticleSize; + } X.modelapi("ck/"+ cat +"_model","post",query,function(val){ if(JSON.stringify(val) != "{}"){ var bbsetdata = { @@ -4541,7 +4583,11 @@ var X = window.X || { eventView:val[0]['query']['eventView'], events:val[0]['query']['events'], }; - query['eventView']['timeParticleSize'] = d.id; + if(cat == "retention"){ + query['eventView']['unitNum'] = parseInt(d.id); + }else { + query['eventView']['timeParticleSize'] = d.id;; + } //时间获取修改后的时间 // 报表时间id var dateid = "times"+id; @@ -4573,7 +4619,7 @@ var X = window.X || { $(document).off('click','.chart').on('click','.chart',function(){ var dropdownlist = [ - {title:'表格',id:'table'}, + {title:'报表',id:'table'}, {title:'图形',id:'echarts'} ]; var obj = $(this); @@ -4680,6 +4726,8 @@ var X = window.X || { } } } + console.log(d.spaces[i]['children'][0]['_id']); + // setHashParms("menu",d.spaces[i]['children'][0]['_id']); $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']); X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id }else { @@ -5082,9 +5130,14 @@ var X = window.X || { var timeParticleSize; X.granularityid(timeParticleSizename,function(d){ timeParticleSize = d; - query['eventView']['timeParticleSize'] = timeParticleSize; + if(oclickarr.cat == "retention"){ + query['eventView']['unitNum'] = parseInt(timeParticleSize); + }else { + query['eventView']['timeParticleSize'] = timeParticleSize; + } + // query['eventView']['timeParticleSize'] = timeParticleSize; X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){ - if(val.length > 0){ + if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){ var bbsetdata = { graph_size:oclickarr['modelsize'], graph_type:oclickarr['modeltype'], @@ -6476,7 +6529,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); //删除指定全局数据 @@ -6488,7 +6543,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){ @@ -6504,26 +6561,12 @@ var X = window.X || { data['eventView']['filts'][index]['comparator_name'] = '等于'; data['eventView']['filts'][index]['comparator_id'] = '=='; data['eventView']['filts'][index]['table_type'] = val.table_type; + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); - //循环给条件框渲染下拉框 - // function analysisdown(){ - // for(let i in data['eventView']['filts']){ - // X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){ - // $(this).html(val.title); - // data['eventView']['filts'][i]['comparator_name'] = val.title; - // data['eventView']['filts'][i]['comparator_id'] = val.id; - // if(val.id == "range"){ - // data['eventView']['filts'][i]['ftv'] = [-1,1]; - // } - // X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ - // analysisdown(); - // }); - // }) - // } - // } - $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){ var obj = $(this); var offset = obj.offset(); @@ -6537,10 +6580,60 @@ var X = window.X || { if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + + $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ + var val = $(this).val(); + var index = $(this).attr("data-index"); + var valarr = val.split(","); + data['eventView']['filts'][index]['strftv'] = val; + data['eventView']['filts'][index]['ftv']= valarr; + }); + + $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){ + var name = $(this).attr('name'); + var val = $(this).val(); + var index = $(this).attr("data-index"); + + if(name == 'start'){ + data['eventView']['filts'][index]['ftv'][0] = val; + data['eventView']['filts'][index]['section'][0] = val; + data['eventView']['filts'][index]['ftv'].push(val); + }else { + data['eventView']['filts'][index]['ftv'][1] = val; + data['eventView']['filts'][index]['section'][1] = val; + data['eventView']['filts'][index]['ftv'].push(val); + } + }); + // 分组项 $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() { var index = $(this).attr("data-index"); @@ -6896,7 +6989,9 @@ var X = window.X || { X.template("funnel","funnel-event",data['events']); X.template("grouped","shushi",data['eventView']['groupBy']); - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); retaineddata(); } @@ -7703,6 +7798,14 @@ var X = window.X || { (function(){ X.pageLogic['login'] = { init : function(){ + + var userinfo = localStorage.getItem('loginData'); + if(userinfo){ + X.DATA["userinfo"] = JSON.parse(userinfo); + X.loginCache(JSON.parse(userinfo)); + X.gourl("dashboard"); + }; + $(".login-denglu").click(function(){ postlogin(); }); @@ -7826,7 +7929,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); var listarr =[ @@ -7837,7 +7942,7 @@ var X = window.X || { X.laydropdown('.eventsplit',listarr,function(d){ $('.eventsplit').html(d.title); data['eventView']['quota'] = d.id; - console.log(d); + // console.log(d); }); //删除指定全局数据 @@ -7849,7 +7954,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){ @@ -7865,7 +7972,9 @@ var X = window.X || { data['eventView']['filts'][index]['comparator_name'] = '等于'; data['eventView']['filts'][index]['comparator'] = '=='; data['eventView']['filts'][index]['table_type'] = val.table_type; - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); @@ -7883,10 +7992,37 @@ var X = window.X || { if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); } }) }); + + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ var val = $(this).val(); var index = $(this).attr("data-index"); @@ -7977,7 +8113,9 @@ var X = window.X || { data['eventView']['startTime'] = timearr[0] + " "+"00:00:00"; data['eventView']['endTime'] = timearr[2]+" "+"23:59:59"; - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); retaineddata(); }; @@ -8516,13 +8654,13 @@ var X = window.X || { }); } - $(".menu_dapax .item_kuvn").click(function(){ + $(document).off('click',".menu_dapax .item_kuvn").on('click',".menu_dapax .item_kuvn",function(){ $(".menu_dapax .item_kuvn").removeClass("selected___3ctlt"); $(this).addClass("selected___3ctlt"); var url = $(this).attr("data-url"); }); - $(document).on("click",".roleinproject-tit",function(){ + $(document).off('click','.roleinproject-tit').on("click",".roleinproject-tit",function(){ var index = $(this).attr("data-index"); $(".projectadmin-con-hz-left-list-con").removeClass("selected___3ctlt"); $(this).addClass("selected___3ctlt"); @@ -9054,7 +9192,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); //删除指定全局数据 @@ -9067,7 +9207,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){ @@ -9084,6 +9226,9 @@ var X = window.X || { data['eventView']['filts'][index]['comparator'] = '=='; data['eventView']['filts'][index]['tableType'] = val.table_type; filtsftvdata[index]=val.category; + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); @@ -9104,6 +9249,30 @@ var X = window.X || { // } // }; + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){ var obj = $(this); var offset = obj.offset(); @@ -9117,7 +9286,9 @@ var X = window.X || { if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); @@ -9247,7 +9418,9 @@ var X = window.X || { X.template("event","initial-event",data['events'][0]); X.template("returnvisitevent","returnvisit-event",data['events'][1]); - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); X.template("grouped","shushi",data['eventView']['groupBy']); retaineddata(); @@ -9266,7 +9439,7 @@ var X = window.X || { if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ var filteritem = data['eventView']['filter_item']; - if(d['days'].length >= 7){ + if(d['days'].length >= 0){ var filterarr = []; for(let i in d['days']){ for(let j in filteritem){ @@ -9336,7 +9509,7 @@ var X = window.X || { } }else { for(let i in d['days']){ - var tit = "第" + i + "日"; + var tit = "第" + d['days'][i] + "日"; titdata.push(tit); } } @@ -9582,6 +9755,9 @@ var X = window.X || { $(".showsetup-box").show(); $(".showsetup-down-box").css('top',offset.top+obj.height()); $(".showsetup-down-box").css('left',offset.left-211); + layui.form.val('showsetupexample',{ + 'showsetup': data['eventView']['filter_item_type'] + }) }); $(document).off('click','.showsetup-box-zz').on('click','.showsetup-box-zz',function(){ @@ -9887,7 +10063,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); }); $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){ @@ -10006,7 +10184,9 @@ var X = window.X || { }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); }); @@ -10020,6 +10200,9 @@ var X = window.X || { data['events']['user_filter']['filts'][index]['columnName'] = val.id; data['events']['user_filter']['filts'][index]['data_type'] = val.type; data['events']['user_filter']['filts'][index]['tableType'] = val.table_type; + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); }) }); @@ -10036,14 +10219,43 @@ var X = window.X || { if(val.id == "range"){ data['events']['user_filter']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); } }) }); + + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['events']['user_filter']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['events']['user_filter']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ + var index = $(this).attr('data-index'); var val = $(this).val(); - var index = $(this).attr("data-index"); - data['events']['user_filter']['filts'][index]['strftv'] = val; + var valarr = val.split(","); + data['events']['user_filter']['filts'][index]['ftv']=valarr; + data['events']['user_filter']['filts'][index]['strftv']=val; }); $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){ @@ -10123,7 +10335,9 @@ var X = window.X || { // $('.participate-num').html(data.cachedata.event_names.length); X.template("route","event-roue-event",data['events']['source_event']); - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); X.laytpldata("#eventsplit-box-dot",data['events']['by_fields'],".eventsplit-box"); // X.template("userpar","userpar-event",data['events']); diff --git a/web/srczip/base/ajaxpage.js b/web/srczip/base/ajaxpage.js index b4d1ac6..7ca206b 100644 --- a/web/srczip/base/ajaxpage.js +++ b/web/srczip/base/ajaxpage.js @@ -98,9 +98,27 @@ window.onhashchange = function(){ // console.log( getHashParms() ); + var page = X.DATA['page']; var urlinfo = getHashParms(); // if(urlinfo.page == 'dashboard'){ - // X.gourl(urlinfo.page,'conetnt'); + // for(let i in X.DATA['ProjectData']){ + // for(let j in X.DATA['ProjectData'][i]['children']){ + // if(X.DATA['ProjectData'][i]['children'][j]['_id'] == urlinfo.menu){ + // $(".tab-tit-box .tab-tit").html(X.DATA['ProjectData'][i]['children'][j]['name']); + // X.DATA['ProjectData'][i]['children'][j]['onclick'] = 1; + // }else{ + // X.DATA['ProjectData'][i]['children'][j]['onclick'] = 0; + // } + // } + // } + + // X.laytpldata('#kongjian-dot',X.DATA['ProjectData'],'#kongjian'); + // X.DATA['page'] = urlinfo.page; + // console.log(urlinfo.page); + // console.log(urlinfo.menu); + // if(page != urlinfo.page){ + // X.gourl(urlinfo.page,'conetnt'); + // } // X.DATA['dashboard_id'] = urlinfo.menu; // X.pageLogic['dashboard'].gettabledata(); // } diff --git a/web/srczip/common.js b/web/srczip/common.js index e6a3899..4ef5ee0 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -93,11 +93,11 @@ var X = window.X || { {'title':'合计','id':'total'}, ], 'retention':[ - {'title':'当日','id':'1'}, - {'title':'次日','id':'2'}, - {'title':'7日','id':'7'}, - {'title':'14日','id':'14'}, - {'title':'30日','id':'30'} + {'title':'当日','id':1}, + {'title':'次日','id':2}, + {'title':'7日','id':7}, + {'title':'14日','id':14}, + {'title':'30日','id':30} ], 'distribution':[ {'title':'按天','id':'P1D'}, @@ -852,7 +852,7 @@ var X = window.X || { if(data['filter_item_type'] != "all" && data['filter_item_type'] != "" && data['filter_item_type']){ var filteritem = data['filter_item']; - if(data['days'].length >= 7){ + if(data['days'].length >= 0){ var filterarr = []; for(let i in data['days']){ for(let j in filteritem){ @@ -914,7 +914,7 @@ var X = window.X || { } }else { for(let i in data['days']){ - var tit = "第" + i + "日"; + var tit = "第" + data['days'][i] + "日"; titdata.push(tit); } } diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index 588a000..49fc665 100644 --- a/web/srczip/logic/analysis.js +++ b/web/srczip/logic/analysis.js @@ -168,7 +168,9 @@ X.laytpldata("#analysis-con-left-screen-list-dot",d.query.events,".analysis-con-left-screen-list-box"); 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"); + X.laytpldata("#analysis-overall-situation-list-box-dot",d.query['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); calculationdata(); } @@ -621,26 +623,12 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); }); - //循环给条件框渲染下拉框 - // function analysisdown(){ - // for(let i in data['eventView']['filts']){ - // X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){ - // $(this).html(val.title); - // data['eventView']['filts'][i]['comparator_name'] = val.title; - // data['eventView']['filts'][i]['comparator'] = val.id; - // if(val.id == "range"){ - // data['eventView']['filts'][i]['ftv'] = [-1,1]; - // } - // X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); - // analysisdown(); - // }) - // } - // }; - $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){ var obj = $(this); var offset = obj.offset(); @@ -653,7 +641,9 @@ if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); }) }); @@ -667,10 +657,36 @@ $(".analysis-overall-situation-left-guanxi").hide(); // $(".analysis-overall-situation-left-box").hide(); } - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); }); + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-left-guanxi').on('click','.analysis-overall-situation-left-guanxi',function(){ var html = $(this).html(); //condrelation筛选条件的关系 @@ -697,7 +713,9 @@ data['eventView']['filts'][index]['comparator'] = '=='; data['eventView']['filts'][index]['tableType'] = val.table_type; filtsftvdata[index]=val.category; - X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box"); + X.laytpldata("#analysis-overall-situation-list-box-dot",data['eventView']['filts'],".analysis-overall-situation-list-box",function(){ + renderdate(); + }); // analysisdown(); }) }); diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 7ce8bbd..ccb1e3a 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -19,6 +19,7 @@ // 退出登录 $(document).off('click','.sifnoutlogin').on('click','.sifnoutlogin',function(){ + window.localStorage.removeItem('loginData'); X.gourl("login"); }); @@ -36,6 +37,7 @@ } $("#model-box").html(""); me.freshMenu(X.DATA['projectid']); + // X.template("toptab","analysis-zhanwei",d); }); @@ -64,8 +66,8 @@ $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){ $(".tab-tit-box .tab-tit").html($(this).find("span").html()); // setHashParms("menu",$(this).attr('data-id')); - X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id $("#model-box").html(""); + X.DATA['dashboard_id'] = $(this).attr('data-id'); //看板id // 获取报表数据 me.gettabledata(); }); @@ -420,7 +422,11 @@ var timeParticleSize; X.granularityid(timeParticleSizename,function(d){ timeParticleSize = d; - query['eventView']['timeParticleSize'] = timeParticleSize; + if(cat == "retention"){ + query['eventView']['unitNum'] = parseInt(timeParticleSize); + }else { + query['eventView']['timeParticleSize'] = timeParticleSize; + } X.modelapi("ck/"+ cat +"_model","post",query,function(val){ if(JSON.stringify(val) != "{}"){ var bbsetdata = { @@ -469,7 +475,11 @@ eventView:val[0]['query']['eventView'], events:val[0]['query']['events'], }; - query['eventView']['timeParticleSize'] = d.id; + if(cat == "retention"){ + query['eventView']['unitNum'] = parseInt(d.id); + }else { + query['eventView']['timeParticleSize'] = d.id;; + } //时间获取修改后的时间 // 报表时间id var dateid = "times"+id; @@ -501,7 +511,7 @@ $(document).off('click','.chart').on('click','.chart',function(){ var dropdownlist = [ - {title:'表格',id:'table'}, + {title:'报表',id:'table'}, {title:'图形',id:'echarts'} ]; var obj = $(this); @@ -608,6 +618,8 @@ } } } + console.log(d.spaces[i]['children'][0]['_id']); + // setHashParms("menu",d.spaces[i]['children'][0]['_id']); $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][0]['name']); X.DATA['dashboard_id'] = d.spaces[i]['children'][0]['_id']; //看板id }else { @@ -1010,9 +1022,14 @@ var timeParticleSize; X.granularityid(timeParticleSizename,function(d){ timeParticleSize = d; - query['eventView']['timeParticleSize'] = timeParticleSize; + if(oclickarr.cat == "retention"){ + query['eventView']['unitNum'] = parseInt(timeParticleSize); + }else { + query['eventView']['timeParticleSize'] = timeParticleSize; + } + // query['eventView']['timeParticleSize'] = timeParticleSize; X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){ - if(val.length > 0){ + if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){ var bbsetdata = { graph_size:oclickarr['modelsize'], graph_type:oclickarr['modeltype'], diff --git a/web/srczip/logic/funnelanalysis.js b/web/srczip/logic/funnelanalysis.js index f26e92c..13f9a88 100644 --- a/web/srczip/logic/funnelanalysis.js +++ b/web/srczip/logic/funnelanalysis.js @@ -285,7 +285,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); //删除指定全局数据 @@ -297,7 +299,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){ @@ -313,26 +317,12 @@ data['eventView']['filts'][index]['comparator_name'] = '等于'; data['eventView']['filts'][index]['comparator_id'] = '=='; data['eventView']['filts'][index]['table_type'] = val.table_type; + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); - //循环给条件框渲染下拉框 - // function analysisdown(){ - // for(let i in data['eventView']['filts']){ - // X.laydropdown("#analysis-overall-situation-fuhao-"+i,filtsftvdata[i],function(val){ - // $(this).html(val.title); - // data['eventView']['filts'][i]['comparator_name'] = val.title; - // data['eventView']['filts'][i]['comparator_id'] = val.id; - // if(val.id == "range"){ - // data['eventView']['filts'][i]['ftv'] = [-1,1]; - // } - // X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ - // analysisdown(); - // }); - // }) - // } - // } - $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){ var obj = $(this); var offset = obj.offset(); @@ -346,10 +336,60 @@ if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + + $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ + var val = $(this).val(); + var index = $(this).attr("data-index"); + var valarr = val.split(","); + data['eventView']['filts'][index]['strftv'] = val; + data['eventView']['filts'][index]['ftv']= valarr; + }); + + $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){ + var name = $(this).attr('name'); + var val = $(this).val(); + var index = $(this).attr("data-index"); + + if(name == 'start'){ + data['eventView']['filts'][index]['ftv'][0] = val; + data['eventView']['filts'][index]['section'][0] = val; + data['eventView']['filts'][index]['ftv'].push(val); + }else { + data['eventView']['filts'][index]['ftv'][1] = val; + data['eventView']['filts'][index]['section'][1] = val; + data['eventView']['filts'][index]['ftv'].push(val); + } + }); + // 分组项 $(document).off('click','.analysis-action-right').on('click','.analysis-action-right',function() { var index = $(this).attr("data-index"); @@ -705,7 +745,9 @@ X.template("funnel","funnel-event",data['events']); X.template("grouped","shushi",data['eventView']['groupBy']); - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); retaineddata(); } diff --git a/web/srczip/logic/login.js b/web/srczip/logic/login.js index 5699c24..2ab0eea 100644 --- a/web/srczip/logic/login.js +++ b/web/srczip/logic/login.js @@ -1,6 +1,14 @@ (function(){ X.pageLogic['login'] = { init : function(){ + + var userinfo = localStorage.getItem('loginData'); + if(userinfo){ + X.DATA["userinfo"] = JSON.parse(userinfo); + X.loginCache(JSON.parse(userinfo)); + X.gourl("dashboard"); + }; + $(".login-denglu").click(function(){ postlogin(); }); diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js index 8134887..4136b54 100644 --- a/web/srczip/logic/ltvmodel.js +++ b/web/srczip/logic/ltvmodel.js @@ -92,7 +92,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); var listarr =[ @@ -103,7 +105,7 @@ X.laydropdown('.eventsplit',listarr,function(d){ $('.eventsplit').html(d.title); data['eventView']['quota'] = d.id; - console.log(d); + // console.log(d); }); //删除指定全局数据 @@ -115,7 +117,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){ @@ -131,7 +135,9 @@ data['eventView']['filts'][index]['comparator_name'] = '等于'; data['eventView']['filts'][index]['comparator'] = '=='; data['eventView']['filts'][index]['table_type'] = val.table_type; - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); @@ -149,10 +155,37 @@ if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); } }) }); + + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ var val = $(this).val(); var index = $(this).attr("data-index"); @@ -243,7 +276,9 @@ data['eventView']['startTime'] = timearr[0] + " "+"00:00:00"; data['eventView']['endTime'] = timearr[2]+" "+"23:59:59"; - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); retaineddata(); }; diff --git a/web/srczip/logic/projectadmin.js b/web/srczip/logic/projectadmin.js index 6f1e8b5..d05cf13 100644 --- a/web/srczip/logic/projectadmin.js +++ b/web/srczip/logic/projectadmin.js @@ -19,13 +19,13 @@ }); } - $(".menu_dapax .item_kuvn").click(function(){ + $(document).off('click',".menu_dapax .item_kuvn").on('click',".menu_dapax .item_kuvn",function(){ $(".menu_dapax .item_kuvn").removeClass("selected___3ctlt"); $(this).addClass("selected___3ctlt"); var url = $(this).attr("data-url"); }); - $(document).on("click",".roleinproject-tit",function(){ + $(document).off('click','.roleinproject-tit').on("click",".roleinproject-tit",function(){ var index = $(this).attr("data-index"); $(".projectadmin-con-hz-left-list-con").removeClass("selected___3ctlt"); $(this).addClass("selected___3ctlt"); diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js index d8aba74..2692b43 100644 --- a/web/srczip/logic/retained.js +++ b/web/srczip/logic/retained.js @@ -297,7 +297,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); //删除指定全局数据 @@ -310,7 +312,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }); $(document).off('click','.analysis-overall-situation-attr').on('click','.analysis-overall-situation-attr',function(){ @@ -327,6 +331,9 @@ data['eventView']['filts'][index]['comparator'] = '=='; data['eventView']['filts'][index]['tableType'] = val.table_type; filtsftvdata[index]=val.category; + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); @@ -347,6 +354,30 @@ // } // }; + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['eventView']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['eventView']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-fuhao').on('click','.analysis-overall-situation-fuhao',function(){ var obj = $(this); var offset = obj.offset(); @@ -360,7 +391,9 @@ if(val.id == "range"){ data['eventView']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); }) }); @@ -490,7 +523,9 @@ X.template("event","initial-event",data['events'][0]); X.template("returnvisitevent","returnvisit-event",data['events'][1]); - X.template("globalfilter","xinwei-whole",data['eventView']['filts']); + X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){ + renderdate(); + }); X.template("grouped","shushi",data['eventView']['groupBy']); retaineddata(); @@ -509,7 +544,7 @@ if(data['eventView']['filter_item_type'] != "all" && data['eventView']['filter_item_type']){ var filteritem = data['eventView']['filter_item']; - if(d['days'].length >= 7){ + if(d['days'].length >= 0){ var filterarr = []; for(let i in d['days']){ for(let j in filteritem){ @@ -579,7 +614,7 @@ } }else { for(let i in d['days']){ - var tit = "第" + i + "日"; + var tit = "第" + d['days'][i] + "日"; titdata.push(tit); } } @@ -825,6 +860,9 @@ $(".showsetup-box").show(); $(".showsetup-down-box").css('top',offset.top+obj.height()); $(".showsetup-down-box").css('left',offset.left-211); + layui.form.val('showsetupexample',{ + 'showsetup': data['eventView']['filter_item_type'] + }) }); $(document).off('click','.showsetup-box-zz').on('click','.showsetup-box-zz',function(){ diff --git a/web/srczip/logic/routeanalysis.js b/web/srczip/logic/routeanalysis.js index 4027d69..e7a5c22 100644 --- a/web/srczip/logic/routeanalysis.js +++ b/web/srczip/logic/routeanalysis.js @@ -166,7 +166,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); }); $(document).off('click','.analysis-shaix-initial-event').on('click','.analysis-shaix-initial-event',function(){ @@ -285,7 +287,9 @@ }else{ $(".analysis-overall-situation-left-guanxi").hide(); } - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); }); @@ -299,6 +303,9 @@ data['events']['user_filter']['filts'][index]['columnName'] = val.id; data['events']['user_filter']['filts'][index]['data_type'] = val.type; data['events']['user_filter']['filts'][index]['tableType'] = val.table_type; + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); }) }); @@ -315,14 +322,43 @@ if(val.id == "range"){ data['events']['user_filter']['filts'][index]['ftv'] = [-1,1]; } - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); } }) }); + + var render_date_index;//且用户符合时间选择框的index + $(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){ + var index = $(this).attr('data-index'); + render_date_index = index; + // console.log(index); + }); + + // 渲染过滤项时间框 + function renderdate(){ + lay('.analysis-overall-situation-date').each(function(){ + layui.laydate.render({ + elem: this + ,type:"datetime" + ,trigger: 'click' + ,done: function(value, date, endDate){ + data['events']['user_filter']['filts'][render_date_index]['strftv'] = value; + var datearr = []; + datearr.push(value) + data['events']['user_filter']['filts'][render_date_index]['ftv'] = datearr; + } + }); + }); + }; + $(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){ + var index = $(this).attr('data-index'); var val = $(this).val(); - var index = $(this).attr("data-index"); - data['events']['user_filter']['filts'][index]['strftv'] = val; + var valarr = val.split(","); + data['events']['user_filter']['filts'][index]['ftv']=valarr; + data['events']['user_filter']['filts'][index]['strftv']=val; }); $(document).off('click','.analysis-overall-situation-input2 input').on('blur','.analysis-overall-situation-input2 input',function(){ @@ -402,7 +438,9 @@ // $('.participate-num').html(data.cachedata.event_names.length); X.template("route","event-roue-event",data['events']['source_event']); - X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts']); + X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){ + renderdate() + }); X.laytpldata("#eventsplit-box-dot",data['events']['by_fields'],".eventsplit-box"); // X.template("userpar","userpar-event",data['events']); diff --git a/web/static/css/style.css b/web/static/css/style.css index f31ea92..321b849 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -25,6 +25,7 @@ /* .layui-card { min-height: 388px; } */ .modify-layui-card-small { height: 186px; } .modify-layui-card { height: 388px; } +.layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; } ::-webkit-scrollbar { width:5px;