修改界面

ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js

@@ -116,7 +116,7 @@ $(() => {
             }, document.getElementById("fractionDefective"));
         })
 
-        //追踪事件轮询
+        //当班入库执行订单
         $.post(url + "/selectInStoreOrderInfo", {}, data => {
             data = JSON.parse(data)
             total('#total', data.map(val => val.actual_number).reduce((val1, val2) => val1 + val2, 0))
@@ -127,7 +127,7 @@ $(() => {
                 rowNum: 5,
                 timeout: 0,
                 header: ["订单编号", '产品型号', "计划数量", "完成数量", "执行进度", "时间"],
-                data: data.map(value => [value.plan_code.slice(4, value.plan_code.length), value.name.split('-')[1], value.plan_number, value.actual_number, ((value.actual_number / value.plan_number).toFixed(4) * 100 + '').slice(0, 5) + '%', value.day]),
+                data: data.map(value => [value.plan_code.slice(4, value.plan_code.length), value.name.split('-')[1], value.plan_number, value.actual_number, value.plan_number === 0? 0 :((value.actual_number / value.plan_number)* 100 + '').slice(0, 5) + '%', value.day]),
                 index: false,
                 fontColor: '#B4B7BF ',
                 indexBGC: '#86F3FF',

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

@@ -913,6 +913,9 @@ const barChartAndLineChartFour = function (data, id) {
             }
         ]
     };
+    if (Math.max(...data.yDataOne) <=5){
+        option.yAxis[0].max = 5
+    }
 
     charts.setOption(option);
     $(window).resize(charts.resize);

ruoyi-admin/src/main/resources/templates/broad/finalAssemblyProductionData.html

@@ -46,7 +46,7 @@
 <!--一次装配不合格率-->
 <div class="fractionDefective" id="fractionDefective"></div>
 
-<!--追踪事件-->
+<!--当班入库执行订单-->
 <div class="trackEventsScrollTable" id="trackEventsScrollTable">
 <div class="trackEvents" id="trackEvents">
 </div>