From 7b00b9e1d571e82a9bd5d56f6bb1374ad0813b02 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:17:47 +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 --- .../templates/scada/NorthFoamerMesPlan.html | 16 +++++++++++----- .../templates/scada/NorthFoamerMesPlan2.html | 8 ++++---- 2 files changed, 15 insertions(+), 9 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..0c7b29e 100644 --- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html +++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html @@ -460,25 +460,31 @@ dataB = [title] dataC = [title] dataB.push(...([...dataA].splice(dataIndex, 6))) - 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(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)]) + }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)]) + } if (dataIndex + 6 > dataA.length) { dataIndex = 0 } else { dataIndex += 6 } 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)]) + }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)]) + } if (dataIndex + 6 > dataA.length) { dataIndex = 0 } else { dataIndex += 6 } - 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..e101c6e 100644 --- a/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html +++ b/ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html @@ -431,7 +431,7 @@ let filter = (arr, key, value, key2) => { return arr.filter(e => e[key] === value)?.[0]?.[key2] } - let totle = (arr, i) => { + let total = (arr, i) => { return arr.map((e, index) => { if (index !== 0) { return e[i + 1] @@ -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([' ', '合计', '', total([...dataB], 2), total([...dataB], 3), total([...dataB], 4), total([...dataB], 3) === 0 ? '0%' : ((total([...dataB], 4) / total([...dataB], 3)) * 100).toString().substr(0, 5) + '%', total([...dataB], 6), total([...dataB], 7), total([...dataB], 8), total([...dataB], 9), total([...dataB], 10), total([...dataB], 11), total([...dataB], 12), total([...dataB], 13), total([...dataB], 14), total([...dataB], 15), total([...dataB], 16), total([...dataB], 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([' ', '合计', '', total([...dataC], 2), total([...dataC], 3), total([...dataC], 4), total([...dataC], 3) === 0 ? '0%' : ((total([...dataC], 4) / total([...dataC], 3)) * 100).toString().substr(0, 5) + '%', total([...dataC], 6), total([...dataC], 7), total([...dataC], 8), total([...dataC], 9), total([...dataC], 10), total([...dataC], 11), total([...dataC], 12), total([...dataC], 13), total([...dataC], 14), total([...dataC], 15), total([...dataC], 16), total([...dataC], 17)]) if (dataIndex + 6 > dataA.length) { dataIndex = 0 } else { @@ -983,4 +983,4 @@ } - \ No newline at end of file +