1
This commit is contained in:
parent
a92b36fd8b
commit
a8ffcbc351
@ -326,7 +326,7 @@
|
||||
<div class="analysis-con-left-screen-list-right-screen-qh">
|
||||
<div class="analysis-con-left-screen-list-right-screen-qh-xian"></div>
|
||||
{{# 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>
|
||||
{{# } else { }}
|
||||
<div class="analysis-con-left-screen-list-right-screen-qh-tit" data-index="{{index}}">或</div>
|
||||
|
||||
30
web/src/x.min.js
vendored
30
web/src/x.min.js
vendored
@ -3852,7 +3852,7 @@ var X = window.X || {
|
||||
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
|
||||
// $("#"+id).remove();
|
||||
var index = $(this).attr("data-index");
|
||||
var indexs = $(this).attr("data-indexs");
|
||||
var indexs = $(this).attr("data-twonum");
|
||||
// filtersymbols[index].splice(indexs,1);
|
||||
data.events[index]['filts'].splice(indexs,1);
|
||||
updataindex(data.events);
|
||||
@ -5718,23 +5718,28 @@ var X = window.X || {
|
||||
url: "screen",
|
||||
extData : id,
|
||||
callback : function(d){
|
||||
d['startTime'] = startTime;
|
||||
d['endTime']=endTime;
|
||||
var dataArr = {
|
||||
report_id : id,
|
||||
ext_filter : d,
|
||||
startTime: startTime,
|
||||
endTime:endTime
|
||||
ext_filter : d
|
||||
}
|
||||
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
|
||||
if(vals == null){
|
||||
layer.msg('查无数据');
|
||||
return;
|
||||
}
|
||||
var report_id = [];
|
||||
report_id.push(id);
|
||||
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:report_id,dashboard_id:X.DATA.dashboard_id},function(q){
|
||||
var bbsetdata = {
|
||||
graph_size:modelsize,
|
||||
graph_type:modeltype,
|
||||
model:cat,
|
||||
name:name,
|
||||
report_id:id
|
||||
report_id:id,
|
||||
modelswitch:q[0].show_config.modelswitch,
|
||||
ascending:q[0].show_config.ascending
|
||||
}
|
||||
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
|
||||
//渲染模板和数据
|
||||
@ -5742,8 +5747,7 @@ var X = window.X || {
|
||||
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
})
|
||||
});
|
||||
@ -6156,11 +6160,9 @@ var X = window.X || {
|
||||
var arr = [];
|
||||
arr.push(id);
|
||||
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){
|
||||
console.log(d);
|
||||
var arr = {
|
||||
"eventView": d[0]['query']['eventView'],
|
||||
"events": d[0]['query']['events'],
|
||||
// "report_id": id,
|
||||
}
|
||||
var dateid = "times"+id;
|
||||
var time = $("#"+dateid).html();
|
||||
@ -7503,6 +7505,12 @@ var X = window.X || {
|
||||
if(d){
|
||||
baobiaodata = d;
|
||||
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("grouped","shushi",data['eventView']['groupBy']);
|
||||
distributiondata();
|
||||
@ -7590,7 +7598,7 @@ var X = window.X || {
|
||||
if(type2data.length >0){
|
||||
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
|
||||
if(val != undefined){
|
||||
console.log(val);
|
||||
// console.log(val);
|
||||
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
|
||||
|
||||
data['events'][index]['quotaname'] = val.title;
|
||||
@ -7603,7 +7611,7 @@ var X = window.X || {
|
||||
data['events'][index]['analysis'] = val.category[0].id;
|
||||
}else {
|
||||
$("#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']);
|
||||
}
|
||||
|
||||
@ -465,7 +465,7 @@
|
||||
// var id = "analysis-zhibiao-list-mar-"+$(this).attr("data-twonum");
|
||||
// $("#"+id).remove();
|
||||
var index = $(this).attr("data-index");
|
||||
var indexs = $(this).attr("data-indexs");
|
||||
var indexs = $(this).attr("data-twonum");
|
||||
// filtersymbols[index].splice(indexs,1);
|
||||
data.events[index]['filts'].splice(indexs,1);
|
||||
updataindex(data.events);
|
||||
|
||||
@ -182,23 +182,28 @@
|
||||
url: "screen",
|
||||
extData : id,
|
||||
callback : function(d){
|
||||
d['startTime'] = startTime;
|
||||
d['endTime']=endTime;
|
||||
var dataArr = {
|
||||
report_id : id,
|
||||
ext_filter : d,
|
||||
startTime: startTime,
|
||||
endTime:endTime
|
||||
ext_filter : d
|
||||
}
|
||||
X.api("ck/"+ cat +"_model","post",dataArr,function(vals){
|
||||
if(vals == null){
|
||||
layer.msg('查无数据');
|
||||
return;
|
||||
}
|
||||
var report_id = [];
|
||||
report_id.push(id);
|
||||
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:report_id,dashboard_id:X.DATA.dashboard_id},function(q){
|
||||
var bbsetdata = {
|
||||
graph_size:modelsize,
|
||||
graph_type:modeltype,
|
||||
model:cat,
|
||||
name:name,
|
||||
report_id:id
|
||||
report_id:id,
|
||||
modelswitch:q[0].show_config.modelswitch,
|
||||
ascending:q[0].show_config.ascending
|
||||
}
|
||||
var modeldata = X.pageLogic['dashboard'].modeldata(bbsetdata,vals);
|
||||
//渲染模板和数据
|
||||
@ -206,8 +211,7 @@
|
||||
X.pageLogic['dashboard'].morefeatures(modeldata[0]);
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
})
|
||||
});
|
||||
@ -620,11 +624,9 @@
|
||||
var arr = [];
|
||||
arr.push(id);
|
||||
X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:arr},function(d){
|
||||
console.log(d);
|
||||
var arr = {
|
||||
"eventView": d[0]['query']['eventView'],
|
||||
"events": d[0]['query']['events'],
|
||||
// "report_id": id,
|
||||
}
|
||||
var dateid = "times"+id;
|
||||
var time = $("#"+dateid).html();
|
||||
|
||||
@ -62,6 +62,12 @@
|
||||
if(d){
|
||||
baobiaodata = d;
|
||||
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("grouped","shushi",data['eventView']['groupBy']);
|
||||
distributiondata();
|
||||
@ -149,7 +155,7 @@
|
||||
if(type2data.length >0){
|
||||
X.querycriteriapop(type2data[0],'dropdownlist',offset.left,offset.top+obj.height(),function(val){
|
||||
if(val != undefined){
|
||||
console.log(val);
|
||||
// console.log(val);
|
||||
$("#analysis-zhibiao-list-type2-"+index).html(val.title);
|
||||
|
||||
data['events'][index]['quotaname'] = val.title;
|
||||
@ -162,7 +168,7 @@
|
||||
data['events'][index]['analysis'] = val.category[0].id;
|
||||
}else {
|
||||
$("#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']);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user