diff --git a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js index ae3af4a..7c1a057 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -3,6 +3,12 @@ $(() => { // 公共请求地址 let url = '/broad/beforeLibrary' + // 订单详情 + const orderDetailsTable = new AutoScrollTable(document.getElementById("orderDetails"), ["编号", "计划数量", "完成数量", "差异值", "时间",], {width: ['30%', null, null, null, '17%']}) + + // 成品质量详情 + const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), ["物料条码", "检测项", "质量缺陷", "标志", "时间"], {width: ['30%', null, null, null, '17%']}) + //订单详情轮询 + 当日订单数量达成率轮询 autoUpdate(url + "/selectOrderInfo ", INTERVAL, data => { orderDetailsTable.loadData(data.map(value => [value.plan_code, value.plan_number, value.actual_number, value.plan_number - value.actual_number, value.day]), Object.keys(planWorkOrderColumns)) @@ -27,16 +33,23 @@ $(() => { PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.code, value.item, value.qa, value.state, value.day]), Object.keys(planWorkOrderColumns)) }) - //产线不良类型分布轮询 + //产线不良类型分布 + 质量统计轮询 autoUpdate(url + "/selectQualityItem ", INTERVAL, data => { - let params = data.map(val => { + pieChart(data.map(val => { return { name: val.name, value: val.qty } - }) - pieChart(params, document.getElementById("distributionOfBadTypesInProductionLineByDay")); + }), document.getElementById("distributionOfBadTypesInProductionLineByDay")); + barChartAndLineChart(data.map(val => { + return { + xName: val.name, + yDataTwo: val.qty, + yDataTwoName: "质量", + } + + }), document.getElementById("FinishedGoodsWarehousingStatisticsByHour")); }) }) diff --git a/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html b/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html index d231d7d..876f9ff 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html +++ b/ruoyi-admin/src/main/resources/templates/broad/beforeLibrary.html @@ -33,6 +33,9 @@
+ + +