From ac50af425e128e5a4038ae6799a325425973e6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 15 Jul 2022 18:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/broad/fp.html    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index 6a293bf..b903ecf 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -47,7 +47,8 @@
         left: 3.5%;
         font-size: 1vw;
     }
-    .total{
+
+    .total {
         flex-wrap: nowrap;
         justify-content: space-around;
         display: flex;
@@ -469,8 +470,8 @@
                 el: '#bottom-left',
                 rowNum: 7,
                 timeout: 0,
-                header: ['工位', '型号', '状态', '目标', '计划','累计','达成率','8:30','9:30','10:30','11:30','12:30','13:30','14:30','15:30','16:30','17:30','18:30','19:00'],
-                data: data.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number,value.qty,`${value.rate}%`,value.h1,value.h2,value.h3,value.h4,value.h5,value.h6,value.h7,value.h8,value.h9,value.h10,value.h11,value.h12]),
+                header: ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30', '19:00'],
+                data: data.map(value => [value.station_no, value.name, value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]),
                 index: false,
                 fontColor: '#B4B7BF ',
                 indexBGC: '#86F3FF',
@@ -550,21 +551,21 @@
         // 右侧压力 + 右侧温度
         autoUpdate('/broad/fp/selectDeviceStation', INTERVAL, data => {
             // 右侧压力
-            multipleVerticalBarChart(
-                {
-                xName: data.map(value => value.station_no),
-                yDataOne: data.map(value => value.pol_yl),
-                yDataOneName: "pol压力",
-                yDataTwo:data.map(value => value.so_yl),
-                yDataTwoName: "so压力",
-            }, document.getElementById("top-right"))
-            // 右侧温度
             multipleVerticalBarChart(
                 {
                     xName: data.map(value => value.station_no),
+                    yDataOne: data.map(value => value.pol_yl),
+                    yDataOneName: "pol压力",
+                    yDataTwo: data.map(value => value.so_yl),
+                    yDataTwoName: "so压力",
+                }, document.getElementById("top-right"))
+            // 右侧温度
+            multipleBrokenLineAreaDiagram(
+                {
+                    xData: data.map(value => value.station_no),
                     yDataOne: data.map(value => value.pol_wd),
                     yDataOneName: "pol温度",
-                    yDataTwo:data.map(value => value.so_wd),
+                    yDataTwo: data.map(value => value.so_wd),
                     yDataTwoName: "so温度",
                 }, document.getElementById("mid-right"))
         })
@@ -580,8 +581,8 @@
                         // rotate: -30,
                     },
                 },
-                yAxis:{
-                    max:Math.max(...data[`seriesInfo`])+5
+                yAxis: {
+                    max: Math.max(...data[`seriesInfo`]) + 5
                 },
                 series: [
                     {