From 969aa4e6188cab667a30abade4511625e1ab8863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Mon, 6 Feb 2023 11:04:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/templates/broad/fp.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html index e339319..f06756b 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/fp.html +++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html @@ -538,7 +538,7 @@ classes = data[`班组`] }) // 生产统计数据 - autoUpdate( classes == 0 ?'/broad/fp/selectOrderExecutionDay' : '/broad/fp/selectStationHourInfo', INTERVAL, data => { + autoUpdate( classes == 0 ?'/broad/fp/selectStationHourInfoDay' : '/broad/fp/selectStationHourInfo', INTERVAL, data => { tableData = data let dataOne = [] if (isFirst) { From 4853c22edc155375dde0bd267cbea4410adaf111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Wed, 15 Feb 2023 15:12:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9loss=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/static/js/board/beforeLibrary.js | 4 ++-- .../src/main/resources/templates/broad/fp.html | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 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 409a2ed..90df130 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -70,11 +70,11 @@ $(() => { $.post("/broad/zz/selectLossInfo", {}, data => { data = JSON.parse(data) let LOSSOne = data.find(val => val.name == '1').qty - let LOSSTwo = data.find(val => val.name == '4').qty + LOSSOne = LOSSOne > 0 ? LOSSOne : 0 LOSS(LOSSOne) verticalBarChart({ xName: ["0-3分钟", "3-10分钟", ">10分钟"], - yData: [data.find(val => val.name == '2').qty, data.find(val => val.name == '3').qty, LOSSTwo], + yData: [data.find(val => val.name == '2').qty, data.find(val => val.name == '3').qty, data.find(val => val.name == '4').qty], }, document.getElementById("statisticOfAttribute")); }) // 标准节拍 diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html index f06756b..217fc63 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/fp.html +++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html @@ -471,9 +471,8 @@ // let now = data.find(val => val.name == '实际产量').qty let now = practical let p = [totalNum, now, totalNum - now] - + console.log(p) for (let i in p) { - console.log(i) updateSplitBlocks(p[i], selectors[i]) } }) @@ -538,7 +537,13 @@ classes = data[`班组`] }) // 生产统计数据 - autoUpdate( classes == 0 ?'/broad/fp/selectStationHourInfoDay' : '/broad/fp/selectStationHourInfo', INTERVAL, data => { + const isDay = () => { + let nowTime = new Date() + let nowHour = parseFloat(`${parseInt(nowTime.toLocaleTimeString().split(':')[0])}.${parseInt(nowTime.toLocaleTimeString().split(':')[1])}`) + console.log(nowHour < 19.3 && nowHour > 7.3) + return nowHour < 19.3 && nowHour > 7.3 + } + autoUpdate(isDay() ? '/broad/fp/selectStationHourInfoDay' : '/broad/fp/selectStationHourInfo', INTERVAL, data => { tableData = data let dataOne = [] if (isFirst) { @@ -550,6 +555,8 @@ times++ } getTable(classes, dataOne) + practical = eval(data.map(val => val.qty).join('+')) + updateSplitBlocks(1600 - practical, selectors[2]) updateSplitBlocks(eval(data.map(val => val.qty).join('+')), selectors[1]) total( Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(2) + '%',