diff --git a/web/src/x.min.js b/web/src/x.min.js index 242f5da..924c3d3 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -3991,10 +3991,9 @@ var X = window.X || { } modellist.sort( X.pageLogic['dashboard'].compare("sort")); - for(let i in modellist){ for(let z in d){ - if(modellist[i]['sort'] == d[z]['sort']){ + if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){ //渲染模板和数据 console.log(d[z]); X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){ diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 05b72b8..12b71d7 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -559,10 +559,9 @@ } modellist.sort( X.pageLogic['dashboard'].compare("sort")); - for(let i in modellist){ for(let z in d){ - if(modellist[i]['sort'] == d[z]['sort']){ + if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){ //渲染模板和数据 console.log(d[z]); X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){