Merge remote-tracking branch 'gitee/master'

ruoyi-admin/src/main/resources/static/js/echartsCommon.js

@@ -1434,7 +1434,7 @@ const multipleBrokenLineAreaDiagram = (data, ids) => {
             itemHeight: 0.25 * vw,
             itemGap: 0.75 * vw,
             data: [data.yDataOneName, data.yDataTwoName, data.yDataThreeName],
-            left: "4%",
+            right: "4%",
             textStyle: {
                 fontSize: 0.75 * vw,
                 color: "#F1F1F3",
@@ -1470,6 +1470,7 @@ const multipleBrokenLineAreaDiagram = (data, ids) => {
                 axisTick: {
                     show: false,
                 },
+                min:15,
                 axisLine: {
                     lineStyle: {
                         color: "#57617B",
@@ -1525,6 +1526,19 @@ const multipleBrokenLineAreaDiagram = (data, ids) => {
                         color: "rgb(137,189,27)",
                     },
                 },
+                label: {
+                    //图形上的文本标签
+                    normal: {
+                        show: true,
+                        position: "top",
+                        textStyle: {
+                            color: "#a8aab0",
+                            fontStyle: "normal",
+                            fontFamily: "微软雅黑",
+                            fontSize: 0.75 * vw,
+                        },
+                    },
+                },
                 data: data.yDataOne,
             },
             {
@@ -1564,6 +1578,19 @@ const multipleBrokenLineAreaDiagram = (data, ids) => {
                         color: "rgb(0,136,212)",
                     },
                 },
+                label: {
+                    //图形上的文本标签
+                    normal: {
+                        show: true,
+                        position: "bottom",
+                        textStyle: {
+                            color: "#a8aab0",
+                            fontStyle: "normal",
+                            fontFamily: "微软雅黑",
+                            fontSize: 0.75 * vw,
+                        },
+                    },
+                },
                 data: data.yDataTwo,
             },
             {

ruoyi-admin/src/main/resources/templates/broad/fp.html

@@ -905,18 +905,19 @@
 <script>
     const area = () => {
         const html = `
+    <span style="position: absolute;top: 0.9%;left: 50%;color: #fff;font-size: 1.3vw;transform: translateX(-50%);letter-spacing: 0.3vw">箱体发泡线生产数据平台</span>
         <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;"> B1</span>
-        <span style="position: absolute;top:30%;left:50%;font-size: 1vw;"> B2</span>
-        <span style="position: absolute;top:30%;left:56%;font-size: 1vw;"> 发泡机1</span>
-        <span style="position: absolute;top:30%;left:63%;font-size: 1vw;"> 发泡机2</span>
+        <span style="position: absolute;top:30%;left:37%;font-size: 1vw;"> B1</span>
+        <span style="position: absolute;top:30%;left:43%;font-size: 1vw;"> B2</span>
+        <span style="position: absolute;top:30%;left:50%;font-size: 1vw;"> A2</span>
+        <span style="position: absolute;top:30%;left:56%;font-size: 1vw;">  1#发泡机</span>
+        <span style="position: absolute;top:30%;left:63%;font-size: 1vw;">  2#发泡机</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;"> B1</span>
         <span style="position: absolute;top:46%;left:51%;font-size: 1vw;"> A2</span>
         <span style="position: absolute;top:40.7%;left:65%;font-size: 1vw;"> B2</span>
-    <span style="position: absolute;top: 10.3%;left: 75%;color: #CFD2D0;font-size: 1.0vw">压力统计</span>
-    <span style="position: absolute;top: 38.3%;left: 75%;color: #CFD2D0;font-size: 1.0vw">温度统计</span>
+    <span style="position: absolute;top: 10.5%;left: 74.6%;color: #CFD2D0;font-size: 0.8vw">发泡注料压力监控</span>
+    <span style="position: absolute;top: 38.5%;left: 74.6%;color: #CFD2D0;font-size: 0.8vw">发泡注料温度监控</span>
         `
         $("body").append(html)
     }