diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index dc088c6..c62aeac 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/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: "top",
+ textStyle: {
+ color: "#a8aab0",
+ fontStyle: "normal",
+ fontFamily: "微软雅黑",
+ fontSize: 0.75 * vw,
+ },
+ },
+ },
data: data.yDataTwo,
},
{
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index fb09720..2a0b9de 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -909,14 +909,14 @@
A2
B1
B2
- 发泡机1
- 发泡机2
+ 1#发泡机
+ 2#发泡机
A1
B1
A2
B2
- 压力统计
- 温度统计
+ 发泡注料压力监控
+ 发泡注料温度监控
`
$("body").append(html)
}