From d3e4232b083af7b023966e64b5e0c9da288cd6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Tue, 26 Jul 2022 11:38:52 +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 --- .../static/js/board/beforeLibrary.js | 74 +++++++------------ 1 file changed, 27 insertions(+), 47 deletions(-) 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 9ea7f8c..03cffb2 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -1,17 +1,15 @@ $(() => { moduleTitle() - moduleOne() - moduleTwo() // 公共请求地址 let url = '/broad/beforeLibrary' const INTERVAL = 30000 // 订单详情 - const orderDetailsTable = new AutoScrollTable(document.getElementById("orderQuantityFulfillmentRateOfTheDay"), ["编号", "型号", "计划数量", "完成数量", "差异值"], {width: ['13%', '40%', null, null, '9%']},8) + const orderDetailsTable = new AutoScrollTable(document.getElementById("orderQuantityFulfillmentRateOfTheDay"), ["编号", "型号", "计划数量", "完成数量", "差异值"], {width: ['13%', '40%', null, null, '9%']}, 8) // 成品质量详情 - const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), ["检测项", "质量缺陷", "数量",'占比'], {width: ['30%', null, null, null]}) + const PropertyInsuranceOneDayOrderInfoTable = new AutoScrollTable(document.getElementById("PropertyInsuranceOneDayOrderInfo"), ["检测项", "质量缺陷", "数量", '占比'], {width: ['30%', null, null, null]}) //订单详情轮询 + 当日订单数量达成率轮询 // 目标 @@ -28,46 +26,24 @@ $(() => { let oneTime = parseFloat(data[0].name.split(':')[0]) // 横坐标 let xName = [] - if (yieldType == 0) { - let arr = [] - for (let i = 0; i < 12; i++) { - arr.push(Math.ceil(targetTop.tips / 11)) + let arr = [] + for (let i = 0; i < 12; i++) { + arr.push(Math.ceil(targetTop.tips / 11)) + } + arr[3] = Math.ceil(targetTop.tips / 22) + arr[8] = Math.ceil(targetTop.tips / 22) + arr[0] = arr[0] - (arr.reduce((val1, val2) => val1 + val2, 0) - targetTop.tips) + targetTop.targetArr = arr + let num = 0 + arr.forEach((val, index) => { + if (data[index].qty) { + num += arr[index] } - arr[3] = Math.ceil(targetTop.tips / 22) - arr[8] = Math.ceil(targetTop.tips / 22) - arr[0] = arr[0] - (arr.reduce((val1, val2) => val1 + val2, 0) - targetTop.tips) - targetTop.targetArr = arr - let num = 0 - arr.forEach((val,index) => { - console.log(data[index]) - if(data[index].qty){ - num += arr[index] - } - }) - targetTop.progress = num - // targetTop.progress = arr.slice(0, data.length).reduce((val1, val2) => val1 + val2, 0) - for (let i = 0; i < 12; i++) { - xName.push(`${(oneTime + i) % 24}:30`) - } - } else { - let arr = [] - for (let i = 0; i < 24; i++) { - arr.push(Math.ceil(targetTop.tips / 23)) - } - arr[8] = Math.ceil(targetTop.tips / 46) - arr[13] = Math.ceil(targetTop.tips / 46) - arr[0] = arr[0] - (arr.reduce((val1, val2) => val1 + val2, 0) - targetTop.tips) - targetTop.targetArr = arr - // let num = 0 - // arr.forEach((val,index) => { - // console.log(data[index]) - // if(data[index].qty){ - // num += arr[index] - // } - // }) - // targetTop.progress = num - targetTop.progress = arr.slice(0, data.length).reduce((val1, val2) => val1 + val2, 0) - xName = ['0:00', '1:00', '2:00', '3:00', '4:00', '5:00', '6:00', '7:00', '8:00', '9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00'] + }) + targetTop.progress = num + // targetTop.progress = arr.slice(0, data.length).reduce((val1, val2) => val1 + val2, 0) + for (let i = 0; i < 12; i++) { + xName.push(`${(oneTime + i) % 24}:30`) } // 达成率 if (targetTop.progress != 0) { @@ -112,12 +88,16 @@ $(() => { 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 + "/selectOrderInfo", INTERVAL, data => { + moduleOne(0,0,0) + }) //成品入库统计轮询 autoUpdate("/broad/mtk/selectInstoreNumByday", INTERVAL, data => { data.sort((a, b) => { return b.qty - a.qty }) + moduleTwo(data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0)) barChartAndLineChart({ xName: data.map(value => value.name), yDataTwo: data.map(value => value.qty), @@ -127,7 +107,7 @@ $(() => { //成品质量详情轮询 autoUpdate(url + "/selectQualityInfo ", INTERVAL, data => { - PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.item, value.type, value.qty, `${value.rate}%`]), Object.keys(["检测项", "质量缺陷", "数量",'占比'])) + PropertyInsuranceOneDayOrderInfoTable.loadData(data.map(value => [value.item, value.type, value.qty, `${value.rate}%`]), Object.keys(["检测项", "质量缺陷", "数量", '占比'])) pieChart(data.map(val => { return { @@ -225,16 +205,16 @@ const jp = (val = 0) => { $('#jp').html(html) } -const moduleOne = (val = 0) => { +const moduleOne = (val1 = 0,val2=0,val3=0) => { const html = ` - 订单数量：1 完成数量： 1 清单率：1% + 订单数量：${val1} 完成数量： ${val2} 清单率：${val3}% ` $('#moduleOne').html(html) } const moduleTwo = (val = 0) => { const html = ` - 合计：1 + 合计：${val} ` $('#moduleTwo').html(html) }