From d27b26b41fecb651c99e9655d9c71f5194fc51eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 14 Jul 2022 17:00:46 +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/static/js/echartsCommon.js |  1 +
 .../main/resources/templates/broad/fp.html    | 28 +++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index b98e8f3..05bb040 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1855,6 +1855,7 @@ const multipleVerticalBarChart = function (data, id) {
             {
                 type: "value",
                 splitNumber: 5,
+                max:50,
                 axisLabel: {
                     show: true,
                     color: '#fff'
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index d3f738f..a8b6130 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -418,6 +418,7 @@
     }
 
     $(() => {
+        area()
         // 订单执行 + 生产统计
         autoUpdate('/broad/fp/selectOrderExecution', INTERVAL, data => {
             orderInf.loadData(data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, value.rate]), Object.keys(orderInfColumns))
@@ -447,17 +448,17 @@
         }
 
         // 当班计划/实际产量/当班差异
-        autoUpdate('/broad/fp/getHeader', INTERVAL, data => {
+        autoUpdate('/broad/fp/selectOrderInfo', INTERVAL, data => {
             // let p = [data[1], data[0][2], data[0][3]]
-            let p = [data.plannedProduction, data.actualProduction, data.plannedProduction - data.actualProduction]
+            let p = [data.plan_shift, data.planned_number, data.plan_shift - data.planned_number]
 
             for (let i in p) {
                 updateSplitBlocks(p[i], selectors[i])
             }
         })
 
-        // selectStationHourInfo
-        autoUpdate('/broad/fp//getPlanHourInfo', INTERVAL, data => {
+        // 生产统计数据
+        autoUpdate('/broad/fp/getPlanHourInfo', INTERVAL, data => {
             // orderInf.loadData(data, Object.keys(orderInfColumns))
             // let consolidatedRow = ["", "合计", ""]
             //
@@ -633,7 +634,7 @@
             axisLabel: {
                 color: '#ffffff',
                 fontSize: '10',
-                rotate: -30,
+                // rotate: -30,
             },
         },
         yAxis: {
@@ -871,5 +872,22 @@
         $(window).resize(charts.resize);
     }
 </script>
+<script>
+    const area = () => {
+        const html = `
+        <span style="position: absolute;top:30%;left:31%;font-size: 1vw;"> a1</span>
+        <span style="position: absolute;top:30%;left:37%;font-size: 1vw;"> a2</span>
+        <span style="position: absolute;top:30%;left:43%;font-size: 1vw;"> a3</span>
+        <span style="position: absolute;top:30%;left:50%;font-size: 1vw;"> a4</span>
+        <span style="position: absolute;top:30%;left:58%;font-size: 1vw;"> a5</span>
+        <span style="position: absolute;top:30%;left:65%;font-size: 1vw;"> a6</span>
+        <span style="position: absolute;top:38.6%;left:33.2%;font-size: 1vw;"> a1</span>
+        <span style="position: absolute;top:37.6%;left:56%;font-size: 1vw;"> a2</span>
+        <span style="position: absolute;top:46%;left:51%;font-size: 1vw;"> a3</span>
+        <span style="position: absolute;top:40.7%;left:65%;font-size: 1vw;"> a4</span>
+        `
+        $("body").append(html)
+    }
+</script>
 
 </html>
\ No newline at end of file