From 46a035f5ebd463b5beec113a81b40330213eecbf Mon Sep 17 00:00:00 2001
From: Wen JY <wenjy@mesnac.com>
Date: Mon, 14 Aug 2023 15:04:21 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8F=91=E6=B3=A1=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E8=AE=A1=E5=88=92=E4=BA=A7=E9=87=8F=E7=B4=AF=E8=AE=A1?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/scada/NorthFoamerMesPlan.html    | 4 ++--
 .../main/resources/templates/scada/NorthFoamerMesPlan2.html   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
index e7b3c59..0667628 100644
--- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
+++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
@@ -475,10 +475,10 @@
                 }
                 console.log(dataB)
                 console.log(dataC)
-                planInfo.loadData([title,...dataA], 19, {
+                planInfo.loadData([...dataB], 19, {
                     includeHead: true,
                 })
-                planInfo2.loadData([title,...dataA], 19, {
+                planInfo2.loadData([...dataC], 19, {
                     includeHead: true,
                 })
             }
diff --git a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html
index bfda6d7..a87e68b 100644
--- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html
+++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html
@@ -453,14 +453,14 @@
                 dataB = [title]
                 dataC = [title]
                 dataB.push(...([...dataA].splice(dataIndex, 6)))
-                dataB.push([' ', '合计', '', totle([...dataB], 2), totle([...dataB], 3), totle([...dataB], 4), totle([...dataB], 3) === 0 ? '0%' : ((totle([...dataB], 4) / totle([...dataB], 3)) * 100).toString().substr(0, 5) + '%', totle([...dataB], 6), totle([...dataB], 7), totle([...dataB], 8), totle([...dataB], 9), totle([...dataB], 10), totle([...dataB], 11), totle([...dataB], 12), totle([...dataB], 13), totle([...dataB], 14), totle([...dataB], 15), totle([...dataB], 16), totle([...dataB], 17)])
+                dataB.push([' ', '合计', '', totle([title,...dataA], 2), totle([title,...dataA], 3), totle([title,...dataA], 4), totle([title,...dataA], 3) === 0 ? '0%' : ((totle([title,...dataA], 4) / totle([title,...dataA], 3)) * 100).toString().substr(0, 5) + '%', totle([title,...dataA], 6), totle([title,...dataA], 7), totle([title,...dataA], 8), totle([title,...dataA], 9), totle([title,...dataA], 10), totle([title,...dataA], 11), totle([title,...dataA], 12), totle([title,...dataA], 13), totle([title,...dataA], 14), totle([title,...dataA], 15), totle([title,...dataA], 16), totle([title,...dataA], 17)])
                 if (dataIndex + 6 > dataA.length) {
                     dataIndex = 0
                 } else {
                     dataIndex += 6
                 }
                 dataC.push(...([...dataA].splice(dataIndex, 6)))
-                dataC.push([' ', '合计', '', totle([...dataC], 2), totle([...dataC], 3), totle([...dataC], 4), totle([...dataC], 3) === 0 ? '0%' : ((totle([...dataC], 4) / totle([...dataC], 3)) * 100).toString().substr(0, 5) + '%', totle([...dataC], 6), totle([...dataC], 7), totle([...dataC], 8), totle([...dataC], 9), totle([...dataC], 10), totle([...dataC], 11), totle([...dataC], 12), totle([...dataC], 13), totle([...dataC], 14), totle([...dataC], 15), totle([...dataC], 16), totle([...dataC], 17)])
+                dataC.push([' ', '合计', '', totle([title,...dataA], 2), totle([title,...dataA], 3), totle([title,...dataA], 4), totle([title,...dataA], 3) === 0 ? '0%' : ((totle([title,...dataA], 4) / totle([title,...dataA], 3)) * 100).toString().substr(0, 5) + '%', totle([title,...dataA], 6), totle([title,...dataA], 7), totle([title,...dataA], 8), totle([title,...dataA], 9), totle([title,...dataA], 10), totle([title,...dataA], 11), totle([title,...dataA], 12), totle([title,...dataA], 13), totle([title,...dataA], 14), totle([title,...dataA], 15), totle([title,...dataA], 16), totle([title,...dataA], 17)])
                 if (dataIndex + 6 > dataA.length) {
                     dataIndex = 0
                 } else {