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

添加看板筛选标记可查看筛选项

Browse Source
This commit is contained in:
罗松柏 2022-01-06 10:11:24 +08:00
parent 81fcb448ad
commit e8d566fd1c
8 changed files with 169 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pages/dashboard.html
View File

@ -674,6 +674,7 @@
</div>
<div class="tishi tishi-tjsx" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" title="条件筛选">
<img src="./static/img/guolv.png" />
<div class='guolv-dian'></div>
</div>
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />
@ -711,6 +712,7 @@
</div>
<div class="tishi tishi-tjsx" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" title="条件筛选">
<img src="./static/img/guolv.png" />
<div class='guolv-dian'></div>
</div>
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />

19
web/pages/modeltype.html
View File

@ -30,9 +30,15 @@
{{# } }}
</div>
{{# if(d.authority == "rw"){ }}
<div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
<img src="./static/img/qvshitu.png" /> <span>报表</span>
<div class="card-tow-right">
<div class="shaixjeiguo" title="查看筛选条件" data-id="{{d.id}}">
<img src="./static/img/jeiguo.png">
</div>
<div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
<img src="./static/img/qvshitu.png" /> <span>报表</span>
</div>
</div>
{{# } }}
</div>
<div class="conent-box" id="conent-box{{d.id}}">
@ -61,8 +67,13 @@
</div>
{{# if(d.authority == "rw"){ }}
<div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
<img src="./static/img/qvshitu.png" /> <span>趋势图</span>
<div class="card-tow-right">
<div class="shaixjeiguo" title="查看筛选条件" data-id="{{d.id}}">
<img src="./static/img/jeiguo.png">
</div>
<div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
<img src="./static/img/qvshitu.png" /> <span>趋势图</span>
</div>
</div>
{{# } }}
</div>

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

@ -123,7 +123,8 @@ var X = window.X || {
'retentionlist' : [
{'title':'留存','id':0},
{'title':'流失','id':1},
]
],
'screenlist':[]
},
};
@ -5952,6 +5953,7 @@ var X = window.X || {
//更新时间按钮
$(".updatetime").click(function(){
X['DATA']['screenlist'] = [];
X.updatatime(".updatetime");
me.gettabledata();
});
@ -6029,6 +6031,7 @@ var X = window.X || {
$(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){
var obj = $(this);
var id = obj.attr('data-id');
var screenlist;
var cat = obj.attr('data-cat');
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
@ -6039,6 +6042,13 @@ var X = window.X || {
var timetxtarr = timetxt.split(" - ");
var startTime = timetxtarr[0] + " "+ "00:00:00";
var endTime = timetxtarr[1]+ " "+ "23:59:59";
for(let i in X.DATA['screenlist']){
if(id == X.DATA['screenlist'][i]['id']){
screenlist = X.DATA['screenlist'][i];
}
}
X.open({
type: 1,
title: false,
@ -6047,14 +6057,22 @@ var X = window.X || {
shadeClose: true,
offset: [120,270],
url: "screen",
extData : id,
extData : screenlist,
callback : function(d){
d['startTime'] = startTime;
d['endTime']=endTime;
d['id'] = id;
var dataArr = {
report_id : id,
ext_filter : d
}
X.DATA['screenlist'].push(d);
for(let i in X.DATA['screenlist']){
var cardid = "model"+X.DATA['screenlist'][i]['id'];
$("#"+cardid+" .shaixjeiguo").show();
}
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
if(vals == '查无数据'){
layer.msg('筛选条件无数据');
@ -6083,6 +6101,28 @@ var X = window.X || {
})
});
$(document).off('click','.shaixjeiguo').on('click','.shaixjeiguo',function(){
var id = $(this).attr('data-id');
var filts
for(let i in X.DATA.screenlist){
if(X.DATA.screenlist[i]['id'] == id){
filts = X.DATA.screenlist[i]['filts'];
}
}
var filtshtml = ''
if(filts.length > 0){
for(let i in filts){
filtshtml+= filts[i]['columnDesc'] + filts[i]['comparator_name'] + filts[i]['strftv'] + '<br>'
}
}
layui.layer.tips(filtshtml, '.shaixjeiguo', {
tips: [4, '#475285']
});
})
// 侧边栏搜索
$('.sousuo-txt').bind('input propertychange', function() {
var tit = $(this).val()
@ -6190,6 +6230,11 @@ var X = window.X || {
//更新报表
$(document).off('click','.model-gengx').on('click','.model-gengx',function(){
var id = $(this).attr('data-id');
for(let i in X['DATA']['screenlist']){
if(X['DATA']['screenlist'][i]['id'] == id){
X['DATA']['screenlist'].splice(i,1);
}
}
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
// return;
X.pageLogic['dashboard'].fillmodeldata(d[id]);
@ -7132,6 +7177,7 @@ var X = window.X || {
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
// console.log(d[q]);
X.pageLogic['dashboard'].fillmodeldata(d[q]);
}
}
@ -13216,6 +13262,25 @@ var X = window.X || {
this.callback = parms.callback; //选择后执行的回调
var reportid = parms.extData;//获取到上层弹窗传的数据
//默认开始时有一个数据
var data = {
'filts':[],
'relation':'and'
};
// if(reportid){
// data = reportid;
// if(reportid.relation == 'and'){
// $('.screen-left-qei').html("且");
// }else {
// $('.screen-left-qei').html("或");
// }
// if(reportid['filts'].length > 1){
// $('.screen-left-qei').show();
// }
// X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){
// renderdate();
// });
// }
var my_event,load_filter_props,filter_map;
X.api("data_auth/my_event","get",{},function(d){
@ -13224,10 +13289,9 @@ var X = window.X || {
load_filter_props = val;
X.api("data_auth/filter_map","get",{},function(d){
filter_map = d;
// console.log(my_event);
// console.log(load_filter_props);
// console.log(filter_map);
updatascreencon();
// if(!reportid){
updatascreencon();
// }
})
})
});
@ -13260,12 +13324,6 @@ var X = window.X || {
}
});
//默认开始时有一个数据
var data = {
'filts':[],
'relation':'and'
};
function updatascreencon(){
var drr={
"columnName":load_filter_props[0]['category'][0]['id'],//事件id
@ -13278,7 +13336,9 @@ var X = window.X || {
"section":[-1,1],//区间
"tableType":load_filter_props[0]['id']
};
data['filts'].push(drr);
X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){
renderdate();
});

3
web/srczip/common.js
View File

@ -122,7 +122,8 @@ var X = window.X || {
'retentionlist' : [
{'title':'留存','id':0},
{'title':'流失','id':1},
]
],
'screenlist':[]
},
};

47
web/srczip/logic/dashboard.js
View File

@ -119,6 +119,7 @@
//更新时间按钮
$(".updatetime").click(function(){
X['DATA']['screenlist'] = [];
X.updatatime(".updatetime");
me.gettabledata();
});
@ -196,6 +197,7 @@
$(document).off('click','.tishi-tjsx').on('click','.tishi-tjsx',function(){
var obj = $(this);
var id = obj.attr('data-id');
var screenlist;
var cat = obj.attr('data-cat');
var modelsize = obj.attr('data-modelsize');
var modeltype = obj.attr('data-modeltype');
@ -206,6 +208,13 @@
var timetxtarr = timetxt.split(" - ");
var startTime = timetxtarr[0] + " "+ "00:00:00";
var endTime = timetxtarr[1]+ " "+ "23:59:59";
for(let i in X.DATA['screenlist']){
if(id == X.DATA['screenlist'][i]['id']){
screenlist = X.DATA['screenlist'][i];
}
}
X.open({
type: 1,
title: false,
@ -214,14 +223,22 @@
shadeClose: true,
offset: [120,270],
url: "screen",
extData : id,
extData : screenlist,
callback : function(d){
d['startTime'] = startTime;
d['endTime']=endTime;
d['id'] = id;
var dataArr = {
report_id : id,
ext_filter : d
}
X.DATA['screenlist'].push(d);
for(let i in X.DATA['screenlist']){
var cardid = "model"+X.DATA['screenlist'][i]['id'];
$("#"+cardid+" .shaixjeiguo").show();
}
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
if(vals == '查无数据'){
layer.msg('筛选条件无数据');
@ -250,6 +267,28 @@
})
});
$(document).off('click','.shaixjeiguo').on('click','.shaixjeiguo',function(){
var id = $(this).attr('data-id');
var filts
for(let i in X.DATA.screenlist){
if(X.DATA.screenlist[i]['id'] == id){
filts = X.DATA.screenlist[i]['filts'];
}
}
var filtshtml = ''
if(filts.length > 0){
for(let i in filts){
filtshtml+= filts[i]['columnDesc'] + filts[i]['comparator_name'] + filts[i]['strftv'] + '<br>'
}
}
layui.layer.tips(filtshtml, '.shaixjeiguo', {
tips: [4, '#475285']
});
})
// 侧边栏搜索
$('.sousuo-txt').bind('input propertychange', function() {
var tit = $(this).val()
@ -357,6 +396,11 @@
//更新报表
$(document).off('click','.model-gengx').on('click','.model-gengx',function(){
var id = $(this).attr('data-id');
for(let i in X['DATA']['screenlist']){
if(X['DATA']['screenlist'][i]['id'] == id){
X['DATA']['screenlist'].splice(i,1);
}
}
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
// return;
X.pageLogic['dashboard'].fillmodeldata(d[id]);
@ -1299,6 +1343,7 @@
//当外框和标题渲染完在渲染数据
if(num == Object.getOwnPropertyNames(d).length){
for(let q in d){
// console.log(d[q]);
X.pageLogic['dashboard'].fillmodeldata(d[q]);
}
}

34
web/srczip/logic/screen.js
View File

@ -8,6 +8,25 @@
this.callback = parms.callback; //选择后执行的回调
var reportid = parms.extData;//获取到上层弹窗传的数据
//默认开始时有一个数据
var data = {
'filts':[],
'relation':'and'
};
// if(reportid){
// data = reportid;
// if(reportid.relation == 'and'){
// $('.screen-left-qei').html("且");
// }else {
// $('.screen-left-qei').html("或");
// }
// if(reportid['filts'].length > 1){
// $('.screen-left-qei').show();
// }
// X.laytpldata("#screen-con-box-dot",reportid['filts'],".screen-con-box",function(){
// renderdate();
// });
// }
var my_event,load_filter_props,filter_map;
X.api("data_auth/my_event","get",{},function(d){
@ -16,10 +35,9 @@
load_filter_props = val;
X.api("data_auth/filter_map","get",{},function(d){
filter_map = d;
// console.log(my_event);
// console.log(load_filter_props);
// console.log(filter_map);
updatascreencon();
// if(!reportid){
updatascreencon();
// }
})
})
});
@ -52,12 +70,6 @@
}
});
//默认开始时有一个数据
var data = {
'filts':[],
'relation':'and'
};
function updatascreencon(){
var drr={
"columnName":load_filter_props[0]['category'][0]['id'],//事件id
@ -70,7 +82,9 @@
"section":[-1,1],//区间
"tableType":load_filter_props[0]['id']
};
data['filts'].push(drr);
X.laytpldata("#screen-con-box-dot",data['filts'],".screen-con-box",function(){
renderdate();
});

6
web/static/css/style.css
View File

@ -104,6 +104,12 @@
font-weight: bold;
}
.guolv-dian { width: 5px; height: 5px; border-radius: 50%; background-color: red; position: relative; top: -20px; left: 20px; display: none; }
.card-tow-right { display: flex; align-items: center; }
.shaixjeiguo { padding: 3px 5px; cursor: pointer; display: none; }
.shaixjeiguo img{ width: 16px; height: 16px; }
.shaixjeiguo:hover { background-color: #f0f2f5; }
.username { color: #67729d; margin-right: 16px; }
.layui-project { position:absolute; top: 0; left: 80px; ;}
.layui-nav-bar { width: 0px !important; height: 0px !important; }

BIN
web/static/img/jeiguo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB