From 89cae7037c0abc8e37b40304e28153be6bdfc8ba Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 19 Aug 2021 11:15:02 +0800
Subject: [PATCH] 111

---
 web/src/x.min.js              | 3 +--
 web/srczip/logic/dashboard.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

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){