修改界面

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

@@ -1892,24 +1892,24 @@ const percentageRingDiagramTwo = function (data, id) {
     if (!data) {
         data = [
             {
-                name: "数据1",
+                name: "内胆检测",
-                value: 54,
+                value: 99,
             },
             {
-                name: "数据1",
+                name: "安全检测",
-                value: 44,
+                value: 97.5,
             },
             {
-                name: "数据1",
+                name: "压力检测",
-                value: 35,
+                value: 97,
             },
             {
-                name: "数据1",
+                name: "温度检测",
-                value: 30,
+                value: 91,
             },
             {
-                name: "数据1",
+                name: "外观检测",
-                value: 44,
+                value: 94,
             },
         ];
     }

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 = [

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: {