From 652ac9628c2a1b501e2d2613919238bffb989b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 14 Aug 2023 15:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/scada/NorthFoamerMesPlan.html     | 8 ++++----
 1 file 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 0c7b29e..ed35fd3 100644
--- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
+++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
@@ -461,9 +461,9 @@
                 dataC = [title]
                 dataB.push(...([...dataA].splice(dataIndex, 6)))
               if(dataB.length ===1){
-                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)])
+                dataB.push(['A,B,C,D', '合计', '正常', 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)])
               }else{
-                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(['A,B,C,D', '合计', '正常', 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)])
               }
                 if (dataIndex + 6 > dataA.length) {
                     dataIndex = 0
@@ -472,9 +472,9 @@
                 }
                 dataC.push(...([...dataA].splice(dataIndex, 6)))
               if(dataC.length ===1){
-                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)])
+                dataC.push(['A,B,C,D', '合计', '正常', 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)])
               }else{
-                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(['A,B,C,D', '合计', '正常', 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)])
               }
                 if (dataIndex + 6 > dataA.length) {
                     dataIndex = 0