diff --git a/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css b/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css index 86bc417..c9c7c76 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css +++ b/ruoyi-admin/src/main/resources/static/css/board/beforeLibrary.css @@ -89,4 +89,8 @@ body { .typeOne{ background-color: #2C95FD; color:#C2D8FF; +} +.orderQuantityFulfillmentRateOfTheDay .autoscroll-table .autoscroll-table_thead tr .autoscroll-table_tbody:nth-child(n+1){ + text-align: left; + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css index f681547..152d659 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css +++ b/ruoyi-admin/src/main/resources/static/css/board/intelligentRefrigeratorInterconnectionFactory.css @@ -8,6 +8,7 @@ body { background-size: 100% 100%; color: rgba(255, 255, 255, .95); font: normal 100% Arial, sans-serif; + overflow: hidden; } .btnOne { @@ -32,20 +33,22 @@ body { background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png); background-size: 100% 100%; position: absolute; - width: 90%; - height: 65.2%; - top: 20.1%; - left: 4.3%; + width: 112%; + height: 100.2%; + top: -0.9%; + left: -4.7%; display: block; + z-index: -1; } .layerTwo{ background-image: url(../../img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png); background-size: 100% 100%; position: absolute; - width: 98.2%; - height: 72.6%; - top: 13%; - left: 0.7%; + width: 112.2%; + height: 99.6%; + top: 1%; + left: -4.3%; + z-index: -1; display: none; } .infoOne{ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png index 437d98d..d838e40 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerOne.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png index aa5d59f..0f61277 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png and b/ruoyi-admin/src/main/resources/static/img/board/intelligentRefrigeratorInterconnectionFactory/layerTwo.png differ 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 fba1519..407d76c 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -6,10 +6,10 @@ $(() => { const INTERVAL = 30000 // 订单详情 - const orderDetailsTable = new AutoScrollTable(document.getElementById("orderQuantityFulfillmentRateOfTheDay"), ["编号", "计划数量", "完成数量", "差异值", "时间"], {width: ['30%', null, null, null, '17%']}) + const orderDetailsTable = new AutoScrollTable(document.getElementById("orderQuantityFulfillmentRateOfTheDay"), ["编号", "型号", "计划数量", "完成数量", "差异值"], {width: ['10%', null, null, null, '9%']}) // 成品质量详情 - const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), ["物料条码", "检测项", "质量缺陷", "标志", "时间"], {width: ['30%', null, null, null, '17%']}) + const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), ["检测项", "质量缺陷", "数量",'占比'], {width: ['30%', null, null, null]}) //订单详情轮询 + 当日订单数量达成率轮询 // 目标 @@ -91,12 +91,12 @@ $(() => { } 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(["编号", "计划数量", "完成数量", "差异值", "时间"])) + orderDetailsTable.loadData(data.map(value => [value.plan_code, value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number]), Object.keys(["编号", "型号", "计划数量", "完成数量", "差异值"])) }) //成品入库统计轮询 - autoUpdate(url + "/selectProductInStore ", INTERVAL, data => { + autoUpdate("/broad/mtk/selectInstoreNumByday", INTERVAL, data => { data.sort((a, b) => { return b.qty - a.qty }) @@ -109,7 +109,7 @@ $(() => { //成品质量详情轮询 autoUpdate(url + "/selectQualityInfo ", INTERVAL, data => { - PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.code, value.item, value.qa, value.state, value.day]), Object.keys(["物料条码", "检测项", "质量缺陷", "标志", "时间"])) + PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.item, value.type, value.qty, `${value.rate}%`]), Object.keys(["检测项", "质量缺陷", "数量",'占比'])) }) //产线不良类型分布 + 质量统计轮询