leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
This commit is contained in:
罗松柏 2022-05-06 15:16:46 +08:00
parent 6b9dc19a4b
commit 3d0bf51936
10 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pages/3rmodel.html
View File

@ -301,7 +301,7 @@
<!-- {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
<div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}"> <input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
<!-- {{# } }} -->
<div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
<div class="analysis-zhibiao-list-del 3rmodel-analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
</div>
{{# }); }}
</div>

6
web/pages/analysis.html
View File

@ -307,7 +307,7 @@
</div>
{{# } }}
<!-- {{# } }} -->
<div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
<div class="analysis-zhibiao-list-del onclick-analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
</div>
{{# }); }}
</div>
@ -361,7 +361,7 @@
<!-- {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
<div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}" data-index="{{index}}" data-indexs="{{indexs}}" data-comparator="{{item.comparator}}"> <input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}" data-comparator="{{item.comparator}}"> </div>
<!-- {{# } }} -->
<div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
<div class="analysis-zhibiao-list-del onclick-analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
</div>
{{# }); }}
</div>
@ -380,7 +380,7 @@
</div>
<!-- 操作按钮 -->
<div class="analysis-con-left-screen-list-right-box">
<div class="analysis-con-left-screen-list-right-box analysis-fenxi-left-box">
<div class="analysis-con-left-screen-list-right" id="analysis-con-left-screen-list-right-{{index}}">
<div class="analysis-chongmingming" data-index="{{index}}" title="重命名指标"></div>
<div class="analysis-chongmingming-del" data-index="{{index}}" title="取消重命名"></div>

2
web/pages/funnel.html
View File

@ -35,7 +35,7 @@
<!-- {{# if(item.comparator_id != "is null" && item.comparator_id != "is not null" && item.comparator_id !="not null" && item.comparator_id != "range"){ }} -->
<div class="analysis-zhibiao-list-type4" id="analysis-zhibiao-list-type4-{{index}}-{{indexs}}"> <input type="text" data-index="{{index}}" data-indexs="{{indexs}}" placeholder="多个条件用,隔开" value="{{items.strftv}}"> </div>
<!-- {{# } }} -->
<div class="analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
<div class="analysis-zhibiao-list-del funnel-analysis-zhibiao-list-del" data-index="{{index}}" data-twonum="{{indexs}}"></div>
</div>
{{# }); }}
</div>

25
web/src/x.min.js vendored
View File

@ -1999,7 +1999,7 @@ var X = window.X || {
});
// 删除二级筛选项
$(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
$(document).off('click','.3rmodel-analysis-zhibiao-list-del').on('click','.3rmodel-analysis-zhibiao-list-del',function(){
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
// $("#"+id).remove();
var index = $(this).attr("data-index");
@ -4169,7 +4169,7 @@ var X = window.X || {
});
// 删除二级筛选项
$(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
$(document).off('click','.onclick-analysis-zhibiao-list-del').on('click','.onclick-analysis-zhibiao-list-del',function(){
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
// $("#"+id).remove();
var index = $(this).attr("data-index");
@ -9497,7 +9497,7 @@ var X = window.X || {
"comparatorName":"等于",
"ftv":[],
"strftv":"",
"table_type":groupitemeventsdata[0]['category'][0]['data_type'],
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
"timeUnit":""
}
data['events'][index]['filts'].push(arr);
@ -9518,7 +9518,7 @@ var X = window.X || {
});
//删除指定筛选
$(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
$(document).off('click','.funnel-analysis-zhibiao-list-del').on('click','.funnel-analysis-zhibiao-list-del',function(){
var index = $(this).attr("data-index");
var indexs = $(this).attr("data-twonum");
data['events'][index]['filts'].splice(indexs,1);
@ -9560,7 +9560,7 @@ var X = window.X || {
data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
data['events'][index]['filts'][indexs]['columnName'] = val.id;
data['events'][index]['filts'][indexs]['data_type'] = val.type;
data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
})
});
@ -13494,7 +13494,7 @@ var X = window.X || {
// 添加筛选项
function addscreen(index){
console.log(groupitemeventsdata);
var arr = {
"columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
@ -13688,6 +13688,13 @@ var X = window.X || {
}
});
$(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
var index = $(this).attr('data-twonum');
data['events']['source_event']['filts'].splice(index,1);
X.template("route","event-roue-event",data['events']['source_event']);
});
// 时间粒度
var timeParticleSizearr = [
{'title':'秒','id':'second'},
@ -13816,6 +13823,12 @@ var X = window.X || {
}
]
});
// 图表单击事件
myChart.setOption(option);
myChart.on('click', function (params) {
console.log(params);
});
};
// 返回

2
web/srczip/logic/3rmodel.js
View File

@ -392,7 +392,7 @@
});
// 删除二级筛选项
$(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
$(document).off('click','.3rmodel-analysis-zhibiao-list-del').on('click','.3rmodel-analysis-zhibiao-list-del',function(){
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
// $("#"+id).remove();
var index = $(this).attr("data-index");

2
web/srczip/logic/analysis.js
View File

@ -487,7 +487,7 @@
});
// 删除二级筛选项
$(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
$(document).off('click','.onclick-analysis-zhibiao-list-del').on('click','.onclick-analysis-zhibiao-list-del',function(){
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
// $("#"+id).remove();
var index = $(this).attr("data-index");

6
web/srczip/logic/funnelanalysis.js
View File

@ -160,7 +160,7 @@
"comparatorName":"等于",
"ftv":[],
"strftv":"",
"table_type":groupitemeventsdata[0]['category'][0]['data_type'],
"tableType":groupitemeventsdata[0]['category'][0]['data_type'],
"timeUnit":""
}
data['events'][index]['filts'].push(arr);
@ -181,7 +181,7 @@
});
//删除指定筛选
$(document).off('click','.analysis-zhibiao-list-del').on('click','.analysis-zhibiao-list-del',function(){
$(document).off('click','.funnel-analysis-zhibiao-list-del').on('click','.funnel-analysis-zhibiao-list-del',function(){
var index = $(this).attr("data-index");
var indexs = $(this).attr("data-twonum");
data['events'][index]['filts'].splice(indexs,1);
@ -223,7 +223,7 @@
data['events'][index]['filts'][indexs]['columnDesc'] = htmlstring;
data['events'][index]['filts'][indexs]['columnName'] = val.id;
data['events'][index]['filts'][indexs]['data_type'] = val.type;
data['events'][index]['filts'][indexs]['table_type'] = val.table_type;
data['events'][index]['filts'][indexs]['tableType'] = val.table_type;
})
});

15
web/srczip/logic/routeanalysis.js
View File

@ -181,7 +181,7 @@
// 添加筛选项
function addscreen(index){
console.log(groupitemeventsdata);
var arr = {
"columnDesc":groupitemeventsdata[0]['category'][0]['title'],//事件中文显示
"columnName":groupitemeventsdata[0]['category'][0]['id'],//事件id
@ -375,6 +375,13 @@
}
});
$(document).off('click','.analysis-zhibiao-list-del-initial-event').on('click','.analysis-zhibiao-list-del-initial-event',function(){
var index = $(this).attr('data-twonum');
data['events']['source_event']['filts'].splice(index,1);
X.template("route","event-roue-event",data['events']['source_event']);
});
// 时间粒度
var timeParticleSizearr = [
{'title':'秒','id':'second'},
@ -503,6 +510,12 @@
}
]
});
// 图表单击事件
myChart.setOption(option);
myChart.on('click', function (params) {
console.log(params);
});
};
// 返回

5
web/static/css/analysis.css
View File

@ -56,7 +56,10 @@
.analysis-background { border: 1px solid #f0f2f5; background-color: #fff !important; }
/* .analysis-con-left-screen-list:hover > .analysis-zhibiao-list .analysis-zhibiao-list-type2 { background-color: #ffffff; }
.analysis-con-left-screen-list:hover > .analysis-zhibiao-list .analysis-zhibiao-list-type1 { background-color: #ffffff; } */
.analysis-con-left-screen-list:hover > .analysis-con-left-screen-list-right-box{ display: block; margin-left: 286px; margin-top: 8px; }
.analysis-con-left-screen-list:hover > .analysis-con-left-screen-list-right-box{ display: block; margin-top: 8px; }
.analysis-fenxi-left-box { margin-left: 286px; }
.analysis-echarts { width: 100%; height: 400px; }
.eventsplit:hover { color: #4fa1ff; cursor: pointer; }
.eventsplit-box { padding: 0 8px; margin: 8px 8px; font-size: 13px; margin-bottom: 0; background-color: #f0f2f5; }