This commit is contained in:
罗松柏 2021-07-24 00:12:34 +08:00
parent 2a5387fba6
commit ad569eb8d4
2 changed files with 112 additions and 98 deletions

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

@ -3219,6 +3219,7 @@ var X = window.X || {
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
var eventdata=[]; var eventdata=[];
var index = d.length;
for(let i in d){ for(let i in d){
X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){ X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){
// console.log(val); // console.log(val);
@ -3242,10 +3243,9 @@ var X = window.X || {
}) })
} }
} }
index --;
})
}
console.log(eventdata); console.log(eventdata);
if(index <= 0){
X.template("modeltable","chart-box",eventdata,function(){ X.template("modeltable","chart-box",eventdata,function(){
for(let i in eventdata){ for(let i in eventdata){
if(eventdata[i]['modeltype'] == 'echarts'){ if(eventdata[i]['modeltype'] == 'echarts'){
@ -3293,6 +3293,13 @@ var X = window.X || {
} }
} }
}); });
}
})
}

View File

@ -241,6 +241,7 @@
X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
var eventdata=[]; var eventdata=[];
var index = d.length;
for(let i in d){ for(let i in d){
X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){ X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){
// console.log(val); // console.log(val);
@ -264,10 +265,9 @@
}) })
} }
} }
index --;
})
}
console.log(eventdata); console.log(eventdata);
if(index <= 0){
X.template("modeltable","chart-box",eventdata,function(){ X.template("modeltable","chart-box",eventdata,function(){
for(let i in eventdata){ for(let i in eventdata){
if(eventdata[i]['modeltype'] == 'echarts'){ if(eventdata[i]['modeltype'] == 'echarts'){
@ -315,6 +315,13 @@
} }
} }
}); });
}
})
}