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

1

Browse Source
This commit is contained in:
罗松柏 2021-11-15 14:51:27 +08:00
parent a92b36fd8b
commit a8ffcbc351
5 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pages/analysis.html
View File

@ -326,7 +326,7 @@
<div class="analysis-con-left-screen-list-right-screen-qh"> <div class="analysis-con-left-screen-list-right-screen-qh">
<div class="analysis-con-left-screen-list-right-screen-qh-xian"></div> <div class="analysis-con-left-screen-list-right-screen-qh-xian"></div>
{{# if(item.filts.length > 1){ }} {{# if(item.filts.length > 1){ }}
{{# if(item.condrelation === "and"){ }} {{# if(item.relation === "and"){ }}
<div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">且</div> <div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">且</div>
{{# } else { }} {{# } else { }}
<div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">或</div> <div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">或</div>

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

@ -3852,7 +3852,7 @@ var X = window.X || {
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum"); // var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
// $("#"+id).remove(); // $("#"+id).remove();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs"); var indexs = $(this).attr("data-twonum");
// filtersymbols[index].splice(indexs,1); // filtersymbols[index].splice(indexs,1);
data.events[index]['filts'].splice(indexs,1); data.events[index]['filts'].splice(indexs,1);
updataindex(data.events); updataindex(data.events);
@ -5718,32 +5718,36 @@ var X = window.X || {
url: "screen", url: "screen",
extData : id, extData : id,
callback : function(d){ callback : function(d){
d['startTime'] = startTime;
d['endTime']=endTime;
var dataArr = { var dataArr = {
report_id : id, report_id : id,
ext_filter : d, ext_filter : d
startTime: startTime,
endTime:endTime
} }
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){ X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
if(vals == null){ if(vals == null){
layer.msg('查无数据'); layer.msg('查无数据');
return; return;
} }
var bbsetdata = { var report_id = [];
graph_size:modelsize, report_id.push(id);
graph_type:modeltype, X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:report_id,dashboard_id:X.DATA.dashboard_id},function(q){
model:cat, var bbsetdata = {
name:name, graph_size:modelsize,
report_id:id graph_type:modeltype,
} model:cat,
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals); name:name,
//渲染模板和数据 report_id:id,
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){ modelswitch:q[0].show_config.modelswitch,
X.pageLogic['dashboard'].morefeatures(modeldata[0]); ascending:q[0].show_config.ascending
}); }
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
//渲染模板和数据
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
});
})
}) })
} }
}) })
}); });
@ -6156,11 +6160,9 @@ var X = window.X || {
var arr = []; var arr = [];
arr.push(id); arr.push(id);
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){ X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){
console.log(d);
var arr = { var arr = {
"eventView": d[0]['query']['eventView'], "eventView": d[0]['query']['eventView'],
"events": d[0]['query']['events'], "events": d[0]['query']['events'],
// "report_id": id,
} }
var dateid = "times"+id; var dateid = "times"+id;
var time = $("#"+dateid).html(); var time = $("#"+dateid).html();
@ -7503,6 +7505,12 @@ var X = window.X || {
if(d){ if(d){
baobiaodata = d; baobiaodata = d;
data = d.query; data = d.query;
// 数据看板点进来时吧保存的时间初始化为当前时间
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";
X.template("userpar","userpar-event",data['events']); X.template("userpar","userpar-event",data['events']);
X.template("grouped","shushi",data['eventView']['groupBy']); X.template("grouped","shushi",data['eventView']['groupBy']);
distributiondata(); distributiondata();
@ -7590,7 +7598,7 @@ var X = window.X || {
if(type2data.length >0){ if(type2data.length >0){
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){ if(val != undefined){
console.log(val); // console.log(val);
$("#analysis-zhibiao-list-type2-"+index).html(val.title); $("#analysis-zhibiao-list-type2-"+index).html(val.title);
data['events'][index]['quotaname'] = val.title; data['events'][index]['quotaname'] = val.title;
@ -7603,7 +7611,7 @@ var X = window.X || {
data['events'][index]['analysis'] = val.category[0].id; data['events'][index]['analysis'] = val.category[0].id;
}else { }else {
$("#analysis-zhibiao-list-type3-"+index).hide(); $("#analysis-zhibiao-list-type3-"+index).hide();
data['events'][index]['analysis'] = val.analysis; // data['events'][index]['analysis'] = val.analysis;
} }
X.template("userpar","userpar-event",data['events']); X.template("userpar","userpar-event",data['events']);
} }

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

@ -465,7 +465,7 @@
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum"); // var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
// $("#"+id).remove(); // $("#"+id).remove();
var index = $(this).attr("data-index"); var index = $(this).attr("data-index");
var indexs = $(this).attr("data-indexs"); var indexs = $(this).attr("data-twonum");
// filtersymbols[index].splice(indexs,1); // filtersymbols[index].splice(indexs,1);
data.events[index]['filts'].splice(indexs,1); data.events[index]['filts'].splice(indexs,1);
updataindex(data.events); updataindex(data.events);

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

@ -182,32 +182,36 @@
url: "screen", url: "screen",
extData : id, extData : id,
callback : function(d){ callback : function(d){
d['startTime'] = startTime;
d['endTime']=endTime;
var dataArr = { var dataArr = {
report_id : id, report_id : id,
ext_filter : d, ext_filter : d
startTime: startTime,
endTime:endTime
} }
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){ X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
if(vals == null){ if(vals == null){
layer.msg('查无数据'); layer.msg('查无数据');
return; return;
} }
var bbsetdata = { var report_id = [];
graph_size:modelsize, report_id.push(id);
graph_type:modeltype, X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:report_id,dashboard_id:X.DATA.dashboard_id},function(q){
model:cat, var bbsetdata = {
name:name, graph_size:modelsize,
report_id:id graph_type:modeltype,
} model:cat,
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals); name:name,
//渲染模板和数据 report_id:id,
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){ modelswitch:q[0].show_config.modelswitch,
X.pageLogic['dashboard'].morefeatures(modeldata[0]); ascending:q[0].show_config.ascending
}); }
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
//渲染模板和数据
X.template("modeltable",'conent-box'+modeldata[0]['id'],modeldata[0],function(){
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
});
})
}) })
} }
}) })
}); });
@ -620,11 +624,9 @@
var arr = []; var arr = [];
arr.push(id); arr.push(id);
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){ X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){
console.log(d);
var arr = { var arr = {
"eventView": d[0]['query']['eventView'], "eventView": d[0]['query']['eventView'],
"events": d[0]['query']['events'], "events": d[0]['query']['events'],
// "report_id": id,
} }
var dateid = "times"+id; var dateid = "times"+id;
var time = $("#"+dateid).html(); var time = $("#"+dateid).html();

10
web/srczip/logic/distribution.js
View File

@ -62,6 +62,12 @@
if(d){ if(d){
baobiaodata = d; baobiaodata = d;
data = d.query; data = d.query;
// 数据看板点进来时吧保存的时间初始化为当前时间
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";
X.template("userpar","userpar-event",data['events']); X.template("userpar","userpar-event",data['events']);
X.template("grouped","shushi",data['eventView']['groupBy']); X.template("grouped","shushi",data['eventView']['groupBy']);
distributiondata(); distributiondata();
@ -149,7 +155,7 @@
if(type2data.length >0){ if(type2data.length >0){
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){ X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){ if(val != undefined){
console.log(val); // console.log(val);
$("#analysis-zhibiao-list-type2-"+index).html(val.title); $("#analysis-zhibiao-list-type2-"+index).html(val.title);
data['events'][index]['quotaname'] = val.title; data['events'][index]['quotaname'] = val.title;
@ -162,7 +168,7 @@
data['events'][index]['analysis'] = val.category[0].id; data['events'][index]['analysis'] = val.category[0].id;
}else { }else {
$("#analysis-zhibiao-list-type3-"+index).hide(); $("#analysis-zhibiao-list-type3-"+index).hide();
data['events'][index]['analysis'] = val.analysis; // data['events'][index]['analysis'] = val.analysis;
} }
X.template("userpar","userpar-event",data['events']); X.template("userpar","userpar-event",data['events']);
} }