From 23697546a112c7ced066a00ce5abc33c3d7e8095 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 16:09:21 +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 | 9 +-
.../main/resources/templates/broad/fp.html | 403 +++++++-----------
2 files changed, 158 insertions(+), 254 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index 0f810bf..b98e8f3 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1960,18 +1960,21 @@ const multipleVerticalBarChart = function (data, id) {
],
};
- if (data?.length >= 3) {
+ if (data?.xName?.length >= 3) {
option.dataZoom.push({
show: true,
type: 'slider',
+ bottom : '0%',
xAxisIndex: 0,
- width: 12,
+ height: 12,
start: 0,
- end: 1 / (data.length / 3) * 100,
+ end: 1 / (data.xName.length / 3) * 100,
textStyle: {
fontSize: 0,
+ color:'rgba(0,0,0,0)'
}
})
+ option.grid.bottom = '7%'
}
charts.setOption(option);
$(window).resize(charts.resize);
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index bf68aed..3aac920 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -2,17 +2,18 @@
-
+
发泡SCADA数据平台
-
-
-
+
+
+
-
+
-
-
+
+
+