From 39bcab13e25ecf153b5081c8de69f150d3e39364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Tue, 2 Aug 2022 12:13:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/js/board/finalAssemblyProductionData.js | 4 ++--
.../intelligentRefrigeratorInterconnectionFactory.js | 2 +-
.../src/main/resources/static/js/echartsCommon.js | 9 ++++++---
.../intelligentRefrigeratorInterconnectionFactory.html | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
index 2ba104c..0c38bc2 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
@@ -47,8 +47,8 @@ $(() => {
for (let i = 0; i < 12; i++) {
arr.push(Math.ceil(targetTop.tips / 11))
}
- arr[3] = Math.ceil(targetTop.tips / 22)
- arr[8] = Math.ceil(targetTop.tips / 22)
+ arr[2] = Math.ceil(targetTop.tips / 22)
+ arr[7] = Math.ceil(targetTop.tips / 22)
arr[0] = arr[0] - (arr.reduce((val1, val2) => val1 + val2, 0) - targetTop.tips)
targetTop.targetArr = arr
let num = 0
diff --git a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js
index 5da35a3..82c7dd4 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/intelligentRefrigeratorInterconnectionFactory.js
@@ -8,7 +8,7 @@ $(() => {
deviceNameOne('28工位箱体发泡线', 25, 59)
deviceNameOne('箱壳自动成型线', 37, 48)
deviceNameOne('成品分垛入库', 44, 18)
- deviceNameOne('内胆底生产线', 52, 43)
+ deviceNameOne('内胆底成型线', 52, 43)
deviceNameOne('压合区', 57, 61)
deviceNameOne('展厅', 49, 80)
deviceNameOne('蒸发器绕管机', 60, 43.5)
diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index fb6d3ec..cef62f3 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1522,14 +1522,17 @@ const pieChartTwo = function (data, id, unit = '次') {
{
name: "访问来源",
type: "pie",
- radius: "70%",
+ radius: "50%",
center: ["50%", "50%"],
colorBy: 'data',
// color: ["rgb(131,249,103)", "#FBFE27", "#FE5050", "#1DB7E5"], //'#FBFE27','rgb(11,228,96)','#FE5050'
data: data,
roseType: "radius",
+ overflow:'break',
label: {
+ overflow:'break',
normal: {
+ overflow:'break',
formatter: `{b|{b}} \n {c|{c}${unit}}`,
rich: {
c: {
@@ -1556,8 +1559,8 @@ const pieChartTwo = function (data, id, unit = '次') {
color: "rgb(98,137,169)",
},
smooth: true,
- length: 20,
- length2: 20,
+ length: 5,
+ length2: 5,
},
},
},
diff --git a/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
index d89da77..418ecfe 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/intelligentRefrigeratorInterconnectionFactory.html
@@ -99,7 +99,7 @@
+ style="width: 4.6vw;height: 0.8vh;position: absolute;top: 34.4%;left: 76%;object-fit: contain;transform: rotate(279deg);">
