1
This commit is contained in:
parent
c302d945aa
commit
cedd21f88f
@ -6,7 +6,7 @@
|
|||||||
<div class="analysis-overall-situation-fuhao" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
|
<div class="analysis-overall-situation-fuhao" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
|
||||||
{{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
|
{{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
|
||||||
{{# if(item.data_type != "datetime" && item.data_type != "user_label"){ }}
|
{{# if(item.data_type != "datetime" && item.data_type != "user_label"){ }}
|
||||||
<div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}">
|
<div class="analysis-overall-situation-input" data-type="{{item.data_type}}" data-index="{{index}}" data-comparator="{{item.comparator}}">
|
||||||
<input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}"/>
|
<input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}"/>
|
||||||
</div>
|
</div>
|
||||||
{{# } else if(item.data_type == "user_label"){ }}
|
{{# } else if(item.data_type == "user_label"){ }}
|
||||||
|
|||||||
@ -46,3 +46,23 @@
|
|||||||
</tr>
|
</tr>
|
||||||
{{# }); }}
|
{{# }); }}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<script id="table-fenxi-retained-td-group-dot" type="text/html">
|
||||||
|
{{# layui.each(d, function(index, item){ }}
|
||||||
|
|
||||||
|
<tr >
|
||||||
|
<td>{{item.date}}</td>
|
||||||
|
<td>{{item.d0}}</td>
|
||||||
|
{{# layui.each(item.data, function(indexs, items){ }}
|
||||||
|
<td>
|
||||||
|
<!-- <p>{{items.n}}</p> -->
|
||||||
|
{{# if(items.p == '-'){ }}
|
||||||
|
<p>{{items.p}}</p>
|
||||||
|
{{# } else { }}
|
||||||
|
<p>{{items.p}}%</p>
|
||||||
|
{{# } }}
|
||||||
|
</td>
|
||||||
|
{{# }); }}
|
||||||
|
</tr>
|
||||||
|
{{# }); }}
|
||||||
|
</script>
|
||||||
@ -205,7 +205,12 @@
|
|||||||
<script id="table-fenxi-td-dot" type="text/html">
|
<script id="table-fenxi-td-dot" type="text/html">
|
||||||
{{# layui.each(d, function(index, item){ }}
|
{{# layui.each(d, function(index, item){ }}
|
||||||
<tr >
|
<tr >
|
||||||
|
{{# if(item.date == "均值"){ }}
|
||||||
<td>{{item.date}}</td>
|
<td>{{item.date}}</td>
|
||||||
|
{{# } else { }}
|
||||||
|
<td>{{item.date}} <img src="./static/img/jia1.png" class="table-info-list-box" data-time="{{item.date}}"> </td>
|
||||||
|
{{# } }}
|
||||||
|
|
||||||
<td>{{item.d0}}</td>
|
<td>{{item.d0}}</td>
|
||||||
{{# layui.each(item.data, function(indexs, items){ }}
|
{{# layui.each(item.data, function(indexs, items){ }}
|
||||||
<td>
|
<td>
|
||||||
|
|||||||
@ -92,7 +92,7 @@
|
|||||||
{{# if(d.events.length > 1){ }}
|
{{# if(d.events.length > 1){ }}
|
||||||
<div class="userlabel-json-relation-relation">
|
<div class="userlabel-json-relation-relation">
|
||||||
<em class="userlabel-json-relation-relation-line"></em>
|
<em class="userlabel-json-relation-relation-line"></em>
|
||||||
<div class="userlabel-json-relation-relation-value">且</div>
|
<div class="userlabel-json-relation-relation-value" data-type="event">且</div>
|
||||||
</div>
|
</div>
|
||||||
{{# } }}
|
{{# } }}
|
||||||
<div class="userlabel-json-relation-main">
|
<div class="userlabel-json-relation-main">
|
||||||
@ -106,6 +106,8 @@
|
|||||||
<div class="ant-dropdown-trigger2 ta-event-select my-event-data" data-index="{{index}}">
|
<div class="ant-dropdown-trigger2 ta-event-select my-event-data" data-index="{{index}}">
|
||||||
<span class="ta-event-select-label">{{item.eventDesc}}</span>
|
<span class="ta-event-select-label">{{item.eventDesc}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{# if(item.is_time){ }}
|
||||||
<span class="ta-bold">，在</span>
|
<span class="ta-bold">，在</span>
|
||||||
{{# if(item.e_days == 0){ }}
|
{{# if(item.e_days == 0){ }}
|
||||||
<span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
|
<span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
|
||||||
@ -116,10 +118,15 @@
|
|||||||
过去{{item.s_days}}天-过去{{item.e_days}}天
|
过去{{item.s_days}}天-过去{{item.e_days}}天
|
||||||
</span>
|
</span>
|
||||||
{{# } }}
|
{{# } }}
|
||||||
|
{{# } }}
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="userlabel-json-action-right">
|
<div class="userlabel-json-action-right">
|
||||||
|
<div class="action-icon action-normal action-md action-action action-icon-time" data-index="{{index}}">
|
||||||
|
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
||||||
|
</div>
|
||||||
<div class="action-icon action-normal action-md action-action action-icon-shax">
|
<div class="action-icon action-normal action-md action-action action-icon-shax">
|
||||||
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
||||||
</div>
|
</div>
|
||||||
@ -151,8 +158,9 @@
|
|||||||
<span class="ta-event-select-label">{{item.uce_calcu_symbolDesc}}</span>
|
<span class="ta-event-select-label">{{item.uce_calcu_symbolDesc}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="ant-input-number tant-input-number lable-input-box">
|
<div class="ant-input-number tant-input-number lable-input-box">
|
||||||
<input style="width: 160px;" type="text" placeholder="多个用英文逗号隔开" data-index="{{index}}" value="{{item.num}}"/>
|
<input style="width: 160px;" type="text" placeholder="区间多个用英文逗号隔开" data-index="{{index}}" value="{{item.num}}"/>
|
||||||
</div>
|
</div>
|
||||||
|
{{# if(item.is_time){ }}
|
||||||
<span class="ta-bold">，在</span>
|
<span class="ta-bold">，在</span>
|
||||||
{{# if(item.e_days == 0){ }}
|
{{# if(item.e_days == 0){ }}
|
||||||
<span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
|
<span class="ant-dropdown-trigger2 ta-range-picker-label time-days-box" data-index="{{index}}">
|
||||||
@ -163,9 +171,13 @@
|
|||||||
过去{{item.s_days}}天-过去{{item.e_days}}天
|
过去{{item.s_days}}天-过去{{item.e_days}}天
|
||||||
</span>
|
</span>
|
||||||
{{# } }}
|
{{# } }}
|
||||||
|
{{# } }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="userlabel-json-action-right">
|
<div class="userlabel-json-action-right">
|
||||||
|
<div class="action-icon action-normal action-md action-action action-icon-time" data-index="{{index}}">
|
||||||
|
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
||||||
|
</div>
|
||||||
<div class="action-icon action-normal action-md action-action action-icon-shax action-icon-events-shax" data-index="{{index}}">
|
<div class="action-icon action-normal action-md action-action action-icon-shax action-icon-events-shax" data-index="{{index}}">
|
||||||
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
||||||
</div>
|
</div>
|
||||||
@ -188,7 +200,7 @@
|
|||||||
{{# if(d.filts.length > 1){ }}
|
{{# if(d.filts.length > 1){ }}
|
||||||
<div class="userlabel-json-relation-relation">
|
<div class="userlabel-json-relation-relation">
|
||||||
<em class="userlabel-json-relation-relation-line"></em>
|
<em class="userlabel-json-relation-relation-line"></em>
|
||||||
<div class="userlabel-json-relation-relation-value">且</div>
|
<div class="userlabel-json-relation-relation-value" data-type="userattr">且</div>
|
||||||
</div>
|
</div>
|
||||||
{{# } }}
|
{{# } }}
|
||||||
<div class="userlabel-json-relation-main">
|
<div class="userlabel-json-relation-main">
|
||||||
@ -199,19 +211,19 @@
|
|||||||
<div class="userlabel-json-action-left">
|
<div class="userlabel-json-action-left">
|
||||||
<div class="ta-filter-condition">
|
<div class="ta-filter-condition">
|
||||||
<span class="ta-property">用户属性</span>
|
<span class="ta-property">用户属性</span>
|
||||||
<div class="ant-dropdown-trigger2 ta-property-select">
|
<div class="ant-dropdown-trigger2 ta-property-select user-attribute" data-index="{{index}}">
|
||||||
<span class="ta-property-select-label">账户ID</span>
|
<span class="ta-property-select-label">{{item.columnDesc}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="ant-dropdown-trigger2 ta-property-select">
|
<div class="ant-dropdown-trigger2 ta-property-select user-attribute-filter" data-index="{{index}}">
|
||||||
<span class="ta-property-select-label">等于</span>
|
<span class="ta-property-select-label">{{item.comparator_name}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="ta-equal-search taDragDisable">
|
<div class="ta-equal-search taDragDisable" data-index="{{index}}">
|
||||||
<input type="text"/>
|
<input type="text" value="{{item.strftv}}"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="userlabel-json-action-right">
|
<div class="userlabel-json-action-right">
|
||||||
<div class="action-icon action-normal action-md action-action action-icon-shax">
|
<div class="action-icon action-normal action-md action-action action-icon-shax userattrfilts" data-type="userattr" data-index="{{index}}">
|
||||||
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
<i class="iconfont" style="font-size: 22px; margin-right: 4px;"></i>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon action-normal action-md action-action action-icon-del">
|
<div class="action-icon action-normal action-md action-action action-icon-del">
|
||||||
@ -219,6 +231,47 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="userlabel-json-relation-row" style="margin-top: 8px;">
|
||||||
|
<div class="userlabel-json-relation-editor">
|
||||||
|
{{# if(item.filts.length > 1){ }}
|
||||||
|
<div class="userlabel-json-relation-relation">
|
||||||
|
<em class="userlabel-json-relation-relation-line"></em>
|
||||||
|
<div class="userlabel-json-relation-relation-value" data-type="userattr" data-index="{{index}}" data-indexs="{{indexs}}">且</div>
|
||||||
|
</div>
|
||||||
|
{{# } }}
|
||||||
|
<div class="userlabel-json-relation-main">
|
||||||
|
<div class="userlabel-json-relation-row">
|
||||||
|
<div class="ta-multa-filter-condition">
|
||||||
|
{{# layui.each(item.filts, function(indexs, items) { }}
|
||||||
|
<div class="userlabel-json-action-row">
|
||||||
|
<div class="userlabel-json-action-left">
|
||||||
|
<div class="ta-filter-condition">
|
||||||
|
<span class="ta-property">用户属性</span>
|
||||||
|
<div class="ant-dropdown-trigger2 ta-property-select user-attribute" data-index="{{index}}" data-indexs="{{indexs}}">
|
||||||
|
<span class="ta-property-select-label">{{items.columnDesc}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="ant-dropdown-trigger2 ta-property-select user-attribute-filter" data-index="{{index}}" data-indexs="{{indexs}}">
|
||||||
|
<span class="ta-property-select-label">{{items.comparator_name}}</span>
|
||||||
|
</div>
|
||||||
|
<div class="ta-equal-search taDragDisable" data-index="{{index}}" data-indexs="{{indexs}}">
|
||||||
|
<input type="text" value="{{items.strftv}}"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="userlabel-json-action-right">
|
||||||
|
<div class="action-icon action-normal action-md action-action action-icon-del" data-index="{{index}}" data-indexs="{{indexs}}">
|
||||||
|
<i class="iconfont" style="font-size: 18px; margin-right: 4px;"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{# }); }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{{# }); }}
|
{{# }); }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
387
web/src/x.min.js
vendored
387
web/src/x.min.js
vendored
@ -138,11 +138,11 @@ var X = window.X || {
|
|||||||
|
|
||||||
(function(){
|
(function(){
|
||||||
//本地李伟
|
//本地李伟
|
||||||
// var ipurl = "http://10.0.0.240:7899/api/v1/";
|
var ipurl = "http://10.0.0.240:7899/api/v1/";
|
||||||
//本地李宗振
|
//本地李宗振
|
||||||
// var ipurl = "http://10.0.0.94:7899/api/v1/";
|
// 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:9865/api/v1/";
|
||||||
//线上测试
|
//线上测试
|
||||||
// var ipurl = "http://139.159.159.3:7889/api/v1/";
|
// var ipurl = "http://139.159.159.3:7889/api/v1/";
|
||||||
|
|
||||||
@ -211,6 +211,7 @@ var X = window.X || {
|
|||||||
X.gourl("login");
|
X.gourl("login");
|
||||||
location.reload();
|
location.reload();
|
||||||
}else if(d.code == -9){
|
}else if(d.code == -9){
|
||||||
|
//无数据时
|
||||||
layer.msg(d.msg);
|
layer.msg(d.msg);
|
||||||
}else {
|
}else {
|
||||||
layer.msg(d.msg);
|
layer.msg(d.msg);
|
||||||
@ -9061,9 +9062,7 @@ var X = window.X || {
|
|||||||
time:time
|
time:time
|
||||||
}
|
}
|
||||||
|
|
||||||
X.parametersopen(dataArr,'grouptable','auto',function(){
|
X.parametersopen(dataArr,'grouptable','auto')
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -9725,11 +9724,11 @@ var X = window.X || {
|
|||||||
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
|
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
|
||||||
'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
|
'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
|
||||||
'comparator_name':'等于',//默认等于
|
'comparator_name':'等于',//默认等于
|
||||||
"comparator_id":'==',//符号id
|
"comparator":'==',//符号id
|
||||||
"ftv":[],//条件
|
"ftv":[],//条件
|
||||||
"strftv":'',//显示条件
|
"strftv":'',//显示条件
|
||||||
"section":[-1,1],//区间
|
"section":[-1,1],//区间
|
||||||
"table_type":groupitemeventsdata[0]['id']
|
"tableType":groupitemeventsdata[0]['id']
|
||||||
};
|
};
|
||||||
data['eventView']['filts'].push(drr);
|
data['eventView']['filts'].push(drr);
|
||||||
if(data['eventView']['filts'].length > 1){
|
if(data['eventView']['filts'].length > 1){
|
||||||
@ -9766,8 +9765,8 @@ var X = window.X || {
|
|||||||
data['eventView']['filts'][index]['columnName'] = val.id;
|
data['eventView']['filts'][index]['columnName'] = val.id;
|
||||||
data['eventView']['filts'][index]['data_type'] = val.type;
|
data['eventView']['filts'][index]['data_type'] = val.type;
|
||||||
data['eventView']['filts'][index]['comparator_name'] = '等于';
|
data['eventView']['filts'][index]['comparator_name'] = '等于';
|
||||||
data['eventView']['filts'][index]['comparator_id'] = '==';
|
data['eventView']['filts'][index]['comparator'] = '==';
|
||||||
data['eventView']['filts'][index]['table_type'] = val.table_type;
|
data['eventView']['filts'][index]['tableType'] = val.table_type;
|
||||||
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
|
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
|
||||||
renderdate();
|
renderdate();
|
||||||
});
|
});
|
||||||
@ -9783,7 +9782,7 @@ var X = window.X || {
|
|||||||
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
$(this).html(val.title);
|
$(this).html(val.title);
|
||||||
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
||||||
data['eventView']['filts'][index]['comparator_id'] = val.id;
|
data['eventView']['filts'][index]['comparator'] = val.id;
|
||||||
if(val.id == "range"){
|
if(val.id == "range"){
|
||||||
data['eventView']['filts'][index]['ftv'] = [-1,1];
|
data['eventView']['filts'][index]['ftv'] = [-1,1];
|
||||||
}
|
}
|
||||||
@ -9817,6 +9816,40 @@ var X = window.X || {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
var comparator = obj.attr("data-comparator");
|
||||||
|
var columnName = data['eventView']['filts'][index]['columnName'];
|
||||||
|
|
||||||
|
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
|
||||||
|
if(val != "查无数据"){
|
||||||
|
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
if(comparator == "in"){
|
||||||
|
if(data['eventView']['filts'][index]['strftv'] == "" ){
|
||||||
|
var strftv = val.title;
|
||||||
|
data['eventView']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}else {
|
||||||
|
var strftv = data['eventView']['filts'][index]['strftv'] + "," + val.title;
|
||||||
|
data['eventView']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}
|
||||||
|
data['eventView']['filts'][index]['strftv'] = strftv;
|
||||||
|
}else {
|
||||||
|
data['eventView']['filts'][index]['strftv'] = val.title;
|
||||||
|
var arr = [];
|
||||||
|
arr.push(val.id);
|
||||||
|
data['eventView']['filts'][index]['ftv'] = arr;
|
||||||
|
}
|
||||||
|
|
||||||
|
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
|
||||||
|
renderdate();
|
||||||
|
});
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
||||||
var val = $(this).val();
|
var val = $(this).val();
|
||||||
var index = $(this).attr("data-index");
|
var index = $(this).attr("data-index");
|
||||||
@ -9854,7 +9887,7 @@ var X = window.X || {
|
|||||||
"columnDesc": "#account_id",//事件中文显示
|
"columnDesc": "#account_id",//事件中文显示
|
||||||
"columnName": "#account_id",//事件id
|
"columnName": "#account_id",//事件id
|
||||||
'data_type': "string",//类型
|
'data_type': "string",//类型
|
||||||
'table_type': "event",
|
'tableType': "event",
|
||||||
"ftv":"",//条件
|
"ftv":"",//条件
|
||||||
"section":''//区间
|
"section":''//区间
|
||||||
};
|
};
|
||||||
@ -9873,7 +9906,7 @@ var X = window.X || {
|
|||||||
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
||||||
data.eventView.groupBy[index]['columnName'] = val.id;
|
data.eventView.groupBy[index]['columnName'] = val.id;
|
||||||
data.eventView.groupBy[index]['data_type'] = val.type;
|
data.eventView.groupBy[index]['data_type'] = val.type;
|
||||||
data.eventView.groupBy[index]['table_type'] = val.table_type;
|
data.eventView.groupBy[index]['tableType'] = val.table_type;
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -10403,13 +10436,50 @@ var X = window.X || {
|
|||||||
var me = this;
|
var me = this;
|
||||||
this.parms = parms;
|
this.parms = parms;
|
||||||
this.callback = parms.callback;
|
this.callback = parms.callback;
|
||||||
var data = parms.extData;
|
var dataArr = parms.extData;
|
||||||
if(data.eventView.timeParticleSize != "P1M" && data.eventView.timeParticleSize != "total" && data.eventView.timeParticleSize != "P1W"){
|
|
||||||
data['eventView']['endTime'] = data.time+" 23:59:59";
|
if(dataArr.eventView.timeParticleSize != "P1M" && dataArr.eventView.timeParticleSize != "total" && dataArr.eventView.timeParticleSize != "P1W"){
|
||||||
data['eventView']['startTime'] = data.time+" 00:00:00";
|
dataArr['eventView']['endTime'] = dataArr.time+" 23:59:59";
|
||||||
|
dataArr['eventView']['startTime'] = dataArr.time+" 00:00:00";
|
||||||
}
|
}
|
||||||
|
|
||||||
X.api("ck/scatter_model_details","post",data,function(d){
|
if(dataArr.type == "retained"){
|
||||||
|
var nname,pname
|
||||||
|
if(dataArr.retentiontype == 0) {
|
||||||
|
nname = 'n';
|
||||||
|
pname = 'p';
|
||||||
|
}else {
|
||||||
|
nname = 'n_outflow';
|
||||||
|
pname = 'p_outflow';
|
||||||
|
}
|
||||||
|
|
||||||
|
X.api("ck/retention_model_details","post",dataArr,function(d){
|
||||||
|
var tabledata=[];
|
||||||
|
for(let i in d['summary_values']){
|
||||||
|
var arr = {
|
||||||
|
date: i,
|
||||||
|
d0:d['summary_values'][i]['d0'],
|
||||||
|
data:[]
|
||||||
|
}
|
||||||
|
for(let j in d['summary_values'][i]["n"]){
|
||||||
|
var nrr = {
|
||||||
|
n:0,
|
||||||
|
p:0
|
||||||
|
}
|
||||||
|
nrr["n"] = d['summary_values'][i][nname][j];
|
||||||
|
nrr["p"] = d['summary_values'][i][pname][j]
|
||||||
|
arr['data'].push(nrr);
|
||||||
|
}
|
||||||
|
tabledata.push(arr)
|
||||||
|
}
|
||||||
|
$('.grouptable-title-box span').html(d.start_date);
|
||||||
|
X.laytpldata("#table-fenxi-th-group-dot",d.title,".table-fenxi-group-th");
|
||||||
|
X.laytpldata("#table-fenxi-retained-td-group-dot",tabledata,".table-fenxi-group-td");
|
||||||
|
|
||||||
|
});
|
||||||
|
}else {
|
||||||
|
|
||||||
|
X.api("ck/scatter_model_details","post",dataArr,function(d){
|
||||||
d['tabletitle'] = $.extend(true,[],d['label']);
|
d['tabletitle'] = $.extend(true,[],d['label']);
|
||||||
d['tabletitle'].unshift(d.biaotou,'全部用户');
|
d['tabletitle'].unshift(d.biaotou,'全部用户');
|
||||||
var contnetdata =[];
|
var contnetdata =[];
|
||||||
@ -10439,9 +10509,12 @@ var X = window.X || {
|
|||||||
});
|
});
|
||||||
|
|
||||||
$(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
|
$(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
|
||||||
data.eventView['download'] = 1;
|
dataArr.eventView['download'] = 1;
|
||||||
X.download("ck/scatter_model_details",data,'分布分析')
|
X.download("ck/scatter_model_details",dataArr,'分布分析')
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -12412,14 +12485,9 @@ var X = window.X || {
|
|||||||
var startmonth = Date.parse(startdate)/1000;
|
var startmonth = Date.parse(startdate)/1000;
|
||||||
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
|
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
|
||||||
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
|
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
|
||||||
retaineddata();
|
// retaineddata();
|
||||||
});
|
});
|
||||||
|
|
||||||
var time = $("#retained-condition-date").val();
|
|
||||||
var timearr = time.split(" ");
|
|
||||||
data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
|
|
||||||
data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
|
|
||||||
|
|
||||||
var eventdata;
|
var eventdata;
|
||||||
var groupitemeventsdata;//分组项里的事件
|
var groupitemeventsdata;//分组项里的事件
|
||||||
var querydata; //计算后返回的数据
|
var querydata; //计算后返回的数据
|
||||||
@ -12453,7 +12521,6 @@ var X = window.X || {
|
|||||||
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
|
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
|
||||||
groupitemeventsdata = val;
|
groupitemeventsdata = val;
|
||||||
//初始事件
|
//初始事件
|
||||||
// console.log(data['events'][0]);
|
|
||||||
X.template("event","initial-event",data['events'][0]);
|
X.template("event","initial-event",data['events'][0]);
|
||||||
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
|
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
|
||||||
|
|
||||||
@ -12491,7 +12558,6 @@ var X = window.X || {
|
|||||||
if(type2data.length >0){
|
if(type2data.length >0){
|
||||||
X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
// if(val != undefined){
|
// if(val != undefined){
|
||||||
console.log(val);
|
|
||||||
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
|
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
|
||||||
data['events'][index]['event_attr'] = val.title;
|
data['events'][index]['event_attr'] = val.title;
|
||||||
data['events'][index]['event_attr_id'] = val.id;
|
data['events'][index]['event_attr_id'] = val.id;
|
||||||
@ -12539,7 +12605,6 @@ var X = window.X || {
|
|||||||
"ftv":[],
|
"ftv":[],
|
||||||
"strftv":"",
|
"strftv":"",
|
||||||
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
||||||
"data_type":groupitemeventsdata[0]['category'][0]['data_type'],
|
|
||||||
"timeUnit":""
|
"timeUnit":""
|
||||||
}
|
}
|
||||||
// initialevent.push(arr);
|
// initialevent.push(arr);
|
||||||
@ -12557,7 +12622,6 @@ var X = window.X || {
|
|||||||
"ftv":[],
|
"ftv":[],
|
||||||
"strftv":"",
|
"strftv":"",
|
||||||
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
||||||
"data_type":groupitemeventsdata[0]['category'][0]['data_type'],
|
|
||||||
"timeUnit":""
|
"timeUnit":""
|
||||||
}
|
}
|
||||||
// data['events'][1]['filts'].push(arr);
|
// data['events'][1]['filts'].push(arr);
|
||||||
@ -12594,12 +12658,10 @@ var X = window.X || {
|
|||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
var index = obj.attr("data-index");
|
var index = obj.attr("data-index");
|
||||||
var dataevent= data['events'][index];
|
var dataevent= data['events'][index];
|
||||||
// console.log(dataevent);
|
|
||||||
X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
|
X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
|
||||||
obj.html(val.id);
|
obj.html(val.id);
|
||||||
dataevent['eventName'] = val.name;
|
dataevent['eventName'] = val.name;
|
||||||
dataevent['eventDesc'] = val.id;
|
dataevent['eventDesc'] = val.id;
|
||||||
// console.log(data['events']);
|
|
||||||
|
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
@ -12634,7 +12696,6 @@ var X = window.X || {
|
|||||||
var index = $(this).attr("data-index");
|
var index = $(this).attr("data-index");
|
||||||
var indexs = $(this).attr("data-indexs");
|
var indexs = $(this).attr("data-indexs");
|
||||||
var type = data['events'][index]['filts'][indexs]['data_type'];
|
var type = data['events'][index]['filts'][indexs]['data_type'];
|
||||||
console.log(type);
|
|
||||||
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
if(val != undefined){
|
if(val != undefined){
|
||||||
obj.html(val.title);
|
obj.html(val.title);
|
||||||
@ -12700,7 +12761,6 @@ var X = window.X || {
|
|||||||
var filtsftvdata=[];
|
var filtsftvdata=[];
|
||||||
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
||||||
var screentypedata = groupitemeventsdata;
|
var screentypedata = groupitemeventsdata;
|
||||||
console.log(screentypedata);
|
|
||||||
var drr={
|
var drr={
|
||||||
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
||||||
//"column_id":screentypedata[0]['category'][0]['id'],
|
//"column_id":screentypedata[0]['category'][0]['id'],
|
||||||
@ -12745,7 +12805,6 @@ var X = window.X || {
|
|||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
var index = obj.attr("data-index");
|
var index = obj.attr("data-index");
|
||||||
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
|
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
|
||||||
console.log(val);
|
|
||||||
obj.html(val.title);
|
obj.html(val.title);
|
||||||
data['eventView']['filts'][index]['columnDesc'] = val.title;
|
data['eventView']['filts'][index]['columnDesc'] = val.title;
|
||||||
data['eventView']['filts'][index]['columnName'] = val.id;
|
data['eventView']['filts'][index]['columnName'] = val.id;
|
||||||
@ -12787,7 +12846,6 @@ var X = window.X || {
|
|||||||
$(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
|
$(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
|
||||||
var index = $(this).attr('data-index');
|
var index = $(this).attr('data-index');
|
||||||
render_date_index = index;
|
render_date_index = index;
|
||||||
// console.log(index);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// 渲染过滤项时间框
|
// 渲染过滤项时间框
|
||||||
@ -12812,7 +12870,6 @@ var X = window.X || {
|
|||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
var index = obj.attr("data-index");
|
var index = obj.attr("data-index");
|
||||||
var type = data['eventView']['filts'][index]['data_type'];
|
var type = data['eventView']['filts'][index]['data_type'];
|
||||||
console.log(type);
|
|
||||||
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
$(this).html(val.title);
|
$(this).html(val.title);
|
||||||
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
||||||
@ -12849,7 +12906,9 @@ var X = window.X || {
|
|||||||
'data_type': "string",//类型
|
'data_type': "string",//类型
|
||||||
'tableType': "event",
|
'tableType': "event",
|
||||||
"ftv":"",//条件
|
"ftv":"",//条件
|
||||||
"section":''//区间
|
"section":'',//区间
|
||||||
|
"intervalType":"def",
|
||||||
|
"quotaIntervalArr":[]
|
||||||
};
|
};
|
||||||
data['eventView']['groupBy'].push(arr);
|
data['eventView']['groupBy'].push(arr);
|
||||||
X.template("grouped","shushi",data['eventView']['groupBy']);
|
X.template("grouped","shushi",data['eventView']['groupBy']);
|
||||||
@ -12866,7 +12925,21 @@ var X = window.X || {
|
|||||||
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
||||||
data.eventView.groupBy[index]['columnName'] = val.id;
|
data.eventView.groupBy[index]['columnName'] = val.id;
|
||||||
data.eventView.groupBy[index]['data_type'] = val.type;
|
data.eventView.groupBy[index]['data_type'] = val.type;
|
||||||
data.eventView.groupBy[index]['tableType'] = val.tableType;
|
data.eventView.groupBy[index]['tableType'] = val.table_type;
|
||||||
|
X.template("grouped","shushi",data['eventView']['groupBy']);
|
||||||
|
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
$(document).off('click','.analysis-granularity').on('click','.analysis-granularity',function(){
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
var sectionid = data['eventView']['groupBy'][index];
|
||||||
|
X.parametersopen(sectionid,'groupeditemspop',"auto",function(val){
|
||||||
|
data['eventView']['groupBy'][index]['intervalType'] = val.type;
|
||||||
|
if(val.type == "user_defined"){
|
||||||
|
data['eventView']['groupBy'][index]['quotaIntervalArr'] = val.quotaIntervalArr;
|
||||||
|
}
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -12886,7 +12959,6 @@ var X = window.X || {
|
|||||||
|
|
||||||
// 时间粒度
|
// 时间粒度
|
||||||
X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){
|
X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){
|
||||||
// console.log(d);
|
|
||||||
$(".analtsis-timeParticleSize").html(d.title);
|
$(".analtsis-timeParticleSize").html(d.title);
|
||||||
data['eventView']['unitNum'] = parseInt(d.id);
|
data['eventView']['unitNum'] = parseInt(d.id);
|
||||||
retaineddata();
|
retaineddata();
|
||||||
@ -12913,6 +12985,10 @@ var X = window.X || {
|
|||||||
});
|
});
|
||||||
|
|
||||||
function retaineddata(){
|
function retaineddata(){
|
||||||
|
var time = $("#retained-condition-date").val();
|
||||||
|
var timearr = time.split(" ");
|
||||||
|
data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
|
||||||
|
data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
|
||||||
var dataArr = {
|
var dataArr = {
|
||||||
eventView: data.eventView,
|
eventView: data.eventView,
|
||||||
events: data.events
|
events: data.events
|
||||||
@ -12922,6 +12998,11 @@ var X = window.X || {
|
|||||||
querydata = d;
|
querydata = d;
|
||||||
updata(d);
|
updata(d);
|
||||||
$(".chawushuj").hide();
|
$(".chawushuj").hide();
|
||||||
|
if(data.eventView.groupBy.length > 0){
|
||||||
|
$(".table-info-list-box").show();
|
||||||
|
}else {
|
||||||
|
$(".table-info-list-box").hide();
|
||||||
|
}
|
||||||
}else {
|
}else {
|
||||||
$("#analysis-echarts").empty();
|
$("#analysis-echarts").empty();
|
||||||
$(".table-fenxi-th").html("");
|
$(".table-fenxi-th").html("");
|
||||||
@ -12949,7 +13030,6 @@ var X = window.X || {
|
|||||||
|
|
||||||
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
|
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
|
||||||
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
|
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
|
||||||
console.log(d);
|
|
||||||
if(d){
|
if(d){
|
||||||
backfilldata(d);
|
backfilldata(d);
|
||||||
}
|
}
|
||||||
@ -12987,28 +13067,6 @@ var X = window.X || {
|
|||||||
function retainedtable(d){
|
function retainedtable(d){
|
||||||
var nname,pname
|
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 titarr = [];
|
|
||||||
// var tablearr = [];
|
|
||||||
// for(let i in filterarr){
|
|
||||||
// var index = Number(filterarr[i]) + 2;
|
|
||||||
// titarr.push(titdata[index]);
|
|
||||||
// }
|
|
||||||
// titarr.unshift(titdata[0],titdata[1]);
|
|
||||||
// console.log(titarr);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(retentiontype == 0) {
|
if(retentiontype == 0) {
|
||||||
nname = 'n';
|
nname = 'n';
|
||||||
pname = 'p';
|
pname = 'p';
|
||||||
@ -13028,48 +13086,13 @@ var X = window.X || {
|
|||||||
n:0,
|
n:0,
|
||||||
p: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 {
|
|
||||||
nrr["n"] = d['summary_values'][i][nname][j];
|
nrr["n"] = d['summary_values'][i][nname][j];
|
||||||
nrr["p"] = d['summary_values'][i][pname][j]
|
nrr["p"] = d['summary_values'][i][pname][j]
|
||||||
arr['data'].push(nrr);
|
arr['data'].push(nrr);
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
tabledata.push(arr)
|
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);
|
|
||||||
|
|
||||||
// X.fixedTable('table-div-box','row-col-fixed','',headdata);
|
|
||||||
|
|
||||||
|
|
||||||
X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
|
X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
|
||||||
X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
|
X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
|
||||||
};
|
};
|
||||||
@ -13123,7 +13146,6 @@ var X = window.X || {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log(ydata);
|
|
||||||
// for(let i in ydata){
|
// for(let i in ydata){
|
||||||
// legenddata.push(i);
|
// legenddata.push(i);
|
||||||
// var arr = {
|
// var arr = {
|
||||||
@ -13390,10 +13412,24 @@ var X = window.X || {
|
|||||||
|
|
||||||
// 下载
|
// 下载
|
||||||
$(document).off('click','.download-table').on('click','.download-table',function(){
|
$(document).off('click','.download-table').on('click','.download-table',function(){
|
||||||
console.log(11111);
|
|
||||||
X.download('ck/retention_model_export',data,'事件分析');
|
X.download('ck/retention_model_export',data,'事件分析');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).off("click",'.table-info-list-box').on('click','.table-info-list-box',function(){
|
||||||
|
|
||||||
|
var time = $(this).attr("data-time");
|
||||||
|
const dataArr = {
|
||||||
|
eventView: data.eventView,
|
||||||
|
events: data.events,
|
||||||
|
time:time,
|
||||||
|
type: 'retained',
|
||||||
|
retentiontype: retentiontype
|
||||||
|
}
|
||||||
|
X.parametersopen(dataArr,'grouptable','auto')
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -13835,7 +13871,7 @@ var X = window.X || {
|
|||||||
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
||||||
'data_type':screentypedata[0]['category'][0]['data_type'],//类型
|
'data_type':screentypedata[0]['category'][0]['data_type'],//类型
|
||||||
'comparator_name':'等于',//默认等于
|
'comparator_name':'等于',//默认等于
|
||||||
"comparator_id":'==',//符号id
|
"comparator":'==',//符号id
|
||||||
"ftv":[],//条件
|
"ftv":[],//条件
|
||||||
"strftv":'',//显示条件
|
"strftv":'',//显示条件
|
||||||
"section":[-1,1],//区间
|
"section":[-1,1],//区间
|
||||||
@ -13878,7 +13914,7 @@ var X = window.X || {
|
|||||||
if(val != undefined){
|
if(val != undefined){
|
||||||
obj.html(val.title);
|
obj.html(val.title);
|
||||||
data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
|
data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
|
||||||
data['events']['user_filter']['filts'][index]['comparator_id'] = val.id;
|
data['events']['user_filter']['filts'][index]['comparator'] = val.id;
|
||||||
if(val.id == "range"){
|
if(val.id == "range"){
|
||||||
data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
|
data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
|
||||||
}
|
}
|
||||||
@ -13913,6 +13949,42 @@ var X = window.X || {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(event){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
var comparator = obj.attr("data-comparator");
|
||||||
|
var columnName = data['events']['user_filter']['filts'][index]['columnName'];
|
||||||
|
|
||||||
|
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
|
||||||
|
if(val != "查无数据"){
|
||||||
|
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
|
||||||
|
if(comparator == "in"){
|
||||||
|
if(data['events']['user_filter']['filts'][index]['strftv'] == "" ){
|
||||||
|
var strftv = val.title;
|
||||||
|
data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}else {
|
||||||
|
var strftv = data['events']['user_filter']['filts'][index]['strftv'] + "," + val.title;
|
||||||
|
data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}
|
||||||
|
data['events']['user_filter']['filts'][index]['strftv'] = strftv;
|
||||||
|
}else {
|
||||||
|
data['events']['user_filter']['filts'][index]['strftv'] = val.title;
|
||||||
|
var arr = [];
|
||||||
|
arr.push(val.id);
|
||||||
|
data['events']['user_filter']['filts'][index]['ftv'] = arr;
|
||||||
|
}
|
||||||
|
|
||||||
|
X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){
|
||||||
|
renderdate()
|
||||||
|
});
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
||||||
var index = $(this).attr('data-index');
|
var index = $(this).attr('data-index');
|
||||||
var val = $(this).val();
|
var val = $(this).val();
|
||||||
@ -15931,20 +16003,21 @@ var X = window.X || {
|
|||||||
uce_calcu_symbolDesc: "等于",
|
uce_calcu_symbolDesc: "等于",
|
||||||
prop_quota: {analysis: '', analysisDesc: '', quota: retdata[0]['id'], quotaDesc: retdata[0]["title"],quota_type: null},
|
prop_quota: {analysis: '', analysisDesc: '', quota: retdata[0]['id'], quotaDesc: retdata[0]["title"],quota_type: null},
|
||||||
is_touch: true,
|
is_touch: true,
|
||||||
|
is_time: false
|
||||||
}
|
}
|
||||||
data['qp']['user_cluster_def']['events'].push(arr);
|
data['qp']['user_cluster_def']['events'].push(arr);
|
||||||
}else {
|
}else {
|
||||||
arr = {
|
arr = {
|
||||||
calcuSymbol: "C01",
|
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
|
||||||
columnDesc: "",
|
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
|
||||||
columnName: "lv",
|
'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
|
||||||
columnType: "double",
|
'comparator_name':'等于',//默认等于
|
||||||
filterType: "SIMPLE",
|
"comparator":'==',//符号id
|
||||||
ftv: ["10"],
|
"ftv":[],//条件
|
||||||
selectType: "number",
|
"strftv":'',//显示条件
|
||||||
tableType: "1",
|
"section":[-1,1],//区间
|
||||||
timeRelative: "",
|
"tableType":defaultgroupdata[0]['id'],
|
||||||
timeUnit: ""
|
"filts": []
|
||||||
}
|
}
|
||||||
data['qp']['user_cluster_def']['filts'].push(arr);
|
data['qp']['user_cluster_def']['filts'].push(arr);
|
||||||
}
|
}
|
||||||
@ -16083,6 +16156,97 @@ var X = window.X || {
|
|||||||
updatalable();
|
updatalable();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".action-icon-time").on('click','.action-icon-time',function(){
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
data['qp']['user_cluster_def']['events'][index]['is_time'] = !data['qp']['user_cluster_def']['events'][index]['is_time'];
|
||||||
|
updatalable();
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".ta-property-select").on("click",".ta-property-select",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".user-attribute").on("click",".user-attribute",function(){
|
||||||
|
var obj =$(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
|
||||||
|
console.log(val);
|
||||||
|
$(this).html(val.title);
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['columnName'] = val.id;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['columnDesc'] = val.title;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['data_type'] = val.type;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['tableType'] = val.table_type;
|
||||||
|
updatalable();
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".user-attribute-filter").on("click",".user-attribute-filter",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
var type = data['qp']['user_cluster_def']['filts'][index]['data_type'];
|
||||||
|
console.log()
|
||||||
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
$(this).html(val.title);
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['comparator_name'] = val.title;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['comparator'] = val.id;
|
||||||
|
if(val.id == "range"){
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['ftv'] = [-1,1];
|
||||||
|
}
|
||||||
|
updatalable();
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off('click','.userattrfilts').on('click','.userattrfilts',function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
var type = obj.attr("data-type");
|
||||||
|
var arr = {
|
||||||
|
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
|
||||||
|
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
|
||||||
|
'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
|
||||||
|
'comparator_name':'等于',//默认等于
|
||||||
|
"comparator":'==',//符号id
|
||||||
|
"ftv":[],//条件
|
||||||
|
"strftv":'',//显示条件
|
||||||
|
"section":[-1,1],//区间
|
||||||
|
"tableType":defaultgroupdata[0]['id']
|
||||||
|
}
|
||||||
|
if(type == 'userattr'){
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['filts'].push(arr);
|
||||||
|
}else {
|
||||||
|
data['qp']['user_cluster_def']['events'][index]['filts'].push(arr);
|
||||||
|
}
|
||||||
|
console.log(data);
|
||||||
|
X.laytpldata('#userlabel-json-box-dot',data['qp']['user_cluster_def'],'.userlabel-json-box');
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".taDragDisable").on("click",".taDragDisable",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
var columnName = data['qp']['user_cluster_def']['filts'][index]['columnName']
|
||||||
|
|
||||||
|
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
|
||||||
|
if(val != "查无数据"){
|
||||||
|
|
||||||
|
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['strftv'] = val.title;
|
||||||
|
var arr = [];
|
||||||
|
arr.push(val.id);
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['ftv'] = arr;
|
||||||
|
updatalable();
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
$(document).off("click",'.userlabel-dy-baocun').on("click",".userlabel-dy-baocun",function(){
|
$(document).off("click",'.userlabel-dy-baocun').on("click",".userlabel-dy-baocun",function(){
|
||||||
var lablename = $(".lablename").val();
|
var lablename = $(".lablename").val();
|
||||||
var labledesc = $(".labledesc").val();
|
var labledesc = $(".labledesc").val();
|
||||||
@ -16098,6 +16262,7 @@ var X = window.X || {
|
|||||||
data['cluster_name'] = lablename;
|
data['cluster_name'] = lablename;
|
||||||
data['display_name'] = labledesc;
|
data['display_name'] = labledesc;
|
||||||
data['remarks'] = labeldes;
|
data['remarks'] = labeldes;
|
||||||
|
|
||||||
X.api('user_label/save','post',data,function(d){
|
X.api('user_label/save','post',data,function(d){
|
||||||
layer.msg("添加成功");
|
layer.msg("添加成功");
|
||||||
})
|
})
|
||||||
|
|||||||
@ -137,11 +137,11 @@ var X = window.X || {
|
|||||||
|
|
||||||
(function(){
|
(function(){
|
||||||
//本地李伟
|
//本地李伟
|
||||||
// var ipurl = "http://10.0.0.240:7899/api/v1/";
|
var ipurl = "http://10.0.0.240:7899/api/v1/";
|
||||||
//本地李宗振
|
//本地李宗振
|
||||||
// var ipurl = "http://10.0.0.94:7899/api/v1/";
|
// 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:9865/api/v1/";
|
||||||
//线上测试
|
//线上测试
|
||||||
// var ipurl = "http://139.159.159.3:7889/api/v1/";
|
// var ipurl = "http://139.159.159.3:7889/api/v1/";
|
||||||
|
|
||||||
@ -210,6 +210,7 @@ var X = window.X || {
|
|||||||
X.gourl("login");
|
X.gourl("login");
|
||||||
location.reload();
|
location.reload();
|
||||||
}else if(d.code == -9){
|
}else if(d.code == -9){
|
||||||
|
//无数据时
|
||||||
layer.msg(d.msg);
|
layer.msg(d.msg);
|
||||||
}else {
|
}else {
|
||||||
layer.msg(d.msg);
|
layer.msg(d.msg);
|
||||||
|
|||||||
@ -682,9 +682,7 @@
|
|||||||
time:time
|
time:time
|
||||||
}
|
}
|
||||||
|
|
||||||
X.parametersopen(dataArr,'grouptable','auto',function(){
|
X.parametersopen(dataArr,'grouptable','auto')
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -279,11 +279,11 @@
|
|||||||
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
|
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
|
||||||
'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
|
'data_type':groupitemeventsdata[0]['category'][0]['data_type'],//类型
|
||||||
'comparator_name':'等于',//默认等于
|
'comparator_name':'等于',//默认等于
|
||||||
"comparator_id":'==',//符号id
|
"comparator":'==',//符号id
|
||||||
"ftv":[],//条件
|
"ftv":[],//条件
|
||||||
"strftv":'',//显示条件
|
"strftv":'',//显示条件
|
||||||
"section":[-1,1],//区间
|
"section":[-1,1],//区间
|
||||||
"table_type":groupitemeventsdata[0]['id']
|
"tableType":groupitemeventsdata[0]['id']
|
||||||
};
|
};
|
||||||
data['eventView']['filts'].push(drr);
|
data['eventView']['filts'].push(drr);
|
||||||
if(data['eventView']['filts'].length > 1){
|
if(data['eventView']['filts'].length > 1){
|
||||||
@ -320,8 +320,8 @@
|
|||||||
data['eventView']['filts'][index]['columnName'] = val.id;
|
data['eventView']['filts'][index]['columnName'] = val.id;
|
||||||
data['eventView']['filts'][index]['data_type'] = val.type;
|
data['eventView']['filts'][index]['data_type'] = val.type;
|
||||||
data['eventView']['filts'][index]['comparator_name'] = '等于';
|
data['eventView']['filts'][index]['comparator_name'] = '等于';
|
||||||
data['eventView']['filts'][index]['comparator_id'] = '==';
|
data['eventView']['filts'][index]['comparator'] = '==';
|
||||||
data['eventView']['filts'][index]['table_type'] = val.table_type;
|
data['eventView']['filts'][index]['tableType'] = val.table_type;
|
||||||
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
|
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
|
||||||
renderdate();
|
renderdate();
|
||||||
});
|
});
|
||||||
@ -337,7 +337,7 @@
|
|||||||
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
$(this).html(val.title);
|
$(this).html(val.title);
|
||||||
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
||||||
data['eventView']['filts'][index]['comparator_id'] = val.id;
|
data['eventView']['filts'][index]['comparator'] = val.id;
|
||||||
if(val.id == "range"){
|
if(val.id == "range"){
|
||||||
data['eventView']['filts'][index]['ftv'] = [-1,1];
|
data['eventView']['filts'][index]['ftv'] = [-1,1];
|
||||||
}
|
}
|
||||||
@ -371,6 +371,40 @@
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
var comparator = obj.attr("data-comparator");
|
||||||
|
var columnName = data['eventView']['filts'][index]['columnName'];
|
||||||
|
|
||||||
|
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
|
||||||
|
if(val != "查无数据"){
|
||||||
|
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
if(comparator == "in"){
|
||||||
|
if(data['eventView']['filts'][index]['strftv'] == "" ){
|
||||||
|
var strftv = val.title;
|
||||||
|
data['eventView']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}else {
|
||||||
|
var strftv = data['eventView']['filts'][index]['strftv'] + "," + val.title;
|
||||||
|
data['eventView']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}
|
||||||
|
data['eventView']['filts'][index]['strftv'] = strftv;
|
||||||
|
}else {
|
||||||
|
data['eventView']['filts'][index]['strftv'] = val.title;
|
||||||
|
var arr = [];
|
||||||
|
arr.push(val.id);
|
||||||
|
data['eventView']['filts'][index]['ftv'] = arr;
|
||||||
|
}
|
||||||
|
|
||||||
|
X.template("globalfilter","xinwei-whole",data['eventView']['filts'],function(){
|
||||||
|
renderdate();
|
||||||
|
});
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
||||||
var val = $(this).val();
|
var val = $(this).val();
|
||||||
var index = $(this).attr("data-index");
|
var index = $(this).attr("data-index");
|
||||||
@ -408,7 +442,7 @@
|
|||||||
"columnDesc": "#account_id",//事件中文显示
|
"columnDesc": "#account_id",//事件中文显示
|
||||||
"columnName": "#account_id",//事件id
|
"columnName": "#account_id",//事件id
|
||||||
'data_type': "string",//类型
|
'data_type': "string",//类型
|
||||||
'table_type': "event",
|
'tableType': "event",
|
||||||
"ftv":"",//条件
|
"ftv":"",//条件
|
||||||
"section":''//区间
|
"section":''//区间
|
||||||
};
|
};
|
||||||
@ -427,7 +461,7 @@
|
|||||||
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
||||||
data.eventView.groupBy[index]['columnName'] = val.id;
|
data.eventView.groupBy[index]['columnName'] = val.id;
|
||||||
data.eventView.groupBy[index]['data_type'] = val.type;
|
data.eventView.groupBy[index]['data_type'] = val.type;
|
||||||
data.eventView.groupBy[index]['table_type'] = val.table_type;
|
data.eventView.groupBy[index]['tableType'] = val.table_type;
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@ -4,13 +4,50 @@
|
|||||||
var me = this;
|
var me = this;
|
||||||
this.parms = parms;
|
this.parms = parms;
|
||||||
this.callback = parms.callback;
|
this.callback = parms.callback;
|
||||||
var data = parms.extData;
|
var dataArr = parms.extData;
|
||||||
if(data.eventView.timeParticleSize != "P1M" && data.eventView.timeParticleSize != "total" && data.eventView.timeParticleSize != "P1W"){
|
|
||||||
data['eventView']['endTime'] = data.time+" 23:59:59";
|
if(dataArr.eventView.timeParticleSize != "P1M" && dataArr.eventView.timeParticleSize != "total" && dataArr.eventView.timeParticleSize != "P1W"){
|
||||||
data['eventView']['startTime'] = data.time+" 00:00:00";
|
dataArr['eventView']['endTime'] = dataArr.time+" 23:59:59";
|
||||||
|
dataArr['eventView']['startTime'] = dataArr.time+" 00:00:00";
|
||||||
}
|
}
|
||||||
|
|
||||||
X.api("ck/scatter_model_details","post",data,function(d){
|
if(dataArr.type == "retained"){
|
||||||
|
var nname,pname
|
||||||
|
if(dataArr.retentiontype == 0) {
|
||||||
|
nname = 'n';
|
||||||
|
pname = 'p';
|
||||||
|
}else {
|
||||||
|
nname = 'n_outflow';
|
||||||
|
pname = 'p_outflow';
|
||||||
|
}
|
||||||
|
|
||||||
|
X.api("ck/retention_model_details","post",dataArr,function(d){
|
||||||
|
var tabledata=[];
|
||||||
|
for(let i in d['summary_values']){
|
||||||
|
var arr = {
|
||||||
|
date: i,
|
||||||
|
d0:d['summary_values'][i]['d0'],
|
||||||
|
data:[]
|
||||||
|
}
|
||||||
|
for(let j in d['summary_values'][i]["n"]){
|
||||||
|
var nrr = {
|
||||||
|
n:0,
|
||||||
|
p:0
|
||||||
|
}
|
||||||
|
nrr["n"] = d['summary_values'][i][nname][j];
|
||||||
|
nrr["p"] = d['summary_values'][i][pname][j]
|
||||||
|
arr['data'].push(nrr);
|
||||||
|
}
|
||||||
|
tabledata.push(arr)
|
||||||
|
}
|
||||||
|
$('.grouptable-title-box span').html(d.start_date);
|
||||||
|
X.laytpldata("#table-fenxi-th-group-dot",d.title,".table-fenxi-group-th");
|
||||||
|
X.laytpldata("#table-fenxi-retained-td-group-dot",tabledata,".table-fenxi-group-td");
|
||||||
|
|
||||||
|
});
|
||||||
|
}else {
|
||||||
|
|
||||||
|
X.api("ck/scatter_model_details","post",dataArr,function(d){
|
||||||
d['tabletitle'] = $.extend(true,[],d['label']);
|
d['tabletitle'] = $.extend(true,[],d['label']);
|
||||||
d['tabletitle'].unshift(d.biaotou,'全部用户');
|
d['tabletitle'].unshift(d.biaotou,'全部用户');
|
||||||
var contnetdata =[];
|
var contnetdata =[];
|
||||||
@ -40,9 +77,12 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
$(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
|
$(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box img',function(){
|
||||||
data.eventView['download'] = 1;
|
dataArr.eventView['download'] = 1;
|
||||||
X.download("ck/scatter_model_details",data,'分布分析')
|
X.download("ck/scatter_model_details",dataArr,'分布分析')
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,14 +45,9 @@
|
|||||||
var startmonth = Date.parse(startdate)/1000;
|
var startmonth = Date.parse(startdate)/1000;
|
||||||
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
|
data['eventView']['e_days'] = parseInt((sameday - endmonth)/86400);
|
||||||
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
|
data['eventView']['s_days'] = parseInt((sameday - startmonth)/86400);
|
||||||
retaineddata();
|
// retaineddata();
|
||||||
});
|
});
|
||||||
|
|
||||||
var time = $("#retained-condition-date").val();
|
|
||||||
var timearr = time.split(" ");
|
|
||||||
data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
|
|
||||||
data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
|
|
||||||
|
|
||||||
var eventdata;
|
var eventdata;
|
||||||
var groupitemeventsdata;//分组项里的事件
|
var groupitemeventsdata;//分组项里的事件
|
||||||
var querydata; //计算后返回的数据
|
var querydata; //计算后返回的数据
|
||||||
@ -86,7 +81,6 @@
|
|||||||
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
|
X.api("data_auth/load_filter_props","post",{event_name:d[0]['category'][0]['event_name']},function(val){
|
||||||
groupitemeventsdata = val;
|
groupitemeventsdata = val;
|
||||||
//初始事件
|
//初始事件
|
||||||
// console.log(data['events'][0]);
|
|
||||||
X.template("event","initial-event",data['events'][0]);
|
X.template("event","initial-event",data['events'][0]);
|
||||||
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
|
X.template("returnvisitevent","returnvisit-event",data['events'][1]);
|
||||||
|
|
||||||
@ -124,7 +118,6 @@
|
|||||||
if(type2data.length >0){
|
if(type2data.length >0){
|
||||||
X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(type2data,'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
// if(val != undefined){
|
// if(val != undefined){
|
||||||
console.log(val);
|
|
||||||
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
|
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
|
||||||
data['events'][index]['event_attr'] = val.title;
|
data['events'][index]['event_attr'] = val.title;
|
||||||
data['events'][index]['event_attr_id'] = val.id;
|
data['events'][index]['event_attr_id'] = val.id;
|
||||||
@ -172,7 +165,6 @@
|
|||||||
"ftv":[],
|
"ftv":[],
|
||||||
"strftv":"",
|
"strftv":"",
|
||||||
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
||||||
"data_type":groupitemeventsdata[0]['category'][0]['data_type'],
|
|
||||||
"timeUnit":""
|
"timeUnit":""
|
||||||
}
|
}
|
||||||
// initialevent.push(arr);
|
// initialevent.push(arr);
|
||||||
@ -190,7 +182,6 @@
|
|||||||
"ftv":[],
|
"ftv":[],
|
||||||
"strftv":"",
|
"strftv":"",
|
||||||
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
|
||||||
"data_type":groupitemeventsdata[0]['category'][0]['data_type'],
|
|
||||||
"timeUnit":""
|
"timeUnit":""
|
||||||
}
|
}
|
||||||
// data['events'][1]['filts'].push(arr);
|
// data['events'][1]['filts'].push(arr);
|
||||||
@ -227,12 +218,10 @@
|
|||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
var index = obj.attr("data-index");
|
var index = obj.attr("data-index");
|
||||||
var dataevent= data['events'][index];
|
var dataevent= data['events'][index];
|
||||||
// console.log(dataevent);
|
|
||||||
X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
|
X.querycriteriapop(eventdata,'setgrouping',offset.left,offset.top+obj.height(),function(val){
|
||||||
obj.html(val.id);
|
obj.html(val.id);
|
||||||
dataevent['eventName'] = val.name;
|
dataevent['eventName'] = val.name;
|
||||||
dataevent['eventDesc'] = val.id;
|
dataevent['eventDesc'] = val.id;
|
||||||
// console.log(data['events']);
|
|
||||||
|
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
@ -267,7 +256,6 @@
|
|||||||
var index = $(this).attr("data-index");
|
var index = $(this).attr("data-index");
|
||||||
var indexs = $(this).attr("data-indexs");
|
var indexs = $(this).attr("data-indexs");
|
||||||
var type = data['events'][index]['filts'][indexs]['data_type'];
|
var type = data['events'][index]['filts'][indexs]['data_type'];
|
||||||
console.log(type);
|
|
||||||
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
if(val != undefined){
|
if(val != undefined){
|
||||||
obj.html(val.title);
|
obj.html(val.title);
|
||||||
@ -333,7 +321,6 @@
|
|||||||
var filtsftvdata=[];
|
var filtsftvdata=[];
|
||||||
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
$(document).off('click','.analysis-overall-situation-add').on('click','.analysis-overall-situation-add',function(){
|
||||||
var screentypedata = groupitemeventsdata;
|
var screentypedata = groupitemeventsdata;
|
||||||
console.log(screentypedata);
|
|
||||||
var drr={
|
var drr={
|
||||||
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
||||||
//"column_id":screentypedata[0]['category'][0]['id'],
|
//"column_id":screentypedata[0]['category'][0]['id'],
|
||||||
@ -378,7 +365,6 @@
|
|||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
var index = obj.attr("data-index");
|
var index = obj.attr("data-index");
|
||||||
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
|
X.querycriteriapop(groupitemeventsdata,'category',offset.left,offset.top+obj.height(),function(val){
|
||||||
console.log(val);
|
|
||||||
obj.html(val.title);
|
obj.html(val.title);
|
||||||
data['eventView']['filts'][index]['columnDesc'] = val.title;
|
data['eventView']['filts'][index]['columnDesc'] = val.title;
|
||||||
data['eventView']['filts'][index]['columnName'] = val.id;
|
data['eventView']['filts'][index]['columnName'] = val.id;
|
||||||
@ -420,7 +406,6 @@
|
|||||||
$(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
|
$(document).off('click','.analysis-overall-situation-date').on('click','.analysis-overall-situation-date',function(){
|
||||||
var index = $(this).attr('data-index');
|
var index = $(this).attr('data-index');
|
||||||
render_date_index = index;
|
render_date_index = index;
|
||||||
// console.log(index);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// 渲染过滤项时间框
|
// 渲染过滤项时间框
|
||||||
@ -445,7 +430,6 @@
|
|||||||
var offset = obj.offset();
|
var offset = obj.offset();
|
||||||
var index = obj.attr("data-index");
|
var index = obj.attr("data-index");
|
||||||
var type = data['eventView']['filts'][index]['data_type'];
|
var type = data['eventView']['filts'][index]['data_type'];
|
||||||
console.log(type);
|
|
||||||
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
$(this).html(val.title);
|
$(this).html(val.title);
|
||||||
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
data['eventView']['filts'][index]['comparator_name'] = val.title;
|
||||||
@ -482,7 +466,9 @@
|
|||||||
'data_type': "string",//类型
|
'data_type': "string",//类型
|
||||||
'tableType': "event",
|
'tableType': "event",
|
||||||
"ftv":"",//条件
|
"ftv":"",//条件
|
||||||
"section":''//区间
|
"section":'',//区间
|
||||||
|
"intervalType":"def",
|
||||||
|
"quotaIntervalArr":[]
|
||||||
};
|
};
|
||||||
data['eventView']['groupBy'].push(arr);
|
data['eventView']['groupBy'].push(arr);
|
||||||
X.template("grouped","shushi",data['eventView']['groupBy']);
|
X.template("grouped","shushi",data['eventView']['groupBy']);
|
||||||
@ -499,7 +485,21 @@
|
|||||||
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
data.eventView.groupBy[index]['columnDesc'] = val.title;
|
||||||
data.eventView.groupBy[index]['columnName'] = val.id;
|
data.eventView.groupBy[index]['columnName'] = val.id;
|
||||||
data.eventView.groupBy[index]['data_type'] = val.type;
|
data.eventView.groupBy[index]['data_type'] = val.type;
|
||||||
data.eventView.groupBy[index]['tableType'] = val.tableType;
|
data.eventView.groupBy[index]['tableType'] = val.table_type;
|
||||||
|
X.template("grouped","shushi",data['eventView']['groupBy']);
|
||||||
|
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
$(document).off('click','.analysis-granularity').on('click','.analysis-granularity',function(){
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
var sectionid = data['eventView']['groupBy'][index];
|
||||||
|
X.parametersopen(sectionid,'groupeditemspop',"auto",function(val){
|
||||||
|
data['eventView']['groupBy'][index]['intervalType'] = val.type;
|
||||||
|
if(val.type == "user_defined"){
|
||||||
|
data['eventView']['groupBy'][index]['quotaIntervalArr'] = val.quotaIntervalArr;
|
||||||
|
}
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -519,7 +519,6 @@
|
|||||||
|
|
||||||
// 时间粒度
|
// 时间粒度
|
||||||
X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){
|
X.laydropdown('.analtsis-timeParticleSize',X['DATA']['companylist']['retention'],function(d){
|
||||||
// console.log(d);
|
|
||||||
$(".analtsis-timeParticleSize").html(d.title);
|
$(".analtsis-timeParticleSize").html(d.title);
|
||||||
data['eventView']['unitNum'] = parseInt(d.id);
|
data['eventView']['unitNum'] = parseInt(d.id);
|
||||||
retaineddata();
|
retaineddata();
|
||||||
@ -546,6 +545,10 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
function retaineddata(){
|
function retaineddata(){
|
||||||
|
var time = $("#retained-condition-date").val();
|
||||||
|
var timearr = time.split(" ");
|
||||||
|
data['eventView']['startTime'] = timearr[0] + " "+"00:00:00";
|
||||||
|
data['eventView']['endTime'] = timearr[2]+" "+"23:59:59";
|
||||||
var dataArr = {
|
var dataArr = {
|
||||||
eventView: data.eventView,
|
eventView: data.eventView,
|
||||||
events: data.events
|
events: data.events
|
||||||
@ -555,6 +558,11 @@
|
|||||||
querydata = d;
|
querydata = d;
|
||||||
updata(d);
|
updata(d);
|
||||||
$(".chawushuj").hide();
|
$(".chawushuj").hide();
|
||||||
|
if(data.eventView.groupBy.length > 0){
|
||||||
|
$(".table-info-list-box").show();
|
||||||
|
}else {
|
||||||
|
$(".table-info-list-box").hide();
|
||||||
|
}
|
||||||
}else {
|
}else {
|
||||||
$("#analysis-echarts").empty();
|
$("#analysis-echarts").empty();
|
||||||
$(".table-fenxi-th").html("");
|
$(".table-fenxi-th").html("");
|
||||||
@ -582,7 +590,6 @@
|
|||||||
|
|
||||||
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
|
$(document).off('click','.analysis-navigation-bar-right-img-baobiao').on('click','.analysis-navigation-bar-right-img-baobiao',function(){
|
||||||
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
|
X.parametersopen(data['eventView']['cksql'],'savedbaobiao','rt',function(d){
|
||||||
console.log(d);
|
|
||||||
if(d){
|
if(d){
|
||||||
backfilldata(d);
|
backfilldata(d);
|
||||||
}
|
}
|
||||||
@ -620,28 +627,6 @@
|
|||||||
function retainedtable(d){
|
function retainedtable(d){
|
||||||
var nname,pname
|
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 titarr = [];
|
|
||||||
// var tablearr = [];
|
|
||||||
// for(let i in filterarr){
|
|
||||||
// var index = Number(filterarr[i]) + 2;
|
|
||||||
// titarr.push(titdata[index]);
|
|
||||||
// }
|
|
||||||
// titarr.unshift(titdata[0],titdata[1]);
|
|
||||||
// console.log(titarr);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(retentiontype == 0) {
|
if(retentiontype == 0) {
|
||||||
nname = 'n';
|
nname = 'n';
|
||||||
pname = 'p';
|
pname = 'p';
|
||||||
@ -661,48 +646,13 @@
|
|||||||
n:0,
|
n:0,
|
||||||
p: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 {
|
|
||||||
nrr["n"] = d['summary_values'][i][nname][j];
|
nrr["n"] = d['summary_values'][i][nname][j];
|
||||||
nrr["p"] = d['summary_values'][i][pname][j]
|
nrr["p"] = d['summary_values'][i][pname][j]
|
||||||
arr['data'].push(nrr);
|
arr['data'].push(nrr);
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
tabledata.push(arr)
|
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);
|
|
||||||
|
|
||||||
// X.fixedTable('table-div-box','row-col-fixed','',headdata);
|
|
||||||
|
|
||||||
|
|
||||||
X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
|
X.laytpldata("#table-fenxi-th-dot",d.title,".table-fenxi-th");
|
||||||
X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
|
X.laytpldata("#table-fenxi-td-dot",tabledata,".table-fenxi-td");
|
||||||
};
|
};
|
||||||
@ -756,7 +706,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log(ydata);
|
|
||||||
// for(let i in ydata){
|
// for(let i in ydata){
|
||||||
// legenddata.push(i);
|
// legenddata.push(i);
|
||||||
// var arr = {
|
// var arr = {
|
||||||
@ -1023,10 +972,24 @@
|
|||||||
|
|
||||||
// 下载
|
// 下载
|
||||||
$(document).off('click','.download-table').on('click','.download-table',function(){
|
$(document).off('click','.download-table').on('click','.download-table',function(){
|
||||||
console.log(11111);
|
|
||||||
X.download('ck/retention_model_export',data,'事件分析');
|
X.download('ck/retention_model_export',data,'事件分析');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).off("click",'.table-info-list-box').on('click','.table-info-list-box',function(){
|
||||||
|
|
||||||
|
var time = $(this).attr("data-time");
|
||||||
|
const dataArr = {
|
||||||
|
eventView: data.eventView,
|
||||||
|
events: data.events,
|
||||||
|
time:time,
|
||||||
|
type: 'retained',
|
||||||
|
retentiontype: retentiontype
|
||||||
|
}
|
||||||
|
X.parametersopen(dataArr,'grouptable','auto')
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@ -343,7 +343,7 @@
|
|||||||
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
"columnName":screentypedata[0]['category'][0]['id'],//事件id
|
||||||
'data_type':screentypedata[0]['category'][0]['data_type'],//类型
|
'data_type':screentypedata[0]['category'][0]['data_type'],//类型
|
||||||
'comparator_name':'等于',//默认等于
|
'comparator_name':'等于',//默认等于
|
||||||
"comparator_id":'==',//符号id
|
"comparator":'==',//符号id
|
||||||
"ftv":[],//条件
|
"ftv":[],//条件
|
||||||
"strftv":'',//显示条件
|
"strftv":'',//显示条件
|
||||||
"section":[-1,1],//区间
|
"section":[-1,1],//区间
|
||||||
@ -386,7 +386,7 @@
|
|||||||
if(val != undefined){
|
if(val != undefined){
|
||||||
obj.html(val.title);
|
obj.html(val.title);
|
||||||
data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
|
data['events']['user_filter']['filts'][index]['comparator_name'] = val.title;
|
||||||
data['events']['user_filter']['filts'][index]['comparator_id'] = val.id;
|
data['events']['user_filter']['filts'][index]['comparator'] = val.id;
|
||||||
if(val.id == "range"){
|
if(val.id == "range"){
|
||||||
data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
|
data['events']['user_filter']['filts'][index]['ftv'] = [-1,1];
|
||||||
}
|
}
|
||||||
@ -421,6 +421,42 @@
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
$(document).off("click",".analysis-overall-situation-input").on("click",".analysis-overall-situation-input",function(event){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
var comparator = obj.attr("data-comparator");
|
||||||
|
var columnName = data['events']['user_filter']['filts'][index]['columnName'];
|
||||||
|
|
||||||
|
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
|
||||||
|
if(val != "查无数据"){
|
||||||
|
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
|
||||||
|
if(comparator == "in"){
|
||||||
|
if(data['events']['user_filter']['filts'][index]['strftv'] == "" ){
|
||||||
|
var strftv = val.title;
|
||||||
|
data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}else {
|
||||||
|
var strftv = data['events']['user_filter']['filts'][index]['strftv'] + "," + val.title;
|
||||||
|
data['events']['user_filter']['filts'][index]['ftv'].push(val.id);
|
||||||
|
}
|
||||||
|
data['events']['user_filter']['filts'][index]['strftv'] = strftv;
|
||||||
|
}else {
|
||||||
|
data['events']['user_filter']['filts'][index]['strftv'] = val.title;
|
||||||
|
var arr = [];
|
||||||
|
arr.push(val.id);
|
||||||
|
data['events']['user_filter']['filts'][index]['ftv'] = arr;
|
||||||
|
}
|
||||||
|
|
||||||
|
X.template("globalfilter","xinwei-whole",data['events']['user_filter']['filts'],function(){
|
||||||
|
renderdate()
|
||||||
|
});
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
$(document).off('blur','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
|
||||||
var index = $(this).attr('data-index');
|
var index = $(this).attr('data-index');
|
||||||
var val = $(this).val();
|
var val = $(this).val();
|
||||||
|
|||||||
@ -61,20 +61,21 @@
|
|||||||
uce_calcu_symbolDesc: "等于",
|
uce_calcu_symbolDesc: "等于",
|
||||||
prop_quota: {analysis: '', analysisDesc: '', quota: retdata[0]['id'], quotaDesc: retdata[0]["title"],quota_type: null},
|
prop_quota: {analysis: '', analysisDesc: '', quota: retdata[0]['id'], quotaDesc: retdata[0]["title"],quota_type: null},
|
||||||
is_touch: true,
|
is_touch: true,
|
||||||
|
is_time: false
|
||||||
}
|
}
|
||||||
data['qp']['user_cluster_def']['events'].push(arr);
|
data['qp']['user_cluster_def']['events'].push(arr);
|
||||||
}else {
|
}else {
|
||||||
arr = {
|
arr = {
|
||||||
calcuSymbol: "C01",
|
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
|
||||||
columnDesc: "",
|
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
|
||||||
columnName: "lv",
|
'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
|
||||||
columnType: "double",
|
'comparator_name':'等于',//默认等于
|
||||||
filterType: "SIMPLE",
|
"comparator":'==',//符号id
|
||||||
ftv: ["10"],
|
"ftv":[],//条件
|
||||||
selectType: "number",
|
"strftv":'',//显示条件
|
||||||
tableType: "1",
|
"section":[-1,1],//区间
|
||||||
timeRelative: "",
|
"tableType":defaultgroupdata[0]['id'],
|
||||||
timeUnit: ""
|
"filts": []
|
||||||
}
|
}
|
||||||
data['qp']['user_cluster_def']['filts'].push(arr);
|
data['qp']['user_cluster_def']['filts'].push(arr);
|
||||||
}
|
}
|
||||||
@ -213,6 +214,97 @@
|
|||||||
updatalable();
|
updatalable();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".action-icon-time").on('click','.action-icon-time',function(){
|
||||||
|
var index = $(this).attr("data-index");
|
||||||
|
data['qp']['user_cluster_def']['events'][index]['is_time'] = !data['qp']['user_cluster_def']['events'][index]['is_time'];
|
||||||
|
updatalable();
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".ta-property-select").on("click",".ta-property-select",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".user-attribute").on("click",".user-attribute",function(){
|
||||||
|
var obj =$(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
X.querycriteriapop(defaultgroupdata,'category',offset.left,offset.top+obj.height(),function(val){
|
||||||
|
console.log(val);
|
||||||
|
$(this).html(val.title);
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['columnName'] = val.id;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['columnDesc'] = val.title;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['data_type'] = val.type;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['tableType'] = val.table_type;
|
||||||
|
updatalable();
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".user-attribute-filter").on("click",".user-attribute-filter",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
var type = data['qp']['user_cluster_def']['filts'][index]['data_type'];
|
||||||
|
console.log()
|
||||||
|
X.parametersopen(filter_map[type],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
$(this).html(val.title);
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['comparator_name'] = val.title;
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['comparator'] = val.id;
|
||||||
|
if(val.id == "range"){
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['ftv'] = [-1,1];
|
||||||
|
}
|
||||||
|
updatalable();
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off('click','.userattrfilts').on('click','.userattrfilts',function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
var type = obj.attr("data-type");
|
||||||
|
var arr = {
|
||||||
|
"columnDesc":defaultgroupdata[0]['category'][0]['title'],//事件中文显示 columnDesc
|
||||||
|
"columnName":defaultgroupdata[0]['category'][0]['id'],//事件id
|
||||||
|
'data_type':defaultgroupdata[0]['category'][0]['data_type'],//类型
|
||||||
|
'comparator_name':'等于',//默认等于
|
||||||
|
"comparator":'==',//符号id
|
||||||
|
"ftv":[],//条件
|
||||||
|
"strftv":'',//显示条件
|
||||||
|
"section":[-1,1],//区间
|
||||||
|
"tableType":defaultgroupdata[0]['id']
|
||||||
|
}
|
||||||
|
if(type == 'userattr'){
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['filts'].push(arr);
|
||||||
|
}else {
|
||||||
|
data['qp']['user_cluster_def']['events'][index]['filts'].push(arr);
|
||||||
|
}
|
||||||
|
console.log(data);
|
||||||
|
X.laytpldata('#userlabel-json-box-dot',data['qp']['user_cluster_def'],'.userlabel-json-box');
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).off("click",".taDragDisable").on("click",".taDragDisable",function(){
|
||||||
|
var obj = $(this);
|
||||||
|
var offset = obj.offset();
|
||||||
|
var index = obj.attr("data-index");
|
||||||
|
var columnName = data['qp']['user_cluster_def']['filts'][index]['columnName']
|
||||||
|
|
||||||
|
X.api("data_mana/select_attr","post",{attr_name:columnName},function(val){
|
||||||
|
if(val != "查无数据"){
|
||||||
|
|
||||||
|
X.parametersopen(val['map_'],'dropdownlist',[offset.top+obj.height(),offset.left],function(val){
|
||||||
|
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['strftv'] = val.title;
|
||||||
|
var arr = [];
|
||||||
|
arr.push(val.id);
|
||||||
|
data['qp']['user_cluster_def']['filts'][index]['ftv'] = arr;
|
||||||
|
updatalable();
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
$(document).off("click",'.userlabel-dy-baocun').on("click",".userlabel-dy-baocun",function(){
|
$(document).off("click",'.userlabel-dy-baocun').on("click",".userlabel-dy-baocun",function(){
|
||||||
var lablename = $(".lablename").val();
|
var lablename = $(".lablename").val();
|
||||||
var labledesc = $(".labledesc").val();
|
var labledesc = $(".labledesc").val();
|
||||||
@ -228,6 +320,7 @@
|
|||||||
data['cluster_name'] = lablename;
|
data['cluster_name'] = lablename;
|
||||||
data['display_name'] = labledesc;
|
data['display_name'] = labledesc;
|
||||||
data['remarks'] = labeldes;
|
data['remarks'] = labeldes;
|
||||||
|
|
||||||
X.api('user_label/save','post',data,function(d){
|
X.api('user_label/save','post',data,function(d){
|
||||||
layer.msg("添加成功");
|
layer.msg("添加成功");
|
||||||
})
|
})
|
||||||
|
|||||||
@ -305,7 +305,7 @@
|
|||||||
.table-fenxi-box { width: 100%; }
|
.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 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 { 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: 7px 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; height: 35px; 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; */
|
/* white-space:pre-wrap; */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,9 +28,10 @@
|
|||||||
.layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; }
|
.layui-laydate .layui-this { background-color: rgba(89, 120, 249, 1) !important; }
|
||||||
.layui-laypage-em { background-color: #3d90ff !important; }
|
.layui-laypage-em { background-color: #3d90ff !important; }
|
||||||
.layui-table-cell { height: auto; }
|
.layui-table-cell { height: auto; }
|
||||||
.nav-list-box { overflow-y: auto; height: 100%; }
|
.nav-list-box { overflow-y: auto; height: calc(100% - 60px ); }
|
||||||
.importuser-con-box .layui-select-title { width: auto; }
|
.importuser-con-box .layui-select-title { width: auto; }
|
||||||
.importuser-con-box .layui-form-selected dl { max-height: 160px; }
|
.importuser-con-box .layui-form-selected dl { max-height: 160px; }
|
||||||
|
.layui-col-md6 {height: 409px;}
|
||||||
|
|
||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
width:0px;
|
width:0px;
|
||||||
|
|||||||
@ -54,6 +54,12 @@
|
|||||||
<div class="content unicode" style="display: block;">
|
<div class="content unicode" style="display: block;">
|
||||||
<ul class="icon_lists dib-box">
|
<ul class="icon_lists dib-box">
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont"></span>
|
||||||
|
<div class="name">时间</div>
|
||||||
|
<div class="code-name">&#xe8b8;</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li class="dib">
|
<li class="dib">
|
||||||
<span class="icon iconfont"></span>
|
<span class="icon iconfont"></span>
|
||||||
<div class="name">过滤</div>
|
<div class="name">过滤</div>
|
||||||
@ -168,9 +174,9 @@
|
|||||||
<pre><code class="language-css"
|
<pre><code class="language-css"
|
||||||
>@font-face {
|
>@font-face {
|
||||||
font-family: 'iconfont';
|
font-family: 'iconfont';
|
||||||
src: url('iconfont.woff2?t=1634286267600') format('woff2'),
|
src: url('iconfont.woff2?t=1655362654795') format('woff2'),
|
||||||
url('iconfont.woff?t=1634286267600') format('woff'),
|
url('iconfont.woff?t=1655362654795') format('woff'),
|
||||||
url('iconfont.ttf?t=1634286267600') format('truetype');
|
url('iconfont.ttf?t=1655362654795') format('truetype');
|
||||||
}
|
}
|
||||||
</code></pre>
|
</code></pre>
|
||||||
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
|
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
|
||||||
@ -196,6 +202,15 @@
|
|||||||
<div class="content font-class">
|
<div class="content font-class">
|
||||||
<ul class="icon_lists dib-box">
|
<ul class="icon_lists dib-box">
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont icon-shijian"></span>
|
||||||
|
<div class="name">
|
||||||
|
时间
|
||||||
|
</div>
|
||||||
|
<div class="code-name">.icon-shijian
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li class="dib">
|
<li class="dib">
|
||||||
<span class="icon iconfont icon-guolv"></span>
|
<span class="icon iconfont icon-guolv"></span>
|
||||||
<div class="name">
|
<div class="name">
|
||||||
@ -367,6 +382,14 @@
|
|||||||
<div class="content symbol">
|
<div class="content symbol">
|
||||||
<ul class="icon_lists dib-box">
|
<ul class="icon_lists dib-box">
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<svg class="icon svg-icon" aria-hidden="true">
|
||||||
|
<use xlink:href="#icon-shijian"></use>
|
||||||
|
</svg>
|
||||||
|
<div class="name">时间</div>
|
||||||
|
<div class="code-name">#icon-shijian</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li class="dib">
|
<li class="dib">
|
||||||
<svg class="icon svg-icon" aria-hidden="true">
|
<svg class="icon svg-icon" aria-hidden="true">
|
||||||
<use xlink:href="#icon-guolv"></use>
|
<use xlink:href="#icon-guolv"></use>
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
@font-face {
|
@font-face {
|
||||||
font-family: "iconfont"; /* Project id 2570810 */
|
font-family: "iconfont"; /* Project id 2570810 */
|
||||||
src: url('iconfont.woff2?t=1634286267600') format('woff2'),
|
src: url('iconfont.woff2?t=1655362654795') format('woff2'),
|
||||||
url('iconfont.woff?t=1634286267600') format('woff'),
|
url('iconfont.woff?t=1655362654795') format('woff'),
|
||||||
url('iconfont.ttf?t=1634286267600') format('truetype');
|
url('iconfont.ttf?t=1655362654795') format('truetype');
|
||||||
}
|
}
|
||||||
|
|
||||||
.iconfont {
|
.iconfont {
|
||||||
@ -13,6 +13,10 @@
|
|||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.icon-shijian:before {
|
||||||
|
content: "\e8b8";
|
||||||
|
}
|
||||||
|
|
||||||
.icon-guolv:before {
|
.icon-guolv:before {
|
||||||
content: "\e683";
|
content: "\e683";
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -5,6 +5,13 @@
|
|||||||
"css_prefix_text": "icon-",
|
"css_prefix_text": "icon-",
|
||||||
"description": "",
|
"description": "",
|
||||||
"glyphs": [
|
"glyphs": [
|
||||||
|
{
|
||||||
|
"icon_id": "11372699",
|
||||||
|
"name": "时间",
|
||||||
|
"font_class": "shijian",
|
||||||
|
"unicode": "e8b8",
|
||||||
|
"unicode_decimal": 59576
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"icon_id": "3369493",
|
"icon_id": "3369493",
|
||||||
"name": "过滤",
|
"name": "过滤",
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user