From 81977adc88fb1071333e832e27d4cf9b96afc4b2 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, 21 Jul 2022 10:05:19 +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

---
 .../main/resources/static/js/echartsCommon.js | 20 +++++++++----------
 .../main/resources/templates/broad/box.html   |  2 +-
 .../main/resources/templates/broad/fp.html    |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
index 412e760..14ae3ed 100644
--- a/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
+++ b/ruoyi-admin/src/main/resources/static/js/echartsCommon.js
@@ -1892,24 +1892,24 @@ const percentageRingDiagramTwo = function (data, id) {
     if (!data) {
         data = [
             {
-                name: "数据1",
-                value: 54,
+                name: "内胆检测",
+                value: 99,
             },
             {
-                name: "数据1",
-                value: 44,
+                name: "安全检测",
+                value: 97.5,
             },
             {
-                name: "数据1",
-                value: 35,
+                name: "压力检测",
+                value: 97,
             },
             {
-                name: "数据1",
-                value: 30,
+                name: "温度检测",
+                value: 91,
             },
             {
-                name: "数据1",
-                value: 44,
+                name: "外观检测",
+                value: 94,
             },
         ];
     }
diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html
index 61e8b29..f7338e1 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/box.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/box.html
@@ -367,7 +367,7 @@
 <script src="../../static/js/data-merger.js" th:src="@{/js/data-merger.js}"></script>
 <script>
     const occupancy = (val1=0,val2=0) => {
-        const html = `内胆库存占用率：${val1}% &nbsp;&nbsp;&nbsp;&nbsp;  箱壳库存占用率${val2}%`
+        const html = `内胆库存占用率：${val1}% &nbsp;&nbsp;&nbsp;&nbsp;  箱壳库存占用率：${val2}%`
         $('#occupancy').html(html)
     }
     const planWorkOrderColumns = [
diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html
index c5493cd..4d05812 100644
--- a/ruoyi-admin/src/main/resources/templates/broad/fp.html
+++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html
@@ -450,7 +450,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))
+            orderInf.loadData(data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate ==0? value.rate : value.rate + '%'}`]), Object.keys(orderInfColumns))
 
             modelChart.setOption({
                 xAxis: {