修改发泡线生产统计数据表格

ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html

@@ -496,13 +496,13 @@
             let dataInit = []
             let dataRes = []
             data.forEach(e => {
-                if (!Object.keys(name).includes(e.orderType)) {
-                    name[e.orderType] = [e.deviceID]
+                if (!Object.keys(name).includes(e.deviceID)) {
+                    name[e.deviceID] = [e.orderType]
                 } else {
-                    let arr = name[e.orderType]
-                    if (!arr.includes(e.deviceID)) {
-                        arr.push(e.deviceID)
-                        name[e.orderType] = arr
+                    let arr = name[e.deviceID]
+                    if (!arr.includes(e.orderType)) {
+                        arr.push(e.orderType)
+                        name[e.deviceID] = arr
                     }
                 }
             })
@@ -510,7 +510,7 @@
                 name[e].forEach(val => {
                     let arr = []
                     data.forEach(item => {
-                        if (item.orderType === e && item.deviceID === val) {
+                        if (item.deviceID === e && item.orderType === val) {
                             arr.push(item)
                         }
                     })